Commit 4fa81329 authored by Eric Duminil's avatar Eric Duminil
Browse files

Replacing eu.simstadt.geo with eu.simstadt.regionchooser to avoid conflict with SimStadt packages

parent c8bf6133
Pipeline #668 failed with stage
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<groupId>eu.simstadt</groupId> <groupId>eu.simstadt</groupId>
<artifactId>region-chooser</artifactId> <artifactId>region-chooser</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
import com.ximpleware.NavException; import com.ximpleware.NavException;
import com.ximpleware.XPathEvalException; import com.ximpleware.XPathEvalException;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.geo.fast_xml_parser.ConvexHullCalculator; import eu.simstadt.regionchooser.fast_xml_parser.ConvexHullCalculator;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.concurrent.Task; import javafx.concurrent.Task;
......
package eu.simstadt.geo; package eu.simstadt.regionchooser;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
import com.ximpleware.NavException; import com.ximpleware.NavException;
import com.ximpleware.XPathEvalException; import com.ximpleware.XPathEvalException;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.geo.fast_xml_parser.BuildingXmlNode; import eu.simstadt.regionchooser.fast_xml_parser.BuildingXmlNode;
import eu.simstadt.geo.fast_xml_parser.CityGmlIterator; import eu.simstadt.regionchooser.fast_xml_parser.CityGmlIterator;
public class RegionExtractor public class RegionExtractor
......
package eu.simstadt.geo.fast_xml_parser; package eu.simstadt.regionchooser.fast_xml_parser;
import com.ximpleware.AutoPilot; import com.ximpleware.AutoPilot;
import com.ximpleware.NavException; import com.ximpleware.NavException;
......
package eu.simstadt.geo.fast_xml_parser; package eu.simstadt.regionchooser.fast_xml_parser;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
...@@ -30,7 +30,8 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode> ...@@ -30,7 +30,8 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode>
* RegionChooser or HullExtractor). It should be fast and not use much memory. A SaxParser would use even less memory * RegionChooser or HullExtractor). It should be fast and not use much memory. A SaxParser would use even less memory
* but might be harder to code and possibly slower to run. * but might be harder to code and possibly slower to run.
* *
* For a more complete and more robust (but slower) implementation, use eu.simstadt.geo.GeoCoordinatesAccessor * For a more complete and more robust (but slower) implementation, use eu.simstadt.geo.GeoCoordinatesAccessor in
* SimStadt geo-libs.
* *
* Based on VTD XML, it provides a Building iterator. * Based on VTD XML, it provides a Building iterator.
* *
......
package eu.simstadt.geo.fast_xml_parser; package eu.simstadt.regionchooser.fast_xml_parser;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
import org.locationtech.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
import org.osgeo.proj4j.CoordinateReferenceSystem; import org.osgeo.proj4j.CoordinateReferenceSystem;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.geo.RegionChooserUtils; import eu.simstadt.regionchooser.RegionChooserUtils;
public class ConvexHullCalculator public class ConvexHullCalculator
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* this convex hull to WGS84 coordinates. * this convex hull to WGS84 coordinates.
* *
* The convex hull is needed for RegionChooser. No SimstadtModel or CityDoctor model is needed, thanks to * The convex hull is needed for RegionChooser. No SimstadtModel or CityDoctor model is needed, thanks to
* eu.simstadt.geo.fast_xml_parser.CityGmlIterator. * eu.simstadt.regionchooser.fast_xml_parser.CityGmlIterator.
* *
* E.g. : POLYGON ((9.219282617376651 48.876828283254675, 9.2175568365387 48.87695546490524, 9.213228008654541 * E.g. : POLYGON ((9.219282617376651 48.876828283254675, 9.2175568365387 48.87695546490524, 9.213228008654541
* 48.87741235218009, 9.21293830332426 48.8774437308139, 9.212628150503749 48.87995232037036, 9.21263222062228 * 48.87741235218009, 9.21293830332426 48.8774437308139, 9.212628150503749 48.87995232037036, 9.21263222062228
...@@ -68,7 +68,8 @@ public static Geometry calculateFromCityGML(Path citygmlPath) throws XPathParseE ...@@ -68,7 +68,8 @@ public static Geometry calculateFromCityGML(Path citygmlPath) throws XPathParseE
Polygon originalConvexHull = (Polygon) ch.getConvexHull(); Polygon originalConvexHull = (Polygon) ch.getConvexHull();
CoordinateReferenceSystem originalCRS = RegionChooserUtils.crsFromCityGMLHeader(citygmlPath); CoordinateReferenceSystem originalCRS = RegionChooserUtils.crsFromCityGMLHeader(citygmlPath);
Polygon convexHull = RegionChooserUtils.changePolygonCRS(originalConvexHull, originalCRS, RegionChooserUtils.WGS84); Polygon convexHull = RegionChooserUtils.changePolygonCRS(originalConvexHull, originalCRS,
RegionChooserUtils.WGS84);
convexHull.setUserData(originalCRS.toString()); convexHull.setUserData(originalCRS.toString());
return convexHull; return convexHull;
} }
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import eu.simstadt.geo.RegionChooserUtils;
public class CRSfromCityGMLHeaderTests public class CRSfromCityGMLHeaderTests
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
import com.ximpleware.NavException; import com.ximpleware.NavException;
import com.ximpleware.XPathEvalException; import com.ximpleware.XPathEvalException;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.geo.RegionChooserUtils;
public class RegionExtractorWithDifferentInputTests public class RegionExtractorWithDifferentInputTests
......
package eu.simstadt.geo.fast_xml_parser; package eu.simstadt.regionchooser.fast_xml_parser;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
import java.nio.file.Paths; import java.nio.file.Paths;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.regionchooser.fast_xml_parser.BuildingXmlNode;
import eu.simstadt.regionchooser.fast_xml_parser.CityGmlIterator;
public class CitygmlParserTests public class CitygmlParserTests
......
package eu.simstadt.geo.fast_xml_parser; package eu.simstadt.regionchooser.fast_xml_parser;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Point;
import com.ximpleware.XPathParseException; import com.ximpleware.XPathParseException;
import eu.simstadt.geo.RegionChooserUtils; import eu.simstadt.regionchooser.RegionChooserUtils;
import eu.simstadt.regionchooser.fast_xml_parser.ConvexHullCalculator;
public class ConvexHullCalculatorTests public class ConvexHullCalculatorTests
......
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