[Git][java-team/spatial4j][master] 6 commits: Add support for JTS 1.15 (Closes: #902790)

Emmanuel Bourg gitlab at salsa.debian.org
Mon Jul 30 22:25:10 BST 2018 

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / spatial4j


Commits:
46cacc7c by Bas Couwenberg at 2018-07-30T21:21:21Z
Add support for JTS 1.15 (Closes: #902790)

- - - - -
a1200713 by Emmanuel Bourg at 2018-07-30T21:21:29Z
Standards-Version updated to 4.1.5

- - - - -
c001609b by Emmanuel Bourg at 2018-07-30T21:21:29Z
Switch to debhelper level 11

- - - - -
50562fc7 by Emmanuel Bourg at 2018-07-30T21:21:29Z
Use salsa.debian.org Vcs-* URLs

- - - - -
c1d1339f by Emmanuel Bourg at 2018-07-30T21:21:29Z
Wrap and sort

- - - - -
5e77932d by Emmanuel Bourg at 2018-07-30T21:21:50Z
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/maven.rules
- + debian/patches/jts-1.15.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-spatial4j (0.5-2) UNRELEASED; urgency=medium
+spatial4j (0.5-2) unstable; urgency=medium
 
   * Team upload.
+
+  [ Emmanuel Bourg ]
   * Removed the unused build dependency on libmaven-install-plugin-java
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+  [ Bas Couwenberg ]
+  * Add support for JTS 1.15 (Closes: #902790)
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 Sep 2017 19:04:06 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 30 Jul 2018 23:21:44 +0200
 
 spatial4j (0.5-1) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,23 +3,24 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 9),
-               default-jdk,
-               junit4,
-               libcarrotsearch-randomizedtesting-java,
-               libjts-java (>= 1.13),
-               libmaven-bundle-plugin-java,
-               libnoggit-java,
-               libslf4j-java,
-               maven-debian-helper (>= 1.6.5)
-Standards-Version: 3.9.7
-Vcs-Git: git://anonscm.debian.org/pkg-java/spatial4j.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/spatial4j.git
+Build-Depends:
+ debhelper (>= 11~),
+ default-jdk,
+ junit4,
+ libcarrotsearch-randomizedtesting-java,
+ libjts-java (>= 1.15),
+ libmaven-bundle-plugin-java,
+ libnoggit-java,
+ libslf4j-java,
+ maven-debian-helper (>= 1.6.5)
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/spatial4j.git
+Vcs-Browser: https://salsa.debian.org/java-team/spatial4j
 Homepage: https://github.com/locationtech/spatial4j
 
 Package: libspatial4j-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Suggests: ${maven:OptionalDepends}
 Description: spatial/geospatial Java library
  Spatial4j is a general purpose spatial / geospatial Java library.


=====================================
debian/maven.rules
=====================================
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,3 @@
 
 junit junit * s/.*/4.x/ * *
+s/com.vividsolutions/org.locationtech.jts/ s/jts/jts-core/ * s/.*/debian/ * *


=====================================
debian/patches/jts-1.15.patch
=====================================
--- /dev/null
+++ b/debian/patches/jts-1.15.patch
@@ -0,0 +1,464 @@
+Description: Update for JTS 1.15.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -103,10 +103,10 @@
+ 
+     <!-- JTS is essentially only used for polygons. -->
+     <dependency>
+-      <groupId>com.vividsolutions</groupId>
+-      <artifactId>jts</artifactId>
++      <groupId>org.locationtech.jts</groupId>
++      <artifactId>jts-core</artifactId>
+       <!-- last I checked, it still works with 1.12 -->
+-      <version>1.13</version>
++      <version>1.15</version>
+       <optional>true</optional>
+       <exclusions>
+         <exclusion>
+--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
++++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
+@@ -18,9 +18,9 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.algorithm.CGAlgorithms;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++import org.locationtech.jts.algorithm.CGAlgorithms;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.util.GeometricShapeFactory;
+ 
+ import java.util.ArrayList;
+ import java.util.Collection;
+@@ -220,7 +220,7 @@ public class JtsSpatialContext extends S
+    * recursively converted and then the resulting list will be passed to
+    * {@link SpatialContext#makeCollection(List)} and returned.
+    *
+-   * If given a {@link com.vividsolutions.jts.geom.Point} then {@link SpatialContext#makePoint(double, double)}
++   * If given a {@link org.locationtech.jts.geom.Point} then {@link SpatialContext#makePoint(double, double)}
+    * is called, which will return a {@link JtsPoint} if {@link JtsSpatialContext#useJtsPoint()}; otherwise
+    * a standard Spatial4j Point is returned.
+    *
+@@ -238,8 +238,8 @@ public class JtsSpatialContext extends S
+       }
+       return makeCollection(shapes);
+     }
+-    if (geom instanceof com.vividsolutions.jts.geom.Point) {
+-      com.vividsolutions.jts.geom.Point pt = (com.vividsolutions.jts.geom.Point) geom;
++    if (geom instanceof org.locationtech.jts.geom.Point) {
++      org.locationtech.jts.geom.Point pt = (org.locationtech.jts.geom.Point) geom;
+       return makePoint(pt.getX(), pt.getY());
+     }
+     if (!useJtsLineString() && geom instanceof LineString) {
+@@ -277,7 +277,7 @@ public class JtsSpatialContext extends S
+ 
+   /**
+    * INTERNAL
+-   * @see #makeShape(com.vividsolutions.jts.geom.Geometry)
++   * @see #makeShape(org.locationtech.jts.geom.Geometry)
+    *
+    * @param geom Non-null
+    * @param dateline180Check if both this is true and {@link #isGeo()}, then JtsGeometry will check
+--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
++++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
+@@ -12,10 +12,10 @@ import com.spatial4j.core.context.Spatia
+ import com.spatial4j.core.io.LegacyShapeReader;
+ import com.spatial4j.core.io.LegacyShapeWriter;
+ import com.spatial4j.core.io.jts.*;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory;
++import org.locationtech.jts.geom.CoordinateSequenceFactory;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+ 
+ import java.util.Map;
+ 
+@@ -37,9 +37,9 @@ import java.util.Map;
+  * <DD>true|false(default) -- see {@link JtsSpatialContext#isAllowMultiOverlap()}</DD>
+  * <DT>precisionModel</DT>
+  * <DD>floating(default) | floating_single | fixed
+- *  -- see {@link com.vividsolutions.jts.geom.PrecisionModel}.
++ *  -- see {@link org.locationtech.jts.geom.PrecisionModel}.
+  * If {@code fixed} then you must also provide {@code precisionScale}
+- *  -- see {@link com.vividsolutions.jts.geom.PrecisionModel#getScale()}</DD>
++ *  -- see {@link org.locationtech.jts.geom.PrecisionModel#getScale()}</DD>
+  * </DL>
+  */
+ public class JtsSpatialContextFactory extends SpatialContextFactory {
+--- a/src/main/java/com/spatial4j/core/context/jts/ValidationRule.java
++++ b/src/main/java/com/spatial4j/core/context/jts/ValidationRule.java
+@@ -21,7 +21,7 @@ public enum ValidationRule {
+    * not ultimately get an error at some point; results are undefined. However, note that
+    * coordinates will still be validated for falling within the world boundaries.
+    *
+-   * @see com.vividsolutions.jts.geom.Geometry#isValid().
++   * @see org.locationtech.jts.geom.Geometry#isValid().
+    */
+   none,
+ 
+@@ -34,7 +34,7 @@ public enum ValidationRule {
+   /**
+    * Invalid Geometries are repaired by taking the convex hull. The result will very likely be a
+    * larger shape that matches false-positives, but no false-negatives. See
+-   * {@link com.vividsolutions.jts.geom.Geometry#convexHull()}.
++   * {@link org.locationtech.jts.geom.Geometry#convexHull()}.
+    */
+   repairConvexHull,
+ 
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+@@ -13,14 +13,14 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.io.BinaryCodec;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.io.InStream;
+-import com.vividsolutions.jts.io.OutStream;
+-import com.vividsolutions.jts.io.ParseException;
+-import com.vividsolutions.jts.io.WKBConstants;
+-import com.vividsolutions.jts.io.WKBReader;
+-import com.vividsolutions.jts.io.WKBWriter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.io.InStream;
++import org.locationtech.jts.io.OutStream;
++import org.locationtech.jts.io.ParseException;
++import org.locationtech.jts.io.WKBConstants;
++import org.locationtech.jts.io.WKBReader;
++import org.locationtech.jts.io.WKBWriter;
+ 
+ import java.io.DataInput;
+ import java.io.DataOutput;
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsGeoJSONReader.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsGeoJSONReader.java
+@@ -12,9 +12,9 @@ import com.spatial4j.core.context.Spatia
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.io.GeoJSONReader;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.geom.Point;
+-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.geom.Point;
++import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+ import org.noggit.JSONParser;
+ 
+ import java.io.IOException;
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsGeoJSONWriter.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsGeoJSONWriter.java
+@@ -17,16 +17,16 @@ import com.spatial4j.core.io.GeoJSONWrit
+ import com.spatial4j.core.io.LegacyShapeWriter;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryCollection;
+-import com.vividsolutions.jts.geom.LineString;
+-import com.vividsolutions.jts.geom.MultiLineString;
+-import com.vividsolutions.jts.geom.MultiPoint;
+-import com.vividsolutions.jts.geom.MultiPolygon;
+-import com.vividsolutions.jts.geom.Point;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryCollection;
++import org.locationtech.jts.geom.LineString;
++import org.locationtech.jts.geom.MultiLineString;
++import org.locationtech.jts.geom.MultiPoint;
++import org.locationtech.jts.geom.MultiPolygon;
++import org.locationtech.jts.geom.Point;
++import org.locationtech.jts.geom.Polygon;
+ 
+ public class JtsGeoJSONWriter extends GeoJSONWriter {
+ 
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsPolyshapeReader.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsPolyshapeReader.java
+@@ -24,8 +24,8 @@ import com.spatial4j.core.io.PolyshapeWr
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+ 
+ import java.io.IOException;
+ import java.util.ArrayList;
+@@ -102,4 +102,4 @@ public class JtsPolyshapeReader extends
+     }
+     return ctx.makeShapeFromGeometry(gf.createPolygon(shell, holes));
+   }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsPolyshapeWriter.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsPolyshapeWriter.java
+@@ -24,14 +24,14 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.io.PolyshapeWriter;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryCollection;
+-import com.vividsolutions.jts.geom.LineString;
+-import com.vividsolutions.jts.geom.MultiPoint;
+-import com.vividsolutions.jts.geom.Point;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryCollection;
++import org.locationtech.jts.geom.LineString;
++import org.locationtech.jts.geom.MultiPoint;
++import org.locationtech.jts.geom.Point;
++import org.locationtech.jts.geom.Polygon;
+ 
+ public class JtsPolyshapeWriter extends PolyshapeWriter {
+ 
+@@ -115,4 +115,4 @@ public class JtsPolyshapeWriter extends
+     }
+     super.write(enc, shape);
+   }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReader.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReader.java
+@@ -17,7 +17,7 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.io.WKTReader;
+ import com.spatial4j.core.shape.Point;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.*;
++import org.locationtech.jts.geom.*;
+ 
+ import java.text.ParseException;
+ import java.util.ArrayList;
+@@ -171,7 +171,7 @@ public class JtsWKTReader extends WKTRea
+   }
+ 
+   /**
+-   * Reads a {@link com.vividsolutions.jts.geom.Coordinate} from the current position. It's akin to
++   * Reads a {@link org.locationtech.jts.geom.Coordinate} from the current position. It's akin to
+    * {@link #point(com.spatial4j.core.io.WKTReader.State)} but for a JTS Coordinate. Only the first
+    * 2 numbers are parsed; any remaining are ignored.
+    */
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
+@@ -14,19 +14,19 @@ import com.spatial4j.core.distance.Dista
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.io.WKTReader;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.io.WKTReader;
+ 
+ import java.text.ParseException;
+ 
+ /**
+  * This is an extension of {@link JtsWKTReader} that processes the entire
+- * string with JTS's {@link com.vividsolutions.jts.io.WKTReader}.  Some differences:
++ * string with JTS's {@link org.locationtech.jts.io.WKTReader}.  Some differences:
+  * <ul>
+  *   <li>No support for ENVELOPE and BUFFER</li>
+- *   <li>MULTI* shapes use JTS's {@link com.vividsolutions.jts.geom.GeometryCollection} subclasses,
++ *   <li>MULTI* shapes use JTS's {@link org.locationtech.jts.geom.GeometryCollection} subclasses,
+  *   not {@link com.spatial4j.core.shape.ShapeCollection}</li>
+  *   <li>'Z' coordinates are saved into the geometry</li>
+  * </ul>
+@@ -46,7 +46,7 @@ public class JtsWKTReaderShapeParser ext
+   }
+ 
+   /**
+-   * Reads WKT from the {@code str} via JTS's {@link com.vividsolutions.jts.io.WKTReader}.
++   * Reads WKT from the {@code str} via JTS's {@link org.locationtech.jts.io.WKTReader}.
+    * @param str
+    * @param reader <pre>new WKTReader(ctx.getGeometryFactory()))</pre>
+    * @return Non-Null
+@@ -58,8 +58,8 @@ public class JtsWKTReaderShapeParser ext
+       //Normalizes & verifies coordinates
+       checkCoordinates(geom);
+ 
+-      if (geom instanceof com.vividsolutions.jts.geom.Point) {
+-        com.vividsolutions.jts.geom.Point ptGeom = (com.vividsolutions.jts.geom.Point) geom;
++      if (geom instanceof org.locationtech.jts.geom.Point) {
++        org.locationtech.jts.geom.Point ptGeom = (org.locationtech.jts.geom.Point) geom;
+         if (ctx.useJtsPoint())
+           return new JtsPoint(ptGeom, ctx);
+         else
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
+@@ -17,11 +17,11 @@ import com.spatial4j.core.shape.impl.BBo
+ import com.spatial4j.core.shape.impl.BufferedLineString;
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.impl.RectangleImpl;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometry;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
+-import com.vividsolutions.jts.operation.union.UnaryUnionOp;
+-import com.vividsolutions.jts.operation.valid.IsValidOp;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.geom.prep.PreparedGeometry;
++import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
++import org.locationtech.jts.operation.union.UnaryUnionOp;
++import org.locationtech.jts.operation.valid.IsValidOp;
+ 
+ import java.util.ArrayList;
+ import java.util.Collection;
+@@ -129,7 +129,7 @@ public class JtsGeometry extends BaseSha
+ 
+   /**
+    * Adds an index to this class internally to compute spatial relations faster. In JTS this
+-   * is called a {@link com.vividsolutions.jts.geom.prep.PreparedGeometry}.  This
++   * is called a {@link org.locationtech.jts.geom.prep.PreparedGeometry}.  This
+    * isn't done by default because it takes some time to do the optimization, and it uses more
+    * memory.  Calling this method isn't thread-safe so be careful when this is done. If it was
+    * already indexed then nothing happens.
+@@ -271,7 +271,7 @@ public class JtsGeometry extends BaseSha
+ 
+   protected SpatialRelation relate(Geometry oGeom) {
+     //see http://docs.geotools.org/latest/userguide/library/jts/dim9.html#preparedgeometry
+-    if (oGeom instanceof com.vividsolutions.jts.geom.Point) {
++    if (oGeom instanceof org.locationtech.jts.geom.Point) {
+       if (preparedGeometry != null)
+         return preparedGeometry.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
+       return geom.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
+@@ -326,7 +326,7 @@ public class JtsGeometry extends BaseSha
+    * If <code>geom</code> spans the dateline, then this modifies it to be a
+    * valid JTS geometry that extends to the right of the standard -180 to +180
+    * width such that some points are greater than +180 but some remain less.
+-   * Takes care to invoke {@link com.vividsolutions.jts.geom.Geometry#geometryChanged()}
++   * Takes care to invoke {@link org.locationtech.jts.geom.Geometry#geometryChanged()}
+    * if needed.
+    *
+    * @return The number of times the geometry spans the dateline.  >= 0
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
+@@ -18,22 +18,22 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.impl.PointImpl;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequence;
+ 
+-/** Wraps a {@link com.vividsolutions.jts.geom.Point}. */
++/** Wraps a {@link org.locationtech.jts.geom.Point}. */
+ public class JtsPoint extends BaseShape<JtsSpatialContext> implements Point {
+ 
+-  private com.vividsolutions.jts.geom.Point pointGeom;
++  private org.locationtech.jts.geom.Point pointGeom;
+   private final boolean empty;//cached
+ 
+   /** A simple constructor without normalization / validation. */
+-  public JtsPoint(com.vividsolutions.jts.geom.Point pointGeom, JtsSpatialContext ctx) {
++  public JtsPoint(org.locationtech.jts.geom.Point pointGeom, JtsSpatialContext ctx) {
+     super(ctx);
+     this.pointGeom = pointGeom;
+     this.empty = pointGeom.isEmpty();
+   }
+ 
+-  public com.vividsolutions.jts.geom.Point getGeom() {
++  public org.locationtech.jts.geom.Point getGeom() {
+     return pointGeom;
+   }
+ 
+--- a/src/test/java/com/spatial4j/core/context/jts/JtsSpatialContextTest.java
++++ b/src/test/java/com/spatial4j/core/context/jts/JtsSpatialContextTest.java
+@@ -9,8 +9,8 @@
+ package com.spatial4j.core.context.jts;
+ 
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.GeometryCollection;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.GeometryCollection;
++import org.locationtech.jts.geom.Polygon;
+ import io.jeo.geom.Geom;
+ import org.junit.Test;
+ 
+--- a/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
+@@ -13,10 +13,10 @@ import com.spatial4j.core.context.Spatia
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++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;
+ 
+--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+@@ -17,8 +17,8 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.GeometryFactory;
+ import org.junit.Test;
+ 
+ import java.text.ParseException;
+--- a/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
++++ b/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
+@@ -14,9 +14,9 @@ package com.spatial4j.core.io;
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -76,7 +76,7 @@ public class PolygonBuilder {
+   }
+ 
+   /**
+-   * Creates the raw {@link com.vividsolutions.jts.geom.Polygon}
++   * Creates the raw {@link org.locationtech.jts.geom.Polygon}
+    *
+    * @return Built polygon
+    */
+@@ -87,7 +87,7 @@ public class PolygonBuilder {
+   }
+ 
+   /**
+-   * Builder for defining a hole in a {@link com.vividsolutions.jts.geom.Polygon}
++   * Builder for defining a hole in a {@link org.locationtech.jts.geom.Polygon}
+    */
+   public class PolygonHoleBuilder {
+ 
+--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
++++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+@@ -14,7 +14,7 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.*;
++import org.locationtech.jts.geom.*;
+ import io.jeo.geom.Geom;
+ import org.junit.Test;
+ 


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+jts-1.15.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@



View it on GitLab: https://salsa.debian.org/java-team/spatial4j/compare/c2f011a7eac111d9497b7f0d979051687044ae9b...5e77932d6a696885cbfa08e300e77d7068cb158f

-- 
View it on GitLab: https://salsa.debian.org/java-team/spatial4j/compare/c2f011a7eac111d9497b7f0d979051687044ae9b...5e77932d6a696885cbfa08e300e77d7068cb158f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180730/02288c26/attachment.html>

More information about the pkg-java-commits mailing list