adding new options to xsd and docs #2 #563

eclipse-sumo · Oct 9, 2024 · 21e37dd · 21e37dd
1 parent 50f5dab
commit 21e37dd
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 22 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-06-12 07:53:54 by Eclipse SUMO duarouter Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:01 by Eclipse SUMO duarouter Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -81,6 +81,7 @@
  <xsd:element name="weights.expand" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="weights.minor-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="weights.tls-penalty" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="weights.turnaround-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="weights.random-factor" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="weight-period" type="timeOptionType" minOccurs="0"/>
  <xsd:element name="weights.priority-factor" type="floatOptionType" 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-06-12 07:53:54 by Eclipse SUMO jtrrouter Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:01 by Eclipse SUMO jtrrouter Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -68,6 +68,7 @@
  <xsd:element name="restriction-params" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="weights.minor-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="weights.tls-penalty" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="weights.turnaround-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="max-edges-factor" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="turn-defaults" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="sink-edges" type="strArrayOptionType" minOccurs="0"/>

diff --git a/data/xsd/marouterConfiguration.xsd b/data/xsd/marouterConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-12 07:53:54 by Eclipse SUMO marouter Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO marouter Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -72,6 +72,7 @@
  <xsd:element name="weights.expand" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="weights.minor-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="weights.tls-penalty" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="weights.turnaround-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="aggregation-interval" type="timeOptionType" minOccurs="0"/>
  <xsd:element name="capacities.default" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="weights.priority-factor" type="floatOptionType" minOccurs="0"/>
@@ -105,6 +106,7 @@
 
  <xsd:complexType name="defaultsTopicType">
  <xsd:all>
+ <xsd:element name="defaults-override" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="flow-output.departlane" type="strOptionType" minOccurs="0"/>
  <xsd:element name="flow-output.departpos" type="strOptionType" minOccurs="0"/>
  <xsd:element name="flow-output.departspeed" type="strOptionType" minOccurs="0"/>

diff --git a/data/xsd/netconvertConfiguration.xsd b/data/xsd/netconvertConfiguration.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-12 07:53:54 by Eclipse SUMO netconvert Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO netconvert Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -123,6 +123,7 @@
  <xsd:element name="geometry.max-segment-length" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-dist" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.max-angle" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="geometry.max-angle.fix" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius.fix" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius.fix.railways" type="boolOptionType" minOccurs="0"/>
@@ -175,6 +176,7 @@
  <xsd:element name="default.junctions.keep-clear" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="default.junctions.radius" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.connection-length" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="default.connection.cont-pos" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.right-of-way" type="strOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
@@ -255,6 +257,7 @@
  <xsd:element name="keep-edges.components" type="intOptionType" minOccurs="0"/>
  <xsd:element name="remove-edges.by-type" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="remove-edges.isolated" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="keep-lanes.min-width" type="floatOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
 
@@ -339,6 +342,7 @@
  <xsd:element name="railway.topology.all-bidi.input-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="railway.topology.direction-priority" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.topology.extend-priority" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="railway.geometry.straighten" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.signal.guess.by-stops" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.access-distance" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="railway.max-accesses" type="intOptionType" 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-06-12 07:53:54 by Eclipse SUMO netedit Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:03 by Eclipse SUMO netedit Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -40,6 +40,7 @@
  <xsd:element name="data-files" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="meandata-files" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="ignore-missing-inputs" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="selection-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="sumo-net-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="node-files" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="edge-files" type="fileOptionType" minOccurs="0"/>
@@ -133,6 +134,7 @@
  <xsd:element name="geometry.max-segment-length" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-dist" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.max-angle" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="geometry.max-angle.fix" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius.fix" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="geometry.min-radius.fix.railways" type="boolOptionType" minOccurs="0"/>
@@ -185,6 +187,7 @@
  <xsd:element name="default.junctions.keep-clear" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="default.junctions.radius" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.connection-length" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="default.connection.cont-pos" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.right-of-way" type="strOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
@@ -265,6 +268,7 @@
  <xsd:element name="keep-edges.components" type="intOptionType" minOccurs="0"/>
  <xsd:element name="remove-edges.by-type" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="remove-edges.isolated" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="keep-lanes.min-width" type="floatOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
 
