From cd495ce2563c580a8826d36260f8613db525c172 Mon Sep 17 00:00:00 2001 From: ue71603 Date: Fri, 20 Jan 2023 12:33:22 +0100 Subject: [PATCH 1/3] Update OJP_Trips.xsd --- OJP/OJP_Trips.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 5eb24f28c..30295fedb 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -791,7 +791,7 @@ - The range of alternative turns that can be described. + The range of possible turns that can be described. @@ -854,7 +854,6 @@ Various types of guidance advice given to traveller. Suitable values may differ by MODE (e.g. a car driver needs different advice than a person walking for a transfer. - @@ -868,12 +867,12 @@ - continue on the same street/road/path. + Continue on the same street/road/path. - keep going on the same street/road/path. + Keep going on the same street/road/path. @@ -891,7 +890,6 @@ Can be something like an elevator or a vehicle. - Entering a roundabout. @@ -922,7 +920,6 @@ Access lane to highway or the like. - If it is unclear which lane to choose. @@ -943,13 +940,16 @@ If there are more than 2 lanes, then TurnAction half_right,right,sharp_right may help decide - + + + + - The range of alternative turns that can be described + The range of possible turns that can be described. From 52d44fc49b4f84b009f47dbaa1cb7c8c8dcb07b3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:35:23 +0000 Subject: [PATCH 2/3] Lint and update documentation tables --- docs/generated/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index feb749f90..6fba90ab6 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -661,7 +661,7 @@

OJP - Open API for distributed Journey

11. OJP/OJP_Trips.xsd - Request and response definitions for trip requests and distributed journey planning

11.1. Simple type definitions

AccessFeatureStatusEnumeration

unknown | available | partiallyAvailable | notAvailable

Allowed values for status of the access feature.

AccessFeatureTypeEnumeration

elevator | stairs | seriesOfStairs | singleStep | seriesOfSingleSteps | escalator | travelator | ramp | footpath | shuttle | other | unkown

Allowed values for a AccessFeature.

AccessibilityFeatureTypesEnumeration

lowFloorAccess | stepFreeAccess | accessWithSteps | slidingStep | raisedKerb | narrowEntrance | wheelchairLift | manualRamp | automaticRamp | suitableForWheelchairs | suitableForUnassistedWheelchairs | suitableForHeaviliyDisabled | suitableForPushchairs | suitableForBicycles | tactilePlatformEdges | tactileGuidingStrips | tactileOrAuditorySigns | visualSigns | elevatorWithTactileButtons | elevatorWithAcousticAnnouncements | audioInformation | audioForHearingImpaired | visualDisplays | displaysForVisuallyImpaired | largePrintTimetables | boardingAssistance | onboardAssistance | unaccompaniedMinorAssistance | barrier | validator

Allowed values for AccessibilityFeature (for mobility and sensory impairments, assistance and important elements to pay attention to).

FeasibilityEnumeration

allAccessFeaturesAvailable | accessFeatureNotAvailable | accessFeaturePartiallyAvailable | accessFeatureWithUnknownAvailability | seeSituations

Allowed values for the feasibility of a TRIP or part of a TRIP.

GuidanceAdviceEnumeration

origin | destination | continue | keep | turn | leave | enter | enter_roundabout | stay_in_roundabout | leave_roundabout | enter_builtup_area | leave_builtup_area | freewayAccessRamp | unknown_lane_choice | left_lane | middle_lane | right_lane | unknown_turning_kind

Various types of guidance advice given to traveller. Suitable values may differ by MODE (e.g. a car driver needs different advice than a person walking for a transfer.

MultiPointTypeEnumeration

anyPoint | eachOrigin | eachDestination | eachOriginDestination | somePoints

How the multiple origin/destination points should be considered. Note: Unfortunately this element was underdefined before and this resulted in different implementations. Note: MultiPointType trumps the number of results. If the algorithm thinks it necessary to provide more results, it should. -

OptimisationMethodEnumeration

fastest | minChanges | leastWalking | leastCost | leastDistance | earliestArrival | latestDeparture | earliestArrivalAndLatestDeparture | environmentalSafety | extraSafe | extraReliable | scenic | quietTravel

The types of algorithm that can be used for planning a journey (fastest, least walking, etc.). If multiple optimisation methods are needed, then several requests should be performed in parallel.

TransitionEnumeration

up | down | level | upAndDown | downAndUp

Transition types for interchanges.

TripProblemTypeEnumeration

TRIP_NOTRIPFOUND | TRIP_ORIGINUNKNOWN | TRIP_DESTINATIONUNKNOWN | TRIP_VIAUNKNOWN | TRIP_NOTVIAUNKNOWN | TRIP_NOCHANGEATUNKNOWN | TRIP_NOORIGIN | TRIP_NODESTINATION | TRIP_ORIGINDESTINATIONIDENTICAL | TRIP_DATETIMEERROR | TRIP_DEPARTUREAFTERARRIVAL | TRIP_DATEOUTOFRANGE | TRIP_ORIGINEQUIVALENT | TRIP_DESTINATIONEQUIVALENT | TRIP_VIAEQUIVALENT | TRIP_REALTIMEINCOMPLETE | TRIP_ITTIMEEXTENDED | TRIP_ITMODECHANGED | TRIP_INCONVENIENTWAITING | TRIP_MULTIPOINT_NOTALLPOINTSCOVERED | TRIP_MULTIPOINT_TOOMANYPOINTS | TRIP_OTHER

Types of problems that may be returned in responses to Trip requests.

TurnActionEnumeration

straight_on | half_right | right | sharp_right | uturn | sharp_left | left | half_left | up | down | unknown_turn_action

The range of alternative turns that can be described

11.2. The TripRequestGroup group

+

TripRequestGroup

Trip request structure.

OptimisationMethodEnumeration

fastest | minChanges | leastWalking | leastCost | leastDistance | earliestArrival | latestDeparture | earliestArrivalAndLatestDeparture | environmentalSafety | extraSafe | extraReliable | scenic | quietTravel

The types of algorithm that can be used for planning a journey (fastest, least walking, etc.). If multiple optimisation methods are needed, then several requests should be performed in parallel.

TransitionEnumeration

up | down | level | upAndDown | downAndUp

Transition types for interchanges.

TripProblemTypeEnumeration

TRIP_NOTRIPFOUND | TRIP_ORIGINUNKNOWN | TRIP_DESTINATIONUNKNOWN | TRIP_VIAUNKNOWN | TRIP_NOTVIAUNKNOWN | TRIP_NOCHANGEATUNKNOWN | TRIP_NOORIGIN | TRIP_NODESTINATION | TRIP_ORIGINDESTINATIONIDENTICAL | TRIP_DATETIMEERROR | TRIP_DEPARTUREAFTERARRIVAL | TRIP_DATEOUTOFRANGE | TRIP_ORIGINEQUIVALENT | TRIP_DESTINATIONEQUIVALENT | TRIP_VIAEQUIVALENT | TRIP_REALTIMEINCOMPLETE | TRIP_ITTIMEEXTENDED | TRIP_ITMODECHANGED | TRIP_INCONVENIENTWAITING | TRIP_MULTIPOINT_NOTALLPOINTSCOVERED | TRIP_MULTIPOINT_TOOMANYPOINTS | TRIP_OTHER

Types of problems that may be returned in responses to Trip requests.

TurnActionEnumeration

straight_on | half_right | right | sharp_right | uturn | sharp_left | left | half_left | up | down | unknown_turn_action

The range of possible turns that can be described.

11.2. The TripRequestGroup group

-

TripRequestGroup

Trip request structure.

TripRequest

Origin

1:*

+PlaceContext

Specifies the origin situation from where the user wants to start.

Destination

1:*

+PlaceContext

Specifies the destination situation where the user is heading to.

Via

0:*

+TripVia

Ordered series of points where the journey must pass through. If more than one via point is given all of them must be obeyed - in the correct order. The server is allowed to replace a via stop by equivalent stops. @@ -938,7 +938,7 @@

OJP - Open API for distributed Journey

NotServicedStop

0:1

xs:boolean

The vehicle will not call at this stop despite earlier planning.

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.

11.23. 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

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.24. 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

LINK PROJECTION on the infrastructure network of the LEG together with time information

TurnDescription

0:1

+InternationalText

Textual description of a manoeuvre. This should imply the information from Manoeuvre, TurnAction, and TrackSection.RoadName.

GuidanceAdvice

0:1

GuidanceAdvice

Various types of guidance advice given to traveller.

TurnAction

0:1

TurnAction

The range of alternative turns that can be described.

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".

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.25. 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.26. The TransferDurationGroup group

+

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..

11.23. 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

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.24. 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

LINK PROJECTION on the infrastructure network of the LEG together with time information

TurnDescription

0:1

+InternationalText

Textual description of a manoeuvre. This should imply the information from Manoeuvre, TurnAction, and TrackSection.RoadName.

GuidanceAdvice

0:1

GuidanceAdvice

Various types of guidance advice given to traveller.

TurnAction

0:1

TurnAction

The range of possible turns that can be described.

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".

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.25. 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.26. The TransferDurationGroup group

From 56cf7e0cea6c0bf7022cb799ffd90e7e964a0e5a Mon Sep 17 00:00:00 2001 From: ue71603 Date: Fri, 20 Jan 2023 12:55:27 +0100 Subject: [PATCH 3/3] reintegrate #286 --- OJP/OJP_Places.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OJP/OJP_Places.xsd b/OJP/OJP_Places.xsd index 9197a7e67..01b62ea79 100644 --- a/OJP/OJP_Places.xsd +++ b/OJP/OJP_Places.xsd @@ -379,7 +379,7 @@ Rough estimate of the travel duration from the specified reference place to this exchange point. - + 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.

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.

WalkDuration

0:1

xs:duration

Walk time as part of the overall interchange duration.

BufferTime

0:1

xs:duration

Buffer time as part of the overall interchange duration. Buffer times, f.e. check in/out times, sometimes are mandatory for using certain services as f.e. airplanes, ferries or highspeed trains.