From 4a9bb96d5d3119b3cdf8640245340ed9d38cd5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 13 Mar 2023 13:54:01 +0100 Subject: [PATCH 1/2] examples adapted to new RelativeLevelOrder And RelativeLevelOrder optional. We otherwise have examples that break. And it might be that people don't wish to use them. --- ...FER_910GWIMBLDN-accessibility_20140601.xml | 3 ++ .../epiap/Chur_Equipment_Pathlink_V1.0.xml | 35 ++++++++++++++++++- examples/standards/epiap/eiap_test1_ramp.xml | 29 ++++++++++++++- ...onDelivery_109_Oslo_morningbus_example.xml | 6 ++-- .../part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index 5e2669caf..cb94b9f00 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -757,14 +757,17 @@ Changes Ground G + 0 Platform Level PL + -1 Street Level ST + +1 diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml index 4be5a2431..43b6084c7 100644 --- a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml +++ b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml @@ -1,6 +1,6 @@ - + 2022-04-13T18:38:52.6831392+02:00 MENTZ NeTEx Export, Version: 19.16.0.0 @@ -766,14 +766,23 @@ Erdgeschoss G + G + true + 0 1. Untergeschoss B1 + B1 + true + -1 2. Untergeschoss B2 + B2 + true + -2 @@ -6075,10 +6084,16 @@ 1. Obergeschoss F1 + F1 + true + 1 Erdgeschoss G + G + true + 0 @@ -6766,6 +6781,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -7368,6 +7386,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -9334,10 +9355,16 @@ 1. Obergeschoss F1 + F1 + true + 1 Erdgeschoss G + G + true + 0 @@ -10056,6 +10083,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -10442,6 +10472,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index f486e0f8d..8f8bba5cc 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -1,5 +1,5 @@ - + 2022-01-10T17:10:54.0424911+01:00 MENTZ EPIAP minimal level conform delivery of the station of Chur. PathLinks/PathJunctions available, all relevant equipment modeled. @@ -995,14 +995,26 @@ Erdgeschoss G + Erdgeschoss Bahnhof Chur + G + true + 0 1. Untergeschoss B1 + 1. Untergeschoss Bahnhof Chur + B1 + true + -1 2. Untergeschoss B2 + 2. Untergeschoss Bahnhof Chur + B2 + true + -2 @@ -2123,6 +2135,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -4386,10 +4401,16 @@ 1. Obergeschoss F1 + F1 + true + 1 Erdgeschoss G + G + true + 0 @@ -4912,6 +4933,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -5223,6 +5247,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed 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 e59970b67..c86041fba 100644 --- a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml +++ b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml @@ -1,7 +1,7 @@ - + 2016-05-23T12:00:00.0Z NSR @@ -233,10 +233,10 @@ outbound - + - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index afd4207d9..25806f79e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd @@ -600,7 +600,7 @@ Rail transport, Roads and Road transport Whether level is for public use. - + Order of LEVELs. The level numbers are not absolute, but only give a relative order within the SITE. 0 should be the ground floor, even when it is often difficult to determine which one that is in a complex structure. Complex buildings can be modelled with multiple SITEs and referenced by SiteRef. From 2fc2f11b7188ced73fbc52985cd4288ad3797485 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 12:55:53 +0000 Subject: [PATCH 2/2] Lint and update documentation tables --- .../epiap/Chur_Equipment_Pathlink_V1.0.xml | 27 +++++++++---------- examples/standards/epiap/eiap_test1_ramp.xml | 18 ++++++------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml index 43b6084c7..c487ac15d 100644 --- a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml +++ b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml @@ -1,6 +1,5 @@ - - - + + 2022-04-13T18:38:52.6831392+02:00 MENTZ NeTEx Export, Version: 19.16.0.0 @@ -768,21 +767,21 @@ G G true - 0 + 0 1. Untergeschoss B1 B1 true - -1 + -1 2. Untergeschoss B2 B2 true - -2 + -2 @@ -6086,14 +6085,14 @@ F1 F1 true - 1 + 1 Erdgeschoss G G true - 0 + 0 @@ -6783,7 +6782,7 @@ G G true - 0 + 0 interchangeAllowed @@ -7388,7 +7387,7 @@ G G true - 0 + 0 interchangeAllowed @@ -9357,14 +9356,14 @@ F1 F1 true - 1 + 1 Erdgeschoss G G true - 0 + 0 @@ -10085,7 +10084,7 @@ G G true - 0 + 0 interchangeAllowed @@ -10474,7 +10473,7 @@ G G true - 0 + 0 interchangeAllowed diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index 8f8bba5cc..816d13613 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -1003,18 +1003,18 @@ 1. Untergeschoss B1 - 1. Untergeschoss Bahnhof Chur + 1. Untergeschoss Bahnhof Chur B1 true - -1 + -1 2. Untergeschoss B2 - 2. Untergeschoss Bahnhof Chur + 2. Untergeschoss Bahnhof Chur B2 true - -2 + -2 @@ -2137,7 +2137,7 @@ G G true - 0 + 0 interchangeAllowed @@ -4403,14 +4403,14 @@ F1 F1 true - 1 + 1 Erdgeschoss G G true - 0 + 0 @@ -4935,7 +4935,7 @@ G G true - 0 + 0 interchangeAllowed @@ -5249,7 +5249,7 @@ G G true - 0 + 0 interchangeAllowed