From 328510f72bc15ae05db9e5334f8f0d4406251b4b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 4 Jan 2019 02:01:38 +0100 Subject: [PATCH 1/3] First attempt to make a more complete DriverScheduleFrame --- .../netex_duty_support.xsd | 134 +++++++- .../netex_duty_version.xsd | 297 +++++++++++++++++- 2 files changed, 426 insertions(+), 5 deletions(-) diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd index 1a8b3243c..55826f232 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a DRIVER TRIP. @@ -191,4 +191,136 @@ Rail transport, Roads and Road transport + + + + + Type for identifier of a STRETCH. + + + + + + Reference to a STRETCH. + + + + + Type for Reference to a STRETCH. + + + + + + Identifier of a STRETCH. + + + + + + + + + Type for identifier of a SPELL. + + + + + + Reference to a SPELL. + + + + + Type for Reference to a SPELL. + + + + + + Identifier of a SPELL. + + + + + + + + + Type for identifier of a SPELL. + + + + + + Reference to a SPELL. + + + + + Type for Reference to a SPELL. + + + + + + Identifier of a SPELL. + + + + + + + + + Type for identifier of a SPELL. + + + + + + Reference to a SPELL. + + + + + Type for Reference to a SPELL. + + + + + + Identifier of a SPELL. + + + + + + + + + + Type for identifier of a BREAK. + + + + + + Reference to a BREAK. + + + + + Type for Reference to a BREAK. + + + + + + Identifier of a BREAK. + + + + + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd index 6bf9e85c1..e8ddcf173 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd @@ -341,9 +341,9 @@ Rail transport, Roads and Road transport Start time. - + - Day offset for start time. Number of days after the current operating day for Duty y . Default is 0 for same day. + Day offset for start time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. @@ -353,7 +353,7 @@ Rail transport, Roads and Road transport - Day offset for end time. Number of days after the starting departure time of the journey if not same calendar day as starting timey. Default is 0 for same day. + Day offset for end time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. @@ -366,9 +366,34 @@ Rail transport, Roads and Road transport TIMING POINT at which DUTY PART starts. + + + DUTY ACTIVITIES for DUTY PART. + + - + + + + Type for a list of DUTY ACTIVITIEs. + + + + + + + + + + + + + + A planned non-driving movement of a driver within a DUTY PART. This may be necessary to reach the first SPELL in a STRETCH, between two SPELLs or after the last SPELL in a STRETCH. It may be entirely on foot or may use a VEHICLE JOURNEY on a vehicle driven by another driver. @@ -518,4 +543,268 @@ Rail transport, Roads and Road transport + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for STRETCH. + + + + + + + + + + + + Elements for a STRETCH. + + + + + + Start time. + + + + + Day offset for start time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. + + + + + End time. + + + + + Day offset for end time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. + + + + + TIMING POINT at which STRETCH starts. + + + + + TIMING POINT at which STRETCH starts. + + + + + SPELLs for STRETCH. + + + + + + + + Type for a list of SPELLs. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for DRIVING SPELL. + + + + + + + + + + + + Elements for a DRIVING SPELL. + + + + + + + + + + + + + + Elements for a NON DRIVING SPELL. + + + + + Start time. + + + + + Day offset for start time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. + + + + + End time. + + + + + Day offset for end time. Number of days after the starting departure time of the journey if not same calendar day. Default is 0 for same day. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for STANDBY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for TASK. + + + + + + + + + + + + Elements for a TASK. + + + + + + + From 9aa3c5c7f3d9e44b73e53f7d12a4b5a004571769 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 22 Feb 2023 11:40:54 +0100 Subject: [PATCH 2/3] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Matthias Günter --- .../part2_vehicleService/netex_duty_support.xsd | 8 ++++---- .../part2_vehicleService/netex_duty_version.xsd | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd index 55826f232..afa524bf7 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd @@ -273,24 +273,24 @@ Rail transport, Roads and Road transport - Type for identifier of a SPELL. + Type for identifier of a TASK. - Reference to a SPELL. + Reference to a TASK. - Type for Reference to a SPELL. + Type for Reference to a TASK. - Identifier of a SPELL. + Identifier of a TASK. diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd index e8ddcf173..e9cacdb65 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd @@ -376,7 +376,7 @@ Rail transport, Roads and Road transport - Type for a list of DUTY ACTIVITIEs. + Type for a list of DUTY ACTIVITY. From 46e5199b7a634a50cab98d5e6403c8167283b13b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:51:06 +0000 Subject: [PATCH 3/3] Lint and update documentation tables --- .../part2_vehicleService/netex_duty_version.xsd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd index f01b62e7c..5a1d0cbc9 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd @@ -541,7 +541,7 @@ Rail transport, Roads and Road transport - + @@ -637,7 +637,7 @@ Rail transport, Roads and Road transport - + @@ -716,7 +716,7 @@ Rail transport, Roads and Road transport - + @@ -754,7 +754,7 @@ Rail transport, Roads and Road transport - + @@ -802,5 +802,4 @@ Rail transport, Roads and Road transport -