diff --git a/OJP/OJP_Common.xsd b/OJP/OJP_Common.xsd index 841230c0d..edf827b94 100644 --- a/OJP/OJP_Common.xsd +++ b/OJP/OJP_Common.xsd @@ -439,7 +439,7 @@ Structured attribute classification with associated text. If URL is given, it refers to the whole attribute text. - + Text of the attribute to be shown to the user. @@ -449,7 +449,21 @@ Internal code of the attribute. Can be used for detection of double occurrences. - + + + Key if the attribute is used as a key/value pair. + + + + + Value if the attribute is used as a key/value pair. + + + + + Facilities associated with this attribute. + + Defines whether the attribute has to be shown to the user. diff --git a/OJP/OJP_FacilitySupport.xsd b/OJP/OJP_FacilitySupport.xsd index 898a1f598..da2c043a1 100644 --- a/OJP/OJP_FacilitySupport.xsd +++ b/OJP/OJP_FacilitySupport.xsd @@ -5,14 +5,6 @@ - - - Wrapper for SIRI facilities. - - - - - Wrapper for SIRI stop facilities. diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd index 680b9987a..ccc59310b 100644 --- a/OJP/OJP_JourneySupport.xsd +++ b/OJP/OJP_JourneySupport.xsd @@ -464,6 +464,11 @@ + + + Note or attribute. + + diff --git a/docs/generated/index.html b/docs/generated/index.html index fc8292b60..b9ab7d0c5 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -71,7 +71,7 @@

