From bd3a5a17b0c2ad817ae17748931768fa66fa93dd Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 5 Jun 2025 05:30:47 +0200 Subject: [PATCH 1/2] Finally validate all examples, in all subfolders --- .github/scripts/validate-examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index 6717dca9e..0f9e7d9fe 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -11,7 +11,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) echo "Validating NeTEx XML examples ..." -if $SCRIPT_DIR/xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/efp/*.xml examples/standards/norway/*/*.xml examples/standards/nta/*.xml examples/standards/tap_tsi/*/*.xml examples/standards/epiap/*xml examples/functions/deckPlans/*.xml 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 /usr/bin/find examples/functions examples/standards -type f -name "*.xml" -print0 | xargs -0 $SCRIPT_DIR/xmllint --noout --schema xsd/NeTEx_publication.xsd; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' From 87556f6c19aadaa84fa8a44399050dcab7ca0e7c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 5 Jun 2025 06:02:13 +0200 Subject: [PATCH 2/2] Fix all remaining broken examples. --- .../functions/line/NeTEx_01_simple_line.xml | 2 +- .../functions/relations/test-01-timetable.xml | 60 +++++++++++++ .../vehicle/Netex_simpleVehicle_01.xml | 2 +- ...onDelivery_109_Oslo_morningbus_example.xml | 84 +++++++++---------- ...xml => 86_STA_PD_R86_20070903.xml.invalid} | 0 ...ptg_sample.xml => nptg_sample.xml.invalid} | 0 6 files changed, 104 insertions(+), 44 deletions(-) rename examples/standards/txc/samples/{86_STA_PD_R86_20070903.xml => 86_STA_PD_R86_20070903.xml.invalid} (100%) rename examples/standards/txc/samples/{nptg_sample.xml => nptg_sample.xml.invalid} (100%) diff --git a/examples/functions/line/NeTEx_01_simple_line.xml b/examples/functions/line/NeTEx_01_simple_line.xml index 1a8c5ff40..d2eb16ade 100644 --- a/examples/functions/line/NeTEx_01_simple_line.xml +++ b/examples/functions/line/NeTEx_01_simple_line.xml @@ -49,9 +49,9 @@ 24 - child adult animal foot bicycle scooter true + child adult animal Ski la Haute diff --git a/examples/functions/relations/test-01-timetable.xml b/examples/functions/relations/test-01-timetable.xml index 4a996e864..dddfb1705 100644 --- a/examples/functions/relations/test-01-timetable.xml +++ b/examples/functions/relations/test-01-timetable.xml @@ -41,6 +41,66 @@ urn:ogc:def:crs:EPSG::4326 + + + + + DK + + + + + + + creates + + + + + + + + AR + Arriva + AR + Arriva + + +45 70277482 + + authority +
+ + + Arriva + Arriva tog + Arriva + Arriva tog + + http://www.mitarriva.dk + + operator +
+ + + + + + + + + 021 + + Arriva + 021 + bus + Arriva + + + + + + + diff --git a/examples/functions/vehicle/Netex_simpleVehicle_01.xml b/examples/functions/vehicle/Netex_simpleVehicle_01.xml index 4f327f569..5c1bed6e5 100644 --- a/examples/functions/vehicle/Netex_simpleVehicle_01.xml +++ b/examples/functions/vehicle/Netex_simpleVehicle_01.xml @@ -89,7 +89,7 @@ Model Hybrid cruise vessel true - + 640 true diff --git a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml index c86041fba..88f4b0bd9 100644 --- a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml +++ b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml @@ -452,32 +452,32 @@ - + 04:30:00 - + 04:32:00 - + 04:33:00 - + 04:34:00 - + 04:35:00 - + 04:40:00 @@ -492,27 +492,27 @@ - + 05:00:00 - + 05:02:00 - + 05:03:00 - + 05:04:00 - + 05:05:00 - + 05:10:00 @@ -528,32 +528,32 @@ - + 05:30:00 - + 05:32:00 - + 05:33:00 - + 05:34:00 - + 05:35:00 - + 05:40:00 @@ -569,27 +569,27 @@ - + 06:00:00 - + 06:02:00 - + 06:03:00 - + 06:04:00 - + 06:06:00 - + 06:10:00 @@ -605,32 +605,32 @@ - + 06:30:00 - + 06:32:00 - + 06:33:00 - + 06:34:00 - + 06:35:00 - + 06:40:00 @@ -645,27 +645,27 @@ - + 07:00:00 - + 07:02:00 - + 07:03:00 - + 07:04:00 - + 07:07:00 - + 07:10:00 @@ -683,27 +683,27 @@ - + 00:30:00 - + 00:32:00 - + 00:33:00 - + 00:34:00 - + 00:37:00 - + 00:40:00 diff --git a/examples/standards/txc/samples/86_STA_PD_R86_20070903.xml b/examples/standards/txc/samples/86_STA_PD_R86_20070903.xml.invalid similarity index 100% rename from examples/standards/txc/samples/86_STA_PD_R86_20070903.xml rename to examples/standards/txc/samples/86_STA_PD_R86_20070903.xml.invalid diff --git a/examples/standards/txc/samples/nptg_sample.xml b/examples/standards/txc/samples/nptg_sample.xml.invalid similarity index 100% rename from examples/standards/txc/samples/nptg_sample.xml rename to examples/standards/txc/samples/nptg_sample.xml.invalid