Add examples and enable validation (#115)

* Set OJP version to 1.1-dev in order to make sure the breaking changes of renaming Location => Place and others are made clear... * Examples are OJP-1.0 files which have been adapted for 1.1-dev * Use "./siri_model/siri_all-v2.0.xsd" for siri namespace everywhere as xmllint and Xerces-J only allow one <import> per target namespace * Import ifopt namespace before siri, otherwise xmllint fails because the first found ifopt import statement in SIRI does not refer to "./ifopt/ifopt_allStopPlace-v0.3.xsd" * Add "xml/xml.xsd" referenced by "./siri_utility/siri_types-v2.0.xsd" using https://www.w3.org/2005/08/xml.xsd
VDVde · Nov 23, 2020 · 9187b3d · 9187b3d
1 parent 23c2d68
commit 9187b3d
Show file tree

Hide file tree

Showing 22 changed files with 8,635 additions and 45 deletions.
diff --git a/.travis/xmllint-check.sh b/.travis/xmllint-check.sh
@@ -20,4 +20,9 @@ if [ ${PARSING_ERROR} -ne 0 ]; then
 fi
 echo -e '\033[0;32mFinished formatting XSD and XML files\033[0m'
 
-# xmllint --noout --schema OJP.xsd examples/subdirectory1/*xml examples/subdirectory2/*xml
+if xmllint --noout --schema OJP.xsd examples/*/*.xml; then
+  echo -e '\033[0;32mValidating examples succeeded\033[0m'
+else
+  echo -e '\033[0;31mValidating examples failed\033[0m'
+  exit 1
+fi
diff --git a/OJP.xsd b/OJP.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.siri.org.uk/siri" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="OJP_siri">
-	<!-- ===Dependencies ======================================= -->
+<xs:schema xmlns="http://www.siri.org.uk/siri" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="OJP_siri">
 	<xs:import namespace="http://www.vdv.de/ojp" schemaLocation="OJP_Requests.xsd"/>
-	<!-- ======================================================================= -->
-	<xs:include schemaLocation="siri/siri_base-v2.0.xsd"/>
+	<!-- ifopt must be imported before siri, otherwise xmllint fails -->
+	<xs:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="./ifopt/ifopt_allStopPlace-v0.3.xsd"/>
+	<xs:include schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<!--== SIRI Request include OJP Requests ===================================================================== -->
 	<xs:element name="OJP">
 		<xs:annotation>
@@ -17,7 +17,7 @@
 				</xs:choice>
 				<xs:element ref="Extensions" minOccurs="0"/>
 			</xs:sequence>
-			<xs:attribute name="version" type="xs:NMTOKEN" use="required" fixed="1.0"/>
+			<xs:attribute name="version" type="xs:NMTOKEN" use="required" fixed="1.1-dev"/>
 		</xs:complexType>
 	</xs:element>
 	<!-- ======================================================================= -->

diff --git a/OJP_Common.xsd b/OJP_Common.xsd
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_reference-v2.0.xsd"/>
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_operator_support-v2.0.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
 	<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
 	<xs:annotation>

diff --git a/OJP_FacilitySupport.xsd b/OJP_FacilitySupport.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_facilities-v1.2.xsd"/>
-	<!--	<xs:include schemaLocation="OJP_Common.xsd"/>-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:annotation>
 		<xs:documentation>==================================== Facilities from SIRI =============================================</xs:documentation>
 	</xs:annotation>

diff --git a/OJP_Fare.xsd b/OJP_Fare.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
 	<xs:include schemaLocation="OJP_Trips.xsd"/>

diff --git a/OJP_JourneySupport.xsd b/OJP_JourneySupport.xsd
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_utility/siri_location-v2.0.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
 	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
 	<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
-	<!-- ===========================================================================================================-->
 	<xs:complexType name="ServiceViaPointStructure">
 		<xs:annotation>
 			<xs:documentation>[a specialisation of VIA in TMv6] STOP PLACE or SCHEDULED STOP POINT as a VIA for a particular SERVICE PATTERN. Specialisation of a VIA.</xs:documentation>

diff --git a/OJP_ModesSupport.xsd b/OJP_ModesSupport.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Utility.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= Individual Modes ============================</xs:documentation>

diff --git a/OJP_PlaceSupport.xsd b/OJP_PlaceSupport.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= Stop Points =============================================</xs:documentation>

diff --git a/OJP_Places.xsd b/OJP_Places.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
 	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>

diff --git a/OJP_RequestSupport.xsd b/OJP_RequestSupport.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_all_framework-v2.0.xsd"/>
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_journey_support-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
 	<xs:include schemaLocation="OJP_SituationSupport.xsd"/>

diff --git a/OJP_Requests.xsd b/OJP_Requests.xsd
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified" id="OJP_siri_service">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_requests-v2.0.xsd"/>
-	<!-- ===OJP Services ======================================= -->
+<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified" id="OJP_siri_service">
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Fare.xsd"/>
 	<xs:include schemaLocation="OJP_Places.xsd"/>
 	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
 	<xs:include schemaLocation="OJP_StopEvents.xsd"/>
 	<xs:include schemaLocation="OJP_TripInfo.xsd"/>
 	<xs:include schemaLocation="OJP_Trips.xsd"/>
-	<!-- ======================================================================= -->
 	<!-- ==== Fare Service=============================================== -->
 	<xs:element name="OJPFareRequest" type="OJPFareRequestStructure" substitutionGroup="siri:AbstractFunctionalServiceRequest"/>
 	<xs:complexType name="OJPFareRequestStructure">

diff --git a/OJP_SituationSupport.xsd b/OJP_SituationSupport.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all_situation-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:complexType name="SituationsStructure">
 		<xs:annotation>
 			<xs:documentation>Wrapper type for SIRI PtSituationsElementStructure</xs:documentation>

diff --git a/OJP_StopEvents.xsd b/OJP_StopEvents.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
 	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>

diff --git a/OJP_Trips.xsd b/OJP_Trips.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_utility/siri_location-v2.0.xsd"/>
-	<!-- ===========================================================================================================-->
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:include schemaLocation="OJP_Common.xsd"/>
 	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
 	<xs:include schemaLocation="OJP_FareSupport.xsd"/>

diff --git a/OJP_Utility.xsd b/OJP_Utility.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ===Dependencies ======================================= -->
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_utility/siri_location-v2.0.xsd"/>
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_utility/siri_types-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= General ================================================</xs:documentation>
 	</xs:annotation>

diff --git a/examples/switzerland/PlaceInformation_001_Stop_PlaceRef_Request.xml b/examples/switzerland/PlaceInformation_001_Stop_PlaceRef_Request.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OJP xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.siri.org.uk/siri" xmlns:ojp="http://www.vdv.de/ojp" version="1.1-dev" xsi:schemaLocation="http://www.siri.org.uk/siri ../../OJP.xsd">
+	<OJPRequest>
+		<ServiceRequest>
+			<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
+			<RequestorRef>IRMA</RequestorRef>
+			<ojp:OJPPlaceInformationRequest>
+				<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
+				<MessageIdentifier>4711</MessageIdentifier>
+				<ojp:PlaceRef>
+					<StopPointRef>8530813</StopPointRef>
+					<ojp:Name>
+						<ojp:Text>Zürich Kreuzplatz</ojp:Text>
+					</ojp:Name>
+				</ojp:PlaceRef>
+				<ojp:Restrictions>
+					<ojp:Type>stop</ojp:Type>
+					<ojp:IncludePtModes>true</ojp:IncludePtModes>
+				</ojp:Restrictions>
+			</ojp:OJPPlaceInformationRequest>
+		</ServiceRequest>
+	</OJPRequest>
+</OJP>
diff --git a/examples/switzerland/PlaceInformation_001_Stop_PlaceRef_Response.xml b/examples/switzerland/PlaceInformation_001_Stop_PlaceRef_Response.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<siri:OJP xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ojp="http://www.vdv.de/ojp" version="1.1-dev" xsi:schemaLocation="http://www.siri.org.uk/siri ../../OJP.xsd">
+	<siri:OJPResponse>
+		<siri:ServiceDelivery>
+			<siri:ResponseTimestamp>2020-10-01T17:54:38Z</siri:ResponseTimestamp>
+			<siri:ProducerRef>OJPCH_Prod</siri:ProducerRef>
+			<siri:Status>true</siri:Status>
+			<ojp:OJPPlaceInformationDelivery>
+				<siri:ResponseTimestamp>2020-10-01T17:54:38Z</siri:ResponseTimestamp>
+				<siri:RequestMessageRef>4711</siri:RequestMessageRef>
+				<siri:Status>true</siri:Status>
+				<ojp:CalcTime>20</ojp:CalcTime>
+				<ojp:PlaceResult>
+					<ojp:Place>
+						<ojp:StopPlace>
+							<ojp:StopPlaceRef>8530813</ojp:StopPlaceRef>
+							<ojp:StopPlaceName>
+								<ojp:Text>Zürich Kreuzplatz</ojp:Text>
+							</ojp:StopPlaceName>
+							<ojp:TopographicPlaceRef>23026261:27</ojp:TopographicPlaceRef>
+						</ojp:StopPlace>
+						<ojp:Name>
+							<ojp:Text xml:lang="de">Zürich</ojp:Text>
+						</ojp:Name>
+						<ojp:GeoPosition>
+							<siri:Longitude>8.55408</siri:Longitude>
+							<siri:Latitude>47.36488</siri:Latitude>
+						</ojp:GeoPosition>
+					</ojp:Place>
+					<ojp:Complete>true</ojp:Complete>
+					<ojp:Probability>1</ojp:Probability>
+					<ojp:Mode>
+						<ojp:PtMode>rail</ojp:PtMode>
+						<siri:RailSubmode>unknown</siri:RailSubmode>
+					</ojp:Mode>
+					<ojp:Mode>
+						<ojp:PtMode>tram</ojp:PtMode>
+						<siri:TramSubmode>cityTram</siri:TramSubmode>
+					</ojp:Mode>
+					<ojp:Mode>
+						<ojp:PtMode>bus</ojp:PtMode>
+						<siri:BusSubmode>localBusService</siri:BusSubmode>
+					</ojp:Mode>
+				</ojp:PlaceResult>
+			</ojp:OJPPlaceInformationDelivery>
+		</siri:ServiceDelivery>
+	</siri:OJPResponse>
+</siri:OJP>
diff --git a/examples/switzerland/PlaceInformation_002_Stop_InitialInput_Request.xml b/examples/switzerland/PlaceInformation_002_Stop_InitialInput_Request.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OJP xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.siri.org.uk/siri" xmlns:ojp="http://www.vdv.de/ojp" version="1.1-dev" xsi:schemaLocation="http://www.siri.org.uk/siri ../../OJP.xsd">
+	<OJPRequest>
+		<ServiceRequest>
+			<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
+			<RequestorRef>IRMA</RequestorRef>
+			<ojp:OJPPlaceInformationRequest>
+				<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
+				<MessageIdentifier>4712</MessageIdentifier>
+				<ojp:InitialInput>
+					<ojp:Name>Bern</ojp:Name>
+				</ojp:InitialInput>
+				<ojp:Restrictions>
+					<ojp:Type>stop</ojp:Type>
+					<ojp:IncludePtModes>true</ojp:IncludePtModes>
+				</ojp:Restrictions>
+			</ojp:OJPPlaceInformationRequest>
+		</ServiceRequest>
+	</OJPRequest>
+</OJP>