adapting pt code to new classes. refs #14644

eclipse-sumo · Apr 2, 2024 · b9a578c · b9a578c
1 parent 7b923ee
commit b9a578c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/netimport/NIImporter_OpenStreetMap.cpp b/src/netimport/NIImporter_OpenStreetMap.cpp
@@ -2605,7 +2605,11 @@ NIImporter_OpenStreetMap::interpretTransportType(const std::string& type, NIOSMN
     SUMOVehicleClass result = SVC_IGNORING;
     if (type == "train") {
         result = SVC_RAIL;
-    } else if (type == "subway" || type == "light_rail" || type == "monorail" || type == "aerialway") {
+    } else if (type == "subway") {
+        result = SVC_SUBWAY;
+    } else if (type == "aerialway") {
+        result = SVC_CABLE_CAR;
+    } else if (type == "light_rail" || type == "monorail") {
         result = SVC_RAIL_URBAN;
     } else if (type == "share_taxi") {
         result = SVC_TAXI;

diff --git a/tools/ptlines2flows.py b/tools/ptlines2flows.py
@@ -151,13 +151,13 @@ def writeTypes(fout, prefix, options):
     print("""    <vType id="%sbus" vClass="bus"%s/>
     <vType id="%stram" vClass="tram"%s/>
     <vType id="%strain" vClass="rail"%s/>
-    <vType id="%ssubway" vClass="rail_urban"%s/>
+    <vType id="%ssubway" vClass="subway"%s/>
     <vType id="%slight_rail" vClass="rail_urban"%s/>
     <vType id="%smonorail" vClass="rail_urban"%s/>
     <vType id="%strolleybus" vClass="bus"%s/>
     <vType id="%sminibus" vClass="bus"%s/>
     <vType id="%sshare_taxi" vClass="taxi"%s/>
-    <vType id="%saerialway" vClass="rail_urban"%s length="2.5" width="2" personCapacity="4"/>
+    <vType id="%saerialway" vClass="cable_car"%s length="2.5" width="2" personCapacity="4"/>
     <vType id="%sferry" vClass="ship"%s/>""" % tuple(prefixes_and_sf), file=fout)