From 57a658e468b6492a55cecb78d36e6a77cd11d177 Mon Sep 17 00:00:00 2001 From: Robbendebiene Date: Thu, 17 Jul 2025 11:53:58 +0200 Subject: [PATCH 1/5] Add FloorHeight to VehicleType and AccessVehicleEquipment Adjust BoardingHeight docs --- .../netex_equipmentVehiclePassenger_version.xsd | 11 ++++++++++- .../netex_vehicleType_version.xsd | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index afd8f06ba..5ed029a0d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -234,7 +234,16 @@ Rail transport, Roads and Road transport - Maximum step height to board. + Height of the outer entry point (lowest step), measured from the ground + of the road or top of the rail. Together with FloorHeight this describes the lowest and + highest point of an entrance. + + + + + Height of the inner entry point (floor next to the entrance), measured + from the ground of the road or top of the rail. Together with BoardingHeight this + describes the lowest and highest point of an entrance. +v2.1 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 661017027..f32044a63 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -411,7 +411,16 @@ Rail transport, Roads and Road transport - Maximum step height to board. +v1.1 + Height of the outer entry point (lowest step), measured from the ground + of the road or top of the rail. Together with FloorHeight this describes the lowest and + highest point of an entrance. +v1.1 + + + + + Height of the inner entry point (floor next to the entrance), measured + from the ground of the road or top of the rail. Together with BoardingHeight this + describes the lowest and highest point of an entrance. +v2.1 From 4ea539b23d708632d3e6ce668569d3abd7dd36c0 Mon Sep 17 00:00:00 2001 From: Robbendebiene Date: Thu, 17 Jul 2025 11:54:55 +0200 Subject: [PATCH 2/5] Add StepHeight to AccessVehicleEquipment --- .../netex_equipmentVehiclePassenger_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 5ed029a0d..9275fa979 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -232,6 +232,11 @@ Rail transport, Roads and Road transport Number of steps to board or alight from VEHICLE. + + + Height of an individual step, in metres rounded to the nearest cm. + + Height of the outer entry point (lowest step), measured from the ground From 0e58d1771a221f47b6c37c022d1630f38d7ba4dd Mon Sep 17 00:00:00 2001 From: Robbendebiene Date: Thu, 17 Jul 2025 11:55:27 +0200 Subject: [PATCH 3/5] Add EdgeToTrackCenterDistance to DeckEntrance, VehicleType and AccessVehicleEquipment --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 7 +++++++ .../netex_equipmentVehiclePassenger_version.xsd | 7 +++++++ .../netex_reusableComponents/netex_vehicleType_version.xsd | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 9176a649e..dbe94b8f3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -738,6 +738,13 @@ Height of ENTRANCE from ground. + + + Distance from the outer edge of the DECK ENTRANCE (including any + fixed outer steps) to the vehicle center (center point between axles). Can be used to + calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 9275fa979..9300b96be 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -266,6 +266,13 @@ Rail transport, Roads and Road transport Normal gap between VEHICLE and platform. + + + Distance from the outer entry point (including any + fixed outer steps) to the vehicle center (center point between axles). Can be used to + calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index f32044a63..287bbb16f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -428,6 +428,13 @@ Rail transport, Roads and Road transport Expected maximal gap between VEHICLE and platform. +v1.1 + + + Distance from the outer entry point (including any + fixed outer steps) to the vehicle center (center point between axles). Can be used to + calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + + From 947727cb8eebe31945a898849a90751794ed5a7b Mon Sep 17 00:00:00 2001 From: Robbendebiene Date: Thu, 17 Jul 2025 11:55:50 +0200 Subject: [PATCH 4/5] Minor fixes --- .../netex_deckPlan_version.xsd | 4 ++-- .../netex_ifopt_equipmentAccess_version.xsd | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index dbe94b8f3..1a47ddf2a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -715,7 +715,7 @@ - Positional ements for a DECK ENTRANCE. + Positional elements for a DECK ENTRANCE. @@ -749,7 +749,7 @@ - EClassification lements for a DECK ENTRANCE. + Classification elements for a DECK ENTRANCE. 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 5fc6f7fbb..c774fa25b 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 @@ -32,7 +32,7 @@ CD Add new attribute to StairEquipment; WithoutRiser. NJSK Review: move order to be with other step properties CD Add new attribute to EscalatorEquipment; EscalatorWithLanding - CD Add new attributes to TravellatorEquipment; Length, Slope and IntegratesAnEscalatorPart + CD Add new attributes to TravellatorEquipment; Length, Slope and IntegratesAnEscalatorPart NJSK Review: correct name of IntegratesAnEscalatorPart CD Add new attributs to EscalatorEquipment: MagneticInductionLoop, GroundMarkAlignedWithButton, TactileGroundFloorButton ExternalFloorSelection NJSK Review: correct name of GroundMarkAlignedWithButton @@ -40,7 +40,7 @@ NJSK Review: change order to group with like properties CD Add new attributes to EntranceEquipment: AudioOrVideoIntercom, Airlock, DoorstepMark AudioPassthroughIndicator, OpeningNecessaryForce NJSK Review: change order to group with like properties - NJSK Review: NB AudioOrVideoIntercom overlap with EntranceAttention + NJSK Review: NB AudioOrVideoIntercom overlap with EntranceAttention CD Add new attributes to QueuingEquipment: DisabledPriority QueuingSeatedPossible. 2019-05-27Fix add missing DropKerbOutside value to Entrance Eqeuipment @@ -48,7 +48,7 @@ Move WIthoutRaiser to be specifc to Staircase. 2019-05-27Doc tidy up - Rename Accoustic(six) to AUdio + Rename Accoustic(six) to AUdio Correct comments 2021-07-14Fix catch up - Make Access Equipment Abstarct @@ -376,12 +376,12 @@ Rail transport, Roads and Road transport - Depth of an individual step, in metres rounded to the nearest cm. + Height of an individual step, in metres rounded to the nearest cm. - The length of the step, in metres rounded to the nearest cm. + Length of an individual step, in metres rounded to the nearest cm. From 79fd6cdd8b57cbec02b0e81cf6518431f6eb7d0c Mon Sep 17 00:00:00 2001 From: Robbendebiene Date: Mon, 28 Jul 2025 13:20:34 +0200 Subject: [PATCH 5/5] Format without word wrapping --- .../netex_deckPlan_version.xsd | 4 +--- .../netex_equipmentVehiclePassenger_version.xsd | 12 +++--------- .../netex_vehicleType_version.xsd | 12 +++--------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 1a47ddf2a..4355eb00b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -740,9 +740,7 @@ - Distance from the outer edge of the DECK ENTRANCE (including any - fixed outer steps) to the vehicle center (center point between axles). Can be used to - calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + Distance from the outer edge of the DECK ENTRANCE (including any fixed outer steps) to the vehicle center (center point between axles). Can be used to calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 9300b96be..7db187027 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -239,16 +239,12 @@ Rail transport, Roads and Road transport - Height of the outer entry point (lowest step), measured from the ground - of the road or top of the rail. Together with FloorHeight this describes the lowest and - highest point of an entrance. + Height of the outer entry point (lowest step), measured from the ground of the road or top of the rail. Together with FloorHeight this describes the lowest and highest point of an entrance. - Height of the inner entry point (floor next to the entrance), measured - from the ground of the road or top of the rail. Together with BoardingHeight this - describes the lowest and highest point of an entrance. +v2.1 + Height of the inner entry point (floor next to the entrance), measured from the ground of the road or top of the rail. Together with BoardingHeight this describes the lowest and highest point of an entrance. +v2.1 @@ -268,9 +264,7 @@ Rail transport, Roads and Road transport - Distance from the outer entry point (including any - fixed outer steps) to the vehicle center (center point between axles). Can be used to - calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + Distance from the outer entry point (including any fixed outer steps) to the vehicle center (center point between axles). Can be used to calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 287bbb16f..3a1abcd6c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -411,16 +411,12 @@ Rail transport, Roads and Road transport - Height of the outer entry point (lowest step), measured from the ground - of the road or top of the rail. Together with FloorHeight this describes the lowest and - highest point of an entrance. +v1.1 + Height of the outer entry point (lowest step), measured from the ground of the road or top of the rail. Together with FloorHeight this describes the lowest and highest point of an entrance. +v1.1 - Height of the inner entry point (floor next to the entrance), measured - from the ground of the road or top of the rail. Together with BoardingHeight this - describes the lowest and highest point of an entrance. +v2.1 + Height of the inner entry point (floor next to the entrance), measured from the ground of the road or top of the rail. Together with BoardingHeight this describes the lowest and highest point of an entrance. +v2.1 @@ -430,9 +426,7 @@ Rail transport, Roads and Road transport - Distance from the outer entry point (including any - fixed outer steps) to the vehicle center (center point between axles). Can be used to - calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1 + Distance from the outer entry point (including any fixed outer steps) to the vehicle center (center point between axles). Can be used to calculate the horizontal gap in conjunction with the EdgeToTrackCenterDistance from QUAY. +v2.1