Skip to content

Delfiplus extensions #388

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
ue71603 merged 6 commits into from
Dec 19, 2023
Merged

Delfiplus extensions #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b6f05c
Changes needed from the mapping table on DELFI+
ue71603 Aug 22, 2022
b63ade5
Update netex_ifopt_stopPlace_support.xsd
ue71603 Nov 24, 2023
d82c9a3
Lint and update documentation tables
github-actions[bot] Nov 24, 2023
a8c8440
Update xsd/netex_framework/netex_reusableComponents/netex_equipment_s…
ue71603 Dec 18, 2023
9608777
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
ue71603 Dec 18, 2023
35904db
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
ue71603 Dec 18, 2023
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
19 changes: 12 additions & 7 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 @@ -196,19 +196,14 @@ Rail transport, Roads and Road transport
<xsd:documentation>VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HoistOperatingRadius" type="LengthType" minOccurs="0">
Copy link
Copy Markdown
Contributor

@Aurige Aurige Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this replaced by something else ?

Copy link
Copy Markdown
Contributor Author

@ue71603 ue71603 Nov 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was answered by @duexw

<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>
</xsd:annotation>
</xsd:element>
<xsd:element name="RampBearingCapacity" type="WeightType" minOccurs="0">
Copy link
Copy Markdown
Contributor

@Aurige Aurige Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renaming is always a risk for backward compatibility ... On the French side, we can still accept this one since it is not used yet !

Copy link
Copy Markdown
Contributor

@duexw duexw Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AccessVehicleEquipment can be either a Hoist or a Ramp, but some properties are only available for either one of them. Both change proposals have the same objective: if we replace RampBearingCapacity with just BearingCapacity, then we can use it for Hoist as well. If we replace HoistOperatingRadius by an Equipment width and length property, then we can use it for both ramp and hoist. We think the risk of change is low - in Germany no one has implemented AccessEquipments yet as well.

Copy link
Copy Markdown
Contributor Author

@ue71603 ue71603 Nov 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was answered by @duexw

<xsd:element name="BearingCapacity" type="WeightType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum weight that ramp can bear.</xsd:documentation>
<xsd:documentation>Maximum weight that the EQUIPMENT can bear.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NumberOfSteps" type="xsd:nonNegativeInteger" minOccurs="0">
Expand All @@ -221,6 +216,16 @@ Rail transport, Roads and Road transport
<xsd:documentation>Maximum step height to board.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="EquipmentLength" type="LengthType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Length of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="EquipmentWidth" type="LengthType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Width of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="GapToPlatform" type="LengthType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Normal gap between VEHICLE and platform.</xsd:documentation>
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 @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:element name="TypeOfEquipmentRef" type="TypeOfEquipmentRefStructure" substitutionGroup="TypeOfEntityRef">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF EQUIPMENT.</xsd:documentation>
<xsd:documentation>Reference to a TYPE OF EQUIPMENT. Some values are defined for EPIAP: "mobileRamp" for mobile Ramps, "permanentRamp" for permanent installation and "wheelchairLift" for a hoist.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="TypeOfEquipmentRefStructure">
Expand Down
3 changes: 3 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 @@ -595,6 +595,9 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="networkStatus"/>
<xsd:enumeration value="realTimeDisruptions"/>
<xsd:enumeration value="realTimeDepartures"/>
<xsd:enumeration value="stationMap"/>
<xsd:enumeration value="acousticStationMap"/>
<xsd:enumeration value="tactileStationMap"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down
10 changes: 10 additions & 0 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,16 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="vehicleLoadingPlace"/>
<xsd:enumeration value="handicappedLevelBoardingSector"/>
<xsd:enumeration value="multimodal"/>
<xsd:enumeration value="busOnStreetBoarding">
<xsd:annotation>
<xsd:documentation>Bus stop directly on street. This means people waiting to board will literally be standing on the street.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="tramOnStreetBoarding">
<xsd:annotation>
<xsd:documentation>Tram stop directly on street. This means people waiting to board will literally be standing on the street.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down