Skip to content

Commit

Permalink
Removed PrivateServiceGroup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ue71603
ue71603 committed Sep 26, 2023
1 parent 740de91 commit 832a942
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 9 deletions.
2 changes: 1 addition & 1 deletion OJP/OJP_Common.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
</xs:element>
<xs:element name="Restricted" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g. dragLift) or the LINE is only made available to certain passenger groups (e.g. school buses, hotel shuttles), as defined in PrivateMode.</xs:documentation>
<xs:documentation>This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g. dragLift) or the LINE is only made available to certain passenger groups (e.g. school buses, hotel shuttles).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RestrictionNote" type="InternationalTextStructure" minOccurs="0">
Expand Down
10 changes: 5 additions & 5 deletions OJP/OJP_JourneySupport.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
</xs:element>
<xs:element name="Restricted" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g. dragLift) or the LINE is only made available to certain passenger groups (e.g. school buses, hotel shuttles), as defined in PrivateMode.</xs:documentation>
<xs:documentation>This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g. dragLift) or the LINE is only made available to certain passenger groups (e.g. school buses, hotel shuttles).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RestrictionNote" type="InternationalTextStructure" minOccurs="0">
Expand Down Expand Up @@ -229,9 +229,9 @@
<xs:group ref="ScheduledJourneyGroup"/>
</xs:sequence>
</xs:group>
<xs:group name="PrivateServiceGroup">
<!-- <xs:group name="PrivateServiceGroup">
<xs:annotation>
<xs:documentation>Specialized service operated by a Private Mode, e.g. a school bus, corporate shuttle, or other transportation for a (usually) closed community.</xs:documentation>
<xs:documentation>Specialized service operated in a restricted way, e.g. a school bus, corporate shuttle, or other transportation for a (usually) closed community.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element ref="JourneyRef" minOccurs="0"/>
Expand All @@ -257,7 +257,7 @@
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:group>
</xs:group> -->
<xs:simpleType name="ReservationNeededEnumeration">
<xs:annotation>
<xs:documentation>Possible types of reservation needed for services.</xs:documentation>
Expand All @@ -283,7 +283,7 @@
<xs:sequence>
<xs:choice>
<xs:group ref="DatedJourneyGroup"/>
<xs:group ref="PrivateServiceGroup"/>
<!-- <xs:group ref="PrivateServiceGroup"/>-->
</xs:choice>
<xs:group ref="siri:JourneyFormationGroup">
<xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion OJP/OJP_StopEvents.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</xs:element>
<xs:element name="IncludeAllRestrictedLines" minOccurs="0">
<xs:annotation>
<xs:documentation>There might exist lines that have special restrictions and are not generally available to the public. E.g. school buses, company shuttles. dragLifts need to have an ACCESS MODE ski. Lines with ACCESS MODE bicycle will be included as well. If this flag is set, then existing restricted lines are considered by the router. The results are marked as restricted in the ServiceGroup. The restriction can be seen from: ACCESS MODE or PrivateMode. The usage could also be detailed with Attribute elements.</xs:documentation>
<xs:documentation>There might exist lines that have special restrictions and are not generally available to the public. E.g. school buses, company shuttles. dragLifts need to have an ACCESS MODE ski. Lines with ACCESS MODE bicycle will be included as well. If this flag is set, then existing restricted lines are considered by the router. The results are marked as restricted in the ServiceGroup. The usage could also be detailed with Attribute elements.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down
4 changes: 2 additions & 2 deletions OJP/OJP_Trips.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</xs:element>
<xs:element name="PersonalAndAlternativeModeFilter" type="PersonalAndAlternativeModeFilterStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Private mobility options to include/exclude.</xs:documentation>
<xs:documentation>Personal mobility options to include/exclude.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="VehicleFilter" type="VehicleFilterStructure" minOccurs="0">
Expand Down Expand Up @@ -132,7 +132,7 @@
</xs:element>
<xs:element name="IncludeAllRestrictedLines" type="xs:boolean" minOccurs="0" default="false">
<xs:annotation>
<xs:documentation>There might exist lines that have special restrictions and are not generally available to the public. E.g. school buses, company shuttles. dragLifts need to have an ACCESS MODE ski. Lines with ACCESS MODE bicycle will be included as well. If this flag is set, then existing restricted lines are considered by the router, irrespective of the selected passenger categories or the MotorisedMainTravelMode. The results are marked as restricted in the ServiceGroup. The restriction can be seen from: ACCESS MODE or PrivateMode. The usage could also be detailed with Attribute elements. Restricted trumps PassengerCategory, for example. If Restricted is set to true, all services are displayed.</xs:documentation>
<xs:documentation>There might exist lines that have special restrictions and are not generally available to the public. E.g. school buses, company shuttles. dragLifts need to have an ACCESS MODE ski. Lines with ACCESS MODE bicycle will be included as well. If this flag is set, then existing restricted lines are considered by the router, irrespective of the selected passenger categories or the MotorisedMainTravelMode. The results are marked as restricted in the ServiceGroup. The usage could also be detailed with Attribute elements. Restricted trumps PassengerCategory, for example. If Restricted is set to true, all services are displayed.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PassengerCategory" type="PassengerCategoryEnumeration" minOccurs="0" maxOccurs="unbounded">
Expand Down
140 changes: 140 additions & 0 deletions examples/functions/trip/TR12_response_example_restricted_service.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<OJPResponse>
<siri:ServiceDelivery>
<siri:ResponseTimestamp>2023-09-13T14:02:49Z</siri:ResponseTimestamp>
<siri:ProducerRef>EFAController10.5.23.58-OJP-EFA01-P</siri:ProducerRef>
<siri:Status>true</siri:Status>
<OJPTripDelivery>
<siri:ResponseTimestamp>2023-09-13T14:02:48Z</siri:ResponseTimestamp>
<siri:Status>true</siri:Status>
<CalcTime>1169</CalcTime>
<TripResult>
<Id>ID-C88D8F6C-CBEE-476C-843D-1644D7258B47</Id>
<Trip>
<Id>ID-C88D8F6C-CBEE-476C-843D-1644D7258B47</Id>
<Duration>PT31M</Duration>
<StartTime>2023-09-13T14:02:00Z</StartTime>
<EndTime>2023-09-13T14:33:00Z</EndTime>
<Transfers>0</Transfers>
<Distance>4345</Distance>
<Leg>
<Id>1</Id>
<TimedLeg>
<LegBoard>
<siri:StopPointRef>8581235</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, rue du Poujet</Text>
</StopPointName>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:11:00Z</TimetabledTime>
</ServiceDeparture>
<Order>1</Order>
</LegBoard>
<LegIntermediates>
<siri:StopPointRef>8581218</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, La Promenade</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:12:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:12:00Z</TimetabledTime>
</ServiceDeparture>
<Order>2</Order>
</LegIntermediates>
<LegIntermediates>
<siri:StopPointRef>8510379</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, Château-Musée</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:12:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:12:00Z</TimetabledTime>
</ServiceDeparture>
<Order>3</Order>
</LegIntermediates>
<LegIntermediates>
<siri:StopPointRef>8510378</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, Hôtel de Ville</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:13:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:13:00Z</TimetabledTime>
</ServiceDeparture>
<Order>4</Order>
</LegIntermediates>
<LegIntermediates>
<siri:StopPointRef>8583087</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, Théâtre</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:14:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:14:00Z</TimetabledTime>
</ServiceDeparture>
<Order>5</Order>
</LegIntermediates>
<LegIntermediates>
<siri:StopPointRef>8571983</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, Le Ticle</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:15:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:15:00Z</TimetabledTime>
</ServiceDeparture>
<Order>6</Order>
</LegIntermediates>
<LegIntermediates>
<siri:StopPointRef>8571982</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, Av. de la gare</Text>
</StopPointName>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:16:00Z</TimetabledTime>
</ServiceArrival>
<ServiceDeparture>
<TimetabledTime>2023-09-13T14:16:00Z</TimetabledTime>
</ServiceDeparture>
<Order>7</Order>
</LegIntermediates>
<LegAlight>
<siri:StopPointRef>8571965</siri:StopPointRef>
<StopPointName>
<Text xml:lang="de">Delémont, gare</Text>
</StopPointName>
<PlannedQuay>
<Text xml:lang="de">F</Text>
</PlannedQuay>
<ServiceArrival>
<TimetabledTime>2023-09-13T14:18:00Z</TimetabledTime>
</ServiceArrival>
<Order>8</Order>
</LegAlight>
<Service>
<JourneyRef>96120:1:R:j23:109:1064</JourneyRef>
<PersonalModeOfOperation>otherOwned</PersonalModeOfOperation>
<siri:VehicleRef>ch:4:13123:1231</siri:VehicleRef>
<Description>School bus</Description>
<OrganisationRef>ch:1:Operator:800</OrganisationRef>
<ReservationNeeded>none</ReservationNeeded>
</Service>
</TimedLeg>
</Leg>
</Trip>
</TripResult>
</OJPTripDelivery>
</siri:ServiceDelivery>
</OJPResponse>
</OJP>

0 comments on commit 832a942

Please sign in to comment.