From 0e11258c34ac66a51cebaedf9d8faa7ae81a460b Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 13 Oct 2023 12:03:54 +0200 Subject: [PATCH 1/2] Update DatedServiceJourney and DatedVehicleJourney for rail Update of the Pr411 (that was merged and rolled back due to issues with examples uising UIC periods) and PR518 (broken for whatever github reason) This version integrates the decisions from the Meeting #13 and #14: Update of examples to use OperatingDayRef in dated jouneys (keep the old UIC periods commented with an explicit mention of the deprecation). UicOperatingPeriod deletion is now replaced by a simple deprecation (clearly stated in comments) for backward compatibility reasons. --- xsd/NeTEx_publication.xsd | 6 +- xsd/NeTEx_publication_timetable.xsd | 6 +- .../netex_datedVehicleJourney_support.xsd | 19 +++++ .../netex_datedVehicleJourney_version.xsd | 76 ++++++++++++------- 4 files changed, 73 insertions(+), 34 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 23bdc5cf3..a4352c83f 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -6921,7 +6921,7 @@ Correct COnstraints for PointOnRoute Every [VehicleJourney Id + Version] must be unique within document. - + @@ -6951,12 +6951,12 @@ Correct COnstraints for PointOnRoute - + - + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 87f254dc9..b404e398b 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -5594,7 +5594,7 @@ Provides a general purose wrapper for NeTEx data content. Every [VehicleJourney Id + Version] must be unique within document. - + @@ -5624,12 +5624,12 @@ Provides a general purose wrapper for NeTEx data content. - + - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd index 022933a6a..d952500aa 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd @@ -91,6 +91,25 @@ Rail transport, Roads and Road transport + + + Reference to a NORMAL DATED VEHICLE JOURNEY. + + + + + Type for a reference to a NORMAL DATED VEHICLE JOURNEY. + + + + + + Identifier of NORMAL DATED VEHICLE JOURNEY. + + + + + Allowed values for type of NORMAL DATED JOURNEY. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd index 2df9f7ad9..c4c6e81d3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd @@ -1,4 +1,5 @@ + @@ -17,9 +18,11 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2020-07-29Issue #97 Add NormalDatedJourney and DatedVehicleJourney journeys in timetableframe + + 2020-07-29Issue #97 Add NormalDatedJourney and DatedVehicleJourney journeys in timetableframe

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -180,6 +183,11 @@ Rail transport, Roads and Road transport DATED CALLs for JOURNEY. + + + Type of Service alteration. Default is planned. + + @@ -188,7 +196,21 @@ Rail transport, Roads and Road transport - + + + DATED VEHICLE JOURNEYs for which current VEHICLE JOURNEY is an alteration (i.e. change, replacement, supplement) + + + + + EXPECTED TO BE MANDATORY - left with minOccurs="0" only to avoid breaking compatibility with old rail datasets + + + + + ** DEPRECATED ** not to be used - left available only to avoid breaking compatibility with old rail datasets + + An alternative code that uniquely identifies theDATED VEHICLE JOURNEY. Specifically for use in AVMS systems. For VDV compatibility. @@ -199,13 +221,30 @@ Rail transport, Roads and Road transport Reference to a JOURNEY PATTERN. - + + + ** DEPRECATED ** not to be used - It is expected that the driver's DUTY refer the DatedJourneyPattern, not the way arround ! + + + + + Type for a list of (NORMAL) DATED VEHICLE JOURNEY references. + + + + + + + + + + - A particular journey of a vehicle on a particular OPERATING DAY including all modifications possibly decided by the control staff. + A particular SERVICE JOURNEY of a vehicle on a particular OPERATING DAY including all modifications possibly decided by the control staff. The VIEW includes derived ancillary data from referenced entities. @@ -250,11 +289,7 @@ The VIEW includes derived ancillary data from referenced entities.If the journey is an alteration to a timetable, indicates the original journey, and the nature of the difference. - - - - - + @@ -282,11 +317,8 @@ The VIEW includes derived ancillary data from referenced entities. - - - - + Identifier of NORMAL DATED VEHICLE JORUNEY. @@ -300,25 +332,13 @@ The VIEW includes derived ancillary data from referenced entities.Type for NORMAL DATED VEHICLE JOURNEY. - + - + - - - Elements for NORMAL DATED VEHICLE JOURNEY. - - - - - Type of Service alteration. Default is planned. - - - - From 80646ff70f7699a28388292631e8003163c7f970 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 10:05:53 +0000 Subject: [PATCH 2/2] Lint and update documentation tables --- .../netex_datedVehicleJourney_support.xsd | 14 +++++++------- .../netex_datedVehicleJourney_version.xsd | 11 ++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd index d952500aa..a0f2667ea 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd @@ -101,13 +101,13 @@ Rail transport, Roads and Road transport Type for a reference to a NORMAL DATED VEHICLE JOURNEY. - - - - Identifier of NORMAL DATED VEHICLE JOURNEY. - - - + + + + Identifier of NORMAL DATED VEHICLE JOURNEY. + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd index c4c6e81d3..5ce1e8139 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd @@ -1,5 +1,4 @@ - @@ -18,11 +17,9 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2020-07-29Issue #97 Add NormalDatedJourney and DatedVehicleJourney journeys in timetableframe + 2020-07-29Issue #97 Add NormalDatedJourney and DatedVehicleJourney journeys in timetableframe

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -222,7 +219,7 @@ Rail transport, Roads and Road transport - + ** DEPRECATED ** not to be used - It is expected that the driver's DUTY refer the DatedJourneyPattern, not the way arround ! @@ -332,7 +329,7 @@ The VIEW includes derived ancillary data from referenced entities.Type for NORMAL DATED VEHICLE JOURNEY. - +