From 015f418405315b5f39020162738244efc8ce2567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 06:59:28 -0400 Subject: [PATCH] Bump geotools.version from 29.2 to 30.0 (#685) * Bump geotools.version from 29.2 to 30.0 Bumps `geotools.version` from 29.2 to 30.0. Updates `org.geotools:gt-shapefile` from 29.2 to 30.0 Updates `org.geotools:gt-epsg-hsql` from 29.2 to 30.0 --- updated-dependencies: - dependency-name: org.geotools:gt-shapefile dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.geotools:gt-epsg-hsql dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fix geotools breaking changes * fix tests --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Barry --- planetiler-core/pom.xml | 2 +- .../planetiler/reader/GeoPackageReader.java | 4 ++-- .../planetiler/reader/ShapefileReader.java | 22 +++++++++---------- .../reader/ShapefileReaderTest.java | 6 ++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/planetiler-core/pom.xml b/planetiler-core/pom.xml index 8843862f..746b2990 100644 --- a/planetiler-core/pom.xml +++ b/planetiler-core/pom.xml @@ -16,7 +16,7 @@ - 29.2 + 30.0 2.20.0 0.16.0 3.24.4 diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java index e326436a..fff8b20c 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java @@ -19,12 +19,12 @@ import mil.nga.geopackage.GeoPackageManager; import mil.nga.geopackage.features.user.FeatureColumns; import mil.nga.geopackage.features.user.FeatureDao; import mil.nga.geopackage.geom.GeoPackageGeometryData; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.operation.MathTransform; import org.geotools.geometry.jts.JTS; import org.geotools.geometry.jts.WKBReader; import org.geotools.referencing.CRS; import org.locationtech.jts.geom.Geometry; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.MathTransform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java index af689bfd..d48f6f44 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java @@ -10,19 +10,19 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.function.Consumer; -import org.geotools.data.FeatureSource; +import org.geotools.api.data.FeatureSource; +import org.geotools.api.feature.simple.SimpleFeatureType; +import org.geotools.api.filter.Filter; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.OperationNotFoundException; +import org.geotools.api.referencing.operation.TransformException; import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.feature.FeatureCollection; import org.geotools.geometry.jts.JTS; import org.geotools.referencing.CRS; import org.locationtech.jts.geom.Geometry; -import org.opengis.feature.simple.SimpleFeatureType; -import org.opengis.filter.Filter; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.OperationNotFoundException; -import org.opengis.referencing.operation.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; public class ShapefileReader extends SimpleReader { private static final Logger LOGGER = LoggerFactory.getLogger(ShapefileReader.class); - private final FeatureCollection inputSource; + private final FeatureCollection inputSource; private final String[] attributeNames; private final ShapefileDataStore dataStore; private final String layer; @@ -50,7 +50,7 @@ public class ShapefileReader extends SimpleReader { dataStore = open(input); try { String typeName = dataStore.getTypeNames()[0]; - FeatureSource source = dataStore + FeatureSource source = dataStore .getFeatureSource(typeName); inputSource = source.getFeatures(Filter.INCLUDE); @@ -130,7 +130,7 @@ public class ShapefileReader extends SimpleReader { long id = 0; try (var iter = inputSource.features()) { while (iter.hasNext()) { - org.opengis.feature.simple.SimpleFeature feature = iter.next(); + org.geotools.api.feature.simple.SimpleFeature feature = iter.next(); Geometry source = (Geometry) feature.getDefaultGeometry(); Geometry latLonGeometry = source; if (transformToLatLon != null) { diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java index 011997a4..1cb2d209 100644 --- a/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java +++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java @@ -14,10 +14,12 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.geotools.api.data.SimpleFeatureStore; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.operation.TransformException; import org.geotools.data.DefaultTransaction; import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStoreFactory; -import org.geotools.data.simple.SimpleFeatureStore; import org.geotools.feature.DefaultFeatureCollection; import org.geotools.feature.simple.SimpleFeatureBuilder; import org.geotools.feature.simple.SimpleFeatureTypeBuilder; @@ -29,8 +31,6 @@ import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.io.TempDir; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.TransformException; class ShapefileReaderTest { @TempDir