From 084cd903b7685140ddc76ff65a991ef475c1998b Mon Sep 17 00:00:00 2001 From: Markus Straub Date: Wed, 6 May 2020 09:55:25 +0200 Subject: [PATCH] rename geometry exporter, update geotools repo --- ...tworkGeometryExporter.java => LinkGeometryExporter.java} | 5 +---- .../matsim/pt2matsim/osm/OsmMultimodalNetworkConverter.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/org/matsim/pt2matsim/osm/{NetworkGeometryExporter.java => LinkGeometryExporter.java} (97%) diff --git a/src/main/java/org/matsim/pt2matsim/osm/NetworkGeometryExporter.java b/src/main/java/org/matsim/pt2matsim/osm/LinkGeometryExporter.java similarity index 97% rename from src/main/java/org/matsim/pt2matsim/osm/NetworkGeometryExporter.java rename to src/main/java/org/matsim/pt2matsim/osm/LinkGeometryExporter.java index 605247db..f32af2ab 100644 --- a/src/main/java/org/matsim/pt2matsim/osm/NetworkGeometryExporter.java +++ b/src/main/java/org/matsim/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, LinkDefinition> linkDefinitions = new TreeMap<>(); - public NetworkGeometryExporter() { - } - public void addLinkDefinition(Id 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 index 2241d9d8..25b58696 100644 --- 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()));