From 28dcd95db83c63a1625acd334ed54ff0de1c268b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 30 May 2025 14:17:43 +0200 Subject: [PATCH 1/6] fixing From/To JourneyRefStructure --- .../netex_interchange_version.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index 574234f65..6bc9b5a59 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -159,14 +159,14 @@ Rail transport, Roads and Road transport SCHEDULED STOP POINT at which JOURNEY MEETING takes place. - + - VEHICLE JOURNEY that feeds JOURNEY MEETING. + JOURNEY that feeds JOURNEY MEETING. - + - VEHICLE JOURNEY that distributes from JOURNEY MEETING. + JOURNEY that distributes from JOURNEY MEETING. @@ -607,14 +607,14 @@ Default is false. - + - VEHICLE JOURNEY that feeds the INTERCHANGE. + JOURNEY that feeds the INTERCHANGE. - + - VEHICLE JOURNEY that distributes from the INTERCHANGE. + JOURNEY that distributes from the INTERCHANGE. From aa58290e5efc43236b8a35b57bb3a35dfc356a0d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 30 May 2025 14:34:37 +0200 Subject: [PATCH 2/6] Update xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd --- .../part2_journeyTimes/netex_interchange_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index 6bc9b5a59..efa5bf2bc 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -166,7 +166,7 @@ Rail transport, Roads and Road transport - JOURNEY that distributes from JOURNEY MEETING. + JOURNEY that distributes from JOURNEY MEETING. From 2172a1099d63483cf6131204f575e5ea9e155936 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Jun 2025 10:42:57 +0200 Subject: [PATCH 3/6] Deprecate structures, introduce actually matching structures --- .../netex_interchange_version.xsd | 138 +++++++++++++----- 1 file changed, 98 insertions(+), 40 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index efa5bf2bc..061609308 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -159,26 +159,52 @@ Rail transport, Roads and Road transport SCHEDULED STOP POINT at which JOURNEY MEETING takes place. - - - JOURNEY that feeds JOURNEY MEETING. - - - - - JOURNEY that distributes from JOURNEY MEETING. - - - - - POINT IN JOURNEY PATTERN ofr feeder journey JOURNEY PATTERN. - - - - - POINT IN JOURNEY PATTERN ofr distributorjourney JOURNEY PATTERN. - - + + + + + DEPRECATE: JOURNEY that feeds JOURNEY MEETING. -v2.0 + + + + + DEPRECATE: JOURNEY that distributes from JOURNEY MEETING. -v2.0 + + + + + DEPRECATE: POINT IN JOURNEY PATTERN of feeder journey JOURNEY PATTERN. -v2.0 + + + + + DEPRECATE: POINT IN JOURNEY PATTERN of distributor journey JOURNEY PATTERN. -v2.0 + + + + + + + SERVICE JOURNEY that feeds JOURNEY MEETING. +v2.0 + + + + + SERVICE JOURNEY that distributes from JOURNEY MEETING. +v2.0 + + + + + STOP POINT IN JOURNEY PATTERN of feeder journey SERVICE JOURNEY PATTERN. +v2.0 + + + + + STOP POINT IN JOURNEY PATTERN of distributor journey SERVICE JOURNEY PATTERN. +v2.0 + + + + @@ -607,16 +633,32 @@ Default is false. - - - JOURNEY that feeds the INTERCHANGE. - - - - - JOURNEY that distributes from the INTERCHANGE. - - + + + + + DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 + + + + + DEPRECATE: JOURNEY that distributes from the INTERCHANGE. -v2.0 + + + + + + + SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 + + + + + SERVICE JOURNEY that distributes from the INTERCHANGE. +v2.0 + + + + @@ -661,16 +703,32 @@ Default is false. - - - JOURNEY PATTERN that feeds INTERCHANGE. - - - - - JOURNEY PATTERN that distributes from INTERCHANGE. - - + + + + + DEPRECATE: JOURNEY PATTERN that feeds INTERCHANGE. -v2.0 + + + + + DEPRECATE: JOURNEY PATTERN that distributes from INTERCHANGE. -v2.0 + + + + + + + SERVICE JOURNEY PATTERN that feeds INTERCHANGE. +v2.0 + + + + + SERVICE JOURNEY PATTERN that distributes from INTERCHANGE. +v2.0 + + + + From 9c23c4c6e2b60cec10b7062effbbea16bb2c46b1 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Jun 2025 11:02:04 +0200 Subject: [PATCH 4/6] Do the same for ConnectingJourneyRef --- .../netex_interchange_version.xsd | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index 061609308..3f6ee56eb 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -349,7 +349,7 @@ Rail transport, Roads and Road transport - A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two VEHICLE JOURNEYs serving those points may be in connection. + A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two SERVICE JOURNEYs serving those points may be in connection. @@ -808,12 +808,22 @@ Default is false. - - - VEHICLE JOURNEY that feeds the INTERCHANGE. - - - + + + + DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 + + + + + + + + SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 + + + + @@ -826,14 +836,19 @@ Default is false. - + + + Simplified view of CONNECTING JOURNEY. + + + - Simplified view of CONNECTING JOURNEY. + Simplified view of CONNECTING SERVICE JOURNEY. - + - Type for CONNECTING JOURNEY VIEW. + Type for CONNECTING SERVICE JOURNEY VIEW. From 0c65fbd1f7cb753e9279fc3bea03e052273ef844 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Jun 2025 11:30:24 +0200 Subject: [PATCH 5/6] Revert changes --- .../netex_interchange_version.xsd | 175 +++++------------- 1 file changed, 51 insertions(+), 124 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index 3f6ee56eb..efa5bf2bc 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -159,52 +159,26 @@ Rail transport, Roads and Road transport SCHEDULED STOP POINT at which JOURNEY MEETING takes place. - - - - - DEPRECATE: JOURNEY that feeds JOURNEY MEETING. -v2.0 - - - - - DEPRECATE: JOURNEY that distributes from JOURNEY MEETING. -v2.0 - - - - - DEPRECATE: POINT IN JOURNEY PATTERN of feeder journey JOURNEY PATTERN. -v2.0 - - - - - DEPRECATE: POINT IN JOURNEY PATTERN of distributor journey JOURNEY PATTERN. -v2.0 - - - - - - - SERVICE JOURNEY that feeds JOURNEY MEETING. +v2.0 - - - - - SERVICE JOURNEY that distributes from JOURNEY MEETING. +v2.0 - - - - - STOP POINT IN JOURNEY PATTERN of feeder journey SERVICE JOURNEY PATTERN. +v2.0 - - - - - STOP POINT IN JOURNEY PATTERN of distributor journey SERVICE JOURNEY PATTERN. +v2.0 - - - - + + + JOURNEY that feeds JOURNEY MEETING. + + + + + JOURNEY that distributes from JOURNEY MEETING. + + + + + POINT IN JOURNEY PATTERN ofr feeder journey JOURNEY PATTERN. + + + + + POINT IN JOURNEY PATTERN ofr distributorjourney JOURNEY PATTERN. + + @@ -349,7 +323,7 @@ Rail transport, Roads and Road transport - A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two SERVICE JOURNEYs serving those points may be in connection. + A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two VEHICLE JOURNEYs serving those points may be in connection. @@ -633,32 +607,16 @@ Default is false. - - - - - DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 - - - - - DEPRECATE: JOURNEY that distributes from the INTERCHANGE. -v2.0 - - - - - - - SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 - - - - - SERVICE JOURNEY that distributes from the INTERCHANGE. +v2.0 - - - - + + + JOURNEY that feeds the INTERCHANGE. + + + + + JOURNEY that distributes from the INTERCHANGE. + + @@ -703,32 +661,16 @@ Default is false. - - - - - DEPRECATE: JOURNEY PATTERN that feeds INTERCHANGE. -v2.0 - - - - - DEPRECATE: JOURNEY PATTERN that distributes from INTERCHANGE. -v2.0 - - - - - - - SERVICE JOURNEY PATTERN that feeds INTERCHANGE. +v2.0 - - - - - SERVICE JOURNEY PATTERN that distributes from INTERCHANGE. +v2.0 - - - - + + + JOURNEY PATTERN that feeds INTERCHANGE. + + + + + JOURNEY PATTERN that distributes from INTERCHANGE. + + @@ -808,22 +750,12 @@ Default is false. - - - - DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 - - - - - - - - SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 - - - - + + + VEHICLE JOURNEY that feeds the INTERCHANGE. + + + @@ -836,19 +768,14 @@ Default is false. - - - Simplified view of CONNECTING JOURNEY. - - - + - Simplified view of CONNECTING SERVICE JOURNEY. + Simplified view of CONNECTING JOURNEY. - + - Type for CONNECTING SERVICE JOURNEY VIEW. + Type for CONNECTING JOURNEY VIEW. From 7278b2a0ef2ddd214cc9959bc4ceb1c9f8df3d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 9 Jun 2025 18:57:06 +0200 Subject: [PATCH 6/6] Revert "Revert changes" This reverts commit 0c65fbd1f7cb753e9279fc3bea03e052273ef844. --- .../netex_interchange_version.xsd | 175 +++++++++++++----- 1 file changed, 124 insertions(+), 51 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index efa5bf2bc..3f6ee56eb 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -159,26 +159,52 @@ Rail transport, Roads and Road transport SCHEDULED STOP POINT at which JOURNEY MEETING takes place. - - - JOURNEY that feeds JOURNEY MEETING. - - - - - JOURNEY that distributes from JOURNEY MEETING. - - - - - POINT IN JOURNEY PATTERN ofr feeder journey JOURNEY PATTERN. - - - - - POINT IN JOURNEY PATTERN ofr distributorjourney JOURNEY PATTERN. - - + + + + + DEPRECATE: JOURNEY that feeds JOURNEY MEETING. -v2.0 + + + + + DEPRECATE: JOURNEY that distributes from JOURNEY MEETING. -v2.0 + + + + + DEPRECATE: POINT IN JOURNEY PATTERN of feeder journey JOURNEY PATTERN. -v2.0 + + + + + DEPRECATE: POINT IN JOURNEY PATTERN of distributor journey JOURNEY PATTERN. -v2.0 + + + + + + + SERVICE JOURNEY that feeds JOURNEY MEETING. +v2.0 + + + + + SERVICE JOURNEY that distributes from JOURNEY MEETING. +v2.0 + + + + + STOP POINT IN JOURNEY PATTERN of feeder journey SERVICE JOURNEY PATTERN. +v2.0 + + + + + STOP POINT IN JOURNEY PATTERN of distributor journey SERVICE JOURNEY PATTERN. +v2.0 + + + + @@ -323,7 +349,7 @@ Rail transport, Roads and Road transport - A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two VEHICLE JOURNEYs serving those points may be in connection. + A quality parameter fixing the acceptable duration (standard and maximum) for an INTERCHANGE to be planned between two SCHEDULED STOP POINTs. This parameter will be used to control whether any two SERVICE JOURNEYs serving those points may be in connection. @@ -607,16 +633,32 @@ Default is false. - - - JOURNEY that feeds the INTERCHANGE. - - - - - JOURNEY that distributes from the INTERCHANGE. - - + + + + + DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 + + + + + DEPRECATE: JOURNEY that distributes from the INTERCHANGE. -v2.0 + + + + + + + SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 + + + + + SERVICE JOURNEY that distributes from the INTERCHANGE. +v2.0 + + + + @@ -661,16 +703,32 @@ Default is false. - - - JOURNEY PATTERN that feeds INTERCHANGE. - - - - - JOURNEY PATTERN that distributes from INTERCHANGE. - - + + + + + DEPRECATE: JOURNEY PATTERN that feeds INTERCHANGE. -v2.0 + + + + + DEPRECATE: JOURNEY PATTERN that distributes from INTERCHANGE. -v2.0 + + + + + + + SERVICE JOURNEY PATTERN that feeds INTERCHANGE. +v2.0 + + + + + SERVICE JOURNEY PATTERN that distributes from INTERCHANGE. +v2.0 + + + + @@ -750,12 +808,22 @@ Default is false. - - - VEHICLE JOURNEY that feeds the INTERCHANGE. - - - + + + + DEPRECATE: JOURNEY that feeds the INTERCHANGE. -v2.0 + + + + + + + + SERVICE JOURNEY that feeds the INTERCHANGE. +v2.0 + + + + @@ -768,14 +836,19 @@ Default is false. - + + + Simplified view of CONNECTING JOURNEY. + + + - Simplified view of CONNECTING JOURNEY. + Simplified view of CONNECTING SERVICE JOURNEY. - + - Type for CONNECTING JOURNEY VIEW. + Type for CONNECTING SERVICE JOURNEY VIEW.