From 41fcf4161e542353021a5559cc7ae9b9cf09da5c Mon Sep 17 00:00:00 2001 From: Eric Duminil Date: Tue, 8 Oct 2019 12:21:29 +0200 Subject: [PATCH] GeoLibs: Update jts-1.13 to hts-1.16.1 --- .../regionchooser/RegionChooserBrowser.java | 2 +- src/eu/simstadt/regionchooser/RegionExtractor.java | 14 +++++++------- .../RegionExtractorWithDifferentInputTests.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/eu/simstadt/regionchooser/RegionChooserBrowser.java b/src/eu/simstadt/regionchooser/RegionChooserBrowser.java index e8d45c6..d57855b 100644 --- a/src/eu/simstadt/regionchooser/RegionChooserBrowser.java +++ b/src/eu/simstadt/regionchooser/RegionChooserBrowser.java @@ -8,7 +8,7 @@ import java.nio.file.Paths; import java.util.logging.Logger; import java.util.prefs.Preferences; -import com.vividsolutions.jts.io.ParseException; +import org.locationtech.jts.io.ParseException; import com.ximpleware.NavException; import com.ximpleware.XPathEvalException; import com.ximpleware.XPathParseException; diff --git a/src/eu/simstadt/regionchooser/RegionExtractor.java b/src/eu/simstadt/regionchooser/RegionExtractor.java index 02b8480..da6a1a4 100644 --- a/src/eu/simstadt/regionchooser/RegionExtractor.java +++ b/src/eu/simstadt/regionchooser/RegionExtractor.java @@ -5,13 +5,13 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.io.ParseException; +import org.locationtech.jts.io.WKTReader; import com.ximpleware.NavException; import com.ximpleware.XPathEvalException; import com.ximpleware.XPathParseException; diff --git a/test/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java b/test/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java index acfb76d..ed53cc5 100644 --- a/test/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java +++ b/test/eu/simstadt/regionchooser/RegionExtractorWithDifferentInputTests.java @@ -7,11 +7,11 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.junit.Test; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.io.ParseException; +import org.locationtech.jts.io.WKTReader; +import org.locationtech.jts.io.WKTWriter; import org.osgeo.proj4j.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; -import com.vividsolutions.jts.io.WKTWriter; import com.ximpleware.NavException; import com.ximpleware.XPathEvalException; import com.ximpleware.XPathParseException; -- GitLab