make conversion from JTS Polygon to GH public and use .create

graphhopper · Feb 3, 2018 · 144da90 · 144da90
1 parent 2475844
commit 144da90
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/util/spatialrules/Polygon.java b/core/src/main/java/com/graphhopper/routing/util/spatialrules/Polygon.java
@@ -72,6 +72,19 @@ public Polygon(double[] lat, double[] lon) {
         epsilon = (maxLat - minLat) / 10;
     }
 
+    /**
+     * Lossy conversion to a GraphHopper Polygon.
+     */
+    public static Polygon create(com.vividsolutions.jts.geom.Polygon polygon) {
+        double[] lats = new double[polygon.getNumPoints()];
+        double[] lons = new double[polygon.getNumPoints()];
+        for (int i = 0; i < polygon.getNumPoints(); i++) {
+            lats[i] = polygon.getCoordinates()[i].y;
+            lons[i] = polygon.getCoordinates()[i].x;
+        }
+        return new Polygon(lats, lons);
+    }
+
     /**
      * Wrapper method for {@link Polygon#contains(double, double)}.
      */

diff --git a/core/src/main/java/com/graphhopper/routing/util/spatialrules/SpatialRuleLookupBuilder.java b/core/src/main/java/com/graphhopper/routing/util/spatialrules/SpatialRuleLookupBuilder.java
@@ -51,7 +51,7 @@ public static SpatialRuleLookup buildIndex(JsonFeatureCollection jsonFeatureColl
             for (int i = 0; i < jsonFeature.getGeometry().getNumGeometries(); i++) {
                 Geometry poly = jsonFeature.getGeometry().getGeometryN(i);
                 if (poly instanceof com.vividsolutions.jts.geom.Polygon)
-                    borders.add(ghPolygonFromJTS((com.vividsolutions.jts.geom.Polygon) poly));
+                    borders.add(Polygon.create((com.vividsolutions.jts.geom.Polygon) poly));
                 else
                     throw new IllegalArgumentException("Geometry for " + id + " (" + i + ") not supported " + poly.getClass().getSimpleName());
             }
@@ -87,15 +87,4 @@ public static SpatialRuleLookup buildIndex(JsonFeatureCollection jsonFeatureColl
     public static SpatialRuleLookup buildIndex(JsonFeatureCollection jsonFeatureCollection, String jsonIdField, SpatialRuleFactory spatialRuleFactory) {
         return buildIndex(jsonFeatureCollection, jsonIdField, spatialRuleFactory, .1, new BBox(-180, 180, -90, 90));
     }
-
-    private static Polygon ghPolygonFromJTS(com.vividsolutions.jts.geom.Polygon polygon) {
-        double[] lats = new double[polygon.getNumPoints()];
-        double[] lons = new double[polygon.getNumPoints()];
-        for (int i = 0; i < polygon.getNumPoints(); i++) {
-            lats[i] = polygon.getCoordinates()[i].y;
-            lons[i] = polygon.getCoordinates()[i].x;
-        }
-        return new Polygon(lats, lons);
-    }
-
 }
diff --git a/core/src/main/java/com/graphhopper/storage/GraphEdgeIdFinder.java b/core/src/main/java/com/graphhopper/storage/GraphEdgeIdFinder.java
@@ -103,7 +103,7 @@ protected boolean checkAdjacent(EdgeIteratorState edge) {
      */
     public void fillEdgeIDs(GHIntHashSet edgeIds, Geometry geometry, EdgeFilter filter) {
         if (geometry instanceof Point) {
-            GHPoint point = GHPoint.from((Point) geometry);
+            GHPoint point = GHPoint.create((Point) geometry);
             findClosestEdgeToPoint(edgeIds, point, filter);
         } else if (geometry instanceof LineString) {
             PointList pl = PointList.from((LineString) geometry);

diff --git a/core/src/main/java/com/graphhopper/util/shapes/GHPoint.java b/core/src/main/java/com/graphhopper/util/shapes/GHPoint.java
@@ -35,6 +35,10 @@ public GHPoint(double lat, double lon) {
         this.lon = lon;
     }
 
+    public static GHPoint create(Point point) {
+        return new GHPoint(point.getY(), point.getX());
+    }
+
     public static GHPoint parse(String str) {
         return parse(str, false);
     }
@@ -100,8 +104,4 @@ public String toString() {
     public Double[] toGeoJson() {
         return new Double[]{lon, lat};
     }
-
-    public static GHPoint from(Point point) {
-        return new GHPoint(point.getY(), point.getX());
-    }
 }