Added Attributes to LegBoard, LegAligt und LegIntermediate (#406)

* Added Attributes to LegBoard, LegAligt und LegIntermediate and improved example to show it. * added to StopEvent as well * Lint and update documentation tables * Lint and update documentation tables * Update OJP/OJP_Trips.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update OJP/OJP_Trips.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update OJP/OJP_JourneySupport.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update OJP/OJP_Trips.xsd Co-authored-by: Stefan de Konink <[email protected]> * Lint and update documentation tables * Attribute now part of StopCallStatusGroup * Lint and update documentation tables * Integrated ParkingFacility, had to rebuild it from siri:AllFAcilityFeatureStructure must be corrected in SIRI as well * fixing examples * Lint and update documentation tables * Key/Value added to Attribute * Lint and update documentation tables * <Text><Text> changed in Attribute * Lint and update documentation tables * removing AllFacilitiesGroup we always refer the siri: if necesasry * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Stefan de Konink <[email protected]>
VDVde · Oct 16, 2023 · c58e03d · c58e03d
1 parent bea8101
commit c58e03d
Show file tree

Hide file tree

Showing 27 changed files with 2,032 additions and 283 deletions.
diff --git a/OJP/OJP_Common.xsd b/OJP/OJP_Common.xsd
@@ -439,7 +439,7 @@
 			<xs:documentation>Structured attribute classification with associated text. If URL is given, it refers to the whole attribute text.</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
-			<xs:element name="Text" type="InternationalTextStructure">
+			<xs:element name="UserText" type="InternationalTextStructure">
 				<xs:annotation>
 					<xs:documentation>Text of the attribute to be shown to the user.</xs:documentation>
 				</xs:annotation>
@@ -449,7 +449,21 @@
 					<xs:documentation>Internal code of the attribute. Can be used for detection of double occurrences.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:group ref="AllFacilitiesGroup"/>
+			<xs:element name="Key" type="xs:NMTOKEN" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Key if the attribute is used as a key/value pair.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Value" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Value if the attribute is used as a key/value pair.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Facility" type="siri:AllFacilitiesFeatureStructure" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Facilities associated with this attribute.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="Mandatory" type="xs:boolean" default="false" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>Defines whether the attribute has to be shown to the user.</xs:documentation>

diff --git a/OJP/OJP_FacilitySupport.xsd b/OJP/OJP_FacilitySupport.xsd
@@ -5,14 +5,6 @@
 	</xs:annotation>
 	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/xsd/siri_model/siri_all.xsd"/>
 	<xs:include schemaLocation="OJP_All.xsd"/>
-	<xs:group name="AllFacilitiesGroup">
-		<xs:annotation>
-			<xs:documentation>Wrapper for SIRI facilities.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:group ref="siri:AllFacilitiesGroup"/>
-		</xs:sequence>
-	</xs:group>
 	<xs:group name="StopFacilityGroup">
 		<xs:annotation>
 			<xs:documentation>Wrapper for SIRI stop facilities.</xs:documentation>

diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd
@@ -464,6 +464,11 @@
 					</xs:annotation>
 				</xs:element>
 			</xs:sequence>
+			<xs:element name="Attribute" type="GeneralAttributeStructure" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Note or attribute.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="ServiceStatusGroup">

diff --git a/docs/generated/index.html b/docs/generated/index.html
diff --git a/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml b/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml
@@ -72,17 +72,19 @@
 										<OperatorRef>182</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Nur 2. Klasse</Text>
-										</Text>
+										</UserText>
 										<Code>A___2</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Restaurant</Text>
-										</Text>
+										</UserText>
 										<Code>A__WR</Code>
-										<siri:RefreshmentFacility>restaurantService</siri:RefreshmentFacility>
+										<Facility>
+											<siri:RefreshmentFacility>restaurantService</siri:RefreshmentFacility>
+										</Facility>
 									</Attribute>
 									<OriginText>
 										<Text>St. Petersinsel Nord</Text>

diff --git a/examples/functions/location/LIR_01_response_simple_StopPoint.xml b/examples/functions/location/LIR_01_response_simple_StopPoint.xml
@@ -38,6 +38,22 @@
 							<PtMode>bus</PtMode>
 							<siri:BusSubmode>localBusService</siri:BusSubmode>
 						</Mode>
+						<Attribute>
+							<UserText>
+								<Text xml:lang="de">Park and Ride Zürich Kreuzplatz</Text>
+								<Text xml:lang="en">Park and Ride Zürich Kreuzplatz</Text>
+							</UserText>
+							<Code>1231211-12311</Code>
+							<Key>PR_NOVA</Key>
+							<Value>12301</Value>
+							<!-- the key used by NOVA to identify this park and ride -->
+							<Facility>
+								<siri:ParkingFacility>parkAndRidePark</siri:ParkingFacility>
+							</Facility>
+							<Facility>
+								<siri:ParkingFacility>carPark</siri:ParkingFacility>
+							</Facility>
+						</Attribute>
 					</Place>
 					<Complete>true</Complete>
 					<Probability>1</Probability>

diff --git a/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml b/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml
@@ -31,6 +31,19 @@
 									<TimetabledTime>2021-08-17T08:25:00Z</TimetabledTime>
 								</ServiceDeparture>
 								<Order>5</Order>
+								<siri:ExpectedDepartureOccupancy>
+									<siri:OccupancyLevel>fewSeatsAvailable</siri:OccupancyLevel>
+									<siri:TotalNumberOfReservedSeats>10</siri:TotalNumberOfReservedSeats>
+								</siri:ExpectedDepartureOccupancy>
+								<Attribute>
+									<UserText>
+										<Text>Boarding</Text>
+									</UserText>
+									<Code>PRM</Code>
+									<Facility>
+										<siri:AssistanceFacility>boardingAssistance</siri:AssistanceFacility>
+									</Facility>
+								</Attribute>
 							</CallAtStop>
 						</ThisCall>
 						<Service>

diff --git a/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml b/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml
@@ -220,9 +220,9 @@
 								<OperatorRef>128</OperatorRef>
 							</OperatorRefs>
 							<Attribute>
-								<Text>
+								<UserText>
 									<Text xml:lang="de">Maskenpflicht fÃ¼r Reisende ab 12 Jahren</Text>
-								</Text>
+								</UserText>
 								<Code>A__OM</Code>
 							</Attribute>
 							<OriginStopPointRef>8504356</OriginStopPointRef>

diff --git a/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml b/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml
@@ -96,9 +96,9 @@
 										<Text>Description of the route.</Text>
 									</RouteDescription>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Links</Text>
-										</Text>
+										</UserText>
 										<Code>ojp91013YR_InfoCall65511_105764_1</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -193,21 +193,21 @@
 										<OperatorRef>11</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Links</Text>
-										</Text>
+										</UserText>
 										<Code>ojp910S1NH_InfoCall179_105764_1</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Links</Text>
-										</Text>
+										</UserText>
 										<Code>ojp910S1NH_InfoCall179_107680_1</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -286,42 +286,48 @@
 										<OperatorRef>11</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Businesszone in 1. Klasse</Text>
-										</Text>
+										</UserText>
 										<Code>A__BZ</Code>
-										<siri:FareClassFacility>firstClass</siri:FareClassFacility>
-										<siri:PassengerCommsFacility>businessServices</siri:PassengerCommsFacility>
+										<Facility>
+											<siri:FareClassFacility>firstClass</siri:FareClassFacility>
+										</Facility>
+										<Facility>
+											<siri:PassengerCommsFacility>businessServices</siri:PassengerCommsFacility>
+										</Facility>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Familienwagen mit Spielplatz</Text>
-										</Text>
+										</UserText>
 										<Code>A__FA</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Ruhezone in 1. Klasse</Text>
-										</Text>
+										</UserText>
 										<Code>A__RZ</Code>
-										<siri:NuisanceFacility>mobilePhoneFreeZone</siri:NuisanceFacility>
+										<Facility>
+											<siri:NuisanceFacility>mobilePhoneFreeZone</siri:NuisanceFacility>
+										</Facility>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Links</Text>
-										</Text>
+										</UserText>
 										<Code>ojp91IR75R_InfoCall161_106218_1</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Links</Text>
-										</Text>
+										</UserText>
 										<Code>ojp91IR75R_InfoCall161_107680_1</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>

diff --git a/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml b/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml
@@ -421,15 +421,15 @@
 										<OperatorRef>3849</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Niederflureinstieg</Text>
-										</Text>
+										</UserText>
 										<Code>A__NF</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -558,15 +558,15 @@
 										<OperatorRef>3849</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Niederflureinstieg</Text>
-										</Text>
+										</UserText>
 										<Code>A__NF</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -947,15 +947,15 @@
 										<OperatorRef>849</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Niederflureinstieg</Text>
-										</Text>
+										</UserText>
 										<Code>A__NF</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -1165,21 +1165,21 @@
 										<OperatorRef>11</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Rechts</Text>
-										</Text>
+										</UserText>
 										<Code>ojp91S12ZH_InfoCall77_106219_1</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Aussteigeseite: Rechts</Text>
-										</Text>
+										</UserText>
 										<Code>ojp91S12ZH_InfoCall77_106220_1</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>
@@ -1410,15 +1410,15 @@
 										<OperatorRef>3849</OperatorRef>
 									</OperatorRefs>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Maskenpflicht für Reisende ab 12 Jahren</Text>
-										</Text>
+										</UserText>
 										<Code>A__OM</Code>
 									</Attribute>
 									<Attribute>
-										<Text>
+										<UserText>
 											<Text xml:lang="de">Niederflureinstieg</Text>
-										</Text>
+										</UserText>
 										<Code>A__NF</Code>
 									</Attribute>
 									<DestinationStopPointRef>de:00000:-1</DestinationStopPointRef>