Skip to content

Commit

Permalink
adapting typemaps. refs #12335
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 2, 2024
1 parent 8aaf8f0 commit 0a5c2f5
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 52 deletions.
20 changes: 10 additions & 10 deletions data/typemap/opendriveNetconvert.typ.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<type id="driving" priority="1" speed="13.89" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="stop" priority="1" speed="13.89" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="driving" priority="1" speed="13.89" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="stop" priority="1" speed="13.89" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="restricted" priority="0" speed="13.89" width="3.65" disallow="all"/> <!-- ambiguous semantics. Could mean bus-lane as well as fully-area restricted (but surfaced) lane area (as seen in official examples) -->
<type id="parking" priority="1" speed="1.39" width="2.50" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="entry" priority="1" speed="22.22" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="exit" priority="1" speed="22.22" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="offRamp" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram ship"/>
<type id="onRamp" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram ship"/>
<type id="parking" priority="1" speed="1.39" width="2.50" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="entry" priority="1" speed="22.22" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="exit" priority="1" speed="22.22" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="offRamp" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="onRamp" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="roadWorks" priority="0" speed="1.39" width="3.65" allow="authority"/>
<type id="tram" priority="2" speed="13.89" width="3.65" allow="tram"/>
<type id="rail" priority="3" speed="33.33" width="3.65" allow="rail rail_urban rail_electric rail_fast"/>
Expand All @@ -27,9 +27,9 @@
<type id="special3" priority="1" speed="22.22" width="3.65" allow="custom1 custom2" discard="true"/>

<!-- deprecated -->
<type id="mwyEntry" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram ship"/>
<type id="mwyExit" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram ship"/>
<type id="mwyEntry" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="mwyExit" priority="1" speed="22.22" width="3.65" disallow="pedestrian bicycle moped rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>

<!-- not fully implemented -->
<type id="bidirectional" priority="1" speed="1.39" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="bidirectional" priority="1" speed="1.39" width="3.65" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
</types>
30 changes: 15 additions & 15 deletions data/typemap/osmNetconvert.typ.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<type id="highway.motorway" numLanes="2" speed="39.44" priority="14" oneway="true" disallow="rail rail_urban rail_electric rail_fast tram ship pedestrian bicycle moped"/>
<type id="highway.trunk" numLanes="2" speed="27.78" priority="13" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship pedestrian bicycle"/>
<type id="highway.primary" numLanes="2" speed="27.78" priority="12" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary" numLanes="1" speed="27.78" priority="11" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary" numLanes="1" speed="22.22" priority="10" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.motorway_link" numLanes="1" speed="22.22" priority="9" oneway="true" disallow="rail rail_urban rail_electric rail_fast tram ship pedestrian bicycle moped"/>
<type id="highway.trunk_link" numLanes="1" speed="22.22" priority="8" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship pedestrian bicycle"/>
<type id="highway.primary_link" numLanes="1" speed="22.22" priority="7" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary_link" numLanes="1" speed="22.22" priority="6" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary_link" numLanes="1" speed="22.22" priority="5" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.unclassified" numLanes="1" speed="13.89" priority="4" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.residential" numLanes="1" speed="13.89" priority="3" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.living_street" numLanes="1" speed="2.78" priority="2" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.unsurfaced" numLanes="1" speed="8.33" priority="1" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.motorway" numLanes="2" speed="39.44" priority="14" oneway="true" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle moped"/>
<type id="highway.trunk" numLanes="2" speed="27.78" priority="13" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle"/>
<type id="highway.primary" numLanes="2" speed="27.78" priority="12" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary" numLanes="1" speed="27.78" priority="11" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary" numLanes="1" speed="22.22" priority="10" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.motorway_link" numLanes="1" speed="22.22" priority="9" oneway="true" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle moped"/>
<type id="highway.trunk_link" numLanes="1" speed="22.22" priority="8" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle"/>
<type id="highway.primary_link" numLanes="1" speed="22.22" priority="7" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary_link" numLanes="1" speed="22.22" priority="6" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary_link" numLanes="1" speed="22.22" priority="5" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.unclassified" numLanes="1" speed="13.89" priority="4" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.residential" numLanes="1" speed="13.89" priority="3" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.living_street" numLanes="1" speed="2.78" priority="2" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.unsurfaced" numLanes="1" speed="8.33" priority="1" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.service" numLanes="1" speed="5.56" priority="1" oneway="false" allow="delivery pedestrian bicycle"/>

<!-- everything which serves mainly pedestrians is oneway because all current pedestrian models do not care about direction -->
Expand All @@ -37,6 +37,6 @@
<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"/>

<type id="highway.construction" numLanes="1" speed="13.89" priority="4" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram ship" discard="true"/>
<type id="highway.construction" numLanes="1" speed="13.89" priority="4" oneway="false" disallow="rail rail_urban rail_electric rail_fast tram tram drone aircraft scooter container wheelchair subway cable_car ship" discard="true"/>
<type id="railway.construction" numLanes="1" speed="13.89" priority="20" oneway="true" allow="rail" discard="true"/>
</types>
16 changes: 8 additions & 8 deletions data/typemap/osmNetconvertPedestrians.typ.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<type id="highway.primary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.primary_link" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary_link" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary_link" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.unclassified" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.residential" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.primary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.primary_link" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary_link" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary" sidewalkWidth="3" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary_link" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.unclassified" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.residential" sidewalkWidth="2" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
</types>
16 changes: 8 additions & 8 deletions data/typemap/osmNetconvertPedestriansNES.typ.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<!-- typemap for pedestrians with (N)o (E)xtra (S)idewalks -->
<type id="highway.primary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.primary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.secondary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.tertiary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.unclassified" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.residential" disallow="pedestrian rail rail_urban rail_electric rail_fast tram ship"/>
<type id="highway.primary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.primary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary_link" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.unclassified" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.residential" disallow="pedestrian rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
</types>
22 changes: 11 additions & 11 deletions data/typemap/osmNetconvertUrbanDe.typ.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<type id="highway.motorway" speed="27.78"/>
<type id="highway.motorway_link" speed="16.67"/>
<type id="highway.trunk" speed="13.89"/>
<type id="highway.trunk_link" speed="13.89"/>
<type id="highway.primary" speed="13.89"/>
<type id="highway.primary_link" speed="13.89"/>
<type id="highway.secondary" speed="13.89"/>
<type id="highway.secondary_link" speed="13.89"/>
<type id="highway.tertiary" speed="13.89"/>
<type id="highway.tertiary_link" speed="13.89"/>
<type id="highway.bus_guideway" speed="13.89"/>
<type id="highway.motorway" speed="27.78" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle moped"/>
<type id="highway.motorway_link" speed="16.67" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle moped"/>
<type id="highway.trunk" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle"/>
<type id="highway.trunk_link" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship pedestrian bicycle"/>
<type id="highway.primary" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.primary_link" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.secondary_link" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.tertiary_link" speed="13.89" disallow="rail rail_urban rail_electric rail_fast tram drone aircraft scooter container wheelchair subway cable_car ship"/>
<type id="highway.bus_guideway" speed="13.89" allow="bus"/>
</types>

0 comments on commit 0a5c2f5

Please sign in to comment.