Update JTS to 18.1 (#205)

Introduces an incompatibility with earlier JTS versions.

Author: GisMarsch

CHANGES.md

@@ -1,6 +1,8 @@
 ## VERSION X.X
 
-(TBD)
+* \#206: Upgraded to JTS 1.18.1.  This JTS release had an incompatible [API change](https://github.com/locationtech/jts/blob/master/doc/JTS_Version_History.md#api-changes) and it requires Java 1.8.
+  Only Spatial4j's `JtsBinaryCodec` was impacted, and thus only use of this will require a JTS upgrade.
+(Christian Marsch)
 
 ## VERSION 0.8
 

pom.xml

@@ -120,7 +120,7 @@
     <dependency>
       <groupId>org.locationtech.jts</groupId>
       <artifactId>jts-core</artifactId>
-      <version>1.17.0</version>
+      <version>1.18.1</version>
       <optional>true</optional>
     </dependency>
 

src/main/java/org/locationtech/spatial4j/io/jts/JtsBinaryCodec.java

@@ -85,15 +85,17 @@ public Shape readJtsGeom(final DataInput dataInput) throws IOException {
       InStream inStream = new InStream() {//a strange JTS abstraction
         boolean first = true;
         @Override
-        public void read(byte[] buf) throws IOException {
+        public int read(byte[] buf) throws IOException {
           if (first) {//we don't write JTS's leading BOM so synthesize reading it
             if (buf.length != 1)
               throw new IllegalStateException("Expected initial read of one byte, not: " + buf.length);
             buf[0] = WKBConstants.wkbXDR;//0
             first = false;
+            return 1;
           } else {
             //TODO for performance, specialize for common array lengths: 1, 4, 8
             dataInput.readFully(buf);
+            return buf.length;
           }
         }
       };

src/test/java/org/locationtech/spatial4j/io/JtsBinaryCodecTest.java

@@ -8,19 +8,16 @@
 
 package org.locationtech.spatial4j.io;
 
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-import org.locationtech.spatial4j.context.SpatialContext;
-import org.locationtech.spatial4j.context.jts.JtsSpatialContext;
-import org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory;
-import org.locationtech.spatial4j.shape.Shape;
+import org.junit.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.PrecisionModel;
 import org.locationtech.jts.util.GeometricShapeFactory;
-
-import org.junit.Test;
-
-import java.util.Arrays;
+import org.locationtech.spatial4j.context.SpatialContext;
+import org.locationtech.spatial4j.context.jts.JtsSpatialContext;
+import org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory;
+import org.locationtech.spatial4j.shape.Shape;
+import org.locationtech.spatial4j.shape.jts.JtsGeometry;
 
 public class JtsBinaryCodecTest extends BinaryCodecTest {
 
@@ -32,9 +29,10 @@ public SpatialContext initContext() {
   }
 
   @Test
-  public void testPoly() {
+  public void testPoly() throws Exception {
     JtsSpatialContext ctx = (JtsSpatialContext)super.ctx;
-    ctx.makeShape(randomGeometry(randomIntBetween(3, 20)), false, false);
+    final JtsGeometry shape = ctx.makeShape(randomGeometry(randomIntBetween(3, 20)), false, false);
+    assertRoundTrip(shape);
   }
 
   @Override