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