OJP - Open API for distributed Journey 12. OJP/OJP_JourneySupport.xsd - Supporting definitions for journeys on public transport vehicles
  • 13. OJP/OJP_Availability.xsd - Request and response definitions for availability of tickets and services on a journey leg.
  • 14. OJP/OJP_Common.xsd - Supporting definitions of common structures
  • -
  • 15. OJP/OJP_FacilitySupport.xsd - Supporting definitions for facilities containing wrappers for SIRI
  • +
  • 15. OJP/OJP_FacilitySupport.xsd - Supporting definitions for facilities containing wrappers for SIRI
  • 16. OJP/OJP_ModesSupport.xsd - Supporting definitions for the classification of modes of transport
  • 17. OJP/OJP_SituationSupport.xsd - Supporting definitions for situations containing wrappers for SIRI Situation Exchange service (SIRI SX)
  • 18. OJP/OJP_Utility.xsd - Support definitions not specifically related to the public transport domain
  • @@ -937,6 +937,7 @@

    OJP - Open API for distributed Journey

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    +

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    11.20. The complex type LegAlightStructure

    @@ -951,6 +952,7 @@

    OJP - Open API for distributed Journey

    +

    LegAlightStructure

    Describes the situation at a stop or station at which the passenger alights from a Leg of a trip including time-related information

    The element contains a sequence of the following elements:

    StopPoint

    →‍siri:StopPointRef

    1:1

    →‍siri:StopPointRef

    Reference to a stop point.

    StopPointName

    1:1

    +InternationalText

    Name or description of stop point for use in passenger information.

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    11.21. The complex type LegIntermediateStructure

    @@ -965,6 +967,7 @@

    OJP - Open API for distributed Journey

    +

    LegIntermediateStructure

    Describes the situation at a stop or station that lies between the LegBoard and LegAlight stop or station including time-related information.

    The element contains a sequence of the following elements:

    StopPoint

    →‍siri:StopPointRef

    1:1

    →‍siri:StopPointRef

    Reference to a stop point.

    StopPointName

    1:1

    +InternationalText

    Name or description of stop point for use in passenger information.

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    11.22. The complex type PathGuidanceStructure

    PathGuidanceStructure

    Description of a piece of a TRIP. May include geographic information, turn instructions and accessibility information.

    The element contains only one element:

    PathGuidanceSection

    1:*

    +PathGuidanceSection

    A view of LEG TRACK including PATH JUNCTION information, PATH LINK information and PATH GUIDANCE. One or more path guidance sections that form the LEG. For a good PATH GUIDANCE a fine granularity of the sections may be needed. This may also depend on the MODE and the type of guidance required.

    11.23. The complex type PathGuidanceSectionStructure

    PathGuidanceSectionStructure

    An extended definition of a NAVIGATION PATH in TMv6 and PATH GUIDANCE to include the textual navigation instructions. Description of a part of a TRIP. May include geographic information, turn instructions and accessibility information.

    The element contains a sequence of the following elements:

    TrackSection

    0:1

    +TrackSection

    An aggregate of information that may be leaning on LEG TRACK together with duration and length that can be used for representing the leg on a map. The points may be STOP PLACE, SCHEDULED STOP POINT, coordinates or ADDRESSes.

    TurnDescription

    0:1

    +InternationalText

    Textual description of a traveller manoeuvre. Contains information from manoeuvre, TurnAction, and TrackSection.RoadName.

    GuidanceAdvice

    0:1

    GuidanceAdvice

    Various types of guidance advice given to traveller (according to Transmodel a view of a LEG TRACK and PATH GUIDANCE).

    TurnAction

    0:1

    TurnAction

    The range of possible turns that can be described (according to Transmodel a view of a LEG TRACK and PATH GUIDANCE).

    RoadName

    0:1

    +InternationalText

    Road name

    Follow

    0:*

    +Follow

    Signs, roads, POI to follow.

    DirectionHint

    0:1

    +InternationalText

    Textual direction hint for better understanding, e.g. "follow signs to Hamburg" (according to Transmodel a view of a LEG TRACK and PATH GUIDANCE).

    AbsoluteBearing

    0:1

    siri:AbsoluteBearingType

    Absolute bearing (sky direction) after the described manoeuvre.

    PathLink

    0:1

    +PathLink

    Description of the type of accessibility on this navigation section. This view is simplified in comparison to the NeTEx PathLink structure.

    SituationFullRefs

    0:1

    +SituationRefList

    A list of references to SITUATIONs.

    11.24. The complex type FollowStructure

    FollowStructure

    The element contains one of the following elements:

    a

    FollowDirectionName

    -1:1

    +InternationalText

    Follow a direction.

    b

    FollowExit

    -1:1

    +InternationalText

    Follow an exit.

    c

    FollowRoadName

    -1:1

    +InternationalText

    Follow a road/route.

    d

    FollowSignName

    -1:1

    +InternationalText

    Follow a sign.

    11.25. The TransferDurationGroup group

    @@ -1443,6 +1446,7 @@

    OJP - Open API for distributed Journey

    +

    TransferDurationGroup

    [an attribute of a CONNECTION (not INTERCHANGE) in TMv6] calculated duration in a response taking into ccount the request parameters.; TransferDuration plus waiting time is the minimum interval between arrival and departure time.

    TransferDuration

    Duration

    1:1

    xs:duration

    Overall duration of this interchange (Transmodel: PT CONNECTION LEG.MEAN INTERCHANGE TIME).

    WalkDuration

    0:1

    xs:duration

    Walk time as part of the overall interchange duration (in Transmodel might be modeled as TRANSFER.CONNECTION.DefaultDuration).

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    SituationFullRefs

    0:1

    +SituationRefList

    A list of references to SITUATIONs.

    12.22. The StopCallStatusGroup group

    @@ -1451,6 +1455,7 @@

    OJP - Open API for distributed Journey

    +

    StopCallStatusGroup

    Status properties for the vehicle call at this stop.

    StopCallStatus

    Order

    0:1

    xs:positiveInteger

    Sequence number of this stop in the service pattern of the journey.

    RequestStop

    0:1

    xs:boolean

    The vehicle journey calls at this stop only on demand.

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    12.23. The ServiceStatusGroup group

    @@ -1613,6 +1618,7 @@

    OJP - Open API for distributed Journey

    +

    ServiceStatusGroup

    parameters which describe the current status of a DATED VEHICLE JOURNEY

    ServiceStatus

    Unplanned

    0:1

    xs:boolean

    Whether this trip is an additional one that has not been planned. Default is false.

    Cancelled

    0:1

    xs:boolean

    Whether this trip is cancelled and will not be run. Default is false.

    NoBoardingAtStop

    0:1

    xs:boolean

    Boarding will not be allowed at this stop of this journey.

    NoAlightingAtStop

    0:1

    xs:boolean

    Alighting will not be allowed at this stop of this journey.

    The element contains a sequence of the following elements:

    →‍siri:ExpectedDepartureOccupancy

    0:*

    →‍siri:ExpectedDepartureOccupancy

    The Occupancy structure from SIRI can be used here. It is recommended to mainly have one ExpectedDepartureOccupancy for each FareClass and mainly focus on OccupancyLevel and OccupancyPercentage. For more details have a look at the SIRI documentation.

    →‍siri:ExpectedDepartureCapacities

    0:*

    →‍siri:ExpectedDepartureCapacities

    The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.

    Attribute

    0:*

    +GeneralAttribute

    Note or attribute.

    13.6. The MinMaxTimeBandGroup group

    @@ -1692,9 +1698,7 @@

    OJP - Open API for distributed Journey

    MinMaxTimeBandGroup

    Earliest possible departure time from a start location and latest possible arrival at a different destination location.

    MinMaxTimeBand

    EarliestDepartureTime

    0:1

    xs:dateTime

    Earliest possible departure time from start location.

    LatestArrivalTime

    0:1

    xs:dateTime

    Latest possible arrival time at destination location.

    InfoUrl

    0:1

    +WebLink

    Link to web page providing more details on service.

    14.23. The complex type OwnerRefStructure

    OwnerRefStructure

    OwnerCode

    Reference to an ORGANISATION with ownership as the RESPONSIBILITY ROLE

    14.24. The toplevel element OwnerRef

    OwnerRef

    +OwnerRef

    Reference to an ORGANISATION with ownership as the RESPONSIBILITY ROLE

    14.25. The complex type OperatingDayRefStructure

    OperatingDayRefStructure

    OperatingDayCode

    Reference to an Operating Day

    14.26. The toplevel element OperatingDayRef

    OperatingDayRef

    +OperatingDayRef

    Reference to an Operating Day

    14.27. The complex type OperatingDaysStructure

    OperatingDaysStructure

    [TMv6] day of public transport operation of which the characteristics are defined in a specific SERVICE CALENDAR and which may last more than 24 hours. This is useful, when the trip can be made during several days. Often users search in "general" withouth setting a date and then refine with the actual date. By using OperatingDaysStructure the result can directly be reused without an additional OJPTripRequest.

    The element contains a sequence of the following elements:

    From

    1:1

    xs:date

    Start date of period.

    To

    1:1

    xs:date

    End date of period.

    Pattern

    1:1

    ValidDayBit

    Bit pattern for operating days between start date and end date. The length of the pattern is equal to the number of days from start date to end date. A bit value of "1" indicates that an event actually happens on the day that is represented by the bit position.

    14.28. The OperatingDaysGroup group

    -

    OperatingDaysGroup

    Coded as bit pattern

    OperatingDays

    OperatingDays

    0:1

    +OperatingDays

    Bit string definition of operating days.

    OperatingDaysDescription

    0:1

    +InternationalText

    Textual description of the operation days, e.g. "monday to friday" or "not on holidays".

    14.29. The complex type WeekdayTimePeriodStructure

    WeekdayTimePeriodStructure

    [a specialisation of TIME BAND in TMv6] aggregation of TIME BAND and DAY OF WEEK (Time period on a weekday).

    The element contains a sequence of the following elements:

    Weekday

    0:*

    WeekdayType

    [a specialisation of DAY OF WEEK in TMv6] enumeration of individual the seven DAYs OF WEEK, along with public holidays

    StartTime

    1:1

    xs:time

    Start time of period.

    Duration

    1:1

    xs:duration

    Time duration of period.

    14.30. The complex type GeneralAttributeStructure

    - - +

    GeneralAttributeStructure

    Structured attribute classification with associated text. If URL is given, it refers to the whole attribute text.

    The element contains a sequence of the following elements:

    Text

    1:1

    +InternationalText

    Text of the attribute to be shown to the user.

    Code

    1:1

    xs:NMTOKEN

    Internal code of the attribute. Can be used for detection of double occurrences.

    →‍siri:AllFacilitiesGroup

    Mandatory

    0:1

    xs:boolean

    Defines whether the attribute has to be shown to the user.

    Importance

    0:1

    Percent

    Importance of the attribute.

    14.29. The complex type WeekdayTimePeriodStructure

    WeekdayTimePeriodStructure

    [a specialisation of TIME BAND in TMv6] aggregation of TIME BAND and DAY OF WEEK (Time period on a weekday).

    The element contains a sequence of the following elements:

    Weekday

    0:*

    WeekdayType

    [a specialisation of DAY OF WEEK in TMv6] enumeration of individual the seven DAYs OF WEEK, along with public holidays

    StartTime

    1:1

    xs:time

    Start time of period.

    Duration

    1:1

    xs:duration

    Time duration of period.

    14.30. The complex type GeneralAttributeStructure

    @@ -1705,11 +1709,9 @@

    OJP - Open API for distributed Journey

    GeneralAttributeStructure

    Structured attribute classification with associated text. If URL is given, it refers to the whole attribute text.

    The element contains a sequence of the following elements:

    UserText

    1:1

    +InternationalText

    Text of the attribute to be shown to the user.

    Code

    1:1

    xs:NMTOKEN

    Internal code of the attribute. Can be used for detection of double occurrences.

    Key

    0:1

    xs:NMTOKEN

    Key if the attribute is used as a key/value pair.

    Value

    0:1

    xs:string

    Value if the attribute is used as a key/value pair.

    Facility

    0:*

    siri:AllFacilitiesFeatureStructure

    Facilities associated with this attribute.

    Mandatory

    0:1

    xs:boolean

    Defines whether the attribute has to be shown to the user.

    Importance

    0:1

    Percent

    Importance of the attribute.

    WebLink

    Url

    1:1

    xs:anyURI

    URL to resource on web.

    MimeType

    0:1

    xs:normalizedString

    MIME type of the referenced resource. To which kind of resource does the URL point to?

    Embeddable

    0:1

    xs:boolean

    Is the referenced resource meant to be embedded as a webview in a surrounding context, e.g. app or web page? If yes, the resource has to be fully responsive. Default is false.

    ConfidenceLevel

    0:1

    Percentage

    Confidence level of the emission value in percent.

    -

    15. OJP/OJP_FacilitySupport.xsd - Supporting definitions for facilities containing wrappers for SIRI

    15.1. The AllFacilitiesGroup group

    - -

    AllFacilitiesGroup

    Wrapper for SIRI facilities.

    →‍siri:AllFacilitiesGroup

    15.2. The StopFacilityGroup group

    +

    15. OJP/OJP_FacilitySupport.xsd - Supporting definitions for facilities containing wrappers for SIRI

    15.1. The StopFacilityGroup group

    StopFacilityGroup

    Wrapper for SIRI stop facilities.

    -

    StopFacilityGroup

    Wrapper for SIRI stop facilities.

    →‍siri:StopFacilityGroup

    15.3. The ServiceFacilityGroup group

    +

    ServiceFacilityGroup

    Wrapper for SIRI service facilities.

    15.2. The ServiceFacilityGroup group

    ServiceFacilityGroup

    Wrapper for SIRI service facilities.

    →‍siri:ServiceFacilityGroup

    16. OJP/OJP_ModesSupport.xsd - Supporting definitions for the classification of modes of transport

    16.1. Simple type definitions

    ContinuousModesEnumeration

    walk | demandResponsive | replacementService

    Types of cmodes that run at any time without a timetable.

    IndividualModesEnumeration

    walk | cycle | taxi | self-drive-car | others-drive-car | motorcycle | truck | scooter | ride-pool-car | car-sharing | cycle-sharing | scooter-sharing | park-ride-car

    modes which an individual powers themselves (such as walk, cycle)

    PrivateModesEnumeration

    vehiclePooling | schoolBus | companyShuttle | hotelShuttle | other

    [a category of MODE in TMv6] MODEs offered by private individuals (or companies or closed communities).

    TransferModesEnumeration

    walk | parkAndRide | bikeAndRide | carHire | bikeHire | protectedConnection | guaranteedConnection | remainInVehicle | changeWithinVehicle | checkIn | checkOut

    MODEs dedicated to peform TRANSFERs

    16.2. The complex type IndividualTransportOptionsStructure

    IndividualTransportOptionsStructure

    Individual modes and their usage limits as stated by the passenger (TRIP ACCESS CONSTRAINT).

    The element contains a sequence of the following elements:

    Mode

    1:1

    IndividualModes

    Mode of individual transport. When mode self-drive-car is used the connection to another mode will need a parking space for the car. Thus, this mode is a generalisation of all park and ride use cases. The mode others-drive-car, however, only needs a place to let a person be set down from a car.

    MaxDistance

    0:1

    siri:DistanceType

    Maximum distance in meters. If given, it restricts the maximum distance of routes with the given mode.

    MaxDuration

    0:1

    xs:duration

    Maximum duration. If given, it restricts the maximum time of routes with the given mode.

    MinDistance

    0:1

    siri:DistanceType

    Minimum distance in meters. If given, it restricts the minimum distance of routes with the given mode.

    MinDuration

    0:1

    xs:duration

    Minimum duration. If given, it restricts the minimum time of routes with the given mode.

    Speed

    0:1

    OpenPercent

    Relative speed in percent. If given slows the standard speed (below 100) or fasten it (above 100).

    AdditionalTime

    0:1

    xs:duration

    Additional time added to the actual traveling time needed to use a specific mode.

    16.3. The complex type ModeStructure

    diff --git a/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml b/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml index d24cb47fc..afafe7b5a 100644 --- a/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml +++ b/examples/functions/fare/Fare_001_Request_PR_59_92_95_123.xml @@ -72,17 +72,19 @@ 182 - + Nur 2. Klasse - + A___2 - + Restaurant - + A__WR - restaurantService + + restaurantService + St. Petersinsel Nord diff --git a/examples/functions/location/LIR_01_response_simple_StopPoint.xml b/examples/functions/location/LIR_01_response_simple_StopPoint.xml index 6e05cfa3c..73d80f86e 100644 --- a/examples/functions/location/LIR_01_response_simple_StopPoint.xml +++ b/examples/functions/location/LIR_01_response_simple_StopPoint.xml @@ -38,6 +38,22 @@ bus localBusService + + + Park and Ride Zürich Kreuzplatz + Park and Ride Zürich Kreuzplatz + + 1231211-12311 + PR_NOVA + 12301 + + + parkAndRidePark + + + carPark + + true 1 diff --git a/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml b/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml index d8b90cfb0..88745792f 100644 --- a/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml +++ b/examples/functions/stop_event/StopEvent_002_Response_ShorterCase_PR_83_92_95_96.xml @@ -31,6 +31,19 @@ 2021-08-17T08:25:00Z 5 + + fewSeatsAvailable + 10 + + + + Boarding + + PRM + + boardingAssistance + + diff --git a/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml b/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml index def28952f..21bd933b7 100644 --- a/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml +++ b/examples/functions/stop_event/StopEvent_003_Response_LongerCase_PR_39_83_96_107_150.xml @@ -220,9 +220,9 @@ 128 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM 8504356 diff --git a/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml b/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml index d92653fcc..b5f588fff 100644 --- a/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml +++ b/examples/functions/trip/TR_01_response_Bern_Luzern_10results_optimisation_fastest.xml @@ -96,9 +96,9 @@ Description of the route. - + Aussteigeseite: Links - + ojp91013YR_InfoCall65511_105764_1 de:00000:-1 @@ -193,21 +193,21 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Aussteigeseite: Links - + ojp910S1NH_InfoCall179_105764_1 - + Aussteigeseite: Links - + ojp910S1NH_InfoCall179_107680_1 de:00000:-1 @@ -286,42 +286,48 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Businesszone in 1. Klasse - + A__BZ - firstClass - businessServices + + firstClass + + + businessServices + - + Familienwagen mit Spielplatz - + A__FA - + Ruhezone in 1. Klasse - + A__RZ - mobilePhoneFreeZone + + mobilePhoneFreeZone + - + Aussteigeseite: Links - + ojp91IR75R_InfoCall161_106218_1 - + Aussteigeseite: Links - + ojp91IR75R_InfoCall161_107680_1 de:00000:-1 diff --git a/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml b/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml index fd07e1476..5572d73b4 100644 --- a/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml +++ b/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml @@ -421,15 +421,15 @@ 3849 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Niederflureinstieg - + A__NF de:00000:-1 @@ -558,15 +558,15 @@ 3849 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Niederflureinstieg - + A__NF de:00000:-1 @@ -947,15 +947,15 @@ 849 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Niederflureinstieg - + A__NF de:00000:-1 @@ -1165,21 +1165,21 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Aussteigeseite: Rechts - + ojp91S12ZH_InfoCall77_106219_1 - + Aussteigeseite: Rechts - + ojp91S12ZH_InfoCall77_106220_1 de:00000:-1 @@ -1410,15 +1410,15 @@ 3849 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Niederflureinstieg - + A__NF de:00000:-1 diff --git a/examples/functions/trip/TR_02_response_geoposition_2_geoposition_1.xml b/examples/functions/trip/TR_02_response_geoposition_2_geoposition_1.xml new file mode 100644 index 000000000..16fcffabe --- /dev/null +++ b/examples/functions/trip/TR_02_response_geoposition_2_geoposition_1.xml @@ -0,0 +1,1636 @@ + + + + + 2020-11-30T10:30:33Z + OJPCH_Prod + true + + 2020-11-30T10:30:32Z + true + 529 + + + + + 8591258 + + Zürich, Lindenplatz + + + EFA + 126303:0: + + 23026261:27 + + + Zürich, Lindenplatz + + + 8.48611 + 47.38782 + + + + Park and Ride + + P_R + + carPark + + + + + + 23026261:27 + + Unknown + + + + Zürich + + + 8.48611 + 47.38782 + + + + + + + ID-847240F3-270A-4821-A566-131E5E949366 + + ID-847240F3-270A-4821-A566-131E5E949366 + PT41M + 2020-12-01T11:55:00Z + 2020-12-01T12:36:00Z + 1 + 5318 + + 1 + + + + 8.48399 + 47.38614 + + + Altstetten + + + + 8591258 + + Zürich, Lindenplatz + + + + walk + + 2020-12-01T11:55:00Z + 2020-12-01T12:00:00Z + PT5M + 330 + + + + + 8.48399 + 47.38614 + + + Altstetten + + + + 8591258 + + Zürich, Lindenplatz + + + PT5M + 330 + + + + + + + + 8.48399 + 47.38614 + + + 8.48340 + 47.38621 + + + + PT0M0S + 0 + + origin + left + + + + + + 8.48340 + 47.38621 + + + 8.48341 + 47.38622 + + + 8.48338 + 47.38633 + + + 8.48327 + 47.38658 + + + 8.48324 + 47.38661 + + + Wirtschaftsweg + PT0M40S + 45 + + keep + straight_on + + + + Wirtschaftsweg + PT0H3M40S + 245 + + turn + right + + + + Fußweg + PT0M9S + 11 + + turn + left + + + + Bahnsteig + PT0M26S + 29 + + turn + right + + + + Einstieg Straßenbahn + PT0M0S + 0 + + enter + left + + + + + + 2 + + + 8591258 + + Zürich, Lindenplatz + + + 2020-12-01T12:00:00Z + + 1 + + + Park and Ride + + P_R + + carPark + + + carHire + + + + + 8591165 + + Zürich, Grimselstrasse + + + 2020-12-01T12:01:00Z + + + 2020-12-01T12:01:00Z + + 2 + + + 8591222 + + Zürich, Kappeli + + + 2020-12-01T12:03:00Z + + + 2020-12-01T12:03:00Z + + 3 + + + 8591138 + + Zürich, Freihofstrasse + + + 2020-12-01T12:04:00Z + + + 2020-12-01T12:04:00Z + + 4 + + + 8591252 + + Zürich, Letzigrund + + + 2020-12-01T12:05:00Z + + + 2020-12-01T12:05:00Z + + 5 + + + 8591038 + + Zürich, Albisriederplatz + + + 2020-12-01T12:06:00Z + + + 2020-12-01T12:06:00Z + + 6 + + + 8591448 + + Zürich, Zypressenstrasse + + + 2020-12-01T12:08:00Z + + + 2020-12-01T12:08:00Z + + 7 + + + 8591259 + + Zürich, Lochergut + + + 2020-12-01T12:09:00Z + + + 2020-12-01T12:09:00Z + + 8 + + + 8591218 + + Zürich,Kalkbreite/Bhf.Wiedikon + + + 2020-12-01T12:10:00Z + + + 2020-12-01T12:10:00Z + + 9 + + + 8591079 + + Zürich, Bezirksgebäude + + + 2020-12-01T12:11:00Z + + + 2020-12-01T12:11:00Z + + 10 + + + 8591381 + + Zürich, Stauffacher + + + 2020-12-01T12:13:00Z + + + 2020-12-01T12:14:00Z + + 11 + + + 8591369 + + Zürich, Sihlstrasse + + + 2020-12-01T12:16:00Z + + + 2020-12-01T12:16:00Z + + 12 + + + 8591299 + + Zürich, Paradeplatz + + + 2020-12-01T12:18:00Z + + + 2020-12-01T12:18:00Z + + 13 + + + 8591093 + + Zürich, Kantonalbank + + + 2020-12-01T12:19:00Z + + + 2020-12-01T12:19:00Z + + 14 + + + 8591105 + + Zürich, Bürkliplatz + + + 2020-12-01T12:21:00Z + + + 2020-12-01T12:21:00Z + + 15 + + + 8576193 + + Zürich, Bellevue + + + 2020-12-01T12:22:00Z + + 16 + + + Unknown + 91002::H:j20:660 + 91002: + H + + tram + cityTram + + Tram + + + T + + + + 2 + + + 3849 + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + + Niederflureinstieg + + A__NF + + de:00000:-1 + + Zürich Tiefenbrunnen, Bahnhof + + + + + + 8591258 + + Zürich, Lindenplatz + + + + 8576193 + + Zürich, Bellevue + + + PT22M + + + + + Tram + + + 5488 + + + + + + 3 + + walk + + 8576193 + + Zürich, Bellevue + + + + 8576193 + + Zürich, Bellevue + + + 2020-12-01T12:22:00Z + 2020-12-01T12:24:00Z + PT2M + PT2M + PT0M + + + + 4 + + + 8576193 + + Zürich, Bellevue + + + 2020-12-01T12:24:00Z + + 1 + + + 8503059 + + Zürich Stadelhofen FB + + + 2020-12-01T12:26:00Z + + + 2020-12-01T12:26:00Z + + 2 + + + 8530813 + + Zürich Kreuzplatz + + + 2020-12-01T12:28:00Z + + + 2020-12-01T12:28:00Z + + 3 + + + 8591364 + + Zürich, Signaustrasse + + + 2020-12-01T12:29:00Z + + 4 + + + 2023-03-03 + 91011:A:H:j20:255 + 91011:A + H + + tram + cityTram + + Tram + + + T + + + + 11 + + + 3849 + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + + Niederflureinstieg + + A__NF + + de:00000:-1 + + Zürich, Rehalp + + + + + + 8576193 + + Zürich, Bellevue + + + + 8591364 + + Zürich, Signaustrasse + + + PT5M + 4550 + + + + + Tram + + + 3953 + + + + + + 5 + + + 8591364 + + Zürich, Signaustrasse + + + + + 8.56005 + 47.36462 + + + Hirslanden + + + + walk + + 2020-12-01T12:29:00Z + 2020-12-01T12:36:00Z + PT7M + 438 + + + + 8591364 + + Zürich, Signaustrasse + + + + + 8.56005 + 47.36462 + + + Hirslanden + + + PT7M + 438 + + + + + + + + + 8.55763 + 47.36323 + + + 8.55763 + 47.36323 + + + Ausstieg Straßenbahn rechts + PT0M0S + 0 + + leave + left + + + + + + 8.55763 + 47.36323 + + + 8.55749 + 47.36334 + + + Signaustrasse + PT0M15S + 16 + + keep + straight_on + + + + + + 8.55749 + 47.36334 + + + 8.55751 + 47.36336 + + + Bahnsteig + PT0M2S + 2 + + turn + right + + + + Forchstrasse + PT0H1M38S + 109 + + turn + left + + + + Fußweg + PT0M15S + 17 + + turn + right + + + + Eidmattstrasse + PT0H3M33S + 238 + + turn + right + + + + B�cklinstrasse + PT0M36S + 40 + + turn + right + + + + B�cklinstrasse + PT0M11S + 13 + + continue + straight_on + + + + + + + + ID-CB3278AE-9854-40E7-8FB5-B6132DE80D84 + + ID-CB3278AE-9854-40E7-8FB5-B6132DE80D84 + PT39M + 2020-12-01T11:57:00Z + 2020-12-01T12:36:00Z + 2 + 12026 + + 1 + + + + 8.48399 + 47.38614 + + + Altstetten + + + + 8591258 + + Zürich, Lindenplatz + + + + walk + + 2020-12-01T11:57:00Z + 2020-12-01T12:02:00Z + PT5M + 330 + + + + + 8.48399 + 47.38614 + + + Altstetten + + + + 8591258 + + Zürich, Lindenplatz + + + PT5M + 330 + + + + + + + + 8.48399 + 47.38614 + + + 8.48340 + 47.38621 + + + + PT0M0S + 0 + + origin + left + + + + + + 8.48340 + 47.38621 + + + 8.48341 + 47.38622 + + + 8.48338 + 47.38633 + + + 8.48327 + 47.38658 + + + 8.48324 + 47.38661 + + + Wirtschaftsweg + PT0M40S + 45 + + keep + straight_on + + + + Wirtschaftsweg + PT0H3M40S + 245 + + turn + right + + + + Fußweg + PT0M9S + 11 + + turn + left + + + + Bahnsteig + PT0M26S + 29 + + turn + right + + + + Einstieg Bus + PT0M0S + 0 + + enter + left + + + + + + 2 + + + 8591258 + + Zürich, Lindenplatz + + + 2020-12-01T12:02:00Z + + 1 + + + 8591056 + + Zürich Altstetten, Bahnhof + + + 2020-12-01T12:05:00Z + + 2 + + + Unknown + 92080::R:j20:1384 + 92080: + R + + bus + localBusService + + Bus + + + B + + + + 80 + + + 849 + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + + Niederflureinstieg + + A__NF + + de:00000:-1 + + Zürich Oerlikon, Bahnhof Nord + + + + + + 8591258 + + Zürich, Lindenplatz + + + + 8591056 + + Zürich Altstetten, Bahnhof + + + PT3M + 669 + + + + + Bus + + + 8411 + + + + + + 3 + + walk + + 8591056 + + Zürich Altstetten, Bahnhof + + + + 8503001 + + Zürich Altstetten + + + 2020-12-01T12:05:00Z + 2020-12-01T12:09:00Z + PT4M + PT4M + PT0M + + + + + + 8.48835 + 47.39107 + + + 8.48835 + 47.39106 + + + Ausstieg Bus rechts + PT0M0S + 0 + + leave + left + + + + + + 8.48835 + 47.39106 + + + 8.48867 + 47.39099 + + + Fußweg + PT0M22S + 25 + + keep + straight_on + + + + Fußweg + PT0M42S + 47 + + turn + left + + + + Fußweg + PT0M11S + 13 + + turn + half_right + + + + Einstieg Zug + PT0M0S + 0 + + enter + left + + + + + + 4 + + + 8503001 + + Zürich Altstetten + + + 4 + + + 2020-12-01T12:09:00Z + + 1 + + + 8503020 + + Zürich Hardbrücke + + + 1 + + + 2020-12-01T12:11:00Z + + + 2020-12-01T12:11:00Z + + 2 + + + 8503000 + + Zürich HB + + + 43/44 + + + 2020-12-01T12:15:00Z + + + 2020-12-01T12:16:00Z + + 3 + + + 8503003 + + Zürich Stadelhofen + + + 3 + + + 2020-12-01T12:19:00Z + + 4 + + + + Unknown + 91S12:Z:H:j20:77 + 91S12:Z + H + + rail + local + + Zug + + + S + + + + S12 + + + 11 + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + + Aussteigeseite: Rechts + + ojp91S12ZH_InfoCall77_106219_1 + + + + Aussteigeseite: Rechts + + ojp91S12ZH_InfoCall77_106220_1 + + de:00000:-1 + + Schaffhausen + + + + + + 8503001 + + Zürich Altstetten + + + + 8503003 + + Zürich Stadelhofen + + + PT10M + 6381 + + + + + S-Bahn + + + 19249 + + + + + + 5 + + walk + + 8503003 + + Zürich Stadelhofen + + + + 8503059 + + Zürich Stadelhofen FB + + + 2020-12-01T12:19:00Z + 2020-12-01T12:26:00Z + PT7M + PT4M + PT3M + + + + + + 8.54848 + 47.36661 + + + 8.54848 + 47.36661 + + + Ausstieg Zug rechts + PT0M0S + 0 + + leave + left + + + + + + 8.54848 + 47.36661 + + + 8.54851 + 47.36663 + + + Fußweg + PT0M2S + 3 + + keep + straight_on + + + + + + 8.54851 + 47.36663 + + + 8.54845 + 47.36668 + + + Fußweg + PT0M6S + 7 + + turn + left + + + + + + 8.54845 + 47.36668 + + + 8.54832 + 47.36678 + + + Außentreppe + PT0M13S + 14 + + continue + straight_on + + + + Fußweg + PT0M40S + 45 + + turn + left + + + + Fußweg + PT0M12S + 13 + + turn + left + + + + Fußweg + PT0M1S + 1 + + continue + straight_on + + + + Einstieg Straßenbahn + PT0M0S + 0 + + enter + left + + + + + + 6 + + + 8503059 + + Zürich Stadelhofen FB + + + 2020-12-01T12:26:00Z + + 1 + + + 8530813 + + Zürich Kreuzplatz + + + 2020-12-01T12:28:00Z + + + 2020-12-01T12:28:00Z + + 2 + + + 8591364 + + Zürich, Signaustrasse + + + 2020-12-01T12:29:00Z + + 3 + + + 2023-03-03 + 91011:A:H:j20:255 + 91011:A + H + + tram + cityTram + + Tram + + + T + + + + 11 + + + 3849 + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + + Niederflureinstieg + + A__NF + + de:00000:-1 + + Zürich, Rehalp + + + + + + 8503059 + + Zürich Stadelhofen FB + + + + 8591364 + + Zürich, Signaustrasse + + + PT3M + 4208 + + + + + Tram + + + 3953 + + + + + + 7 + + + 8591364 + + Zürich, Signaustrasse + + + + + 8.56005 + 47.36462 + + + Hirslanden + + + + walk + + 2020-12-01T12:29:00Z + 2020-12-01T12:36:00Z + PT7M + 438 + + + + 8591364 + + Zürich, Signaustrasse + + + + + 8.56005 + 47.36462 + + + Hirslanden + + + PT7M + 438 + + + + + + + + + 8.55763 + 47.36323 + + + 8.55763 + 47.36323 + + + Ausstieg Straßenbahn rechts + PT0M0S + 0 + + leave + left + + + + + + 8.55763 + 47.36323 + + + 8.55749 + 47.36334 + + + Signaustrasse + PT0M15S + 16 + + keep + straight_on + + + + + + 8.55749 + 47.36334 + + + 8.55751 + 47.36336 + + + Bahnsteig + PT0M2S + 2 + + turn + right + + + + Forchstrasse + PT0H1M38S + 109 + + turn + left + + + + Fußweg + PT0M15S + 17 + + turn + right + + + + Eidmattstrasse + PT0H3M33S + 238 + + turn + right + + + + B�cklinstrasse + PT0M36S + 40 + + turn + right + + + + B�cklinstrasse + PT0M11S + 13 + + continue + straight_on + + + + + + + + + + diff --git a/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml b/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml index 133649671..5746ea82d 100644 --- a/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml +++ b/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml @@ -237,21 +237,21 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Aussteigeseite: Rechts - + ojp91S24ZR_InfoCall259_106218_1 - + Aussteigeseite: Links - + ojp91S24ZR_InfoCall259_106536_1 de:00000:-1 @@ -381,9 +381,9 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM de:00000:-1 @@ -532,21 +532,21 @@ 11 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Aussteigeseite: Links - + ojp91S24ZR_InfoCall259_108328_1 - + Aussteigeseite: Links - + ojp91S24ZR_InfoCall259_106536_1 de:00000:-1 diff --git a/examples/functions/trip/TR_04_response_search_by_StopPlaceRef_many_params.xml b/examples/functions/trip/TR_04_response_search_by_StopPlaceRef_many_params.xml index d18e7433d..2c4eaaff7 100644 --- a/examples/functions/trip/TR_04_response_search_by_StopPlaceRef_many_params.xml +++ b/examples/functions/trip/TR_04_response_search_by_StopPlaceRef_many_params.xml @@ -58,6 +58,17 @@ 2020-09-30T10:03:00Z 1 + true + + 2 + 4 + + + + FULL + + SwissPRMMobilityCode + 8505000 @@ -94,21 +105,21 @@ 82 - + Reservierung möglich - + A___R - + Bar - + A___B - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM de:00000:-1 @@ -190,21 +201,21 @@ 82 - + Reservierung möglich - + A___R - + Bar - + A___B - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM de:00000:-1 diff --git a/examples/functions/trip/TR_05_response_with_occupation.xml b/examples/functions/trip/TR_05_response_with_occupation.xml index 936fd8f5c..fe8066195 100644 --- a/examples/functions/trip/TR_05_response_with_occupation.xml +++ b/examples/functions/trip/TR_05_response_with_occupation.xml @@ -125,15 +125,15 @@ 3849 - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM - + Niederflureinstieg - + A__NF de:00000:-1 diff --git a/examples/functions/trip/TR_06_response_private_sharing.xml b/examples/functions/trip/TR_06_response_private_sharing.xml index fc41e7e83..3fc908173 100644 --- a/examples/functions/trip/TR_06_response_private_sharing.xml +++ b/examples/functions/trip/TR_06_response_private_sharing.xml @@ -144,21 +144,21 @@ 82 - + Reservierung möglich - + A___R - + Bar - + A___B - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM de:00000:-1 diff --git a/examples/functions/trip/TR_ParallelService.xml b/examples/functions/trip/TR_ParallelService.xml index 2c669dde6..c779a0eb4 100644 --- a/examples/functions/trip/TR_ParallelService.xml +++ b/examples/functions/trip/TR_ParallelService.xml @@ -303,9 +303,9 @@ 33 - + Zug mit mehreren Zielen: Bitte Anschriften am Zug beachten - + A__FL 8504221 diff --git a/examples/functions/trip_change/ChangeTripRequest.xml b/examples/functions/trip_change/ChangeTripRequest.xml index b80d1b8f0..2b1acb1cb 100644 --- a/examples/functions/trip_change/ChangeTripRequest.xml +++ b/examples/functions/trip_change/ChangeTripRequest.xml @@ -86,21 +86,21 @@ 82 - + Reservierung möglich - + A___R - + Bar - + A___B - + Maskenpflicht für Reisende ab 12 Jahren - + A__OM de:00000:-1 diff --git a/examples/functions/trip_change/ChangeTripResponse.xml b/examples/functions/trip_change/ChangeTripResponse.xml index 1f56aa64f..b09d345e8 100644 --- a/examples/functions/trip_change/ChangeTripResponse.xml +++ b/examples/functions/trip_change/ChangeTripResponse.xml @@ -78,15 +78,15 @@ 82 - + Reservierung möglich - + A___R - + Bar - + A___B

    ModeStructure

    [a specialisation of MODE in TMv6] an extended range of VEHICLE MODEs, aggregating them with some SUBMODEs

    The element contains a sequence of the following elements: