Commit b2536456 authored by Eric Duminil's avatar Eric Duminil
Browse files

Proj4j was too old

replacing os.geo with org.locationtech
parent 581501af
No related merge requests found
Showing with 12 additions and 12 deletions
+12 -12
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<artifactId>picocli</artifactId> <artifactId>picocli</artifactId>
<version>4.6.3</version> <version>4.6.3</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.locationtech.proj4j/proj4j -->
<!-- https://mvnrepository.com/artifact/org.osgeo/proj4j --> <!-- More recent than from osgeo -->
<dependency> <dependency>
<groupId>org.osgeo</groupId> <groupId>org.locationtech.proj4j</groupId>
<artifactId>proj4j</artifactId> <artifactId>proj4j</artifactId>
<version>0.1.0</version> <version>1.1.3</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.locationtech.jts/jts-core --> <!-- https://mvnrepository.com/artifact/org.locationtech.jts/jts-core -->
<dependency> <dependency>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.osgeo.proj4j.CoordinateReferenceSystem; import org.locationtech.proj4j.CoordinateReferenceSystem;
import eu.simstadt.regionchooser.RegionChooserCLI.GetVersion; import eu.simstadt.regionchooser.RegionChooserCLI.GetVersion;
import picocli.CommandLine; import picocli.CommandLine;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.WKTReader; import org.locationtech.jts.io.WKTReader;
import org.locationtech.jts.io.WKTWriter; import org.locationtech.jts.io.WKTWriter;
import org.osgeo.proj4j.BasicCoordinateTransform; import org.locationtech.proj4j.BasicCoordinateTransform;
import org.osgeo.proj4j.CRSFactory; import org.locationtech.proj4j.CRSFactory;
import org.osgeo.proj4j.CoordinateReferenceSystem; import org.locationtech.proj4j.CoordinateReferenceSystem;
import org.osgeo.proj4j.ProjCoordinate; import org.locationtech.proj4j.ProjCoordinate;
public class RegionChooserUtils public class RegionChooserUtils
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
import org.osgeo.proj4j.CoordinateReferenceSystem; import org.locationtech.proj4j.CoordinateReferenceSystem;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.regionchooser.RegionChooserUtils; import eu.simstadt.regionchooser.RegionChooserUtils;
......
...@@ -99,7 +99,7 @@ void testExtractRegionFromTwoCitygmlsInWGS84() throws IOException { ...@@ -99,7 +99,7 @@ void testExtractRegionFromTwoCitygmlsInWGS84() throws IOException {
assertTrue(err.toString().contains(expectedLog), err.toString() + " should contain " + expectedLog); assertTrue(err.toString().contains(expectedLog), err.toString() + " should contain " + expectedLog);
assertTrue(Files.exists(outGML)); assertTrue(Files.exists(outGML));
assertTrue(Files.size(outGML) > 300_000); assertTrue(Files.size(outGML) > 300_000);
assertEquals(22, countBuildings(outGML)); assertEquals(23, countBuildings(outGML));
} }
@Test @Test
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import org.osgeo.proj4j.CoordinateReferenceSystem; import org.locationtech.proj4j.CoordinateReferenceSystem;
import com.ximpleware.NavException; import com.ximpleware.NavException;
import com.ximpleware.XPathEvalException; import com.ximpleware.XPathEvalException;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment