fix(deps): update Geotools to 32.1

BREAKING CHANGE: Geotools update includes breaking changes that affect this library's API.
wetransform-os · Dec 4, 2024 · 4c0f0bc · 4c0f0bc
1 parent bd2cd8d
commit 4c0f0bc
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ build
 .project
 .classpath
 .settings/
+
+/web/
diff --git a/build.gradle b/build.gradle
@@ -19,18 +19,22 @@ repositories {
     mavenCentral()
 }
 
+ext {
+    geotoolsVersion = '32.1'
+}
+
 dependencies {
     implementation 'org.lz4:lz4-java:1.8.0' // Apache 2.0
     implementation 'com.github.albfernandez:javadbf:1.14.1' // LGPL 3.0
     implementation 'com.google.code.gson:gson:2.11.0' // Apache 2.0
     implementation 'org.apache.commons:commons-lang3:3.17.0' // Apache 2.0
 
     // GeoTools (LGPL 2.1)
-    implementation 'org.geotools:gt-main:29.6'
-    implementation 'org.geotools:gt-epsg-hsql:29.6'
-    implementation 'org.geotools:gt-opengis:29.6'
-//    implementation 'org.geotools:gt-geometry:24.2'
-    implementation 'org.geotools:gt-referencing:29.6'
+    implementation "org.geotools:gt-main:${geotoolsVersion}"
+    implementation "org.geotools:gt-epsg-hsql:${geotoolsVersion}"
+    implementation "org.geotools:gt-api:${geotoolsVersion}"
+//    implementation "org.geotools:gt-geometry:${geotoolsVersion}"
+    implementation "org.geotools:gt-referencing:${geotoolsVersion}"
 
 	implementation 'javax.xml.bind:jaxb-api:2.3.1'
     implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'

diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1 @@
+example.csv
diff --git a/data/example.csv b/data/example.csv
diff --git a/src/json/converter/shp/ShpFileReader.java b/src/json/converter/shp/ShpFileReader.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.util.regex.Pattern;
 
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 
 import json.converter.csv.CSVReader;
 import json.converter.csv.merger.Merger;

diff --git a/src/json/geojson/objects/Point.java b/src/json/geojson/objects/Point.java
@@ -5,7 +5,7 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 
 import json.graphic.Colorifier;
 import json.graphic.Display;

diff --git a/src/json/geojson/objects/Polygon.java b/src/json/geojson/objects/Polygon.java
@@ -8,7 +8,7 @@
 import java.util.Vector;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 
 import json.algorithm.DouglasPeucker;
 import json.graphic.Colorifier;

diff --git a/src/json/tools/Toolbox.java b/src/json/tools/Toolbox.java
@@ -13,8 +13,8 @@
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
 
 public class Toolbox {
 

diff --git a/src/json/topojson/api/TopojsonApi.java b/src/json/topojson/api/TopojsonApi.java
@@ -13,7 +13,7 @@
 import net.jpountz.lz4.LZ4Compressor;
 import net.jpountz.lz4.LZ4Factory;
 
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 
 import json.converter.csv.merger.Merger;
 import json.converter.shp.ShpFileReader;

diff --git a/unittest/TilesExplosion.java b/unittest/TilesExplosion.java
@@ -7,7 +7,7 @@
 import json.topojson.api.TopojsonApi;
 import json.topojson.topology.Topology;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
+import org.geotools.api.referencing.FactoryException;
 
 
 public class TilesExplosion {

diff --git a/unittest/TilesTesting.java b/unittest/TilesTesting.java
@@ -15,7 +15,7 @@
 import json.topojson.api.TopojsonApi;
 import json.topojson.topology.Topology;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
+import org.geotools.api.referencing.FactoryException;
 
 
 public class TilesTesting implements DisplayListener {

diff --git a/unittest/testAssociation.java b/unittest/testAssociation.java
@@ -14,7 +14,7 @@
 import json.topojson.api.TopojsonApi;
 import json.topojson.topology.Topology;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
+import org.geotools.api.referencing.FactoryException;
 
 
 public class testAssociation {

diff --git a/unittest/testFillPolygon.java b/unittest/testFillPolygon.java
@@ -11,7 +11,7 @@
 import json.topojson.api.TopojsonApi;
 import json.topojson.topology.Topology;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
+import org.geotools.api.referencing.FactoryException;
 
 
 public class testFillPolygon {

diff --git a/unittest/testTopojson.java b/unittest/testTopojson.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 
 import com.google.gson.Gson;
-import org.opengis.referencing.FactoryException;
+import org.geotools.api.referencing.FactoryException;
 
 
 @Ignore("Not working because reference systems cannot be resolved")