rename geometry exporter, update geotools repo

LeonardoLuquezi · May 27, 2020 · 084cd90 · 084cd90
1 parent f308216
commit 084cd90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...t2matsim/osm/NetworkGeometryExporter.java → ...m/pt2matsim/osm/LinkGeometryExporter.java b/...t2matsim/osm/NetworkGeometryExporter.java → ...m/pt2matsim/osm/LinkGeometryExporter.java
@@ -28,14 +28,11 @@
  * present in the LineString we export it anyways so this file is a
  * representation of the full network.
  */
-public class NetworkGeometryExporter {
+public class LinkGeometryExporter {
 
 	private final char SEPARATOR = ',';
 	private Map<Id<Link>, LinkDefinition> linkDefinitions = new TreeMap<>();
 
-	public NetworkGeometryExporter() {
-	}
-
 	public void addLinkDefinition(Id<Link> linkId, LinkDefinition definition) {
 		linkDefinitions.put(linkId, definition);
 	}

diff --git a/src/main/java/org/matsim/pt2matsim/osm/OsmMultimodalNetworkConverter.java b/src/main/java/org/matsim/pt2matsim/osm/OsmMultimodalNetworkConverter.java
@@ -36,7 +36,7 @@
 import org.matsim.core.utils.geometry.transformations.IdentityTransformation;
 import org.matsim.core.utils.geometry.transformations.TransformationFactory;
 import org.matsim.pt2matsim.config.OsmConverterConfigGroup;
-import org.matsim.pt2matsim.osm.NetworkGeometryExporter.LinkDefinition;
+import org.matsim.pt2matsim.osm.LinkGeometryExporter.LinkDefinition;
 import org.matsim.pt2matsim.osm.lib.AllowedTagsFilter;
 import org.matsim.pt2matsim.osm.lib.Osm;
 import org.matsim.pt2matsim.osm.lib.OsmData;
@@ -90,7 +90,7 @@ public class OsmMultimodalNetworkConverter {
 
 	protected AllowedTagsFilter ptFilter;
 	protected OsmConverterConfigGroup.OsmWayParams ptDefaultParams;
-	protected NetworkGeometryExporter geometryExporter;
+	protected LinkGeometryExporter geometryExporter;
 
 	public OsmMultimodalNetworkConverter(OsmData osmData) {
 		this.osmData = osmData;
@@ -101,7 +101,7 @@ public OsmMultimodalNetworkConverter(OsmData osmData) {
 	 */
 	public void convert(OsmConverterConfigGroup config) {
 		this.config = config;
-		this.geometryExporter = new NetworkGeometryExporter();
+		this.geometryExporter = new LinkGeometryExporter();
 		CoordinateTransformation transformation = (config.getOutputCoordinateSystem() == null ?
 				new IdentityTransformation() :
 				TransformationFactory.getCoordinateTransformation(TransformationFactory.WGS84, config.getOutputCoordinateSystem()));