more renaming..

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

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/org/matsim/pt2matsim/config/OsmConverterConfigGroup.java b/src/main/java/org/matsim/pt2matsim/config/OsmConverterConfigGroup.java
@@ -46,7 +46,7 @@ public class OsmConverterConfigGroup extends ReflectiveConfigGroup {
 
 	private static final String OSM_FILE ="osmFile";
 	private static final String OUTPUT_NETWORK_FILE ="outputNetworkFile";
-	private static final String OUTPUT_NETWORK_GEOMETRY_FILE ="outputNetworkGeometryFile";
+	private static final String OUTPUT_DETAILED_LINK_GEOMETRY_FILE ="outputDetailedLinkGeometryFile";
 	private static final String OUTPUT_COORDINATE_SYSTEM ="outputCoordinateSystem";
 	private static final String KEEP_PATHS ="keepPaths";
 	private static final String MAX_LINK_LENGTH = "maxLinkLength";
@@ -56,7 +56,7 @@ public class OsmConverterConfigGroup extends ReflectiveConfigGroup {
 
 	private String osmFile;
 	private String outputNetworkFile;
-	private String outputNetworkGeometryFile;
+	private String outputDetailedLinkGeometryFile;
 	private String outputCoordinateSystem;
 
 	private double maxLinkLength = 500.0;
@@ -170,14 +170,14 @@ public void setOutputNetworkFile(String outputNetworkFile) {
 		this.outputNetworkFile = outputNetworkFile;
 	}
 
-	@StringGetter(OUTPUT_NETWORK_GEOMETRY_FILE)
-	public String getOutputNetworkGeometryFile() {
-		return outputNetworkGeometryFile;
+	@StringGetter(OUTPUT_DETAILED_LINK_GEOMETRY_FILE)
+	public String getOutputDetailedLinkGeometryFile() {
+		return outputDetailedLinkGeometryFile;
 	}
 
-	@StringSetter(OUTPUT_NETWORK_GEOMETRY_FILE)
-	public void setOutputNetworkGeometryFile(String outputNetworkGeometryFile) {
-		this.outputNetworkGeometryFile = outputNetworkGeometryFile;
+	@StringSetter(OUTPUT_DETAILED_LINK_GEOMETRY_FILE)
+	public void setOutputDetailedLinkGeometryFile(String outputDetailedLinkGeometryFile) {
+		this.outputDetailedLinkGeometryFile = outputDetailedLinkGeometryFile;
 	}
 
 	@StringGetter(OUTPUT_COORDINATE_SYSTEM)
@@ -205,8 +205,8 @@ public final Map<String, String> getComments() {
 		Map<String, String> map = super.getComments();
 		map.put(OSM_FILE,
 				"The path to the osm file.");
-		map.put(OUTPUT_NETWORK_GEOMETRY_FILE,
-				"CSV file containing the full geometry for (including start end end node) each link.\n" +
+		map.put(OUTPUT_DETAILED_LINK_GEOMETRY_FILE,
+				"CSV file containing the full geometry (including start end end node) for each link.\n" +
 				"\t\tThis file can be used for visualization purposes in Simunto Via or GIS software.\n");
 		map.put(KEEP_PATHS,
 				"Sets whether the detailed geometry of the roads should be retained in the conversion or not.\n" +

diff --git a/src/main/java/org/matsim/pt2matsim/osm/OsmMultimodalNetworkConverter.java b/src/main/java/org/matsim/pt2matsim/osm/OsmMultimodalNetworkConverter.java
@@ -112,10 +112,10 @@ public void convert(OsmConverterConfigGroup config) {
 		cleanNetwork();
 		if(config.getKeepTagsAsAttributes()) addAttributes();
 
-		if (this.config.getOutputNetworkGeometryFile() != null) {
+		if (this.config.getOutputDetailedLinkGeometryFile() != null) {
 			try {
 				geometryExporter.onlyKeepGeometryForTheseLinks(network.getLinks().keySet());
-				geometryExporter.writeToFile(Paths.get(this.config.getOutputNetworkGeometryFile()));
+				geometryExporter.writeToFile(Paths.get(this.config.getOutputDetailedLinkGeometryFile()));
 			} catch (IOException e) {
 				log.warn("Error while writing network geometry", e);
 				e.printStackTrace();