Skip to content

Commit

Permalink
Renamed AllVehicleModesOfTransportEnum/List and AllModesOfTransportEn…
Browse files Browse the repository at this point in the history
…um/List
  • Loading branch information
trurlurl committed Dec 12, 2024
1 parent e5fc5e6 commit a66808f
Show file tree
Hide file tree
Showing 23 changed files with 88 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for ACCESS link end.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="TransportMode" type="AllModesOfTransportEnumeration" default="all" minOccurs="0">
<xsd:element name="TransportMode" type="AllModesEnumeration" default="all" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Identifier of MODE of TRANSPORT of end point of ACCESS link. Default is all modes.</xsd:documentation>
<xsd:documentation>Identifier of MODE of end point of ACCESS link. Default is all modes.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PlaceRef" type="PlaceRefStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:group name="VehicleModeCharacterisationGroup">
<xsd:annotation>
<xsd:documentation>Elements characterfising a MODE</xsd:documentation>
<xsd:documentation>Elements characterising a PUBLIC TRANSPORT MODE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration">
<xsd:annotation>
<xsd:documentation>A TRANSPORT MODE for a Vehicle</xsd:documentation>
<xsd:documentation>A PUBLIC TRANSPORT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="AllSubmodeChoiceGroup"/>
Expand Down
30 changes: 15 additions & 15 deletions xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ Rail transport, Roads and Road transport
<xsd:list itemType="AccessModeEnumeration"/>
</xsd:simpleType>
<!--======Vehicle===================================================================================-->
<xsd:element name="VehicleMode" type="AllVehicleModesOfTransportEnumeration">
<xsd:element name="VehicleMode" type="AllPublicTransportModesEnumeration">
<xsd:annotation>
<xsd:documentation>VEHICLE TRANSPORT 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>
<!--======Modes===================================================================================-->
Expand All @@ -141,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="AllModesOfTransportEnumeration">
<xsd:simpleType name="AllModesEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for MODES of TRANSPORT: 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"/>
Expand Down Expand Up @@ -185,21 +185,21 @@ Rail transport, Roads and Road transport
<!-- NOT IN tpeg -->
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="AllModesOfTransportListOfEnumerations">
<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="AllModesOfTransportEnumeration"/>
<xsd:list itemType="AllModesEnumeration"/>
</xsd:simpleType>
<xsd:simpleType name="AllVehicleModesOfTransportListOfEnumerations">
<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">
Expand Down Expand Up @@ -382,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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:group name="TransportModeGroup">
<xsd:annotation>
<xsd:documentation>Elements for a Transport MODE.</xsd:documentation>
<xsd:documentation>Elements for a MODE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="TransportMode" type="AllModesOfTransportEnumeration">
<xsd:element name="TransportMode" type="AllModesEnumeration">
<xsd:annotation>
<xsd:documentation>Categorisation of MODE of TRANSPORT.</xsd:documentation>
<xsd:documentation>Categorisation of MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="AllSubmodeChoiceGroup"/>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="TransportModeStructure">
<xsd:annotation>
<xsd:documentation>Type for a TRANSPORT MODE.</xsd:documentation>
<xsd:documentation>Type for a MODE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="TransportModeGroup"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>MODE elements of an TRANSPORT ORGANISATION.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PrimaryMode" type="AllModesOfTransportEnumeration" minOccurs="0">
<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"/>
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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="AllVehicleModesOfTransportListOfEnumerations" default="all" minOccurs="0">
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:group ref="TransportTypePropertiesGroup"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>MODE of Vehicle transport associated with VEHICLE TYPE. +v1.2.2</xsd:documentation>
<xsd:documentation>PT MODE associated with VEHICLE TYPE. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="VehicleTypeTotalCapacityGroup"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Content of Stop.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Description of MODE of LINE.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
<xsd:element name="VehicleModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>MODES of TRANSPORT 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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ Rail transport, Roads and Road transport
<xsd:group ref="PlaceGroup"/>
<xsd:sequence>
<xsd:group ref="SiteElementNamesGroup"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport.</xsd:documentation>
<xsd:documentation>Primary PT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="FlexibleStopPlaceGroup"/>
Expand All @@ -144,9 +144,9 @@ Rail transport, Roads and Road transport
<xsd:extension base="Place_VersionStructure">
<xsd:sequence>
<xsd:group ref="SiteElementNamesGroup"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport.</xsd:documentation>
<xsd:documentation>Primary PT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="FlexibleStopPlaceGroup"/>
Expand Down Expand Up @@ -298,9 +298,9 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:group>
<xsd:element ref="FlexibleStopPlaceRef" minOccurs="0"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport.</xsd:documentation>
<xsd:documentation>Primary PT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for a TICKETING SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="VehicleModes" type="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
<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:element name="TicketingServiceList" type="TicketingServiceFacilityListOfEnumerations" minOccurs="0">
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Mode Elements of a SITE COMPONENT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport associated by this component.</xsd:documentation>
<xsd:documentation>Primary PT MODE associated by this component.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="PtSubmodeChoiceGroup" minOccurs="0"/>
Expand Down
16 changes: 8 additions & 8 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Mode Elements of a SITE COMPONENT. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:group>
<xsd:element name="OtherTransportModes" type="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
<xsd:element name="OtherTransportModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public transport MODES which may be accessed through associated place.</xsd:documentation>
<xsd:documentation>PUBLIC TRANSPORT MODES which may be accessed through associated place.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="tariffZones" type="tariffZoneRefs_RelStructure" minOccurs="0">
Expand Down Expand Up @@ -1439,9 +1439,9 @@ contained within its parent QUAY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="gml:Polygon" minOccurs="0"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport associated by this component. +v1.2</xsd:documentation>
<xsd:documentation>Primary PT MODE associated by this component. +v1.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="PtSubmodeChoiceGroup" minOccurs="0">
Expand Down Expand Up @@ -1482,9 +1482,9 @@ contained within its parent QUAY.</xsd:documentation>
<xsd:documentation>Type of STOP PLACE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport.</xsd:documentation>
<xsd:documentation>Primary PT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -1526,9 +1526,9 @@ contained within its parent QUAY.</xsd:documentation>
<xsd:documentation>Type of STOP PLACE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary MODE of Vehicle transport.</xsd:documentation>
<xsd:documentation>Primary PT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether POINT is to be shown as accessible.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ConnectingVehicleModes" type="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
<xsd:element name="ConnectingVehicleModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Connecting VEHICLE MODEs of TRANSPORT to show for POINT if different from POINT.</xsd:documentation>
<xsd:documentation>Connecting PT MODEs to show for POINT if different from POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
16 changes: 8 additions & 8 deletions xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Primary LINE in GROUP OF LINEs, if relevant.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Primary Transport MODE of NETWORK.</xsd:documentation>
<xsd:documentation>Primary PUBLIC TRANSPORT MODE of NETWORK.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TransportSubmode" minOccurs="0"/>
Expand Down Expand Up @@ -351,9 +351,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of LINE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Transport MODE of LINE.</xsd:documentation>
<xsd:documentation>PT MODE of LINE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TransportSubmode" minOccurs="0"/>
Expand Down Expand Up @@ -1016,9 +1016,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Name of NETWORK.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>TRANSPORT MODE of NETWORK.</xsd:documentation>
<xsd:documentation>PUBLIC TRANSPORT MODE of NETWORK.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -1059,9 +1059,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Short name of LINE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:element name="TransportMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>TRANSPORT MODE of LINE.</xsd:documentation>
<xsd:documentation>PUBLIC TRANSPORT MODE of LINE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TransportSubmode" minOccurs="0"/>
Expand Down
Loading

0 comments on commit a66808f

Please sign in to comment.