diff --git a/OJP/OJP_All.xsd b/OJP/OJP_All.xsd
index 6bbc10680..35dd86ac8 100644
--- a/OJP/OJP_All.xsd
+++ b/OJP/OJP_All.xsd
@@ -20,4 +20,5 @@
OJPFareRequest
OJPFareRequestStructure
OJPFareDelivery
OJPFareDeliveryStructure
OJPLocationInformationRequest
OJPLocationInformationRequestStructure
OJPLocationInformationDelivery
OJPLocationInformationDeliveryStructure
OJPExchangePointsRequest
OJPExchangePointsRequestStructure
OJPExchangePointsDelivery
OJPExchangePointsDeliveryStructure
OJPStopEventRequest
OJPStopEventRequestStructure
OJPStopEventDelivery
OJPStopEventDeliveryStructure
OJPTripInfoRequest
OJPTripInfoRequestStructure
OJPTripInfoDelivery
OJPTripInfoDeliveryStructure
OJPTripRequest
OJPTripRequestStructure
OJPTripDelivery
OJPTripDeliveryStructure
OJPMultiPointTripRequest
OJPMultiPointTripRequestStructure
OJPMultiPointTripDelivery
OJPMultiPointTripDeliveryStructure
OJPTripRefineRequest
OJPTripRefineRequestStructure
OJPTripRefineDelivery
OJPTripRefineDeliveryStructure
OJPAvailabilityRequest
OJPAvailabilityRequestStructure
OJPAvailabilityDelivery
OJPAvailabilityDeliveryStructure
OJPLineInformationRequest
OJPLineInformationRequestStructure
OJPLineInformationDelivery
OJPLineInformationDeliveryStructure
OJPFareRequest
OJPFareRequestStructure
OJPFareDelivery
OJPFareDeliveryStructure
OJPLocationInformationRequest
OJPLocationInformationRequestStructure
OJPLocationInformationDelivery
OJPLocationInformationDeliveryStructure
OJPExchangePointsRequest
OJPExchangePointsRequestStructure
OJPExchangePointsDelivery
OJPExchangePointsDeliveryStructure
OJPStopEventRequest
OJPStopEventRequestStructure
OJPStopEventDelivery
OJPStopEventDeliveryStructure
OJPTripInfoRequest
OJPTripInfoRequestStructure
OJPTripInfoDelivery
OJPTripInfoDeliveryStructure
OJPTripRequest
OJPTripRequestStructure
OJPTripDelivery
OJPTripDeliveryStructure
OJPMultiPointTripRequest
OJPMultiPointTripRequestStructure
OJPMultiPointTripDelivery
OJPMultiPointTripDeliveryStructure
OJPStatusRequest
OJPStatusRequestStructure
OJPStatusDelivery
OJPStatusDeliveryStructure
OJPTripRefineRequest
OJPTripRefineRequestStructure
OJPTripRefineDelivery
OJPTripRefineDeliveryStructure
OJPAvailabilityRequest
OJPAvailabilityRequestStructure
OJPAvailabilityDelivery
OJPAvailabilityDeliveryStructure
OJPLineInformationRequest
OJPLineInformationRequestStructure
OJPLineInformationDelivery
OJPLineInformationDeliveryStructure
MessageIntegrityPropertiesGroup
groupServiceRequestContextGroup
groupServiceResponseContextGroup
groupAbstractOJPServiceRequestStructure
PlacesStructure
Operators_RelStructure
ResponseContextStructure
OJPGenericProblemType
FareRequestGroup
groupStopFareRequestStructure
StaticFareRequestStructure
TripFareRequestStructure
MultiTripFareRequestStructure
FareResponseGroup
groupFareResultStructure
StopFareResultStructure
StaticFareResultStructure
TripFareProductReferenceStructure
MultiTripFareResultStructure
FareAuthorityRefStructure
FareAuthorityRef
FareAuthorityGroup
groupTariffZoneRefStructure
TariffZoneRef
TariffZoneStructure
TariffZoneListInAreaStructure
TariffZoneRefListStructure
ContactDetailsStructure
BookingMethodListOfEnumerations
PurchaseMomentListOfEnumerations
BookingProcessListOfEnumerations
GroupBookingListOfEnumerations
BookingArrangementsStructure
BookingArrangementsGroup
groupBookingArrangementsContainerStructure
FareProductRefStructure
FareProductRef
EntitlementProductListStructure
EntitlementProductStructure
FareProductStructure
FareProductPriceGroup
groupFareProductValidityGroup
groupFareProductBookingGroup
groupLegRangeGroup
groupTripFareResultStructure
FarePassengerStructure
FareDataFilterGroup
groupFareParamStructure
FareProblemType
IndividualTransportOptionsStructure
ModeStructure
ModeGroup
groupPtModeFilterStructure
PrivateModeFilterStructure
MultiPointTripResult
0:*
The trip results found by the server.
→siri:Extensions
0:1
→siri:Extensions
OJPTripRefineRequest
| +OJPTripRefineRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPTripRefineRequestStructure
|
OJPStatusRequest
| +OJPStatusRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPStatusRequestStructure
| |||||
The element contains only one element: | |||||
| 0:1 | →siri:Extensions |
OJPStatusDelivery
| +OJPStatusDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPStatusDeliveryStructure
| siri:AbstractServiceDeliveryStructure | ||||
The element contains a sequence of the following elements: | |||||
0:1 | |||||
ServiceResponseContext |
| 0:1 | siri:DataFrameRefStructure | identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. | |
| 0:1 | Calculation time. | |||
| 0:* | OJP generic problem for the whole delivery. | |||
OJPStatusResponse |
| 0:1 | xs:dateTime | Time when the service was started. | |
| 0:1 | xs:dateTime | Time when the service started responding to queries. | ||
| 0:1 | xs:dateTime | Time when the timetable was last updated. | ||
| 0:1 | xs:normalizedString | Information about the server build. | ||
| 0:1 | →siri:Extensions |
OJPTripRefineRequest
| +OJPTripRefineRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPTripRefineRequestStructure
| |||||
The element contains a sequence of the following elements: | |||||
TripRefineRequest |
| 0:1 | Options to control the refine | ||
| 0:1 | Context to hold objects, which are referenced within the response. | |||
| 0:1 | →siri:Extensions |
OJPTripRefineDelivery
| +OJPTripRefineDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPTripRefineDeliveryStructure
| siri:AbstractServiceDeliveryStructure |
OJPTripRefineDelivery
| +OJPTripRefineDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPTripRefineDeliveryStructure
| siri:AbstractServiceDeliveryStructure | ||||
The element contains a sequence of the following elements: | |||||
0:1 | |||||
ServiceResponseContext |
| 0:1 | siri:DataFrameRefStructure | identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. | |
| 0:* | The trip results refined by the server. | |||
| 0:1 | →siri:Extensions |
OJPAvailabilityRequest
| +OJPAvailabilityRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPAvailabilityRequestStructure
|
OJPAvailabilityRequest
| +OJPAvailabilityRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPAvailabilityRequestStructure
| |||||
The element contains a sequence of the following elements: | |||||
Then, the element contains one of the following elements: | |||||
AvailabilityRequest | a |
| -1:1 | Definition of the journey leg to be covered by public transport. Other mobility services can be added later. | |
AvailabilityRequest |
| 0:1 | xs:anyType | ||
| 0:1 | →siri:Extensions |
OJPAvailabilityDelivery
| +OJPAvailabilityDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPAvailabilityDeliveryStructure
| siri:AbstractServiceDeliveryStructure |
OJPAvailabilityDelivery
| +OJPAvailabilityDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPAvailabilityDeliveryStructure
| siri:AbstractServiceDeliveryStructure | ||||
The element contains a sequence of the following elements: | |||||
ServiceResponseContext |
| 0:1 | siri:DataFrameRefStructure | identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. | |
| 0:1 | xs:anyType | |||
| 0:1 | →siri:Extensions |
OJPLineInformationRequest
| +OJPLineInformationRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPLineInformationRequestStructure
|
OJPLineInformationRequest
| +OJPLineInformationRequest (↔ siri:AbstractFunctionalServiceRequest) |
OJPLineInformationRequestStructure
| |||||
The element contains a sequence of the following elements: | |||||
| 0:1 | ||||
| 0:1 | →siri:Extensions |
OJPLineInformationDelivery
| +OJPLineInformationDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPLineInformationDeliveryStructure
| siri:AbstractServiceDeliveryStructure |
OJPLineInformationDelivery
| +OJPLineInformationDelivery (↔ siri:AbstractFunctionalServiceDelivery) |
OJPLineInformationDeliveryStructure
| siri:AbstractServiceDeliveryStructure | ||||
The element contains a sequence of the following elements: | |||||
0:1 | |||||
LineInformationResponse |
| 0:* | |||
FareResponse |
| 0:1 | Context to hold trip response objects that occur frequently. | ||
| 0:* | Fare result choice element. |
FareResultStructure
| Wrapper element for Fare results. | ||||
The element contains a sequence of the following elements: | |||||
| 1:1 | ID of this result. | |||
| 0:* | Problems related to this FARE result. | |||
| 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 |
| -1:* | Fare and FareProducts for multiple trips. | ||
b |
| -1:1 | Static Fare information. | ||
c |
| -1:1 | Stop-related Fare information. | ||
d |
| -1:* | Fare and FareProducts for a given trip. |
StopFareResultStructure
| Stop-related Fare information. | ||||
The element contains a sequence of the following elements: | |||||
| 1:* | One or more lists of Fare zones that belong to a Fare authority/area. | |||
| 0:1 | xs:anyType |
StaticFareResultStructure
| General Fare information. | ||||
The element contains a sequence of the following elements: | |||||
| 0:* | [related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information. | |||
| 0:* | URL to information page on the web. | |||
| 0:1 | xs:anyType |
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: | |||||
1:1 | Reference to a FareProduct. | ||||
| 1:1 | Identifies the "valid from" trip. | |||
| 0:1 | Identifies the "valid from" LEG. If missing, then valid from the first LEG. | |||
| 1:1 | Identifies the "valid to" trip. | |||
| 0:1 | Identifies the "valid to" LEG. If missing, then valid to the last LEG. |
MultiTripFareResultStructure
| Structure of a Multi Trip Fare Request result | ||||
The element contains a sequence of the following elements: | |||||
| 1:* | Non-empty list of trip references in the corresponding MultiTripFareRequestStructure | |||
| 0:* | Zero, one or more FareProducts that are valid for the referenced trips / part of trips. | |||
| 0:1 | The set of passed zones. | |||
| 0:* | URL to Fare information pages on the web. |
| public | authorisedPublic | staff | other | Allowed values for Booking Access. |
| callDriver | callOffice | online | other | phoneAtStop | text | mobileApp | atOffice | none | Allowed values for Flexible Booking method. |
| xs:normalizedString | Allowed values for Booking Process UIC 7037 Code list. |
| any | information | reservations | lostProperty | publicRelations | complaints | emergency | other | Allowed values for CONTACT role. |
| xs:normalizedString | Email address type a@b. |
| xs:NMTOKEN | Identifier of an ENTITLEMENT PRODUCT (e.g. BahnCard50, BahnCard50First, military card, concessionary card, ...). It is defined by the fare authority. |
| xs:NMTOKEN | Identifier of a Fare Authority. |
| 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. |
| xs:NMTOKEN | Identifier of a FareProduct |
| xs:normalizedString | Allowed values for Group Booking. |
| 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. |
| xs:decimal | A percentage value between 0 and 100 |
| xs:normalizedString | Type for an International phone number. + Country + MSISDN e.g. +41 675601 etc. |
| xs:normalizedString | Allowed values for Purchase Moment. |
| xs:normalizedString | Allowed values for Purchase when. |
| xs:NMTOKEN | Identifier of a fare zone. |
| all | first | second | third | business | economy | classes of travel available on a particular service which will affect the price to be paid |
FareAuthorityRefStructure
| Reference to a Fare Authority ([a specialisation of an ORGANISATION in TMv6] ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs). |
FareAuthorityRef
| Reference to a Fare Authority. |
FareAuthorityGroup
group
| Group of attributes for an ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs |
| public | authorisedPublic | staff | other | Allowed values for Booking Access. |
| callDriver | callOffice | online | other | phoneAtStop | text | mobileApp | atOffice | none | Allowed values for Flexible Booking method. |
| xs:normalizedString | Allowed values for Booking Process UIC 7037 Code list. |
| any | information | reservations | lostProperty | publicRelations | complaints | emergency | other | Allowed values for CONTACT role. |
| xs:normalizedString | Email address type a@b. |
| xs:NMTOKEN | Identifier of an ENTITLEMENT PRODUCT (e.g. BahnCard50, BahnCard50First, military card, concessionary card, ...). It is defined by the fare authority. |
| xs:NMTOKEN | Identifier of a Fare Authority. |
| 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. |
| xs:NMTOKEN | Identifier of a FareProduct |
| xs:normalizedString | Allowed values for Group Booking. |
| 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. |
| xs:normalizedString | Type for an International phone number. + Country + MSISDN e.g. +41 675601 etc. |
| xs:normalizedString | Allowed values for Purchase Moment. |
| xs:normalizedString | Allowed values for Purchase when. |
| xs:NMTOKEN | Identifier of a fare zone. |
| all | first | second | third | business | economy | classes of travel available on a particular service which will affect the price to be paid |
FareAuthorityRefStructure
| Reference to a Fare Authority ([a specialisation of an ORGANISATION in TMv6] ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs). |
FareAuthorityRef
| Reference to a Fare Authority. |
FareAuthorityGroup
group
| Group of attributes for an ORGANISATION which has the RESPONSIBILITY ROLE for the definition of FARE PRODUCTs | ||||
FareAuthority | 1:1 | Reference to a Fare Authority. | |||
| 1:1 | xs:string | Textual description or name of Fare authority. |
TariffZoneRef
| Reference to a fare zone. |
TariffZoneStructure
| [a more clearly defined equivalent of TARIFF ZONE in TM and NeTEx] A ZONE used to define a zonal fare structure in a zone-counting or zone-matrix system. | ||||
The element contains a sequence of the following elements: | |||||
1:1 | Reference to a fare zone. | ||||
| 1:1 | xs:string | Text describing the fare zone. Passengers will recognize the fare zone by this text. Often published on Fare Zone Maps. |
TariffZoneListInAreaStructure
| List of fare zones within the area of a Fare Authority. | ||||
The element contains a sequence of the following elements: | |||||
BookableTicketAndServiceInformation |
| 0:* | Sequence of bookable tickets or surcharges for this part of the trip. If ticket price is zero: an already purchased/virtual ticket of this type presented to the driver would be accepted. | ||
| 0:* | Sequence of bookable service items for this part of the trip. |
BookableServiceItemStructure
| Possible service items that can be booked in the actual booking system (defined by the traffic company of charge). Only those elements with value greater 0 are bookable. The indicated capacity corresponds to the maximum number that can be booked in one booking. This number does not have to be available for the specific booking and may result in booking failure. Caution: list can vary widely from one traffic company to another. | ||||
The element contains a sequence of the following elements: | |||||
| 1:1 | The type of bookable service. | |||
| 1:1 | xs:nonNegativeInteger | Maximum number of service items that can be booked in one booking transaction. Default is 0. |
AvailabilityProblemType
| AvailabilityProblemType (↔ ErrorType) |
| xs:NMTOKEN | Identifier of a Journey |
| xs:normalizedString | Type for identifier of a NeTEx Object. |
| xs:NMTOKEN | Identifier of an Operating Day |
| xs:NMTOKEN | identifier of ORGANISATION with ownership as the RESPONSIBILITY ROLE |
| singleStationBased | multipleStationBased | nonStationBased | Sharing service loan and return scheme. |
| Sunday | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | PublicHoliday | [a specialisation of DAY OF WEEK in TMv6] enumeration of individual the seven DAYs OF WEEK, along with public holidays |
OJPError
| +OJPError (↔ siri:OtherError) | Error: All OJP related errors. |
OJPErrorStructure
| siri:OtherErrorStructure | Type for Error: OJP Error. |
| xs:NMTOKEN | Identifier of a Journey |
| xs:normalizedString | Type for identifier of a NeTEx Object. |
| xs:NMTOKEN | Identifier of an Operating Day |
| xs:NMTOKEN | identifier of ORGANISATION with ownership as the RESPONSIBILITY ROLE |
| xs:decimal | A percentage value between 0 and 100 |
| singleStationBased | multipleStationBased | nonStationBased | Sharing service loan and return scheme. |
| Sunday | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | PublicHoliday | [a specialisation of DAY OF WEEK in TMv6] enumeration of individual the seven DAYs OF WEEK, along with public holidays |
OJPError
| +OJPError (↔ siri:OtherError) | Error: All OJP related errors. |
OJPErrorStructure
| siri:OtherErrorStructure | Type for Error: OJP Error. | |||
The element contains a sequence of the following elements: | |||||
| 1:1 | →Error | |||
ProblemDetail |
| 0:1 | Explanation of the problem. | ||
| 0:1 | xs:normalizedString | MIME type of the referenced resource. To which kind of resource does the URL point to? | ||
| 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. |
| STATUS_INSTANCE_USAGE_DEPRECATED | STATUS_OTHER | Types of problems that may be returned in responses to status requests. |
StatusProblemType
| StatusProblemType (↔ ErrorType) |
OJPStatusResponse
| +OJPStatusResponse (↔ siri:AbstractFunctionalServiceCapabilitiesResponse) |
OJPStatusResponseStructure
| siri:AbstractServiceCapabilitiesResponseStructure | ||||
The element contains a sequence of the following elements: | |||||
ServiceResponseContext |
| 0:1 | siri:DataFrameRefStructure | identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. | |
| 0:1 | Calculation time. | |||
| 0:* | OJP generic problem for the whole delivery. | |||
OJPStatusResponse |
| 0:1 | xs:dateTime | Time when the service was started. | |
| 0:1 | xs:dateTime | Time when the service started responding to queries. | ||
| 0:1 | xs:dateTime | Time when the timetable was last updated. | ||
| 0:1 | xs:normalizedString | Information about the server build. | ||
| 0:1 | →siri:Extensions |
OJPStatusResponseGroup
group
| Status response group. | ||||
OJPStatusResponse |
| 0:1 | xs:dateTime | Time when the service was started. | |
| 0:1 | xs:dateTime | Time when the service started responding to queries. | ||
| 0:1 | xs:dateTime | Time when the timetable was last updated. | ||
| 0:1 | xs:normalizedString | Information about the server build. |