Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change directory structure and add OJP_All.xsd #117

Merged
merged 1 commit into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions OJP.xsd
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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:import namespace="http://www.vdv.de/ojp" schemaLocation="./OJP/OJP_All.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"/>
<xs:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="./siri/ifopt/ifopt_allStopPlace-v0.3.xsd"/>
<xs:include schemaLocation="./siri/siri_model/siri_all-v2.0.xsd"/>
<!--== SIRI Request include OJP Requests ===================================================================== -->
<xs:element name="OJP">
<xs:annotation>
Expand Down
18 changes: 18 additions & 0 deletions OJP/OJP_All.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
<xs:include schemaLocation="OJP_Fare.xsd"/>
<xs:include schemaLocation="OJP_FareSupport.xsd"/>
<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
<xs:include schemaLocation="OJP_Places.xsd"/>
<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
<xs:include schemaLocation="OJP_Requests.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
<xs:include schemaLocation="OJP_StopEvents.xsd"/>
<xs:include schemaLocation="OJP_TripInfo.xsd"/>
<xs:include schemaLocation="OJP_Trips.xsd"/>
<xs:include schemaLocation="OJP_Utility.xsd"/>
</xs:schema>
5 changes: 2 additions & 3 deletions OJP_Common.xsd → OJP/OJP_Common.xsd
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>========================================= General ================================================</xs:documentation>
</xs:annotation>
Expand Down
3 changes: 2 additions & 1 deletion OJP_FacilitySupport.xsd → OJP/OJP_FacilitySupport.xsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>==================================== Facilities from SIRI =============================================</xs:documentation>
</xs:annotation>
Expand Down
6 changes: 2 additions & 4 deletions OJP_Fare.xsd → OJP/OJP_Fare.xsd
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_FareSupport.xsd"/>
<xs:include schemaLocation="OJP_Trips.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>====================================================Request definitions====================================================</xs:documentation>
</xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion OJP_FareSupport.xsd → OJP/OJP_FareSupport.xsd
Original file line number Diff line number Diff line change
@@ -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" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:simpleType name="TypeOfFareClassEnumeration">
<xs:annotation>
<xs:documentation>classes of travel available on a particular service which will affect the price to be paid</xs:documentation>
Expand Down
7 changes: 2 additions & 5 deletions OJP_JourneySupport.xsd → OJP/OJP_JourneySupport.xsd
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?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-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:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.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>
Expand Down
4 changes: 2 additions & 2 deletions OJP_ModesSupport.xsd → OJP/OJP_ModesSupport.xsd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Utility.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>========================================= Individual Modes ============================</xs:documentation>
</xs:annotation>
Expand Down
4 changes: 2 additions & 2 deletions OJP_PlaceSupport.xsd → OJP/OJP_PlaceSupport.xsd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>========================================= Stop Points =============================================</xs:documentation>
</xs:annotation>
Expand Down
6 changes: 2 additions & 4 deletions OJP_Places.xsd → OJP/OJP_Places.xsd
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>FUNCTION 1: Place Identification</xs:documentation>
</xs:annotation>
Expand Down
6 changes: 2 additions & 4 deletions OJP_RequestSupport.xsd → OJP/OJP_RequestSupport.xsd
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>====================================================Simple Types ====================================================</xs:documentation>
</xs:annotation>
Expand Down
9 changes: 2 additions & 7 deletions OJP_Requests.xsd → OJP/OJP_Requests.xsd
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<?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" 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"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<!-- ==== Fare Service=============================================== -->
<xs:element name="OJPFareRequest" type="OJPFareRequestStructure" substitutionGroup="siri:AbstractFunctionalServiceRequest"/>
<xs:complexType name="OJPFareRequestStructure">
Expand Down
3 changes: 2 additions & 1 deletion OJP_SituationSupport.xsd → OJP/OJP_SituationSupport.xsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:complexType name="SituationsStructure">
<xs:annotation>
<xs:documentation>Wrapper type for SIRI PtSituationsElementStructure</xs:documentation>
Expand Down
6 changes: 2 additions & 4 deletions OJP_StopEvents.xsd → OJP/OJP_StopEvents.xsd
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:group name="StopEventRequestGroup">
<xs:annotation>
<xs:documentation>Request structure for departure and arrival events at stops</xs:documentation>
Expand Down
4 changes: 1 addition & 3 deletions OJP_TripInfo.xsd → OJP/OJP_TripInfo.xsd
Original file line number Diff line number Diff line change
@@ -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" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>===================== Request structures ============================================================</xs:documentation>
</xs:annotation>
Expand Down
7 changes: 2 additions & 5 deletions OJP_Trips.xsd → OJP/OJP_Trips.xsd
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?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-v2.0.xsd"/>
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
<xs:include schemaLocation="OJP_FareSupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>===== Request Structures ===============================================</xs:documentation>
</xs:annotation>
Expand Down
3 changes: 2 additions & 1 deletion OJP_Utility.xsd → OJP/OJP_Utility.xsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:annotation>
<xs:documentation>========================================= General ================================================</xs:documentation>
</xs:annotation>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.