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

Change main namespace of OJP from SIRI to OJP #347

Merged
merged 16 commits into from
May 25, 2023
Merged

Change main namespace of OJP from SIRI to OJP #347

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
567df07
Fix of namespaces in OJP.xsd
Aurige Mar 14, 2023
3acbf1f
Example update to have a proper use of namespace
Aurige Mar 24, 2023
2b2c312
Remove ojp: namespace
skinkie Mar 31, 2023
f24ad52
Remove ojp namespace
skinkie Mar 31, 2023
d842fa7
Remove comment
skinkie Mar 31, 2023
859bbe2
changed examples
ue71603 Apr 4, 2023
bf128dd
check includes
ue71603 Apr 4, 2023
6d014de
update
ue71603 Apr 4, 2023
1eb6f47
Lint and update documentation tables
github-actions[bot] Apr 4, 2023
06efb02
Update FareResponse.xml
ue71603 Apr 12, 2023
5267573
fixing examples
ue71603 Apr 12, 2023
16d6e17
validation
ue71603 Apr 13, 2023
978c7a4
fixed validation error
ue71603 May 24, 2023
f7fe8c2
Lint and update documentation tables
github-actions[bot] May 24, 2023
d01362c
Remove calctime comment
skinkie May 25, 2023
86d7049
Aligned imports in siri sources
sgrossberndt May 25, 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
12 changes: 6 additions & 6 deletions OJP.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?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:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="OJP_siri">
<xs:annotation>
<xs:documentation>OJP.xsd - OJP messages as extension of SIRI</xs:documentation>
</xs:annotation>
<xs:import namespace="http://www.vdv.de/ojp" schemaLocation="./OJP/OJP_All.xsd"/>
<xs:include schemaLocation="./OJP/OJP_All.xsd"/>
<!-- ifopt must be imported before siri, otherwise xmllint fails -->
<xs:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="./siri/xsd/ifopt/ifopt_allStopPlace.xsd"/>
<xs:include schemaLocation="./siri/xsd/siri_model/siri_all.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/xsd/siri_model/siri_all.xsd"/>
<xs:element name="OJP">
<xs:annotation>
<xs:documentation>Root element for OJP messages based on SIRI message exchange protocol.</xs:documentation>
Expand All @@ -17,7 +17,7 @@
<xs:element ref="OJPRequest"/>
<xs:element ref="OJPResponse"/>
</xs:choice>
<xs:element ref="Extensions" minOccurs="0"/>
<xs:element ref="siri:Extensions" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="version" type="xs:NMTOKEN" use="required" fixed="1.1-dev"/>
</xs:complexType>
Expand All @@ -32,7 +32,7 @@
<xs:documentation>Type for OJP Request - Groups individual functional requests.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:group ref="RequestGroup"/>
<xs:group ref="siri:RequestGroup"/>
</xs:sequence>
</xs:complexType>
<xs:element name="OJPResponse" type="OJPResponseStructure">
Expand All @@ -45,7 +45,7 @@
<xs:documentation>Type for OJP Response - Groups individual functional responses.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:group ref="ResponseGroup"/>
<xs:group ref="siri:ResponseGroup"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
2 changes: 1 addition & 1 deletion docs/generated/index.html
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions examples/functions/availability/AvailabilityRequest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<?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">
<OJP xmlns="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1-dev" xsi:schemaLocation="http://www.vdv.de/ojp ../../../OJP.xsd">
<OJPRequest>
<ServiceRequest>
<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
<RequestorRef>MyClient</RequestorRef>
<ojp:OJPAvailabilityRequest>
<RequestTimestamp>2020-01-19T12:00:00Z</RequestTimestamp>
<MessageIdentifier>231231-231</MessageIdentifier>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<ojp:StopPlaceRef>ch:1:sloid:7000</ojp:StopPlaceRef>
<ojp:Name>
<ojp:Text>origin</ojp:Text>
</ojp:Name>
</ojp:CallPlace>
<ojp:Order>7</ojp:Order>
</ojp:PickUpLocation>
<ojp:SetDownLocation>
<ojp:CallPlace>
<ojp:GeoPosition>
<Longitude>20.12121</Longitude>
<Latitude>30.134123</Latitude>
<Precision>20</Precision>
</ojp:GeoPosition>
<ojp:Name>
<ojp:Text>destiniation</ojp:Text>
</ojp:Name>
<ojp:AllowedSystemId>sbb</ojp:AllowedSystemId>
</ojp:CallPlace>
<ojp:ServiceArrival>
<ojp:TimetabledTime>2022-10-19T12:00:00Z</ojp:TimetabledTime>
<ojp:EstimatedTimeLow>2022-10-19T11:55:00Z</ojp:EstimatedTimeLow>
<ojp:EstimatedTimeHigh>2022-10-19T12:10:00Z</ojp:EstimatedTimeHigh>
</ojp:ServiceArrival>
<ojp:Order>10</ojp:Order>
<ojp:RequestStop>true</ojp:RequestStop>
<ojp:UnplannedStop>false</ojp:UnplannedStop>
<ojp:NotServicedStop>false</ojp:NotServicedStop>
</ojp:SetDownLocation>
<LineRef>ch:1:slnid:102301231</LineRef>
<ojp:Mode>
<ojp:PtMode>bus</ojp:PtMode>
<BusSubmode>demandAndResponseBus</BusSubmode>
</ojp:Mode>
<ojp:ProductCategory>
<ojp:ProductCategoryRef>NB</ojp:ProductCategoryRef>
</ojp:ProductCategory>
<ojp:PublishedServiceName>
<ojp:Text>NB 1</ojp:Text>
</ojp:PublishedServiceName>
<VehicleRef>1293912-1231</VehicleRef>
<ojp:OperatorRefs>
<ojp:OperatorRef>ch:1:sboid:13123</ojp:OperatorRef>
</ojp:OperatorRefs>
</ojp:PublicTransport>
<ojp:MobilityUser>
<ojp:Age>19</ojp:Age>
<ojp:WheelchairUser>true</ojp:WheelchairUser>
<ojp:NoSingleStep>true</ojp:NoSingleStep>
<ojp:NoStairs>true</ojp:NoStairs>
<ojp:LevelEntrance>true</ojp:LevelEntrance>
<ojp:WalkSpeed>70</ojp:WalkSpeed>
<ojp:AdditionalTransferTime>PT2M</ojp:AdditionalTransferTime>
</ojp:MobilityUser>
<ojp:EarliestDepartureTime>2022-10-19T11:30:00Z</ojp:EarliestDepartureTime>
<ojp:LatestArrivalTime>2022-10-19T12:10:00Z</ojp:LatestArrivalTime>
</ojp:OJPAvailabilityRequest>
</ServiceRequest>
<siri:ServiceRequest>
<siri:RequestTimestamp>2020-01-19T12:00:00Z</siri:RequestTimestamp>
<siri:RequestorRef>MyClient</siri:RequestorRef>
<OJPAvailabilityRequest>
<siri:RequestTimestamp>2020-01-19T12:00:00Z</siri:RequestTimestamp>
<siri:MessageIdentifier>231231-231</siri:MessageIdentifier>
<PublicTransport>
<PickUpLocation>
<CallPlace>
<StopPlaceRef>ch:1:sloid:7000</StopPlaceRef>
<Name>
<Text>origin</Text>
</Name>
</CallPlace>
<Order>7</Order>
</PickUpLocation>
<SetDownLocation>
<CallPlace>
<GeoPosition>
<siri:Longitude>20.12121</siri:Longitude>
<siri:Latitude>30.134123</siri:Latitude>
<siri:Precision>20</siri:Precision>
</GeoPosition>
<Name>
<Text>destiniation</Text>
</Name>
<AllowedSystemId>sbb</AllowedSystemId>
</CallPlace>
<ServiceArrival>
<TimetabledTime>2022-10-19T12:00:00Z</TimetabledTime>
<EstimatedTimeLow>2022-10-19T11:55:00Z</EstimatedTimeLow>
<EstimatedTimeHigh>2022-10-19T12:10:00Z</EstimatedTimeHigh>
</ServiceArrival>
<Order>10</Order>
<RequestStop>true</RequestStop>
<UnplannedStop>false</UnplannedStop>
<NotServicedStop>false</NotServicedStop>
</SetDownLocation>
<siri:LineRef>ch:1:slnid:102301231</siri:LineRef>
<Mode>
<PtMode>bus</PtMode>
<siri:BusSubmode>demandAndResponseBus</siri:BusSubmode>
</Mode>
<ProductCategory>
<ProductCategoryRef>NB</ProductCategoryRef>
</ProductCategory>
<PublishedServiceName>
<Text>NB 1</Text>
</PublishedServiceName>
<siri:VehicleRef>1293912-1231</siri:VehicleRef>
<OperatorRefs>
<OperatorRef>ch:1:sboid:13123</OperatorRef>
</OperatorRefs>
</PublicTransport>
<MobilityUser>
<Age>19</Age>
<WheelchairUser>true</WheelchairUser>
<NoSingleStep>true</NoSingleStep>
<NoStairs>true</NoStairs>
<LevelEntrance>true</LevelEntrance>
<WalkSpeed>70</WalkSpeed>
<AdditionalTransferTime>PT2M</AdditionalTransferTime>
</MobilityUser>
<EarliestDepartureTime>2022-10-19T11:30:00Z</EarliestDepartureTime>
<LatestArrivalTime>2022-10-19T12:10:00Z</LatestArrivalTime>
</OJPAvailabilityRequest>
</siri:ServiceRequest>
</OJPRequest>
</OJP>
58 changes: 29 additions & 29 deletions examples/functions/availability/AvailabilityRequest_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<OJP xmlns="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1-dev" xsi:schemaLocation="http://www.vdv.de/ojp ../../../OJP.xsd">
<OJPRequest>
<siri:ServiceRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<siri:RequestorRef>OeBB</siri:RequestorRef>
<ojp:OJPAvailabilityRequest>
<OJPAvailabilityRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<PublicTransport>
<PickUpLocation>
<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>
<Name>
<Text>Kt-Kalldorf, Winterberg</Text>
</Name>
</CallPlace>
<ServiceDeparture>
<TimetabledTime>2022-12-12T11:46:00Z</TimetabledTime>
</ServiceDeparture>
</PickUpLocation>
<SetDownLocation>
<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>
<Name>
<Text>Kt-Stemmen, Elfenborner Weg</Text>
</Name>
</CallPlace>
<ServiceArrival>
<TimetabledTime>2022-12-12T12:02:00Z</TimetabledTime>
</ServiceArrival>
</SetDownLocation>
</PublicTransport>
<MobilityUser/>
</OJPAvailabilityRequest>
</siri:ServiceRequest>
</siri:OJPRequest>
</siri:OJP>
</OJPRequest>
</OJP>
58 changes: 29 additions & 29 deletions examples/functions/availability/AvailabilityRequest_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<OJP xmlns="http://www.vdv.de/ojp" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1-dev" xsi:schemaLocation="http://www.vdv.de/ojp ../../../OJP.xsd">
<OJPRequest>
<siri:ServiceRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<siri:RequestorRef>OeBB</siri:RequestorRef>
<ojp:OJPAvailabilityRequest>
<OJPAvailabilityRequest>
<siri:RequestTimestamp>2022-12-12T11:46:00Z</siri:RequestTimestamp>
<ojp:PublicTransport>
<ojp:PickUpLocation>
<ojp:CallPlace>
<PublicTransport>
<PickUpLocation>
<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>
<Name>
<Text>Kt-Kalldorf, Winterberg</Text>
</Name>
</CallPlace>
<ServiceDeparture>
<TimetabledTime>2022-12-14T09:46:00Z</TimetabledTime>
</ServiceDeparture>
</PickUpLocation>
<SetDownLocation>
<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>
<Name>
<Text>Kt-Stemmen, Elfenborner Weg</Text>
</Name>
</CallPlace>
<ServiceArrival>
<TimetabledTime>2022-12-14T10:02:00Z</TimetabledTime>
</ServiceArrival>
</SetDownLocation>
</PublicTransport>
<MobilityUser/>
</OJPAvailabilityRequest>
</siri:ServiceRequest>
</siri:OJPRequest>
</siri:OJP>
</OJPRequest>
</OJP>
12 changes: 6 additions & 6 deletions examples/functions/availability/AvailabilityResponse notOK.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<OJP xmlns="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.vdv.de/ojp ../../../OJP.xsd" version="1.1-dev">
<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>
<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>
</OJPAvailabilityDelivery>
</siri:ServiceDelivery>
</siri:OJPResponse>
</siri:OJP>
</OJPResponse>
</OJP>
Loading