From 9709713d8dacf92eaf677f7e5d809482ef5aa4d4 Mon Sep 17 00:00:00 2001
From: Robin Beer <RBeer@ibigroup.com>
Date: Mon, 20 Feb 2023 11:20:19 +0000
Subject: [PATCH] refactor(Updated geo tools): Changed class imports to
 reference new package names

---
 pom.xml                                                |  2 +-
 .../com/conveyal/datatools/editor/utils/GeoUtils.java  | 10 +++++-----
 .../datatools/editor/utils/PolylineEncoder.java        | 10 ++++++----
 .../conveyal/datatools/manager/jobs/GisExportJob.java  |  8 ++++----
 .../datatools/manager/jobs/GisExportJobTest.java       |  6 +++---
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ab411b8d..0b5bb2b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Using the latest version of geotools (e.g, 20) seems to cause issues with the shapefile
         plugin where the_geom for each feature is null. -->
-        <geotools.version>17.5</geotools.version>
+        <geotools.version>20.1</geotools.version>
         <awsjavasdk.version>1.11.625</awsjavasdk.version>
     </properties>
     <build>
diff --git a/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java b/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
index 658564275..a7b3e0e48 100644
--- a/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
+++ b/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
@@ -1,11 +1,11 @@
 package com.conveyal.datatools.editor.utils;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
 import org.geotools.referencing.GeodeticCalculator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
 
 import java.awt.geom.Point2D;
 
diff --git a/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java b/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
index 9072fd382..ed1f135a2 100755
--- a/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
+++ b/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
@@ -13,10 +13,12 @@ the License, or (at your option) any later version.
 
 package com.conveyal.datatools.editor.utils;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
index 2fb589368..849c173bb 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
@@ -12,10 +12,6 @@
 import com.conveyal.gtfs.model.Agency;
 import com.conveyal.gtfs.model.Route;
 import com.conveyal.gtfs.model.Stop;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.io.FileUtils;
 import org.geotools.data.DataUtilities;
@@ -28,6 +24,10 @@
 import org.geotools.feature.DefaultFeatureCollection;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.slf4j.Logger;
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
index 9b41e2d65..e42976802 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
@@ -11,9 +11,9 @@
 import com.conveyal.datatools.manager.utils.SqlAssert;
 import com.google.common.base.Strings;
 import com.google.common.io.Files;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Point;
 import org.apache.commons.io.FileUtils;
 import org.geotools.data.DataStore;
 import org.geotools.data.DataStoreFinder;