Merge pull request #5 from GIScience/drop-geotools

drop "geotools" dependency

oshdb-api/pom.xml

@@ -35,12 +35,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.geotools</groupId>
-      <artifactId>gt-geometry</artifactId>
-      <version>${geotools.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>com.h2database</groupId>

oshdb-util/pom.xml

@@ -26,13 +26,6 @@
       <artifactId>h2</artifactId>
       <version>${h2.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.geotools</groupId>
-      <artifactId>gt-shapefile</artifactId>
-      <version>${geotools.version}</version>
-      <type>jar</type>
-    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>

oshdb-util/src/main/java/org/heigit/bigspatialdata/oshdb/util/geometry/Geo.java

@@ -1,7 +1,6 @@
 package org.heigit.bigspatialdata.oshdb.util.geometry;
 
 import com.vividsolutions.jts.geom.*;
-import org.geotools.geometry.jts.JTS;
 import org.heigit.bigspatialdata.oshdb.util.OSHDBBoundingBox;
 
 /**
@@ -146,8 +145,7 @@ public static double ringArea(LinearRing ring) {
 	// =====================
 
 	public static Geometry clip(Geometry obj, OSHDBBoundingBox bbox) {
-		Envelope envelope = new Envelope(bbox.getMinLon(), bbox.getMaxLon(), bbox.getMinLat(), bbox.getMaxLat());
-		return obj.intersection(JTS.toGeometry(envelope));
+		return obj.intersection(OSHDBGeometryBuilder.getGeometry(bbox));
 	}
 
 	public static <P extends Geometry & Polygonal> Geometry clip(Geometry obj, P poly) {

oshdb-util/src/main/java/org/heigit/bigspatialdata/oshdb/util/geometry/OSHDBGeometryBuilder.java

@@ -8,7 +8,6 @@
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
-import org.geotools.geometry.jts.JTS;
 import org.heigit.bigspatialdata.oshdb.osh.OSHEntity;
 import org.heigit.bigspatialdata.oshdb.osm.OSMEntity;
 import org.heigit.bigspatialdata.oshdb.osm.OSMMember;
@@ -283,7 +282,12 @@ public static <P extends Geometry & Polygonal, T extends OSMEntity> Geometry get
   * @return com.vividsolutions.jts.geom.Geometry
   */
  public static Polygon getGeometry(OSHDBBoundingBox bbox) {
-   return JTS.toGeometry(new Envelope(bbox.getMinLon(), bbox.getMaxLon(), bbox.getMinLat(), bbox.getMaxLat()));
+   GeometryFactory gf = new GeometryFactory();
+   Geometry g = gf.toGeometry(new Envelope(bbox.getMinLon(), bbox.getMaxLon(), bbox.getMinLat(), bbox.getMaxLat()));
+   if (g instanceof Polygon)
+     return (Polygon) g;
+   else
+    return gf.createPolygon((LinearRing) null);
  }
 
 

oshdb-util/src/main/java/org/heigit/bigspatialdata/oshdb/util/geometry/fip/FastBboxInPolygon.java

@@ -9,7 +9,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Predicate;
-import org.heigit.bigspatialdata.oshdb.util.geometry.OSHDBGeometryBuilder;
 
 /**
  * Fast bounding-box in (multi)polygon test inspired by
@@ -42,14 +41,14 @@ public <P extends Geometry & Polygonal> FastBboxInPolygon(P geom) {
    */
   @Override
   public boolean test(OSHDBBoundingBox boundingBox) {
-    Polygon g = OSHDBGeometryBuilder.getGeometry(boundingBox);
-    Point p1 = g.getExteriorRing().getPointN(0);
+    GeometryFactory gf = new GeometryFactory();
+    Point p1 = gf.createPoint(new Coordinate(boundingBox.getMinLon(), boundingBox.getMinLat()));
     if (crossingNumber(p1, true) % 2 == 0) {
       return false;
     }
-    Point p2 = g.getExteriorRing().getPointN(1);
-    Point p3 = g.getExteriorRing().getPointN(2);
-    Point p4 = g.getExteriorRing().getPointN(3);
+    Point p2 = gf.createPoint(new Coordinate(boundingBox.getMaxLon(), boundingBox.getMinLat()));
+    Point p3 = gf.createPoint(new Coordinate(boundingBox.getMaxLon(), boundingBox.getMaxLat()));
+    Point p4 = gf.createPoint(new Coordinate(boundingBox.getMinLon(), boundingBox.getMaxLat()));
     if (crossingNumber(p1, true) != crossingNumber(p2, true) ||
         crossingNumber(p3, true) != crossingNumber(p4, true) ||
         crossingNumber(p2, false) != crossingNumber(p3, false) ||

oshdb-util/src/main/java/org/heigit/bigspatialdata/oshdb/util/geometry/fip/FastBboxOutsidePolygon.java

@@ -1,7 +1,9 @@
 package org.heigit.bigspatialdata.oshdb.util.geometry.fip;
 
+import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.MultiPolygon;
 import com.vividsolutions.jts.geom.Point;
 import com.vividsolutions.jts.geom.Polygon;
@@ -13,7 +15,6 @@
 import java.util.List;
 import java.util.function.Predicate;
 import org.heigit.bigspatialdata.oshdb.util.OSHDBBoundingBox;
-import org.heigit.bigspatialdata.oshdb.util.geometry.OSHDBGeometryBuilder;
 
 /**
  * Fast bounding-box in (multi)polygon test inspired by
@@ -44,14 +45,14 @@ public <P extends Geometry & Polygonal> FastBboxOutsidePolygon(P geom) {
    */
   @Override
   public boolean test(OSHDBBoundingBox boundingBox) {
-    Polygon g = OSHDBGeometryBuilder.getGeometry(boundingBox);
-    Point p1 = g.getExteriorRing().getPointN(0);
+    GeometryFactory gf = new GeometryFactory();
+    Point p1 = gf.createPoint(new Coordinate(boundingBox.getMinLon(), boundingBox.getMinLat()));
     if (crossingNumber(p1, true) % 2 == 1) {
       return false;
     }
-    Point p2 = g.getExteriorRing().getPointN(1);
-    Point p3 = g.getExteriorRing().getPointN(2);
-    Point p4 = g.getExteriorRing().getPointN(3);
+    Point p2 = gf.createPoint(new Coordinate(boundingBox.getMaxLon(), boundingBox.getMinLat()));
+    Point p3 = gf.createPoint(new Coordinate(boundingBox.getMaxLon(), boundingBox.getMaxLat()));
+    Point p4 = gf.createPoint(new Coordinate(boundingBox.getMinLon(), boundingBox.getMaxLat()));
     if (crossingNumber(p1, true) != crossingNumber(p2, true) ||
         crossingNumber(p3, true) != crossingNumber(p4, true) ||
         crossingNumber(p2, false) != crossingNumber(p3, false) ||

oshdb-util/src/main/java/org/heigit/bigspatialdata/oshdb/util/geometry/fip/FastPolygonOperations.java

@@ -2,13 +2,10 @@
 
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.MultiPolygon;
+import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.Polygonal;
 import java.io.Serializable;
 import java.util.ArrayList;
-import org.geotools.geometry.jts.JTS;
-import org.heigit.bigspatialdata.oshdb.util.geometry.Geo;
 
 public class FastPolygonOperations implements Serializable {
   private final int AvgVerticesPerBlock = 40; // todo: finetune this value
@@ -30,6 +27,8 @@ public <P extends Geometry & Polygonal> FastPolygonOperations(P geom) {
     envWidth = env.getMaxX() - env.getMinX();
     envHeight = env.getMaxY() - env.getMinY();
 
+    GeometryFactory gf = new GeometryFactory();
+
     for (int x = 0; x < numBands; x++) {
       for (int y = 0; y < numBands; y++) {
         Envelope envPart = new Envelope(
@@ -39,7 +38,7 @@ public <P extends Geometry & Polygonal> FastPolygonOperations(P geom) {
             env.getMinY() + envHeight * (y+1)/numBands
         );
         blocks.add(// index: y + x*numBands,
-            geom.intersection(JTS.toGeometry(envPart))
+            geom.intersection(gf.toGeometry(envPart))
         );
       }
     }

oshdb/pom.xml

@@ -25,12 +25,6 @@
       <artifactId>RoaringBitmap</artifactId>
       <version>${roaringbitmap.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.geotools</groupId>
-      <artifactId>gt-main</artifactId>
-      <version>${geotools.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>