From 061d00325b45393c35a135c9c447d2a0f0f9cc38 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Mon, 21 Dec 2020 15:17:54 +0100 Subject: [PATCH 01/74] Add usage validity start/end time for element access --- .../netex_customerPurchasePackage_version.xsd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd index 74b445002..4c63f2bdc 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -47,6 +47,9 @@ 2019-04-06TN6 distinguish between RequestedTravelSpoeifcation and Offered TravelSpecication. Remodularise to separate out from Sales Transaction + + 2020-12-21Added StartOfValidity and EndOfValidity to describe validity of CustomerPurchasePackageElementAccess +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the CUSTOMER PURCHASE PACKAGE types.

@@ -775,6 +778,16 @@ Rail transport, Roads and Road transport Whether the element has been used + + + Start Validity of element access. + + + + + End Validity of element access. + + PARAMETER ASSIGNMENTs applying to CUSTOMER PURCHASE PACKAGE ELEMENT ACCESS. From 285d7e290eaadb70e632fa8ec020d95e4956e1f8 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Wed, 27 Jan 2021 11:51:51 +0100 Subject: [PATCH 02/74] Initial commit for GroupOfTariffZones --- .../Netex_GroupingExample_General_01.xml | 17 ++++ xsd/NeTEx_publication.xsd | 21 +++++ xsd/NeTEx_publication_timetable.xsd | 21 +++++ .../netex_zone_version.xsd | 79 +++++++++++++++++++ .../part1_frames/netex_siteFrame_version.xsd | 18 +++++ .../netex_accessRightParameter_version.xsd | 4 + 6 files changed, 160 insertions(+) diff --git a/examples/functions/grouping/Netex_GroupingExample_General_01.xml b/examples/functions/grouping/Netex_GroupingExample_General_01.xml index a639bdcc7..71fe5f0d7 100644 --- a/examples/functions/grouping/Netex_GroupingExample_General_01.xml +++ b/examples/functions/grouping/Netex_GroupingExample_General_01.xml @@ -23,6 +23,7 @@ This is shows use ofGrouping oif entities in the same file Version History Group changes to show all versions of each basic entity (Stop, Link, Srevice pattern, DAY TYPE) + 2021-01-25 - Added example use of GroupOfTariffZones (C) 2010-2019 Crown Copyright CEN --> @@ -75,5 +76,21 @@ Version History + + + + + + + + + + + + + + + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index ad1eef080..eaf902064 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -1068,6 +1068,27 @@ + + + + + Every [GroupOfTariffZones Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 317048cb2..ce446f6ca 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1020,6 +1020,27 @@ Provides a general purose wrapper for NeTEx data content. + + + + + Every [GroupOfTariffZones Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index f13368b1b..60333a4e6 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -30,6 +30,9 @@ 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy + + 2021-01-25Add GroupOfTariffZones +

NeTEx - Network Exchange. This subschema defines ZONE types.

 @@ -248,6 +251,82 @@ Rail transport, Roads and Road transport + + + + A grouping of TARIFF ZONEs which will be commonly referenced for a specific purpose. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for GROUP OF LINES. + + + + + + + + + + + + Elements for GROUP OF LINES. + + + + + TARIFF ZONEs in GROUP OF TARIFF ZONEs. + + + + + + + Reference to a GROUP OF TARIFF ZONEs. + + + + + Type for a GROUP OF TARIFF ZONEs. + + + + + + Identifier of a GROUP OF TARIFF ZONEs. + + + + + + + + Type for identifier of a GROUP OF TARIFF ZONEs. + + + 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 8dd1871b6..c78a9ba0c 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -217,7 +217,25 @@ Rail transport, Roads and Road transport TARIFF ZONEs in frame. + + + GROUPs of TARIFF ZONEs in frame. + + + + + Type for containment in frame of GROUP OF TARIFF ZONEs. + + + + + + + + + + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 962c688a4..64d4f212e 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -91,6 +91,9 @@ 2019-04-18FIX - SUpport Place to Place travel (ADDRESS and TOPOGRAPHICAL PLACE) : Add AddressRef , TopoographiPlaceRef and PlaceUseEnum. + + 2021-01-25Add GroupOfTariffZonesRef to NetworkValidityParametersGroup +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the FARE ACCESS RIGHT PARAMETER types.

@@ -393,6 +396,7 @@ Rail transport, Roads and Road transport + From 6f02c4725045a57ee17d49ab59dd6182c2223941 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Wed, 27 Jan 2021 13:54:20 +0100 Subject: [PATCH 03/74] Fixed copy/paste error on documentation tags --- .../netex_genericFramework/netex_zone_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 60333a4e6..09488f4e4 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -280,7 +280,7 @@ Rail transport, Roads and Road transport - Type for GROUP OF LINES. + Type for GROUP OF TARIFF ZONEs. @@ -292,7 +292,7 @@ Rail transport, Roads and Road transport - Elements for GROUP OF LINES. + Elements for GROUP OF TARIFF ZONEs. From 99951562ff2c5ea51b8a3f58a4e7d2dbd8a6b423 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Fri, 29 Jan 2021 15:36:47 +0100 Subject: [PATCH 04/74] Add optional TimebandRef and ServiceCalendarRef to TemporalValidityParametersGroup --- .../part3_fares/netex_accessRightParameter_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 962c688a4..962aa4296 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -91,6 +91,9 @@ 2019-04-18FIX - SUpport Place to Place travel (ADDRESS and TOPOGRAPHICAL PLACE) : Add AddressRef , TopoographiPlaceRef and PlaceUseEnum. + + 2020-12-08FIX - Add optional TimebandRef and ServiceCalendarRef to TemporalValidityParametersGroup +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the FARE ACCESS RIGHT PARAMETER types.

@@ -327,9 +330,11 @@ Rail transport, Roads and Road transport + + From 6b57386d13c528d901115fdeed8e47b13b7b50ce Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Thu, 4 Feb 2021 16:09:20 +0100 Subject: [PATCH 05/74] Add dynamicdistancematrixelement for on-the-fly generation when pre-computing all possible combinations is not feasible --- .../netex_accessRightParameter_version.xsd | 7 +++++-- .../netex_distanceMatrixElement_version.xsd | 12 +++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 962c688a4..96e933b0a 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -16,7 +16,7 @@ - + @@ -250,7 +250,10 @@ Rail transport, Roads and Road transport - + + + + diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd index 53de50624..59fdcc3d8 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd @@ -31,7 +31,10 @@ 2019-03-25Fix #40 by Skinkie from 2019.01.07 . Fix typo on DistanceMatrixElement.IsDirect. - NB this will break existing XML that uses IsDirect. + NB this will break existing XML that uses IsDirect. + + + 2021-02-05Add DynamicDistanceMatrixElement for on-the-fly creation when pre-computing all possible combinations is not feasible

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -479,6 +482,13 @@ Rail transport, Roads and Road transport + + + + A dynamic free-standing distance matrix element. Used when a pre-computed distance matrix element is not feasible. + + + From 1c82fa3be398cbeb083bdf6d0a625e75cac533ad Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Fri, 5 Feb 2021 19:04:06 +0100 Subject: [PATCH 06/74] Added proper element definition --- xsd/NeTEx_publication.xsd | 9 ++++ .../netex_distanceMatrixElement_support.xsd | 6 +++ .../netex_distanceMatrixElement_version.xsd | 47 +++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index ad1eef080..7348115d5 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -7519,6 +7519,15 @@ + + + + Every [DynamicDistanceMatrixElement Id + Version] must be unique within document. + + + + + diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd index e79b11c10..74376b9f5 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd @@ -121,6 +121,12 @@ Rail transport, Roads and Road transport + + + Type for identifier of a DYNAMIC DISTANCE MATRIX ELEMENT. + + + Reference to a DISTANCE MATRIX ELEMENT, used in a forward direction. diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd index 59fdcc3d8..3f88f7684 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd @@ -1,5 +1,7 @@ - + @@ -228,7 +230,14 @@ Rail transport, Roads and Road transport - + + + + + Dummy SERVICE JOURNEY Supertype. + + + A cell of an origin-destination matrix for TARIFF ZONEs or STOP POINTs, expressing a fare distance for the corresponding trip: value in km, number of fare units etc. @@ -482,12 +491,42 @@ Rail transport, Roads and Road transport - - + + A dynamic free-standing distance matrix element. Used when a pre-computed distance matrix element is not feasible. + + + + + + + + + + + + + + + + + + + + + + + + Type for DYNAMIC DISTANCE MATRIX ELEMENT. + + + + + + From 7b3098d138a759a24141e3a8beca60eadd63491f Mon Sep 17 00:00:00 2001 From: syversenkr Date: Fri, 13 Aug 2021 13:54:36 +0200 Subject: [PATCH 07/74] Add enumerations for pushchair (#187) * Add enumerations for pushchair --- .../netex_facility_support.xsd | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 70b3d9bba..4db60ca45 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -36,7 +36,9 @@ 2019-04-14Fix Add new values ti PassengerInfromation LienStatus and realTimeDIsruption - + + 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the FACILITY subtypes

@@ -112,6 +114,7 @@ Rail transport, Roads and Road transport pti23_16_3 + pti23_16_1 @@ -229,6 +232,7 @@ Rail transport, Roads and Road transport + @@ -244,7 +248,8 @@ Rail transport, Roads and Road transport - + + @@ -399,6 +404,7 @@ Rail transport, Roads and Road transport + From 0d83406197d7074daba732a4f85aea8d76a19f5f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 4 Nov 2021 21:56:32 +0100 Subject: [PATCH 08/74] Typo in VehicleType (#253) (#256) * Typo in VehicleType Reported by @hennoit --- .../netex_vehicleType_version.xsd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 6a0ea45c9..6b94341ee 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -70,7 +70,7 @@ Rail transport, Roads and Road transport - Type of VEHICLe. + Type of VEHICLE. @@ -97,7 +97,7 @@ Rail transport, Roads and Road transport - Type for a VEHICLE. TYPE. + Type for a VEHICLE TYPE. @@ -109,7 +109,7 @@ Rail transport, Roads and Road transport - Elements for a VEHICLE. TYPE. + Elements for a VEHICLE TYPE. @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - Facilities of VEHICLE. + Facilities of VEHICLE TYPE. @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - Prooprty Elements for a VEHICLE. TYPE. + Property Elements for a VEHICLE. TYPE. @@ -174,7 +174,7 @@ Rail transport, Roads and Road transport - Total Number of passengers that VEHICLE TYPE. can carry. + Total Number of passengers that VEHICLE TYPE can carry. @@ -203,7 +203,7 @@ Rail transport, Roads and Road transport - The length of a VEHICLE of the type. +v1.1 + The height of a VEHICLE of the type. +v1.1 From 22d8ec2475f1088ebf4db602441590ab0051d339 Mon Sep 17 00:00:00 2001 From: Henno Willering Date: Thu, 4 Nov 2021 21:58:03 +0100 Subject: [PATCH 09/74] Add Presentation to TypeOfProductCategory (#254) --- .../netex_serviceRestrictions_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 99943f2d6..b998c4cce 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -350,6 +350,11 @@ Rail transport, Roads and Road transport An alternative code that uniquely identifies the PRODUCT CATEGORY. Specifically for use in AVMS systems that require an alias, if code is different from main identifier. For VDV compatibility. + + + The presentation colours to use for this TYPE OF PRODUCT CATEGORY. +v2.1 + + From 9d60fe683794e375a383a2c6ca7542470975c663 Mon Sep 17 00:00:00 2001 From: Henno Willering Date: Thu, 4 Nov 2021 21:59:49 +0100 Subject: [PATCH 10/74] Add VehicleMode to VehicleType (and some typos) (#252) --- .../netex_vehicleType_version.xsd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 6b94341ee..17c4504c1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -2,6 +2,7 @@ + @@ -128,6 +129,11 @@ Rail transport, Roads and Road transport + + + VEHICLE MODE to which VEHICLE TYPE belongs. +v2.1 + + @@ -149,7 +155,7 @@ Rail transport, Roads and Road transport - Property Elements for a VEHICLE. TYPE. + Property Elements for a VEHICLE TYPE. From 4088f49eba4bbe58b3d768932ed87bbf4139f4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 16 Jan 2022 14:18:48 +0100 Subject: [PATCH 11/74] Level with order (#263) Level order as proposed for EPIAP. --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) 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 a6bd221a4..7bcee1454 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 @@ -549,6 +549,11 @@ Rail transport, Roads and Road transport + + + Order of Levels. The levels numbers are not absolute, but only give a relative order. + + From 1bbcd980d17cc5ecd7bb4cc02c710f3ccfa5f660 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 1 Feb 2022 16:12:26 +0100 Subject: [PATCH 12/74] Fix typo's --- .../netex_relationship_support.xsd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd index 84e1eeeba..9b2b5411c 100644 --- a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd @@ -101,7 +101,7 @@ Rail transport, Roads and Road transport - Nature of last modification: new, revise, delete, undchanged; + Nature of last modification: new, revise, delete, unchanged; @@ -111,7 +111,7 @@ Rail transport, Roads and Road transport - Identifier of version of eferenced entity. For use when refenece is External and a specific version is required. Mutually exclusive with version + Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version @@ -119,7 +119,7 @@ Rail transport, Roads and Road transport - Reference to a NeTEx Object . i.e. concrete instance of an ENTITY may include a version. Implements a one to one relationship by reference. + Reference to a NeTEx Object i.e. concrete instance of an ENTITY may include a version. Implements a one to one relationship by reference. @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - Nature of last modification: new, revise, delete, undchanged; + Nature of last modification: new, revise, delete, unchanged; @@ -206,7 +206,7 @@ Rail transport, Roads and Road transport - Identifier of version of eferenced entity. For use when refenece is External and a specific version is required. Mutually exclusive with version + Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version From 8c7fbb47c67bf5b0dff2095623090231593ecccf Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 6 Apr 2022 12:11:54 +0200 Subject: [PATCH 13/74] Remove emf leftover --- .../SupplementProduct.emf | Bin 62252 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 xsd/netex_framework/netex_reusableComponents/SupplementProduct.emf diff --git a/xsd/netex_framework/netex_reusableComponents/SupplementProduct.emf b/xsd/netex_framework/netex_reusableComponents/SupplementProduct.emf deleted file mode 100644 index 95005c1634217397dfe32b3c9f723f733e5d28f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62252 zcmd^|37lP3mF~|iC=y8tQDXoVxC|MZAOu>{%49+akc1>ff@xF+LjnOoh$PtB`lPzS zCO~4-3`RwH;?z+RC5nmz5GRxtd5A)bJ|(p1qs0LgR8UEO|5N9?wQ5u6-dlBV75Vv2 zYGv;=oVC|kd+oJ{bL&t%+z2osnIT zot-VI>8~-Gu58`9dXn0?rLuj`4o~*GYx7UI?ZvI&AN0sh`Yu&cn= zLo)mW>XzL^Kt|1FC#pQ&0==}{3hvK(-aF&QkH2?DVCS+STr%rKN2<%QRZrLRgYu}$ zaYI{a+(&GFw3i6B7x;Nq&EB3IS zM_sm2rqp6f(?@ zEwkfF@fKwlYK~u_x%75g7B}V*;IV42^z@vh)c&N+zW!V?CBf&iDJiC~u!JZs^bGGy9hQohz6wm?}VD zRe;Zdu>xP7V^X{?hPL*Lp@kA;{eo?OaIh9PUy1VKIx$<4oh4tsLFLe{K4o7&;*WV) zt@!0#JWe+Cp@;gZeBkAk&m-VFs-ySJ`Nk)l*}I;xoNvD6jwLgx|MC3O{=|C6SE~QG zQ_o%j&-z|owEw`%^JaV3S)Z?DW2?RTEdPOz9JY&fQl|Lt3x%Wq>!DoC`p=sEpEJ{W z2!DIb?yUN!1wR!$DDapy{Q=Q#73BJgHH&%B%En5!cvZo-1dc1@9aq#Hf2!t}a0*|ERm%k22Dcr#?lG5UXDHcPc`l?$??vsYy^)k;-kmQl)RU8#|Jw(848JwH1$ z|NlIVSFj88|4P;0l#gxJ($#$IG3M|mcjiixw;|7WYLDkjd?|4Rfj zv*Yq8I#zn-XUB@tmz(iD5c?V2{Y`0{m;iUoK&O8I>h53a?zHkJ{@SJ6KoGjivjd}Mp_Rt50*cXHG zQ>*jh1liCfpl_XzRn4zGa%T_E+)D#)?**!_5&TH-UV+EH={=&oM-cnoyk`3TJl#9g zzQ0-bx~(47%j|fbcx8RhWZQVn);CV#c%eQF(4@deMe@jM);OcRV1{G`D9boO88dyU3eNzV%68m;xSf+FD6&Nue``+SXd z(@(G2M`+vDXlLEtyQXT>8g2V_tZ~X>}|PG{)Sf$JirkhcV~=R5ibbGsiRj-5%!#*9#a-8wAerrtdA< zje;0I<~0*PFVwyEFY<#~-z}58+p1>=eOeYjJkP4^E&0lg*l?UsIu6_iwo|N{o$ZK& zm_G-KiHT|t-#aG2iHRudT>Bi+M=ICuxX<-@uD$1yy>VCDa_zgn($-wtw*BxU1LRu# z?XiLnxQ26Va$4&4_ETGoP4?b#Y?}UK(bKVMUNd9!GrHd~KiIL!nVH+FX9wf9Y;0aB zUgPywb7y7*sDUv{oq5tUk9~55X)evPyk)EhIo3(YnFr1HndW>lQ9Q=4eXHuQ<&zzy zo3)zH?TynWSIj+=gmd*^V&q(lHuLG~0nQikxAR->VDRFB=c+zkFjYYORRypB zV%%5bv*f;g3ir6Z{iO)UzgFczD!tY*{WYS~HtqQ=!#rqZd8}K!s^CC@$2{_bS?jEp zyxXd02mULw<8|UK(Q2o6oqW39E3DFa)yh2Ik*ff56(#vB<}m8dM*i}+C7*Dm;}$y4 z8}rBRaxQtw`Gi;jTFD>iqpg@Hz@KT~R#E%%WVFwAO_F`Yf^l>L|3BJizv}UOm=`&Z zz-Q@YIe1e9%scj<{ptAJQ~upg{MvfCz|G%VIQ?cm_yNM*KKsq|a{KUH@088fXcWwPYLC<|UDdwU`aUMBl!A`4z7OUy(Yz{_OkC$ivW zviKn{gmpWuPq;SwZleo5;jf|q&AwjpLosKX!)qC z9X7tSuyN`DHkx-}lQvpD>hkzW^W){xIbFW@SQA>C4~QrFI9`rfc#fxQ5*-7LSKpV8 zNz>!lJ4gCnDgA3zE>g+ZJEwBAKKJm-Y_(vm>T4_WRbM39BJt*jxu9?CF&}WHV-LF9 z?Nr@kZ@Jn#O!#Fg7pSD&<(28#xs}7RO9YpxepzLX>I+0$Al{tXe3a_+*gIFcW=W5I z^^O8>N6cIxT}Mmzg({C#8ONS^tHe7-JQa1vp5>#icG&n2g^m9>fQ{z8rAZqtA9c0E z#=Dod18!aDoIo9GDig;(O#(Iuw@PPJ5Bc; zA>1*xO!!fOzck^WTJWu_Q?hA(FfLYpS+<$+`;kKb3zP^LTa2TRRF2I)UO6h;spF{Z z1s%r|h<^w(8ljw`9xgxKg~C z`XtF4^pDRQ@i`6edd0TKC^FWGxp;J!dVNyO{I!{{Rj_Q zng8662TI0mA@8=R+a^`>%W@#tLA&&0BRlYGnH?vKw^*~_Le1v0HM-_&*J*#*SNI7X zgZ0&1-7{S+s`!uMr;a12_K(={YIz!A}uxU1fUl$Lqp<%zNMi-4~yO`=UME7wvhD z@MsTsYEO*6vazvHwye;zFeeW59zx{&YUg{1>Z}9uDRBCvsf174-a|~@yluXR7(Kvy z2>k85^b7favGCujT&8lUIfQ&>UB8j8rNULz<}&l3)yrj5#iwH&`;IN!C05J1+Oesy z?UyIZ;?%xkv4F33P}!=ltgBPHQeTw?`GQddrYm(YxeNVh`rF$Icj0OBdj-9S@yvjKNAEP?Z%KH=B!Fy(|)DGyA z1ziGcvi!4cx96$UKGS7tkL%bzMS#CkU%J0{l5b~;KTW{=`@#Y@pU)8<75Lz@g-;Z) zSGPY@tzB*(p6i{m%Q|g~+uTJur%N{CtV@g|pW>-JxZ6^-pATX`#(XxIKILqTHm+7l zEE*>cfmUKM+8u4(*6oXSyB=fCKC;i;|5wO|v*a`P?^OlfN=&&e>-5=d#A6I0pW@Sl zO}^jHC00{0<@2NTycvC~rGznokA&9ZwNrK5$$3naQ|Q;us8r1_+tkdN6lcnp>aKMv zuTwc%a86~7)|i)OR|(dszOM2v)vpunI`Q5W&SLt`ls(SVJeiE~e11DzZE&W1u}b=W zUD59H%4(e-U!1*DaJA}JSFTchooMSMe^tMH>u1C_jvLOD*9y0AMvIR{=N5zc}CRV6xDzfqdUnesb@*VBbREFX2X!$!`5v5|A&)JF3- zQ*Opa%ST=9u#t0MY~&m`wb8t{H)*5gqb|n6fyhbHsk+tON$`#q=m9?T>QM(79 z`F?Co^Q3XH^2@UHv*R+p<3w7@!52)G{-@=Jv@ioU9WbDwW(^?Ic~l3+D7HKDIFJ!zFKgV>gz;Xm#q&u4xN6k zX3o4fs;%pF&&g`*W|ib7!1ULOzFxS*YI)8)XvAW?oEN)AtY#n0KB;oNpi6)}@$0%{ zNu>O;90)e>zSV8jvxE7)%#L@9H`p`p^Rv^l*XO^1xk}H#Z+xF8ST4%4d|c62%y$5F zfcRv8NNJks(B#IPzI~8^9_0tBTOM9)FSbG5zGNJ(79M?RpJPMp-;W7DO2kjAq;EWr z;d6M<%KX~fzdiZ)ZMZGu-4=D*q-uUy4g@=Bz-`sDgEN6LJ9yU9bq3n|+p&DJ0lz)# z-=;o2|Bi&J&d3+)jqVJcl+V_g`3$x0b8~zb`z`hfzK?zecR#vxzo3KsXh7C9N^trQ zKKIx+jrxnVUv@*mh!MuLiVnN6xeP{B-05L%vP!boE1A%$O zoB578$C&9O6;pA3nIyZI-|NkB_-&bh`Hb;;sLHDXK1Ow*mGz44pr5$Xxfc3lL6-nq zE&puWJ)y8Ewa;|1dtAr%DFXbR`qF)WuzbsUX_|oi@QMOA{}AD9*bnrbyLgPj&R&s|* zbg=HAh_tbb~)`UI!F1MXkV$_AANvLY2Gs~R(`qNW^xwiDCDd?l>D5tHYiVR zQoh=)<2KR1Do~#4xL34$b&k@WoW(f`vGXFe>zuV-d1|Bb)eAemAo}fsJ5|41w7YeV z(m!W;{4{%xa-Z6otG2eNjC&mDb3}horA(^jE%qJopb>NNa-QoJk#iKzXvPZ|E65Y4 zt~+K#$}h`-U`Lm3a9j24s7kiXjy2-V>i3OZZl|4x$6dF;1wvga(d0dMy`a;Mq@%CB{zl zll_T(a|P1{Qw7*k73h{67+b!!^*#5kGL(1R-%=Ul5jyW<|3f9u<$07Cfd{QD4jhkX zOUC{~-u|O*KdYKwmIJ{K@{rrAXU90nmD#aMJU+e3_q3d$`0G9C8F;_#c%W~oM=;HC zV;mXBljFBpwjKGVhOaUHoS0{orY^DfZbh=GbS0w-Qrs%Q3?~JH`ljj3MMxJe40xOzo)WU>ps!&wf<& zIKS9uouWs(qntv&wuV(TzkFXaYgYEzKi6ICv!7NuT5wL~*VZpKE-M_ui(k-afCvNuj`G>?6DGd5a2>T+Dv z+h-GZ?6ZHR((;T+#}WJNM}#|$*k}JT@Y!caKKpF=*3}v6^fxiWyw6_u7b@4P{*KMlq|bER*(V5)$AstR}(V64E`wtfcj-!k+7b@(4t#y*GsQqg~}l4puz z6&|!QU%Su$NiyzBjs1CFei_z|At7DY-<4R)`I=N<+cV}W}lvC)pd@iw< z+Fd6&M8G_7PGw?cMP;wbRf2V@ud7T|{SeU(shp#F-xz7_Tw-^%ho28B+Ff4RyK=6+ zHS3*%t5v_cvcKvFiFQzBx#}_Yqi-BH=St5cf%}wm32@u1N6Xg?j0s;}uS-llSpWS$ z-+RSb!rutc!TN)ea|U>vOH3B%r&JgHYx$_F9X4{7fE}DAq&AwzxkNKIT0ZJ(hmD*i zU?XPBHAI94Q(wT)v!mK|&RVZLwNd%1vt#$ljvado_E-HN(GIGtPjZ&WPqXI| zFIQWKs;!wS<6Z|kpTj&#rG9F;hW!UTXvAE+oaeelLyA6^d?r5u?9ptMrJI)pF zm~4r5&}S6iR^`8O*|)29JjDHQtefA=zIiy~CFYY!dM@^H&FlrpU)VKH<^C#-vrhq9 znTKo#wsEC<66kRqXZdH_ZqHSzeWuIo9@o2sOcCI3`_8^}4D($8%#YI~Lp<_bd*J5t z9eAu6%m<$$e4=EBx^K2E*2!mK=;w$tc8w#S;;B5ipIfH&^Fi##p~fQXf7)PQN-P?0 zM=VCWqpgF9IomUm_C>p0k1?0pLE6>)RdA{Hz)lU)a6z!W&YHHuSNV@DR_RZiP(|WYp zUY9zT*OL;ftplj~V*bU)>~$9k*z3MZ0G%}jrFra|PZa2?6AGd5a2>hhSWw{Iry*f*abusm~{^UrCb&lNb1 z*f)0z%xB*m`RtqFTNmTib^4na@xFP1K_lkkz0FNKQWdVJJC<}C-%j@J701?7LbSa)35K~K`Zl_`|e=L zxGm(}7IoXCYJOP`1Uq;)OW!rJ1Ams;ak6;*|5AJJSq8r0KKsvp9gMH$>i+41sRH_~ zD&V;Q@{q4>{r&#&GMMjfc#X=~|IlZM{%V!_>DT}8pq2UE{eP`w+^@(FrvD$4JpJFu z4&tcHj!VSjcMSOb0^aEJKL0#n%Nm|Yd^8_Nj4_WRmy8qF(=y7(y5)#3;x6TREHoOQ zt;Sr;>yu-JxSw05_47gO$DzjJ)zVKJoDUF-#@i8#(e7yLU}DbpjHG?hZr5YXr8YUH zu9g253EaP&Ux2p~Q*O&TIj@K@0v=-s`4ms(hZ0lu&M&^BHsf4mpLHr=quo(Xq2KcP z#XV|wo#0^s^T0Wk`*c=ukIpRa(b>g)f(KQ9ShR9 zm(DEi(%Hp#1V2=Li)dSPe(}Sm&M)qlF8hk}3viEVJzBn&i1V`7^%ASCC8+vB79Vrw zaG&5p!S@BwS(i|n$N9y73iMN|i~hBI)YT3fIdi~9_B*MK=DkI{W^A;4)YT3fIdi~9 z&Ky!3&3k*3Hd;RF@|dZ2enH%Ee(^nl<(a#je>lImTi`fiPxxJd`J7)w{;37ux)`sn z)8E9%G6Clm_X^eucy{BX!~=%={Ne$%>1TSU>M2fMvEAcjkL&nmv4FXU^9%g8M!?u& z?YO$~J)K|Nuk(xVReVpU=&ld+-rv6Dv$`>#NoDOmblBb#6S-FN-Uc;9-s3xiocA^; z*KJbHo6>PlWopNLf(KQ9ShRD{805R zqHWO`NdLU&G1%-G$p2GYtl9peGVY_GbN28XmHMgWEA}?_VR;`u|m_pML!h4_cYu-T!Zu%uxIP9^GsE>e+$*GCSTZ z-lF_>7gqH9_K)7b9QMr5VlY4Yyn>Q3K}jE(&Rj%2J;#97=!|2yW2&#eH`mtd>F*@} zlOC#>x$yEr&g0a$<925~?=-{R9qE7p2sdU9X%i9Xv_Ug8L?8kBBc~~aY#y(YF$VyFiw*F(SeXh!Mt!>^p;x)4$ zuzb|j4ja!aY<%MYHk!AhNgFL6b+yCBm4%IO8o);LE^N|9%ST=5nSgQkr=NlGz&tRN zSh!jCvEO*365)+1(P3TYtq||y;_0U}t{B6XkGgE*V8<7^%4d)_$;OM-__?yIk=4Jp~Zpuq=@~m;{#$Cc=9*^q)&+}dbm}gn!;XyY*gKs}N7NQ^RZ)}Wxdxw1c zEfJY}=nMaz2>yl#t<0zHTh8U(7V>V3x@}T5zbprW9p?(%Ry{lLS(zOti8n>RS9*}X zH|-$R?KAtC(snfRO{;6*32LiLfS;eOb@pe~I5}sjg5uv)y1z|7Li8&|r+?hv=0Pj- zv-^9sWZaL)52nBGlDykGvW^|BEz0a@Zk>IizUiL7*4sBuJYE9{K;0 z@WI^{>s-s8AUkdjvWpAcve*^t@xD(a_ko+gNP0E|KKLf#QCF<{KE{2t=k;~$iO<1( z(H`!L_Annsd%#nB;`r$6&;EO4+x$HF#d%|nbg_2nR(Xrcp^iDmzjZB;uFpxAerjXi zJZNQOj??&{zr0fBH~Z?;!dJ`M;4AAQf2O`NuaU2qhqhH; zomBXWXK5v_n0Kw~lmUEY9(`Fat_J!Wn8O`g9&csuR5%OhQ77N1lJ^6akNNZ?;>CRW zapCMoJU%{_@IPGeqb}E3(>az^&9C7+mt!B`_BP3`Yi0KxD%p#8y9>25j{WP^jjDe@~xbJ(8`0hJZ^J_R`g$CT-w`CWx!n_z`#dPv- z8Y|{Cj+Ghf`h5Bn(e4kC<9@6VY#};uz z-FrFejz8knaxTp??)xkY-#U@;*m11bZ(`NP81k*|X=3d9949^J{ec>a=b`kS<29b$ z{-ltz?Z(SwISXx8md{K@J@G#Dcx?Sya^PjM=!vr6F&Eee_?gRknmOksmyHwrNWgm# z`gl{vZXKWP7}xQA!H-n`QO7>2PZn)*$0pUI|0hX)S3$kcZ;+jjB(UOqZbSoR@t&-MbeCuM|xlVuc zjLQVfO~mVW1@w<`<_%ytKPy99_{z`py#a9I+jftWJ+9-M#RBrd-IBp?_X-&M%t?25 z?Amcp$BR1dRq1;=MR$Fm&&s4Z)Unmd`+(=l7(PSrO_d$8Eyk94-w>}NUZdEueAHzd zTX`Sw9JT)gHU3qVe166619lM3JFCqqpHewq{_7HO#kt2Z_$kT#NpkMbTZHpm#=j&S z{V|94*}u8r`+zaJpBUeu@^4j=>j2aLRdixlP1N$HdC>5EyqssdMXUma&r*F=USFwN@479n z_2h~yuGu`EEdw85Oi(iSQkVNO)^?^_#&mG|!u=V2VV@x%`-gFUqi*JN4EWRY8a{&u zt;{d(pBp6OwvcyQ)NPZh`DHl}?4SX+RnHFg6lHd-7O$CiF;(>se{;5)ovzh*?_XD0 zqLTiw|EYTojqf85A2;ed_mTUFGS<;y+`bu1f3XfcTuKfepugbBouz(qe;q6t_XF~S z>8~p#Pk%MCgY)vT{#qv9$^kz6a)9X3fA~p{l>5u$z`nze&HAs^J7N$epIh`8Hm{kO_=uins4?+~?sZ!?*Rg|le`PVzBi=xJ z=@XS*2mYR#g&Mg!F7PPpdVCJ?@hrZyqZ1oAWPu5ML4ht@_HkzA%8V%xmPU^c~K&zT#P0@fGiItcyIK z#+7;WWxco>=pD{*`zwxh*V$|CC*X|i&oY`l)%JR>2US`o=F_Jo6Z7eIl4TF+@zEhX z^8X@v_)(YZF{e9+J9o0LBgb2owU6Uo)%+UHbw_;Pv!iVJg>2bVC3{V;J51k0^e08v zPc6Tg2d!QlRK;)geUIC!X9x3lnH@Y&qxU`TkC^vj-fDGy8FQWcJjTb~h3_37;4was z^?lFg`<{uii&*(wVXtGw^y@`WW5v8?V&yG*PWJ)w?gQ!`gR172s-^fNmi;xpSf9J1R;x_M)&iHN&{MVsP zsb^TGk{Bj$P_plV$NBD3m3rjb zTu0RxvWz>+M_snD)$`!P)joZHno7sa4#Hm{oW07)D$DYK`<1hTQzYkp{k(9V%Q&%y z{(<|Wx%1#vx}WplYgKw4;M@rMH7eh(GWyXxX!tQ+>3Q(wV)_}8cdn!EXY~D+1ILcX z1#YXJ9gW`mmz@W5o>=chn7qw=O$o>qwL0rOcn0{L0%QQ!k)tjb=JSK;mN6aN{&1g0 zf7oxx$3D79gd279Wh(Kh&y(;QJZO#j=myESE#%!6b=#zBepwC#J7~ad)wAQT`Am2) z{l)LCaVC7t0R06IpEv5SgC*mB7;JxCse9?KMs_ggm)XI3p`B;Kjr=!P?M)YO#=-ch z3V3dSJ)f_K^jsg14}BS*AVQY_)=2Knu*2s_3&t=b1c)&4X6f z7v17j1(ZXLiEDJP+d8d|9r&=!j%!o<)94yf*~dPZYRi(d#<8+y?h8PwoRZpPYI|;Df(jxOJ83 z#dp!3uN3$|_r>SnzGx5kMSE@+9_;~7?TPb8pN|`#seVwpSle*U{6>{Sjc3M|b#Xq+ z?_|btWnQCkHC1|;*WDL>R@)_3%lkF^N+$N3cgy_dd_o?|h1#{6PlqcKy}leFVZwUHgnt!44Z^E5hBb$`UX7xPxD>$8~aVyrl> z_AY$y_yCXb5##FFK2xPH_{>&}70xoDbJm*1ih0e%%2nzs_W|FW zf!nHQN29&;nfg@DGye`v@B96g*=hP7=QH%Xzt22fB?g&GU8Z$#KrYJHfhnIph9)=W zeB`1o@OY2?;aG|Ou;0+t&e)wKea)V?lJofd`5h{|RT^ha3_RQCt+r<*?eo~zn@|2aF7Uw@2%jjOLp^V`EpGE0(iwlh0Q`i|Ch{qs z%7gp4Wm-QU41B)V-1ozf`aM#H#^EKE+dc@Umx&{S@cm!Sq>=^z*$UoG0;lB;(sk zOxd21w6DzHj;Yip$J9T|hw=NBIMW4hC8pe#W9W*azaq|evl&M|#pz%3eSg_Awj-wa zzRA2zmBf_sZ6&5`&$JP=ugu?$snjON)B&+ETJ-fB1LO8Dj)I#t`x; zp2~xlJ!3m!itlcwjrR+PDdXEpOxd21w6DzHj;Yip#}vOO9AoNz1>Q!mZs z2zZPka$D9p zOFHSVh`%7<$ftNJ4_@|+?Z{I Date: Wed, 6 Apr 2022 12:13:26 +0200 Subject: [PATCH 14/74] Remove network_filter_network.xsd --- xsd/netex_service/netex_all_filters.xsd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xsd/netex_service/netex_all_filters.xsd b/xsd/netex_service/netex_all_filters.xsd index ef9b9f3ae..4bce943d7 100644 --- a/xsd/netex_service/netex_all_filters.xsd +++ b/xsd/netex_service/netex_all_filters.xsd @@ -1,9 +1,6 @@ - - - @@ -33,7 +30,6 @@ Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device.xsd - http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network.xsd http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction.xsd http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile.xsd http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event.xsd From 11866a13c001909718ec91ef5643c7e8d2d0b304 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 6 Apr 2022 12:14:03 +0200 Subject: [PATCH 15/74] Remove netex_country_version.xsd --- .../netex_country_version.xsd | 378 ------------------ 1 file changed, 378 deletions(-) delete mode 100644 xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd deleted file mode 100644 index 3be005949..000000000 --- a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - - main schema - e-service developers - Europe - First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2010-09-04 - - - 2011-02-05 - - - 2011-12-16 - - -

NeTEx - Network Exchange. Topographic Model subschema.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd - [ISO 639-2/B] ENG - Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX - Unclassified - CEN, Crown Copyright 2009-2014 - - -
    -
  • Derived from the SIRI standards.
    • -
- - Version 0.4 Draft for approval - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx Network Exchange - TOPOGRAPHIC types. - Standard - - - TOPOGRAPHIC types for IFOPT Fixed Objects in Public Transport. - - - - - - - - - - Type for containment in frame of TOPOGRAPHIC PLACEs. - - - - - - - - - - - - Collection of TOPOGRAPHIC PLACEs. - - - - - - - - - - - - - Type for containment in frame of GROUP OF PLACEs. - - - - - - - - - - - - - A town, city, village, suburb, quarter or other name settlement within a country. Provides a Gazetteer of Transport related place names. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifier of TOPOGRAPHIC PLACE. - - - - - - - - - Type for a TOPOGRAPHIC PLACE. - - - - - - - - - - - - - Elements of a TOPOGRAPHIC PLACE DESCRIPTOR. - - - - - ISO 3166-2 code for subdivision of a country if relevant. E.g. GB-CAM. - - - - - Structured text descriptor of TOPOGRAPHIC PLACE. - - - - - Collection of aliases for the TOPOGRAPHIC PLACE. - - - - - - - - - - Classification of the TOPOGRAPHIC PLACE as a settlement. Enumerated value. - - - - - Whether the TOPOGRAPHIC PLACE is considered to be at the centre of a town. Default is false. - - - - - Post code or partial post code associated with area. - - - - - - - Elements describing the relation of a TOPOGRAPHIC PLACE to other places. - - - - - - For TOPOGRAPHIC PLACEs thats span borders, references to additional COUNTRY or COUNTRIEs that place lies in. - - - - - Parent TOPOGRAPHIC PLACE. Reference to another TOPOGRAPHIC PLACE that contains the child TOPOGRAPHIC PLACE completely. Must not be cyclic. - - - - - TOPOGRAPHIC PLACEs which are adjacent to the TOPOGRAPHIC PLACE. or which partially overlay. - N.B. this should not be used for spatial containment. Instead the Parent Site should be used the TOPOGRAPHIC PLACE which completely contain the TOPOGRAPHIC PLACE, and on child TOPOGRAPHIC PLACEs for localities completely contained in the TOPOGRAPHIC PLACE. - - - - - TOPOGRAPHIC PLACEs other than then parent in which the place can be regarded as contained. a. - - - - - Access Links to other PLACEs. - - - - - - - - Type for containment of TOPOGRAPHIC PLACE DESCRIPTORs. - - - - - - - - - - - - Type for a TOPOGRAPHIC PLACE DESCRIPTOR. - - - - - - - Name of the TOPOGRAPHIC PLACE. - - - - - Short name for TOPOGRAPHIC PLACE to be used when qualifying children. - - - - - Qualifier to use when presenting name to distinguish it from other similarly named elements. - - - - - - Qualifying name. Place name characters only allowed. - - - - - - - - - - - - - - A grouping of PLACEs which will be commonly referenced for a specific purpose. - - - - - - - - - - - - - - - - - - - - - Identifier of GROUP OF PLACES. - - - - - - - - - Type for GROUP OF PLACES. - - - - - - - - - - - - Elements for GROUP OF PLACES. - - - - - PLACEs in GROUP OF PLACEs. - - - - - - Primary PLACE in GROUP OF PLACEs, if relevant. - - - - - - - - Simplified view of TOPOGRAPHIC PLACE. Data is derived through the relationship. - - - - - - - - - - Type for a TOPOGRAPHIC PLACE VIEW. - - - - - - - - Name of the TOPOGRAPHIC PLACE. - - - - - Short name for TOPOGRAPHIC PLACE to be used when qualifying children. - - - - - Qualifying name. Place name characters only allowed. - - - - - - - - - From eea2430fbbac0238b2d41cc4a8a4cfdf1e00bbc4 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 12 Apr 2022 17:14:37 +0200 Subject: [PATCH 16/74] EPIAP quay boarding positions enhancement (#298) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update netex_ifopt_stopPlace_version.xsd EPIAP Quay and Boarding Position Enhancement * Change from Stefan Jugelt on documentation for EdgeToTrackCenterDistance I would suggest to refer to the parameter 4.2.9.3. Platform offset of the Infrastrcuture TSI: Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013. Co-authored-by: Matthias Günter --- .../netex_ifopt_stopPlace_version.xsd | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 c6699e8c1..d1a0ed56d 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 @@ -516,6 +516,7 @@ contained within its parent QUAY. + if QUAY is a subzone of another QUAY, identifies parent. @@ -655,6 +656,24 @@ contained within its parent QUAY. + + + Additional details for accessibility of QUAYs and BOARDING POSITIONs + + + + + Height of the platform relative to the ground (bus) or the rail track. + + + + + Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013. + + + + + Type for a list of ACCESS SPACEs. @@ -856,6 +875,7 @@ contained within its parent QUAY. Entrances to BOARDING POSITION. + From 38a73950d11a58acd6f8e32010535f03d60b376c Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 12 Apr 2022 17:14:37 +0200 Subject: [PATCH 17/74] EPIAP quay boarding positions enhancement (#298) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update netex_ifopt_stopPlace_version.xsd EPIAP Quay and Boarding Position Enhancement * Change from Stefan Jugelt on documentation for EdgeToTrackCenterDistance I would suggest to refer to the parameter 4.2.9.3. Platform offset of the Infrastrcuture TSI: Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013. Co-authored-by: Matthias Günter --- .../netex_ifopt_stopPlace_version.xsd | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 c6699e8c1..d1a0ed56d 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 @@ -516,6 +516,7 @@ contained within its parent QUAY. + if QUAY is a subzone of another QUAY, identifies parent. @@ -655,6 +656,24 @@ contained within its parent QUAY. + + + Additional details for accessibility of QUAYs and BOARDING POSITIONs + + + + + Height of the platform relative to the ground (bus) or the rail track. + + + + + Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013. + + + + + Type for a list of ACCESS SPACEs. @@ -856,6 +875,7 @@ contained within its parent QUAY. Entrances to BOARDING POSITION. + From a2fc3c56068c25c771d252162eb70138ef53302e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 17:26:10 +0200 Subject: [PATCH 18/74] Adding handrail to BorderTypeEnumeration (#303) This allows for this accessibility feature to be used in SitePathLink --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 5cf28d26c..3f9d44914 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -313,6 +313,7 @@ Rail transport, Roads and Road transport + From 1fd9c564cdbc41880532f51127ca0c063cfe116e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 13 Apr 2022 17:28:04 +0200 Subject: [PATCH 19/74] EPIAP: Add raised kerb mobility facility enumeration (#301) * raisedCurb in MobilityFacilityEnumeration * Curb to Kerb Kerb is used in the rest of NeTEx --- .../netex_reusableComponents/netex_facility_support.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 79b283f96..72a2300b5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -138,6 +138,7 @@ Rail transport, Roads and Road transport + From f22c74623d17f06b11c5ce6a560964f72dd2b745 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 13 Apr 2022 17:28:04 +0200 Subject: [PATCH 20/74] EPIAP: Add raised kerb mobility facility enumeration (#301) * raisedCurb in MobilityFacilityEnumeration * Curb to Kerb Kerb is used in the rest of NeTEx --- .../netex_reusableComponents/netex_facility_support.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 60aaab295..87c40cc8f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -134,6 +134,7 @@ Rail transport, Roads and Road transport + From 7f4d24385081ac52d1b659faf9d9a778882182c6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 13 Apr 2022 20:46:10 +0200 Subject: [PATCH 21/74] Add Length and Width on StopPlaceSpaceGroup (#315) Replaces #302 --- .../part1_ifopt/netex_ifopt_stopPlace_version.xsd | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 d1a0ed56d..599cd7e8b 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 @@ -403,6 +403,16 @@ Rail transport, Roads and Road transport ENTRANCEs to SPACE. + + + Length of SPACE in metres. + + + + + Width of SPACE in metres. + + From 6c809c74eacf3d124d99b6083900df0641a49ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 20:46:52 +0200 Subject: [PATCH 22/74] Improve passenger information equipment (#314) * Adding handrail to BorderTypeEnumeration This allows for this accessibility feature to be used in SitePathLink * Update netex_passengerInformationEquipment_version.xsd * comments gone * Handrail is in a different PR REmoved here * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd Co-authored-by: Stefan de Konink Co-authored-by: Stefan de Konink --- .../netex_ifopt_equipmentTicketing_version.xsd | 2 +- .../netex_passengerInformationEquipment_version.xsd | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd index 42ee232c3..cd92a7acb 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd @@ -1,8 +1,8 @@ - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index 575977266..633224636 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -1,9 +1,9 @@ - + @@ -24,7 +24,6 @@ 2011-02-05 - 2019-04-15Add missing element from TypeofPassengerInformationEquipment @@ -244,9 +243,14 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. + + + Detailed information about accessibility uses. Borrowed from TicketOffice. + + - List of predefined Passenger Info EQUIPMENT f. + List of predefined Passenger Info EQUIPMENT. From c4c289af89d6eb512fcd65e7da8ca9e878698f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 20:52:14 +0200 Subject: [PATCH 23/74] Update netex_ifopt_stopPlace_support.xsd (#276) * Update netex_ifopt_stopPlace_support.xsd Extension of QuayTypeEnumeration for the hierarchy needed in rail * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd * completed with discussion from the PullRequest Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_stopPlace_support.xsd | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index f35f07232..40bc56b06 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -382,12 +382,17 @@ Rail transport, Roads and Road transport - Allowed values for QUAY Component Types. + Allowed values for QUAY Component Types. Special is the structure for rail, which allows a hierarchy. + railIslandPlatform is the full platform positioned between two tracks, railPlatform is a side platform facing the track and railPlatformSector is a sector of such a railPlatform. A similar hierarchy is defined for a metro station layout. - + + + + + @@ -400,6 +405,7 @@ Rail transport, Roads and Road transport + From 02811b86838cdd781cd1601bbe95c74e1403a12e Mon Sep 17 00:00:00 2001 From: Henno Willering Date: Wed, 13 Apr 2022 20:53:44 +0200 Subject: [PATCH 24/74] Allow multiple gml:Polygons associated to a Zone (#255) * Allow multiple Polygons to describe a Zone * use MultiSurface instead of multiple Polygons --- xsd/gml/geometryAggregates-extract-v3_2_1.xsd | 57 +++++++++++++++++++ xsd/gml/geometryPrimitives-extract-v3_2_1.xsd | 19 +++++++ xsd/gml/gml_extract_all_objects_v_3_2_1.xsd | 4 +- .../netex_zone_version.xsd | 8 ++- 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 xsd/gml/geometryAggregates-extract-v3_2_1.xsd create mode 100644 xsd/gml/geometryPrimitives-extract-v3_2_1.xsd diff --git a/xsd/gml/geometryAggregates-extract-v3_2_1.xsd b/xsd/gml/geometryAggregates-extract-v3_2_1.xsd new file mode 100644 index 000000000..742dbe8e4 --- /dev/null +++ b/xsd/gml/geometryAggregates-extract-v3_2_1.xsd @@ -0,0 +1,57 @@ + + + + geometryAggregates.xsd + See ISO/DIS 19136 12.3. +Geometric aggregates (i.e. instances of a subtype of gml:AbstractGeometricAggregateType) are arbitrary aggregations of geometry elements. They are not assumed to have any additional internal structure and are used to "collect" pieces of geometry of a specified type. Application schemas may use aggregates for features that use multiple geometric objects in their representations. + +GML is an OGC Standard. +Copyright (c) 2007,2010 Open Geospatial Consortium. +To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . + + + + + + + + + + + + + gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates. + + + + + + + + + + + + + + + A gml:MultiSurface is defined by one or more gml:AbstractSurfaces. +The members of the geometric aggregate may be specified either using the "standard" property (gml:surfaceMember) or the array property (gml:surfaceMembers). It is also valid to use both the "standard" and the array properties in the same collection. + + + + + This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array. + + + + + A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none. + + + + + + + + \ No newline at end of file diff --git a/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd b/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd new file mode 100644 index 000000000..8eb043d6f --- /dev/null +++ b/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd @@ -0,0 +1,19 @@ + + + + geometryPrimitives.xsd + See ISO/DIS 19136 Clause 11. +Beside the "simple" geometric primitives specified in the previous Clause, this Clause specifies additional primitives to describe real world situations which require a more expressive geometry model. + +GML is an OGC Standard. +Copyright (c) 2007,2010 Open Geospatial Consortium. +To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . + + + + + + This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface. + + + diff --git a/xsd/gml/gml_extract_all_objects_v_3_2_1.xsd b/xsd/gml/gml_extract_all_objects_v_3_2_1.xsd index 4f8fa0681..347b60789 100644 --- a/xsd/gml/gml_extract_all_objects_v_3_2_1.xsd +++ b/xsd/gml/gml_extract_all_objects_v_3_2_1.xsd @@ -4,9 +4,11 @@ - + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index f13368b1b..6622ff5cb 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -126,7 +126,13 @@ Rail transport, Roads and Road transport Centre Coordinates of ZONE. - + + + Use gml:MultiSurface if the Zone contains multiple non-continuous areas, e.g. a coastline with islands. + + + + Projections of ZONE onto another layer. From ae6d2e566bdf9757d912f7b1064c9dcb58c2fa2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 21:07:10 +0200 Subject: [PATCH 25/74] Update netex_servicePattern_support.xsd (#214) * Update copyright to 2021 (#206) * Update copyright to 2021 * Declutter whitespace * Fix * Update netex_servicePattern_support.xsd Adding a possibility that the driver should be informed * more neutral formulation of informStaffOnboard * typo correction Co-authored-by: Stefan de Konink --- .../part1_tacticalPlanning/netex_servicePattern_support.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index b35d08564..78d34c54f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -433,6 +433,11 @@ Rail transport, Roads and Road transport Use Sms to request stop + + + Inform staff onboard about the request stop. Mainly used for on demand traffic, where the route depends on where passengers want to leave the vehicle. + + Use other method to request stop From 5682f3a364241d60e7540098acd256572b48db27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 21:10:48 +0200 Subject: [PATCH 26/74] Extension of AccessibilityLimitation for EPIAP (#265) * Extension of AccessibilityLimitation for EPIAP * Other problems from Adrian's CR on AccessibibilityLimitation --- .../netex_acsb_limitations.xsd | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index bc4a74451..c742c8d58 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -17,7 +17,8 @@ 2011-11-05 - 2012-05-29 Add partial value for limitationStatus + + 2012-05-29 Add partial value for limitationStatus

NeTEx - Network Exchange. This subschema defines common accessibility limitation types.

@@ -66,6 +67,8 @@ Rail transport, Roads and Road transport + + @@ -110,6 +113,16 @@ Rail transport, Roads and Road transport Whether a PLACE has visual signals for the hearing impaired. + + + Whether a PLACE has tactile guidance. + + + + + Whether a PLACE allows guide dog access. + + @@ -133,14 +146,31 @@ Rail transport, Roads and Road transport Whether a PLACE has lift free access. - + - Whether a PLACE is wheelchair accessible. + Whether a PLACE has ramp free access. Ramp free isn't necessary absolute. If a ramp is not steep, then a PLACE + can still be considered ramp free. + + + + + Whether the platform is high enough and gap is small enough for level access into vehicle +Station/Platform has WheelChairAccess AND at platform(s) used by level floor access vehicles in the timetable at least at a designated wheelchair door (position) the gap between platform and vehicle floor (including sliding step) does not exceed 75 mm measured horizontally and 50 mm measured vertically (TSI PRN). If Platform.LevelAcccesIntoVehicle is ‘true’ AND Vehicle.StepFreeAccess is ‘true’ vehicle entrance for a wheelchairuser is possible independently. + + + + + Whether a PLACE has audible signals for the visually impaired. - Whether a PLACE has Visual signals available for the free access. + Whether a PLACE has visual signals available for the free access. + + + + + Whether the Place has tactile guidance. From 4c4a9b9450bf2649fabd723a6c3749cf7d9ecfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 21:14:52 +0200 Subject: [PATCH 27/74] Update netex_facility_support.xsd (#278) --- .../netex_reusableComponents/netex_facility_support.xsd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 87c40cc8f..65e31870e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -289,14 +289,19 @@ Rail transport, Roads and Road transport - Assistance is available if booked. + Assistance is available if booked. - Assistance is available at certain times. + Assistance is available at certain times. + + + Assistance is dependent on the journey. + + Not known if assistance is available. From 3959510d6571f5726af64411944e381e9d1b18b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 13 Apr 2022 21:20:37 +0200 Subject: [PATCH 28/74] Updating additional relevant user categories (#280) women and families are possibly also relevant additional ParkingUserTypes Co-authored-by: Stefan de Konink --- xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd index 10930e195..f4b442e88 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd @@ -535,6 +535,8 @@ Rail transport, Roads and Road transport + + From 2b7c605c5d1e451c2f49919b3ad2e9e2d47dd8ad Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 13 Apr 2022 21:49:07 +0200 Subject: [PATCH 29/74] Need to specify more than one ActivationMeans (#319) Co-authored-by: Kristian Syversen --- .../netex_usageParameterTravel_support.xsd | 13 +++++++++++-- .../netex_usageParameterTravel_version.xsd | 7 +++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd index 6d9006b76..03cb5f1fd 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd @@ -54,7 +54,10 @@ 2019-04-02Doc tidy Add new vale _cap_ to UsageValidityType - 2020-10-16New Modes: Add accessCode value to ActivationMeans enumeration + 2020-10-16New Modes: Add accessCode value to ActivationMeans enumeration + + + 2020-12-10FIX - Add ActivationMeansListOfEnumerations

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -369,9 +372,15 @@ Rail transport, Roads and Road transport + + + List of values for ACTIVATION MEANS. + + + - Allowed values for Activation Means + Allowed values for ACTIVATION MEANS. diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd index cbebce913..1e20f3c3f 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -41,6 +41,9 @@ 2020-10-05 New Modes: Allow all modes for interchanging + + 2020-12-10FIX - Make ActivationMeans into list +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the Travel USAGE PARAMETER types.

@@ -436,9 +439,9 @@ Rail transport, Roads and Road transport Duration of USAGE VALIDITY PERIOD. - + - Means of activatiing start of period. + Means of activating start of period. From 2d0d3bcbff869dfc16905126acebac957aad1896 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Thu, 14 Apr 2022 00:29:57 +0200 Subject: [PATCH 30/74] Add support for NAND, NOR, XNOR as a LogicalOperation. Also renamed BooleanOperatorEnumeration to LogicalOperationEnumeration to better reflect actual use (#126) From d9557a33732af05ca074d1f214af1961c39ddc58 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Apr 2022 10:12:29 +0200 Subject: [PATCH 31/74] TransportMode (Duty) as AllModesEnumeration Fix #44 --- xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd index e74d4639f..0b624b0ae 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd @@ -510,7 +510,7 @@ Rail transport, Roads and Road transport How long the DRIVER TRIP takes. - + Mode of Transport. From 830313e9ce589967f07c814f999e5665ee72a199 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Apr 2022 01:19:42 +0200 Subject: [PATCH 32/74] Resolve comments. Fix #151 --- .../part3_fares/netex_distanceMatrixElement_version.xsd | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd index b53134cd7..2019eb36e 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd @@ -231,11 +231,9 @@ Rail transport, Roads and Road transport - - - Dummy SERVICE JOURNEY Supertype. + Dummy SERVICE JOURNEY supertype. @@ -538,7 +536,6 @@ Rail transport, Roads and Road transport - From 08d67c98a6da2bdbbd7b73549a6dac9151b6d562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Apr 2022 12:28:48 +0200 Subject: [PATCH 33/74] Added Chur example from Wilfried (#329) * Added Chur example from Wilfried * Adding EPIAP examples to travis --- .travis.yml | 2 +- .../epiap/Chur_Equipment_Pathlink_Readme.txt | 4 + .../epiap/Chur_Equipment_Pathlink_V1.0.gpx | 1 + .../epiap/Chur_Equipment_Pathlink_V1.0.xml | 10732 ++++++++++++++++ 4 files changed, 10738 insertions(+), 1 deletion(-) create mode 100644 examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt create mode 100644 examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx create mode 100644 examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml diff --git a/.travis.yml b/.travis.yml index fb57720ba..deb0846ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ before_script: - sudo apt-get install -qq libxml2-utils script: - - "xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*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" + - "xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*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/epiap/*.xml" diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt b/examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt new file mode 100644 index 000000000..df9e16002 --- /dev/null +++ b/examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt @@ -0,0 +1,4 @@ +File Chur_Equipment_Pathlink_V1.0.gpx shows access equipments and site pathlinks of Chur station (UIC stop 8509000) +The file has been generated from the DIVA scheduling system. Timetable Frame and Calendar Frame have been removed to keep the file smaller. +The pathlink coordinates have been determined by automatic routing on OSM GIS data; some of them are not perfect yet. +The additional file Chur_Equipment_Pathlink_V1.0.gpx contains the pathlinks as gpx so they can be viewed with appropriate tools, e.g. https://www.gpsvisualizer.com/ diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx new file mode 100644 index 000000000..171c4054b --- /dev/null +++ b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx @@ -0,0 +1 @@ +ch:1:SitePathLink:8509000_70_8509000_7_Esc_99-1ch:1:SitePathLink:8509000_70_8509000_7_Esc_99-3ch:1:SitePathLink:8509000_70_8509000_84_Elev_118-1ch:1:SitePathLink:8509000_70_8509000_84_Elev_118-3ch:1:SitePathLink:8509000_70_8509000_84_Elev_127-1ch:1:SitePathLink:8509000_70_8509000_84_Elev_127-3ch:1:SitePathLink:8509000_84_8509000_70_Elev_118-1ch:1:SitePathLink:8509000_84_8509000_70_Elev_118-3ch:1:SitePathLink:8509000_84_8509000_70_Elev_127-1ch:1:SitePathLink:8509000_84_8509000_70_Elev_127-3ch:1:SitePathLink:8509000_1_8509000_70_Stair_85-1ch:1:SitePathLink:8509000_1_8509000_70_Stair_85-3ch:1:SitePathLink:8509000_70_8509000_1_Stair_85-1ch:1:SitePathLink:8509000_70_8509000_1_Stair_85-3ch:1:SitePathLink:8509000_2_8509000_70_Stair_91-1ch:1:SitePathLink:8509000_2_8509000_70_Stair_91-3ch:1:SitePathLink:8509000_70_8509000_2_Stair_91-1ch:1:SitePathLink:8509000_70_8509000_2_Stair_91-3ch:1:SitePathLink:8509000_3_8509000_70_Stair_94-1ch:1:SitePathLink:8509000_3_8509000_70_Stair_94-3ch:1:SitePathLink:8509000_70_8509000_3_Stair_94-1ch:1:SitePathLink:8509000_70_8509000_3_Stair_94-3ch:1:SitePathLink:8509000_4_8509000_70_Stair_95-1ch:1:SitePathLink:8509000_4_8509000_70_Stair_95-3ch:1:SitePathLink:8509000_70_8509000_4_Stair_95-1ch:1:SitePathLink:8509000_70_8509000_4_Stair_95-3ch:1:SitePathLink:8509000_5_8509000_70_Stair_96-1ch:1:SitePathLink:8509000_5_8509000_70_Stair_96-3ch:1:SitePathLink:8509000_70_8509000_5_Stair_96-1ch:1:SitePathLink:8509000_70_8509000_5_Stair_96-3ch:1:SitePathLink:8509000_70_8509000_82_Stair_97-1ch:1:SitePathLink:8509000_70_8509000_82_Stair_97-3ch:1:SitePathLink:8509000_82_8509000_70_Stair_97-1ch:1:SitePathLink:8509000_82_8509000_70_Stair_97-3ch:1:SitePathLink:8509000_70_8509000_82_Esc_122-1ch:1:SitePathLink:8509000_70_8509000_82_Esc_122-3ch:1:SitePathLink:8509000_70_8509000_82_Esc_98-1ch:1:SitePathLink:8509000_70_8509000_82_Esc_98-3ch:1:SitePathLink:8509000_82_8509000_70_Esc_122-1ch:1:SitePathLink:8509000_82_8509000_70_Esc_122-3ch:1:SitePathLink:8509000_82_8509000_70_Esc_98-1ch:1:SitePathLink:8509000_82_8509000_70_Esc_98-3ch:1:SitePathLink:8509000_70_8509000_6_Ramp_106-1ch:1:SitePathLink:8509000_70_8509000_6_Ramp_106-3ch:1:SitePathLink:8509000_6_8509000_70_Ramp_106-1ch:1:SitePathLink:8509000_6_8509000_70_Ramp_106-3ch:1:SitePathLink:8509000_70_8509000_6_Stair_107-1ch:1:SitePathLink:8509000_70_8509000_6_Stair_107-3ch:1:SitePathLink:8509000_6_8509000_70_Stair_107-1ch:1:SitePathLink:8509000_6_8509000_70_Stair_107-3ch:1:SitePathLink:8509000_70_8509000_1_Ramp_108-1ch:1:SitePathLink:8509000_70_8509000_1_Ramp_108-3ch:1:SitePathLink:8509000_1_8509000_70_Ramp_108-1ch:1:SitePathLink:8509000_1_8509000_70_Ramp_108-3ch:1:SitePathLink:8509000_70_8509000_2_Ramp_109-1ch:1:SitePathLink:8509000_70_8509000_2_Ramp_109-3ch:1:SitePathLink:8509000_2_8509000_70_Ramp_109-1ch:1:SitePathLink:8509000_2_8509000_70_Ramp_109-3ch:1:SitePathLink:8509000_70_8509000_3_Ramp_110-1ch:1:SitePathLink:8509000_70_8509000_3_Ramp_110-3ch:1:SitePathLink:8509000_3_8509000_70_Ramp_110-1ch:1:SitePathLink:8509000_3_8509000_70_Ramp_110-3ch:1:SitePathLink:8509000_70_8509000_4_Ramp_111-1ch:1:SitePathLink:8509000_70_8509000_4_Ramp_111-3ch:1:SitePathLink:8509000_4_8509000_70_Ramp_111-1ch:1:SitePathLink:8509000_4_8509000_70_Ramp_111-3ch:1:SitePathLink:8509000_70_8509000_5_Ramp_112-1ch:1:SitePathLink:8509000_70_8509000_5_Ramp_112-3ch:1:SitePathLink:8509000_5_8509000_70_Ramp_112-1ch:1:SitePathLink:8509000_5_8509000_70_Ramp_112-3ch:1:SitePathLink:8509000_70_8509000_80_Elev_119-1ch:1:SitePathLink:8509000_70_8509000_80_Elev_119-3ch:1:SitePathLink:8509000_80_8509000_70_Elev_119-1ch:1:SitePathLink:8509000_80_8509000_70_Elev_119-3ch:1:SitePathLink:8509000_70_8509000_80_Ramp_120-1ch:1:SitePathLink:8509000_70_8509000_80_Ramp_120-2ch:1:SitePathLink:8509000_70_8509000_80_Ramp_120-3ch:1:SitePathLink:8509000_80_8509000_70_Ramp_120-1ch:1:SitePathLink:8509000_80_8509000_70_Ramp_120-2ch:1:SitePathLink:8509000_80_8509000_70_Ramp_120-3ch:1:SitePathLink:8509000_70_8509000_80_Stair_121-1ch:1:SitePathLink:8509000_70_8509000_80_Stair_121-3ch:1:SitePathLink:8509000_80_8509000_70_Stair_121-1ch:1:SitePathLink:8509000_80_8509000_70_Stair_121-3ch:1:SitePathLink:8509000_1_8509000_70_Elev_105-1ch:1:SitePathLink:8509000_1_8509000_70_Elev_105-3ch:1:SitePathLink:8509000_70_8509000_1_Elev_105-1ch:1:SitePathLink:8509000_70_8509000_1_Elev_105-3ch:1:SitePathLink:8575112_1_8509000_1_Stair_187-1ch:1:SitePathLink:8575112_1_8509000_1_Stair_187-3ch:1:SitePathLink:8575112_1_8509000_1_Elev_188-1ch:1:SitePathLink:8575112_1_8509000_1_Elev_188-3ch:1:SitePathLink:8575112_1_8509000_2_Esc_189-1ch:1:SitePathLink:8575112_1_8509000_2_Esc_189-3ch:1:SitePathLink:8575112_1_8509000_2_Esc_190-1ch:1:SitePathLink:8575112_1_8509000_2_Esc_190-3ch:1:SitePathLink:8575112_1_8509000_2_Elev_191-1ch:1:SitePathLink:8575112_1_8509000_2_Elev_191-3ch:1:SitePathLink:8575112_1_8509000_3_Esc_192-1ch:1:SitePathLink:8575112_1_8509000_3_Esc_192-3ch:1:SitePathLink:8575112_1_8509000_3_Esc_193-1ch:1:SitePathLink:8575112_1_8509000_3_Esc_193-3ch:1:SitePathLink:8575112_1_8509000_3_Elev_194-1ch:1:SitePathLink:8575112_1_8509000_3_Elev_194-3ch:1:SitePathLink:8575112_1_8509000_4_Esc_195-1ch:1:SitePathLink:8575112_1_8509000_4_Esc_195-3ch:1:SitePathLink:8575112_1_8509000_4_Esc_196-1ch:1:SitePathLink:8575112_1_8509000_4_Esc_196-3ch:1:SitePathLink:8575112_1_8509000_4_Elev_197-1ch:1:SitePathLink:8575112_1_8509000_4_Elev_197-3ch:1:SitePathLink:8575112_1_8509000_5_Elev_198-1ch:1:SitePathLink:8575112_1_8509000_5_Elev_198-3ch:1:SitePathLink:8575112_1_8509000_5_Stair_199-1ch:1:SitePathLink:8575112_1_8509000_5_Stair_199-3ch:1:SitePathLink:8509000_1_8575112_1_Stair_187-1ch:1:SitePathLink:8509000_1_8575112_1_Stair_187-3ch:1:SitePathLink:8509000_1_8575112_1_Elev_188-1ch:1:SitePathLink:8509000_1_8575112_1_Elev_188-3ch:1:SitePathLink:8509000_2_8575112_1_Esc_189-1ch:1:SitePathLink:8509000_2_8575112_1_Esc_189-3ch:1:SitePathLink:8509000_2_8575112_1_Esc_190-1ch:1:SitePathLink:8509000_2_8575112_1_Esc_190-3ch:1:SitePathLink:8509000_2_8575112_1_Elev_191-1ch:1:SitePathLink:8509000_2_8575112_1_Elev_191-3ch:1:SitePathLink:8509000_3_8575112_1_Esc_192-1ch:1:SitePathLink:8509000_3_8575112_1_Esc_192-3ch:1:SitePathLink:8509000_3_8575112_1_Esc_193-1ch:1:SitePathLink:8509000_3_8575112_1_Esc_193-3ch:1:SitePathLink:8509000_3_8575112_1_Elev_194-1ch:1:SitePathLink:8509000_3_8575112_1_Elev_194-3ch:1:SitePathLink:8509000_4_8575112_1_Esc_195-1ch:1:SitePathLink:8509000_4_8575112_1_Esc_195-3ch:1:SitePathLink:8509000_4_8575112_1_Esc_196-1ch:1:SitePathLink:8509000_4_8575112_1_Esc_196-3ch:1:SitePathLink:8509000_4_8575112_1_Elev_197-1ch:1:SitePathLink:8509000_4_8575112_1_Elev_197-3ch:1:SitePathLink:8509000_5_8575112_1_Elev_198-1ch:1:SitePathLink:8509000_5_8575112_1_Elev_198-3ch:1:SitePathLink:8509000_5_8575112_1_Stair_199-1ch:1:SitePathLink:8509000_5_8575112_1_Stair_199-3ch:1:SitePathLink:8509681_1_8509681_3_Stair_172-1ch:1:SitePathLink:8509681_1_8509681_3_Stair_172-3ch:1:SitePathLink:8509681_3_8509681_1_Stair_172-1ch:1:SitePathLink:8509681_3_8509681_1_Stair_172-3ch:1:SitePathLink:8509681_1_8509681_3_Esc_155-1ch:1:SitePathLink:8509681_1_8509681_3_Esc_155-3ch:1:SitePathLink:8509681_3_8509681_1_Esc_155-1ch:1:SitePathLink:8509681_3_8509681_1_Esc_155-3ch:1:SitePathLink:8509681_1_8509681_3_Elev_173-1ch:1:SitePathLink:8509681_1_8509681_3_Elev_173-3ch:1:SitePathLink:8509681_3_8509681_1_Elev_173-1ch:1:SitePathLink:8509681_3_8509681_1_Elev_173-3ch:1:SitePathLink:8575112_2_8575112_1_Stair_113-1ch:1:SitePathLink:8575112_2_8575112_1_Stair_113-2ch:1:SitePathLink:8575112_1_8575112_2_Stair_113-2ch:1:SitePathLink:8575112_1_8575112_2_Stair_113-3 \ No newline at end of file diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml new file mode 100644 index 000000000..4be5a2431 --- /dev/null +++ b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml @@ -0,0 +1,10732 @@ + + + + 2022-04-13T18:38:52.6831392+02:00 + MENTZ + NeTEx Export, Version: 19.16.0.0 + + + + 2021-01-01T00:00:00 + 2021-12-11T23:59:59 + + + + ch + www.sbb.ch + SBB Schweiz OpenData + + + + + + + 1 + 2 + de + + + + + + + SBB + + + + + Bus und Service AG + BuS + + + EntityLegalOwnership + + + + Operation + + + + + + PostAuto AG + PAG + + + EntityLegalOwnership + + + + Operation + + + + + + Rhätische Bahn + RhB + + + EntityLegalOwnership + + + + Operation + + + + + + + + + + EFA_AUF + EFA_AUF + + + EFA_TRE + EFA_TRE + + + EFA_ROL + EFA_ROL + + + EFA_RAM + EFA_RAM + + + + + ProductCategories + + + Bus + B + + + RegioExpress + RE + + + + + + + Region + 11 + + + Angebot + 10 + + + Allgemeiner Hinweis + 1 + + + + + + + regular stop + + + DRT collection point + + + + + + + Bedarfslinie + L + + + Anrufsammelverkehr + A + + + Richtungsband, örtlich disponierter Bus + Ö + + + Zeitbezogener Flächenverkehr + Z + + + Freier Flächenverkehr + F + + + + + + + 766 + Bus und Service AG + BuS + + + 801 + PostAuto AG + PAG + + + 72 + Rhätische Bahn + RhB + + + + + Strasse + 92 + 92 + + + PostAuto Schweiz + 96 + 96 + + + Schiene + 91 + 91 + + + + + PAG Maxibus LowEntry + PAG Maxibus LE + true + false + false + 2400 + + + PAG Maxibus Hochboard + PAG Maxibus Hochboard + true + false + false + 2300 + + + + + + + + + GlobalId + 89ccd3e6-9dae-4e33-adba-f800ae3e2383 + + + BfS-NrGKZ + 11790 + + + + Silvaplana + + town + CH + + + + + GlobalId + fd4ee8c8-e69f-4fa0-a8dc-b09e540baca1 + + + BfS-NrGKZ + 11722 + + + + Domat/Ems + + town + CH + + + + + GlobalId + 8b930b7b-059b-4d0e-8db1-6512f12bc1b9 + + + BfS-NrGKZ + 11901 + + + + Chur + + town + CH + + + + + GlobalId + 17fbd3fe-66c8-4c0e-bcc7-15047c9108ba + + + BfS-NrGKZ + 11921 + + + + Litzirüti + + town + CH + + + + + GlobalId + 17c08106-0734-4898-8637-71f32f56e86e + + + BfS-NrGKZ + 11731 + + + + Felsberg (CH) + + town + CH + + + + + GlobalId + a657ff01-9456-4e94-b008-90b96ac36475 + + + BfS-NrGKZ + 11733 + + + + Tamins + + town + CH + + + + + GlobalId + eeb7304b-c752-473d-81f5-de44508e314e + + + BfS-NrGKZ + 11723 + + + + Rhäzüns + + town + CH + + + + + GlobalId + 2fd3aa7a-2893-4596-913a-f2411351ec8d + + + BfS-NrGKZ + 11542 + + + + Tiefencastel + + town + CH + + + + + GlobalId + f9a33e78-2cfc-43bc-adc7-ebdecb76e74f + + + BfS-NrGKZ + 11787 + + + + St. Moritz + + town + CH + + + + + GlobalId + 11c407d3-9f0e-46ce-9f01-b0e9d2d3b1fb + + + BfS-NrGKZ + 11543 + + + + Bivio + + town + CH + + + + + GlobalId + ea4b1ee1-0d97-46e3-8662-5ce76314d9e6 + + + BfS-NrGKZ + 11506 + + + + Lenzerheide/Lai + + town + CH + + + + + GlobalId + 7fff40ac-bffa-4c24-9f4c-95c359fb97d5 + + + BfS-NrGKZ + 11513 + + + + Lantsch/Lenz + + town + CH + + + + + GlobalId + f5944b58-46b1-4e31-839f-fce2c27fb0a4 + + + BfS-NrGKZ + 11911 + + + + Churwalden + + town + CH + + + + + GlobalId + f8eaf6d6-695f-4438-a673-b4d59f634855 + + + BfS-NrGKZ + 11543 + + + + Cunter + + town + CH + + + + + GlobalId + 73879a22-578e-4770-bc40-14629d67e19e + + + BfS-NrGKZ + 11911 + + + + Malix + + town + CH + + + + + GlobalId + 87bcfba8-da2c-42a2-9883-bc9c8d1dd5f7 + + + BfS-NrGKZ + 11543 + + + + Mulegns + + town + CH + + + + + GlobalId + 7cf5234c-b552-45ae-a4ca-c32ce1681ab5 + + + BfS-NrGKZ + 11911 + + + + Parpan + + town + CH + + + + + GlobalId + 699a1104-a965-496b-bd8b-a5331565a15b + + + BfS-NrGKZ + 11543 + + + + Savognin + + town + CH + + + + + GlobalId + 9de710cc-43c5-48d4-a7f4-fd1ac9827f5e + + + BfS-NrGKZ + 11543 + + + + Sur (CH) + + town + CH + + + + + GlobalId + 7f9aaf8d-50d4-4541-af72-e6d32e0c62e3 + + + BfS-NrGKZ + 11543 + + + + Tinizong + + town + CH + + + + + GlobalId + d903b09f-125b-43d8-ab18-2b90af665d33 + + + BfS-NrGKZ + 11506 + + + + Valbella + + town + CH + + + + + GlobalId + 92fa4fce-6a03-443d-89b6-136959d3a1c2 + + + BfS-NrGKZ + 11543 + + + + Rona (CH) + + town + CH + + + + + GlobalId + 0ec661d6-f4c9-4bdb-8b3a-72292abc6c41 + + + BfS-NrGKZ + 11721 + + + + Bonaduz + + town + CH + + + + + GlobalId + 31ce9801-c3bf-4564-b1ea-e5409c82714e + + + BfS-NrGKZ + 11542 + + + + Brienz/Brinzauls + + town + CH + + + + + GlobalId + 31b3da69-8127-4266-99ef-35873b28d68a + + + BfS-NrGKZ + 11543 + + + + Marmorera + + town + CH + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8505250 + + + + + 16 + + + 30 + + + Silvaplana, Alp Güglia + 8505250 + + + 9.743729 + 46.472477 + 2200 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8508249 + + + + + 16 + + + 30 + + + Domat/Ems, Bahnhof + 8508249 + + + 9.453511 + 46.833664 + 581 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509000 + + + + + 8 + + + 500 + + + Chur + 8509000 + + + 9.528933 + 46.853087 + 584 + + + + + label + offical + CH + + + alias + offical + Coire + + + alias + offical + Coira + + + alias + offical + Coire + + + alias + offical + Coira + + + + + + Erdgeschoss + G + + + 1. Untergeschoss + B1 + + + 2. Untergeschoss + B2 + + + + + Zugang Gürtel + ZUG + 80 + + + 9.528628 + 46.854451 + 584 + + + + + + + + 9.5289781 + 46.8543278 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + + + + + + + + + Zugang Bahnhofsplatz (Treppe) + ZuBT + 82 + + + 9.530074 + 46.853197 + 584 + + + + + + + + 9.5299663 + 46.8532835 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5299663 + 46.8532589 + + + + + + + + + + Zugang Bahnhofsplatz (Lift) + ZuBL + 84 + + + 9.530263 + 46.853339 + 584 + + + + + + + + 9.5302448 + 46.853394 + + + + + + + + + + 9.53011 + 46.8533756 + + + + + + + + + + + + Aufzug von Zwischengeschoss nach Zugang Gürtel + 119 + + 0.8 + 1 + 800 + 1.8 + + + Aufzug von Bahnsteig 1 nach Zwischengeschoss + 105 + + 2.3 + 2.6 + 2.3 + + + Aufzug von Zugang Bahnhofsplatz nach Zwischengeschoss West + 127 + + 1 + 2.5 + 1 + + + Aufzug von Zugang Bahnhofsplatz nach Zwischengeschoss Ost + 118 + + 1 + 1 + 2.5 + + + Treppe von Zwischengeschoss nach Zugang Gürtel + 121 + + 22 + 0.17 + + + Treppe von Zwischengeschoss nach Gleis 1 + 107 + + 28 + 0.17 + + + Treppe von Bahnsteig 1 nach Zwischengeschoss + 85 + + 28 + 0.17 + + + Treppe von Zwischengeschoss nach Zugang Bahnhofsplatz + 97 + + 30 + 0.17 + + + Treppe von Bahnsteig 5 nach Zwischengeschoss + 96 + + 33 + 0.16 + + + Treppe von Bahnsteig 4 nach Zwischengeschoss + 95 + + 33 + 0.16 + + + Treppe von Bahnsteig 3 nach Zwischengeschoss x + 94 + + 0.22 + 33 + 0.16 + + + Treppe von Bahnsteig 2 nach Zwischengeschoss + 91 + + 33 + 0.16 + + + Rolltreppe von Zwischengeschoss nach Zugang Bahnhofsplatz + 122 + + 1.6 + + + Rolltreppe von Zwischengeschoss nach Zugang & Gleis 2 + 99 + + + + Rolltreppe von Zwischengeschoss nach Zugang Bahnhofsplatz + 98 + + 1.6 + + + Rampe von Zwischengeschoss nach Gleis 1 + 106 + + 2.5 + 40 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Bahnsteig 1 + 108 + + 2.7 + 40 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Bahnsteig 3 + 110 + + 2.7 + 40 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Bahnsteig 4 + 111 + + 2.7 + 40 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Bahnsteig 5 + 112 + + 2.7 + 40 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Zugang Gürtel + 120 + + 5 + 50 + false + false + false + false + false + + + Rampe von Zwischengeschoss nach Bahnsteig 2 + 109 + + 2.7 + 40 + false + false + false + false + false + + + recommendedInterchange + + + + OnlyPT + + Bahnsteig 5 + BS1 + + + 9.529562 + 46.853689 + 584 + + + + + + + + 9.5294812 + 46.8535415 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + OnlyPT + + Bahnsteig 7/8 + BS2 + + + 9.529364 + 46.853818 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + OnlyPT + + Bahnsteig 9/10 + BS3 + + + 9.529239 + 46.853953 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + OnlyPT + + Bahnsteig 11/12 + BS4 + + + 9.529158 + 46.854051 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + OnlyPT + + Bahnsteig 13/14 + BS5 + + + 9.528987 + 46.854156 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + Entrance_and_PT + + Gleis 1 + BA + + + 9.529814 + 46.853419 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + + Entrance_and_PT + + Zugang & Gleis 2 + ZuBA + + + 9.529751 + 46.853505 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + + + Zwischengeschoss + ZW + 70 + + + 9.529311 + 46.853861 + 584 + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5299663 + 46.8532835 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289781 + 46.8543278 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5302448 + 46.853394 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5294812 + 46.8535415 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5299663 + 46.8532589 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + 9.53011 + 46.8533756 + + + + + + + + + + 9.5289332 + 46.8530869 + + + + + + + + + + + + + + + + + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT7M49S + + + + + + + + + + + + oneWay + escalator + + PT18S + + + + + + + 77 + + 9.52896 46.853056 9.529248 46.85321 9.529382 46.853284 9.529508 46.853357 9.529742 46.85348 9.52976 46.853492 + + + + + + + + + + oneWay + footpath + + PT9M52S + + + + 101 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529634 46.853597 9.529706 46.853529 9.529715 46.853499 9.529832 46.8534 9.529885 46.853351 9.530173 46.853406 9.530218 46.853413 9.530236 46.853394 + + + + + + + + + + oneWay + footpath + + PT2M3S + + + + 1 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 5 + + 9.530254 46.853388 9.530263 46.853376 9.530272 46.853345 9.530263 46.853345 + + + + + + + + + + + oneWay + footpath + + PT6S + + + + 89 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529634 46.853597 9.529706 46.853529 9.529715 46.853499 9.529832 46.8534 9.529885 46.853351 9.530101 46.853388 + + + + + + + + + + oneWay + footpath + + PT1M46S + + + + 2 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 20 + + 9.530119 46.853363 9.530092 46.853351 9.530146 46.853308 9.530227 46.853357 9.530263 46.853345 + + + + + + + + + + + oneWay + footpath + + PT23S + + + + 5 + + 9.530263 46.853345 9.530272 46.853345 9.530263 46.853376 9.530254 46.853388 + + + + + + + + + + + oneWay + footpath + + PT6S + + + + 1 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 101 + + 9.530236 46.853394 9.530218 46.853413 9.530173 46.853406 9.529885 46.853351 9.529832 46.8534 9.529715 46.853499 9.529706 46.853529 9.529634 46.853597 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT2M3S + + + + 20 + + 9.530263 46.853345 9.530227 46.853357 9.530146 46.853308 9.530092 46.853351 9.530119 46.853363 + + + + + + + + + + + oneWay + footpath + + PT23S + + + + 2 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 89 + + 9.530101 46.853388 9.529885 46.853351 9.529832 46.8534 9.529715 46.853499 9.529706 46.853529 9.529634 46.853597 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT1M46S + + + + 143 + + 9.529544 46.853701 9.529311 46.853578 9.529355 46.853542 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT42S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT17S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT17S + + + + + + + + + + + + oneWay + stairs + + + + + + 143 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529355 46.853542 9.529311 46.853578 9.529544 46.853701 + + + + + + + + + + oneWay + footpath + + PT42S + + + + 343 + + 9.529347 46.853824 9.529149 46.85372 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT50S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT9S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT9S + + + + + + + + + + + + oneWay + stairs + + + + + + 343 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.529149 46.85372 9.529347 46.853824 + + + + + + + + + + oneWay + footpath + + PT50S + + + + 362 + + 9.529221 46.853959 9.529005 46.853843 9.528682 46.853664 9.528637 46.85364 9.528673 46.853609 9.528709 46.853628 9.529086 46.853824 9.52914 46.853836 9.529203 46.853867 9.529212 46.853898 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT51S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT8S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT8S + + + + + + + + + + + + oneWay + stairs + + + + + + 362 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529212 46.853898 9.529203 46.853867 9.52914 46.853836 9.529086 46.853824 9.528709 46.853628 9.528673 46.853609 9.528637 46.85364 9.528682 46.853664 9.529005 46.853843 9.529221 46.853959 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 377 + + 9.529131 46.85407 9.528897 46.853941 9.528529 46.853738 9.528556 46.853714 9.528592 46.853732 9.52896 46.853941 9.529014 46.853953 9.529077 46.853984 9.529095 46.854008 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT51S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT8S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT8S + + + + + + + + + + + + oneWay + stairs + + + + + + 377 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.529095 46.854008 9.52905 46.854002 9.528996 46.853972 9.52896 46.853941 9.528592 46.853732 9.528556 46.853714 9.528529 46.853738 9.528897 46.853941 9.529131 46.85407 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 389 + + 9.528969 46.854162 9.528772 46.854051 9.528448 46.853873 9.528403 46.853849 9.52843 46.853824 9.528466 46.853849 9.528781 46.854015 9.52887 46.854082 9.528924 46.854113 9.528969 46.854119 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT51S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT8S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT8S + + + + + + + + + + + + oneWay + stairs + + + + + + 389 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528969 46.854119 9.528924 46.854113 9.52887 46.854082 9.528781 46.854015 9.528466 46.853849 9.52843 46.853824 9.528403 46.853849 9.528448 46.853873 9.528772 46.854051 9.528969 46.854156 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT31S + + + + + + + + + + + + oneWay + stairs + + + + + + 116 + + 9.52896 46.853056 9.529248 46.85321 9.529382 46.853284 9.529508 46.853357 9.529526 46.853339 9.529562 46.853308 9.529571 46.853296 9.529589 46.853284 9.529598 46.853271 9.529607 46.853265 9.529634 46.853247 9.529688 46.853191 9.529724 46.853167 9.529751 46.853179 9.529805 46.853136 9.52985 46.853093 9.530083 46.853179 9.530065 46.853191 + + + + + + + + + + + oneWay + footpath + + PT58S + + + + 116 + + 9.530065 46.853191 9.530083 46.853179 9.52985 46.853093 9.529805 46.853136 9.529751 46.853179 9.529724 46.853167 9.529688 46.853191 9.529634 46.853247 9.529607 46.853265 9.529598 46.853271 9.529589 46.853284 9.529571 46.853296 9.529562 46.853308 9.529526 46.853339 9.529508 46.853357 9.529382 46.853284 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + + oneWay + footpath + + PT58S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT31S + + + + 77 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529634 46.853597 9.529706 46.853529 9.529715 46.853499 9.529832 46.8534 9.529885 46.853351 9.529912 46.85332 9.52993 46.85332 + + + + + + + + + + oneWay + footpath + + PT27S + + + + + + + + + + + + oneWay + escalator + + PT40S + + + + + + + 63 + + 9.52993 46.853314 9.529688 46.853191 9.529724 46.853167 9.529751 46.853179 9.529805 46.853136 9.52985 46.853093 9.530083 46.853179 9.530065 46.853191 + + + + + + + + + + + oneWay + footpath + + PT22S + + + + 77 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529634 46.853597 9.529706 46.853529 9.529715 46.853499 9.529832 46.8534 9.529885 46.853351 9.529912 46.85332 9.52993 46.85332 + + + + + + + + + + oneWay + footpath + + PT47S + + + + + + + + + + + + oneWay + escalator + + PT40S + + + + + + + 4 + + 9.53002 46.853222 9.530038 46.853216 9.530056 46.853191 + + + + + + + + + + + oneWay + footpath + + PT2S + + + + 63 + + 9.530065 46.853191 9.530083 46.853179 9.52985 46.853093 9.529805 46.853136 9.529751 46.853179 9.529724 46.853167 9.529688 46.853191 9.52993 46.853314 + + + + + + + + + + + oneWay + footpath + + PT22S + + + + + + + + + + + + oneWay + escalator + + PT40S + + + + + + + 77 + + 9.52993 46.85332 9.529912 46.85332 9.529885 46.853351 9.529832 46.8534 9.529715 46.853499 9.529706 46.853529 9.529634 46.853597 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT27S + + + + 4 + + 9.530065 46.853191 9.530038 46.853216 9.53002 46.853222 + + + + + + + + + + + oneWay + footpath + + PT2S + + + + + + + + + + + + oneWay + escalator + + PT40S + + + + + + + 77 + + 9.52993 46.85332 9.529912 46.85332 9.529885 46.853351 9.529832 46.8534 9.529715 46.853499 9.529706 46.853529 9.529634 46.853597 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT47S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT38S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 83 + + 9.52896 46.853056 9.529248 46.85321 9.529382 46.853284 9.529508 46.853357 9.529526 46.853339 9.529562 46.853308 9.529571 46.853296 9.529805 46.853425 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 83 + + 9.529805 46.853425 9.529571 46.853296 9.529562 46.853308 9.529526 46.853339 9.529508 46.853357 9.529382 46.853284 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT38S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT38S + + + + + + + + + + + + oneWay + stairs + + + + + + 83 + + 9.52896 46.853056 9.529248 46.85321 9.529382 46.853284 9.529508 46.853357 9.529526 46.853339 9.529562 46.853308 9.529571 46.853296 9.529805 46.853425 + + + + + + + + + + oneWay + footpath + + PT51S + + + + 83 + + 9.529805 46.853425 9.529571 46.853296 9.529562 46.853308 9.529526 46.853339 9.529508 46.853357 9.529382 46.853284 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT51S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT38S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT8S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 143 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529355 46.853542 9.529311 46.853578 9.529544 46.853701 + + + + + + + + + + oneWay + footpath + + PT21S + + + + 143 + + 9.529544 46.853701 9.529311 46.853578 9.529355 46.853542 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT21S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT8S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 343 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.529149 46.85372 9.529347 46.853824 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 343 + + 9.529347 46.853824 9.529149 46.85372 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 362 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529212 46.853898 9.529203 46.853867 9.52914 46.853836 9.529086 46.853824 9.528709 46.853628 9.528673 46.853609 9.528637 46.85364 9.528682 46.853664 9.529005 46.853843 9.529221 46.853959 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 362 + + 9.529221 46.853959 9.529005 46.853843 9.528682 46.853664 9.528637 46.85364 9.528673 46.853609 9.528709 46.853628 9.529086 46.853824 9.52914 46.853836 9.529203 46.853867 9.529212 46.853898 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 377 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.529095 46.854008 9.52905 46.854002 9.528996 46.853972 9.52896 46.853941 9.528592 46.853732 9.528556 46.853714 9.528529 46.853738 9.528897 46.853941 9.529131 46.85407 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 377 + + 9.529131 46.85407 9.528897 46.853941 9.528529 46.853738 9.528556 46.853714 9.528592 46.853732 9.52896 46.853941 9.529014 46.853953 9.529077 46.853984 9.529095 46.854008 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 389 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528969 46.854119 9.528924 46.854113 9.52887 46.854082 9.528781 46.854015 9.528466 46.853849 9.52843 46.853824 9.528403 46.853849 9.528448 46.853873 9.528772 46.854051 9.528969 46.854156 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 389 + + 9.528969 46.854162 9.528772 46.854051 9.528448 46.853873 9.528403 46.853849 9.52843 46.853824 9.528466 46.853849 9.528781 46.854015 9.52887 46.854082 9.528924 46.854113 9.528969 46.854119 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + oneWay + footpath + + PT25S + + + + 40 + + + + + + + + + oneWay + ramp + + PT30S + + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT4S + + + + 62 + + 9.529302 46.853849 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528888 46.854223 9.528996 46.854285 + + + + + + + + + + oneWay + footpath + + PT1M14S + + + + 1 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 46 + + 9.528951 46.854316 9.528745 46.8545 9.528664 46.854438 9.528646 46.854494 9.528601 46.854457 + + + + + + + + + + + oneWay + footpath + + PT55S + + + + 46 + + 9.528592 46.854457 9.528646 46.854494 9.528664 46.854438 9.528745 46.8545 9.528951 46.854316 + + + + + + + + + + + oneWay + footpath + + PT55S + + + + 1 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 62 + + 9.528996 46.854285 9.528888 46.854223 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529302 46.853855 + + + + + + + + + + oneWay + footpath + + PT1M14S + + + + 52 + + 9.529302 46.853849 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528888 46.854223 9.528888 46.854223 + + + + + + + + + + oneWay + footpath + + PT39S + + + + 26 + + 9.528888 46.854223 9.528888 46.854223 9.528682 46.854408 + + + + + + + + + + oneWay + ramp + + PT40S + + + + + + + 14 + + 9.528682 46.854408 9.528664 46.854438 9.528646 46.854494 9.528601 46.854457 + + + + + + + + + + + oneWay + footpath + + PT10S + + + + 14 + + 9.528592 46.854457 9.528646 46.854494 9.528664 46.854438 9.528682 46.854408 + + + + + + + + + + + oneWay + footpath + + PT10S + + + + 26 + + 9.528852 46.854248 9.528888 46.854223 9.528888 46.854223 + + + + + + + + + + oneWay + ramp + + PT40S + + + + + + + 52 + + 9.528888 46.854223 9.528888 46.854223 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529302 46.853855 + + + + + + + + + + oneWay + footpath + + PT39S + + + + 61 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.529598 46.853578 9.52967 46.853511 9.529697 46.853505 9.52958 46.853443 + + + + + + + + + + oneWay + footpath + + PT14S + + + + + + + + + + + + oneWay + stairs + + + + + + 328 + + 9.52896 46.853056 9.529248 46.85321 9.529239 46.853216 9.529293 46.853265 9.529355 46.853302 9.52949 46.853376 9.529715 46.853499 9.529706 46.853511 9.529607 46.853456 9.52958 46.853486 9.529481 46.853437 9.529409 46.853492 9.5294 46.853505 9.529023 46.853302 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528888 46.854223 9.528682 46.854408 9.528664 46.854438 9.528646 46.854494 9.528601 46.854457 + + + + + + + + + + + oneWay + footpath + + PT1M15S + + + + 328 + + 9.528592 46.854457 9.528646 46.854494 9.528664 46.854438 9.528682 46.854408 9.528888 46.854223 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.529023 46.853302 9.5294 46.853505 9.529409 46.853492 9.529481 46.853437 9.52958 46.853486 9.529607 46.853456 9.529706 46.853511 9.529715 46.853499 9.52949 46.853376 9.529355 46.853302 9.529293 46.853265 9.529239 46.853216 9.529248 46.85321 9.52896 46.853056 + + + + + + + + + + + oneWay + footpath + + PT1M15S + + + + + + + + + + + + oneWay + stairs + + + + + + 61 + + 9.52958 46.853443 9.529697 46.853505 9.52967 46.853511 9.529598 46.853578 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT14S + + + + 40 + + 9.529544 46.853701 9.529311 46.853578 9.529355 46.853542 9.5294 46.853505 9.529472 46.853542 + + + + + + + + + + oneWay + footpath + + PT59S + + + + 2 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 47 + + 9.52949 46.853535 9.529598 46.853597 9.529544 46.853646 9.529373 46.853793 9.529293 46.853855 + + + + + + + + + + oneWay + footpath + + PT1M10S + + + + 47 + + 9.529293 46.853855 9.529373 46.853793 9.529544 46.853646 9.529598 46.853597 9.52949 46.853535 + + + + + + + + + + oneWay + footpath + + PT1M10S + + + + 2 + + + + + + + + + oneWay + lift + + PT20S + + + + + + + 40 + + 9.529472 46.853542 9.5294 46.853505 9.529355 46.853542 9.529311 46.853578 9.529544 46.853701 + + + + + + + + + + oneWay + footpath + + PT59S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT11S + + + + + + + + + + + + oneWay + stairs + + + + + + 312 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.528942 46.853376 9.529311 46.853578 9.529544 46.853701 + + + + + + + + + + oneWay + footpath + + PT2M48S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT18S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 312 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529544 46.853646 9.529517 46.853634 9.529499 46.853609 9.529445 46.853578 9.529391 46.853566 9.529005 46.853351 9.528978 46.853339 9.528942 46.853376 9.529311 46.853578 9.529544 46.853701 + + + + + + + + + + oneWay + footpath + + PT4M41S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT16S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 168 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.529149 46.85372 9.529347 46.853824 + + + + + + + + + + oneWay + footpath + + PT2M13S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT16S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 168 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.529149 46.85372 9.529347 46.853824 + + + + + + + + + + oneWay + footpath + + PT2M13S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT33S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 168 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.529149 46.85372 9.529347 46.853824 + + + + + + + + + + oneWay + footpath + + PT4M26S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT9S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 306 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529212 46.853898 9.529203 46.853867 9.52914 46.853836 9.529086 46.853824 9.528709 46.853628 9.528673 46.853609 9.528637 46.85364 9.528682 46.853664 9.529005 46.853843 9.529221 46.853959 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT9S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 306 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529212 46.853898 9.529203 46.853867 9.52914 46.853836 9.529086 46.853824 9.528709 46.853628 9.528673 46.853609 9.528637 46.85364 9.528682 46.853664 9.529005 46.853843 9.529221 46.853959 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT19S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 306 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529212 46.853898 9.529203 46.853867 9.52914 46.853836 9.529086 46.853824 9.528709 46.853628 9.528673 46.853609 9.528637 46.85364 9.528682 46.853664 9.529005 46.853843 9.529221 46.853959 + + + + + + + + + + oneWay + footpath + + PT4M40S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT9S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 321 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.529095 46.854008 9.529077 46.853984 9.529014 46.853953 9.52896 46.853941 9.528592 46.853732 9.528556 46.853714 9.528529 46.853738 9.528897 46.853941 9.529131 46.85407 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT9S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 321 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.529095 46.854008 9.529077 46.853984 9.529014 46.853953 9.52896 46.853941 9.528592 46.853732 9.528556 46.853714 9.528529 46.853738 9.528897 46.853941 9.529131 46.85407 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT18S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 321 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.529095 46.854008 9.529077 46.853984 9.529014 46.853953 9.52896 46.853941 9.528592 46.853732 9.528556 46.853714 9.528529 46.853738 9.528897 46.853941 9.529131 46.85407 + + + + + + + + + + oneWay + footpath + + PT4M41S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT17S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 334 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528969 46.854119 9.528924 46.854113 9.52887 46.854082 9.528781 46.854015 9.528466 46.853849 9.52843 46.853824 9.528403 46.853849 9.528448 46.853873 9.528772 46.854051 9.528969 46.854156 + + + + + + + + + + oneWay + footpath + + PT4M42S + + + + 21 + + 9.527945 46.852804 9.527972 46.852823 9.527981 46.852817 9.528017 46.85281 9.528026 46.852798 9.527891 46.852731 9.527873 46.852731 + + + + + + + + + + oneWay + footpath + + PT14S + + + + + + + + + + + + oneWay + stairs + + + + + + 334 + + 9.527613 46.852878 9.527891 46.853038 9.527927 46.853056 9.528322 46.853271 9.528781 46.853517 9.528808 46.853492 9.528843 46.853505 9.52923 46.853714 9.529284 46.853726 9.529338 46.853757 9.529347 46.853781 9.529373 46.853793 9.529239 46.85391 9.529122 46.854021 9.528996 46.854131 9.528969 46.854119 9.528924 46.854113 9.52887 46.854082 9.528781 46.854015 9.528466 46.853849 9.52843 46.853824 9.528403 46.853849 9.528448 46.853873 9.528772 46.854051 9.528969 46.854156 + + + + + + + + + + oneWay + footpath + + PT3M45S + + + + 312 + + 9.529544 46.853701 9.529311 46.853578 9.528942 46.853376 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M48S + + + + + + + + + + + + oneWay + stairs + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT11S + + + + 312 + + 9.529544 46.853701 9.529311 46.853578 9.528942 46.853376 9.528978 46.853339 9.529005 46.853351 9.529391 46.853566 9.529445 46.853578 9.529499 46.853609 9.529517 46.853634 9.529544 46.853646 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT4M41S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT18S + + + + 168 + + 9.529347 46.853824 9.529149 46.85372 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M13S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT16S + + + + 168 + + 9.529347 46.853824 9.529149 46.85372 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M13S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT16S + + + + 168 + + 9.529347 46.853824 9.529149 46.85372 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT4M26S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT33S + + + + 306 + + 9.529221 46.853959 9.529005 46.853843 9.528682 46.853664 9.528637 46.85364 9.528673 46.853609 9.528709 46.853628 9.529086 46.853824 9.52914 46.853836 9.529203 46.853867 9.529212 46.853898 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT9S + + + + 306 + + 9.529221 46.853959 9.529005 46.853843 9.528682 46.853664 9.528637 46.85364 9.528673 46.853609 9.528709 46.853628 9.529086 46.853824 9.52914 46.853836 9.529203 46.853867 9.529212 46.853898 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT9S + + + + 306 + + 9.529221 46.853959 9.529005 46.853843 9.528682 46.853664 9.528637 46.85364 9.528673 46.853609 9.528709 46.853628 9.529086 46.853824 9.52914 46.853836 9.529203 46.853867 9.529212 46.853898 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT4M40S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT19S + + + + 321 + + 9.529131 46.85407 9.528897 46.853941 9.528529 46.853738 9.528556 46.853714 9.528592 46.853732 9.52896 46.853941 9.529014 46.853953 9.529077 46.853984 9.529095 46.854008 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT9S + + + + 321 + + 9.529131 46.85407 9.528897 46.853941 9.528529 46.853738 9.528556 46.853714 9.528592 46.853732 9.52896 46.853941 9.529014 46.853953 9.529077 46.853984 9.529095 46.854008 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT2M20S + + + + + + + + + + + + oneWay + escalator + + PT30S + + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT9S + + + + 321 + + 9.529131 46.85407 9.528897 46.853941 9.528529 46.853738 9.528556 46.853714 9.528592 46.853732 9.52896 46.853941 9.529014 46.853953 9.529077 46.853984 9.529095 46.854008 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT4M41S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT18S + + + + 334 + + 9.528969 46.854162 9.528772 46.854051 9.528448 46.853873 9.528403 46.853849 9.52843 46.853824 9.528466 46.853849 9.528781 46.854015 9.52887 46.854082 9.528924 46.854113 9.528969 46.854119 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT4M42S + + + + 1 + + + + + + + + + oneWay + lift + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT17S + + + + 334 + + 9.528969 46.854162 9.528772 46.854051 9.528448 46.853873 9.528403 46.853849 9.52843 46.853824 9.528466 46.853849 9.528781 46.854015 9.52887 46.854082 9.528924 46.854113 9.528969 46.854119 9.528996 46.854131 9.529122 46.854021 9.529239 46.85391 9.529373 46.853793 9.529347 46.853781 9.529338 46.853757 9.529284 46.853726 9.52923 46.853714 9.528843 46.853505 9.528808 46.853492 9.528781 46.853517 9.528322 46.853271 9.527927 46.853056 9.527891 46.853038 9.527613 46.852878 + + + + + + + + + + oneWay + footpath + + PT3M45S + + + + + + + + + + + + oneWay + stairs + + + + + + 21 + + 9.527873 46.852731 9.527891 46.852731 9.528026 46.852798 9.528017 46.85281 9.527981 46.852817 9.527972 46.852823 9.527945 46.852804 + + + + + + + + + + oneWay + footpath + + PT14S + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509006 + + + + + 16 + + + 30 + + + Chur Wiesental + 8509006 + + + 9.531449 + 46.861902 + 576 + + + + + label + offical + CHWI + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509150 + + + + + 16 + + + 33 + + + Chur Altstadt + 8509150 + + + 9.531161 + 46.847502 + 596 + + + + + label + offical + CHSA + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509156 + + + + + 16 + + + 1 + + + Litzirüti + 8509156 + + + 9.703269 + 46.797953 + 1450 + + + + + label + offical + LITZ + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509180 + + + + + 16 + + + 1 + + + Felsberg + 8509180 + + + 9.48126 + 46.843097 + 569 + + + + + label + offical + FBG + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509182 + + + + + 16 + + + 100 + + + Ems Werk + 8509182 + + + 9.430388 + 46.828637 + 598 + + + + + label + offical + EMSW + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509183 + + + + + 16 + + + 120 + + + Reichenau-Tamins + 8509183 + + + 9.412548 + 46.823658 + 604 + + + + + label + offical + REIT + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509185 + + + + + 16 + + + 100 + + + Rhäzüns + 8509185 + + + 9.399261 + 46.799681 + 654 + + + + + label + offical + RHAE + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509192 + + + + + 16 + + + 111 + + + Tiefencastel + 8509192 + + + 9.572861 + 46.663878 + 884 + + + + + label + offical + TICA + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509253 + + + + + 8 + + + 5000 + + + St. Moritz + 8509253 + + + 9.846389 + 46.497973 + 1775 + + + + + label + offical + SMOR + + + + recommendedInterchange + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509270 + + + + + 16 + + + 30 + + + St. Moritz (Standseilbahn) + 8509270 + + + 9.83763 + 46.49882 + 1855 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509607 + + + + + 16 + + + 0 + + + Julier, La Veduta + 8509607 + + + 9.718065 + 46.470182 + 2236 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509679 + + + + + 16 + + + 30 + + + Rhäzüns (Luftseilbahn Feldis) + 8509679 + + + 9.401795 + 46.795831 + 658 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509681 + + + + + 16 + + + 30 + + + Lenzerheide/Lai Canols + 8509681 + + + 9.556574 + 46.740214 + 1476 + + + + + + 1. Obergeschoss + F1 + + + Erdgeschoss + G + + + + + Haupteingang + ZuH + 1 + + + 9.556125 + 46.740214 + 1476 + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + Nebeneingang oben + ZuO + 2 + + + 9.556718 + 46.740116 + 1476 + + + + + + + + Aufzug von Haupteingang nach Gondel + 173 + + 0.9 + 1.1 + 1125 + 0.9 + + + Treppe von Haupteingang nach Gondel + 172 + + + + Rolltreppe von Gondel nach Haupteingang + 155 + + + + interchangeAllowed + + + + OnlyPT + + Gondel + G1 + + + 9.556565 + 46.740208 + 1476 + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + 9.5565744 + 46.740214 + + + + + + + + + + + + 19 + + 9.556125 46.740208 9.556251 46.740239 9.556296 46.740202 9.556341 46.740196 + + + + + + + + + + + oneWay + footpath + + PT2M + + + + + + + + + + + + oneWay + stairs + + + + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + + + + + + + + + oneWay + stairs + + + + + + 19 + + 9.556341 46.740196 9.556296 46.740202 9.556251 46.740239 9.556125 46.740208 + + + + + + + + + + + oneWay + footpath + + PT2M + + + + 19 + + 9.556125 46.740208 9.556251 46.740239 9.556296 46.740202 9.556341 46.740196 + + + + + + + + + + + oneWay + footpath + + PT1M30S + + + + + + + + + + + + oneWay + escalator + + + + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + + + + + + + + + oneWay + escalator + + + + + + 19 + + 9.556341 46.740196 9.556296 46.740202 9.556251 46.740239 9.556125 46.740208 + + + + + + + + + + + oneWay + footpath + + PT1M30S + + + + 19 + + 9.556125 46.740208 9.556251 46.740239 9.556296 46.740202 9.556341 46.740196 + + + + + + + + + + + oneWay + footpath + + PT3M + + + + 1 + + + + + + + + + oneWay + lift + + + + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + + 9.556583 46.740208 + + + + + + + + + + oneWay + footpath + + + 1 + + + + + + + + + oneWay + lift + + + + + + 19 + + 9.556341 46.740196 9.556296 46.740202 9.556251 46.740239 9.556125 46.740208 + + + + + + + + + + + oneWay + footpath + + PT3M + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509730 + + + + + 16 + + + 30 + + + Tamins, Unterdorf + 8509730 + + + 9.408092 + 46.827684 + 626 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509741 + + + + + 16 + + + 30 + + + Lantsch/Lenz, St. Cassian + 8509741 + + + 9.558003 + 46.698754 + 1422 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509755 + + + + + 16 + + + 20 + + + Bivio, posta + 8509755 + + + 9.64964 + 46.469984 + 1776 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509763 + + + + + 16 + + + 30 + + + Churwalden, Post + 8509763 + + + 9.54372 + 46.780307 + 1230 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509768 + + + + + 16 + + + 40 + + + Cunter, vischnanca + 8509768 + + + 9.5916 + 46.607316 + 1189 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509789 + + + + + 16 + + + 40 + + + Lantsch/Lenz, Vischnanca + 8509789 + + + 9.56297 + 46.685772 + 1324 + + + + + label + offical + LAEB + + + alias + offical + Lantsch/Lenz, Dorf + + + alias + offical + Lantsch/Lenz, Dorf + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509790 + + + + + 16 + + + 60 + + + Lenzerheide/Lai, Post + 8509790 + + + 9.557994 + 46.727414 + 1476 + + + + + label + offical + LEH + + + + + + Erdgeschoss + G + + + interchangeAllowed + + + + Entrance_and_PT + + BS + BS + + + 9.557994 + 46.727426 + 1476 + + + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509793 + + + + + 16 + + + 0 + + + Malix, Dorf + 8509793 + + + 9.532634 + 46.810983 + 1120 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509797 + + + + + 16 + + + 0 + + + Mulegns + 8509797 + + + 9.620705 + 46.523586 + 1480 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509854 + + + + + 16 + + + 0 + + + Parpan, Post + 8509854 + + + 9.557652 + 46.76015 + 1493 + + + + + label + offical + PABA + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509870 + + + + + 16 + + + 30 + + + St. Moritz Bad, Post + 8509870 + + + 9.836157 + 46.485888 + 1772 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509874 + + + + + 16 + + + 30 + + + Savognin, posta + 8509874 + + + 9.600879 + 46.595515 + 1212 + + + + + label + offical + SBAT + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509889 + + + + + 16 + + + 30 + + + Sur, plazza dalla posta + 8509889 + + + 9.629338 + 46.519921 + 1556 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509894 + + + + + 16 + + + 40 + + + Tinizong, Tga Communala + 8509894 + + + 9.616645 + 46.583267 + 1232 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509950 + + + + + 16 + + + 30 + + + Valbella, Dorf + 8509950 + + + 9.556062 + 46.749484 + 1533 + + + + + label + offical + VBAT + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8509972 + + + + + 16 + + + 0 + + + Rona + 8509972 + + + 9.624667 + 46.560702 + 1407 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530545 + + + + + 16 + + + 30 + + + Chur (Brambrüeschbahn) + 8530545 + + + 9.525762 + 46.847336 + 595 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530580 + + + + + 16 + + + 30 + + + Churwalden (Talst.Pradaschier) + 8530580 + + + 9.541321 + 46.778621 + 1248 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530582 + + + + + 16 + + + 30 + + + Churwalden (Talstation) + 8530582 + + + 9.541609 + 46.777145 + 1230 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530584 + + + + + 16 + + + 30 + + + Lenzerheide/Lai Val Sporz + 8530584 + + + 9.546253 + 46.72516 + 1521 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530589 + + + + + 16 + + + 30 + + + Savognin (Talstation) + 8530589 + + + 9.591743 + 46.596509 + 1207 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8530601 + + + + + 16 + + + 30 + + + St. Moritz Suvretta + 8530601 + + + 9.817831 + 46.487503 + 1936 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8557055 + + + + + 16 + + + 30 + + + Lantsch/Lenz, Biathlon Arena + 8557055 + + + 9.559916 + 46.692279 + 1390 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8571313 + + + + + 16 + + + 50 + + + Chur, Post I + 8571313 + + + 9.527703 + 46.852276 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572111 + + + + + 16 + + + 30 + + + Chur, Gürtelstrasse + 8572111 + + + 9.528888 + 46.854451 + 585 + + + + + + Erdgeschoss + G + + + interchangeAllowed + + + + Entrance_and_PT + + Bussteig + BuS + + + 9.52879 + 46.8545 + 585 + + + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572375 + + + + + 16 + + + 30 + + + Chur, Amselweg + 8572375 + + + 9.530946 + 46.85684 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572404 + + + + + 16 + + + 30 + + + Chur, Wiesental + 8572404 + + + 9.530748 + 46.861883 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572453 + + + + + 16 + + + 30 + + + Chur, Lachen + 8572453 + + + 9.527918 + 46.863198 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572456 + + + + + 16 + + + 0 + + + Chur, Lacuna + 8572456 + + + 9.52614 + 46.861337 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572655 + + + + + 16 + + + 0 + + + Chur, Tulpenweg + 8572655 + + + 9.527182 + 46.857811 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572658 + + + + + 16 + + + 30 + + + Chur, Daleustrasse + 8572658 + + + 9.528233 + 46.854641 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572659 + + + + + 16 + + + 0 + + + Chur, Sommerau + 8572659 + + + 9.506583 + 46.845721 + 583 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572662 + + + + + 16 + + + 30 + + + Felsberg, Emserstrasse + 8572662 + + + 9.493225 + 46.843472 + 571 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572663 + + + + + 16 + + + 30 + + + Felsberg, Bahnhof + 8572663 + + + 9.48055 + 46.842943 + 568 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572664 + + + + + 16 + + + 30 + + + Felsberg, Post + 8572664 + + + 9.477451 + 46.844627 + 573 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572667 + + + + + 16 + + + 0 + + + Felsberg, Underchrüzli + 8572667 + + + 9.474325 + 46.84486 + 570 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572671 + + + + + 16 + + + 0 + + + Felsberg, Kirchenstutz + 8572671 + + + 9.471109 + 46.845241 + 572 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572672 + + + + + 16 + + + 0 + + + Felsberg, Ringelweg + 8572672 + + + 9.468656 + 46.844234 + 573 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572689 + + + + + 16 + + + 0 + + + Felsberg, Rjterstutz/Aeuli + 8572689 + + + 9.465 + 46.842894 + 579 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572746 + + + + + 16 + + + 0 + + + Felsberg, Calanda + 8572746 + + + 9.481745 + 46.844879 + 564 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572749 + + + + + 16 + + + 0 + + + Felsberg, Schöneggstrasse + 8572749 + + + 9.482454 + 46.846949 + 566 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572784 + + + + + 16 + + + 0 + + + Felsberg, Bahnhofstrasse + 8572784 + + + 9.480074 + 46.846114 + 568 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572786 + + + + + 16 + + + 0 + + + Felsberg, Brugg + 8572786 + + + 9.478529 + 46.844467 + 573 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8572906 + + + + + 16 + + + 0 + + + Reichenau-Tamins, Adler + 8572906 + + + 9.408433 + 46.824734 + 662 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8573016 + + + + + 16 + + + 0 + + + Bonaduz, alte Post + 8573016 + + + 9.400402 + 46.812655 + 662 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8573017 + + + + + 16 + + + 0 + + + Bonaduz, Crusch + 8573017 + + + 9.399729 + 46.80896 + 662 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8573021 + + + + + 16 + + + 30 + + + Rhäzüns, Dorfplatz + 8573021 + + + 9.398183 + 46.798814 + 658 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8573042 + + + + + 16 + + + 30 + + + Rhäzüns, Luftseilbahn LRF + 8573042 + + + 9.400914 + 46.796151 + 657 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574493 + + + + + 16 + + + 30 + + + Chur, Malteser + 8574493 + + + 9.529257 + 46.848412 + 591 + + + + + label + offical + CHMA + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574494 + + + + + 16 + + + 0 + + + Chur, St. Antönierrank + 8574494 + + + 9.53038 + 46.84491 + 674 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574495 + + + + + 16 + + + 0 + + + Chur, Araschgerrank + 8574495 + + + 9.538932 + 46.839883 + 760 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574496 + + + + + 16 + + + 0 + + + Chur, Städeli + 8574496 + + + 9.53824 + 46.837001 + 846 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574497 + + + + + 16 + + + 0 + + + Malix, Kreuz + 8574497 + + + 9.539201 + 46.827285 + 954 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574498 + + + + + 16 + + + 0 + + + Churwalden, Egga + 8574498 + + + 9.531386 + 46.799294 + 1153 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574499 + + + + + 16 + + + 0 + + + Churwalden, Furnerschhus + 8574499 + + + 9.537827 + 46.785677 + 1210 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574500 + + + + + 16 + + + 0 + + + Churwalden, Rüti + 8574500 + + + 9.552083 + 46.774143 + 1310 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574501 + + + + + 16 + + + 0 + + + Parpan, Parpaner Höhe + 8574501 + + + 9.559081 + 46.754224 + 1548 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574502 + + + + + 16 + + + 0 + + + Lenzerheide/Lai, La Riva + 8574502 + + + 9.55184 + 46.73423 + 1484 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574503 + + + + + 16 + + + 0 + + + Lenzerheide/Lai, Clavadoiras + 8574503 + + + 9.558838 + 46.721822 + 1456 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574504 + + + + + 16 + + + 0 + + + Vazerol + 8574504 + + + 9.57949 + 46.669704 + 1140 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574505 + + + + + 16 + + + 30 + + + Tiefencastel, Dorf + 8574505 + + + 9.576679 + 46.662269 + 841 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574506 + + + + + 16 + + + 0 + + + Cunter, Burvagn + 8574506 + + + 9.589273 + 46.623002 + 1171 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574507 + + + + + 16 + + + 0 + + + Tinizong, Cadras + 8574507 + + + 9.613222 + 46.585626 + 1225 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574508 + + + + + 16 + + + 0 + + + Marmorera, Scalotta + 8574508 + + + 9.629976 + 46.513331 + 1603 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574509 + + + + + 16 + + + 0 + + + Marmorera, rampar/Staudamm + 8574509 + + + 9.634351 + 46.510463 + 1684 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574510 + + + + + 16 + + + 0 + + + Marmorera, vischnanca + 8574510 + + + 9.642408 + 46.497144 + 1706 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574511 + + + + + 16 + + + 0 + + + Bivio, Stalvedro + 8574511 + + + 9.641636 + 46.481973 + 1712 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574512 + + + + + 16 + + + 0 + + + Bivio, Suracqua + 8574512 + + + 9.684683 + 46.463196 + 1922 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574513 + + + + + 16 + + + 30 + + + Silvaplana, Lej Tscheppa + 8574513 + + + 9.785169 + 46.462627 + 1999 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574515 + + + + + 16 + + + 130 + + + St. Moritz, Bahnhof + 8574515 + + + 9.845284 + 46.497676 + 1776 + + + + interchangeAllowed + + + C + C + + + 9.845284 + 46.497676 + 1776 + + + C + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574666 + + + + + 16 + + + 30 + + + Chur, Brambrüeschb./Stadthalle + 8574666 + + + 9.525636 + 46.847496 + 595 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574667 + + + + + 16 + + + 0 + + + Chur, Kaserne/Kornquader + 8574667 + + + 9.519142 + 46.846949 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574668 + + + + + 16 + + + 0 + + + Chur, Strassenverkehrsamt + 8574668 + + + 9.51659 + 46.846753 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574669 + + + + + 16 + + + 30 + + + Chur, Kalchbühl + 8574669 + + + 9.510967 + 46.846317 + 577 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574670 + + + + + 16 + + + 0 + + + Chur, Plankis + 8574670 + + + 9.502676 + 46.845223 + 584 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574671 + + + + + 16 + + + 0 + + + Domat/Ems, Plarenga + 8574671 + + + 9.462242 + 46.837444 + 571 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574672 + + + + + 16 + + + 30 + + + Domat/Ems, Unterdorf + 8574672 + + + 9.454876 + 46.837167 + 580 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574673 + + + + + 16 + + + 30 + + + Domat/Ems, Post + 8574673 + + + 9.447546 + 46.833671 + 584 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574674 + + + + + 16 + + + 0 + + + Domat/Ems, Tuma Platta + 8574674 + + + 9.443521 + 46.831968 + 584 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574675 + + + + + 16 + + + 0 + + + Domat/Ems, Padrusa + 8574675 + + + 9.440243 + 46.830856 + 584 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574676 + + + + + 16 + + + 30 + + + Ems GR, Chemie + 8574676 + + + 9.431637 + 46.829418 + 597 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574678 + + + + + 16 + + + 0 + + + Tamins, Oberdorf + 8574678 + + + 9.405568 + 46.829147 + 663 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574709 + + + + + 16 + + + 30 + + + Chur, Stadt + 8574709 + + + 9.532338 + 46.84714 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574946 + + + + + 16 + + + 50 + + + St. Moritz, Schulhausplatz + 8574946 + + + 9.838295 + 46.498263 + 1801 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574950 + + + + + 16 + + + 30 + + + St. Moritz Bad, Campingplatz + 8574950 + + + 9.823832 + 46.47883 + 1805 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8574952 + + + + + 16 + + + 30 + + + St. Moritz, Somplaz + 8574952 + + + 9.8265 + 46.484212 + 1801 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8575112 + + + + + 16 + + + 500 + + + Chur, Postautostation + 8575112 + + + 9.527604 + 46.85289 + 585 + + + + + + 1. Obergeschoss + F1 + + + Erdgeschoss + G + + + + + Zugang + ZuP + 2 + + + 9.528251 + 46.852681 + 585 + + + + + + + + + + + + + + + + + + Aufzug von Bussteig nach Bahnsteig 1 + 188 + + 1 + 1.7 + 1000 + 1.3 + + + Aufzug von Bussteig nach Bahnsteig 2 + 191 + + 1 + 1.7 + 1000 + 1.1 + + + Aufzug von Bussteig nach Bahnsteig 3 + 194 + + 1 + 1.7 + 1000 + 1.1 + + + Aufzug von Bussteig nach Bahnsteig 4 + 197 + + 1 + 1.7 + 1000 + 1.1 + + + Aufzug von Bussteig nach Bahnsteig 5 + 198 + + 0.9 + 1.4 + 800 + 1.4 + + + Treppe von Bussteig nach Bahnsteig 1 + 187 + + 46 + 0.17 + + + Treppe von Bussteig nach Zugang + 113 + + + + Treppe von Bussteig nach Bahnsteig 13/14 + 199 + + 40 + 0.17 + + + Rolltreppe von Bahnsteig 7/8 nach Bussteig + 190 + + + + Rolltreppe von Bussteig nach Bahnsteig 9/10 + 192 + + + + Rolltreppe von Bahnsteig 9/10 nach Bussteig + 193 + + + + Rolltreppe von Bussteig nach Bahnsteig 11/12 + 195 + + + + Rolltreppe von Bahnsteig 11/12 nach Bussteig + 196 + + + + Rolltreppe von Bussteig nach Bahnsteig 7/8 + 189 + + + + interchangeAllowed + + + + OnlyPT + + Bussteig + BuS + + + 9.527559 + 46.852964 + 585 + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + 9.5276037 + 46.8528903 + + + + + + + + + + + + + + + + + + + + 9 + + 9.528242 46.852675 9.528251 46.852675 9.528197 46.852651 9.528188 46.852657 9.528152 46.852663 + + + + + + + + + + + oneWay + footpath + + PT2M + + + + 170 + + 9.528152 46.852663 9.528188 46.852657 9.528197 46.852651 9.528251 46.852675 9.528484 46.852485 9.528017 46.852344 9.527801 46.852276 9.527514 46.85219 9.527451 46.852258 9.527334 46.852387 9.527119 46.852577 + + + + + + + + + + oneWay + stairs + + + + + + + + + + + + + + oneWay + footpath + + + + + + + + + + + oneWay + footpath + + + 170 + + 9.527119 46.852577 9.527334 46.852387 9.527451 46.852258 9.527514 46.85219 9.527801 46.852276 9.528017 46.852344 9.528484 46.852485 9.528251 46.852675 9.528197 46.852651 9.528188 46.852657 9.528152 46.852663 + + + + + + + + + + oneWay + stairs + + + + + + 9 + + 9.528152 46.852663 9.528188 46.852657 9.528197 46.852651 9.528251 46.852675 9.528242 46.852675 + + + + + + + + + + + oneWay + footpath + + PT2M + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8575113 + + + + + 16 + + + 60 + + + Tiefencastel, Bahnhof + 8575113 + + + 9.572052 + 46.664094 + 887 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8577207 + + + + + 16 + + + 0 + + + Cunter, Dafora + 8577207 + + + 9.591546 + 46.609896 + 1183 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580560 + + + + + 16 + + + 0 + + + Churwalden, Lax + 8580560 + + + 9.531997 + 46.79486 + 1174 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580561 + + + + + 16 + + + 0 + + + Valbella, Canols + 8580561 + + + 9.556565 + 46.744517 + 1498 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580587 + + + + + 16 + + + 0 + + + Domat/Ems, Abzw. Felsberg + 8580587 + + + 9.479777 + 46.840731 + 571 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580716 + + + + + 16 + + + 0 + + + Savognin, Cresta + 8580716 + + + 9.595921 + 46.598349 + 1207 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580717 + + + + + 16 + + + 0 + + + Tinizong, Vardaval + 8580717 + + + 9.623328 + 46.57529 + 1272 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8580921 + + + + + 16 + + + 0 + + + Lantsch/Lenz, Barbatschauns + 8580921 + + + 9.562099 + 46.689598 + 1349 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581028 + + + + + 16 + + + 0 + + + Malix, Rezia + 8581028 + + + 9.534988 + 46.81622 + 1079 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581044 + + + + + 12 + + + 500 + + + Chur, Bahnhofplatz + 8581044 + + + 9.530451 + 46.853603 + 585 + + + + + label + offical + CHBA + + + + + + Erdgeschoss + G + + + interchangeAllowed + + + + Entrance_and_PT + + Kante E, D + ED + + + 9.52985 + 46.853382 + 585 + + + + + + + Entrance_and_PT + + Kante A, B, C + ABC + + + 9.529832 + 46.853216 + 585 + + + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581190 + + + + + 10 + + + 100 + + + Lantsch/Lenz, Sudem Vischnanca + 8581190 + + + 9.565764 + 46.682 + 1293 + + + + recommendedInterchange + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581561 + + + + + 16 + + + 30 + + + Domat/Ems, Plaz + 8581561 + + + 9.450942 + 46.836473 + 589 + + + + + label + offical + DOEX + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581896 + + + + + 16 + + + 0 + + + Chur, Giacomettistrasse + 8581896 + + + 9.529984 + 46.863843 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581901 + + + + + 16 + + + 0 + + + Parpan, Obertor/Heimberg + 8581901 + + + 9.561138 + 46.75727 + 1519 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8581999 + + + + + 16 + + + 30 + + + Reichenau-Tamins, Bahnhof + 8581999 + + + 9.413033 + 46.824046 + 604 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582066 + + + + + 16 + + + 0 + + + Felsberg, Abzw. + 8582066 + + + 9.479391 + 46.841567 + 567 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582067 + + + + + 16 + + + 0 + + + Tinizong, Curtinatsch + 8582067 + + + 9.618846 + 46.581668 + 1247 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582141 + + + + + 16 + + + 0 + + + Bonaduz, Isla + 8582141 + + + 9.40431 + 46.823007 + 662 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582822 + + + + + 16 + + + 30 + + + Lenzerheide/Lai, Val Sporz + 8582822 + + + 9.547708 + 46.725314 + 1515 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582828 + + + + + 16 + + + 30 + + + Valbella, Posthotel + 8582828 + + + 9.555793 + 46.748506 + 1524 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8582835 + + + + + 16 + + + 30 + + + Lenzerheide/Lai, Rothornbahn + 8582835 + + + 9.555811 + 46.740577 + 1489 + + + + + + Erdgeschoss + G + + + interchangeAllowed + + + + Entrance_and_PT + + Richtung Lenzerheid + BS1 + + + 9.555694 + 46.740707 + 1489 + + + + + + + Entrance_and_PT + + Richtung Chur + BS2 + + + 9.555982 + 46.740485 + 1489 + + + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8583813 + + + + + 16 + + + 0 + + + Lantsch/Lenz, Sozas + 8583813 + + + 9.570274 + 46.67506 + 1215 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8583827 + + + + + 16 + + + 30 + + + Churwalden, Rathaus + 8583827 + + + 9.542749 + 46.782017 + 1222 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8583828 + + + + + 16 + + + 30 + + + Churwalden, Bergbahnen + 8583828 + + + 9.54372 + 46.778012 + 1238 + + + + + label + offical + CHUB + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8583898 + + + + + 16 + + + 0 + + + Bivio, Las Colonnas/Passhöhe + 8583898 + + + 9.726104 + 46.471809 + 2279 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8587676 + + + + + 16 + + + 100 + + + Rhäzüns, Bahnhof + 8587676 + + + 9.398722 + 46.799349 + 650 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8595592 + + + + + 16 + + + 0 + + + Chur, Postplatz + 8595592 + + + 9.53091 + 46.850881 + 585 + + + + interchangeAllowed + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + DIDOK + 8595594 + + + + + 16 + + + 30 + + + Chur, Turnerwiese + 8595594 + + + 9.532239 + 46.856238 + 585 + + + + interchangeAllowed + + + + + + P_and_R + + P+R Gürtelstrasse + P+R G + 83 + + + 9.529104 + 46.854365 + 584 + + + + + + + parkAndRide + + + + + + + From 859208d7aa6ff4e6aca34ac23916e82006bb9a15 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Fri, 29 Apr 2022 09:04:51 +0200 Subject: [PATCH 34/74] Changed charset encoding from latin1, latin2 to UTF-8 (#352) --- .../calendar/NeTEx_Calendar_se_PA1.xml | 2 +- .../calendar/Netex_calendarCodeing_02.xml | 2 +- .../Netex_calendarExample_01_BHN01.xml | 2 +- ...NTUR-SchoolTwiceADayTripCarnet_2020120.xml | 4 +- ...ographicFares_UnitZone_MultipleProduct.xml | 134 +-- ...SimpleFares_PointToPoint_SingleProduct.xml | 2 +- ...impleFares_PointToPoint_MultipleOffers.xml | 2 +- ...mpleFares_ZoneToZone_AdultChildProduct.xml | 2 +- ..._SimpleFares_ZoneToZone_OffPeakProduct.xml | 2 +- ...raphicFares_UnitDistance_SingleProduct.xml | 4 +- ...raphicFares_UnitZone_AdultChildProduct.xml | 2 +- ...aphicFares_UnitFareStage_SingleProduct.xml | 8 +- ...cFares_HierarchicalZone_MultipleOffers.xml | 2 +- ...imeIntervalFares_Zonal_MultipleProduct.xml | 2 +- ...2_Bus_ZonalFares_MultipleSalesPackages.xml | 44 +- ...Netex_81.1_Metro_FlatFare_GroupProduct.xml | 2 +- ...tex_91.1_Rail_RailCard_MultipleProduct.xml | 2 +- .../fares/rail/Netex_era_crossborder_de.xml | 34 +- .../fares/rail/Netex_era_distance_ro.xml | 58 +- .../functions/fares/rail/Netex_era_toc_uk.xml | 84 +- .../Netex_GroupingExample_General_01.xml | 2 +- .../newModes/NewModes-CarClubExample.xml | 2 +- .../newModes/NewModes-CarPoolingExample.xml | 4 +- .../NewModes-ChauffeuredServiceExample.xml | 2 +- .../newModes/NewModes-CycleSharingExample.xml | 2 +- .../patterns/Netex_KBIC_ParisNetwork_1.xml | 4 +- .../Netex_Sites_PoiClassification_1.xml | 2 +- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 2 +- .../simpleNetwork/Netex_uk_underground_1.xml | 2 +- .../site/Netex_01_Sites_SimpleStadium_1.xml | 2 +- .../Netex_10_Sites_OlympicPark_2_basic.xml | 2 +- .../site/Netex_11_Sites_OlympicPark_1.xml | 2 +- .../site/Netex_12_Sites_OlympicPark_3_nav.xml | 2 +- ...Netex_13_Sites_OlympicPark_4_delayOnly.xml | 2 +- .../site/Netex_21_Sites_Parking_1.xml | 2 +- .../site/Netex_21_Sites_Parking_2.xml | 2 +- .../site/Netex_Address_Example_1.xml | 2 +- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- .../Netex_01_StopPoints_NoFrills_1.xml | 2 +- .../Netex_01_Stops_SingleStopOnStreet_1.xml | 2 +- .../Netex_02_Stops_StopPairOnStreet_1.xml | 2 +- .../Netex_04_Stops_SimpleStation_1.xml | 2 +- ...topPlace_uk_ComplexStation_Wimbledon_1.xml | 2 +- .../Netex_10_StopPlace_withParking_1.xml | 2 +- ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml | 2 +- ...x_01.2_Bus_SimpleTimetable_WithTimings.xml | 2 +- ...s_SimpleTimetable_WithMultiplePatterns.xml | 2 +- ...1.4_Bus_SimpleTimetable_WithConnection.xml | 2 +- ...1.5_Bus_SimpleTimetable_StopAssignment.xml | 2 +- ....6_Bus_SimpleTimetable_RouteProjection.xml | 2 +- ...Netex_02.1_Bus_CircularRoute_Timetable.xml | 2 +- ..._BranchedRouteTimetable_SimplePatterns.xml | 2 +- ..._BranchedRouteTimetable_SharedPatterns.xml | 2 +- ...Bus_TemplateTimetable_HeadwayFrequency.xml | 2 +- ..._TemplateTimetable_RhythmicalFrequency.xml | 2 +- ...quencyJourneyTimetable_HeadwayInterval.xml | 2 +- ...ncyJourneyTimetable_RhythmicalInterval.xml | 2 +- ...x_07.1_Bus_FlexibleTimetable_ZonesOnly.xml | 2 +- ...07.2_Bus_FlexibleTimetable_WithPattern.xml | 2 +- ..._08.1_BusTram_Timetable_AmbiguousLinks.xml | 2 +- ..._08.2_Bus_SimpleTimetable_Cancellation.xml | 2 +- .../Netex_09.1_Bus_InterchangeRule.xml | 2 +- ...etex_10_Rail_SplittingJoiningTimetable.xml | 2 +- .../timetable/Netex_11_Rail_CompoundTrain.xml | 2 +- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 192 ++-- ...ltimodal_PassengerInformationEquipment.xml | 2 +- .../validityCondition/NeTEx_trigger-01.xml | 2 +- .../variant/Netex_VariantExample_Step_05.xml | 2 +- .../Netex_simpleVehicleSchedule_01.xml | 6 +- .../versioning/Netex_Uniqueness_01.xml | 2 +- .../Netex_VersioningExample_Step_01.xml | 2 +- .../Netex_VersioningExample_Step_02.xml | 2 +- .../Netex_VersioningExample_Step_03.xml | 2 +- .../Netex_VersioningExample_Step_04.xml | 2 +- .../Netex_VersioningExample_Step_05.xml | 2 +- .../Netex_VersioningExample_Step_05_ByRef.xml | 2 +- ...VersioningExample_Step_05_GeneralFrame.xml | 2 +- ..._VersioningExample_VersionHistories_01.xml | 2 +- ..._VersioningExample_VersionHistories_02.xml | 2 +- examples/standards/epiap/eiap_test1_ramp.xml | 2 +- .../standards/epip/epip_common_profile.xml | 2 +- .../Netex_era_uic_Stations_SSP_Se_1.xml | 4 +- .../era_uic/Netex_era_uic_Stations_Se_1.xml | 4 +- .../Netex_era_uic_timetable_hack_01.xml | 2 +- ...AMSY_NETWORK_FARE_Arriva-pass_20200417.xml | 114 +-- ...AMSY_NETWORK_FARE_Arriva-trip_20200417.xml | 8 +- ...ristol-Line-48-trip-(stage)_2017-01-01.xml | 34 +- ...ARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml | 154 +-- ...FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml | 180 ++-- ...FirstSheffield-pass-by-period_20200310.xml | 50 +- ...E_FirstSheffield-pass-by-user_20200310.xml | 122 +-- ...RE_FirstSheffield-pass-simple_20200310.xml | 50 +- ...RE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml | 2 +- ...YOR-Line-26-trip-(stages-Z2Z)-20181101.xml | 32 +- ...INE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml | 6 +- ...RE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml | 6 +- ...K_FARE_Metrorider-pass+others_20170101.xml | 188 ++-- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 136 +-- ...RK_FARE_Metrorider-pass_basic_20170101.xml | 68 +- ...S_LINE_FARE_Line-3-trip-(p2p)_20190101.xml | 4 +- ...ETWORK_FARE_Travelmaster-pass_20200315.xml | 386 +++---- .../fxc/uk_fxc_addon_HSP_plusbus.xml | 14 +- .../standards/fxc/uk_fxc_common_profile.xml | 2 +- examples/standards/gbfs/Netex_gbfs_exm1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Agency_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_CalendarDates_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Calendar_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_FareAttributes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_FareRules_1.xml | 4 +- .../gtfs/Netex_gtfs_exm1_Frequencies_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Routes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Shapes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_StopTimes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Stops_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Transfers_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Trips_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_zz_Composite.xml | 4 +- ...s_Example_1_flatFare_unlimitedTransfer.xml | 6 +- ...fs_fares_Example_2_flatFare_noTransfer.xml | 6 +- ...s_fares_Example_3_flatFare_90mTransfer.xml | 6 +- ...s_fares_Example_4_flatFare_byLineGroup.xml | 2 +- ...fares_Example_5_flatFare_feeToTransfer.xml | 2 +- ...es_Example_6_pointToPointFare_anyRoute.xml | 2 +- ..._gtfs_fares_Example_7_zoneSequenceFare.xml | 4 +- ...ex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml | 12 +- ...tex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml | 12 +- ...onDelivery_109_Oslo_morningbus_example.xml | 2 +- ...Calendar-DayType-AvailabilityCondition.xml | 2 +- .../ServiceCalendar-DayTypeAssignments.xml | 2 +- ...endar-OperatingPeriods-with-exceptions.xml | 2 +- .../ServiceCalendar-OperatingPeriods.xml | 2 +- .../schedule/ServiceCalendar-calendar-ref.xml | 2 +- .../schedule/ServiceCalendar-example.xml | 2 +- .../norway/schedule/ServiceCalendar-test.xml | 2 +- .../stops/BasicIndoorStopPlace_example.xml | 2 +- .../BasicStopPlace-two-quays_example.xml | 2 +- .../norway/stops/BasicStopPlace_example.xml | 2 +- .../norway/stops/PointOfInterest.xml | 2 +- ...ace-with-equipment-and-parking_example.xml | 2 +- .../standards/nta/NeTEx-Export Example.xml | 2 +- .../tap_tsi/B1_NRT/Netex_sncf_b1_1.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-full.xml | 950 +++++++++--------- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml | 950 +++++++++--------- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml | 24 +- .../B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml | 2 +- .../B1_NRT/Netex_tap_tsi_tcvg_stations_1.xml | 106 +- .../B1_NRT/Netex_tap_tsi_tcvs_series_1.xml | 2 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml | 8 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml | 52 +- .../B2_IRT/Netex_tap_tsi_B2-71-optimised.xml | 20 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml | 26 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2.xml | 20 +- .../B2_IRT/Netex_tap_tsi_tcvs_irt_1.xml | 2 +- .../B3_Special/Netex_tap_tsi_B3+more.xml | 6 +- .../tap_tsi/B3_Special/Netex_tap_tsi_B3.xml | 6 +- .../tap_tsi/Other/Netex_tap_trainhotel_1.xml | 208 ++-- .../Netex_tap_trainhotel_SalesPackage_2.xml | 212 ++-- .../Netex_vdv_452_brighton_Stops_1.xml | 2 +- .../Netex_de_calendarExample_01_gd.xml | 2 +- .../vdv452/timetable/NeTEx VDV Example.xml | 2 +- .../siri_generic/exa_checkStatus_request.xml | 2 +- .../siri_generic/exa_checkStatus_response.xml | 2 +- .../siri_generic/exa_dataReady_request.xml | 2 +- .../siri_generic/exa_dataReady_response.xml | 2 +- .../exa_dataReceived_response.xml | 2 +- .../siri_generic/exa_dataSupply_request.xml | 2 +- .../siri_generic/exa_heartbeat_request.xml | 2 +- .../exa_requestSubscription_response.xml | 2 +- .../exa_terminateSubscription_request.xml | 2 +- .../exa_terminateSubscription_response.xml | 2 +- ...exa_terminateSubscription_response_err.xml | 2 +- .../siri_netex/exu_dataObject_request.xml | 2 +- .../siri_netex/exu_dataObject_request_b1.xml | 2 +- .../siri_netex/exu_dataObject_response.xml | 2 +- .../exu_dataObject_response_b1-NX.xml | 2 +- .../siri_netex/exu_dataObject_response_b1.xml | 2 +- .../exu_dataObject_subscriptionRequest-Nx.xml | 2 +- .../exu_dataObject_subscriptionRequest.xml | 2 +- xsd/NeTEx_publication-NoConstraint.xsd | 2 +- xsd/NeTEx_publication.xsd | 2 +- xsd/NeTEx_publication_timetable.xsd | 2 +- .../netex_compositeFrame_version.xsd | 2 +- .../netex_contact_version.xsd | 2 +- .../netex_organisation_version.xsd | 2 +- .../netex_place_version.xsd | 2 +- .../netex_access_version.xsd | 2 +- .../netex_otherOrganisation_version.xsd | 2 +- .../netex_serviceRestrictions_version.xsd | 2 +- .../netex_topographicPlace_version.xsd | 2 +- .../netex_transportOrganisation_version.xsd | 2 +- .../netex_utility/netex_location_types.xsd | 2 +- .../netex_utility/netex_utility_types.xsd | 2 +- .../part1_frames/netex_siteFrame_version.xsd | 2 +- .../netex_lineNetwork_version.xsd | 2 +- .../netex_line_version.xsd | 2 +- .../netex_routeInstruction_version.xsd | 2 +- .../netex_route_version.xsd | 2 +- .../netex_fareZone_version.xsd | 2 +- .../netex_servicePattern_version.xsd | 2 +- .../netex_serviceFrame_version.xsd | 2 +- .../netex_nm_mobilityJourneyFrame_version.xsd | 2 +- .../netex_nm_mobilityServiceFrame_version.xsd | 2 +- xsd/wsdl/NeTEx_publication-NoConstraint.xsd | 2 +- 204 files changed, 2541 insertions(+), 2541 deletions(-) diff --git a/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml b/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml index 110845c17..18dc9d32e 100644 --- a/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml +++ b/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/functions/calendar/Netex_calendarCodeing_02.xml b/examples/functions/calendar/Netex_calendarCodeing_02.xml index 9825c1175..961732d24 100644 --- a/examples/functions/calendar/Netex_calendarCodeing_02.xml +++ b/examples/functions/calendar/Netex_calendarCodeing_02.xml @@ -1,4 +1,4 @@ - + 2017-12-17T09:30:47.0Z @@ -321,7 +321,7 @@ 2021-09-07T01:07:00 - Kj�p Skoleskyss + Kjøp Skoleskyss Initial purchase of carnet 2020-09-06T01:07:00 10000 diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml index 5a94948c6..8d7ab8fcc 100644 --- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml +++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml @@ -1,4 +1,4 @@ - + - Oyster Top ups must be in in �5 Multiples + Oyster Top ups must be in in £5 Multiples up 5 - Oyster AUTO Top ups must be in in �20 Multiples + Oyster AUTO Top ups must be in in £20 Multiples up 20 @@ -2801,12 +2801,12 @@ To apply online you will need: An active, valid email address A colour, digital photo of your child -Debit or credit card to pay the �10 administration fee +Debit or credit card to pay the £10 administration fee You will be asked for your child's machine readable passport number. If your child does not have a machine-readable passport and you can't complete all the application steps online you may be prompted to: Download and print off a verification letter Get the verification letter signed and approved by your child's education establishment -Take the verification letter to the Post Office along with required documentation and pay the �10 administration fee +Take the verification letter to the Post Office along with required documentation and pay the £10 administration fee Apply online Applying at a Post Office You can collect a 16+ Zip Oyster photocard application form from a Post Office in London. @@ -2884,7 +2884,7 @@ You must have an 11-15 Oyster photocard to get: Child-rate fares on the Tube, DLR and London Overground 7 Day, Monthly and longer period Travelcards at child rate -Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just �2 each for up to four children travelling with them: +Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just £2 each for up to four children travelling with them: Gold Card Network RailCard Family and Friends RailCard @@ -3090,7 +3090,7 @@ Your Unique Learner Number (ULN) A UK Provider Reference Number (UKPRN) A colour, digital photo to upload An active email address -A credit or debit card to pay the �10 fee +A credit or debit card to pay the £10 fee @@ -3178,9 +3178,9 @@ We will not issue a Veterans Oyster photocard if you live in London and are elig Group Day tickets are available from Tube or London Overground station ticket offices and Tube station touchscreen machines. You can also get Group Day Tickets from some National Rail stations that Tube and London Overground services run through. Adult Under-18s -Zones 1-6 �4.50 each �1.70 each -Zones 1-8 + Watford Junction �6.50 each �2.20 each -Zones 1-9 �6.50 each �2.20 each +Zones 1-6 £4.50 each £1.70 each +Zones 1-8 + Watford Junction £6.50 each £2.20 each +Zones 1-9 £6.50 each £2.20 each * Only valid on the following National Rail services: Amersham to Marylebone @@ -3426,7 +3426,7 @@ Discounted travel for one adult travelling with the RailCard holder for the whol Purchase from Ticket Machine - At ticket offices Day Travelcards and Group Day tickets can be bought up to�seven days in advance of the start date + At ticket offices Day Travelcards and Group Day tickets can be bought up to seven days in advance of the start date P4D @@ -3691,14 +3691,14 @@ Oyster_PayAsYouGo_right - PayAsYouGo_trip Auto Cash Top up Payment before ride - - Auto top-up makes sure you never run out of pay as you go credit by automatically topping up your Oyster card with money from your credit or debit card, whenever your pay as you go balance falls below �10. + Auto top-up makes sure you never run out of pay as you go credit by automatically topping up your Oyster card with money from your credit or debit card, whenever your pay as you go balance falls below £10. How to set up Auto top-up Create or log in to your Oyster online account Select 'add/renew/top-up ticket' and then 'pay as you go with Auto top-up' -Add some pay as you go credit (minimum �10) -Select a Auto top-up amount (�20 or �40) +Add some pay as you go credit (minimum £10) +Select a Auto top-up amount (£20 or £40) Choose a station or tram stop from the dropdown list for where you want to activate Auto top-up You need to activate within eight days @@ -3882,7 +3882,7 @@ If you don't have an Oyster card, you can get one online and set up an Oyster on No Transfer - At ticket offices Day Travelcards and Group Day tickets can be bought up to�seven days in advance of the start date + At ticket offices Day Travelcards and Group Day tickets can be bought up to seven days in advance of the start date @@ -4307,7 +4307,7 @@ Gold Card - You will need to pay �5 deposit when you get a new Oyster card. This is refundable if you return the card. + You will need to pay £5 deposit when you get a new Oyster card. This is refundable if you return the card. @@ -4384,7 +4384,7 @@ If your Oyster only has pay as you go credit at adult rate on it you can let som - You will need to pay �5 deposit when you get a new Oyster card. This is refundable if you return the card. + You will need to pay £5 deposit when you get a new Oyster card. This is refundable if you return the card. 5.00 @@ -5003,7 +5003,7 @@ You can only get these as paper tickets, not on an Oyster card, and they must be Family Day Travel Card - Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just �2 each for up to four children travelling with them: + Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just £2 each for up to four children travelling with them: Gold Card Network RailCard Family and Friends RailCard @@ -5662,12 +5662,12 @@ To apply online you will need: An active, valid email address A colour, digital photo of your child -Debit or credit card to pay the �10 administration fee +Debit or credit card to pay the £10 administration fee You will be asked for your child's machine readable passport number. If your child does not have a machine-readable passport and you can't complete all the application steps online you may be prompted to: Download and print off a verification letter Get the verification letter signed and approved by your child's education establishment -Take the verification letter to the Post Office along with required documentation and pay the �10 administration fee +Take the verification letter to the Post Office along with required documentation and pay the £10 administration fee Apply online Applying at a Post Office You can collect a 16+ Zip Oyster photocard application form from a Post Office in London. @@ -5705,7 +5705,7 @@ To apply online, you will need: An active, valid email address Your child's machine-readable passport number A digital photo of your child -Credit or debit card to pay the �10 administration fee +Credit or debit card to pay the £10 administration fee If we're able to verify your child's age online: We will post the 16+ Zip Oyster photocard to the address you provide. It can take up to two weeks for the photocard to be delivered. @@ -5726,7 +5726,7 @@ To apply you will need: An active, valid email address A digital photo of your child -Credit or debit card to pay the �10 administration fee +Credit or debit card to pay the £10 administration fee You need to bring your confirmation email and proof of the applicants' age when collecting the Oyster photocard from a London Travel Information Centre. This can be either: Passport @@ -5768,7 +5768,7 @@ To apply online, you will need: A colour, digital photo Your enrolment ID from your education establishment A London address -A valid debit or credit card to pay the �10 administration fee +A valid debit or credit card to pay the £10 administration fee An active, valid email address Once you've fully enrolled with your education establishment, you can apply up to four weeks before your course start date, or on your 18th birthday. Applications received sooner than then this will be rejected. @@ -11884,7 +11884,7 @@ Wallington After 09:20 You can have two adults named on your Family and Friends RailCard allowing either adult to carry the card and get a discount. -All kids under five travel free - and each adult may take up to two 'under fives' with them. However, if the only child in the group is under five, you'll need to purchase a discounted child ticket to qualify for the adult RailCard discount. All child fares are subject to a �1 minimum fare. +All kids under five travel free - and each adult may take up to two 'under fives' with them. However, if the only child in the group is under five, you'll need to purchase a discounted child ticket to qualify for the adult RailCard discount. All child fares are subject to a £1 minimum fare. If your child turns 16 during the validity period of your 1-year Family and Friends RailCard, they will still be entitled to travel at the discounted child fare. This lasts for as long as your 1-year Family and Friends RailCard is valid. @@ -11932,12 +11932,12 @@ TODO some stuff not captured There are a range of National RailCards you can buy that allow discounted travel during off-peak times on Tube, DLR, London Overground and National Rail services. Name Cost per annum Validity Eligibility - 16-25 RailCard �28 12 months Visit website - Senior RailCard �28 12 months Visit website - HM Forces RailCard �15 12 months Visit website - Disabled Persons RailCard �20 12 months Visit website - Network RailCard �28 12 months Visit website - Family and Friends RailCard �28 12 months Visit website + 16-25 RailCard £28 12 months Visit website + Senior RailCard £28 12 months Visit website + HM Forces RailCard £15 12 months Visit website + Disabled Persons RailCard £20 12 months Visit website + Network RailCard £28 12 months Visit website + Family and Friends RailCard £28 12 months Visit website Gold Cards Gold Cards are annual season tickets with a difference: @@ -11974,7 +11974,7 @@ When you buy an annual season ticket at a station within the Network RailCard Ar Cost of card Buy your RailCard now and Save! -On 19 May the price of a 1-year RailCard will change from �28 to �30 and a 3-year RailCard from �65 to �70. The Family and Friends RailCard is still great value with cardholders saving on average �131 a year on their rail travel, as well as taking advantage of our RailCard partner offers. +On 19 May the price of a 1-year RailCard will change from £28 to £30 and a 3-year RailCard from £65 to £70. The Family and Friends RailCard is still great value with cardholders saving on average £131 a year on their rail travel, as well as taking advantage of our RailCard partner offers. 2013-05-19 @@ -12149,7 +12149,7 @@ On 19 May the price of a 1-year RailCard will change from What is the HM Forces RailCard? -The HM Forces RailCard costs �15 and it'll save you 1/3 on most rail fares throughout Great Britain for a whole year. That works out to under �2 a month for huge savings. You're eligible if you're a member of the Regular Forces or a spouse of a member, for more details see eligibility. +The HM Forces RailCard costs £15 and it'll save you 1/3 on most rail fares throughout Great Britain for a whole year. That works out to under £2 a month for huge savings. You're eligible if you're a member of the Regular Forces or a spouse of a member, for more details see eligibility. There are plenty of ways you can use your RailCard, for both long and short trips. Better still you can use it anytime on weekends, Public Holidays and during the week. The only restriction is that if you travel before 10am Monday to Friday (except during July and August) a minimum fare will apply. For more details see minimum fares. @@ -12480,7 +12480,7 @@ Are buying or leasing a vehicle through the Motability scheme A copy of the leas Use pay as you go and daily price capping Buy 7 Day, monthly and longer period Bus and Tram Passes You do not need an Oyster card to pay cash single fares. -You can also use a contactless payment card to pay for single fares on buses (not trams) at the pay as you go fare of �1.40. +You can also use a contactless payment card to pay for single fares on buses (not trams) at the pay as you go fare of £1.40. Find out more about using contactless payment cards on buses @@ -13121,12 +13121,12 @@ Operated by KPMG Thames Clippers - St George Wharf to Millbank �3.30 �2.97 �2.20 �6.60 + St George Wharf to Millbank £3.30 £2.97 £2.20 £6.60 - Millbank to Bankside �5.50 �4.95 �3.70 �11 + Millbank to Bankside £5.50 £4.95 £3.70 £11 @@ -13135,9 +13135,9 @@ Operated by KPMG Thames Clippers RB2 adult fares - Millbank to Bankside �5.50 �4.95 �3.70 �11 -St George Wharf to Millbank �3.30 �2.97 �2.20 �6.60 -All other journeys on this service �6 �5.40 �4 �12 + Millbank to Bankside £5.50 £4.95 £3.70 £11 +St George Wharf to Millbank £3.30 £2.97 £2.20 £6.60 +All other journeys on this service £6 £5.40 £4 £12 @@ -13243,9 +13243,9 @@ All other journeys on this service RB2 child fares - Millbank to Bankside �2.80 n/a �1.80 -St George Wharf to Millbank �1.70 n/a �1.10 -All other journeys on this service �3.00 n/a �2.00 + Millbank to Bankside £2.80 n/a £1.80 +St George Wharf to Millbank £1.70 n/a £1.10 +All other journeys on this service £3.00 n/a £2.00 @@ -13351,9 +13351,9 @@ All other journeys on this service RB2 child fares - Millbank to Bankside �2.80 n/a �1.80 -St George Wharf to Millbank �1.70 n/a �1.10 -All other journeys on this service �3.00 n/a �2.00 + Millbank to Bankside £2.80 n/a £1.80 +St George Wharf to Millbank £1.70 n/a £1.10 +All other journeys on this service £3.00 n/a £2.00 @@ -14270,10 +14270,10 @@ All other journeys on this service A Cableway Trip - 360� tour -You will have the option of taking a non-stop return trip on the Emirates Air Line; just ask for a 360� tour Boarding Pass at an Emirates Air Line ticket office. 360� tour Boarding Pass fares are the same as return fares. + 360° tour +You will have the option of taking a non-stop return trip on the Emirates Air Line; just ask for a 360° tour Boarding Pass at an Emirates Air Line ticket office. 360° tour Boarding Pass fares are the same as return fares. -Oyster card holders who want to travel on the Emirates Air Line as part of a 360� tour will need to buy a Boarding Pass - available at the discounted rate when you show your Oyster card. +Oyster card holders who want to travel on the Emirates Air Line as part of a 360° tour will need to buy a Boarding Pass - available at the discounted rate when you show your Oyster card. @@ -14449,7 +14449,7 @@ Multi-journey Boarding Passes are not transferable. Buy SIngle Cash ticket for zone 1 - � 4.50 cash + £ 4.50 cash 2013-07-08T01:07:00 4.50 @@ -14495,7 +14495,7 @@ Multi-journey Boarding Passes are not transferable. Buy Group Day ticket ticket for zone 1-6 4 Adults 10 Children - 4 @� 4.50 each + 10@ � 1.70 each + 4 @£ 4.50 each + 10@ £ 1.70 each 2013-07-08T01:07:15 28.70 @@ -14556,7 +14556,7 @@ Multi-journey Boarding Passes are not transferable. Buy single Cash ticket with Travel card discount fr River RB2 Millbank to Bankside - � 3.70 cash + £ 3.70 cash 2013-07-08T01:07:00 3.70 @@ -14599,7 +14599,7 @@ Multi-journey Boarding Passes are not transferable. Buy an Travel Card Oyster Card with 7 days for zones 1 and 2 - Card 5.00 deposit + Pass @ �30.40 + Card 5.00 deposit + Pass @ £30.40 2013-07-08T01:07:00 35.40 @@ -14647,10 +14647,10 @@ Multi-journey Boarding Passes are not transferable. - + - Top up Oyster card with �10 - �10 + Top up Oyster card with £10 + £10 2013-07-08T01:07:10 10.00 @@ -14674,7 +14674,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in in a zone inside travel card - Raises liability for max far �.8.40 ( �2.40) + Raises liability for max far £.8.40 ( £2.40) 2013-07-08T01:09:00 8.40 @@ -14705,7 +14705,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out in a zone inside travel card - Raises liabliity for max incremntal fare zons 2- 8 �.8.40 ( �2.40) + Raises liabliity for max incremntal fare zons 2- 8 £.8.40 ( £2.40) 2013-07-08T01:09:10 -8.40 @@ -14744,7 +14744,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in - Raises libailiity for max far �.8.40 ( �2.40) + Raises libailiity for max far £.8.40 ( £2.40) 2013-07-08T01:12:00 8.40 @@ -14779,7 +14779,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out n a zone outside traval card - Max 8.40 - actusl �2.40 = -�6.00 + Max 8.40 - actusl £2.40 = -£6.00 2013-07-08T01:12:30 -6.0 @@ -14809,8 +14809,8 @@ Multi-journey Boarding Passes are not transferable. - Top up Oyster card with �10 - Put �10 on card to trigger + Top up Oyster card with £10 + Put £10 on card to trigger 2013-07-08T01:07:10 10.00 @@ -14853,8 +14853,8 @@ Multi-journey Boarding Passes are not transferable. - Top up Oyster card with �10 - Put �10 on card to trigger + Top up Oyster card with £10 + Put £10 on card to trigger 2013-07-08T01:07:10 10.00 @@ -14904,7 +14904,7 @@ Multi-journey Boarding Passes are not transferable. Buy an Travel Card Oyster Card with 20 PAY as you go - Card 5.00 deposit + Pass @ �20 + Card 5.00 deposit + Pass @ £20 2013-07-08T01:07:00 25.00 @@ -14929,9 +14929,9 @@ Multi-journey Boarding Passes are not transferable. - + - Add �10 Pay as you go + Add £10 Pay as you go 2013-07-08T01:07:10 @@ -14950,7 +14950,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in - Raises libailiity for max far �.8.40 ( �2.40) + Raises libailiity for max far £.8.40 ( £2.40) 2013-07-08T01:12:00 8.40 @@ -14985,7 +14985,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out n a zone outside traval card - Max 8.40 - actusl �2.40 = -�6.00 + Max 8.40 - actusl £2.40 = -£6.00 2013-07-08T01:12:30 -6.0 diff --git a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml index d8823052e..e9fddc86d 100644 --- a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml +++ b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml @@ -1,4 +1,4 @@ - + - + 0 - + 80 - + 115 - + 135 @@ -1919,7 +1919,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 250 - + @@ -1933,7 +1933,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�80 Funded +15 Week-£80 Funded 170 20110808,Variable, 104 @@ -1945,7 +1945,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 170 - + @@ -1958,7 +1958,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�115 Funded +15 Week-£115 Funded 135 20110808,Variable, 104 @@ -1970,7 +1970,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 135 - + @@ -1983,7 +1983,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�135 Funded +15 Week-£135 Funded 115 20110808,Variable, 104 @@ -1995,7 +1995,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 115 - + @@ -2270,7 +2270,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 220 - + @@ -2283,7 +2283,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�80 Funded +15 Week-£80 Funded 140 20110808,Variable, 104 @@ -2295,7 +2295,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 140 - + @@ -2308,7 +2308,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�115 Funded +15 Week-£115 Funded 105 20110808,Variable, 104 @@ -2320,7 +2320,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 105 - + @@ -2333,7 +2333,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�135 Funded +15 Week-£135 Funded 85 20110808,Variable, 104 @@ -2345,7 +2345,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 85 - + diff --git a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml index 89991b01b..d6df818e1 100644 --- a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml +++ b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml @@ -1,4 +1,4 @@ - + Bucharest to Buzau. @@ -7419,13 +7419,13 @@ State Secretariat - Mizil to S�h�teni. + Mizil to Săhăteni. 7 - S�h�teni to Ulmeni. + Săhăteni to Ulmeni. 12 @@ -7595,10 +7595,10 @@ State Secretariat TODO - add members - + TODO - add members - + TODO - add members @@ -7677,7 +7677,7 @@ State Secretariat - Transferoviar C�l�tori + Transferoviar Călători TODO-BITMAPVALUE https://www.transferoviarcalatori.ro/logo.png TFC @@ -7703,13 +7703,13 @@ State Secretariat - TFC - Transferoviar C�l�tori S.R.L. + Transferoviar Călători S.R.L. ilete@tfc-online.ro 0238 434 380 @@ -7722,7 +7722,7 @@ c Strada Tudor Vladimirescu Cluj Napoca ap 1 et 1 sector 1 - Jude�ul Cluj + Judeţul Cluj diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index 8054fd451..005494fd3 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -1,4 +1,4 @@ - + Anglia Plus 'Three Days in Seven' Anglia Plus 'Three Days in Seven' Flexi Rover -This pass gives you all the flexibility of the One Day Ranger for just �38.00 per adult - which means your third day's travel is free! You choose whichever three days you would like to travel on within a seven day period - and children are still only �2.00 each when accompanied by an adult. All prices apply until 1 January 2019. +This pass gives you all the flexibility of the One Day Ranger for just £38.00 per adult - which means your third day's travel is free! You choose whichever three days you would like to travel on within a seven day period - and children are still only £2.00 each when accompanied by an adult. All prices apply until 1 January 2019. Both the One Day Ranger and the Flexi Rover are valid after 08:45 on Mondays to Fridays and at any time at weekends and on Bank Holidays. You can also use the following trains on weekdays that depart before 08:45: @@ -8785,8 +8785,8 @@ On the "Breeze" town services in Bury St Edmunds operated by Stephensons +Full term: £270.00 Full term: £460.00 +Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this great value fare. @@ -9218,7 +9218,7 @@ Short Term (1/4/18-1/6/18): NETWORK Railcard (Annual Gold Card) holders get 1/3 off the adult price of PLUSBUS day tickets for towns and cities located within the South East of England, upon presentation of their valid Network Railcard (Annual Gold Card), as follows: ** Mondays to Fridays after 10:00hours; ** Saturday, Sunday, Bank Holidays any time. -The �13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. http://www.plusbus.info/sites/default/files/Railcard%20discount%20restrictions%20for%20PLUSBUS.pdf offPeak @@ -9354,7 +9354,7 @@ http://www.plusbus.info/sites/default/files/Railcard%20discount%20restrictions%2 NETWORK Railcard (Annual Gold Card) holders get 1/3 off the adult price of PLUSBUS day tickets for towns and cities located within the South East of England, upon presentation of their valid Network Railcard (Annual Gold Card), as follows: ** Mondays to Fridays after 10:00hours; ** Saturday, Sunday, Bank Holidays any time. -The �13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. @@ -9389,7 +9389,7 @@ Children MUST be charged the normal child PLUSBUS day ticket price (which is hal Tickets bought with other Rail cards have no off peak restriction 16-25 Railcard, 26-30 Railcard and HM Forces Railcard holders get holders get 1/3 off the adult price of PLUSBUS day tickets, upon presentation of their valid 16-25 or 26-30 Railcard or HM Forces Railcard, at all times. -The �12 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £12 minimum fare restriction does not apply to PLUSBUS day ticket purchases. Disabled Persons Railcard holders get 1/3 off the adult price of PLUSBUS day tickets, upon presentation of their valid Disabled Persons Railcard at all times, when purchased with the following rail ticket types:- *** Off-Peak Day Singles, Off-Peak Day Returns; @@ -9645,7 +9645,7 @@ You must show the actual PLUSBUS ticket to the bus driver (or tram conductor) to COmmercial conditions 14. Are refunds available for PLUSBUS tickets? -PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to �10 to process refunds. +PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to £10 to process refunds. PLUSBUS tickets bought online may not be refundable from some online agents. @@ -9719,7 +9719,7 @@ The validity of your PlusBus season ticket does not have to match your rail seas COmmercial conditions 14. Are refunds available for PLUSBUS tickets? -PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to �10 to process refunds. +PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to £10 to process refunds. PLUSBUS tickets bought online may not be refundable from some online agents. @@ -10552,7 +10552,7 @@ Fully inter-available First Class Season Ticket (i.e. tickets not specific to on Any First Class Anytime ticket valid for travel on the Virgin Trains East Coast route Any Virgin Trains East Coast First Class packages Holders of a First Class Lounge supplement, available for purchase with a Virgin Trains East Coast First Advance ticket or First Class reader offer -Please be aware that First Advance and Weekend First tickets are not entitled to use the First Class Lounges. If travelling on a First Advance ticket, you can purchase a �5 supplement ticket, which allows you access into the First Class Lounge. This can be purchased on the day of travel at any Virgin Trains East Coast Travel Centre or at the time of booking your ticket online. +Please be aware that First Advance and Weekend First tickets are not entitled to use the First Class Lounges. If travelling on a First Advance ticket, you can purchase a £5 supplement ticket, which allows you access into the First Class Lounge. This can be purchased on the day of travel at any Virgin Trains East Coast Travel Centre or at the time of booking your ticket online. http://www.nationalrail.co.uk/stations_destinations/44863.aspx diff --git a/examples/functions/grouping/Netex_GroupingExample_General_01.xml b/examples/functions/grouping/Netex_GroupingExample_General_01.xml index a639bdcc7..506fa7f3b 100644 --- a/examples/functions/grouping/Netex_GroupingExample_General_01.xml +++ b/examples/functions/grouping/Netex_GroupingExample_General_01.xml @@ -1,4 +1,4 @@ - + - Calais Fr�thun + Calais Fréthun Calais mixed @@ -1662,7 +1662,7 @@ Q.4. Public holiday - Services do not run on a christams day - railStation - Marne La Vall�e Chessy + Marne La Vallée Chessy Marne For Disneyland Resort @@ -1785,11 +1785,11 @@ Q.4. Public holiday - Services do not run on a christams day - railStation - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers outdoors - Mo�tiers + Moûtiers true @@ -1985,7 +1985,7 @@ Q.4. Public holiday - Services do not run on a christams day - Paris / Brussels - Disneyland Paris / Marne-La-Vall�e + Disneyland Paris / Marne-La-Vallée Avignon @@ -1997,7 +1997,7 @@ Q.4. Public holiday - Services do not run on a christams day - Brussels to London - Disneyland Paris (Marne-La-Vall�e) to London + Disneyland Paris (Marne-La-Vallée) to London Avignon to London @@ -2090,12 +2090,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2159,12 +2159,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -2239,7 +2239,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - (Ebbsfleet) - Ashford - (Calais) - Lille - Marne La Vall�e + London - (Ebbsfleet) - Ashford - (Calais) - Lille - Marne La Vallée outbound @@ -2270,7 +2270,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - (Ebbsfleet) - Ashford - (Calais) - Mo�tiers - Aime - Bourg St Maurice + London - (Ebbsfleet) - Ashford - (Calais) - Moûtiers - Aime - Bourg St Maurice outbound @@ -2426,7 +2426,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg - Aime - Mo�tiers - (lille) - (Calais) - Ashford -( Ebbsfleet) - London + Bourg - Aime - Moûtiers - (lille) - (Calais) - Ashford -( Ebbsfleet) - London inbound @@ -2531,7 +2531,7 @@ Q.4. Public holiday - Services do not run on a christams day - Lille - Disneyland Resort Paris / Marne La Vall�e + Disneyland Resort Paris / Marne La Vallée Disneyland / Marne @@ -2543,7 +2543,7 @@ Q.4. Public holiday - Services do not run on a christams day - London - Mo�tiers - Aime la Plagne - Bourg St Maurice + Moûtiers - Aime la Plagne - Bourg St Maurice French Alps @@ -2619,11 +2619,11 @@ Q.4. Public holiday - Services do not run on a christams day - Ashford - Alps - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2783,11 +2783,11 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2816,7 +2816,7 @@ Q.4. Public holiday - Services do not run on a christams day - Ashford - Calais Fr�thun + Calais Fréthun Calais @@ -2836,7 +2836,7 @@ Q.4. Public holiday - Services do not run on a christams day - Paris GdL - Marne-La-Vall�e + Marne-La-Vallée Marne For Disneyland @@ -2853,8 +2853,8 @@ Q.4. Public holiday - Services do not run on a christams day - Avignon Centre - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers Aime-la-Plagne @@ -2913,12 +2913,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2973,12 +2973,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -3271,7 +3271,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -3292,7 +3292,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -3635,7 +3635,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -4068,7 +4068,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais Fr�thun + Calais Fréthun @@ -4083,7 +4083,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Marne-La-Marne-La-Vall�e (for Disneyland Resort) + Marne-La-Marne-La-Vallée (for Disneyland Resort) @@ -4098,7 +4098,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers + Moûtiers @@ -4315,12 +4315,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -4441,12 +4441,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -4515,7 +4515,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Ashford + Moûtiers to Ashford @@ -4824,7 +4824,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -4846,7 +4846,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -5192,7 +5192,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -5525,7 +5525,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -5551,7 +5551,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -5917,7 +5917,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -6057,12 +6057,12 @@ Q.4. Public holiday - Services do not run on a christams day - PT20M - Calais to Mo�tiers + Calais to Moûtiers PT20M - Mo�tiers to Aime + Moûtiers to Aime PT20M @@ -10372,7 +10372,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9074 London - Ebbsfleet - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9074 London - Ebbsfleet - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10444,7 +10444,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9096 London - Ebbsfleet - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9096 London - Ebbsfleet - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10516,7 +10516,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9095 Bourg St Maurice - AIme - Mo�tiers - Ashford - London + 9095 Bourg St Maurice - AIme - Moûtiers - Ashford - London @@ -10587,7 +10587,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9099 Bourg St Maurice - AIme - Mo�tiers - Ashford - London + 9099 Bourg St Maurice - AIme - Moûtiers - Ashford - London @@ -10667,7 +10667,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9092 London - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9092 London - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10676,7 +10676,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9096 London - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9096 London - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10705,7 +10705,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9095 Bourg St Maurice - Aime - Mo�tiers - Ashford - London + 9095 Bourg St Maurice - Aime - Moûtiers - Ashford - London @@ -10714,7 +10714,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9099 Bourg St Maurice - Aime - Mo�tiers - Ashford - London + 9099 Bourg St Maurice - Aime - Moûtiers - Ashford - London @@ -10808,8 +10808,8 @@ Q.4. Public holiday - Services do not run on a christams day - Nantes - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers diff --git a/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml b/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml index cf11a019d..1b9133391 100644 --- a/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml +++ b/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml @@ -1,4 +1,4 @@ - + 2001-12-17T09:30:47.0Z diff --git a/examples/functions/variant/Netex_VariantExample_Step_05.xml b/examples/functions/variant/Netex_VariantExample_Step_05.xml index 191c8a5c2..491945b47 100644 --- a/examples/functions/variant/Netex_VariantExample_Step_05.xml +++ b/examples/functions/variant/Netex_VariantExample_Step_05.xml @@ -1,4 +1,4 @@ - + 16 Plus Card - he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (�1.80 flat fare, single trip). + he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (£1.80 flat fare, single trip). https://www.arrivabus.co.uk/north-west/bus-tickets/16Plus/ beforeTravel @@ -1245,18 +1245,18 @@ We group the elements in separate frames @@ -1265,8 +1265,8 @@ July + August 1 July 2020 31 August 2020 AND @@ -1296,7 +1296,7 @@ Academic Year 1 September 2019 30 June 2020 AND @@ -1321,8 +1321,8 @@ Academic Year + 1 1 September 2019 31 July 2020 AND @@ -1352,10 +1352,10 @@ Academic Year + 2 1 September 2019 31 August 2020 AND @@ -1393,9 +1393,9 @@ Spring + Summer Terms + 2 1 January 2020 31 August 2020 AND @@ -1593,12 +1593,12 @@ July + August 1 July 2020 31 August 2020 @@ -1606,8 +1606,8 @@ Summer Term 10 April 2020 22 July 2020 AND @@ -1636,7 +1636,7 @@ Academic Year 1 September 2019 22 July 2020 AND @@ -1661,8 +1661,8 @@ Autumn + Spring Terms 1 September 2019 10 April 2020 AND @@ -1691,7 +1691,7 @@ Spring + Summer Terms 20 December 2020 22 July 2020 AND @@ -2144,19 +2144,19 @@ Summer Term 10 April 2020 22 July 2020 @@ -2241,12 +2241,12 @@ July + August 1 July 2020 31 August 2020 Autumn term 2019 diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml index 9688b08e4..df15243ec 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml @@ -1,4 +1,4 @@ - + 16 Plus Card - he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (�1.80 flat fare, single trip). + he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (£1.80 flat fare, single trip). https://www.arrivabus.co.uk/north-west/bus-tickets/16Plus/ beforeTravel diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml index 4b2336497..15e4c0ab3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml @@ -1,4 +1,4 @@ - + @@ -1870,11 +1870,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv First West of England section ("Distance Based") Trip Fare diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml index e4e2455e2..18c15a111 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml @@ -1,4 +1,4 @@ - + @@ -1019,11 +1019,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv @@ -2845,7 +2845,7 @@ Over 12 miles (within West of England area) @@ -3040,7 +3040,7 @@ Bath Short_Hop Fares @@ -3118,10 +3118,10 @@ Bristol Inner 1 trip short hop | 1.000 Single Fares @@ -3375,7 +3375,7 @@ Weston-super-Mare Town Zone 1 trip | Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Town Zone (valid for 12 months from the date of issue). Adult hild aged 5-15 16-21 year olds/student -Weston �18 �9 �12.60 +Weston £18 £9 £12.60 --> @@ -3706,9 +3706,9 @@ Weston ______ ______ ________ | Adult Child Student NB see related prduct Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Town Zone (valid for 12 months from the date of issue). -Adult �18 -16-21 year olds/student �12.60 -Child aged 5-15 �9 +Adult £18 +16-21 year olds/student £12.60 +Child aged 5-15 £9 --> @@ -4095,14 +4095,14 @@ For Terms and Conditions and details of PayPoint agents see link or contact cust @@ -4313,10 +4313,10 @@ West of England plus | | | | @@ -4467,10 +4467,10 @@ Annual : 1 year | Bristol Outer | | paper | || m-ticket | ______ ______ ________ | Adult Child Student | Family | Group || Adult Child Student | Group -1 day : 1 day | �6.60 �3.30 �4.50 | �13.00 | �10.00 || �6.00 | �3.00 | �4.20 | �8.00 -1 week : 7 day | �23.80 �11.90 �16.70 | | || �22.00 �11.00 �15.40 -4 week : 31 day | �86.40 �43.20 �60.50 | | || �80.00 �40.00 �56.00 -Annual : 1 year | �907.00 �453.50 �635.00 ! | ||�840.00 �420.00 �588.00 +1 day : 1 day | £6.60 £3.30 £4.50 | £13.00 | £10.00 || £6.00 | £3.00 | £4.20 | £8.00 +1 week : 7 day | £23.80 £11.90 £16.70 | | || £22.00 £11.00 £15.40 +4 week : 31 day | £86.40 £43.20 £60.50 | | || £80.00 £40.00 £56.00 +Annual : 1 year | £907.00 £453.50 £635.00 ! | ||£840.00 £420.00 £588.00 --> @@ -4782,10 +4782,10 @@ Annual : 1 year | @@ -4996,10 +4996,10 @@ Annual : 1 year | @@ -5104,10 +5104,10 @@ Annual : 1 year | @@ -5490,10 +5490,10 @@ Annual : 1 year | @@ -5704,10 +5704,10 @@ Annual : 1 year | @@ -5812,10 +5812,10 @@ Annual : 1 year | @@ -6027,10 +6027,10 @@ ______ ______ ______ _ | ______ ______ ______ ______ ___ @@ -6208,7 +6208,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ___ @@ -7211,10 +7211,10 @@ Some bus operators even offer special 'smart' discounts for customers using Pay- Travelwest Rider Pass Travelling with more than one bus company? The AvonRider, BathRider, BristolRider and WestonRider are day tickets available to buy on bus, where you can travel on up to 14 different operator services across the area of your choice with just one ticket. - AvonRider �7.20 Adult �5.50 Student/Child - BathRider �4.50 Adult �4 Student/Child -BristolRider �4.50 Adult �3.50 Student/Child -WestonRider �4 Adult �3 Student/ + AvonRider £7.20 Adult £5.50 Student/Child + BathRider £4.50 Adult £4 Student/Child +BristolRider £4.50 Adult £3.50 Student/Child +WestonRider £4 Adult £3 Student/ Rider Tickets Rider Tickets are day tickets that are accepted by all bus operators in a given area Valid for travel on the day of issue and up to 2.59am the following morning. @@ -7408,14 +7408,14 @@ Student/child Rider Tickets are not available on travelcards. The following tickets can be loaded onto your Travelcard online*, on the bus, except First buses and metrobus services, (using cash or Pay-As-You-Go credit) or at an iPoint (using a bank card or Pay-As-You-Go credit): -AvonRider Adult - Covering the area of the former County of Avon. Day ticket (�7.20) and Weekly ticket (�32.50) are available online. For more information about this ticket visit our page AvonRider -BristolRider Adult - Covering approximately a 6 mile radius of the city centre. Day ticket (�5.00) and Weekly ticket (�20.00) are available online. For more information about this ticket visit our page BristolRider +AvonRider Adult - Covering the area of the former County of Avon. Day ticket (£7.20) and Weekly ticket (£32.50) are available online. For more information about this ticket visit our page AvonRider +BristolRider Adult - Covering approximately a 6 mile radius of the city centre. Day ticket (£5.00) and Weekly ticket (£20.00) are available online. For more information about this ticket visit our page BristolRider *Only Adult tickets can be bought online, you can buy other tickets from the driver. The following tickets can be loaded onto your Travelcard on the bus**, except First buses, (using cash or Pay-As-You-Go credit): -BathRider - Covering the Bath urban area. Day ticket (�4.50) and Weekly ticket (�20.00) are available. For more information about this ticket visit our page BathRider -WestonRider - Covering the Weston-super-Mare urban area. Day ticket (�4.00) and Weekly ticket (�18) are available. For more information about this ticket visit our page WestonRider +BathRider - Covering the Bath urban area. Day ticket (£4.50) and Weekly ticket (£20.00) are available. For more information about this ticket visit our page BathRider +WestonRider - Covering the Weston-super-Mare urban area. Day ticket (£4.00) and Weekly ticket (£18) are available. For more information about this ticket visit our page WestonRider **Only Adult tickets are available to buy for your Travelcard. @@ -7448,10 +7448,10 @@ WestonRider - Covering the Weston-super-Mare urban area. Day ticket ( Pass@TW_Rider Fares diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml index 209cdc625..d45b906c8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml @@ -1,4 +1,4 @@ - + @@ -2334,11 +2334,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv First West of England section ("Distance Based") Trip Fare @@ -3068,8 +3068,8 @@ Over 12 miles (within West of England area) Short_hop Fares @@ -3347,9 +3347,9 @@ Bristol 1 trip short hop 1.20 0.60 0.60 _1 trip__ _____ ___ | p ticket __1 trip__ _____ ___ | Adult Child Student | -Bath | �2.50 �1.30 �1.80 | -Bristol | 2.50 �1.30 �1.80 | -Weston-super-Mare | 1.70 �0.85 �1.20 | +Bath | £2.50 £1.30 £1.80 | +Bristol | 2.50 £1.30 £1.80 | +Weston-super-Mare | 1.70 £0.85 £1.20 | West_of_England | na na na | --> @@ -3437,10 +3437,10 @@ West_of_England | na na na | Single trip in zone prices, m-ticket @@ -3730,10 +3730,10 @@ West_of_England | Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Zone (valid for 12 months from the date of issue). Adult hild aged 5-15 16-21 year olds/student -Bath �10.00 5.00 7.00 -Bristol �10.00 5.00 7.00 -Weston �7.50 5.00 3.75 -West of Englad (mticketOnlY) �17.50 8.75 12.25 +Bath £10.00 5.00 7.00 +Bristol £10.00 5.00 7.00 +Weston £7.50 5.00 3.75 +West of Englad (mticketOnlY) £17.50 8.75 12.25 --> @@ -3758,19 +3758,19 @@ West of Englad (mticketOnlY) - Pack of 5 adult trips - just �2 per journey + Pack of 5 adult trips - just £2 per journey 10.00 - Pack of 5 student trips - jjust �1.00 per journey + Pack of 5 student trips - jjust £1.00 per journey 5.00 - Pack of 5 student trips - jjust �1.40 per journey + Pack of 5 student trips - jjust £1.40 per journey 7.00 @@ -3791,19 +3791,19 @@ West of Englad (mticketOnlY) - Pack of 5 adult trips - just �2 per journey + Pack of 5 adult trips - just £2 per journey 10.00 - Pack of 5 child trips - jjust �1.00 per journey + Pack of 5 child trips - jjust £1.00 per journey 5.00 - Pack of 5 student trips - jjust �1.40 per journey + Pack of 5 student trips - jjust £1.40 per journey 7.00 @@ -4914,11 +4914,11 @@ For Terms and Conditions and details of PayPoint agents see link or contact cust @@ -5064,11 +5064,11 @@ ______ _____ | Adult Child Student | Group | @@ -5213,7 +5213,7 @@ ______ ____ | Adult Child Student | Group @@ -5249,11 +5249,11 @@ ______ _____ | Adult Child Student @@ -5399,11 +5399,11 @@ ______ _____ | Adult Child Student | Group | @@ -5554,7 +5554,7 @@ ______ ____ | Adult Child Student | Group @@ -5592,10 +5592,10 @@ ______ _____ | Adult Child Student @@ -5716,10 +5716,10 @@ ______ _____ | Adult Child Student | Group | @@ -5839,7 +5839,7 @@ ______ ____ | Adult Child Student | Group @@ -5875,11 +5875,11 @@ ______ _____ | Adult Child Student @@ -6025,11 +6025,11 @@ ______ _____ | Adult Child Student | Group | @@ -6174,7 +6174,7 @@ ______ ____ | Adult Child Student | Group @@ -6216,7 +6216,7 @@ ______ _____ | Adult Child Student @@ -7697,7 +7697,7 @@ The AvonRider, BathRider, BristolRider and WestonRider are day tickets available Day | | Week | Adult | Student/Child || Adult | Student/Child -ison | �4.00 | �3.00 || 18.00 | 13.50 | / +ison | £4.00 | £3.00 || 18.00 | 13.50 | / Rider Tickets Rider Tickets are day tickets that are accepted by all bus operators in a given area Valid for travel on the day of issue and up to 2.59am the following morning. @@ -8040,10 +8040,10 @@ Student/child Rider Tickets are not available on travelcards. @@ -9058,12 +9058,12 @@ A photocard is required for the monthly Freedom Travelpass Pass@Freedom Fares diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml index bcc9c160b..6446408a8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5727,13 +5727,13 @@ ______ ______ ______ | Adult Child Group Student | Adult Child Group Student | FirstPass | | | | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -FirstDay: 1 day | �5.00 �2.30 �10.00 xxxxx | �5.00 �2.00 �9.00 xxxxx | -Firstweek : 7 day | �20.00 �8.00 xxxxx �l5.00 | �20.00 �7.00 xxxxx xxxx | -First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | �76.00 �28.00 xxxxx �36.00 | -FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | �74.00 xxxxx xxxxx xxxxx | -FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | �814.00 xxxxx xxxxx xxxxx | -Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �109.00 | -AllTerms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �249.00 | +FirstDay: 1 day | £5.00 £2.30 £10.00 xxxxx | £5.00 £2.00 £9.00 xxxxx | +Firstweek : 7 day | £20.00 £8.00 xxxxx £l5.00 | £20.00 £7.00 xxxxx xxxx | +First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | £76.00 £28.00 xxxxx £36.00 | +FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | £74.00 xxxxx xxxxx xxxxx | +FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £814.00 xxxxx xxxxx xxxxx | +Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £109.00 | +AllTerms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml index 04cfc6c21..20da827d7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5369,8 +5369,8 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | FARE ZONE: Sheffield ______ ______ ______ | Cash ______ ______ ______ | Adult -FirstDay: 1 day | �4.40 -Firstweek : 7 day | �14.50 +FirstDay: 1 day | £4.40 +Firstweek : 7 day | £14.50 --> @@ -5413,8 +5413,8 @@ Firstweek : 7 day | @@ -5456,7 +5456,7 @@ Firstweek : 7 day | FARE ZONE: Sheffield | Cash ______ ______ ______ | Group FirstDay: 1 day | xxxxx -Firstweek : 7 day | �l0.00 +Firstweek : 7 day | £l0.00 First4Week : 28 day | xxxxx --> @@ -5490,7 +5490,7 @@ First4Week : 28 day | xxxxx @@ -5599,9 +5599,9 @@ FirstYear: 1 year | @@ -5679,8 +5679,8 @@ FirstYear: 1 year | xxxxx FARE ZONE: Sheffield | m-ticket ______ ______ ______ | Student FirstDay: 1 day | xxxxx -Firstweek : 7 day | �10.00 -First4Week : 28 day | �36.00 +Firstweek : 7 day | £10.00 +First4Week : 28 day | £36.00 --> @@ -5724,7 +5724,7 @@ ______ ______ ______ | Group FirstDay: 1 day | xxxxx Firstweek : 7 day | xxxxx First4Week : 28 day | xxxxx -FirstUnlimited: 28 day | �52.00 +FirstUnlimited: 28 day | £52.00 FirstYear: 1 year | xxxxx --> @@ -5768,13 +5768,13 @@ FirstYear: 1 year | xxxxx @@ -5808,8 +5808,8 @@ Term1 : 1 day | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx @@ -5897,7 +5897,7 @@ First4Week : 28 day | xxxxx @@ -5933,7 +5933,7 @@ First4Week : 28 day | xxxxx FARE ZONE: South Yorks | Cash ______ ______ ______ | Adult FirstDay: 1 day | xxxxx -Firstweek : 7 day | �l5.00 +Firstweek : 7 day | £l5.00 First4Week : 28 day | xxxxx FirstUnlimited: 28 day | xxxxx FirstYear: 1 year | xxxxx @@ -5985,11 +5985,11 @@ FirstYear: 1 year | xxxxx @@ -6045,9 +6045,9 @@ FirstYear: 1 year | @@ -6194,7 +6194,7 @@ ______ ______ ______ | Adult FirstDay: 1 day | xxxxx Firstweek : 7 day | xxxxx First4Week : 28 day | xxxxx -FirstUnlimited: 28 day | �74.00 +FirstUnlimited: 28 day | £74.00 --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index 165e1a5fc..a4e62c6ac 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5468,13 +5468,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ FARE ZONE: South Yorks | Cash onbus | m-ticket | ______ ______ ______ | Adult Child Group Student | Adult Child Group Student | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -FirstDay: 1 day | �5.00 �2.30 �10.00 xxxxx | �5.00 �2.00 �9.00 xxxxx | -Firstweek : 7 day | �20.00 �8.00 xxxxx �l5.00 | �20.00 �7.00 xxxxx xxxx | -First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | �76.00 �28.00 xxxxx �36.00 | -FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | �74.00 xxxxx xxxxx xxxxx | -FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | �814.00 xxxxx xxxxx xxxxx | -Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �109.00 | -Allterms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �249.00 | +FirstDay: 1 day | £5.00 £2.30 £10.00 xxxxx | £5.00 £2.00 £9.00 xxxxx | +Firstweek : 7 day | £20.00 £8.00 xxxxx £l5.00 | £20.00 £7.00 xxxxx xxxx | +First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | £76.00 £28.00 xxxxx £36.00 | +FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | £74.00 xxxxx xxxxx xxxxx | +FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £814.00 xxxxx xxxxx xxxxx | +Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £109.00 | +Allterms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml b/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml index e7053e641..9dfe322e8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml index 5f678b767..dc1542e98 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml @@ -1,4 +1,4 @@ - + @@ -1007,11 +1007,11 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ https://www.metrobus.co.uk/metrovayger-adult-fares/ Adult fares on the key - 1 day: �6.70 - 1 week: �24 - 4 weeks: �85 - 13 weeks: �250 - Annual: �870 + 1 day: £6.70 + 1 week: £24 + 4 weeks: £85 + 13 weeks: £250 + Annual: £870 What's not available on the key: @@ -1772,15 +1772,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -2326,13 +2326,13 @@ _____ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | th ______ ______ ______ _ | Adult Child Family | Adult Child Family Duo | Adult Child Student | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | MetroVoyager | | | | -1 day 1 day | �7.40 �4.30 �12.50 | �6.70 �3.80 �12.50 xxxxx | �6.70 �3.80 �5.05 | -2 day : 2 day | xxxxx xxxxx xxxxx | �12.50 �6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �18.20 �10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �26.00 �16.50 xxxxx | �24.00 �15.75 xxxxx xxxxx | �24.00 �15.75 �18.00 | -4 week : 28 day | xxxxx xxxxx xxxxx | �85.00 �52.00 xxxxx xxxxx | �85.00 �52.00 �63.75 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �250.00 �153.00 �187.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �879.00 �610.00 �652.50 | +1 day 1 day | £7.40 £4.30 £12.50 | £6.70 £3.80 £12.50 xxxxx | £6.70 £3.80 £5.05 | +2 day : 2 day | xxxxx xxxxx xxxxx | £12.50 £6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £18.20 £10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £26.00 £16.50 xxxxx | £24.00 £15.75 xxxxx xxxxx | £24.00 £15.75 £18.00 | +4 week : 28 day | xxxxx xxxxx xxxxx | £85.00 £52.00 xxxxx xxxxx | £85.00 £52.00 £63.75 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £250.00 £153.00 £187.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £879.00 £610.00 £652.50 | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ______ ______ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -3224,9 +3224,9 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ @@ -3436,9 +3436,9 @@ ______ ______ ______ _ | Gatwick Travel Card If you work at Gatwick Airport, an easitCRAWLEY member or at selected companies in City Place, you may be able to get up to 38% off by buying a Gatwick Travelcard. These are accepted at all times on all Metrobus routes which serve Crawley or Gatwick and are available for periods of: -1 week (�17) -4 weeks (�54) -Annual (�495). +1 week (£17) +4 weeks (£54) +Annual (£495). A special key smartcard is required to purchase a Gatwick Travelcard. To get yours, visit one of our Travel shops in Crawley or Redhill and now at our new Travel Shop at Gatwick South Terminal . If you are airport staff, you will need to show your airside or landside ID or a letter from your employer (with accompanying photographic ID) proving that you work at an approved company at Gatwick Airport. If you work for an easitCRAWLEY member company, you will need to show your valid Easit_card - If you don't have an Easit_card click here to apply , or speak to your employer for further advice. If you work for one of the eligible City Place companies you will need to show your valid Staff ID card. Once you have collected your card, you can then top up your key card with Gatwick Travelcards either online or at our travel shops. @@ -3980,7 +3980,7 @@ Metrobus Travel Shop, Crawley Bus Station, Marlborough Street, Crawley, BS1 3NU Easit_card -Traffic congestion has been described as having a negative impact on Sussex based businesses (Sussex Enterprise, Voice of Business Survey, 2008) with transport inadequacies costing each Sussex business an average of �29,000 every year. +Traffic congestion has been described as having a negative impact on Sussex based businesses (Sussex Enterprise, Voice of Business Survey, 2008) with transport inadequacies costing each Sussex business an average of £29,000 every year. Given the importance of Manor Royal to the local and wider economy, easitCRAWLEY was introduced to tackle the problems caused by business related traffic movements and to help achieve better commercial and community outcomes. Manor Royal BID information @@ -4004,9 +4004,9 @@ Travel planning Optional network meetings For further information please select initiativ -There is no cost to registering, but some of our initiatives require you to have an Easit_card - these cost �5.05 (inc vat) and can be purchased online. +There is no cost to registering, but some of our initiatives require you to have an Easit_card - these cost £5.05 (inc vat) and can be purchased online. -The Easit_card can save you ���'s on your daily commute! +The Easit_card can save you £££'s on your daily commute! For membership details please email info@easit.org.uk @@ -4044,7 +4044,7 @@ You may purchase Single and Return tickets (ONLY) online at easit.org.uk/app/use All other ticket types must be purchased from the relevant ticket office i.e. tickets for Southern routes must be purchased from a Southern station, tickets for GWR routes must be purchased from a GWR station. You will be required to show your Easit_card with every purchase. It is possible to find out who operates a station at www.nationalrail.co.uk and selecting 'stations and destinations'. How do I get an Easit_card? -The card costs �5.05 (inc VAT) and is available to purchase via easit.org.uk +The card costs £5.05 (inc VAT) and is available to purchase via easit.org.uk The Easit_card has not arrived. Please allow three weeks for your card to arrive. If you are outside of this time frame please log into your account and ensure that your shipping details are correct. If they are - please email info@easit.org.uk so that we may investigate. Please note, you must notify us within five weeks of an order or we will not be able to reprint the card. If you are outside of this timeframe, you can always log into your account and order a replacement card. @@ -4400,7 +4400,7 @@ Unfortunately not. As our discounts are genuine discounts off of the cost of the Family - Family Discovery - �17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). + Family Discovery - £17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). 5 @@ -4431,9 +4431,9 @@ Unfortunately not. As our discounts are genuine discounts off of the cost of the Discovery fares - one day tickets. Available from the driver. From 1st May 2018 the prices will be: -Adult Discovery - �9 -Child Discovery - �7.20 -Family Discovery - �17.50 +Adult Discovery - £9 +Child Discovery - £7.20 +Family Discovery - £17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). Discovery tickets will be issued and accepted by the following operators in West Sussex, East Sussex, Surrey, Brighton and Hove, East Hampshire, Kent and Medway (subject to exclusions at the bottom): @@ -4540,7 +4540,7 @@ Excluded services: Services operated on behalf of Transport for London, City Sig @@ -1151,11 +1151,11 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ https://www.metrobus.co.uk/metrovayger-adult-fares/ Adult fares on the key - 1 day: �6.70 - 1 week: �24 - 4 weeks: �85 - 13 weeks: �250 - Annual: �870 + 1 day: £6.70 + 1 week: £24 + 4 weeks: £85 + 13 weeks: £250 + Annual: £870 What's not available on the key: @@ -1916,15 +1916,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -2470,13 +2470,13 @@ _____ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | th ______ ______ ______ _ | Adult Child Family | Adult Child Family Duo | Adult Child Student | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | MetroVoyager | | | | -1 day 1 day | �7.40 �4.30 �12.50 | �6.70 �3.80 �12.50 xxxxx | �6.70 �3.80 �5.05 | -2 day : 2 day | xxxxx xxxxx xxxxx | �12.50 �6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �18.20 �10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �26.00 �16.50 xxxxx | �24.00 �15.75 xxxxx xxxxx | �24.00 �15.75 �18.00 | -4 week : 28 day | xxxxx xxxxx xxxxx | �85.00 �52.00 xxxxx xxxxx | �85.00 �52.00 �63.75 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �250.00 �153.00 �187.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �879.00 �610.00 �652.50 | +1 day 1 day | £7.40 £4.30 £12.50 | £6.70 £3.80 £12.50 xxxxx | £6.70 £3.80 £5.05 | +2 day : 2 day | xxxxx xxxxx xxxxx | £12.50 £6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £18.20 £10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £26.00 £16.50 xxxxx | £24.00 £15.75 xxxxx xxxxx | £24.00 £15.75 £18.00 | +4 week : 28 day | xxxxx xxxxx xxxxx | £85.00 £52.00 xxxxx xxxxx | £85.00 £52.00 £63.75 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £250.00 £153.00 £187.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £879.00 £610.00 £652.50 | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ______ ______ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -3368,9 +3368,9 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml index e0c6fadfb..63bfe7b6f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml @@ -1,4 +1,4 @@ - + @@ -833,15 +833,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | diff --git a/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml b/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml index 234ec74e4..32480b289 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml @@ -1,4 +1,4 @@ - + @@ -7454,15 +7454,15 @@ FARE ZONE: SHeffield ______ ______ ______ | m-ticket, smartcard | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -7759,18 +7759,18 @@ ______ ______ ______ | 1day 1week 28days 1year | 1day | 1day 1week 28days 1year TravelMaster pass | | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -AllZone: GetAbout | �2.60 �9.00 xxxxx xxxxx | �2.60 | �2.60 �8.30 �33.20 xxxxx | -AllZone: GetAbout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 | �4.80 �14.00 �56.00 xxxxx | +AllZone: GetAbout | £2.60 £9.00 xxxxx xxxxx | £2.60 | £2.60 £8.30 £33.20 xxxxx | +AllZone: GetAbout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 | £4.80 £14.00 £56.00 xxxxx | ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | --> @@ -8225,15 +8225,15 @@ FARE ZONE: SHeffield ______ ______ ______ | m-ticket, smartcard | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: | �4.00 �13.00 �52.00 | +Sheffield: | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -8465,18 +8465,18 @@ ______ ______ ______ | 1day 1week 28days 1year | day 1week 28days 1year | TravelMaster pass | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: Getabout | �2.60 �9.00 xxxxx xxxxx | �2.60 �8.30 �33.20 xxxxx| -AllZone: Getabout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 �14.00 �56.00 xxxxx| +AllZone: Getabout | £2.60 £9.00 xxxxx xxxxx | £2.60 £8.30 £33.20 xxxxx| +AllZone: Getabout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 £14.00 £56.00 xxxxx| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> @@ -8516,10 +8516,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ Sheffield CityBus @@ -8669,10 +8669,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -8823,10 +8823,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -8975,10 +8975,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ Doncaster DConnect @@ -9120,10 +9120,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9273,10 +9273,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9426,10 +9426,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9571,9 +9571,9 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9702,9 +9702,9 @@ AllZone: Getabout @@ -9838,15 +9838,15 @@ FARE ZONE: SHeffield ______ ______ ______ | off vehicle | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -9886,9 +9886,9 @@ ______ ______ _____ | ______ ______ ______ | @@ -9997,9 +9997,9 @@ Sheffield: CityBus @@ -10108,9 +10108,9 @@ Sheffield: CityWide + tram @@ -10220,9 +10220,9 @@ Barnsley: BConnect @@ -10331,9 +10331,9 @@ Doncaster: DConnect @@ -10442,9 +10442,9 @@ Rotherham: RConnect @@ -10553,9 +10553,9 @@ AllZone: SyConnect @@ -10687,18 +10687,18 @@ ______ ______ ______ | 1day 1week 28days 1year | day 1week 28days 1year | TravelMaster pass | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: Getabout | �2.60 �9.00 xxxxx xxxxx | �2.60 �8.30 �33.20 xxxxx| -AllZone: Getabout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 �14.00 �56.00 xxxxx| +AllZone: Getabout | £2.60 £9.00 xxxxx xxxxx | £2.60 £8.30 £33.20 xxxxx| +AllZone: Getabout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 £14.00 £56.00 xxxxx| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> @@ -10714,10 +10714,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10770,10 +10770,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10825,10 +10825,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10880,10 +10880,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10927,10 +10927,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10982,10 +10982,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11037,10 +11037,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11089,9 +11089,9 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11136,9 +11136,9 @@ AllZone: Getabout @@ -11192,15 +11192,15 @@ FARE ZONE: SHeffield ______ ______ ______ | off vehicle | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -11224,9 +11224,9 @@ ______ ______ _____ | ______ ______ ______ | Sheffield CityBus @@ -11261,9 +11261,9 @@ Sheffield: CityBus @@ -11297,9 +11297,9 @@ Sheffield: CityWide + tram @@ -11334,9 +11334,9 @@ Barnsley: BConnect @@ -11370,9 +11370,9 @@ Doncaster: DConnect @@ -11406,9 +11406,9 @@ Rotherham: RConnect @@ -11442,9 +11442,9 @@ AllZone: SyConnect diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 817777d3d..3b2cf693c 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -1,4 +1,4 @@ - + @@ -62,7 +62,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH @@ -73,7 +73,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210 @@ -153,7 +153,7 @@ true - M�rby + Mörby 90 @@ -244,7 +244,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210-2 diff --git a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml index 3ed5eecaa..5a9fb688e 100644 --- a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml +++ b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml @@ -1,7 +1,7 @@ - + + IFOPT representation of Tekniska Högskolan which is used for Bus and Metro in Stockholm (reduced) --> 2001-12-17T09:30:47.0Z SYS001 @@ -47,7 +47,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH @@ -58,7 +58,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210 @@ -183,7 +183,7 @@ true - M�rby + Mörby 90 @@ -274,7 +274,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210-2 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 700f24da6..e59970b67 100644 --- a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml +++ b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml b/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml index 036e3a6a8..c7c802578 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml b/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml index 3f81232da..67eb1071b 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml index 690872b6d..b4326a643 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml index 6ad706b99..023160447 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml b/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml index d26e55a05..5886000ea 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-example.xml b/examples/standards/norway/schedule/ServiceCalendar-example.xml index d5eb7ff6b..78d8899e1 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-example.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-example.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-test.xml b/examples/standards/norway/schedule/ServiceCalendar-test.xml index 9b5b3474f..cc125113a 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-test.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-test.xml @@ -1,4 +1,4 @@ - + 2017-01-02T12:00:00.0Z diff --git a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml index cb6c476df..4afdc320a 100644 --- a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml +++ b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/nta/NeTEx-Export Example.xml b/examples/standards/nta/NeTEx-Export Example.xml index 8580ae9bb..2ee18760e 100644 --- a/examples/standards/nta/NeTEx-Export Example.xml +++ b/examples/standards/nta/NeTEx-Export Example.xml @@ -1,4 +1,4 @@ - + 2012-10-25T13:53:18.0811912Z SYS0001 diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml b/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml index 383e39b77..8d8dcb290 100644 --- a/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml +++ b/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml @@ -1,4 +1,4 @@ - + @@ -147,7 +147,7 @@ The example shows the usage of special fares for - Brussels - K�ln + Brussels - Köln diff --git a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml index f892be511..e5829adb2 100644 --- a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml +++ b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml @@ -1,4 +1,4 @@ - + @@ -114,7 +114,7 @@ The example shows the usage of special fares for - Brussels - K�ln + Brussels - Köln diff --git a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml index c38fdbdd5..b3553008b 100644 --- a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml +++ b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml @@ -1,4 +1,4 @@ - + @@ -70,7 +70,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast lunch @@ -81,7 +81,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast @@ -102,7 +102,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. Double Affaires @@ -113,7 +113,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment Famille . + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment Famille . T4 Touriste @@ -125,7 +125,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans saisie type de lit , s�lectionner T2 et dans " compartiment , s�lectionner Famille . . + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans saisie type de lit , sélectionner T2 et dans " compartiment , sélectionner Famille . . T4 Touriste @@ -138,7 +138,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Si�ges Super inclinables + Sièges Super inclinables recliningSeats @@ -159,7 +159,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Gamme de prix ELIPSOS Trainh�tel + Gamme de prix ELIPSOS Trainhôtel @@ -184,78 +184,78 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. - L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). - En classe P, les enfants de moins de 4 ans et de 4 � 12 ans ne peuvent pas partager un lit. N�anmoins, une des deux personnes partageant la cabine peut �tre un enfant occupant un lit. Il est alors consid�r� comme la 2e personne pour b�n�ficier de ce tarif. + En classe P, les enfants de moins de 4 ans et de 4 à 12 ans ne peuvent pas partager un lit. Néanmoins, une des deux personnes partageant la cabine peut être un enfant occupant un lit. Il est alors considéré comme la 2e personne pour bénéficier de ce tarif. - Sur Mosa�que +, indiquez toujours 4 personnes m�me si la cabine est occup�e par 3 voyageurs. + Sur Mosaïque +, indiquez toujours 4 personnes même si la cabine est occupée par 3 voyageurs. - Tarif propos� �galement aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'�ge, ainsi qu_aux porteurs de la carte Carnet Jove �g�s de 14 � moins de 30 ans. + Tarif proposé également aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'âge, ainsi qu_aux porteurs de la carte Carnet Jove âgés de 14 à moins de 30 ans. - Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concern�s par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. - Uniquement sur les OD du Trainh�tel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainh�tel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. + Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concernés par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. + Uniquement sur les OD du Trainhôtel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainhôtel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. - Le client a acc�s � toutes les classes de service ind�pendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission � pr�senter au point de vente habilit�. + Le client a accès à toutes les classes de service indépendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission à présenter au point de vente habilité. - Pour un enfant de 4 � moins de 12 ans, �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re (Port Bou fronti�re sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye fronti�re sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne � condition que la cabine soit enti�rement r�serv�e. + Pour un enfant de 4 à moins de 12 ans, émettre un billet ouvert en 2e classe en précisant le point frontière (Port Bou frontière sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye frontière sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne à condition que la cabine soit entièrement réservée. - Les animaux domestiques de petite taille doivent �tre transport�s dans un contenant (taille maximale 60x35x35). �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'�mission de billet). + Les animaux domestiques de petite taille doivent être transportés dans un contenant (taille maximale 60x35x35). Émettre un billet ouvert en 2e classe en précisant le point frontière*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'émission de billet). - Condition non exig�e pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs � la pr�sence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. + Condition non exigée pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs à la présence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. - Pour effectuer une vente en cabine double Grande Classe au tarif Senior associ� au tarif Guide Handicap�, le dossier doit �tre constitu� sur Mosa�que classique (Pav� Accueil > Informations). + Pour effectuer une vente en cabine double Grande Classe au tarif Senior associé au tarif Guide Handicapé, le dossier doit être constitué sur Mosaïque classique (Pavé Accueil > Informations). - Trainh�tel No 409/407 (quotidien) + Trainhôtel No 409/407 (quotidien) - Trainh�tel No 477/475 (quotidien) + Trainhôtel No 477/475 (quotidien) - Trainh�tel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) + Trainhôtel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) - Trainh�tel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) + Trainhôtel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) - La cabine Double Grande Classe et la cabine Double Affaires doivent �tre utilis�es uniquement par deux personnes qui se connaissent (r�server en compartiment " Famille "). + La cabine Double Grande Classe et la cabine Double Affaires doivent être utilisées uniquement par deux personnes qui se connaissent (réserver en compartiment " Famille "). - Carte FIP + ordre de mission � pr�senter au poste de vente habilit�. + Carte FIP + ordre de mission à présenter au poste de vente habilité. - IMPORTANT ! Lors d_une vente, pour toute difficult� li�e � HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. + IMPORTANT ! Lors d_une vente, pour toute difficulté liée à HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans " saisie type de lit ", s�lectionner T2 et dans " compartiment ", s�lectionner " Famille ". + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans " saisie type de lit ", sélectionner T2 et dans " compartiment ", sélectionner " Famille ". - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment " Famille ". + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment " Famille ". - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. La r�servation reste obligatoire. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. La réservation reste obligatoire. @@ -315,7 +315,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Madrid Chamartin - Barcelone Fran�a + Barcelone França Zurich @@ -326,8 +326,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel FRANCISCO DE GOYA - Paris Austerlitz _ Les Aubrais - Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Paris Austerlitz _ Les Aubrais - Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -359,8 +359,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel JOAN MIRO - Paris Austerlitz _ Les Aubrais _ Orl�ans _ Limoges � destination de Figueras _ G�rone et Barcelone Fran�a + Trainhôtel JOAN MIRO + Paris Austerlitz _ Les Aubrais _ Orléans _ Limoges à destination de Figueras _ Gérone et Barcelone França @@ -380,8 +380,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - - + + @@ -389,14 +389,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel PAU CASALS - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich - - + + @@ -422,14 +422,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel SALVADOR DALI - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano - - + + @@ -455,13 +455,13 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue P29D @@ -478,11 +478,11 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -522,8 +522,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel FRANCISCO DE GOYA - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -1729,8 +1729,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel JOAN MIRO - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel JOAN MIRO + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -2936,8 +2936,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel PAU CASALS (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich @@ -3007,8 +3007,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel SALVADOR DALI (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano @@ -3095,14 +3095,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage 4 111 Enfant partegeant un lit - Cabine enti�rement r�serv�e. Compartiment Famille + Cabine entièrement réservée. Compartiment Famille @@ -3127,7 +3127,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment famille + Cabine entièrement réservée (10). Compartiment famille @@ -3144,12 +3144,12 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP Congress Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) @@ -3159,14 +3159,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Mini a Deux - Achat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + Achat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble 2 2 Duo (prix pour 2) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A @@ -3180,14 +3180,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Espace Plus (prix pour 4) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A 4 4 Group ticket - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) @@ -3197,8 +3197,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG 12 - Group Handicap� - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Group Handicapé + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -3216,13 +3216,13 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG true - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination rail rail false - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. P14D @@ -3230,7 +3230,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3250,7 +3250,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3285,7 +3285,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3320,7 +3320,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG anyTime - PremsOui jusqu_� H (2) du voyage aller + PremsOui jusqu_à H (2) du voyage aller @@ -3344,7 +3344,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3374,7 +3374,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG beforeStartOfValidity - La r�servation reste obligatoire + La réservation reste obligatoire reservationsCompulsory @@ -3384,7 +3384,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG true - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. @@ -3573,7 +3573,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage PT0012 @@ -3632,7 +3632,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Prems - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. PP05AD @@ -3671,7 +3671,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG MiniADeux - SAchat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + SAchat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble PP05AD @@ -3711,7 +3711,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Duo - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment "Famille" sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment "Famille" sauf en classe A @@ -3807,7 +3807,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Jeune - De 12 � moins de 26 ans le jour du voyage + De 12 à moins de 26 ans le jour du voyage @@ -3871,8 +3871,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Congr�s _ Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Congrès _ Salons + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) CN20AD @@ -3933,7 +3933,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR00AD @@ -3973,7 +3973,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR02AD @@ -3992,8 +3992,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Guide d_handicap� ou d_aveugle - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Guide d_handicapé ou d_aveugle + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -4058,7 +4058,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP @@ -4101,7 +4101,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant Partegeant Un Lit - Cabine enti�rement r�serv�e. Compartiment " Famille " + Cabine entièrement réservée. Compartiment " Famille " @@ -4141,7 +4141,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment "famille" + Cabine entièrement réservée (10). Compartiment "famille" @@ -4188,12 +4188,12 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -4216,7 +4216,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - + @@ -4228,9 +4228,9 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du -Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du +Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4335,7 +4335,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les senior - Handicap� + Handicapé Animale @@ -4417,7 +4417,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les TypeOfFareProduct - Trainh�tel + Trainhôtel diff --git a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml index 33741f6b5..f9d616937 100644 --- a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml +++ b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml @@ -1,4 +1,4 @@ - + @@ -104,7 +104,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast lunch @@ -115,7 +115,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast @@ -136,7 +136,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. Double Affaires @@ -147,7 +147,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment Famille . + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment Famille . T4 Touriste @@ -159,7 +159,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans saisie type de lit , s�lectionner T2 et dans " compartiment , s�lectionner Famille . . + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans saisie type de lit , sélectionner T2 et dans " compartiment , sélectionner Famille . . T4 Touriste @@ -172,7 +172,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Si�ges Super inclinables + Sièges Super inclinables recliningSeats @@ -193,7 +193,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Gamme de prix ELIPSOS Trainh�tel + Gamme de prix ELIPSOS Trainhôtel @@ -218,78 +218,78 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. - L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). - En classe P, les enfants de moins de 4 ans et de 4 � 12 ans ne peuvent pas partager un lit. N�anmoins, une des deux personnes partageant la cabine peut �tre un enfant occupant un lit. Il est alors consid�r� comme la 2e personne pour b�n�ficier de ce tarif. + En classe P, les enfants de moins de 4 ans et de 4 à 12 ans ne peuvent pas partager un lit. Néanmoins, une des deux personnes partageant la cabine peut être un enfant occupant un lit. Il est alors considéré comme la 2e personne pour bénéficier de ce tarif. - Sur Mosa�que +, indiquez toujours 4 personnes m�me si la cabine est occup�e par 3 voyageurs. + Sur Mosaïque +, indiquez toujours 4 personnes même si la cabine est occupée par 3 voyageurs. - Tarif propos� �galement aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'�ge, ainsi qu_aux porteurs de la carte Carnet Jove �g�s de 14 � moins de 30 ans. + Tarif proposé également aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'âge, ainsi qu_aux porteurs de la carte Carnet Jove âgés de 14 à moins de 30 ans. - Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concern�s par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. - Uniquement sur les OD du Trainh�tel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainh�tel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. + Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concernés par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. + Uniquement sur les OD du Trainhôtel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainhôtel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. - Le client a acc�s � toutes les classes de service ind�pendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission � pr�senter au point de vente habilit�. + Le client a accès à toutes les classes de service indépendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission à présenter au point de vente habilité. - Pour un enfant de 4 � moins de 12 ans, �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re (Port Bou fronti�re sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye fronti�re sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne � condition que la cabine soit enti�rement r�serv�e. + Pour un enfant de 4 à moins de 12 ans, émettre un billet ouvert en 2e classe en précisant le point frontière (Port Bou frontière sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye frontière sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne à condition que la cabine soit entièrement réservée. - Les animaux domestiques de petite taille doivent �tre transport�s dans un contenant (taille maximale 60x35x35). �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'�mission de billet). + Les animaux domestiques de petite taille doivent être transportés dans un contenant (taille maximale 60x35x35). Émettre un billet ouvert en 2e classe en précisant le point frontière*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'émission de billet). - Condition non exig�e pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs � la pr�sence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. + Condition non exigée pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs à la présence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. - Pour effectuer une vente en cabine double Grande Classe au tarif Senior associ� au tarif Guide Handicap�, le dossier doit �tre constitu� sur Mosa�que classique (Pav� Accueil > Informations). + Pour effectuer une vente en cabine double Grande Classe au tarif Senior associé au tarif Guide Handicapé, le dossier doit être constitué sur Mosaïque classique (Pavé Accueil > Informations). - Trainh�tel No 409/407 (quotidien) + Trainhôtel No 409/407 (quotidien) - Trainh�tel No 477/475 (quotidien) + Trainhôtel No 477/475 (quotidien) - Trainh�tel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) + Trainhôtel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) - Trainh�tel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) + Trainhôtel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) - La cabine Double Grande Classe et la cabine Double Affaires doivent �tre utilis�es uniquement par deux personnes qui se connaissent (r�server en compartiment " Famille "). + La cabine Double Grande Classe et la cabine Double Affaires doivent être utilisées uniquement par deux personnes qui se connaissent (réserver en compartiment " Famille "). - Carte FIP + ordre de mission � pr�senter au poste de vente habilit�. + Carte FIP + ordre de mission à présenter au poste de vente habilité. - IMPORTANT ! Lors d_une vente, pour toute difficult� li�e � HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. + IMPORTANT ! Lors d_une vente, pour toute difficulté liée à HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans " saisie type de lit ", s�lectionner T2 et dans " compartiment ", s�lectionner " Famille ". + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans " saisie type de lit ", sélectionner T2 et dans " compartiment ", sélectionner " Famille ". - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment " Famille ". + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment " Famille ". - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. La r�servation reste obligatoire. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. La réservation reste obligatoire. @@ -348,7 +348,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Madrid Chamartin - Barcelone Fran�a + Barcelone França Zurich @@ -359,8 +359,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel FRANCISCO DE GOYA - Paris Austerlitz _ Les Aubrais - Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Paris Austerlitz _ Les Aubrais - Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -392,8 +392,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel JOAN MIRO - Paris Austerlitz _ Les Aubrais _ Orl�ans _ Limoges � destination de Figueras _ G�rone et Barcelone Fran�a + Trainhôtel JOAN MIRO + Paris Austerlitz _ Les Aubrais _ Orléans _ Limoges à destination de Figueras _ Gérone et Barcelone França @@ -413,8 +413,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - - + + @@ -422,14 +422,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel PAU CASALS - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich - - + + @@ -455,14 +455,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel SALVADOR DALI - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano - - + + @@ -488,13 +488,13 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue P29D @@ -511,11 +511,11 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -639,8 +639,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel FRANCISCO DE GOYA - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -1806,8 +1806,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel JOAN MIRO - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel JOAN MIRO + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -2973,8 +2973,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel PAU CASALS (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich @@ -3004,8 +3004,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel SALVADOR DALI (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano @@ -3051,14 +3051,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage 4 111 Enfant partegeant un lit - Cabine enti�rement r�serv�e. Compartiment Famille + Cabine entièrement réservée. Compartiment Famille @@ -3083,7 +3083,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment famille + Cabine entièrement réservée (10). Compartiment famille @@ -3100,12 +3100,12 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP Congress Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) @@ -3115,14 +3115,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Mini a Deux - Achat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + Achat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble 2 2 Duo (prix pour 2) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A @@ -3136,14 +3136,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Espace Plus (prix pour 4) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A 4 4 Group ticket - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) @@ -3153,8 +3153,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE 12 - Group Handicap� - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Group Handicapé + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -3172,13 +3172,13 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE true - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination rail rail false - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. P14D @@ -3186,7 +3186,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3206,7 +3206,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3241,7 +3241,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3276,7 +3276,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE anyTime - PremsOui jusqu_� H (2) du voyage aller + PremsOui jusqu_à H (2) du voyage aller @@ -3300,7 +3300,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3330,7 +3330,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE beforeStartOfValidity - La r�servation reste obligatoire + La réservation reste obligatoire reservationsCompulsory @@ -3340,7 +3340,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE true - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. @@ -3399,12 +3399,12 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -3428,7 +3428,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - + @@ -3465,7 +3465,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage PT0012 @@ -3539,7 +3539,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Prems - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. PP05AD @@ -3582,7 +3582,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE MiniADeux - SAchat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + SAchat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble PP05AD @@ -3625,7 +3625,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Duo - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment "Famille" sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment "Famille" sauf en classe A @@ -3729,7 +3729,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Jeune - De 12 � moins de 26 ans le jour du voyage + De 12 à moins de 26 ans le jour du voyage @@ -3817,8 +3817,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Congr�s _ Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Congrès _ Salons + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) CN20AD @@ -3903,7 +3903,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR00AD @@ -3947,7 +3947,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR02AD @@ -3990,8 +3990,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Guide d_handicap� ou d_aveugle - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Guide d_handicapé ou d_aveugle + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -4080,7 +4080,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP @@ -4136,7 +4136,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant Partegeant Un Lit - Cabine enti�rement r�serv�e. Compartiment " Famille " + Cabine entièrement réservée. Compartiment " Famille " @@ -4179,7 +4179,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment "famille" + Cabine entièrement réservée (10). Compartiment "famille" @@ -4230,8 +4230,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4265,9 +4265,9 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du -Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du +Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4314,7 +4314,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les senior - Handicap� + Handicapé Animale @@ -4396,7 +4396,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les TypeOfFareProduct - Trainh�tel + Trainhôtel diff --git a/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml b/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml index 8fc38f25a..7e6c50ba2 100644 --- a/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml +++ b/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml b/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml index 8d32b4899..65c181549 100644 --- a/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml b/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml index 8fe5f2e0b..419385018 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml b/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml index c759755e7..3aa2efb67 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml b/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml index 330068f76..e7fbc2041 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml b/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml index 4a0393216..2e67e99ea 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml b/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml index 7db2d1c15..c0e6d2539 100644 --- a/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml b/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml index c757cd4ec..c05113fb0 100644 --- a/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml index 494a9109a..fe5316b6b 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml index 1dd891767..c7adb4f01 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml index 21fcb7b19..285f16c2d 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml index 891363e0e..0e1258b47 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml index 3978156cf..d79f6e6d9 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml index 60720388e..cf2fe1a9c 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml index 799d0fbc5..e47b4b4a3 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml index 3a6875b77..1692f1506 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml index a9eb0c667..f680f8c84 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml index f6a93f12d..cf227d833 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication-NoConstraint.xsd b/xsd/NeTEx_publication-NoConstraint.xsd index dde4d75f5..0d3963541 100644 --- a/xsd/NeTEx_publication-NoConstraint.xsd +++ b/xsd/NeTEx_publication-NoConstraint.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 9ccf5ddd9..742f86bd8 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index ea9f6edbd..03334b967 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd index 6d6361f99..01b9c3c30 100644 --- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd index f39269935..01834d945 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index a2d7e9e93..a45b7c5eb 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 95e0029f5..312ca8245 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd index 50ef33812..717166c79 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd index fc68c4209..9cc4b6934 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 37a1815af..8cc98fff1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd index 3dd5758ef..a7f9b7293 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd index 94fe044b9..bff3eb407 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_utility/netex_location_types.xsd b/xsd/netex_framework/netex_utility/netex_location_types.xsd index 62cf219da..b02eb4b63 100644 --- a/xsd/netex_framework/netex_utility/netex_location_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_location_types.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd index 4f4322ba7..6ae817b03 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd @@ -1,4 +1,4 @@ - + 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 f4fd3c7ae..eacd4a944 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd index 66747f64b..fcd8a84da 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index f29a49b5d..a8a586f2f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -1,4 +1,4 @@ - + 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 03183c86b..5b2180e34 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -1,4 +1,4 @@ - + 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 f7244cb91..95c498e7a 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd index 1d3663bc7..167cca972 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 1ed177d26..cd4c1e7df 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd index 37248b541..be397201c 100644 --- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd index a4ef08cd9..16b2c0452 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd index 7babde2ac..c227a0682 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd index 70c0dce46..845eadf8e 100644 --- a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd +++ b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd @@ -1,4 +1,4 @@ - + From eaf7225df1a4e26b189d2130bdbd4e2463ec5ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 4 May 2022 17:16:18 +0200 Subject: [PATCH 35/74] changes according to basecamp discussion (#344) * changes according to basecamp discussion * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd Co-authored-by: Stefan de Konink * Apply suggestions from code review Co-authored-by: Stefan de Konink --- .../netex_servicePattern_support.xsd | 19 +++++++++++++++++++ .../netex_servicePattern_version.xsd | 13 ++++++++++++- .../netex_timingPattern_version.xsd | 1 - 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index b2824a243..8f62c3c14 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -393,6 +393,25 @@ Rail transport, Roads and Road transport + + + Allowed values for sides in direction of travel to board and alight. + + + + + + + In special cases the vehicle can be boarded and/or alighted from both sides. + + + + + Only to be used, when there is really no value to be defined. The side is a rather important element to support PRM. + + + + Allowed values for Stop RequestMethod diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index cd4c1e7df..2a825338a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -48,7 +48,8 @@ Add mode of operation for VehicleEntrance Add VEHICLE MEETING POINT TO CONNECTION END - 2019-03-01Comment SBB20 + + 2019-03-01Comment SBB20 Extension of ConnectionEnd (submode and transportOrganisation) @@ -833,6 +834,16 @@ Rail transport, Roads and Road transport Whether boarding is allowed at the stop. Default is true. + + + On which side the vehicle can be alighted on this stop in the direction of travel. This is often not relevant. And it is difficult to define this from the QUAY when the direction of travel is not known. + + + + + On which side the vehicle can be boarded on this stop in the direction of travel. + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd index 733c7dece..8152c10d8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -1,5 +1,4 @@ - From 5f6a146804015a72faf672eeffd9e0368e21ddcb Mon Sep 17 00:00:00 2001 From: ue71603 Date: Fri, 13 May 2022 12:48:01 +0200 Subject: [PATCH 36/74] Update netex_acsb_limitations.xsd --- .../netex_accessibility/netex_acsb_limitations.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index 31faa2fe4..2d0462303 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -154,8 +154,8 @@ Rail transport, Roads and Road transport - Whether the platform is high enough and gap is small enough for level access into vehicle -Station/Platform has WheelChairAccess AND at platform(s) used by level floor access vehicles in the timetable at least at a designated wheelchair door (position) the gap between platform and vehicle floor (including sliding step) does not exceed 75 mm measured horizontally and 50 mm measured vertically (TSI PRN). If Platform.LevelAcccesIntoVehicle is ‘true’ AND Vehicle.StepFreeAccess is ‘true’ vehicle entrance for a wheelchairuser is possible independently. + Whether the platform is high enough and gap is small enough for level access into vehicle. +At least at a designated wheelchair door position the gap between platform and vehicle floor (of level access vehicle) does not exceed 75 mm measured horizontally and 50 mm measured vertically including sliding step (according to PRM TSI). From f4465b95b9f11cf22e85044b2717646cb2ce8a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 20 May 2022 12:17:34 +0200 Subject: [PATCH 37/74] Stairfree Access as Limitation to be more compatible with OJP (#362) * Stairfree Access as Limitation to be more compatible with OJP and for EP --- .../netex_accessibility/netex_acsb_limitations.xsd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index 2d0462303..2fb14667c 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -65,6 +65,7 @@ Rail transport, Roads and Road transport + @@ -136,6 +137,11 @@ Rail transport, Roads and Road transport Whether a PLACE has step free access. + + + Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed. + + Whether a PLACE has escalator free access. From 4889e9e2d736cd0a76eb5faff99708e005999551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 Mar 2023 06:14:57 +0100 Subject: [PATCH 38/74] Update netex_ifopt_site_version.xsd (#410) * Update netex_ifopt_site_version.xsd * new name after discussion with Stefan * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd --- .../part1_ifopt/netex_ifopt_site_version.xsd | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 365397670..abeda343e 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 @@ -1,5 +1,4 @@ - @@ -570,11 +569,6 @@ Rail transport, Roads and Road transport - - - Order of Levels. The levels numbers are not absolute, but only give a relative order. - - @@ -608,6 +602,11 @@ 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. + + Accessibility values associated with LEVEL. From b28946ea4397ab7f8fe3c7d3c6920a6dddb56ed0 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 2 Mar 2023 07:10:02 +0100 Subject: [PATCH 39/74] Fix branch Notice that the examples still miss RelativeLevelOrder. --- xsd/NeTEx_publication_timetable.xsd | 1 - xsd/gml/geometryAggregates-extract-v3_2_1.xsd | 2 +- xsd/gml/geometryPrimitives-extract-v3_2_1.xsd | 2 +- .../netex_acsb_limitations.xsd | 11 +++--- .../netex_zone_version.xsd | 3 +- .../netex_facility_support.xsd | 7 ++-- .../part1_frames/netex_siteFrame_version.xsd | 1 - ...netex_ifopt_equipmentTicketing_version.xsd | 1 - .../part1_ifopt/netex_ifopt_path_support.xsd | 2 +- .../netex_ifopt_stopPlace_support.xsd | 8 ++--- ..._passengerInformationEquipment_version.xsd | 3 +- .../netex_servicePattern_version.xsd | 34 +++++++------------ .../netex_usageParameterTravel_version.xsd | 7 ++-- 13 files changed, 31 insertions(+), 51 deletions(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 9cbde6e60..631292645 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1009,7 +1009,6 @@ Provides a general purose wrapper for NeTEx data content. -<<<<<<< HEAD diff --git a/xsd/gml/geometryAggregates-extract-v3_2_1.xsd b/xsd/gml/geometryAggregates-extract-v3_2_1.xsd index 742dbe8e4..e55f23021 100644 --- a/xsd/gml/geometryAggregates-extract-v3_2_1.xsd +++ b/xsd/gml/geometryAggregates-extract-v3_2_1.xsd @@ -54,4 +54,4 @@ The members of the geometric aggregate may be specified either using the "standa - \ No newline at end of file + diff --git a/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd b/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd index 8eb043d6f..c78b0cb85 100644 --- a/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd +++ b/xsd/gml/geometryPrimitives-extract-v3_2_1.xsd @@ -1,5 +1,5 @@ - + geometryPrimitives.xsd See ISO/DIS 19136 Clause 11. diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index ecc52d67b..e5216ef18 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -16,8 +16,7 @@ 2011-11-05 - - 2012-05-29 Add partial value for limitationStatus + 2012-05-29 Add partial value for limitationStatus

NeTEx - Network Exchange. This subschema defines common accessibility limitation types.

@@ -64,7 +63,7 @@ Rail transport, Roads and Road transport - + @@ -117,12 +116,12 @@ Rail transport, Roads and Road transport Whether a PLACE has tactile guidance. - + Whether a PLACE allows guide dog access. - + @@ -140,7 +139,7 @@ Rail transport, Roads and Road transport Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed. - + Whether a PLACE has escalator free access. diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index af839607a..1af992ae9 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -27,8 +27,7 @@ 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy - - 2021-01-25Add GroupOfTariffZones + 2021-01-25Add GroupOfTariffZones

NeTEx - Network Exchange. This subschema defines ZONE types.

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 620983acc..e4e3c4f2b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -34,9 +34,8 @@ 2021-04-15New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other. - - 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility - + 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the FACILITY subtypes

@@ -297,7 +296,7 @@ Rail transport, Roads and Road transport Assistance is dependent on the journey. - + Not known if assistance is available. 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 b62c49b00..19915fb12 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -236,6 +236,5 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd index 1d5b1fb53..db22c2f18 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd @@ -2,7 +2,6 @@ - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 6ed829731..522179008 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -312,7 +312,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 010ba8e40..49a4df1f0 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -383,12 +383,12 @@ Rail transport, Roads and Road transport - - + + - - + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index 0ae9f156c..afa50de0d 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -24,8 +24,7 @@ 2011-02-05 - - 2019-04-15Add missing element from TypeofPassengerInformationEquipment + 2019-04-15Add missing element from TypeofPassengerInformationEquipment

NeTEx - Network Exchange. This subschema defines PASSENGER INFORMATION EQUIPMENT types.

diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 2a825338a..9403fac92 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -1,5 +1,4 @@ - @@ -21,35 +20,26 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-05-19CRT040 + 2017-05-19CRT040 Allow type attribute on Public and ShortCode. Backwards compatible. Add NameSuffix to SchedueldStopPoint - - 2017-06-11CRT023 Add BookingArrangements to StopPointInPattern nt + 2017-06-11CRT023 Add BookingArrangements to StopPointInPattern nt - - 2017-05-25Text on for alighting/boarding corrected. Doc change only. + 2017-05-25Text on for alighting/boarding corrected. Doc change only. - - 2019-02-21Remove commented out old Section code + 2019-02-21Remove commented out old Section code - - 2019-03-25Merge in Corrections to comments as per SBB20 #55 Correct camel case on StopPoinInXXX groups. + 2019-03-25Merge in Corrections to comments as per SBB20 #55 Correct camel case on StopPoinInXXX groups. - - 2019-03-25 NL48 CD #64 Add new attributes for advertising of stop; Print and Dynamic to StopPointInPattern. + 2019-03-25 NL48 CD #64 Add new attributes for advertising of stop; Print and Dynamic to StopPointInPattern. - - 2020-10-05 New Modes: Change to allow all modes for connection end. + 2020-10-05 New Modes: Change to allow all modes for connection end. Add mode of operation for VehicleEntrance Add VEHICLE MEETING POINT TO CONNECTION END - - 2019-03-01Comment SBB20 + 2019-03-01Comment SBB20 Extension of ConnectionEnd (submode and transportOrganisation) @@ -837,13 +827,13 @@ Rail transport, Roads and Road transport On which side the vehicle can be alighted on this stop in the direction of travel. This is often not relevant. And it is difficult to define this from the QUAY when the direction of travel is not known. - + On which side the vehicle can be boarded on this stop in the direction of travel. - - + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd index 704ab464c..2577c24fe 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -34,9 +34,6 @@ 2020-10-05 New Modes: Allow all modes for interchanging - - 2020-12-10FIX - Make ActivationMeans into list -

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the Travel USAGE PARAMETER types.

@@ -432,9 +429,9 @@ Rail transport, Roads and Road transport Duration of USAGE VALIDITY PERIOD. - + - Means of activating start of period. + Means of activatiing start of period. From 3c9abe6016c22fd872bc3614f346b9af21012202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 13 Mar 2023 19:20:53 +0100 Subject: [PATCH 40/74] examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional and a small validity problem (#430) 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 | 38 +++++++++++++++++-- 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, 70 insertions(+), 8 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..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 @@ -766,14 +765,23 @@ Erdgeschoss G + G + true + 0 1. Untergeschoss B1 + B1 + true + -1 2. Untergeschoss B2 + B2 + true + -2 @@ -6075,10 +6083,16 @@ 1. Obergeschoss F1 + F1 + true + 1 Erdgeschoss G + G + true + 0 @@ -6766,6 +6780,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -7368,6 +7385,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -9334,10 +9354,16 @@ 1. Obergeschoss F1 + F1 + true + 1 Erdgeschoss G + G + true + 0 @@ -10056,6 +10082,9 @@ Erdgeschoss G + G + true + 0 interchangeAllowed @@ -10442,6 +10471,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..816d13613 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 a505efbc26dc142e1059ac8a6d4748ceac27e0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Sep 2023 22:21:49 +0200 Subject: [PATCH 41/74] BeaconEquipment added and example VehicleType modeling for EPIAP (#365) * First part of Beacon Equipment * second part of BeaconEquipment * BeaconEquipment -> PassengerBeaconEquipment There are also technical Beacons with BeaconPoint. As they are different currently no ref is added in either element. * XML Spy removed * fixed example and added examples to project * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review --------- Co-authored-by: Stefan de Konink --- NeTEx.spp | 5 + ...AP_Accessibility_Chur_V08_vehicletypes.xml | 2467 +++++++++++++++++ ...netex_ifopt_equipmentPassenger_support.xsd | 90 +- ...netex_ifopt_equipmentPassenger_version.xsd | 78 +- 4 files changed, 2637 insertions(+), 3 deletions(-) create mode 100644 examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml diff --git a/NeTEx.spp b/NeTEx.spp index 1c4f8643d..c2a933644 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -947,6 +947,11 @@ + + + + + diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml new file mode 100644 index 000000000..6e217402a --- /dev/null +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -0,0 +1,2467 @@ + + + 2021-10-25T10:49:51.6560213+02:00 + MENTZ + NeTEx Export, Version: 19.9.0.3016 + + + + 2020-12-13T00:00:00 + 2021-12-11T23:59:59 + + + + + epd + http://netex-cen.eu/epip_data + EPIP data + + + + + + + + + + + + + + + creates + Planning + + + + + + Schweizerische Bundesbahnen SBB + SBB + + + EntityLegalOwnership + + + + Operation + + + + + + + + ProductCategories + + + Bus + B + + + + + + + 11 + Schweizerische Bundesbahnen SBB + SBB + + + Accessibility NeTEx + 1 + 1 + + + + + Schiene + 91 + 91 + + + + + + Locker storage + false + true + false + true + 0.5 + 1 + 1 + P7D + + + freeTrolleys + true + true + true + + + 1239123112311231 + unidirectional + Eddystone + https://123.12.2.21/beaconbackend/ + + + Door + 1 + 0.20 + true + assistedWheelchair + + + Ramp + 1 + true + + + + + CitaroK Churbus + CitaroK + true + true + false + 11 + 2.550 + 1 + + + audioInformation + purchase + automaticRamp + + + + + true + true + + + + Wagen 1 + engine + secondClass + + 46 + 10 + 2 + + + + wheelchairAccessToilet + + + + + + + Wagen 2 + carriage + secondClass + + 45 + 20 + 0 + + + + cyclesAllowedInCarriage baggageStorage + + + + + + + Wagen 3 + carriage + firstClass secondClass + + 38 + 20 + 0 + + + + cyclesAllowedInCarriage baggageStorage + + + + + + + Wagen 4 + engine + secondClass + + 46 + 10 + 0 + + + + cyclesAllowedInCarriage baggageStorage + + + + + + + + + + + + + + + + + + + + + + + + + + VehicleModeStandardBus + + + + + + + + + + + 3 + DoorManufacturer + + + + 1 + RampManufacturer + + + + + + + + + + GlobalId + 8b930b7b-059b-4d0e-8db1-6512f12bc1b9 + + + GKZ + 011901 + + + + Chur + + town + CH + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + GlobalID + 8509000 + + + Chur + CH + 8509000 + + + + + Basement + -1 + + + Ground + 0 + + + Upper + 1 + + + + + Zugang Gürtel + ZUG + 80 + + + + true + true + + + + + Zugang Bahnhofsplatz + ZuB + 82 + + + + Zugang Postauto + ZuP + 83 + + + + Zu Bahnsteig 1 + ZuB1 + 84 + + + + + + + + + Bahnsteig 1 + BS1 + BS1 + railPlatform + + + Bahnsteig 3 + BS3 + 3 + + BS3 + railPlatform + + + Bahnsteig 4 + BS4 + 4 + + BS4 + railPlatform + + + Bahnsteig 5 + BS5 + 5 + + BS5 + railPlatform + + + Zug1 + Z1 + 6 + + Z1 + railPlatform + + + Zug 2 + Z2 + 7 + + Z2 + railPlatform + + + Zwischengeschoss + ZW + 70 + + ZW + other + + + Zw Brücke + ZWB + 71 + + ZWB + other + + + ZW Bahnsteig 1 + ZW1 + 72 + + ZW1 + other + + + Zugang Gürtel + ZUG + 80 + + ZUG + other + + + Zugang Bahnhofsplatz + ZuB + 82 + + ZuB + other + + + Zugang Postauto + ZuP + 83 + + ZuP + other + + + Zu Bahnsteig 1 + ZuB1 + 84 + + ZuB1 + other + + + 1 + 1 + + 1 + + + + 2 + 2 + + 2 + + + + 3 + 3 + + 10 + + + + 10ABC + 10ABC + + 10ABC + + + + 10DE + 10DE + + 10DE + + + + 10E + 10E + + 10E + + + + 11 + 11 + + 11 + + + + 12 + 12 + + 12 + + + + 13 + 13 + + 13 + + + + 14 + 14 + + 14 + + + + 4 + 4 + + 4 + + + + 5 + 5 + + 5 + + + + 7 + 7 + + 7 + + + 8 + 8 + + 8 + + + 9 + 9 + + 9 + + + + + + ZW + + + lockers + + + + + ZW1 + ZW Bahnsteig 1 + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + GlobalID + 8575112 + + + Chur, Postautostation + 8575112 + + + + + Ground + 0 + + + + + 0 + + other + + + + Gen + + + + + + + 1978-10-01T00:00:00 + 2500-12-31T00:00:00 + + + + GlobalID + 8581044 + + + Chur, Bahnhofplatz + CHBA + 8581044 + + + + + Ground + 0 + + + + + Bahnsteig 1 + BS1 + 1 + + BS1 + other + + + + A + A + + A + + + + B + B + + B + + + + C + C + + C + + + + D + D + + D + + + + E + E + + E + + + + + + + + HstnrLokal + 7000 + + + HstnrNational + 49000817 + + + Bern + 7000 + + + 7.4391195476977394 + 46.94882495970554 + 0 + + + + + + + + + + + + + oneWay + barrier + true + + PT5M30S + + + + + + + + + + + oneWay + barrier + + PT3M30S + + + + + + + + + + + oneWay + barrier + + PT3M + + + + + + + + + Hin + H + outbound + + + Rück + R + inbound + + + + + + 2020-12-13T00:00:00 + + YYY + YYY + unknown + YYY + + + + + + + Chur, Postautostation + Gen + + + Chur, Bahnhofplatz + A + + + Chur + 4 + + + + + + + 30 + + + + + 50 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 1 + outbound + + + + true + true + false + access + + + + true + true + false + access + + + + true + true + false + access + + + + + + + + + + + passenger + + + 1 + 1 + 1 + inbound + + + + true + true + false + access + + + + true + true + false + access + + + + true + true + false + access + + + + + + + + + + + passenger + + + + + + + Fahrplan 2021 + 2020-12-13 + 2021-12-11 + + + 2020-12-13 + + + + 2020-12-14 + + + + 2020-12-15 + + + + 2020-12-16 + + + + 2020-12-17 + + + + 2020-12-18 + + + + 2020-12-19 + + + + 2020-12-20 + + + + 2020-12-21 + + + + 2020-12-22 + + + + 2020-12-23 + + + + 2020-12-24 + + + + 2020-12-25 + + + + 2020-12-26 + + + + 2020-12-27 + + + + 2020-12-28 + + + + 2020-12-29 + + + + 2020-12-30 + + + + 2020-12-31 + + + + 2021-01-01 + + + + 2021-01-02 + + + + 2021-01-03 + + + + 2021-01-04 + + + + 2021-01-05 + + + + 2021-01-06 + + + + 2021-01-07 + + + + 2021-01-08 + + + + 2021-01-09 + + + + 2021-01-10 + + + + 2021-01-11 + + + + 2021-01-12 + + + + 2021-01-13 + + + + 2021-01-14 + + + + 2021-01-15 + + + + 2021-01-16 + + + + 2021-01-17 + + + + 2021-01-18 + + + + 2021-01-19 + + + + 2021-01-20 + + + + 2021-01-21 + + + + 2021-01-22 + + + + 2021-01-23 + + + + 2021-01-24 + + + + 2021-01-25 + + + + 2021-01-26 + + + + 2021-01-27 + + + + 2021-01-28 + + + + 2021-01-29 + + + + 2021-01-30 + + + + 2021-01-31 + + + + 2021-02-01 + + + + 2021-02-02 + + + + 2021-02-03 + + + + 2021-02-04 + + + + 2021-02-05 + + + + 2021-02-06 + + + + 2021-02-07 + + + + 2021-02-08 + + + + 2021-02-09 + + + + 2021-02-10 + + + + 2021-02-11 + + + + 2021-02-12 + + + + 2021-02-13 + + + + 2021-02-14 + + + + 2021-02-15 + + + + 2021-02-16 + + + + 2021-02-17 + + + + 2021-02-18 + + + + 2021-02-19 + + + + 2021-02-20 + + + + 2021-02-21 + + + + 2021-02-22 + + + + 2021-02-23 + + + + 2021-02-24 + + + + 2021-02-25 + + + + 2021-02-26 + + + + 2021-02-27 + + + + 2021-02-28 + + + + 2021-03-01 + + + + 2021-03-02 + + + + 2021-03-03 + + + + 2021-03-04 + + + + 2021-03-05 + + + + 2021-03-06 + + + + 2021-03-07 + + + + 2021-03-08 + + + + 2021-03-09 + + + + 2021-03-10 + + + + 2021-03-11 + + + + 2021-03-12 + + + + 2021-03-13 + + + + 2021-03-14 + + + + 2021-03-15 + + + + 2021-03-16 + + + + 2021-03-17 + + + + 2021-03-18 + + + + 2021-03-19 + + + + 2021-03-20 + + + + 2021-03-21 + + + + 2021-03-22 + + + + 2021-03-23 + + + + 2021-03-24 + + + + 2021-03-25 + + + + 2021-03-26 + + + + 2021-03-27 + + + + 2021-03-28 + + + + 2021-03-29 + + + + 2021-03-30 + + + + 2021-03-31 + + + + 2021-04-01 + + + + 2021-04-02 + + + + 2021-04-03 + + + + 2021-04-04 + + + + 2021-04-05 + + + + 2021-04-06 + + + + 2021-04-07 + + + + 2021-04-08 + + + + 2021-04-09 + + + + 2021-04-10 + + + + 2021-04-11 + + + + 2021-04-12 + + + + 2021-04-13 + + + + 2021-04-14 + + + + 2021-04-15 + + + + 2021-04-16 + + + + 2021-04-17 + + + + 2021-04-18 + + + + 2021-04-19 + + + + 2021-04-20 + + + + 2021-04-21 + + + + 2021-04-22 + + + + 2021-04-23 + + + + 2021-04-24 + + + + 2021-04-25 + + + + 2021-04-26 + + + + 2021-04-27 + + + + 2021-04-28 + + + + 2021-04-29 + + + + 2021-04-30 + + + + 2021-05-01 + + + + 2021-05-02 + + + + 2021-05-03 + + + + 2021-05-04 + + + + 2021-05-05 + + + + 2021-05-06 + + + + 2021-05-07 + + + + 2021-05-08 + + + + 2021-05-09 + + + + 2021-05-10 + + + + 2021-05-11 + + + + 2021-05-12 + + + + 2021-05-13 + + + + 2021-05-14 + + + + 2021-05-15 + + + + 2021-05-16 + + + + 2021-05-17 + + + + 2021-05-18 + + + + 2021-05-19 + + + + 2021-05-20 + + + + 2021-05-21 + + + + 2021-05-22 + + + + 2021-05-23 + + + + 2021-05-24 + + + + 2021-05-25 + + + + 2021-05-26 + + + + 2021-05-27 + + + + 2021-05-28 + + + + 2021-05-29 + + + + 2021-05-30 + + + + 2021-05-31 + + + + 2021-06-01 + + + + 2021-06-02 + + + + 2021-06-03 + + + + 2021-06-04 + + + + 2021-06-05 + + + + 2021-06-06 + + + + 2021-06-07 + + + + 2021-06-08 + + + + 2021-06-09 + + + + 2021-06-10 + + + + 2021-06-11 + + + + 2021-06-12 + + + + 2021-06-13 + + + + 2021-06-14 + + + + 2021-06-15 + + + + 2021-06-16 + + + + 2021-06-17 + + + + 2021-06-18 + + + + 2021-06-19 + + + + 2021-06-20 + + + + 2021-06-21 + + + + 2021-06-22 + + + + 2021-06-23 + + + + 2021-06-24 + + + + 2021-06-25 + + + + 2021-06-26 + + + + 2021-06-27 + + + + 2021-06-28 + + + + 2021-06-29 + + + + 2021-06-30 + + + + 2021-07-01 + + + + 2021-07-02 + + + + 2021-07-03 + + + + 2021-07-04 + + + + 2021-07-05 + + + + 2021-07-06 + + + + 2021-07-07 + + + + 2021-07-08 + + + + 2021-07-09 + + + + 2021-07-10 + + + + 2021-07-11 + + + + 2021-07-12 + + + + 2021-07-13 + + + + 2021-07-14 + + + + 2021-07-15 + + + + 2021-07-16 + + + + 2021-07-17 + + + + 2021-07-18 + + + + 2021-07-19 + + + + 2021-07-20 + + + + 2021-07-21 + + + + 2021-07-22 + + + + 2021-07-23 + + + + 2021-07-24 + + + + 2021-07-25 + + + + 2021-07-26 + + + + 2021-07-27 + + + + 2021-07-28 + + + + 2021-07-29 + + + + 2021-07-30 + + + + 2021-07-31 + + + + 2021-08-01 + + + + 2021-08-02 + + + + 2021-08-03 + + + + 2021-08-04 + + + + 2021-08-05 + + + + 2021-08-06 + + + + 2021-08-07 + + + + 2021-08-08 + + + + 2021-08-09 + + + + 2021-08-10 + + + + 2021-08-11 + + + + 2021-08-12 + + + + 2021-08-13 + + + + 2021-08-14 + + + + 2021-08-15 + + + + 2021-08-16 + + + + 2021-08-17 + + + + 2021-08-18 + + + + 2021-08-19 + + + + 2021-08-20 + + + + 2021-08-21 + + + + 2021-08-22 + + + + 2021-08-23 + + + + 2021-08-24 + + + + 2021-08-25 + + + + 2021-08-26 + + + + 2021-08-27 + + + + 2021-08-28 + + + + 2021-08-29 + + + + 2021-08-30 + + + + 2021-08-31 + + + + 2021-09-01 + + + + 2021-09-02 + + + + 2021-09-03 + + + + 2021-09-04 + + + + 2021-09-05 + + + + 2021-09-06 + + + + 2021-09-07 + + + + 2021-09-08 + + + + 2021-09-09 + + + + 2021-09-10 + + + + 2021-09-11 + + + + 2021-09-12 + + + + 2021-09-13 + + + + 2021-09-14 + + + + 2021-09-15 + + + + 2021-09-16 + + + + 2021-09-17 + + + + 2021-09-18 + + + + 2021-09-19 + + + + 2021-09-20 + + + + 2021-09-21 + + + + 2021-09-22 + + + + 2021-09-23 + + + + 2021-09-24 + + + + 2021-09-25 + + + + 2021-09-26 + + + + 2021-09-27 + + + + 2021-09-28 + + + + 2021-09-29 + + + + 2021-09-30 + + + + 2021-10-01 + + + + 2021-10-02 + + + + 2021-10-03 + + + + 2021-10-04 + + + + 2021-10-05 + + + + 2021-10-06 + + + + 2021-10-07 + + + + 2021-10-08 + + + + 2021-10-09 + + + + 2021-10-10 + + + + 2021-10-11 + + + + 2021-10-12 + + + + 2021-10-13 + + + + 2021-10-14 + + + + 2021-10-15 + + + + 2021-10-16 + + + + 2021-10-17 + + + + 2021-10-18 + + + + 2021-10-19 + + + + 2021-10-20 + + + + 2021-10-21 + + + + 2021-10-22 + + + + 2021-10-23 + + + + 2021-10-24 + + + + 2021-10-25 + + + + 2021-10-26 + + + + 2021-10-27 + + + + 2021-10-28 + + + + 2021-10-29 + + + + 2021-10-30 + + + + 2021-10-31 + + + + 2021-11-01 + + + + 2021-11-02 + + + + 2021-11-03 + + + + 2021-11-04 + + + + 2021-11-05 + + + + 2021-11-06 + + + + 2021-11-07 + + + + 2021-11-08 + + + + 2021-11-09 + + + + 2021-11-10 + + + + 2021-11-11 + + + + 2021-11-12 + + + + 2021-11-13 + + + + 2021-11-14 + + + + 2021-11-15 + + + + 2021-11-16 + + + + 2021-11-17 + + + + 2021-11-18 + + + + 2021-11-19 + + + + 2021-11-20 + + + + 2021-11-21 + + + + 2021-11-22 + + + + 2021-11-23 + + + + 2021-11-24 + + + + 2021-11-25 + + + + 2021-11-26 + + + + 2021-11-27 + + + + 2021-11-28 + + + + 2021-11-29 + + + + 2021-11-30 + + + + 2021-12-01 + + + + 2021-12-02 + + + + 2021-12-03 + + + + 2021-12-04 + + + + 2021-12-05 + + + + 2021-12-06 + + + + 2021-12-07 + + + + 2021-12-08 + + + + 2021-12-09 + + + + 2021-12-10 + + + + 2021-12-11 + + + + 2021-12-12 + + + + 2021-12-13 + + + + + + + täglich + TA + + + + + + + + 1 + + + 08:00:00 + + + + + + + + + + + + + 08:00:00 + + + + 08:15:00 + 08:15:00 + + + + 08:30:00 + + + + + 2 + + + 08:00:00 + + + + + + + + + + + + + 08:00:00 + + + + 08:15:00 + 08:15:00 + + + + 08:30:00 + + + + + + + 10 + + + 20 + + + + + PublicJourney + N + 1 + + + GarageRunOut + GO + 2 + + + GarageRunIn + GI + 3 + + + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 7bc9c3336..126789881 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport - Identifier of an HELP POINT EQUIPMENT. + Reference of an HELP POINT EQUIPMENT. @@ -133,6 +133,94 @@ Rail transport, Roads and Road transport + + + Type for identifier of a BEACON EQUIPMENT. + + + + + + Reference of an BEACON EQUIPMENT. + + + + + Type for a reference to an BEACON EQUIPMENT. + + + + + + Identifier of a BEACON EQUIPMENT. + + + + + + + + Allowed values for Beacon Type + + + + + bluetooth low energy + + + + + ultra wide band + + + + + In some cases the beacon is a wifi hot spot. + + + + + + + + Allowed values for communication direction of beacon. + + + + + Normal unidirectional beacon. Usually a backend is then mandatory. + + + + + The beacon is able to do bidirectional transmissions. + + + + + + + Allowed values for beacon protocols + + + + + Apple beacon protocol + + + + + Android beacons + + + + + Usage of VDV 431 + + + + + Type for identifier of a RUBBISH DISPOSAL. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index eb933ace0..8341b359c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -87,7 +87,7 @@ Rail transport, Roads and Road transport - Specialisation of PASSENGER EQUIPMENT for pasenger safety. + Specialisation of PASSENGER EQUIPMENT for passenger safety. @@ -360,7 +360,7 @@ Rail transport, Roads and Road transport - Whether the EQUIPMENT is fixed at a place or min a vehicle. + Whether the EQUIPMENT is fixed at a place or in a vehicle. @@ -424,6 +424,80 @@ Rail transport, Roads and Road transport + + + Specialisation of PASSENGER EQUIPMENT for Beacons. For SSID or UUID always use PublicCode. Be aware that when using VEHICLE TYPE or VEHICLE PROFILE only the type of the beacon can be described. The information aboutn the relevent real beacon often can only be provided when the actual VEHICLE is known. + + + + + + + + + + + + + + + + + + Whether the EQUIPMENT is fixed at a place or in a vehicle. + + + + + + + + + + + + + + + Type for a BEACON EQUIPMENT. + + + + + + + + + + + + Elements for a BEACON EQUIPMENT type. Beacons are under development so the Enumerations may change fast. + + + + + + The type of the beacon + + + + + If the Beacon is unidirectional or bidirectional + + + + + The relevant Beacon Protocol used. + + + + + The to reach the back end system for the usage of the beacon. + + + + + Equipment for Passengers relating to a Rubbish disposal. From 37a21060280430b7cf70a0df4fe4cee5bd3a16cb Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:23:31 +0000 Subject: [PATCH 42/74] Lint and update documentation tables --- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 12 ++++----- ...netex_ifopt_equipmentPassenger_support.xsd | 27 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index 6e217402a..c8d6beac9 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -1,5 +1,5 @@ - - + + 2021-10-25T10:49:51.6560213+02:00 MENTZ NeTEx Export, Version: 19.9.0.3016 @@ -100,10 +100,10 @@ true - 1239123112311231 - unidirectional - Eddystone - https://123.12.2.21/beaconbackend/ + 1239123112311231 + unidirectional + Eddystone + https://123.12.2.21/beaconbackend/ Door diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 126789881..07f1094c2 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -156,8 +156,8 @@ Rail transport, Roads and Road transport - - + + Allowed values for Beacon Type @@ -166,22 +166,21 @@ Rail transport, Roads and Road transport bluetooth low energy - + ultra wide band - + In some cases the beacon is a wifi hot spot. - + - - + Allowed values for communication direction of beacon. @@ -189,15 +188,15 @@ Rail transport, Roads and Road transport Normal unidirectional beacon. Usually a backend is then mandatory. - + The beacon is able to do bidirectional transmissions. - + - + Allowed values for beacon protocols @@ -206,20 +205,20 @@ Rail transport, Roads and Road transport Apple beacon protocol - + Android beacons - + Usage of VDV 431 - + - + From b7c3df9b10cdaa29e43e3a56edf7fa24423540ab Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sun, 15 Oct 2023 00:54:25 +0200 Subject: [PATCH 43/74] Fix railIslandPlatform (#524) Fix #523 --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 49a4df1f0..960e0d576 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -384,7 +384,7 @@ Rail transport, Roads and Road transport - + From c6c34850192a05e88079d112d340da644f35fe90 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 1 Nov 2023 11:25:51 +0100 Subject: [PATCH 44/74] Fix #533 (#534) * Fix #533 * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: DWillDB <144349651+DWillDB@users.noreply.github.com> --------- Co-authored-by: DWillDB <144349651+DWillDB@users.noreply.github.com> --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 0f05acb5d..7d409776f 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1024,14 +1024,19 @@ Rail transport, Roads and Road transport Whether ramp is on a pedestal. + + + Type of handrail. + + Height of handrail. - + - Type of handrail. + Height of any additional lower handrail. From ecf023db43d251f5eabcaccffa40c99772cb15ef Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Nov 2023 14:44:56 +0100 Subject: [PATCH 45/74] Fix epiap example validation (#547) * Make sure the EPIAP examples actually get validated Split up until new release of libxml2 is available. --- .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 45041a37a..d2be5eb89 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/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/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' From ee3c27a763aa3ce3b0b981960c371445898e86e9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 10 Nov 2023 15:59:12 +0100 Subject: [PATCH 46/74] Fix #539 (#540) --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 7d409776f..23775d196 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1242,11 +1242,6 @@ Rail transport, Roads and Road transport Whether there is an audio signal indicating passing through - - - Necessary force to open the door - - From 504b8265294750327fc0f65d2a6f93b10917eee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 18 Dec 2023 13:22:36 +0100 Subject: [PATCH 47/74] Ramp equipment with maximal load and an explanation for Length for mobile ramps. (#366) * Update netex_ifopt_equipmentAccess_version.xsd * Update netex_ifopt_equipmentAccess_version.xsd * fix ident1 * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 23775d196..f81e3aea4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1006,7 +1006,12 @@ Rail transport, Roads and Road transport - Length of ramp in metres. + Length of ramp in metres. In the case of a mobile ramp associated with a vehicle this element is used to convey the length the ramp needs to be extended from the vehicle. This indicates the minimally necessary width of the Quay. + + + + + Maximum load in kilograms. Mainly used for mobile ramps. @@ -1429,4 +1434,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From 7f5bd2ffdd7d026385b36f68ca3ef0a4c72bd275 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:24:30 +0000 Subject: [PATCH 48/74] Lint and update documentation tables --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index f81e3aea4..ab97cdd38 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1434,4 +1434,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 86cf10c67623a3888135523a7942162a43373d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Dec 2023 19:11:23 +0100 Subject: [PATCH 49/74] Delfiplus extensions (#388) * Changes needed from the mapping table on DELFI+ * changes to ramp/hoist * more information in stationMap removal of an element that we could not find out, what it does (replaced with a length and width) * Update netex_ifopt_stopPlace_support.xsd * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- ...etex_equipmentVehiclePassenger_version.xsd | 19 ++++++++++++------- .../netex_equipment_support.xsd | 2 +- .../netex_facility_support.xsd | 3 +++ .../netex_ifopt_stopPlace_support.xsd | 10 ++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 0e8d7e5c8..e9efcf081 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -196,19 +196,14 @@ Rail transport, Roads and Road transport VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs. - - - Distance from VEHICLE needed to operate hoist. - - Whether a ramp may be used to access VEHICLE. - + - Maximum weight that ramp can bear. + Maximum weight that the EQUIPMENT can bear. @@ -221,6 +216,16 @@ Rail transport, Roads and Road transport Maximum step height to board. + + + Length of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE. + + + + + Width of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE. + + Normal gap between VEHICLE and platform. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd index ad3840a63..784b70b65 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport - Reference to a TYPE OF EQUIPMENT. + Reference to a TYPE OF EQUIPMENT. Some values are defined for EPIAP: "mobileRamp" for mobile Ramps, "permanentRamp" for permanent installation and "wheelchairLift" for a hoist. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index e4e3c4f2b..917930d72 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -595,6 +595,9 @@ Rail transport, Roads and Road transport + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 960e0d576..1c7b4e8fb 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -403,6 +403,16 @@ Rail transport, Roads and Road transport + + + Bus stop directly on street. This means people waiting to board will literally be standing on the street. + + + + + Tram stop directly on street. This means people waiting to board will literally be standing on the street. + + From 47fed4d3b8da8fc2315df0432371185f0cf544ce Mon Sep 17 00:00:00 2001 From: DWillDB <144349651+DWillDB@users.noreply.github.com> Date: Tue, 19 Dec 2023 20:53:51 +0100 Subject: [PATCH 50/74] Enhance door control element height (Fix #541) (#542) * Fix #541 * adds example for door control element height Co-authored-by: Christophe Duquesne * Fix #541 updates documentation for door control element height * Fix #541 adds example for door control element height --------- Co-authored-by: Christophe Duquesne --- .../functions/stopPlace/Netex_10_StopPlace_withParking_1.xml | 2 ++ .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index dd5280ece..f8b3df286 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -1017,6 +1017,7 @@ Changes true true + 0.8 true @@ -1035,6 +1036,7 @@ Changes true true + 0.8 true diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index ab97cdd38..8ece82e53 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1197,6 +1197,11 @@ Rail transport, Roads and Road transport Whether doors are automatic. + + + Indicates door control element height. This could be e.g. a door handle or a door button. + + Whether door is made of glass. From f466c583c179bf5c47721345f4d7911e9d21cfa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 30 Dec 2023 10:22:29 +0100 Subject: [PATCH 51/74] Create epiap_test_Crossing_Equipment.xml (#611) * Create epiap_test_Crossing_Equipment.xml * Lint and update documentation tables * version to 1 and filled description --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .../epiap/epiap_test_Crossing_Equipment.xml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 examples/standards/epiap/epiap_test_Crossing_Equipment.xml diff --git a/examples/standards/epiap/epiap_test_Crossing_Equipment.xml b/examples/standards/epiap/epiap_test_Crossing_Equipment.xml new file mode 100644 index 000000000..bc22723d0 --- /dev/null +++ b/examples/standards/epiap/epiap_test_Crossing_Equipment.xml @@ -0,0 +1,53 @@ + + + 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. + + + + 2021-01-01T00:00:00 + 2021-12-11T23:59:59 + + + + + + 1 + 2 + de + + + + + + + www.sbb.ch + + + + + SBB + + + + + Example of a crossing equipment. + 2 + both + true + levelCrossing + false + true + false + tactileStripAtEnd + true + true + true + + + + + + + From b0ae91d94df83f0bf8a53eb04c1cfd72b004988c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 8 Jan 2024 21:24:58 +0100 Subject: [PATCH 52/74] changing QuayType for "on street" bus/tram (#629) * changing QuayTaype for "on street" * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * improved comments * removing depreciated values --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_ifopt/netex_ifopt_stopPlace_support.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 1c7b4e8fb..3eac19c1c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -403,14 +403,14 @@ Rail transport, Roads and Road transport - + - Bus stop directly on street. This means people waiting to board will literally be standing on the street. + Bus stop directly on street. This means people waiting to board will literally be standing on the street. The usual elements of a stop (pole, bank, information) usually are present at the road side. Often there are markings on the floor and sometimes also traffic lights stopping the traffic for boarding and alighting. Often the area to wait is on the side of the road and the BOARDING POSITION could indicate, where to board/alight. However, BOARDING POSITIONs are often not modeled. - + - Tram stop directly on street. This means people waiting to board will literally be standing on the street. + Tram stop directly on street. This means people waiting to board will literally be standing on the street. The usual elements of a stop (pole, bank, information) usually are present at the road side. Often there are markings on the floor and sometimes also traffic lights stopping the traffic for boarding and alighting. Often the area to wait is on the side of the road and the BOARDING POSITION could indicate, where to board/alight. However, BOARDING POSITIONs are often not modeled. From 3ef063572b801911437a0d6d39f57ec13e1492d4 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:01:04 +0100 Subject: [PATCH 53/74] LiftCallEquipment (#634) * LiftCallEquipment added * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink --------- Co-authored-by: Stefan de Konink --- xsd/NeTEx_publication.xsd | 21 +++++ xsd/NeTEx_publication_timetable.xsd | 25 +++++- .../netex_ifopt_equipmentAccess_support.xsd | 28 +++++- .../netex_ifopt_equipmentAccess_version.xsd | 90 ++++++++++++++++++- 4 files changed, 159 insertions(+), 5 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 23bdc5cf3..b98b48893 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -2155,6 +2155,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [LiftCallEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 631292645..00de08a32 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1683,7 +1683,7 @@ Provides a general purose wrapper for NeTEx data content. - + @@ -1778,7 +1778,7 @@ Provides a general purose wrapper for NeTEx data content. - + @@ -1824,6 +1824,27 @@ Provides a general purose wrapper for NeTEx data content. + + + + + Every [LiftCallEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 2774e4b09..09ab81f73 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -187,7 +187,33 @@ Rail transport, Roads and Road transport - Identifier of a TICKETING EQUIPMENT. + Identifier of a LIFT EQUIPMENT. + + + + + + + + + Type for identifier of a LIFT call EQUIPMENT. + + + + + + Identifier of an LIFT call EQUIPMENT. + + + + + Type for a reference to an LIFT call EQUIPMENT. + + + + + + Identifier of a LIFT call EQUIPMENT. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 8ece82e53..5842d2b86 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -99,6 +99,7 @@ Rail transport, Roads and Road transport + @@ -116,6 +117,7 @@ Rail transport, Roads and Road transport + @@ -942,9 +944,93 @@ Rail transport, Roads and Road transport Indicates buttons height (in centimeter) - + + + + + + Specialisation of PLACE ACCESS EQUIPMENT for calling LIFTs (provides specific characteristics that may differ from floor to floor like button height, door, etc.). + + + + + + + + + + + + + + + + + + Elements for an ACCESS EQUIPMENT. + + + + + + + Elements for calling a LIFT that are specific to a floor. + + + + + + + + + + + + + + + + + + + + + Elements for LIFT call EQUIPMENT type. + + + + + Height of call button from ground. + + + + + Whether buttons are raised. + + + + + Whether buttons have braille. + + + + + Indicates a tactile marker on floor under the buttons (or aligned with). +v1.1 + + + + + Whether LIFT has AudioAnnouncements. + + + + + Indicates existence of a magnetic induction loop. +v1.1 + + + - Indicates a tactile marker on floor under the buttons (or aligned with). + The direction from which to approach the door(s). From c5ed5f49a0253eca143737f8d682883b7729b376 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Thu, 8 Feb 2024 22:42:38 +0100 Subject: [PATCH 54/74] EPIAP Equipments Enhancement (#555) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Enhancement of Crossing Equipments Enhancements of the Crossing Equipmentsproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#18 (French Accessibility Profile) More similar commits (on other accessibility equipments) will follow on this same PR (several proposal on several object on the same XSD file) * Enhancement of Sanitary Equipments Enhancements of the Sanitary Equipments proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#19 (French Accessibility Profile) * Enhancement of Sanitary Equipments complement * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Addition of default values Addition of default values whenever relevant * Addition of default value Addition of default values whenever relevant * Enhancement of the SeatingEquipments Enhancements of the SeatingEquipments proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#20 (French Accessibility Profile) * Lint and update documentation tables * to conform PR540 decision * Enhancement of the EntranceEquipment Enhancement of the EntranceEquipment Enhancements of the EntranceEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#21 (French Accessibility Profile) * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Enhancement of the RampEquipment Enhancements of the RampEquipmentproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#22 (French Accessibility Profile) * Enhancement of the RoughSurface Enhancements of the RoughSurfaceproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#23 (French Accessibility Profile) * Enhancements of the StaircaseEquipment Enhancements of the StaircaseEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#24 (French Accessibility Profile) * Enhancements of the EscalatorEquipment Enhancements of the EscalatorEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#25 (French Accessibility Profile) * Enhancements of the LiftEquipment Enhancements of the LiftEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#27 (French Accessibility Profile) * Enhancement of Crossing Equipments Enhancements of the Crossing Equipmentsproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#18 (French Accessibility Profile) More similar commits (on other accessibility equipments) will follow on this same PR (several proposal on several object on the same XSD file) * Enhancement of Sanitary Equipments Enhancements of the Sanitary Equipments proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#19 (French Accessibility Profile) * Enhancement of Sanitary Equipments complement * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink * Addition of default values Addition of default values whenever relevant * Addition of default value Addition of default values whenever relevant * Enhancement of the SeatingEquipments Enhancements of the SeatingEquipments proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#20 (French Accessibility Profile) * Lint and update documentation tables * Enhancement of the EntranceEquipment Enhancement of the EntranceEquipment Enhancements of the EntranceEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#21 (French Accessibility Profile) * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Enhancement of the RampEquipment Enhancements of the RampEquipmentproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#22 (French Accessibility Profile) * Enhancement of the RoughSurface Enhancements of the RoughSurfaceproposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#23 (French Accessibility Profile) * Enhancements of the StaircaseEquipment Enhancements of the StaircaseEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#24 (French Accessibility Profile) * Enhancements of the EscalatorEquipment Enhancements of the EscalatorEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#25 (French Accessibility Profile) * Enhancements of the LiftEquipment Enhancements of the LiftEquipment proposed by the French team working on an accessibility capture tool These enhancements are mainly coming from comparison and mapping with OSM The original request is here etalab/transport-normes#27 (French Accessibility Profile) * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * cleaning Cleanin g of unnecessary "discomfortable" values * Clarifications Clarifications (from github diuscussions) * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Christophe Duquesne * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Christophe Duquesne * fixed comments from Nick * fixing error * Lint and update documentation tables * typo plus unknown value for StairRampEnumeration * Lint and update documentation tables * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * fixing names according to Tim * Update xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink * fix validation problem --------- Co-authored-by: Stefan de Konink Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthias Günter Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_mode_support.xsd | 12 +- .../netex_nm_equipmentEnergy_support.xsd | 2 +- .../netex_submode_version.xsd | 2 +- .../netex_ifopt_equipmentAccess_support.xsd | 199 ++++++++++++++++++ .../netex_ifopt_equipmentAccess_version.xsd | 115 +++++++++- ...netex_ifopt_equipmentPassenger_support.xsd | 16 ++ ...netex_ifopt_equipmentPassenger_version.xsd | 15 ++ .../netex_ifopt_equipmentWaiting_version.xsd | 9 +- 8 files changed, 358 insertions(+), 12 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 472cc728b..8c24d9165 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -242,12 +242,12 @@ Rail transport, Roads and Road transport - Deprecated. Use Mode rail with RailSubmode longDistance. + Deprecated. Use mode rail with RailSubmode longDistance. - Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + Deprecated. Use mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). @@ -257,12 +257,12 @@ Rail transport, Roads and Road transport - All air related Mode. No special distinction is done. + All air related mode. No special distinction is made. - Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. + Most water related modes. The only specialisation is the mode ferry. In Transmodel also ship was used for this mode. @@ -272,12 +272,12 @@ Rail transport, Roads and Road transport - cable railway on steep slope using two counterbalanced carriages. + Cable railway on steep slope using two counterbalanced carriages. - A collection for all Mode involving snow and ice. + A collection for all modes involving snow and ice. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index 56225bcf1..c25b33ea7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -216,7 +216,7 @@ Rail transport, Roads and Road transport - depreciated. Will be panthograph. + DEPRECATED. Will be panthograph. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index 776a8f7f2..19b8d2bc5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -263,7 +263,7 @@ Local train adapted for running in mountain railway lines. - Deprecated. Use metro + DEPRECATED. Use metro diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 09ab81f73..e266ff552 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -523,4 +523,203 @@ Rail transport, Roads and Road transport + + + Allowed values for the status of the ground marking + + + + + + + + + + + + + Allowed values for the visual obstacles on crossings + + + + + + + + + + + + + + Allowed values for the bollards on crossings + + + + + + Bollards on both sides and well contrasted with the environment. + + + + + Bollards on either side of the crossing (with no information about the contrast). + + + + + Bollards only on one side of the crossing. + + + + + Bollards present but too low or poorly positioned in relation to the crossing. + + + + + + + + Allowed values for the positions of a turning space for an Entrance. + + + + + + + + + + + + Allowed values for the type of handle for a door + + + + + + Lever handle + + + + + + + Panic bar + + + + + Door handle + + + + + Grab rail or grab handle + + + + + Window lever + + + + + Marshal's baton, vertical bar + + + + + + + + + Allowed values for Sides of Safety Edge. + + + + + + + + + + + Allowed values for the positions of a turning space for a ramp. + + + + + + + + + + + + Allowed values forthe Step Condition + + + + + The staircase has regular steps, all of the same height and depth. + + + + + The steps are not all the same size. + + + + + The steps are very different in size, some may be missing or steeply sloped. + + + + + + + + Allowed values for the stair ramp. + + + + + + A narrow ramp on the side, designed to push a bicycle. + + + + + A ramp on the side, designed to roll a suitcase. + + + + + A pair of ramps with steps in between, intended for pushing a stroller. + + + + + Another type of handrail included in the staircase itself. + + + + + + + + + Allowed values for the Reached Floor Announcement + + + + + + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 9bcb678e4..1f03f061e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -240,6 +240,11 @@ Rail transport, Roads and Road transport Type of Surface. + + + Whether there is visual contrast compared to the immediate surroundings. + + Whether equipment is suitable for cycles. @@ -363,7 +368,12 @@ Rail transport, Roads and Road transport - Depth of an individual step. + Depth of an individual step, in metres rounded to the nearest cm. + + + + + The length of the step, in metres rounded to the nearest cm. @@ -371,6 +381,11 @@ Rail transport, Roads and Road transport Whether there is a colour contrast on step nosings. + + + Indicates the regularity of the steps. + + Type of handrail. @@ -386,6 +401,16 @@ Rail transport, Roads and Road transport Height of any additional lower handrail from step. + + + Indicates the presence of signage that can be read tactilely (in Braille for example) on the handrail. + + + + + Indicates the presence and type of a ramp included within the staircase. + + Properties of top of staircase. @@ -476,6 +501,11 @@ Rail transport, Roads and Road transport Whether ESCALATOR has a landing. +v1.1 + + + Whether the escalator is equipped with a remote operation control system. + + @@ -924,6 +954,11 @@ Rail transport, Roads and Road transport DEPRECATED - Spelling correction renamed to audio announcements. THis value will be dropped at - so + + + Whether the elevator car has a visual, tactile or audible display to announce the floor reached. This is different from AudioAnnouncements since AudioAnnouncements can be about different topics than reached floor (closing doors, up-down movement, etc.), and the ReachedFloorAnnouncement can be visual or tactile, and not only audio. + + Indicates existence of a Magnetic Induction Loop. +v1.1 @@ -1033,6 +1068,11 @@ Rail transport, Roads and Road transport The direction from which to approach the door(s). + + + Whether the lift is equipped with a remote operation control system + + @@ -1150,6 +1190,21 @@ Rail transport, Roads and Road transport Whether equipment is suitable for cycles. + + + The maximum distance between two resting levels, in metres rounded to the nearest cm. It is recommended to install a rest platform at the bottom and top of each ramp, as well as every 10 metres in the case of a long ramp. + + + + + Whether there is a wheel guard (side border intended to block the wheel of the wheelchair to prevent falls). + + + + + Position of the manoeuvring space (for wheelchairs). + + @@ -1214,6 +1269,17 @@ Rail transport, Roads and Road transport Whether there is a door in the entrance. If false, opening does not have door. + + + Pointing towards outside (or, for doors within a StopPlace, to label the side as outside). + + + + + Type of door handle. + + + Whether the door is kept open. @@ -1335,7 +1401,27 @@ Rail transport, Roads and Road transport - Whether there is an audio signal indicating passing through + Whether there is an audio signal indicating passing through. + + + + + When there is a removable ramp, whether the entrance has a dedicated doorbell to ask for the ramp. + + + + + Whether the entrance is easily identifiable in its environment taking into account architecture, signage and visual contrast. + + + + + Position of the turning space: the manoeuvring space for wheelchairs is a space left in the immediate vicinity of the door to operate it correctly and is (should be) materialised by a rectangle located at the base of the door. + + + + + Turning circle within the turning space for a wheelchair. @@ -1522,6 +1608,31 @@ Rail transport, Roads and Road transport Whether equipment is suitable for cycles. + + + Status of the ground marking of the crossing. + + + + + Indicates the presence of a device delivering vibrations to facilitate the crossing of visually impaired people. + + + + + Indicates whether the pedestrian crossing is convex, curved (it goes up then down). + + + + + Indicates the presence and type of visual obstacle to visibility. The visual obstacle is an element, positioned up to 5 metres upstream of the crossing, and which hinders the pedestrian from seeing and being seen when crossing. + + + + + Indicates the presence of bollards intended to protect pedestrians. + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 07f1094c2..c56cdf9c7 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -269,4 +269,20 @@ Rail transport, Roads and Road transport + + + Allowed values for Toilet Type. + + + + + + + + Both seated and urinal positions are available in the toilet. + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 8341b359c..b0d467841 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -201,6 +201,21 @@ Rail transport, Roads and Road transport Key issuing scheme under which facility is accessible. + + + Whether the toilets have a sink allowing hand washing with soap. + + + + + Whether the tap inside the toilet supplies drinking water. + + + + + Indicates the position of using the toilet. + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd index 3fe5a01c3..ca4ab615f 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd @@ -552,14 +552,19 @@ Rail transport, Roads and Road transport Elements for SEATING EQUIPMENT type. - + Whether there is an armrest. +v1.1 + + + Whether the seat has a backrest to rest your back (default is true). +v2.0 + + - Height of the seating +v1.1) + Height of the seating. +v1.1 From 77fb8e264d8f1f1f4160b80cda8dc062267c2057 Mon Sep 17 00:00:00 2001 From: Julius Tens <144336919+juliustens-db@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:20:35 +0100 Subject: [PATCH 55/74] Clone 'TactileWriting' attribute from StairGroup for other equipments with handrail (#664) --- .../netex_ifopt_equipmentAccess_version.xsd | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 1f03f061e..896498b00 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -833,6 +833,11 @@ Rail transport, Roads and Road transport Height of lower handrail from floor. + + + Indicates the presence of signage that can be read tactilely (in Braille for example) on the handrail. + + @@ -1170,6 +1175,11 @@ Rail transport, Roads and Road transport Height of any additional lower handrail. + + + Indicates the presence of signage that can be read tactilely (in Braille for example) on the handrail. + + Whether ramp has tactile guidance strips. From 0aae933ae47b32f69f52dbc6e6ed0b9ea3e18e03 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 08:42:10 +0000 Subject: [PATCH 56/74] Lint and update documentation tables --- xsd/NeTEx_publication_timetable.xsd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index bf06f01ab..b2745b6ca 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1645,11 +1645,8 @@ Provides a general purose wrapper for NeTEx data content. - - >>>>>>> master - - - + >>>>>>> master + From f59199d7dc780d73088541c00e98b93385affacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:47:18 +0200 Subject: [PATCH 57/74] Update xsd/NeTEx_publication_timetable.xsd Co-authored-by: Stefan de Konink --- xsd/NeTEx_publication_timetable.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index b2745b6ca..662b10f7f 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1645,7 +1645,7 @@ Provides a general purose wrapper for NeTEx data content. - >>>>>>> master + From 74e794335e05d2522993d7daa99b94390eec05a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:48:05 +0200 Subject: [PATCH 58/74] Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd Co-authored-by: Stefan de Konink --- .../netex_accessibility/netex_acsb_limitations.xsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index e5216ef18..4cfd9de6a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -152,8 +152,7 @@ Rail transport, Roads and Road transport - Whether a PLACE has ramp free access. Ramp free isn't necessary absolute. If a ramp is not steep, then a PLACE - can still be considered ramp free. + Whether a PLACE has ramp free access. Ramp free isn't necessary absolute. If a ramp is not steep, then a PLACE can still be considered ramp free. From 88b255f588c296722e7e3015b62ff2d3e6b4137f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:48:14 +0200 Subject: [PATCH 59/74] Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd Co-authored-by: Stefan de Konink --- .../netex_accessibility/netex_acsb_limitations.xsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd index 4cfd9de6a..a990916ef 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd @@ -157,8 +157,7 @@ Rail transport, Roads and Road transport - Whether the platform is high enough and gap is small enough for level access into vehicle. -At least at a designated wheelchair door position the gap between platform and vehicle floor (of level access vehicle) does not exceed 75 mm measured horizontally and 50 mm measured vertically including sliding step (according to PRM TSI). + Whether the platform is high enough and gap is small enough for level access into vehicle. At least at a designated wheelchair door position the gap between platform and vehicle floor (of level access vehicle) does not exceed 75 mm measured horizontally and 50 mm measured vertically including sliding step (according to PRM TSI). From 3ec9ecef1a64a8f1662c2dd1d6798961fcc5e2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:48:25 +0200 Subject: [PATCH 60/74] Update xsd/NeTEx_publication_timetable.xsd Co-authored-by: Stefan de Konink --- xsd/NeTEx_publication_timetable.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 662b10f7f..151c14e77 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1738,7 +1738,7 @@ Provides a general purose wrapper for NeTEx data content. - + From 745d6914395e210092b624f7f368ca17826f06e9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 08:50:16 +0000 Subject: [PATCH 61/74] Lint and update documentation tables --- xsd/NeTEx_publication_timetable.xsd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 151c14e77..953726430 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1645,8 +1645,11 @@ Provides a general purose wrapper for NeTEx data content. - - + + + + + From e7d3a097e4b99ea3b7f4abaff778d835b3e2a440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:57:36 +0200 Subject: [PATCH 62/74] Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink --- .../netex_reusableComponents/netex_mode_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 8c24d9165..814a57b60 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - Deprecated. Use mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + DEPRECATED. Use mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). From 3be86a7c6c294ded678022834ca19b67fbfa95f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:57:44 +0200 Subject: [PATCH 63/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index b0d467841..278b64347 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -492,7 +492,7 @@ Rail transport, Roads and Road transport - The type of the beacon + The type of the beacon. From cc0a95832c0425e52de6662c1c6ce8df27dd40a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:57:52 +0200 Subject: [PATCH 64/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: Stefan de Konink --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 3eac19c1c..bf21f7dda 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -378,8 +378,7 @@ Rail transport, Roads and Road transport - Allowed values for QUAY Component Types. Special is the structure for rail, which allows a hierarchy. - railIslandPlatform is the full platform positioned between two tracks, railPlatform is a side platform facing the track and railPlatformSector is a sector of such a railPlatform. A similar hierarchy is defined for a metro station layout. + Allowed values for QUAY Component Types. Special is the structure for rail, which allows a hierarchy. railIslandPlatform is the full platform positioned between two tracks, railPlatform is a side platform facing the track and railPlatformSector is a sector of such a railPlatform. A similar hierarchy is defined for a metro station layout. From 5aad15568df0104d31d4d5f461269a9c0054cd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:58:02 +0200 Subject: [PATCH 65/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 278b64347..85a01d3e1 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -497,7 +497,7 @@ Rail transport, Roads and Road transport - If the Beacon is unidirectional or bidirectional + If the Beacon is unidirectional or bidirectional. From 00460d4409cb4337862344476277a664deefa494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:58:10 +0200 Subject: [PATCH 66/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 85a01d3e1..2032ef9c4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -507,7 +507,7 @@ Rail transport, Roads and Road transport - The to reach the back end system for the usage of the beacon. + The to reach the back end system for the usage of the beacon. From 5962c5a3bb59f492249337aa1e4bc4c98202a811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:58:17 +0200 Subject: [PATCH 67/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index c56cdf9c7..0c849b2d9 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -199,7 +199,7 @@ Rail transport, Roads and Road transport - Allowed values for beacon protocols + Allowed values for beacon protocols. From bac0dd9104ff80f2150bcdd76d2ea3b7370c4962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 10:58:29 +0200 Subject: [PATCH 68/74] Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink --- .../netex_reusableComponents/netex_mode_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 814a57b60..2e28ebadb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -242,7 +242,7 @@ Rail transport, Roads and Road transport - Deprecated. Use mode rail with RailSubmode longDistance. + DEPRECATED. Use mode rail with RailSubmode longDistance. From 8fe7a61e9e4d4bb5801dfa43c0b46d43366dcfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 11:01:06 +0200 Subject: [PATCH 69/74] Update xsd/NeTEx_publication_timetable.xsd Co-authored-by: Stefan de Konink --- xsd/NeTEx_publication_timetable.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 953726430..b55604f3c 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1646,7 +1646,7 @@ Provides a general purose wrapper for NeTEx data content. - + From 97869caae51c715aa2a227fa2c00af195e0bd08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 11:01:14 +0200 Subject: [PATCH 70/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentAccess_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index e266ff552..c1d62c601 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -593,7 +593,7 @@ Rail transport, Roads and Road transport - Allowed values for the type of handle for a door + Allowed values for the type of handle for a door. From 3d09ed209ac6cbab469328a47227d7d90ab8a5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 2 May 2024 11:01:21 +0200 Subject: [PATCH 71/74] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink --- .../part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 0c849b2d9..61fda8fa6 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -160,7 +160,7 @@ Rail transport, Roads and Road transport - Allowed values for Beacon Type + Allowed values for Beacon Type. From dc13fbe7e8a35db6e0698794f0b2abcfc8757072 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 2 May 2024 11:03:09 +0200 Subject: [PATCH 72/74] Apply suggestions from code review --- xsd/NeTEx_publication_timetable.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index b55604f3c..1ee54e4c5 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1646,7 +1646,7 @@ Provides a general purose wrapper for NeTEx data content. - + From d799a09a377a363c17e4d41724c5e7e59305be0e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 2 May 2024 11:18:36 +0200 Subject: [PATCH 73/74] Apply suggestions from code review --- xsd/NeTEx_publication_timetable.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 1ee54e4c5..e3d82367e 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1646,7 +1646,7 @@ Provides a general purose wrapper for NeTEx data content. - + From 240018b958e7dc68163f66b10616e83edf731501 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Thu, 2 May 2024 12:04:06 +0200 Subject: [PATCH 74/74] To solve issue #665 This change would solve #665, but I'm not sure it is allowed to let it slip in here. If it interfered with this PR, I would do it later in a separate PR, after this one will be merged. --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 896498b00..aa24d2621 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -483,7 +483,7 @@ Rail transport, Roads and Road transport - Whether ESCALATOR has a tactile actuator. + Whether there are buttons to start the ESCALATOR if it is not moving, and whether these buttons are intended and suited for the visually impaired. @@ -718,7 +718,7 @@ Rail transport, Roads and Road transport - Whether Travelator has a tactile actuator. + Whether there are buttons to start the TRAVELATOR if it is not moving, and whether these buttons are intended and suited for the visually impaired.