From 1bedcef0a198945cc10b2d201e66729cc2742c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 May 2023 14:25:55 +0200 Subject: [PATCH 1/5] Change FareEstimated description --- OJP/OJP_Fare.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OJP/OJP_Fare.xsd b/OJP/OJP_Fare.xsd index acf2dfa0d..871e83eed 100644 --- a/OJP/OJP_Fare.xsd +++ b/OJP/OJP_Fare.xsd @@ -150,7 +150,7 @@ - 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. + 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. From b0877a7c1cfdfca1f2217f4697c4ac1ea8107120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 May 2023 15:56:22 +0200 Subject: [PATCH 2/5] fixing include and wrapper FareResponse.xml --- OJP/OJP_Status.xsd | 4 ++-- examples/functions/fare/FareResponse.xml | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OJP/OJP_Status.xsd b/OJP/OJP_Status.xsd index 22e56dd3a..5b345b6e0 100644 --- a/OJP/OJP_Status.xsd +++ b/OJP/OJP_Status.xsd @@ -3,9 +3,9 @@ OJP/OJP_Status.xsd - OJP Status request and response - + - + =============================== Status Service ========================================== diff --git a/examples/functions/fare/FareResponse.xml b/examples/functions/fare/FareResponse.xml index 8b52f723b..111f61ed1 100644 --- a/examples/functions/fare/FareResponse.xml +++ b/examples/functions/fare/FareResponse.xml @@ -1,5 +1,11 @@ - + + + + 2021-08-25T17:34:02Z + OJPCH_Prod + true + 2001-12-17T09:30:47Z true @@ -91,3 +97,6 @@ + + + \ No newline at end of file From 1c011146872e814aa8beb3d121e7e6cb034d85e9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 13:57:49 +0000 Subject: [PATCH 3/5] Lint and update documentation tables --- docs/generated/index.html | 2 +- examples/functions/fare/FareResponse.xml | 190 +++++++++++------------ 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index 28f739726..8e2f8538d 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -324,7 +324,7 @@

OJP - Open API for distributed Journey

4.3. The complex type StopFareRequestStructure

StopFareRequestStructure

Sub-request: stop-related fare information.

The element contains a sequence of the following elements:

→‍siri:StopPointRef

1:1

→‍siri:StopPointRef

Reference to the stop point.

Date

0:1

xs:date

Date for which to retrieve Fare information.

4.4. The complex type StaticFareRequestStructure

StaticFareRequestStructure

General Fare information. May depend on date.

The element contains a sequence of the following elements:

Date

0:1

xs:date

Date for which to retrieve Fare information.

→‍FareProductRef

0:*

→‍FareProductRef

Reference to a FareProduct. If no FareProductRef is specified the responding system should reply with information about all available fare products.

4.5. The complex type TripFareRequestStructure

TripFareRequestStructure

Structure of a Single Trip Fare Request.

The element contains a sequence of the following elements:

TripContext

0:1

+ResponseContext

Context to hold trip related objects that occur frequently. Especially necessary, when the system answering the fare request is not the same as the one that did the trip request.

Trip

1:1

+Trip

A complete trip from origin to destination

4.6. The complex type MultiTripFareRequestStructure

MultiTripFareRequestStructure

Structure of a Multi Trip Fare Request.

The element contains a sequence of the following elements:

TripContext

0:1

+ResponseContext

Context to hold trip related objects that occur frequently.

Trip

1:*

+Trip

Multiple complete trips from multiple origins and multiple destination

4.7. The FareResponseGroup group

-

FareResponseGroup

FareResponse

FareResponseContext

0:1

+ResponseContext

Context to hold trip response objects that occur frequently.

FareResult

0:*

+FareResult

Fare result choice element.

4.8. The complex type FareResultStructure

FareResultStructure

Wrapper element for Fare results.

The element contains a sequence of the following elements:

Id

1:1

FareResultObjectId

ID of this result.

ErrorCondition

0:*

+OJPError

Problems related to this FARE result.

FareEstimated

0:1

xs:boolean

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.

Then, the element contains one of the following elements:

a

MultiTripFareResult

-1:*

+MultiTripFareResult

Fare and FareProducts for multiple trips.

