From b253645692ad4f36e8342ec5862f4e9eef328196 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Fri, 26 May 2023 11:06:59 +0200
Subject: [PATCH] Proj4j was too old
replacing os.geo with org.locationtech
---
pom.xml | 8 ++++----
.../java/eu/simstadt/regionchooser/RegionChooserCLI.java | 2 +-
.../eu/simstadt/regionchooser/RegionChooserUtils.java | 8 ++++----
.../fast_xml_parser/ConvexHullCalculator.java | 2 +-
.../eu/simstadt/regionchooser/RegionChooserCLITests.java | 2 +-
.../RegionExtractorWithDifferentInputTests.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2938503..f752aa8 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 7761843..128b8eb 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 64b50c2..142be29 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 155ea05..e10492a 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 5400632..2098139 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 7d4b0c0..5245b99 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;
--
GitLab