From e3d749945bc927a0dd304b2823c1053d41dc8a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 17:03:27 +0200 Subject: [PATCH 01/11] GBFSMapping - mustPickUpandDRopOffToSameStop #716 --- .../netex_routingConstraint_support.xsd | 5 +++++ .../netex_nm_mobilityServiceConstraintZone_version.xsd | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index 511e8faa7..0252fc6c6 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -155,6 +155,11 @@ Rail transport, Roads and Road transport + + + Special zones where vehicles must be returned to the same stop. +v2.0 + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index f36bbcd57..edcd76ec1 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -4,6 +4,7 @@ + @@ -199,6 +200,11 @@ Rail transport, Roads and Road transport + + + The specific ZONE where a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 + + From 5f0c1d1499f0cc1bd4f03d0b34ceb2b87e5e79be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 17:11:56 +0200 Subject: [PATCH 02/11] fixing validation and update example --- examples/standards/gbfs/Netex_gbfs_exm1.xml | 4 ++++ .../netex_nm_mobilityServiceConstraintZone_version.xsd | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml index 23dca6e1d..61104fcbf 100644 --- a/examples/standards/gbfs/Netex_gbfs_exm1.xml +++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml @@ -365,6 +365,10 @@ GBFS file: geofencing_zones.json. + + mustPickUpAndDropOffInSameZone + true + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index edcd76ec1..a91864984 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -5,6 +5,7 @@ + @@ -200,7 +201,7 @@ Rail transport, Roads and Road transport - + The specific ZONE where a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 From 2005315f475e8ae1d273237f17aa2c56723ec50d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 15:14:46 +0000 Subject: [PATCH 03/11] Lint and update documentation tables --- .../part1_tacticalPlanning/netex_routingConstraint_support.xsd | 2 +- .../netex_nm_mobilityServiceConstraintZone_version.xsd | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index 0252fc6c6..5790b732a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport Special zones where vehicles must be returned to the same stop. +v2.0 - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index a91864984..ff6f7a68a 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -5,7 +5,6 @@ - @@ -201,7 +200,7 @@ Rail transport, Roads and Road transport - + The specific ZONE where a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 From ce71e592ae8799734d5061b3d7fd6c3070797697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 13 May 2024 13:23:45 +0200 Subject: [PATCH 04/11] Update xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd --- .../part1_tacticalPlanning/netex_routingConstraint_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index 5790b732a..f0ad27ec7 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -157,7 +157,7 @@ Rail transport, Roads and Road transport - Special zones where vehicles must be returned to the same stop. +v2.0 + Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 From bceaf11f8bb740398e85b00fd9601cb9df10ce58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 13 May 2024 13:23:56 +0200 Subject: [PATCH 05/11] Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd --- .../part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index ff6f7a68a..673423499 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -202,7 +202,7 @@ Rail transport, Roads and Road transport - The specific ZONE where a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 + Tells whether in this ZONE a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 From 7768d35d60a3bc15ec01ee8aab4319659da6fcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 14 May 2024 21:47:43 +0200 Subject: [PATCH 06/11] Update xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_routingConstraint_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index f0ad27ec7..779277be2 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -155,7 +155,7 @@ Rail transport, Roads and Road transport - + Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 From 78eca2db0aacfa92158614ad1b335e8521456538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 14 May 2024 21:48:02 +0200 Subject: [PATCH 07/11] Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index 673423499..94189933d 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -202,7 +202,7 @@ Rail transport, Roads and Road transport - Tells whether in this ZONE a vehicle must be collected/returned from a station rather than anywhere in zone. +v2.0 + If false, a vehicle must be picked up / dropped off at a station rather than anywhere in the ZONE. +v2.0 From 35bbb2bb5c29ceaf1b6fa755a4198d9e34090466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 15 May 2024 11:54:05 +0200 Subject: [PATCH 08/11] Update examples/standards/gbfs/Netex_gbfs_exm1.xml Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- examples/standards/gbfs/Netex_gbfs_exm1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml index 61104fcbf..ecddf96a6 100644 --- a/examples/standards/gbfs/Netex_gbfs_exm1.xml +++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml @@ -366,7 +366,7 @@ GBFS file: geofencing_zones.json. - mustPickUpAndDropOffInSameZone + mustPickUpAndDropOffAtSameStop true From a556d29eb5972403de6fd889797c433c48ff4952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 15 May 2024 12:11:36 +0200 Subject: [PATCH 09/11] fixing errors --- .../netex_routingConstraint_support.xsd | 7 +------ .../netex_nm_mobilityServiceConstraintZone_support.xsd | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index 779277be2..f7d77d882 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -145,7 +145,7 @@ Rail transport, Roads and Road transport - Allowed values for Zone Use. + Allowed values for zone use. @@ -155,11 +155,6 @@ Rail transport, Roads and Road transport - - - Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 - - diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index ae2f4e18d..03a6b7bb1 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -150,6 +150,11 @@ Rail transport, Roads and Road transport + + + Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 + + From 61bc1529663dc36fbaf9bf0c888e813267b6d441 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 10:13:55 +0000 Subject: [PATCH 10/11] Lint and update documentation tables --- .../part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index 03a6b7bb1..63b2e2276 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 - + From 03bbce433857ebbb20dad4da3d6d4510de9339ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 15 May 2024 14:04:20 +0200 Subject: [PATCH 11/11] Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd Co-authored-by: Stefan de Konink --- .../part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index 63b2e2276..c04275ad3 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -152,7 +152,7 @@ Rail transport, Roads and Road transport - Zones where vehicles must be returned to the same stop. Implements a GBFS rule. +v2.0 + Zones where vehicles must be returned to the same stop. +v2.0