Skip to content
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

Integrate LineEquipment air conditioning #601

Merged
merged 3 commits into from
Dec 19, 2023
Merged

Integrate LineEquipment air conditioning #601

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eba7887
include the new FAciclities
ue71603 Dec 13, 2023
3d39e4b
Lint and update documentation tables
github-actions[bot] Dec 13, 2023
4110979
ClimateControl
ue71603 Dec 14, 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
2 changes: 2 additions & 0 deletions examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,9 @@ The Calendar is shown coded as
<ServiceFacilitySet version="any" id="acs:sfs_24o_01">
<ProvidedByRef ref="xyz:4567">EXTERNAL</ProvidedByRef>
<AssistanceFacilityList>boardingAssistance conductor wheelchairAssistance</AssistanceFacilityList>
<EnvironmentControlList>airConditioning</EnvironmentControlList>
<FareClasses>standardClass</FareClasses>
<LightingControlFacilityList>tintedWindows blinds curtains</LightingControlFacilityList>
<MobilityFacilityList> stepFreeAccess suitableForWheelchairs</MobilityFacilityList>
<NuisanceFacilityList>noSmoking</NuisanceFacilityList>
<PassengerInformationFacilityList>nextStopIndicator realTimeConnections stopAnnouncements</PassengerInformationFacilityList>
Expand Down
31 changes: 31 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 @@ -358,6 +358,21 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="EnvironmentControlEnumeration">
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nick: ClimateControl

<xsd:annotation>
<xsd:documentation>Allowed values for Environment Control Facility.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="none"/>
<xsd:enumeration value="airConditioning"/>
<xsd:enumeration value="heating"/>
<xsd:enumeration value="noConditioning"/>
<xsd:enumeration value="windowsCanBeOpened"/>
<xsd:enumeration value="sealedWindows"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="FamilyFacilityEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Family Accommodation.</xsd:documentation>
Expand Down Expand Up @@ -396,6 +411,22 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="LightingControlFacilityEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for lighing control Facility.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="none"/>
<xsd:enumeration value="tintedWindows"/>
<xsd:enumeration value="blinds"/>
<xsd:enumeration value="curtains"/>
<xsd:enumeration value="dimmableLights"/>
<xsd:enumeration value="lightsAlwaysOn"/>
<xsd:enumeration value="noNaturalLight"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="LuggageCarriageEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Luggage Carriage Facility.</xsd:documentation>
Expand Down
36 changes: 36 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,15 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="CarServiceFacilityList" minOccurs="0"/>
<xsd:element ref="CateringFacilityList" minOccurs="0"/>
<xsd:element ref="EnvironmentControlList" minOccurs="0"/>
<xsd:element ref="FamilyFacilityList" minOccurs="0"/>
<xsd:element ref="FareClasses" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of Fare Classes.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="GenderLimitation" minOccurs="0"/>
<xsd:element ref="LightingControlFacilityList" minOccurs="0"/>
<xsd:element ref="MealFacilityList" minOccurs="0"/>
<xsd:element ref="MedicalFacilityList" minOccurs="0"/>
<xsd:element ref="MobilityFacilityList" minOccurs="0"/>
Expand Down Expand Up @@ -906,6 +908,23 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:list itemType="CouchetteFacilityEnumeration"/>
</xsd:simpleType>
<!-- ========== Environment Control Service FACILITY============================-->
<xsd:element name="EnvironmentControl" type="EnvironmentControlEnumeration">
<xsd:annotation>
<xsd:documentation>Classification of ENVIRONMENT CONTROL FACILITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="EnvironmentControlList" type="EnvironmentControlListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of ENVIRONMENT CONTROL FACILITies.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="EnvironmentControlListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of values for ENVIRONMENT CONTROL SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="EnvironmentControlEnumeration"/>
</xsd:simpleType>
<!-- ========== Emergency Service FACILITY============================-->
<xsd:element name="EmergencyService" type="EmergencyServiceEnumeration">
<xsd:annotation>
Expand Down Expand Up @@ -980,6 +999,23 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:list itemType="HireFacilityEnumeration"/>
</xsd:simpleType>
<!-- ===Lighting Control FACILITY====================================== -->
<xsd:element name="LightingControlFacility" type="LightingControlFacilityEnumeration" default="unknown">
<xsd:annotation>
<xsd:documentation>Classification of lighting control FACILITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LightingControlFacilityList" type="LightingControlFacilityListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of lighting control FACILITies.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="LightingControlFacilityListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of values for lighting control FACILITY.</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="LightingControlFacilityEnumeration"/>
</xsd:simpleType>
<!-- ===Luggage Carriage FACILITY====================================== -->
<xsd:element name="LuggageCarriageFacility" type="LuggageCarriageEnumeration" default="unknown">
<xsd:annotation>
Expand Down