From 48117f918732d09f620b5f7249e0eb5df42c2c5d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 14:59:57 +0100 Subject: [PATCH 01/10] Introduce the examples from Norway --- .github/scripts/validate-examples.sh | 2 +- .../norway/stops/submodel-StationWithEquipment.xml | 2 +- examples/standards/norway/vehicles/submodel-VehicleType.xml | 6 +++--- .../part1_ifopt/netex_ifopt_equipmentParking_version.xsd | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index d2be5eb89..958e05254 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/norway/*/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' diff --git a/examples/standards/norway/stops/submodel-StationWithEquipment.xml b/examples/standards/norway/stops/submodel-StationWithEquipment.xml index 0ac06764e..631eef56f 100644 --- a/examples/standards/norway/stops/submodel-StationWithEquipment.xml +++ b/examples/standards/norway/stops/submodel-StationWithEquipment.xml @@ -139,7 +139,7 @@ This example contains a autogenerated example of a station with two levels, an a 10 railings false - true + indoors diff --git a/examples/standards/norway/vehicles/submodel-VehicleType.xml b/examples/standards/norway/vehicles/submodel-VehicleType.xml index 4925fa834..f7a2dfb6c 100644 --- a/examples/standards/norway/vehicles/submodel-VehicleType.xml +++ b/examples/standards/norway/vehicles/submodel-VehicleType.xml @@ -1,11 +1,11 @@ - + example V true diesel - + firstClass 100 80 @@ -14,7 +14,7 @@ 2 2 - + standardClass 300 250 diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd index a3df83656..d5b7f42c8 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd @@ -127,9 +127,9 @@ Rail transport, Roads and Road transport whether shelter is enclosed. - + - Whether storage is covered. + Whether the component is indoors or outdoors. From abd2cbcb60e7ab1e0382a2cf68d98717f5c8b669 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:02:05 +0000 Subject: [PATCH 02/10] Lint and update documentation tables --- examples/standards/norway/vehicles/submodel-VehicleType.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/standards/norway/vehicles/submodel-VehicleType.xml b/examples/standards/norway/vehicles/submodel-VehicleType.xml index f7a2dfb6c..e00e39725 100644 --- a/examples/standards/norway/vehicles/submodel-VehicleType.xml +++ b/examples/standards/norway/vehicles/submodel-VehicleType.xml @@ -1,5 +1,5 @@ - + example V true From d101577bfb80182f0f8fc00c2dd9dff579e75de0 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 15:31:50 +0100 Subject: [PATCH 03/10] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_ifopt/netex_ifopt_equipmentParking_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd index d5b7f42c8..a6ad276f1 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport - Whether the component is indoors or outdoors. + Whether the parking space is protected from the weather. From cd00ea6ae716d1c9fec0940492d2f25cb846794d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 19 Mar 2024 15:04:25 +0100 Subject: [PATCH 04/10] Introduce backwards compatibility --- .../standards/norway/stops/submodel-StationWithEquipment.xml | 2 +- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/standards/norway/stops/submodel-StationWithEquipment.xml b/examples/standards/norway/stops/submodel-StationWithEquipment.xml index 631eef56f..0ac06764e 100644 --- a/examples/standards/norway/stops/submodel-StationWithEquipment.xml +++ b/examples/standards/norway/stops/submodel-StationWithEquipment.xml @@ -139,7 +139,7 @@ This example contains a autogenerated example of a station with two levels, an a 10 railings false - indoors + true diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index f5a340c94..8ca451245 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -308,6 +308,8 @@ Rail transport, Roads and Road transport + + From 2a5ca512471fe77f2a9d32a914660385f0a60c2b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:06:16 +0000 Subject: [PATCH 05/10] Lint and update documentation tables --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 8ca451245..ba1e3d9b7 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -308,8 +308,10 @@ Rail transport, Roads and Road transport - - + + + + From a2668014a5246ca103723eb9193217602ea7835b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 10 Apr 2024 18:35:57 +0200 Subject: [PATCH 06/10] Update netex_ifopt_site_support.xsd --- .../part1_ifopt/netex_ifopt_site_support.xsd | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index f28e1aa2d..b1bee8829 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -381,45 +381,6 @@ Rail transport, Roads and Road transport - - - Allowed values for public use. - - - - - - - - - - - - Allowed values for covered. - - - - - - - - - - - - - - - - Allowed values for gated. - - - - - - - -======= Allowed values for ENTRANCE type. From 23230a8af52ed7a78cf609bc0f81f4beddb91f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 Apr 2024 17:41:20 +0200 Subject: [PATCH 07/10] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_ifopt/netex_ifopt_equipmentParking_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd index a6ad276f1..35f02260f 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - whether shelter is enclosed. + Whether shelter is enclosed. From 0f2fee9f0a80007f15cabf4dd06000377dbdeb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 Apr 2024 17:49:45 +0200 Subject: [PATCH 08/10] updates CoveredEnumeration with a true and false --- .../netex_environment_support.xsd | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index f95608cd4..82ed7fce6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -449,6 +449,16 @@ Rail transport, Roads and Road transport + + + Value to be used, if covered is used as a "boolean". Equals covered. +v2.0 + + + + + Value to be used, if covered is used as a "boolean". Equals outdoors. +v2.0 + + From b6d5c42a00aa1fbc67223ea2286729426d628f76 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:52:09 +0000 Subject: [PATCH 09/10] Lint and update documentation tables --- .../netex_reusableComponents/netex_environment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 82ed7fce6..5826d3b79 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -457,7 +457,7 @@ Rail transport, Roads and Road transport Value to be used, if covered is used as a "boolean". Equals outdoors. +v2.0 - + From bf06f4d113c08180318a1b1ab64e0a4abed542a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 17 Apr 2024 18:35:15 +0200 Subject: [PATCH 10/10] Depreciated added --- .../netex_reusableComponents/netex_environment_support.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 5826d3b79..3683ae13a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -451,12 +451,12 @@ Rail transport, Roads and Road transport - Value to be used, if covered is used as a "boolean". Equals covered. +v2.0 + Value to be used, if covered is used as a "boolean". Equals covered. Depreciated.+v2.0 - Value to be used, if covered is used as a "boolean". Equals outdoors. +v2.0 + Value to be used, if covered is used as a "boolean". Equals outdoors. Depreciated. +v2.0