diff --git a/OJP/OJP_All.xsd b/OJP/OJP_All.xsd
index 1fba79bd5..cf90d124d 100644
--- a/OJP/OJP_All.xsd
+++ b/OJP/OJP_All.xsd
@@ -3,11 +3,13 @@
OJP/OJP_All.xsd - Includes for all OJP schema files
+
+
diff --git a/OJP/OJP_Availability.xsd b/OJP/OJP_Availability.xsd
new file mode 100644
index 000000000..83bf5015f
--- /dev/null
+++ b/OJP/OJP_Availability.xsd
@@ -0,0 +1,426 @@
+
+
+
+ OJP/OJP_Availability.xsd - Request and response definitions for availability of tickets and services on a journey leg.
+
+
+
+
+ ========================================== AvailabilityRequest ==========================================
+
+
+
+ Availability request. Used to check the availability of a MOBILITY SERVICE, a VEHICLE, SERVICE JOURNEY or SINGLE JOURNEY. Be aware that usually after the response arrives, the rest of the TRIP must be recalculated. As especially pickup and setdown locations may have shifted from where they were in the previously calculated TRIP.
+
+
+
+
+ A choice as we assume that here future extensions may occur (non-public transport).
+
+
+
+ Definition of the journey leg to be covered by public transport. Other mobility services can be added later.
+
+
+
+
+
+ Passenger(s) for whom the service needs to be booked, one MobilityUser per passenger.
+
+
+
+
+ This element is only used to transmit restrictions from the earlier/or later trip part. The possible trip is the result of a previous OJPTripRequest. The desired time for the public transport is set within PublicTransport element.
+
+
+
+
+
+
+ ========================================== Additional Declarations ==========================================
+
+
+
+ Journey leg by public transport.
+
+
+
+
+ Location where passenger intends to enter the service.
+
+
+
+
+ Location where passenger intends to leave the service.
+
+
+
+
+ Properties of a service (line and direction) by which the availability is being checked: attributes of ContinuousServiceStructure or DatedJourneyStructure.
+
+
+
+
+
+
+
+ Passenger(s) for whom the service needs to be booked.
+
+
+
+
+ Age of the passenger on the day of travel.
+
+
+
+
+
+
+
+
+ Provisioned vehicle call at a general location.
+
+
+
+
+
+ More general location for a call than stop points. May be used with flexible services or "Area Dial-A-Ride".
+
+
+
+
+ Arrival times of the service at this stop.
+
+
+
+
+ Departure times of the service at this stop.
+
+
+
+
+
+
+
+
+ Earliest possible departure time from a start location and latest possible arrival at a different destination location.
+
+
+
+
+
+
+
+ ========================================== From Trias_JourneySupport.xsd ==========================================
+
+
+
+ Profile of the passenger's abilities.
+
+
+
+
+ Passenger uses a wheelchair. Default is FALSE.
+
+
+
+
+ Passenger uses a walking frame. Default is FALSE.
+
+
+
+
+ Passenger uses a walking stick. Default is FALSE.
+
+
+
+
+ Passenger is (maybe temporarily) walking impaired. Default is FALSE.
+
+
+
+
+ Passenger has a pram with him/her. Default is FALSE.
+
+
+
+
+ Passenger has got heavy luggage. Default is FALSE.
+
+
+
+
+ Passenger is visually impaired.
+
+
+
+
+ Passenger is hearing impaired.
+
+
+
+
+ Passenger is reading impaired.
+
+
+
+
+
+
+ Description of passenger's accessibility requirements
+
+
+
+
+
+
+
+
+ Requirements for the driver/staff to assist the passenger when boarding/alighting.
+
+
+
+
+ Whether assistance is required for boarding. Could be offered by the driver or station staff. Default is FALSE.
+
+
+
+
+ Whether assistance is required for alighting. Could be offered by the driver or station staff. Default is FALSE.
+
+
+
+
+
+ ========================================== AvailabilityResponse ==========================================
+
+
+
+ Availability response.
+
+
+
+
+ Indication of the availability of the requested service.
+
+
+
+
+
+
+ ========================================== Additional declarations ==========================================
+
+
+
+ Availability result structure.
+
+
+
+
+ Problems related to this AVAILABILITY result.
+
+
+
+
+
+ Definition of the journey leg that should be made by public transport. Other mobility services may be added later.
+
+
+
+
+
+
+
+
+ ==================== ticket and service information =====================
+
+
+
+ Lists those tickets or surcharges and service characteristics such as the transportation of wheelchairs, prams, luggage etc. or the provision of required child seats or booster seats that are offered in the trips transport company to be booked for the trip.
+
+
+
+
+ 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.
+
+
+
+
+ Sequence of bookable service items for this part of the trip.
+
+
+
+
+
+
+ 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 type of bookable service.
+
+
+
+
+ Maximum number of service items that can be booked in one booking transaction. Default is 0.
+
+
+
+
+
+
+ Types of bookable service items.
+
+
+
+
+ Space for a wheelchair.
+
+
+
+
+ Space for a motorised wheelchair.
+
+
+
+
+ Space for storing a foldable wheelchair.
+
+
+
+
+ Place suitable for a person with a walking frame.
+
+
+
+
+ Space for a pram or pushchair.
+
+
+
+
+ Space for storing heavy luggage.
+
+
+
+
+ Seat suitable for attaching a child seat taken along by the passengers.
+
+
+
+
+ Child seat provided in the vehicle.
+
+
+
+
+ Seat suitable for attaching a baby carrier taken along by the passengers.
+
+
+
+
+ Baby carrier provided in the vehicle.
+
+
+
+
+ Seat booster provided in the vehicle.
+
+
+
+
+ Space for a bicycle.
+
+
+
+
+ Place suitable when accompanied by a guide dog.
+
+
+
+
+ Place suitable when accompanied by a dog.
+
+
+
+
+ Assistance for boarding.
+
+
+
+
+ Assistance for unboarding.
+
+
+
+
+ Assistance available on board, during the journey.
+
+
+
+
+ Assistance for a minor travelling alone.
+
+
+
+
+
+ ========================================== Problems ==========================================
+
+
+
+ Types of problems that may be returned in responses to AVAILABILITY requests.
+
+
+
+
+ No SERVICE (VEHICLE JOURNEY or VEHICLE) could be found for this request.
+
+
+
+
+ At the locations (address, stop, etc.) for which the availability has been requested, there is no public transport service at all. E.g. outside of the area
+
+
+
+
+ The location (address, stop, etc.) for which availability was requested is unknown.
+
+
+
+
+ The vehicle is not available due to existing rules like operating hours or not competing against an existing public transport line. In the details of the problem there should be information, which rules where violated: e.g. The desired MOBILITY SERVICE can't be provided, because there exists a regulare line for this TRIP.
+
+
+
+
+ The MOBILITY SERVICE is disrupted.
+
+
+
+
+ There is no VEHICLE available at the current time.
+
+
+
+
+ A problem has occurred that does not have a specific problem type.
+
+
+
+
+
+
+ Problem that may be returned in responses to AVAILABILITY requests.
+
+
+
+
+ Type of the AVAILABILITY problem.
+
+
+
+
+
+
diff --git a/OJP/OJP_Common.xsd b/OJP/OJP_Common.xsd
index 187fe0f6a..1cc02494e 100644
--- a/OJP/OJP_Common.xsd
+++ b/OJP/OJP_Common.xsd
@@ -47,14 +47,14 @@
-
+
- An oriented correspondence from one LINK of a source layer, onto an entity in a target layer: e.g. LINK SEQUENCE.
+ An oriented correspondence from one LINK or ROUTE of a source layer, onto an entity in a target layer: e.g. LINK SEQUENCE. As OJP is reduced in relation to NeTEx, we use a simple general structure.
- Ordered list of locations representing the geogemtry of the link.
+ Ordered list of locations representing the geometry of the link or route.
diff --git a/OJP/OJP_FareSupport.xsd b/OJP/OJP_FareSupport.xsd
index 505e6e080..db8c2b86f 100644
--- a/OJP/OJP_FareSupport.xsd
+++ b/OJP/OJP_FareSupport.xsd
@@ -186,7 +186,7 @@
========================================== Tickets ==========================================
-
+
Identifier of a FareProduct
@@ -197,7 +197,7 @@
Reference to a FareProduct.
-
+
@@ -255,20 +255,20 @@
[related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information
-
+
- Unique Id of the FareProduct.
+ Identifier of a FareProduct
- printable FareProduct name
+ Printable FareProduct name
- Is this product a proto product? Default is false. If true, it should not be shown to the user. In a distributed environment (e.g. EU-Spirit) partial systems may generate incomplete product information (proto product), which has to be be processed further and combined with other information before it is a complete fare product and can be shown to the user. See https://eu-spirit.eu/
+ Is this product a proto product? Default is false. If true, it should not be shown to the user. In a distributed environment (e.g. EU-Spirit) partial systems may generate incomplete product information (proto product), which has to be processed further and combined with other information before it is a complete fare product and can be shown to the user. See https://eu-spirit.eu/
diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd
index 1da6469fd..2386083ca 100644
--- a/OJP/OJP_JourneySupport.xsd
+++ b/OJP/OJP_JourneySupport.xsd
@@ -684,7 +684,7 @@
End place of this track.
-
+
An oriented correspondence from one LINK of a source layer, onto an entity in a target layer: e.g. LINK SEQUENCE.
diff --git a/OJP/OJP_Lines.xsd b/OJP/OJP_Lines.xsd
new file mode 100644
index 000000000..cceb773a0
--- /dev/null
+++ b/OJP/OJP_Lines.xsd
@@ -0,0 +1,50 @@
+
+
+
+ OJP/OJP_Lines.xsd - Request and response definitions for information on lines
+
+
+
+
+ =============================== Line Information Service ==========================================
+
+
+ =============================== Line Information Response Group ==========================================
+
+
+
+ Line Information response group.
+
+
+
+
+
+
+ =============================== LineInformation support functions ==========================================
+
+
+
+
+
+ Reference to the LINE.
+
+
+
+
+
+ DIRECTION of LINE.
+
+
+
+
+ The LINE's route geometry. A line can have multiple ROUTEs and each has its own geometry. The first should be the "main" geometry.
+
+
+
+
+ List of transport modes that are supported by this line.
+
+
+
+
+
diff --git a/OJP/OJP_Requests.xsd b/OJP/OJP_Requests.xsd
index a9600ffca..5534e40fe 100644
--- a/OJP/OJP_Requests.xsd
+++ b/OJP/OJP_Requests.xsd
@@ -221,4 +221,56 @@
+
+ ========================================== Availability Request ==========================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ========================================== Line Information Service ==========================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OJP/OJP_Utility.xsd b/OJP/OJP_Utility.xsd
index 37defa922..812bcf449 100644
--- a/OJP/OJP_Utility.xsd
+++ b/OJP/OJP_Utility.xsd
@@ -48,6 +48,12 @@
+
+
+ Type definition for e-mail addresses.
+
+
+
[a restricted view of ALTERNATIVE NAME in TMv6] alternative identified text to be used in specified languages.
diff --git a/docs/schema-collection.xml b/docs/schema-collection.xml
index 197ab377b..8fead8ede 100644
--- a/docs/schema-collection.xml
+++ b/docs/schema-collection.xml
@@ -1,19 +1,24 @@
+
-
-
+
+
-
-
+
-
-
-
+
+
+
+
+
+
diff --git a/examples/function/OJPAvailabilityRequest.xml b/examples/function/OJPAvailabilityRequest.xml
new file mode 100644
index 000000000..bcb2cb1af
--- /dev/null
+++ b/examples/function/OJPAvailabilityRequest.xml
@@ -0,0 +1,70 @@
+
+
+
+
+ 2020-01-19T12:00:00Z
+ MyClient
+
+ 2020-01-19T12:00:00Z
+ 231231-231
+
+
+
+ ch:1:sloid:7000
+
+ origin
+
+
+ 7
+
+
+
+
+ 20.12121
+ 30.134123
+ 20
+
+
+ destiniation
+
+ sbb
+
+
+ 2022-10-19T12:00:00Z
+ 2022-10-19T11:55:00Z
+ 2022-10-19T12:10:00Z
+
+ 10
+ true
+ false
+ false
+
+ ch:1:slnid:102301231
+
+ bus
+ demandAndResponseBus
+
+
+ NB
+
+
+ NB 1
+
+ 1293912-1231
+ ch:1:sboid:13123
+
+
+ 19
+ true
+ true
+ true
+ true
+ 70
+ PT2M
+
+ 2022-10-19T11:30:00Z
+ 2022-10-19T12:10:00Z
+
+
+
+
diff --git a/examples/function/OJPAvailabilityRequest_1.xml b/examples/function/OJPAvailabilityRequest_1.xml
new file mode 100644
index 000000000..5c48f06a4
--- /dev/null
+++ b/examples/function/OJPAvailabilityRequest_1.xml
@@ -0,0 +1,29 @@
+
+
+ 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
+
+
+
+
+
diff --git a/examples/function/OJPAvailabilityRequest_2.xml b/examples/function/OJPAvailabilityRequest_2.xml
new file mode 100644
index 000000000..8c204435d
--- /dev/null
+++ b/examples/function/OJPAvailabilityRequest_2.xml
@@ -0,0 +1,29 @@
+
+
+ 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
+
+
+
+
+
diff --git a/examples/function/OJPAvailabilityResponse notOK.xml b/examples/function/OJPAvailabilityResponse notOK.xml
new file mode 100644
index 000000000..b1b4cab06
--- /dev/null
+++ b/examples/function/OJPAvailabilityResponse notOK.xml
@@ -0,0 +1,10 @@
+
+
+ 2001-12-17T09:30:47Z
+ false
+
+
+ Anfrage konnte nicht verarbeitet werden
+
+
+
diff --git a/examples/function/OJPAvailabilityResponse_OK.xml b/examples/function/OJPAvailabilityResponse_OK.xml
new file mode 100644
index 000000000..c926b370f
--- /dev/null
+++ b/examples/function/OJPAvailabilityResponse_OK.xml
@@ -0,0 +1,27 @@
+
+
+ 2001-12-17T09:30:47Z
+
+
+
+
+ de:05766:2317
+
+ Winterberg/Kalldorf
+
+
+
+
+
+ de:05766:3437
+
+ Elfenborner Weg/Stemmen (Kalletal)
+
+
+
+ 2022-12-14T11:02:00+01:00
+
+
+
+
+
diff --git a/examples/functions/LineRequest.xml b/examples/functions/LineRequest.xml
new file mode 100644
index 000000000..1906771a2
--- /dev/null
+++ b/examples/functions/LineRequest.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ 2022-12-19T12:00:00Z
+ IRMA
+
+ 2022-12-19T12:00:00Z
+ 4711
+
+
+ ch:1:slnid:129312
+ ch:1:Direction:H
+
+ false
+
+
+
+
+
diff --git a/examples/functions/LineResponse.xml b/examples/functions/LineResponse.xml
new file mode 100644
index 000000000..39802c9a5
--- /dev/null
+++ b/examples/functions/LineResponse.xml
@@ -0,0 +1,45 @@
+
+
+
+
+ 2022-12-01T17:54:38Z
+ OJPCH_Prod
+ true
+
+ 2022-12-01T17:54:38Z
+ 4711
+ true
+
+
+ ch:slnid:123123
+ IC8
+
+
+ 7.48464
+ 46.93150
+
+
+ 7.48447
+ 46.93141
+
+
+ 7.48441
+ 46.93138
+
+
+ 7.48437
+ 46.93134
+
+
+
+ rail
+ longDistanceTrain
+
+ Intercity
+
+
+
+
+
+
+