first draft of the inclusion of formations

Technically simple, the explanation of the usage more difficult. We need a chapter on VehicleFeatureRef in OJP.
VDVde · Mar 3, 2023 · db201eb · db201eb
1 parent dc93a5f
commit db201eb
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd
@@ -223,8 +223,18 @@
 				<xs:group ref="PrivateServiceGroup"/>
 			</xs:choice>
 			<xs:group ref="ServiceOriginGroup" minOccurs="0"/>
+			<xs:group ref="siri:ServiceInfoGroup" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The group contains the VehicleFeatureRef from SIRI that are used to describe some characteristics of vehicles and don't rely on FORMATION.</xs:documentation>
+				</xs:annotation>
+			</xs:group>
 			<xs:group ref="ServiceDestinationGroup"/>
 			<xs:group ref="ServiceStatusGroup"/>
+			<xs:group ref="siri:JourneyFormationGroup"> <!-- not in the old SIRI!!! -->
+				<xs:annotation>
+					<xs:documentation>The formation elements on the journey level.</xs:documentation>
+				</xs:annotation>
+			</xs:group>
 			<xs:element name="BookingArrangements" type="BookingArrangementsContainerStructure" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>Container with information on booking possibilities for this service.</xs:documentation>
@@ -319,6 +329,8 @@
 		</xs:annotation>
 		<xs:sequence>
 			<xs:group ref="ServiceTimeGroup"/>
+			<xs:element ref="siri:ArrivalFormationAssignment" minOccurs="0"/> <!-- comes with SIRI 2.1 -->
+			<!-- TODO the quays should be moved here, too -->			
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ServiceDepartureStructure">
@@ -327,6 +339,8 @@
 		</xs:annotation>
 		<xs:sequence>
 			<xs:group ref="ServiceTimeGroup"/>
+			<xs:element ref="siri:DepartureFormationAssignment" minOccurs="0"/> <!-- comes with SIRI 2.1 -->
+			<!-- TODO the quays should be moved here, too -->				
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="CallAtStopStructure">