From 20dc6bbb58e6f794962f06a4054b1342843f5e46 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 29 Sep 2023 12:21:53 +0200 Subject: [PATCH 1/6] Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure Fix #512 --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index 59b2831c0..89fec6eaa 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport - + From 5661dfb38ec2a3dc5299d79212290f37b564a561 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 17 Jan 2024 17:11:37 +0100 Subject: [PATCH 2/6] fix --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index f35d47517..76eb5cb3d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport - + Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. From bc35be2208d3300fc523bb2688474feca68c7fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 24 Jan 2024 21:18:12 +0100 Subject: [PATCH 3/6] taxiRanks now separately. Vehicle Meeting Points never were in stopPlaces --- .../newModes/NewModes-CarPoolingExample.xml | 6 ++++-- .../NewModes-ChauffeuredServiceExample.xml | 6 ++++-- .../part1_frames/netex_siteFrame_version.xsd | 7 +++++++ .../netex_ifopt_stopPlace_version.xsd | 4 ++-- .../part1_ifopt/netex_taxiPlace_version.xsd | 16 ++++++++++++++++ 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index d58fd4d97..b2d673117 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -262,6 +262,8 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held + + Taxi Rank at Alphaville Hotel de Ville @@ -276,7 +278,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held - + ALphaville Hotel de Ville @@ -1664,4 +1666,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 46ddc84b6..af8a16536 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -397,6 +397,8 @@ + + Taxi Rank at Alphaville Hotel de Ville @@ -409,7 +411,7 @@ - + Alphaville Hotel de Ville @@ -1236,4 +1238,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index eacd4a944..d3e03d344 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -4,6 +4,8 @@ + + @@ -168,6 +170,11 @@ Rail transport, Roads and Road transport STOP PLACEs in frame. + + + TAXI RANKs in frame. + + POINTS OF INTEREST in frame. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index 76eb5cb3d..0bf2a0db3 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -105,14 +105,14 @@ Rail transport, Roads and Road transport - Type for containment in frame of STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. + Type for containment in frame of STOP PLACE - Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. + Can be a STOP PLACE. diff --git a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd index 839197dd6..7cd92c4fe 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd @@ -60,6 +60,22 @@ Rail transport, Roads and Road transport TAXI PLACE data types + + + Type for containment in frame of TAXI RANKs. + + + + + + + TAXI RANK. + + + + + + A place comprising one or more locations where taxis may stop to pick up or set down passengersA place comprising one or more locations where taxis may stop to pick up or set down passengers. +v1.2.2 From b2c6dea5d11fb53cad152911db38b3d0b934844a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:19:39 +0000 Subject: [PATCH 4/6] Lint and update documentation tables --- examples/functions/newModes/NewModes-CarPoolingExample.xml | 2 +- .../functions/newModes/NewModes-ChauffeuredServiceExample.xml | 2 +- xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd | 3 +-- xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index b2d673117..3ade6acb8 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -1666,4 +1666,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index af8a16536..6b4b9aa5b 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -1238,4 +1238,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index d3e03d344..5137569a8 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -5,7 +5,6 @@ - @@ -174,7 +173,7 @@ Rail transport, Roads and Road transport TAXI RANKs in frame. - + POINTS OF INTEREST in frame. diff --git a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd index 7cd92c4fe..abcc7059d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd @@ -75,7 +75,7 @@ Rail transport, Roads and Road transport - + A place comprising one or more locations where taxis may stop to pick up or set down passengersA place comprising one or more locations where taxis may stop to pick up or set down passengers. +v1.2.2 From db7237d14d044b6faaff1a847df00641e6270407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 25 Jan 2024 01:12:06 +0100 Subject: [PATCH 5/6] Update xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd index abcc7059d..650fb988c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - A place comprising one or more locations where taxis may stop to pick up or set down passengersA place comprising one or more locations where taxis may stop to pick up or set down passengers. +v1.2.2 + A place comprising one or more locations where taxis may stop to pick up or set down passengers. +v1.2.2 From 2d188749327a14b1b0272fe6228d4a4ecb61dfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 25 Jan 2024 01:12:18 +0100 Subject: [PATCH 6/6] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index 0bf2a0db3..c4cc3ec30 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport - Can be a STOP PLACE. + A STOP PLACE.