resolve some geotools 31 vs older issues

matsim-scenarios · May 22, 2024 · 8c8272c · 8c8272c
1 parent 890943e
commit 8c8272c
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 188 deletions.
diff --git a/src/main/java/org/matsim/analysis/Person2Home.java b/src/main/java/org/matsim/analysis/Person2Home.java
@@ -12,7 +12,7 @@
 import org.matsim.core.population.PopulationUtils;
 import org.matsim.core.utils.geometry.geotools.MGC;
 import org.matsim.core.utils.gis.ShapeFileReader;
-import org.opengis.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeature;
 import picocli.CommandLine;
 
 import java.io.FileWriter;

diff --git a/src/main/java/org/matsim/prepare/CreateSupply.java b/src/main/java/org/matsim/prepare/CreateSupply.java
@@ -30,7 +30,7 @@
 import org.matsim.prepare.counts.LongTermCountsCreator;
 import org.matsim.prepare.counts.RawDataVehicleTypes;
 import org.matsim.prepare.counts.ShortTermCountsCreator;
-import org.opengis.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeature;
 
 import java.io.FileReader;
 import java.io.IOException;

diff --git a/src/main/java/org/matsim/prepare/ElevationReader.java b/src/main/java/org/matsim/prepare/ElevationReader.java
@@ -2,12 +2,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.geotools.api.referencing.operation.TransformException;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.gce.geotiff.GeoTiffReader;
-import org.geotools.geometry.DirectPosition2D;
+import org.geotools.geometry.Position2D;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.core.utils.geometry.CoordinateTransformation;
-import org.opengis.referencing.operation.TransformException;
 
 import java.awt.image.Raster;
 import java.io.File;
@@ -33,7 +33,7 @@ public class ElevationReader {
     public double getElevationAt(Coord coord) {
 
         Coord transformed = transformation.transform(coord);
-        var position = new DirectPosition2D(transformed.getX(), transformed.getY());
+        var position = new Position2D(transformed.getX(), transformed.getY());
 
         for (ElevationMap elevationMap : elevationMaps) {
 
@@ -67,11 +67,11 @@ private static class ElevationMap {
             }
         }
 
-        boolean covers(DirectPosition2D position) {
+        boolean covers(Position2D position) {
             return coverage.getEnvelope2D().contains(position.getX(), position.getY());
         }
 
-        double getElevation(DirectPosition2D position) {
+        double getElevation(Position2D position) {
 
             if (!coverage.getEnvelope2D().contains(position.getX(), position.getY())) {
                 throw new IllegalArgumentException("position is not covered by height map. Test with 'covers' first");