updating xsds and docs #563 #2

eclipse-sumo · Feb 3, 2025 · 8b62d2f · 8b62d2f
1 parent cfdd7a2
commit 8b62d2f
Show file tree

Hide file tree

Showing 15 changed files with 226 additions and 35 deletions.
diff --git a/data/xsd/duarouterConfiguration.xsd b/data/xsd/duarouterConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-09 19:54:01 by Eclipse SUMO duarouter Version v1_20_0+2262-4c4b720e23e
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO duarouter Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -73,6 +73,7 @@
             <xsd:element name="repair.to" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.distance" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.junctions" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="mapmatch.taz" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="bulk-routing" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="routing-threads" type="intOptionType" minOccurs="0"/>
             <xsd:element name="routing-algorithm" type="strOptionType" minOccurs="0"/>
@@ -88,6 +89,8 @@
             <xsd:element name="astar.all-distances" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="astar.landmark-distances" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="astar.save-landmark-distances" type="fileOptionType" minOccurs="0"/>
+            <xsd:element name="scale" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="scale-suffix" type="strOptionType" minOccurs="0"/>
             <xsd:element name="gawron.beta" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="gawron.a" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="keep-all-routes" type="boolOptionType" minOccurs="0"/>

diff --git a/data/xsd/jtrrouterConfiguration.xsd b/data/xsd/jtrrouterConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-09 19:54:01 by Eclipse SUMO jtrrouter Version v1_20_0+2262-4c4b720e23e
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO jtrrouter Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -63,6 +63,7 @@
             <xsd:element name="repair.to" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.distance" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.junctions" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="mapmatch.taz" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="bulk-routing" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="routing-threads" type="intOptionType" minOccurs="0"/>
             <xsd:element name="restriction-params" type="strArrayOptionType" minOccurs="0"/>

diff --git a/data/xsd/neteditConfiguration.xsd b/data/xsd/neteditConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-09 19:54:03 by Eclipse SUMO netedit Version v1_20_0+2262-4c4b720e23e
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO netedit Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -326,6 +326,7 @@
             <xsd:element name="sidewalks.guess.exclude" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="crossings.guess" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="crossings.guess.speed-threshold" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="crossings.guess.roundabout-priority" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="walkingareas" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="walkingareas.join-dist" type="floatOptionType" minOccurs="0"/>
         </xsd:all>
@@ -434,9 +435,10 @@
             <xsd:element name="new-network" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="attribute-help-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="ignore-supermode-question" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="force-saving" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="ignore.additionalelements" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="ignore.routeelements" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="e2.friendlyPos.automatic" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="force-saving" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="node-prefix" type="strOptionType" minOccurs="0"/>
             <xsd:element name="edge-prefix" type="strOptionType" minOccurs="0"/>
             <xsd:element name="edge-infix" type="strOptionType" minOccurs="0"/>

diff --git a/data/xsd/netgenerateConfiguration.xsd b/data/xsd/netgenerateConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO netgenerate Version v1_20_0+2262-4c4b720e23e
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO netgenerate Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -279,6 +279,7 @@
             <xsd:element name="sidewalks.guess.exclude" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="crossings.guess" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="crossings.guess.speed-threshold" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="crossings.guess.roundabout-priority" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="walkingareas" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="walkingareas.join-dist" type="floatOptionType" minOccurs="0"/>
         </xsd:all>

diff --git a/data/xsd/polyconvertConfiguration.xsd b/data/xsd/polyconvertConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-12 07:53:54 by Eclipse SUMO polyconvert Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO polyconvert Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -88,6 +88,7 @@
             <xsd:element name="all-attributes" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="ignore-errors" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="poi-layer-offset" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="flatten" type="boolOptionType" minOccurs="0"/>
         </xsd:all>
     </xsd:complexType>
 

