JTS (LocationTech), fix mapsforge#1027

mgalkin · Jan 16, 2018 · cd651ff · cd651ff
1 parent d651263
commit cd651ff
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 70 deletions.
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -3,6 +3,7 @@
 ## New since 0.9.1
 
 - Render theme fallback internal resources [#1026](https://github.com/mapsforge/mapsforge/issues/1026)
+- JTS (LocationTech) [#1027](https://github.com/mapsforge/mapsforge/issues/1027)
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/mapsforge/issues?q=is%3Aclosed+milestone%3A0.10.0)
 

diff --git a/mapsforge-map-writer/build.gradle b/mapsforge-map-writer/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
     implementation project(":mapsforge-core")
     implementation 'com.google.guava:guava:23.0'
-    implementation 'com.vividsolutions:jts-core:1.14.0'
     implementation 'net.sf.trove4j:trove4j:3.0.3'
+    implementation 'org.locationtech.jts:jts-core:1.15.0'
     compileOnly 'org.openstreetmap.osmosis:osmosis-core:0.46'
 }
 

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/BaseTileBasedDataProcessor.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/BaseTileBasedDataProcessor.java
@@ -17,9 +17,8 @@
  */
 package org.mapsforge.map.writer;
 
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.TopologyException;
-
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.TopologyException;
 import org.mapsforge.core.model.BoundingBox;
 import org.mapsforge.core.util.LatLongUtils;
 import org.mapsforge.core.util.MercatorProjection;

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/MapFileWriter.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/MapFileWriter.java
@@ -24,13 +24,13 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.CacheStats;
 import com.google.common.cache.LoadingCache;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
 
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 import org.mapsforge.core.model.LatLong;
 import org.mapsforge.core.util.LatLongUtils;
 import org.mapsforge.core.util.MercatorProjection;

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/WayPolygonizer.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/WayPolygonizer.java
@@ -14,10 +14,9 @@
  */
 package org.mapsforge.map.writer;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Polygon;
-
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
 import org.mapsforge.map.writer.model.TDNode;
 import org.mapsforge.map.writer.model.TDWay;
 import org.mapsforge.map.writer.util.JTSUtils;

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/GeoUtils.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/GeoUtils.java
@@ -16,20 +16,19 @@
  */
 package org.mapsforge.map.writer.util;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.TopologyException;
-import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
-
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.simplify.TopologyPreservingSimplifier;
 import org.mapsforge.core.model.BoundingBox;
 import org.mapsforge.core.model.LatLong;
 import org.mapsforge.core.util.LatLongUtils;

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/JTSUtils.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/JTSUtils.java
@@ -14,15 +14,14 @@
  */
 package org.mapsforge.map.writer.util;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Polygon;
-
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
 import org.mapsforge.core.util.LatLongUtils;
 import org.mapsforge.map.writer.model.TDNode;
 import org.mapsforge.map.writer.model.TDWay;

diff --git a/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/PolyLabel.java b/mapsforge-map-writer/src/main/java/org/mapsforge/map/writer/util/PolyLabel.java
@@ -19,14 +19,14 @@
  */
 package org.mapsforge.map.writer.util;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateFilter;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-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.CoordinateFilter;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 
 import java.util.Comparator;
 import java.util.PriorityQueue;

diff --git a/mapsforge-map-writer/src/test/java/org/mapsforge/map/writer/util/JTSUtilsTest.java b/mapsforge-map-writer/src/test/java/org/mapsforge/map/writer/util/JTSUtilsTest.java
@@ -14,13 +14,12 @@
  */
 package org.mapsforge.map.writer.util;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.util.Assert;
-
 import org.junit.Test;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
 import org.mapsforge.map.writer.model.TDWay;
 
 import java.util.List;

diff --git a/mapsforge-map-writer/src/test/java/org/mapsforge/map/writer/util/MockingUtils.java b/mapsforge-map-writer/src/test/java/org/mapsforge/map/writer/util/MockingUtils.java
@@ -14,15 +14,14 @@
  */
 package org.mapsforge.map.writer.util;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
-
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 import org.mapsforge.core.util.LatLongUtils;
 import org.mapsforge.map.writer.model.TDNode;
 import org.mapsforge.map.writer.model.TDWay;

diff --git a/mapsforge-poi-writer/build.gradle b/mapsforge-poi-writer/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     implementation project(":mapsforge-poi")
     implementation 'com.google.guava:guava:23.0'
-    implementation 'com.vividsolutions:jts-core:1.14.0'
+    implementation 'org.locationtech.jts:jts-core:1.15.0'
     implementation 'org.xerial:sqlite-jdbc:3.20.0'
     compileOnly 'org.openstreetmap.osmosis:osmosis-core:0.46'
 }

diff --git a/mapsforge-poi-writer/src/main/java/org/mapsforge/poi/writer/GeoTagger.java b/mapsforge-poi-writer/src/main/java/org/mapsforge/poi/writer/GeoTagger.java
@@ -15,11 +15,11 @@
 package org.mapsforge.poi.writer;
 
 import com.google.common.collect.Lists;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
 
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 import org.mapsforge.core.model.BoundingBox;
 import org.mapsforge.core.model.LatLong;
 import org.mapsforge.poi.storage.DbConstants;

diff --git a/mapsforge-poi-writer/src/main/java/org/mapsforge/poi/writer/PoiWriter.java b/mapsforge-poi-writer/src/main/java/org/mapsforge/poi/writer/PoiWriter.java
@@ -15,11 +15,10 @@
  */
 package org.mapsforge.poi.writer;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 import org.mapsforge.core.model.BoundingBox;
 import org.mapsforge.core.model.LatLong;
 import org.mapsforge.poi.storage.DbConstants;