b

StaticFareResult

-1:1

+StaticFareResult

Static Fare information.

c

StopFareResult

-1:1

+StopFareResult

Stop-related Fare information.

d

TripFareResult

-1:*

+TripFareResult

Fare and FareProducts for a given trip.

4.9. The complex type StopFareResultStructure

StopFareResultStructure

Stop-related Fare information.

The element contains a sequence of the following elements:

TariffZoneListInArea

1:*

+TariffZoneListInArea

One or more lists of Fare zones that belong to a Fare authority/area.

Extension

0:1

xs:anyType

4.10. The complex type StaticFareResultStructure

StaticFareResultStructure

General Fare information.

The element contains a sequence of the following elements:

FareProduct

0:*

+FareProduct

[related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information.

StaticInfoUrl

0:*

+WebLink

URL to information page on the web.

Extension

0:1

xs:anyType

4.11. The complex type TripFareProductReferenceStructure

TripFareProductReferenceStructure

Element that connects FareProducts to trips. A TripFareProduct is a FAREPRODUCT covering a part or the whole of a TRIP from boarding the first public transport vehicle to alighting from the last public transport vehicle (corresponds to a package of PREASSIGNED FARE PRODUCTs)

The element contains a sequence of the following elements:

→‍FareProductRef

1:1

→‍FareProductRef

Reference to a FareProduct.

FromTripIdRef

1:1

Identifies the "valid from" trip.

FromLegIdRef

0:1

LegObjectId

Identifies the "valid from" LEG. If missing, then valid from the first LEG.

ToTripIdRef

1:1

Identifies the "valid to" trip.

ToLegIdRef

0:1

LegObjectId

Identifies the "valid to" LEG. If missing, then valid to the last LEG.

4.12. The complex type MultiTripFareResultStructure

MultiTripFareResultStructure

Structure of a Multi Trip Fare Request result

The element contains a sequence of the following elements:

TripFareProductReference

1:*

+TripFareProductReference

Non-empty list of trip references in the corresponding MultiTripFareRequestStructure

FareProduct

0:*

+FareProduct

Zero, one or more FareProducts that are valid for the referenced trips / part of trips.

PassedZones

0:1

+TariffZoneListInArea

The set of passed zones.

StaticInfoUrl

0:*

+WebLink

URL to Fare information pages on the web.

+

4.8. The complex type FareResultStructure

FareResultStructure

Wrapper element for Fare results.

The element contains a sequence of the following elements:

Id

1:1

FareResultObjectId

ID of this result.

ErrorCondition

0:*

+OJPError

Problems related to this FARE result.

FareEstimated

0:1

xs:boolean

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.

Then, the element contains one of the following elements:

a

MultiTripFareResult

-1:*

+MultiTripFareResult

Fare and FareProducts for multiple trips.

b

StaticFareResult

-1:1

+StaticFareResult

Static Fare information.

c

StopFareResult

-1:1

+StopFareResult

Stop-related Fare information.

d

TripFareResult

-1:*

+TripFareResult

Fare and FareProducts for a given trip.

4.9. The complex type StopFareResultStructure

StopFareResultStructure

Stop-related Fare information.

The element contains a sequence of the following elements:

TariffZoneListInArea

1:*

+TariffZoneListInArea

One or more lists of Fare zones that belong to a Fare authority/area.

Extension

0:1

xs:anyType

4.10. The complex type StaticFareResultStructure

StaticFareResultStructure

General Fare information.

The element contains a sequence of the following elements:

FareProduct

0:*

+FareProduct

[related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information.

StaticInfoUrl

0:*

+WebLink

URL to information page on the web.

Extension

0:1

xs:anyType

4.11. The complex type TripFareProductReferenceStructure

TripFareProductReferenceStructure

Element that connects FareProducts to trips. A TripFareProduct is a FAREPRODUCT covering a part or the whole of a TRIP from boarding the first public transport vehicle to alighting from the last public transport vehicle (corresponds to a package of PREASSIGNED FARE PRODUCTs)

The element contains a sequence of the following elements:

→‍FareProductRef

1:1

→‍FareProductRef

Reference to a FareProduct.

FromTripIdRef

1:1

Identifies the "valid from" trip.

FromLegIdRef

0:1

LegObjectId

Identifies the "valid from" LEG. If missing, then valid from the first LEG.

ToTripIdRef

1:1

Identifies the "valid to" trip.

ToLegIdRef

0:1

LegObjectId

Identifies the "valid to" LEG. If missing, then valid to the last LEG.

4.12. The complex type MultiTripFareResultStructure

MultiTripFareResultStructure

Structure of a Multi Trip Fare Request result

The element contains a sequence of the following elements:

TripFareProductReference

1:*

+TripFareProductReference

Non-empty list of trip references in the corresponding MultiTripFareRequestStructure

FareProduct

0:*

+FareProduct

Zero, one or more FareProducts that are valid for the referenced trips / part of trips.

PassedZones

0:1

+TariffZoneListInArea

The set of passed zones.

StaticInfoUrl

0:*

+WebLink

URL to Fare information pages on the web.

5. OJP/OJP_FareSupport.xsd - Supporting definitions for fare information on passenger trips

5.1. Simple type definitions

BookingAccessEnumeration

public | authorisedPublic | staff | other

Allowed values for Booking Access.

BookingMethodEnumeration

callDriver | callOffice | online | other | phoneAtStop | text | mobileApp | atOffice | none

Allowed values for Flexible Booking method.

BookingProcessEnumeration

xs:normalizedString

Allowed values for Booking Process UIC 7037 Code list.

ContactTypeEnumeration

any | information | reservations | lostProperty | publicRelations | complaints | emergency | other

Allowed values for CONTACT role.

EmailAddressType

xs:normalizedString

Email address type a@b.

EntitlementProductCodeType

xs:NMTOKEN

Identifier of an ENTITLEMENT PRODUCT (e.g. BahnCard50, BahnCard50First, military card, concessionary card, ...). It is defined by the fare authority.

FareAuthorityCodeType

xs:NMTOKEN

Identifier of a Fare Authority.

FareProblemTypeEnumeration

FARE_OUTOFAREA | FARE_JOURNEYNOTPERMITTED | FARE_ADDITIONALCHARGES | FARE_ADDITIONALTICKETS | FARE_ROUTENOTFEASIBLE | FARE_ALREADYCOVERED | FARE_DATEOUTOFRANGE | FARE_STOPPOINTUNKNOWN | FARE_OTHER

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

FareProductIdType

xs:NMTOKEN

Identifier of a FareProduct

GroupBookingEnumeration

xs:normalizedString

Allowed values for Group Booking.

PassengerCategoryEnumeration

Adult | Child | Senior | Youth | Disabled

[a simplified and specialised view of USER PROFILE in TM and NeTEx] classification of passengers by age or other factors that may determine the fare they will need to pay.

PhoneType

xs:normalizedString

Type for an International phone number. + Country + MSISDN e.g. +41 675601 etc.

PurchaseMomentEnumeration

xs:normalizedString

Allowed values for Purchase Moment.

PurchaseWhenEnumeration

xs:normalizedString

Allowed values for Purchase when.

TariffZoneCodeType

xs:NMTOKEN

Identifier of a fare zone.

5.2. The complex type FareAuthorityRefStructure

FareAuthorityRefStructure

FareAuthorityCode

Reference to a Fare Authority ([a specialisation of an ORGANISATION in TMv6] ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs).

5.3. The toplevel element FareAuthorityRef

FareAuthorityRef

+FareAuthorityRef

Reference to a Fare Authority.

5.4. The FareAuthorityGroup group

diff --git a/examples/functions/fare/FareResponse.xml b/examples/functions/fare/FareResponse.xml index 111f61ed1..c29261dfe 100644 --- a/examples/functions/fare/FareResponse.xml +++ b/examples/functions/fare/FareResponse.xml @@ -5,98 +5,98 @@ 2021-08-25T17:34:02ZOJPCH_Prodtrue - - 2001-12-17T09:30:47Z - true - - - FARE_ADDITIONALCHARGES - - - 2001-12-18T09:30:47Z - - - - ch:1:sboid:123123 - Mybuxi - - - ch:1:sboid:11 - SBB NOVA - - - - - 1231231112231 - - FARE_ADDITIONALTICKETS - - - 1 - 1 - - mybuxi10001231 - Kilometerbasiert normal - ch:1:sboid:123123 - Mybuxi - 15 - CHF - economyClass - - - MyBuxi - - https://www.mybuxi.ch/booking - - - - - onReservation - - PT10M - - - - - - - 123123123 - - 2 - 2 - - öV - ÖV - ch:1:sboid:11 - NOVA - 51 - CHF - secondClass - - - NOVA - - https://www.sbb.ch/NOVA - - - - öV - ÖV - ch:1:sboid:11 - NOVA - 75 - CHF - firstClass - - - NOVA - - https://www.sbb.ch/NOVA - - - - - - - - \ No newline at end of file + + 2001-12-17T09:30:47Z + true + + + FARE_ADDITIONALCHARGES + + + 2001-12-18T09:30:47Z + + + + ch:1:sboid:123123 + Mybuxi + + + ch:1:sboid:11 + SBB NOVA + + + + + 1231231112231 + + FARE_ADDITIONALTICKETS + + + 1 + 1 + + mybuxi10001231 + Kilometerbasiert normal + ch:1:sboid:123123 + Mybuxi + 15 + CHF + economyClass + + + MyBuxi + + https://www.mybuxi.ch/booking + + + + + onReservation + + PT10M + + + + + + + 123123123 + + 2 + 2 + + öV + ÖV + ch:1:sboid:11 + NOVA + 51 + CHF + secondClass + + + NOVA + + https://www.sbb.ch/NOVA + + + + öV + ÖV + ch:1:sboid:11 + NOVA + 75 + CHF + firstClass + + + NOVA + + https://www.sbb.ch/NOVA + + + + + + + + From 51dfef168673839e66b38cde1579fb5b5ee1a6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 May 2023 16:06:15 +0200 Subject: [PATCH 4/5] more example wrappers. --- .../availability/AvailabilityRequest_1.xml | 64 +++++++++++-------- .../availability/AvailabilityRequest_2.xml | 64 +++++++++++-------- .../AvailabilityResponse notOK.xml | 27 +++++--- .../availability/AvailabilityResponse_OK.xml | 61 ++++++++++-------- 4 files changed, 125 insertions(+), 91 deletions(-) diff --git a/examples/functions/availability/AvailabilityRequest_1.xml b/examples/functions/availability/AvailabilityRequest_1.xml index 9ddf99d71..cd2b6c9ae 100644 --- a/examples/functions/availability/AvailabilityRequest_1.xml +++ b/examples/functions/availability/AvailabilityRequest_1.xml @@ -1,29 +1,37 @@ - - 2022-12-12T11:46:00Z - - - - de:05766:2317:0:1 - - Kt-Kalldorf, Winterberg - - - - 2022-12-12T11:46:00Z - - - - - de:05766:3437:0:2 - - Kt-Stemmen, Elfenborner Weg - - - - 2022-12-12T12:02:00Z - - - - - + + + + 2022-12-12T11:46:00Z + OeBB + + 2022-12-12T11:46:00Z + + + + de:05766:2317:0:1 + + Kt-Kalldorf, Winterberg + + + + 2022-12-12T11:46:00Z + + + + + de:05766:3437:0:2 + + Kt-Stemmen, Elfenborner Weg + + + + 2022-12-12T12:02:00Z + + + + + + + + \ No newline at end of file diff --git a/examples/functions/availability/AvailabilityRequest_2.xml b/examples/functions/availability/AvailabilityRequest_2.xml index b8fb61be1..a8fada9d0 100644 --- a/examples/functions/availability/AvailabilityRequest_2.xml +++ b/examples/functions/availability/AvailabilityRequest_2.xml @@ -1,29 +1,37 @@ - - 2022-12-12T11:46:00Z - - - - de:05766:2317:0:1 - - Kt-Kalldorf, Winterberg - - - - 2022-12-14T09:46:00Z - - - - - de:05766:3437:0:2 - - Kt-Stemmen, Elfenborner Weg - - - - 2022-12-14T10:02:00Z - - - - - + + + + 2022-12-12T11:46:00Z + OeBB + + 2022-12-12T11:46:00Z + + + + de:05766:2317:0:1 + + Kt-Kalldorf, Winterberg + + + + 2022-12-14T09:46:00Z + + + + + de:05766:3437:0:2 + + Kt-Stemmen, Elfenborner Weg + + + + 2022-12-14T10:02:00Z + + + + + + + + \ No newline at end of file diff --git a/examples/functions/availability/AvailabilityResponse notOK.xml b/examples/functions/availability/AvailabilityResponse notOK.xml index 491ac56c0..60386eeae 100644 --- a/examples/functions/availability/AvailabilityResponse notOK.xml +++ b/examples/functions/availability/AvailabilityResponse notOK.xml @@ -1,10 +1,19 @@ - - 2001-12-17T09:30:47Z - false - - - Anfrage konnte nicht verarbeitet werden - - - + + + + 2020-11-30T10:07:19Z + OJPCH_Prod + true + + 2001-12-17T09:30:47Z + false + + + Anfrage konnte nicht verarbeitet werden + + + + + + \ No newline at end of file diff --git a/examples/functions/availability/AvailabilityResponse_OK.xml b/examples/functions/availability/AvailabilityResponse_OK.xml index a02bbb4ab..484a419bf 100644 --- a/examples/functions/availability/AvailabilityResponse_OK.xml +++ b/examples/functions/availability/AvailabilityResponse_OK.xml @@ -1,27 +1,36 @@ - - 2001-12-17T09:30:47Z - - - - - de:05766:2317 - - Winterberg/Kalldorf - - - - - - de:05766:3437 - - Elfenborner Weg/Stemmen (Kalletal) - - - - 2022-12-14T11:02:00+01:00 - - - - - + + + + 2020-11-30T10:07:19Z + OJPCH_Prod + true + + 2001-12-17T09:30:47Z + + + + + de:05766:2317 + + Winterberg/Kalldorf + + + + + + de:05766:3437 + + Elfenborner Weg/Stemmen (Kalletal) + + + + 2022-12-14T11:02:00+01:00 + + + + + + + + \ No newline at end of file From f7fec427eeebda09bf6ae00f4526f2cea82948f2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 14:07:01 +0000 Subject: [PATCH 5/5] Lint and update documentation tables --- examples/functions/availability/AvailabilityRequest_1.xml | 2 +- examples/functions/availability/AvailabilityRequest_2.xml | 2 +- examples/functions/availability/AvailabilityResponse notOK.xml | 2 +- examples/functions/availability/AvailabilityResponse_OK.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/functions/availability/AvailabilityRequest_1.xml b/examples/functions/availability/AvailabilityRequest_1.xml index cd2b6c9ae..f07d5f476 100644 --- a/examples/functions/availability/AvailabilityRequest_1.xml +++ b/examples/functions/availability/AvailabilityRequest_1.xml @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/examples/functions/availability/AvailabilityRequest_2.xml b/examples/functions/availability/AvailabilityRequest_2.xml index a8fada9d0..a7566d5ba 100644 --- a/examples/functions/availability/AvailabilityRequest_2.xml +++ b/examples/functions/availability/AvailabilityRequest_2.xml @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/examples/functions/availability/AvailabilityResponse notOK.xml b/examples/functions/availability/AvailabilityResponse notOK.xml index 60386eeae..37836d751 100644 --- a/examples/functions/availability/AvailabilityResponse notOK.xml +++ b/examples/functions/availability/AvailabilityResponse notOK.xml @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/examples/functions/availability/AvailabilityResponse_OK.xml b/examples/functions/availability/AvailabilityResponse_OK.xml index 484a419bf..1482e86af 100644 --- a/examples/functions/availability/AvailabilityResponse_OK.xml +++ b/examples/functions/availability/AvailabilityResponse_OK.xml @@ -33,4 +33,4 @@ - \ No newline at end of file +

FareAuthorityGroup

Group of attributes for an ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs

FareAuthority

→‍FareAuthorityRef

1:1

→‍FareAuthorityRef

Reference to a Fare Authority.

FareAuthorityText

1:1

xs:string

Textual description or name of Fare authority.