diff --git a/data/xsd/sumoConfiguration.xsd b/data/xsd/sumoConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO sumo Version v1_20_0+2262-4c4b720e23e
+<!-- generated on 2025-02-03 20:56:08 by Eclipse SUMO sumo Version v1_21_0+1830-1621789eca8
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -75,6 +75,7 @@
             <xsd:element name="elechybrid-output.aggregated" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="chargingstations-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="chargingstations-output.aggregated" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="chargingstations-output.aggregated.write-unfinished" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="overheadwiresegments-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="substations-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="substations-output.precision" type="intOptionType" minOccurs="0"/>
@@ -118,6 +119,7 @@
             <xsd:element name="personroute-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="link-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="railsignal-block-output" type="fileOptionType" minOccurs="0"/>
+            <xsd:element name="railsignal-vehicle-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="bt-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="lanechange-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="lanechange-output.started" type="boolOptionType" minOccurs="0"/>
@@ -129,6 +131,7 @@
             <xsd:element name="edgedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="lanedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="statistic-output" type="fileOptionType" minOccurs="0"/>
+            <xsd:element name="deadlock-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="save-state.times" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period.keep" type="intOptionType" minOccurs="0"/>
@@ -182,14 +185,17 @@
             <xsd:element name="time-to-teleport.highways.min-speed" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.disconnected" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.remove" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="time-to-teleport.remove-constraint" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.ride" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.bidi" type="timeOptionType" minOccurs="0"/>
+            <xsd:element name="time-to-teleport.railsignal-deadlock" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="waiting-time-memory" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="startup-wait-threshold" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="max-depart-delay" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="sloppy-insert" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="eager-insert" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="emergency-insert" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="insertion-checks" type="strOptionType" minOccurs="0"/>
             <xsd:element name="random-depart-offset" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="lanechange.duration" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="lanechange.overtake-right" type="boolOptionType" minOccurs="0"/>
@@ -200,6 +206,7 @@
             <xsd:element name="tls.delay_based.detector-range" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="tls.yellow.min-decel" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="railsignal-moving-block" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="railsignal.max-block-length" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="time-to-impatience" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="default.action-step-length" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="default.carfollowmodel" type="strOptionType" minOccurs="0"/>
@@ -220,6 +227,7 @@
             <xsd:element name="pedestrian.striping.jamtime" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="pedestrian.striping.jamtime.crossing" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="pedestrian.striping.jamtime.narrow" type="timeOptionType" minOccurs="0"/>
+            <xsd:element name="pedestrian.striping.jamfactor" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="pedestrian.striping.reserve-oncoming" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="pedestrian.striping.reserve-oncoming.junctions" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="pedestrian.striping.reserve-oncoming.max" type="floatOptionType" minOccurs="0"/>
@@ -235,6 +243,7 @@
             <xsd:element name="ride.stop-tolerance" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.distance" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="mapmatch.junctions" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="mapmatch.taz" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="weights.turnaround-penalty" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="persontrip.walk-opposite-factor" type="floatOptionType" minOccurs="0"/>
         </xsd:all>
@@ -356,11 +365,14 @@
             <xsd:element name="device.stationfinder.maxChargePower" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.chargeType" type="strOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.waitForCharge" type="timeOptionType" minOccurs="0"/>
+            <xsd:element name="device.stationfinder.minOpportunityDuration" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.saturatedChargeLevel" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.needToChargeLevel" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="device.stationfinder.opportunisticChargeLevel" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.replacePlannedStop" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.maxDistanceToReplacedStop" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.stationfinder.chargingStrategy" type="strOptionType" minOccurs="0"/>
+            <xsd:element name="device.stationfinder.checkEnergyForRoute" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="device.battery.probability" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.battery.explicit" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="device.battery.deterministic" type="boolOptionType" minOccurs="0"/>
@@ -497,6 +509,7 @@
             <xsd:element name="device.glosa.max-speedfactor" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.glosa.min-speed" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="device.glosa.add-switchtime" type="floatOptionType" minOccurs="0"/>
+            <xsd:element name="device.glosa.use-queue" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="device.glosa.override-safety" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="device.glosa.ignore-cfmodel" type="boolOptionType" minOccurs="0"/>
         </xsd:all>