From c146fad05a372c23ee44b4637a988b1a0e7e55de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 12 Dec 2023 19:08:59 +0100 Subject: [PATCH 01/11] fix 466 with including also the stuff that Christophe wrote. --- .../netex_routeInstruction_version.xsd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index a5783b63c..c121b2575 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -73,7 +73,12 @@ Rail transport, Roads and Road transport - + + + A reference to an Instruction on how to follow a ROUTE through the network. + + + An Instruction on how to follow a ROUTE through the network. From d6c747bfea36af79aa2414831cd4c4913c92b32c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 18:10:20 +0000 Subject: [PATCH 02/11] Lint and update documentation tables --- .../part1_networkDescription/netex_routeInstruction_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index c121b2575..4862fb655 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -77,7 +77,7 @@ Rail transport, Roads and Road transport A reference to an Instruction on how to follow a ROUTE through the network. - + An Instruction on how to follow a ROUTE through the network. From 1997f30423e4d932e0f8f8f469656f8851f89325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 12 Dec 2023 19:53:15 +0100 Subject: [PATCH 03/11] Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Co-authored-by: Stefan de Konink --- .../part1_networkDescription/netex_routeInstruction_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 4862fb655..df8328f5e 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -73,7 +73,7 @@ Rail transport, Roads and Road transport - + A reference to an Instruction on how to follow a ROUTE through the network. From 0e42c84a4b379ea090cf4d3e9bce5c3ad29d620f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 24 Jan 2024 21:06:29 +0100 Subject: [PATCH 04/11] example, fixed choice, added constraints --- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 14 +++++++++++++ xsd/NeTEx_publication.xsd | 21 +++++++++++++++++++ .../netex_routeInstruction_version.xsd | 12 ++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml index 10c9d4304..70f2c07ea 100644 --- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml +++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml @@ -606,10 +606,24 @@ v1.1 revised ids + + + false + 100 + + + back + down + false + + + + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 36295f6d9..70cace8b5 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -10902,6 +10902,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [RouteInstruction Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index df8328f5e..4bfdadc86 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -73,16 +73,18 @@ Rail transport, Roads and Road transport - + + - A reference to an Instruction on how to follow a ROUTE through the network. + A reference to an instruction on how to follow a ROUTE through the network. - + - An Instruction on how to follow a ROUTE through the network. + An instruction on how to follow a ROUTE through the network. - + + From 610196a2723414fa953b6dc5e463f0ceb62c1bb0 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:08:02 +0000 Subject: [PATCH 05/11] Lint and update documentation tables --- xsd/NeTEx_publication.xsd | 6 +++--- .../netex_routeInstruction_version.xsd | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 70cace8b5..55e40af70 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -10902,7 +10902,7 @@ Correct COnstraints for PointOnRoute - + @@ -10911,7 +10911,7 @@ Correct COnstraints for PointOnRoute - + @@ -10922,7 +10922,7 @@ Correct COnstraints for PointOnRoute - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 4bfdadc86..3413e1ed8 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -74,16 +74,16 @@ Rail transport, Roads and Road transport - - - A reference to an instruction on how to follow a ROUTE through the network. - - - - - An instruction on how to follow a ROUTE through the network. - - + + + A reference to an instruction on how to follow a ROUTE through the network. + + + + + An instruction on how to follow a ROUTE through the network. + + From 953e8eba3338e9b889f861ad0041ea4a13ab6512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 2 Feb 2024 13:35:26 +0100 Subject: [PATCH 06/11] fix carrdinalties and a typo --- .../part1_networkDescription/netex_routeInstruction_version.xsd | 2 +- .../part1_networkDescription/netex_route_version.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 3413e1ed8..80083cf96 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -73,7 +73,7 @@ Rail transport, Roads and Road transport - + A reference to an instruction on how to follow a ROUTE through the network. diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd index f0b599701..508f2e950 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -356,7 +356,7 @@ Rail transport, Roads and Road transport - Instructins for following route. +v1.1 + Instructions for following route. +v1.1 From 3210409a01c3061eb183e70e7dba1849d9130645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 8 Feb 2024 22:49:29 +0100 Subject: [PATCH 07/11] sequences in choice --- .../netex_routeInstruction_version.xsd | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 80083cf96..180dea1cc 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -74,16 +74,20 @@ Rail transport, Roads and Road transport - - - A reference to an instruction on how to follow a ROUTE through the network. - - - - - An instruction on how to follow a ROUTE through the network. - - + + + + A reference to an instruction on how to follow a ROUTE through the network. + + + + + + + An instruction on how to follow a ROUTE through the network. + + + @@ -175,4 +179,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From a121d9fd8cbc59e9413a8bfc1a61b03d15ea515c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:50:57 +0000 Subject: [PATCH 08/11] Lint and update documentation tables --- .../part1_networkDescription/netex_routeInstruction_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 180dea1cc..6b6c136ae 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -179,4 +179,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 079ad9179eff5790f75e801df723306c4c64d8d6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 9 Feb 2024 00:24:55 +0100 Subject: [PATCH 09/11] Apply suggestions from code review --- .../part1_networkDescription/netex_route_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd index 508f2e950..321e24d00 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -356,7 +356,7 @@ Rail transport, Roads and Road transport - Instructions for following route. +v1.1 + Instructions for following a route. +v1.1 From 53b37525a3f7be5c20f62b3eb50cbed2cce8a199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 16:35:11 +0200 Subject: [PATCH 10/11] typos and simplification --- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 2 +- .../netex_routeInstruction_version.xsd | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml index 70f2c07ea..67b66bff9 100644 --- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml +++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml @@ -608,7 +608,7 @@ v1.1 revised ids - false + 3rd road to the left 100 diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 6b6c136ae..3dea5fe2c 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -72,24 +72,18 @@ Rail transport, Roads and Road transport - - A reference to an instruction on how to follow a ROUTE through the network. - - An instruction on how to follow a ROUTE through the network. - - @@ -141,27 +135,27 @@ Rail transport, Roads and Road transport - Directions for following path step. + Directions for following path step. - Relative heading for Instruction + Relative heading for Instruction. - Heading for Instructioni nternational boundary between two countries may be crossed. + Heading for instruction. - Compass Bearing for Instruction + Compass Bearing for Instruction. - Distance for step. + Distance for step. @@ -171,7 +165,7 @@ Rail transport, Roads and Road transport - Directions for following path staep. + Directions for following path step. From 8fcb269d540fc779eb14db2f0a4a174b31a41b27 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 14:36:39 +0000 Subject: [PATCH 11/11] Lint and update documentation tables --- .../netex_routeInstruction_version.xsd | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 3dea5fe2c..5f27ddff7 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -72,18 +72,18 @@ Rail transport, Roads and Road transport - - - - A reference to an instruction on how to follow a ROUTE through the network. - - - - - An instruction on how to follow a ROUTE through the network. - - - + + + + A reference to an instruction on how to follow a ROUTE through the network. + + + + + An instruction on how to follow a ROUTE through the network. + + +