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

Typos/Definitions/Error corrections #359

Merged
merged 6 commits into from
May 24, 2023
Merged

Typos/Definitions/Error corrections #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bedcef
Change FareEstimated description
ue71603 May 11, 2023
b0877a7
fixing include and wrapper FareResponse.xml
ue71603 May 11, 2023
1c01114
Lint and update documentation tables
github-actions[bot] May 11, 2023
51dfef1
more example wrappers.
ue71603 May 11, 2023
f19f41a
Merge branch 'Typo_definitions' of https://github.com/VDVde/OJP into …
ue71603 May 11, 2023
f7fec42
Lint and update documentation tables
github-actions[bot] May 11, 2023
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
2 changes: 1 addition & 1 deletion OJP/OJP_Fare.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</xs:element>
<xs:element name="FareEstimated" type="xs:boolean" default="true" minOccurs="0">
<xs:annotation>
<xs:documentation>Whether the fare is only estimated by the service. Estimated can mean different things: For example, the fare may vary depending on age, PassengerCategory, TravelClass, EntitlementProducts. It can also mean that the fare structure used by the service is not entirely accurate or that other factors, such as the time a shared vehicle is used, need to be factored into the price. As a rule, the price should then be given as an approximate and probably lower limit of the actual price. Default is TRUE.</xs:documentation>
<xs:documentation>Whether the fare is only estimated by the service. Estimated can mean different things: For example, the fare may vary depending on age, PassengerCategory, FareClass, EntitlementProducts. It can also mean that the fare structure used by the service is not entirely accurate or that other factors, such as the time a shared vehicle is used, need to be factored into the price. As a rule, the price should then be given as an approximate and probably lower limit of the actual price. Default is TRUE.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:choice>
Expand Down
4 changes: 2 additions & 2 deletions OJP/OJP_Status.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<xs:annotation>
<xs:documentation>OJP/OJP_Status.xsd - OJP Status request and response</xs:documentation>
</xs:annotation>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/xsd/siri_model/siri_all.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_modes-v1.1.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/xsd/siri_model/siri_modes.xsd"/>
<xs:annotation>
<xs:documentation>=============================== Status Service ==========================================</xs:documentation>
</xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/index.html
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 36 additions & 28 deletions examples/functions/availability/AvailabilityRequest_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<ojp:OJPAvailabilityRequest xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317:0:1</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Kalldorf, Winterberg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceDeparture>
<ojp:TimetabledTime>2022-12-12T11:46:00Z</ojp:TimetabledTime>
</ojp:ServiceDeparture>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437:0:2</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Stemmen, Elfenborner Weg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-12T12:02:00Z</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
<ojp:MobilityUser/>
</ojp:OJPAvailabilityRequest>
<siri:OJP xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd" version="1.1-dev">
<siri:OJPRequest>
<siri:ServiceRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<siri:RequestorRef>OeBB</siri:RequestorRef>
<ojp:OJPAvailabilityRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317:0:1</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Kalldorf, Winterberg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceDeparture>
<ojp:TimetabledTime>2022-12-12T11:46:00Z</ojp:TimetabledTime>
</ojp:ServiceDeparture>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437:0:2</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Stemmen, Elfenborner Weg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-12T12:02:00Z</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
<ojp:MobilityUser/>
</ojp:OJPAvailabilityRequest>
</siri:ServiceRequest>
</siri:OJPRequest>
</siri:OJP>
64 changes: 36 additions & 28 deletions examples/functions/availability/AvailabilityRequest_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<ojp:OJPAvailabilityRequest xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317:0:1</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Kalldorf, Winterberg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceDeparture>
<ojp:TimetabledTime>2022-12-14T09:46:00Z</ojp:TimetabledTime>
</ojp:ServiceDeparture>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437:0:2</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Stemmen, Elfenborner Weg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-14T10:02:00Z</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
<ojp:MobilityUser/>
</ojp:OJPAvailabilityRequest>
<siri:OJP xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd" version="1.1-dev">
<siri:OJPRequest>
<siri:ServiceRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<siri:RequestorRef>OeBB</siri:RequestorRef>
<ojp:OJPAvailabilityRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317:0:1</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Kalldorf, Winterberg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceDeparture>
<ojp:TimetabledTime>2022-12-14T09:46:00Z</ojp:TimetabledTime>
</ojp:ServiceDeparture>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437:0:2</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Kt-Stemmen, Elfenborner Weg</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-14T10:02:00Z</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
<ojp:MobilityUser/>
</ojp:OJPAvailabilityRequest>
</siri:ServiceRequest>
</siri:OJPRequest>
</siri:OJP>
27 changes: 18 additions & 9 deletions examples/functions/availability/AvailabilityResponse notOK.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<ojp:OJPAvailabilityDelivery xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:ResponseTimestamp>2001-12-17T09:30:47Z</siri:ResponseTimestamp>
<siri:Status>false</siri:Status>
<siri:ErrorCondition>
<siri:OtherError>
<siri:ErrorText>Anfrage konnte nicht verarbeitet werden</siri:ErrorText>
</siri:OtherError>
</siri:ErrorCondition>
</ojp:OJPAvailabilityDelivery>
<siri:OJP xmlns:ojp="http://www.vdv.de/ojp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:siri="http://www.siri.org.uk/siri" version="1.1-dev" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:OJPResponse>
<siri:ServiceDelivery>
<siri:ResponseTimestamp>2020-11-30T10:07:19Z</siri:ResponseTimestamp>
<siri:ProducerRef>OJPCH_Prod</siri:ProducerRef>
<siri:Status>true</siri:Status>
<ojp:OJPAvailabilityDelivery>
<siri:ResponseTimestamp>2001-12-17T09:30:47Z</siri:ResponseTimestamp>
<siri:Status>false</siri:Status>
<siri:ErrorCondition>
<siri:OtherError>
<siri:ErrorText>Anfrage konnte nicht verarbeitet werden</siri:ErrorText>
</siri:OtherError>
</siri:ErrorCondition>
</ojp:OJPAvailabilityDelivery>
</siri:ServiceDelivery>
</siri:OJPResponse>
</siri:OJP>
61 changes: 35 additions & 26 deletions examples/functions/availability/AvailabilityResponse_OK.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<ojp:OJPAvailabilityDelivery xmlns:ojp="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:ResponseTimestamp>2001-12-17T09:30:47Z</siri:ResponseTimestamp>
<ojp:AvailabilityResult>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Winterberg/Kalldorf</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Elfenborner Weg/Stemmen (Kalletal)</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-14T11:02:00+01:00</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
</ojp:AvailabilityResult>
</ojp:OJPAvailabilityDelivery>
<siri:OJP xmlns:ojp="http://www.vdv.de/ojp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:siri="http://www.siri.org.uk/siri" version="1.1-dev" xsi:schemaLocation="http://www.siri.org.uk/siri ../../../OJP.xsd">
<siri:OJPResponse>
<siri:ServiceDelivery>
<siri:ResponseTimestamp>2020-11-30T10:07:19Z</siri:ResponseTimestamp>
<siri:ProducerRef>OJPCH_Prod</siri:ProducerRef>
<siri:Status>true</siri:Status>
<ojp:OJPAvailabilityDelivery>
<siri:ResponseTimestamp>2001-12-17T09:30:47Z</siri:ResponseTimestamp>
<ojp:AvailabilityResult>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:2317</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Winterberg/Kalldorf</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<siri:StopPointRef>de:05766:3437</siri:StopPointRef>
<ojp:Name>
<ojp:Text>Elfenborner Weg/Stemmen (Kalletal)</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-12-14T11:02:00+01:00</ojp:TimetabledTime>
</ojp:ServiceArrival>
</ojp:SetDownLocation>
</ojp:PublicTransport>
</ojp:AvailabilityResult>
</ojp:OJPAvailabilityDelivery>
</siri:ServiceDelivery>
</siri:OJPResponse>
</siri:OJP>
Loading