Skip to content

Re-adapt commit 84c52d1 #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TuThoThai wants to merge 1 commit into from
Closed

Re-adapt commit 84c52d1 #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,17 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====AccessEquipment============================ -->
<xsd:keyref name="AccessEquipment_AnyKeyRef" refer="netex:AccessEquipment_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccessEquipmentRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="AccessEquipment_AnyVersionedKey">
<xsd:selector xpath=".//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:LiftCallEquipment | .//netex:RampEquipment | .//netex:StaircaseEquipment | .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:RoughSurface | .//netex:PlaceLighting"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====EntranceEquipment============================== -->
<!-- =====EntranceEquipment unique========================== -->
<xsd:unique name="EntranceEquipment_UniqueBy_Id_Version">
Expand Down
5 changes: 0 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,6 @@ Rail transport, Roads and Road transport
<xsd:documentation>VEHICLE has a hoist or lift for wheelchairs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HoistOperatingRadius" type="LengthType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Distance from VEHICLE needed to operate hoist.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Ramp" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether a ramp may be used to access VEHICLE.</xsd:documentation>
Expand Down
2 changes: 2 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
</Date>
<Date><Modified>2021-07-07</Modified>Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility
</Date>
<Date><Modified>2021-07-07</Modified>Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the FACILITY subtypes </p>
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>The presentation colours to use for this TYPE OF PRODUCT CATEGORY. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Presentation" type="PresentationStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The presentation colours to use for this TYPE OF PRODUCT CATEGORY. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
42 changes: 41 additions & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,11 @@ Rail transport, Roads and Road transport
<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="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. 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">
<xsd:annotation>
<xsd:documentation>Indicates existence of a Magnetic Induction Loop. +v1.1</xsd:documentation>
Expand Down Expand Up @@ -1068,7 +1073,42 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="GroundMarkAlignedWithButton" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates a tactile marker on floor under the buttons (or aligned with).</xsd:documentation>
<xsd:documentation>Height of call button from ground.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="RaisedButtons" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether buttons are raised.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BrailleButtons" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether buttons have braille.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="GroundMarkAlignedWithButton" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates a tactile marker on floor under the buttons (or aligned with). +v1.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AudioAnnouncements" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether LIFT has AudioAnnouncements.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="MagneticInductionLoop" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates existence of a magnetic induction loop. +v1.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorOrientation" type="CompassBearing8Enumeration" minOccurs="0" maxOccurs="2">
<xsd:annotation>
<xsd:documentation>The direction from which to approach the door(s).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="MonitoringRemoteControl" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the lift is equipped with a remote operation control system</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AudioAnnouncements" type="xsd:boolean" minOccurs="0">
Expand Down
74 changes: 74 additions & 0 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,80 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="PassengerBeaconEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>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.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="PassengerBeaconEquipment_VersionStructure">
<xsd:sequence>
<xsd:sequence>
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="DataManagedObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="EquipmentGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:element name="Fixed" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the EQUIPMENT is fixed at a place or in a vehicle.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="PassengerBeaconEquipmentGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="PassengerBeaconEquipmentIdType" use="optional"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="PassengerBeaconEquipment_VersionStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a BEACON EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="PassengerEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="PassengerBeaconEquipmentGroup"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="PassengerBeaconEquipmentGroup">
<xsd:annotation>
<xsd:documentation>Elements for a BEACON EQUIPMENT type. Beacons are under development so the Enumerations may change fast.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="AccessibilityAssessment" minOccurs="0"/>
<xsd:element name="BeaconType" type="BeaconTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The type of the beacon.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BeaconDirection" type="BeaconDirectionEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>If the Beacon is unidirectional or bidirectional.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BeaconProtocol" type="BeaconProtocolEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The relevant Beacon Protocol used.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BeaconBackendUrl" type="xsd:anyURI" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The to reach the back end system for the usage of the beacon.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="RubbishDisposalEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>Equipment for Passengers relating to a Rubbish disposal.</xsd:documentation>
Expand Down
Loading