From 2aa9789d4dcc4f8bc922f47bca2f834407b59769 Mon Sep 17 00:00:00 2001
From: Peter von Grumbkow <42928266+pvgrumbkow@users.noreply.github.com>
Date: Thu, 22 Oct 2020 18:40:47 +0200
Subject: [PATCH 1/2] Moved ResponseContextStructure to OJP_RequestSupport.xsd
OJP_Places.xsd was not well-formed, because it used ResponseContextStructure without including it. Moved ResponseContextStructure from OJP_JourneySupport.xsd to OJP_RequestSupport.xsd, as it is a general structure and not only for journeys. Added includes of OJP_RequestSupport into several files.
---
OJP_JourneySupport.xsd | 22 ----------------------
OJP_Places.xsd | 3 ++-
OJP_RequestSupport.xsd | 27 +++++++++++++++++++++++++++
OJP_StopEvents.xsd | 1 +
OJP_TripInfo.xsd | 1 +
OJP_Trips.xsd | 1 +
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/OJP_JourneySupport.xsd b/OJP_JourneySupport.xsd
index b94262173..96cac9b18 100644
--- a/OJP_JourneySupport.xsd
+++ b/OJP_JourneySupport.xsd
@@ -475,28 +475,6 @@
-
-
- Abstract structure providing response contexts related to journeys.
-
-
-
-
- Container for place objects. Only place objects that are referenced in the response should be put into the container.
-
-
-
-
-
-
-
-
-
- Container for SIRI SX situation objects. Only situations that are referenced in the response should be put into the container.
-
-
-
-
=========================================== Filter Groups ===========================================================
diff --git a/OJP_Places.xsd b/OJP_Places.xsd
index 294286826..35f0960ec 100644
--- a/OJP_Places.xsd
+++ b/OJP_Places.xsd
@@ -5,6 +5,7 @@
+
FUNCTION 1: Place Identification
@@ -332,7 +333,7 @@
Rough estimate of the travel duration from the specified refrence 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.
diff --git a/OJP_RequestSupport.xsd b/OJP_RequestSupport.xsd
index 12c3895bd..c2c8a5e2b 100644
--- a/OJP_RequestSupport.xsd
+++ b/OJP_RequestSupport.xsd
@@ -3,6 +3,8 @@
+
+
====================================================Simple Types ====================================================
@@ -148,4 +150,29 @@
+
+ ====================================================Collection contexts====================================================
+
+
+
+ Structure providing response contexts related to journeys, containing collections of places and situations.
+
+
+
+
+ Container for place objects. Only place objects that are referenced in the response should be put into the container.
+
+
+
+
+
+
+
+
+
+ Container for SIRI SX situation objects. Only situations that are referenced in the response should be put into the container.
+
+
+
+
diff --git a/OJP_StopEvents.xsd b/OJP_StopEvents.xsd
index f82315f04..c53995210 100644
--- a/OJP_StopEvents.xsd
+++ b/OJP_StopEvents.xsd
@@ -5,6 +5,7 @@
+
Request structure for departure and arrival events at stops
diff --git a/OJP_TripInfo.xsd b/OJP_TripInfo.xsd
index 5d1bbe53b..6592f84f9 100644
--- a/OJP_TripInfo.xsd
+++ b/OJP_TripInfo.xsd
@@ -2,6 +2,7 @@
+
===================== Request structures ============================================================
diff --git a/OJP_Trips.xsd b/OJP_Trips.xsd
index 33d2c0285..94a5c40e9 100644
--- a/OJP_Trips.xsd
+++ b/OJP_Trips.xsd
@@ -6,6 +6,7 @@
+
===== Request Structures ===============================================
From 6f3cb659ffdedd01dde8fb6349cfdaa4fd35def2 Mon Sep 17 00:00:00 2001
From: Peter von Grumbkow <42928266+pvgrumbkow@users.noreply.github.com>
Date: Thu, 22 Oct 2020 18:44:14 +0200
Subject: [PATCH 2/2] Typo correction
---
OJP_Places.xsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OJP_Places.xsd b/OJP_Places.xsd
index 35f0960ec..bd3ff7b24 100644
--- a/OJP_Places.xsd
+++ b/OJP_Places.xsd
@@ -333,7 +333,7 @@
Rough estimate of the travel duration from the specified refrence 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.