adapting xsd for rerouters and parameters in walks #14198 #2

eclipse-sumo · Jan 17, 2024 · 31a2b99 · 31a2b99
1 parent 62809d8
commit 31a2b99
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/data/xsd/additional_file.xsd b/data/xsd/additional_file.xsd
@@ -358,6 +358,12 @@
                                 <xsd:attribute name="visible" type="boolType"/>
                             </xsd:complexType>
                         </xsd:element>
+                        <xsd:element name="viaProbReroute">
+                            <xsd:complexType>
+                                <xsd:attribute name="id" type="idType" use="required"/>
+                                <xsd:attribute name="probability" type="nonNegativeFloatType"/>
+                            </xsd:complexType>
+                        </xsd:element>
                     </xsd:choice>
                     <xsd:attribute name="begin" type="nonNegativeFloatType" use="required"/>
                     <xsd:attribute name="end" type="nonNegativeFloatType" use="required"/>

diff --git a/data/xsd/routeTypes.xsd b/data/xsd/routeTypes.xsd
@@ -892,6 +892,9 @@
         <xsd:choice maxOccurs="unbounded">
             <xsd:element name="personTrip">
                 <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
                     <xsd:attribute name="from" type="xsd:string"/>
                     <xsd:attribute name="to" type="xsd:string"/>
                     <xsd:attribute name="fromTaz" type="xsd:string"/>
@@ -920,6 +923,9 @@
             </xsd:element>
             <xsd:element name="ride">
                 <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
                     <xsd:attribute name="from" type="xsd:string"/>
                     <xsd:attribute name="to" type="xsd:string"/>
                     <xsd:attribute name="busStop" type="xsd:string"/>
@@ -941,6 +947,9 @@
             </xsd:element>
             <xsd:element name="walk">
                 <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
                     <xsd:attribute name="route" type="xsd:string"/>
                     <xsd:attribute name="edges" type="xsd:string"/>
                     <xsd:attribute name="from" type="xsd:string"/>