Skip to content

Fix AccessEquipmentRef #168

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

Merged
skinkie merged 5 commits into from
Apr 15, 2022
Merged

Fix AccessEquipmentRef #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1635921
Fix AccessEquipmentRef
skinkie Apr 25, 2021
047c548
Should be abstract as this element cannot be implemented (only its su…
syversenkr Apr 26, 2021
e46c975
Honest attempt to change the model to the UML description.
skinkie Apr 15, 2022
4986b91
Extra fixes
skinkie Apr 15, 2022
135de94
Merge branch 'master' into fix_access_equipmentref
skinkie Apr 15, 2022
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
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="PassengerEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="VehicleEquipmentRef" type="InstalledEquipmentRefStructure" substitutionGroup="PassengerEquipmentRef">
<xsd:element name="VehicleEquipmentRef" type="VehicleEquipmentRefStructure" substitutionGroup="PassengerEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -111,7 +111,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="VehicleEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="WheelchairVehicleRef" type="InstalledEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:element name="WheelchairVehicleRef" type="WheelchairVehicleRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 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 @@ -120,7 +120,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="AccessVehicleEquipment" substitutionGroup="InstalledEquipment">
<xsd:element name="AccessVehicleEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of VEHICLE EQUIPMENT for ACCESS providing information such as low floor, ramp, access area dimensions, etc.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -280,7 +280,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="WheelchairVehicleEquipment" substitutionGroup="InstalledEquipment">
<xsd:element name="WheelchairVehicleEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of VEHICLE EQUIPMENT for Wheel chair accessibility on board a VEHICLE providing information such as the number of wheel chair areas and the access dimensions.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Rail transport, Roads and Road transport
<xsd:restriction base="EquipmentRefStructure">
<xsd:attribute name="ref" type="InstalledEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a POINT.</xsd:documentation>
<xsd:documentation>Identifier of an INSTALLED EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
Expand Down
25 changes: 25 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,31 @@ Rail transport, Roads and Road transport
<xsd:extension base="InstalledEquipment_VersionStructure"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="PlaceEquipmentRef" type="PlaceEquipmentRefStructure" abstract="true" substitutionGroup="InstalledEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a PLACE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="PlaceEquipmentRefStructure" abstract="true">
<xsd:annotation>
<xsd:documentation>Type for a reference to an PLACE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="InstalledEquipmentRefStructure">
<xsd:attribute name="ref" type="PlaceEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a PLACE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="PlaceEquipmentIdType">
<xsd:annotation>
<xsd:documentation>Type for identifier of a PLACE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="InstalledEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="OtherPlaceEquipment" type="PlaceEquipment_VersionStructure">
<xsd:annotation>
<xsd:documentation>Equipment that may be in a fixed within a SITE.</xsd:documentation>
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>Type for identifier of an ACCESS EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="InstalledEquipmentIdType"/>
<xsd:restriction base="PlaceEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="AccessEquipmentRef" type="AccessEquipmentRefStructure" abstract="true" substitutionGroup="EquipmentRef">
<xsd:element name="AccessEquipmentRef" type="AccessEquipmentRefStructure" abstract="true" substitutionGroup="PlaceEquipmentRef">
<xsd:annotation>
<xsd:documentation>Identifier of an ACCESS EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand All @@ -82,10 +82,10 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to an ACCESS EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="InstalledEquipmentRefStructure">
<xsd:restriction base="PlaceEquipmentRefStructure">
<xsd:attribute name="ref" type="AccessEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of an ACCESS EQUIPMENT.</xsd:documentation>
<xsd:documentation>Identifier of a ACCESS EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ====ACCESS=================================================================== -->
<xsd:element name="AccessEquipment" type="AccessEquipment_VersionStructure" abstract="true" substitutionGroup="InstalledEquipment">
<xsd:element name="AccessEquipment" type="AccessEquipment_VersionStructure" abstract="true" substitutionGroup="PlaceEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of PLACE EQUIPMENT dedicated to access (e.g. lifts, entrances, stairs, ramps, etc.).</xsd:documentation>
</xsd:annotation>
Expand All @@ -140,7 +140,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for an ACCESS EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="InstalledEquipment_VersionStructure">
<xsd:extension base="PlaceEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="AccessEquipmentGroup">
<xsd:annotation>
Expand Down
10 changes: 5 additions & 5 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>Type for identifier of SIGN EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="EquipmentIdType"/>
<xsd:restriction base="PlaceEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="SignEquipmentRef" type="EquipmentRefStructure" substitutionGroup="EquipmentRef">
<xsd:element name="SignEquipmentRef" type="PlaceEquipmentRefStructure" substitutionGroup="PlaceEquipmentRef">
<xsd:annotation>
<xsd:documentation>Identifier of an SIGN EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand All @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to an PLACE SIGN.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="EquipmentRefStructure">
<xsd:restriction base="PlaceEquipmentRefStructure">
<xsd:attribute name="ref" type="PlaceSignIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a PLACE SIGN.</xsd:documentation>
Expand All @@ -111,7 +111,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to an GENERAL SIGN.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="EquipmentRefStructure">
<xsd:restriction base="PlaceEquipmentRefStructure">
<xsd:attribute name="ref" type="GeneralSignIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a GENERAL SIGN.</xsd:documentation>
Expand All @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to an HEADING SIGN.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="EquipmentRefStructure">
<xsd:restriction base="PlaceEquipmentRefStructure">
<xsd:attribute name="ref" type="HeadingSignIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a HEADING SIGN.</xsd:documentation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ===SIGNS =================================================================== -->
<xsd:element name="SignEquipment" type="SignEquipment_VersionStructure" substitutionGroup="InstalledEquipment">
<xsd:element name="SignEquipment" type="SignEquipment_VersionStructure" substitutionGroup="PlaceEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of PLACE EQUIPMENT for signs (heading signs, etc.).</xsd:documentation>
</xsd:annotation>
Expand All @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for SIGN EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="InstalledEquipment_VersionStructure">
<xsd:extension base="PlaceEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="SignEquipmentGroup"/>
</xsd:sequence>
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ====ACCESS=================================================================== -->
<xsd:element name="TicketingEquipment" substitutionGroup="InstalledEquipment">
<xsd:element name="TicketingEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of PASSENGER EQUIPMENT for ticketing.</xsd:documentation>
</xsd:annotation>
Expand All @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a TICKETING EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="InstalledEquipment_VersionStructure">
<xsd:extension base="PassengerEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="TicketingEquipmentGroup"/>
</xsd:sequence>
Expand Down Expand Up @@ -237,7 +237,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ===TICEKT VALIDATOR EQUIPENT============================================ -->
<xsd:element name="TicketValidatorEquipment" substitutionGroup="InstalledEquipment">
<xsd:element name="TicketValidatorEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of INSTALLED EQUIPMENT describing a ticket validator.</xsd:documentation>
</xsd:annotation>
Expand All @@ -252,7 +252,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a TICKET VALIDATOR EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="InstalledEquipment_VersionStructure">
<xsd:extension base="PassengerEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="TicketValidatorGroup"/>
</xsd:sequence>
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>Type for identifier of SITE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="EquipmentIdType"/>
<xsd:restriction base="PlaceEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="SiteEquipmentRef" type="SiteEquipmentRefStructure" substitutionGroup="EquipmentRef">
<xsd:element name="SiteEquipmentRef" type="SiteEquipmentRefStructure" substitutionGroup="PlaceEquipmentRef">
<xsd:annotation>
<xsd:documentation>Identifier of an SITE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand All @@ -75,7 +75,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to an SITE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="EquipmentRefStructure">
<xsd:restriction base="PlaceEquipmentRefStructure">
<xsd:attribute name="ref" type="SiteEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a SITE EQUIPMENT.</xsd:documentation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:element name="SiteEquipment" type="SiteEquipment_VersionStructure" abstract="true" substitutionGroup="InstalledEquipment">
<xsd:element name="SiteEquipment" type="SiteEquipment_VersionStructure" abstract="true" substitutionGroup="PlaceEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of PLACE EQUIPMENT for SITEs (e.g. LUGGAGE LOCKER, WAITING EQUIPMENT, TROLLEY STAND, etc.)</xsd:documentation>
</xsd:annotation>
Expand All @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a SITE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="InstalledEquipment_VersionStructure"/>
<xsd:extension base="PlaceEquipment_VersionStructure"/>
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
Expand Down