Skip to content

Commit

Permalink
Merge branch 'EPIAP-Accessibility-Equipments-enhancement' of https://…
Browse files Browse the repository at this point in the history 
…github.com/Aurige/NeTEx into pr/555
  • Loading branch information
@ue71603
ue71603 committed Jan 8, 2024
2 parents 801aa6d + 7afe2c4 commit 0dc8e3c
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 32 deletions.
40 changes: 21 additions & 19 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,6 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="none"/>
<xsd:enumeration value="good"/>
<xsd:enumeration value="worn"/>
<xsd:enumeration value="discomfortable"/>
<xsd:enumeration value="hazardous"/>
<xsd:enumeration value="unknown"/>
</xsd:restriction>
Expand All @@ -519,7 +518,6 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="none"/>
<xsd:enumeration value="carParking"/>
<xsd:enumeration value="vegetation"/>
<xsd:enumeration value="discomfortable"/>
<xsd:enumeration value="building"/>
<xsd:enumeration value="streetFurniture"/>
<xsd:enumeration value="other"/>
Expand All @@ -534,30 +532,30 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="none"/>
<xsd:enumeration value="contrasted">
<xsd:annotation>
<xsd:documentation>Bollards on both sides and well contrasted with the environment</xsd:documentation>
<xsd:documentation>Bollards on both sides and well contrasted with the environment.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="yes">
<xsd:annotation>
<xsd:documentation>Bollards on either side of the crossing (with no information about the contrast)</xsd:documentation>
<xsd:documentation>Bollards on either side of the crossing (with no information about the contrast).</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="partial">
<xsd:annotation>
<xsd:documentation>Bollards only on one side of the crossing</xsd:documentation>
<xsd:documentation>Bollards only on one side of the crossing.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="limited">
<xsd:annotation>
<xsd:documentation>Bollards present but too low or poorly positioned in relation to the crossing</xsd:documentation>
<xsd:documentation>Bollards present but too low or poorly positioned in relation to the crossing.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
<xsd:simpleType name="EntranceTurningSpacePositionEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for the positions of a turning space for an Entrance</xsd:documentation>
<xsd:documentation>Allowed values for the positions of a turning space for an Entrance.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="none"/>
Expand Down Expand Up @@ -611,7 +609,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:simpleType name="SafetyEdgeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Sides of Safety Edge</xsd:documentation>
<xsd:documentation>Allowed values for Sides of Safety Edge.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="none"/>
Expand All @@ -622,7 +620,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:simpleType name="RampTurningSpacePositionEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for the positions of a turning space for a ramp</xsd:documentation>
<xsd:documentation>Allowed values for the positions of a turning space for a ramp.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="none"/>
Expand All @@ -639,17 +637,17 @@ Rail transport, Roads and Road transport
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="even">
<xsd:annotation>
<xsd:documentation>The staircase has regular steps, all of the same height and depth</xsd:documentation>
<xsd:documentation>The staircase has regular steps, all of the same height and depth.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="uneven">
<xsd:annotation>
<xsd:documentation>The steps are not all the same size</xsd:documentation>
<xsd:documentation>The steps are not all the same size.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="rough">
<xsd:annotation>
<xsd:documentation>The steps are very different in size, some may be missing or steeply sloped</xsd:documentation>
<xsd:documentation>The steps are very different in size, some may be missing or steeply sloped.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
Expand All @@ -663,22 +661,22 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="none"/>
<xsd:enumeration value="bicycle">
<xsd:annotation>
<xsd:documentation>A narrow ramp on the side, designed to push a bicycle</xsd:documentation>
<xsd:documentation>A narrow ramp on the side, designed to push a bicycle.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="luggage">
<xsd:annotation>
<xsd:documentation>A ramp on the side, designed to roll a suitcase</xsd:documentation>
<xsd:documentation>A ramp on the side, designed to roll a suitcase.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="stroller">
<xsd:annotation>
<xsd:documentation>A pair of ramps with steps in between, intended for pushing a stroller</xsd:documentation>
<xsd:documentation>A pair of ramps with steps in between, intended for pushing a stroller.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>Another type of handrail included in the staircase itself</xsd:documentation>
<xsd:documentation>Another type of handrail included in the staircase itself.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
Expand All @@ -698,15 +696,19 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
<xsd:simpleType name="OtherExitDoorsEnumeration">
<xsd:simpleType name="OtherDoorsEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for the Other Exit Doors: To identify the side, consider entering the elevator on the ground floor without turning around.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="none"/>
<xsd:enumeration value="same"/>
<xsd:enumeration value="left"/>
<xsd:enumeration value="right"/>
<xsd:enumeration value="opposite"/>
<xsd:enumeration value="opposite">
<xsd:annotation>
<xsd:documentation>The door is on the opposite side as the one of the ground floor. Sometimes referred as TroughLoader.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
Expand Down
31 changes: 18 additions & 13 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="StepCondition" type="StepConditionEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates the regularity of the steps</xsd:documentation>
<xsd:documentation>Indicates the regularity of the steps.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HandrailType" type="HandrailEnumeration" minOccurs="0">
Expand All @@ -406,7 +406,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="StairRamp" type="StairRampEnumeration" default="none" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates the presence and type of a ramp included within the staircase</xsd:documentation>
<xsd:documentation>Indicates the presence and type of a ramp included within the staircase.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TopEnd" type="StairEndStructure" minOccurs="0">
Expand Down Expand Up @@ -501,7 +501,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MonitoringRemoteControl" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the escalator is equipped with a remote operation control system</xsd:documentation>
<xsd:documentation>Whether the escalator is equipped with a remote operation control system.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -954,7 +954,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ReachedFloorAnnouncement" type="ReachedFloorAnnouncementEnumeration" default="visual" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the elevator car has a visual, tactile or audible display to announce the floor reached.</xsd:documentation>
<xsd:documentation>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.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="MagneticInductionLoop" type="xsd:boolean" minOccurs="0">
Expand Down Expand Up @@ -987,9 +987,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether the lift is equipped with a remote operation control system</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OtherExitDoors" type="OtherExitDoorsEnumeration" default="none" minOccurs="0">
<xsd:element name="OtherDoors" type="OtherDoorsEnumeration" default="same" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates the position of exit doors on upper floors when it is different from that on the ground floor. To choose the side, consider entering the elevator on the ground floor without turning around.</xsd:documentation>
<xsd:documentation>Indicates the position of doors on floors when it is different from that on the ground floor. To choose the side, consider entering the elevator on the ground floor without turning around.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -1111,12 +1111,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="SafetyEdge" type="SafetyEdgeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether there is a wheel guard (side border intended to block the wheel of the wheelchair to prevent falls)</xsd:documentation>
<xsd:documentation>Whether there is a wheel guard (side border intended to block the wheel of the wheelchair to prevent falls).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TurningSpace" type="RampTurningSpacePositionEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Position of the manoeuvring space (for wheelchairs)</xsd:documentation>
<xsd:documentation>Position of the manoeuvring space (for wheelchairs).</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -1183,11 +1183,16 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether there is a door in the entrance. If false, opening does not have door.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorHandle" type="DoorHandleEnumeration" minOccurs="0">
<xsd:element name="DoorOrientation" type="CompassBearing8Enumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Pointing towards outside (or, for doors within a StopPlace, to label the side as outside).</xsd:documentation>
</xsd:annotation>
<xsd:element name="DoorHandleOutside" type="DoorHandleEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of door handle.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorHandleInside" type="DoorHandleEnumeration" minOccurs="0"/>
<xsd:element name="KeptOpen" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the door is kept open.</xsd:documentation>
Expand Down Expand Up @@ -1513,17 +1518,17 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MarkingStatus" type="MarkingStatusEnumeration" default="good" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Status of the ground marking of the crossing</xsd:documentation>
<xsd:documentation>Status of the ground marking of the crossing.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VibratingCrossingAids" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates the presence of a device delivering vibrations to facilitate the crossing of visually impaired people. May be associated with the OSM traffic_signals:floor_vibration and traffic_signals:vibration</xsd:documentation>
<xsd:documentation>Indicates the presence of a device delivering vibrations to facilitate the crossing of visually impaired people.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BumpCrossing" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates whether the pedestrian crossing is convex, curved (it goes up then down)</xsd:documentation>
<xsd:documentation>Indicates whether the pedestrian crossing is convex, curved (it goes up then down).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VisualObstacle" type="VisualObstacleEnumeration" minOccurs="0">
Expand All @@ -1533,7 +1538,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="BollardCrossing" type="BollardCrossingEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates the presence of bollards intended to protect pedestrians. May be associated with the OSM crossing:bollard</xsd:documentation>
<xsd:documentation>Indicates the presence of bollards intended to protect pedestrians. </xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down

0 comments on commit 0dc8e3c

Please sign in to comment.