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

Omit unsused requests and responses #76

Merged
merged 2 commits into from
May 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
33 changes: 0 additions & 33 deletions OJP_Fare.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<xs:annotation>
<xs:documentation>====================================================Request definitions====================================================</xs:documentation>
</xs:annotation>
<xs:element name="FareRequest" type="FareRequestStructure"/>
<xs:group name="FareRequestGroup">
<xs:annotation>
<xs:documentation>Fare request structure.</xs:documentation>
Expand Down Expand Up @@ -44,15 +43,6 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:complexType name="FareRequestStructure">
<xs:annotation>
<xs:documentation>Fare request element.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:group ref="FareRequestGroup"/>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="StopFareRequestStructure">
<xs:annotation>
<xs:documentation>Sub-request: stop-related fare information.</xs:documentation>
Expand Down Expand Up @@ -106,16 +96,6 @@
<xs:annotation>
<xs:documentation>====================================================Response definitions====================================================</xs:documentation>
</xs:annotation>
<xs:element name="FareResponse">
<xs:annotation>
<xs:documentation>Fare response element.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:complexContent>
<xs:extension base="FareResponseStructure"/>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:group name="FareResponseGroup">
<xs:sequence>
<xs:element name="FareResult" type="FareResultStructure" minOccurs="0" maxOccurs="unbounded">
Expand All @@ -125,19 +105,6 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:complexType name="FareResponseStructure">
<xs:annotation>
<xs:documentation>Fare response structure.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="ErrorMessage" type="ErrorMessageStructure" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Error messages related to the request as a whole.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="FareResponseGroup"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="FareResultStructure">
<xs:annotation>
<xs:documentation>Wrapper element for Fare results.</xs:documentation>
Expand Down
30 changes: 1 addition & 29 deletions OJP_Locations.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<xs:annotation>
<xs:documentation>All functions integrated into one request / response</xs:documentation>
</xs:annotation>
<xs:element name="LocationInformationRequest" type="LocationInformationRequestStructure"/>
<xs:group name="LocationInformationRequestGroup">
<xs:sequence>
<xs:choice>
Expand All @@ -45,13 +44,6 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:complexType name="LocationInformationRequestStructure">
<xs:sequence>
<xs:group ref="LocationInformationRequestGroup"/>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:element name="LocationInformationResponse" type="LocationInformationResponseStructure"/>
<xs:group name="LocationInformationResponseGroup">
<xs:sequence>
<xs:element name="ContinueAt" type="xs:nonNegativeInteger" minOccurs="0">
Expand All @@ -62,12 +54,6 @@
<xs:element name="Location" type="PlaceResultStructure" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:group>
<xs:complexType name="LocationInformationResponseStructure">
<xs:sequence>
<xs:element name="ErrorMessage" type="ErrorMessageStructure" minOccurs="0" maxOccurs="unbounded"/>
<xs:group ref="LocationInformationResponseGroup"/>
</xs:sequence>
</xs:complexType>
<xs:annotation>
<xs:documentation>Additional declarations</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -236,7 +222,6 @@
<xs:annotation>
<xs:documentation>===== Exchange point request ===============================================</xs:documentation>
</xs:annotation>
<xs:element name="ExchangePointsRequest" type="ExchangePointsRequestStructure"/>
<xs:group name="ExchangePointsRequestGroup">
<xs:sequence>
<xs:element name="PlaceRef" type="PlaceRefStructure" minOccurs="0">
Expand All @@ -251,12 +236,6 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:complexType name="ExchangePointsRequestStructure">
<xs:sequence>
<xs:group ref="ExchangePointsRequestGroup"/>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ExchangePointsParamStructure">
<xs:sequence>
<xs:group ref="ExchangePointsDataFilterGroup"/>
Expand Down Expand Up @@ -317,7 +296,6 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:element name="ExchangePointsResponse" type="ExchangePointsResponseStructure"/>
<xs:group name="ExchangePointsResponseGroup">
<xs:sequence>
<xs:element name="ContinueAt" type="xs:nonNegativeInteger" minOccurs="0">
Expand All @@ -328,12 +306,6 @@
<xs:element name="Place" type="ExchangePointsResultStructure" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:group>
<xs:complexType name="ExchangePointsResponseStructure">
<xs:sequence>
<xs:element name="ErrorMessage" type="ErrorMessageStructure" minOccurs="0" maxOccurs="unbounded"/>
<xs:group ref="ExchangePointsResponseGroup"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ExchangePointsResultStructure">
<xs:sequence>
<xs:element name="Place" type="PlaceStructure">
Expand All @@ -346,7 +318,7 @@
<xs:documentation>Rough estimate of the travel duration from the specified location to this exchange point.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="WaitDuration" type="xs:duration" minOccurs="0" default="PT0M">
<xs:element name="WaitDuration" type="xs:duration" default="PT0M" minOccurs="0">
skinkie marked this conversation as resolved.
Show resolved Hide resolved
<xs:annotation>
<xs:documentation>Duration needed at this exchange point to change from one service to another. If a journey planning orchestrator puts together a trip at this exchange point, it has to take care, that feeding arrival and fetching departure are at least this duration apart.</xs:documentation>
</xs:annotation>
Expand Down