-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
Stratification of transport mode enumerations #791
base: next
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,41 +112,13 @@ Rail transport, Roads and Road transport | |
<xsd:list itemType="AccessModeEnumeration"/> | ||
</xsd:simpleType> | ||
<!--======Vehicle===================================================================================--> | ||
<xsd:element name="VehicleMode" type="AllModesEnumeration"> | ||
<xsd:element name="VehicleMode" type="AllPublicTransportModesEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>VEHICLE MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).</xsd:documentation> | ||
<xsd:documentation>PUBLIC TRANSPORT MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:simpleType name="VehicleModeEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for MODES of Public Transport applicable to timetabled public transport.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:restriction base="xsd:NMTOKEN"> | ||
<xsd:enumeration value="air"/> | ||
<xsd:enumeration value="bus"/> | ||
<xsd:enumeration value="coach"/> | ||
<xsd:enumeration value="ferry"/> | ||
<xsd:enumeration value="metro"/> | ||
<xsd:enumeration value="rail"/> | ||
<xsd:enumeration value="trolleyBus"/> | ||
<xsd:enumeration value="tram"/> | ||
<xsd:enumeration value="water"/> | ||
<xsd:enumeration value="cableway"/> | ||
<xsd:enumeration value="funicular"/> | ||
<xsd:enumeration value="lift"/> | ||
<xsd:enumeration value="snowAndIce"/> | ||
<xsd:enumeration value="other"/> | ||
</xsd:restriction> | ||
</xsd:simpleType> | ||
<xsd:simpleType name="VehicleModeListOfEnumerations"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for List of PT MODES of transport applicable to timetabled public transport.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:list itemType="VehicleModeEnumeration"/> | ||
</xsd:simpleType> | ||
<!--======Modes===================================================================================--> | ||
<!--======Modes===================================================================================--> | ||
<xsd:element name="RoadVehicleMode" type="AllModesEnumeration"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like having been the wrong before. |
||
<xsd:element name="RoadVehicleMode" type="RoadVehicleModeEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>Road Vehicle MODE: a characterisation of the operation according to the means of transport (bus, tram, coach).</xsd:documentation> | ||
</xsd:annotation> | ||
|
@@ -169,14 +141,14 @@ Rail transport, Roads and Road transport | |
<xsd:list itemType="RoadVehicleModeEnumeration"/> | ||
</xsd:simpleType> | ||
<!--======Modes===================================================================================--> | ||
<xsd:element name="AllVehicleModes" type="AllVehicleModesOfTransportEnumeration"> | ||
<xsd:element name="AllVehicleModes" type="AllPublicTransportModesEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>All MODEs including vehicle transport and self drive.</xsd:documentation> | ||
<xsd:documentation>All PUBLIC TRANSPORT MODEs including self drive.</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:simpleType name="AllModesEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for r MODES: TPEG pti_table 01.</xsd:documentation> | ||
<xsd:documentation>All MODEs (PUBLIC TRANSPORT MODEs and PERSONAL MODEs).</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:restriction base="xsd:NMTOKEN"> | ||
<xsd:enumeration value="all"/> | ||
|
@@ -215,19 +187,19 @@ Rail transport, Roads and Road transport | |
</xsd:simpleType> | ||
<xsd:simpleType name="AllModesListOfEnumerations"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for List of ALL MODES of transport.</xsd:documentation> | ||
<xsd:documentation>Allowed values for List of ALL MODES.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:list itemType="AllModesEnumeration"/> | ||
</xsd:simpleType> | ||
<xsd:simpleType name="AllVehicleModesListOfEnumerations"> | ||
<xsd:simpleType name="AllPublicTransportModesListOfEnumerations"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for List of PT MODES of transport applicable to timetabled public transport.</xsd:documentation> | ||
<xsd:documentation>Allowed values for List of PT MODES applicable to timetabled public transport.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:list itemType="AllVehicleModesOfTransportEnumeration"/> | ||
<xsd:list itemType="AllPublicTransportModesEnumeration"/> | ||
</xsd:simpleType> | ||
<xsd:simpleType name="AllVehicleModesOfTransportEnumeration"> | ||
<xsd:simpleType name="AllPublicTransportModesEnumeration"> | ||
<xsd:annotation> | ||
<xsd:documentation>Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used.</xsd:documentation> | ||
<xsd:documentation>PUBLIC TRANSPORT MODE: A MODE used for public transport services (e.g., by bus, by tram, by metro, by train, by ferry, by ship, by shared taxi car, by shared car) under either a CONVENTIONAL MODE OF OPERATION or an ALTERNATIVE MODE OF OPERATION (i.e., excluding a PERSONAL MODE OF OPERATION). Note: Prior to TM 6.2 this was named VEHICLE MODE.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:restriction base="xsd:NMTOKEN"> | ||
<xsd:enumeration value="all"> | ||
|
@@ -410,7 +382,7 @@ Rail transport, Roads and Road transport | |
</xsd:annotation> | ||
<xsd:complexContent> | ||
<xsd:extension base="SubmodeRefStructure"> | ||
<xsd:attribute name="mode" type="AllVehicleModesOfTransportEnumeration" use="required"/> | ||
<xsd:attribute name="mode" type="AllPublicTransportModesEnumeration" use="required"/> | ||
</xsd:extension> | ||
</xsd:complexContent> | ||
</xsd:complexType> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -278,7 +278,7 @@ Rail transport, Roads and Road transport | |
<xsd:sequence> | ||
<xsd:element name="PrimaryMode" type="AllModesEnumeration" minOccurs="0"> | ||
<xsd:annotation> | ||
<xsd:documentation>Primary transport MODE of TRANSPORT ORGANISATION</xsd:documentation> | ||
<xsd:documentation>Primary MODE of TRANSPORT ORGANISATION</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:group ref="AllSubmodeChoiceGroup" minOccurs="0"/> | ||
|
@@ -510,9 +510,9 @@ Rail transport, Roads and Road transport | |
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:element ref="OrganisationPartRef" minOccurs="0"/> | ||
<xsd:element name="VehicleMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0"> | ||
<xsd:element name="VehicleMode" type="AllPublicTransportModesEnumeration" minOccurs="0"> | ||
<xsd:annotation> | ||
<xsd:documentation>Vehicle mode to which context applies.</xsd:documentation> | ||
<xsd:documentation>PT MODE to which context applies.</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:element ref="TransportSubmode" minOccurs="0"/> | ||
|
@@ -731,9 +731,9 @@ Rail transport, Roads and Road transport | |
<xsd:documentation>Elements for an TRANSPORT ADMINISTRATIVE ZONE.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:sequence> | ||
<xsd:element name="VehicleModes" type="AllModesListOfEnumerations" default="all" minOccurs="0"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like having been the wrong before. |
||
<xsd:element name="VehicleModes" type="AllPublicTransportModesListOfEnumerations" default="all" minOccurs="0"> | ||
<xsd:annotation> | ||
<xsd:documentation>TRANSPORT MODEs for which this zone applies. Default is all.</xsd:documentation> | ||
<xsd:documentation>PUBLIC TRANSPORT MODEs for which this zone applies. Default is all.</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
</xsd:sequence> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -114,9 +114,9 @@ Rail transport, Roads and Road transport | |
<xsd:documentation>Elements for a TICKETING EQUIPMENT.</xsd:documentation> | ||
</xsd:annotation> | ||
<xsd:sequence> | ||
<xsd:element name="VehicleModes" type="AllModesListOfEnumerations" minOccurs="0"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like having been the wrong before. |
||
<xsd:element name="VehicleModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0"> | ||
<xsd:annotation> | ||
<xsd:documentation>Modes for which ticketing services apply.</xsd:documentation> | ||
<xsd:documentation>PT MODEs for which ticketing services apply.</xsd:documentation> | ||
</xsd:annotation> | ||
</xsd:element> | ||
<xsd:group ref="TicketingEquipmentPropertiesGroup"/> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like having been the wrong before.