Merge branch 'changes_for_v1.1' into AddAccessFeatureStatusOnPathLink

VDVde · Nov 26, 2022 · 7c2b429 · 7c2b429
2 parents 79af443 + 12b44f7
commit 7c2b429
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 31 deletions.
diff --git a/OJP/OJP_FareSupport.xsd b/OJP/OJP_FareSupport.xsd
@@ -18,16 +18,13 @@
 			<xs:enumeration value="economy"/>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="VatRateEnumeration">
+	<xs:simpleType name="Percentage">
 		<xs:annotation>
-			<xs:documentation>Enumeration of Value Added Tax rates.</xs:documentation>
+			<xs:documentation>A percentage value between 0 and 100</xs:documentation>
 		</xs:annotation>
-		<xs:restriction base="xs:NMTOKEN">
-			<xs:enumeration value="no"/>
-			<xs:enumeration value="full"/>
-			<xs:enumeration value="half"/>
-			<xs:enumeration value="mixed"/>
-			<xs:enumeration value="unknown"/>
+		<xs:restriction base="xs:decimal">
+			<xs:minInclusive value="0.0"/>
+			<xs:maxInclusive value="100.0"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:annotation>
@@ -300,9 +297,9 @@
 					<xs:documentation>iso 4217 currency code, e.g. EUR for Euro or GBP for Pound Sterling </xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VatRate" type="VatRateEnumeration" minOccurs="0">
+			<xs:element name="VatRate" type="Percentage" minOccurs="0">
 				<xs:annotation>
-					<xs:documentation>Rate of value added tax. Default is unknown.</xs:documentation>
+					<xs:documentation>Rate of value added tax.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>

diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd
@@ -63,6 +63,11 @@
 		</xs:annotation>
 		<xs:sequence>
 			<xs:element ref="JourneyRef"/>
+			<xs:element name="PublicCode" type="xs:normalizedString" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Public code of the SERVICE JOURNEY (same meaning as in NeTEx). Examples: "512", "S8" or "Circle Line" or "ICE 488".</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:group ref="ServiceGroup"/>
 		</xs:sequence>
 	</xs:group>
@@ -89,7 +94,12 @@
 			</xs:element>
 			<xs:element name="TrainNumber" type="xs:normalizedString" minOccurs="0">
 				<xs:annotation>
-					<xs:documentation>Contains the TrainNumber description from NeTEx. If several TrainNumber types exist, use the commercial number.</xs:documentation>
+					<xs:documentation>Contains the TrainNumber from NeTEx (TRAIN NUMBER from Transmodel). If several TrainNumber types exist, use the commercial one. In some cases also non-train modes will use TrainNumber.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element ref="siri:VehicleRef" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Contains the Vehicle reference of the vehicle. In Transmodel this may be the VEHICLE Id.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element ref="OperatorRef" minOccurs="0"/>

diff --git a/OJP/OJP_PlaceSupport.xsd b/OJP/OJP_PlaceSupport.xsd
@@ -460,6 +460,11 @@
 					<xs:documentation>Public name of the place.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
+			<xs:element name="AllowedSystemId" type="xs:normalizedString" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Used in distributed environments. e.g. EU-Spirit. If none is given, the place information request refers to all known systems (in EU-Spirit "passive servers"). If at least one is given, the place information request refers only to the given systems (in EU-Spirit "passive servers"). In EU-Spirit the system IDs were previously called "provider code". See https://eu-spirit.eu/</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 </xs:schema>
diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd
@@ -733,12 +733,18 @@
 			<xs:documentation>Allowed values for a AccessFeature.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="lift"/>
+			<xs:enumeration value="elevator"/>
 			<xs:enumeration value="stairs"/>
 			<xs:enumeration value="seriesOfStairs"/>
+			<xs:enumeration value="singleStep"/>
+			<xs:enumeration value="seriesOfSingleSteps"/>
 			<xs:enumeration value="escalator"/>
+			<xs:enumeration value="travelator"/>
 			<xs:enumeration value="ramp"/>
 			<xs:enumeration value="footpath"/>
+			<xs:enumeration value="shuttle"/>
+			<xs:enumeration value="other"/>
+			<xs:enumeration value="unkown"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="TransitionEnumeration">
@@ -778,6 +784,41 @@
 			<xs:enumeration value="accessFeaturePartiallyAvailable"/>
 			<xs:enumeration value="accessFeatureWithUnknownAvailability"/>
 			<xs:enumeration value="seeSituations"/>
+	<xs:simpleType name="AccessibilityFeatureTypesEnumeration">
+		<xs:annotation>
+			<xs:documentation>Allowed values for AccessibilityFeature (for mobility and sensory impairments, assistance and important elements to pay attention to).</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="lowFloorAccess"/>
+			<xs:enumeration value="stepFreeAccess"/>
+			<xs:enumeration value="accessWithSteps"/>
+			<xs:enumeration value="slidingStep"/>
+			<xs:enumeration value="raisedKerb"/>
+			<xs:enumeration value="narrowEntrance"/>
+			<xs:enumeration value="wheelchairLift"/>
+			<xs:enumeration value="manualRamp"/>
+			<xs:enumeration value="automaticRamp"/>
+			<xs:enumeration value="suitableForWheelchairs"/>
+			<xs:enumeration value="suitableForUnassistedWheelchairs"/>
+			<xs:enumeration value="suitableForHeaviliyDisabled"/>
+			<xs:enumeration value="suitableForPushchairs"/>
+			<xs:enumeration value="suitableForBicycles"/>
+			<xs:enumeration value="tactilePlatformEdges"/>
+			<xs:enumeration value="tactileGuidingStrips"/>
+			<xs:enumeration value="tactileOrAuditorySigns"/>
+			<xs:enumeration value="visualSigns"/>
+			<xs:enumeration value="elevatorWithTactileButtons"/>
+			<xs:enumeration value="elevatorWithAcousticAnnouncements"/>
+			<xs:enumeration value="audioInformation"/>
+			<xs:enumeration value="audioForHearingImpaired"/>
+			<xs:enumeration value="visualDisplays"/>
+			<xs:enumeration value="displaysForVisuallyImpaired"/>
+			<xs:enumeration value="largePrintTimetables"/>
+			<xs:enumeration value="boardingAssistance"/>
+			<xs:enumeration value="onboardAssistance"/>
+			<xs:enumeration value="unaccompaniedMinorAssistance"/>
+			<xs:enumeration value="barrier"/>
+			<xs:enumeration value="validator"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="PathLinkStructure">
@@ -815,6 +856,11 @@
 					<xs:documentation>Reference to a situation that affects the availability of the access feature.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
+			<xs:element name="AccessibilityFeature" type="AccessibilityFeatureTypesEnumeration" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Presence of an accessibility feature on the PathLink.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="From" type="PathLinkEndStructure" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>Designations of level and place where this PathLink starts.</xs:documentation>