@@ -349,6 +353,7 @@
  <xsd:element name="railway.topology.all-bidi.input-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="railway.topology.direction-priority" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.topology.extend-priority" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="railway.geometry.straighten" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.signal.guess.by-stops" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="railway.access-distance" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="railway.max-accesses" type="intOptionType" 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-06-12 07:53:54 by Eclipse SUMO netgenerate Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO netgenerate Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -166,6 +166,7 @@
  <xsd:element name="default.junctions.keep-clear" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="default.junctions.radius" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.connection-length" type="floatOptionType" minOccurs="0"/>
+ <xsd:element name="default.connection.cont-pos" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="default.right-of-way" type="strOptionType" minOccurs="0"/>
  <xsd:element name="default-junction-type" type="strOptionType" minOccurs="0"/>
  </xsd:all>
@@ -221,6 +222,7 @@
  <xsd:element name="remove-edges.input-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="keep-edges.in-boundary" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="keep-edges.in-geo-boundary" type="strArrayOptionType" minOccurs="0"/>
+ <xsd:element name="keep-lanes.min-width" type="floatOptionType" 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-06-12 07:53:54 by Eclipse SUMO sumo Version v1_20_0+0443-233e48e5c88
+<!-- generated on 2024-10-09 19:54:02 by Eclipse SUMO sumo Version v1_20_0+2262-4c4b720e23e
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -67,12 +67,14 @@
  <xsd:element name="emission-output.precision" type="intOptionType" minOccurs="0"/>
  <xsd:element name="emission-output.geo" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="emission-output.step-scaled" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="emission-output.attributes" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="battery-output" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="battery-output.precision" type="intOptionType" minOccurs="0"/>
  <xsd:element name="elechybrid-output" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="elechybrid-output.precision" type="intOptionType" minOccurs="0"/>
  <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="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"/>
@@ -139,6 +141,7 @@
  <xsd:element name="save-state.precision" type="intOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.jupedsim.wkt" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.jupedsim.wkt.geo" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="pedestrian.jupedsim.py" type="fileOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
 
@@ -210,6 +213,7 @@
  <xsd:element name="use-stop-ended" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="use-stop-started" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.model" type="strOptionType" minOccurs="0"/>
+ <xsd:element name="pedestrian.timegap-crossing" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.striping.stripe-width" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.striping.dawdling" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="pedestrian.striping.mingap-to-vehicle" type="floatOptionType" minOccurs="0"/>
@@ -231,6 +235,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="weights.turnaround-penalty" type="floatOptionType" minOccurs="0"/>
  <xsd:element name="persontrip.walk-opposite-factor" type="floatOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
@@ -273,6 +278,8 @@
  <xsd:element name="person-device.rerouting.explicit" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="person-device.rerouting.deterministic" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="person-device.rerouting.period" type="timeOptionType" minOccurs="0"/>
+ <xsd:element name="person-device.rerouting.mode" type="strOptionType" minOccurs="0"/>
+ <xsd:element name="person-device.rerouting.scope" type="strOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
 
@@ -351,6 +358,9 @@
  <xsd:element name="device.stationfinder.waitForCharge" 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.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.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"/>
@@ -486,6 +496,9 @@
  <xsd:element name="device.glosa.range" type="floatOptionType" minOccurs="0"/>
  <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.override-safety" type="boolOptionType" minOccurs="0"/>
+ <xsd:element name="device.glosa.ignore-cfmodel" type="boolOptionType" minOccurs="0"/>
  </xsd:all>
  </xsd:complexType>
 
@@ -572,6 +585,7 @@
  <xsd:element name="breakpoints" type="strArrayOptionType" minOccurs="0"/>
  <xsd:element name="edgedata-files" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="alternative-net-file" type="fileOptionType" minOccurs="0"/>
+ <xsd:element name="selection-file" type="fileOptionType" minOccurs="0"/>
  <xsd:element name="demo" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="disable-textures" type="boolOptionType" minOccurs="0"/>
  <xsd:element name="registry-viewport" type="boolOptionType" minOccurs="0"/>