updating typemaps refs #14644

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

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/data/typemap/osmNetconvert.typ.xml b/data/typemap/osmNetconvert.typ.xml
@@ -32,7 +32,7 @@
 
     <type id="railway.preserved"      numLanes="1" speed="27.78" priority="16" oneway="true"  allow="rail"/>
     <type id="railway.tram"           numLanes="1" speed="13.89" priority="17" oneway="true"  allow="tram"/>
-    <type id="railway.subway"         numLanes="1" speed="27.78" priority="18" oneway="true"  allow="rail_urban"/>
+    <type id="railway.subway"         numLanes="1" speed="27.78" priority="18" oneway="true"  allow="subway"/>
     <type id="railway.light_rail"     numLanes="1" speed="27.78" priority="19" oneway="true"  allow="rail_urban"/>
     <type id="railway.rail"           numLanes="1" speed="44.44" priority="20" oneway="true"  allow="rail"/>
     <type id="railway.highspeed"      numLanes="1" speed="69.44" priority="21" oneway="true"  allow="rail_fast"/>

diff --git a/data/typemap/osmNetconvertAerialway.typ.xml b/data/typemap/osmNetconvertAerialway.typ.xml
@@ -1,5 +1,5 @@
 <types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
     <type id="railway.monorail"       numLanes="1" speed="27.78" priority="22" oneway="true"  allow="rail_urban"/>
-    <type id="aerialway.gondola"      numLanes="1" speed="13.89" priority="23" oneway="false"  allow="rail_urban"/>
-    <type id="aerialway.cable_car"    numLanes="1" speed="13.89" priority="24" oneway="false"  allow="rail_urban"/>
+    <type id="aerialway.gondola"      numLanes="1" speed="13.89" priority="23" oneway="false"  allow="cable_car"/>
+    <type id="aerialway.cable_car"    numLanes="1" speed="13.89" priority="24" oneway="false"  allow="cable_car"/>
 </types>
diff --git a/data/typemap/osmNetconvertAirport.typ.xml b/data/typemap/osmNetconvertAirport.typ.xml
@@ -1,9 +1,9 @@
 <types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
-    <type id="aeroway.stopway"          numLanes="1" speed="13.89" priority="30" oneway="false" allow="authority"/>
-    <type id="aeroway.parking_position" numLanes="1" speed="13.89" priority="31" oneway="false" allow="authority emergency"/>
-    <type id="aeroway.taxiway"          numLanes="1" speed="27.78" priority="32" oneway="false" allow="authority emergency"/>
-    <type id="aeroway.taxilane"         numLanes="1" speed="27.78" priority="34" oneway="false" allow="authority emergency"/>
-    <type id="aeroway.runway"           numLanes="1" speed="100.0" priority="35" oneway="false" allow="authority emergency"/>
-    <type id="aeroway.highway_strip"    numLanes="1" speed="100.0" priority="36" oneway="false" allow="authority emergency"/>
+    <type id="aeroway.stopway"          numLanes="1" speed="13.89" priority="30" oneway="false" allow="aircraft authority emergency"/>
+    <type id="aeroway.parking_position" numLanes="1" speed="13.89" priority="31" oneway="false" allow="aircraft authority emergency"/>
+    <type id="aeroway.taxiway"          numLanes="1" speed="27.78" priority="32" oneway="false" allow="aircraft authority emergency"/>
+    <type id="aeroway.taxilane"         numLanes="1" speed="27.78" priority="34" oneway="false" allow="aircraft authority emergency"/>
+    <type id="aeroway.runway"           numLanes="1" speed="100.0" priority="35" oneway="false" allow="aircraft authority emergency"/>
+    <type id="aeroway.highway_strip"    numLanes="1" speed="100.0" priority="36" oneway="false" allow="aircraft authority emergency"/>
 
 </types>