diff --git a/pom.xml b/pom.xml index 2938503c9f1b6a807073be8d6ae3b2e9edc41343..f752aa89a6dc5ae90fd6704a75053e6be00b1b19 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,12 @@ <artifactId>picocli</artifactId> <version>4.6.3</version> </dependency> - - <!-- https://mvnrepository.com/artifact/org.osgeo/proj4j --> + <!-- https://mvnrepository.com/artifact/org.locationtech.proj4j/proj4j --> + <!-- More recent than from osgeo --> <dependency> - <groupId>org.osgeo</groupId> + <groupId>org.locationtech.proj4j</groupId> <artifactId>proj4j</artifactId> - <version>0.1.0</version> + <version>1.1.3</version> </dependency> <!-- https://mvnrepository.com/artifact/org.locationtech.jts/jts-core --> <dependency> diff --git a/src/main/java/eu/simstadt/regionchooser/RegionChooserCLI.java b/src/main/java/eu/simstadt/regionchooser/RegionChooserCLI.java index 7761843011d782f593bb632f8be5d99ce1ee0ee4..128b8eba3dc4eafaebca0b77cfc7d2914f6cd99d 100644 --- a/src/main/java/eu/simstadt/regionchooser/RegionChooserCLI.java +++ b/src/main/java/eu/simstadt/regionchooser/RegionChooserCLI.java @@ -8,7 +8,7 @@ import java.nio.file.Paths; import java.util.Scanner; import java.util.concurrent.Callable; -import org.osgeo.proj4j.CoordinateReferenceSystem; +import org.locationtech.proj4j.CoordinateReferenceSystem; import eu.simstadt.regionchooser.RegionChooserCLI.GetVersion; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/src/main/java/eu/simstadt/regionchooser/RegionChooserUtils.java b/src/main/java/eu/simstadt/regionchooser/RegionChooserUtils.java index 64b50c2903fe981cdab3aaaf0f372883986dc8bd..142be29ba743e43eb63c6af89691def7f86159bc 100644 --- a/src/main/java/eu/simstadt/regionchooser/RegionChooserUtils.java +++ b/src/main/java/eu/simstadt/regionchooser/RegionChooserUtils.java @@ -15,10 +15,10 @@ import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; import org.locationtech.jts.io.WKTWriter; -import org.osgeo.proj4j.BasicCoordinateTransform; -import org.osgeo.proj4j.CRSFactory; -import org.osgeo.proj4j.CoordinateReferenceSystem; -import org.osgeo.proj4j.ProjCoordinate; +import org.locationtech.proj4j.BasicCoordinateTransform; +import org.locationtech.proj4j.CRSFactory; +import org.locationtech.proj4j.CoordinateReferenceSystem; +import org.locationtech.proj4j.ProjCoordinate; public class RegionChooserUtils diff --git a/src/main/java/eu/simstadt/regionchooser/fast_xml_parser/ConvexHullCalculator.java b/src/main/java/eu/simstadt/regionchooser/fast_xml_parser/ConvexHullCalculator.java index 155ea05bbf7f32816d6a112da4186b60bc2e061b..e10492a136ea98b8ed84bd47d1e240abeb83b50a 100644 --- a/src/main/java/eu/simstadt/regionchooser/fast_xml_parser/ConvexHullCalculator.java +++ b/src/main/java/eu/simstadt/regionchooser/fast_xml_parser/ConvexHullCalculator.java @@ -16,7 +16,7 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Polygon; -import org.osgeo.proj4j.CoordinateReferenceSystem; +import org.locationtech.proj4j.CoordinateReferenceSystem; import com.ximpleware.XPathParseException; import eu.simstadt.regionchooser.RegionChooserUtils; diff --git a/src/test/java/eu/simstadt/regionchooser/RegionChooserCLITests.java b/src/test/java/eu/simstadt/regionchooser/RegionChooserCLITests.java index 540063272366d7e51c0d490a5974e16135de9bcf..20981392383676ade648864e81e9ada3bef37fec 100644 --- a/src/test/java/eu/simstadt/regionchooser/RegionChooserCLITests.java +++ b/src/test/java/eu/simstadt/regionchooser/RegionChooserCLITests.java @@ -99,7 +99,7 @@ void testExtractRegionFromTwoCitygmlsInWGS84() throws IOException { assertTrue(err.toString().contains(expectedLog), err.toString() + " should contain " + expectedLog); assertTrue(Files.exists(outGML)); assertTrue(Files.size(outGML) > 300_000); - assertEquals(22, countBuildings(outGML)); + assertEquals(23, countBuildings(outGML)); } @Test diff --git a/src/test/java/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java b/src/test/java/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java index 7d4b0c02b7dcedd4e9d6ae905ed9ce187ad09b43..5245b99f1e88067ea95a0fc3f1bc96c075d789cd 100644 --- a/src/test/java/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java +++ b/src/test/java/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.locationtech.jts.io.ParseException; -import org.osgeo.proj4j.CoordinateReferenceSystem; +import org.locationtech.proj4j.CoordinateReferenceSystem; import com.ximpleware.NavException; import com.ximpleware.XPathEvalException; import com.ximpleware.XPathParseException;