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.

Sign up for GitHub

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

Moved ResponseContextStructure to OJP_RequestSupport.xsd #110

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Moved ResponseContextStructure to OJP_RequestSupport.xsd #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aa9789
Moved ResponseContextStructure to OJP_RequestSupport.xsd
pvgrumbkow Oct 22, 2020
6f3cb65
Typo correction
pvgrumbkow Oct 22, 2020
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
22 changes: 0 additions & 22 deletions OJP_JourneySupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,28 +475,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ResponseContextStructure">
<xs:annotation>
<xs:documentation>Abstract structure providing response contexts related to journeys.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Places" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for place objects. Only place objects that are referenced in the response should be put into the container.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="Place" type="PlaceStructure" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Situations" type="SituationsStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for SIRI SX situation objects. Only situations that are referenced in the response should be put into the container.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:annotation>
<xs:documentation>=========================================== Filter Groups ===========================================================</xs:documentation>
</xs:annotation>
Expand Down
1 change: 1 addition & 0 deletions OJP_Places.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<!-- ===========================================================================================================-->
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:annotation>
<xs:documentation>FUNCTION 1: Place Identification</xs:documentation>
</xs:annotation>
Expand Down
27 changes: 27 additions & 0 deletions OJP_RequestSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<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:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
<xs:annotation>
<xs:documentation>====================================================Simple Types ====================================================</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -148,4 +150,29 @@
<xs:group ref="siri:ServiceResponseGroup"/>
</xs:sequence>
</xs:group>
<xs:annotation>
<xs:documentation>====================================================Collection contexts====================================================</xs:documentation>
</xs:annotation>
<xs:complexType name="ResponseContextStructure">
<xs:annotation>
<xs:documentation>Structure providing response contexts related to journeys, containing collections of places and situations.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Places" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for place objects. Only place objects that are referenced in the response should be put into the container.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="Place" type="PlaceStructure" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Situations" type="SituationsStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for SIRI SX situation objects. Only situations that are referenced in the response should be put into the container.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
1 change: 1 addition & 0 deletions OJP_StopEvents.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<!-- ===========================================================================================================-->
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
<xs:group name="StopEventRequestGroup">
<xs:annotation>
<xs:documentation>Request structure for departure and arrival events at stops</xs:documentation>
Expand Down
1 change: 1 addition & 0 deletions OJP_TripInfo.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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:annotation>
<xs:documentation>===================== Request structures ============================================================</xs:documentation>
</xs:annotation>
Expand Down
1 change: 1 addition & 0 deletions OJP_Trips.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<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:annotation>
<xs:documentation>===== Request Structures ===============================================</xs:documentation>
</xs:annotation>
Expand Down