Skip to content

Commit

Permalink
Merge pull request #781 from NeTEx-CEN/v2_labels_third_series
Browse files Browse the repository at this point in the history
Labelling v2.0 changes, third series
  • Loading branch information
Aurige authored Sep 25, 2024
2 parents 0c1c7a5 + f290bde commit 8bfc8df
Show file tree
Hide file tree
Showing 29 changed files with 145 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="responsibilityRoles" type="responsibilityRolesInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>RESPONSIBILITY Roles used in frame.</xsd:documentation>
<xsd:documentation>RESPONSIBILITY roles used in frame. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="responsibilitySets" type="responsibilitySetsInFrame_RelStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="StairFreeAccess" type="LimitationStatusEnumeration" default="unknown">
<xsd:annotation>
<xsd:documentation>Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed.</xsd:documentation>
<xsd:documentation>Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="EscalatorFreeAccess" type="LimitationStatusEnumeration" default="unknown">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:annotation>
<xsd:documentation>Use gml:MultiSurface if the Zone contains multiple non-continuous areas, e.g. a coastline with islands.</xsd:documentation>
<xsd:documentation>Use gml:MultiSurface if the Zone contains multiple non-continuous areas, e.g. a coastline with islands. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:element ref="gml:Polygon"/>
<xsd:element ref="gml:MultiSurface"/>
Expand Down Expand Up @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public identifier code of TARIFF ZONE.</xsd:documentation>
<xsd:documentation>Public identifier code of TARIFF ZONE. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport
</xsd:attribute>
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
<xsd:annotation>
<xsd:documentation>Location of the external entity.</xsd:documentation>
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<xsd:sequence>
<xsd:element name="deckPlans" type="deckPlans_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>A List OF DECK PLANs</xsd:documentation>
<xsd:documentation>A List OF DECK PLANs. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="FlooringStatus" type="FlooringStatusEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Status of the flooring.</xsd:documentation>
<xsd:documentation>Status of the flooring. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="RightSideBorder" type="BorderTypeEnumeration" minOccurs="0">
Expand All @@ -173,7 +173,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="TactileWarningStripContrast" type="xsd:boolean" minOccurs="0" default="true">
<xsd:annotation>
<xsd:documentation>Indicates whether the color of the possible warning strip is sufficiently contrasted with the color of the floor.</xsd:documentation>
<xsd:documentation>Indicates whether the color of the possible warning strip is sufficiently contrasted with the color of the floor. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TactileGuidingStrip" type="xsd:boolean" minOccurs="0">
Expand All @@ -183,7 +183,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="TactileGuidingStripStatus" type="TactileGuidingStripStatusEnumeration" minOccurs="0" default="goodAndContrasted">
<xsd:annotation>
<xsd:documentation>Provides additional details on possible guiding strip.</xsd:documentation>
<xsd:documentation>Provides additional details on possible guiding strip. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="BearingCapacity" type="WeightType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum weight that the EQUIPMENT can bear.</xsd:documentation>
<xsd:documentation>Maximum weight that the EQUIPMENT can bear. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NumberOfSteps" type="xsd:nonNegativeInteger" minOccurs="0">
Expand All @@ -239,12 +239,12 @@ Rail transport, Roads and Road transport
</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:documentation>Length of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE. +v2.0</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:documentation>Width of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="GapToPlatform" type="LengthType" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,21 @@ 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="stationMap">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="acousticStationMap">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="tactileStationMap">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,11 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="ownCar"/>
<xsd:enumeration value="privateLift"/>
<xsd:enumeration value="privateLift">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="openModes" type="openModesRelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OPEN MODES in FRAME</xsd:documentation>
<xsd:documentation>OPEN MODES in FRAME. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="modesOfOperation" type="modesOfOperationRelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>MODES OF OPERATION in frame.</xsd:documentation>
<xsd:documentation>MODES OF OPERATION in frame. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,21 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="shuttle"/>
<xsd:enumeration value="ski"/>
<xsd:enumeration value="skate"/>
<xsd:enumeration value="motorcycle"/>
<xsd:enumeration value="scooter"/>
<xsd:enumeration value="wheelchair"/>
<xsd:enumeration value="motorcycle">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="scooter">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="wheelchair">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="AccessModeListOfEnumerations">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,16 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="CarModelProfile"/>
<xsd:element ref="CycleModelProfile"/>
<xsd:element ref="CarModelProfile">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="CycleModelProfile">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MaximumBookingPeriod" type="xsd:duration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum interval in advance of departure day or time that Service may be ordered. +V1.2..2</xsd:documentation>
<xsd:documentation>Maximum interval in advance of departure day or time that Service may be ordered. +V1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BookingUrl" type="InfoLinkStructure" minOccurs="0">
Expand Down Expand Up @@ -333,7 +333,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MaximumBookingPeriod" type="xsd:duration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum interval in advance of departure day or time that a service may be ordered. +V1.2..2</xsd:documentation>
<xsd:documentation>Maximum interval in advance of departure day or time that a service may be ordered. +V1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BookingUrl" type="InfoLinkStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Service mode</xsd:documentation>
</xsd:enumeration>
<xsd:enumeration value="largeVehicleTransportRailService">
<xsd:annotation>
<xsd:documentation>carTransportRailService that allows for bigger vehicles than normal cars (e.g. truck, bus).</xsd:documentation>
<xsd:documentation>carTransportRailService that allows for bigger vehicles than normal cars (e.g. truck, bus). +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="touristRailway">
Expand Down Expand Up @@ -432,7 +432,7 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
<xsd:enumeration value="dragLift"/>
<xsd:enumeration value="paternoster">
<xsd:annotation>
<xsd:documentation>A paternoster lift is a vertical passenger lift which consists of a chain of open compartments that passengers step into as it passes.</xsd:documentation>
<xsd:documentation>A paternoster lift is a vertical passenger lift which consists of a chain of open compartments that passengers step into as it passes. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="telecabinLink">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,21 @@ Rail transport, Roads and Road transport
<xsd:documentation>Allowed values for classifying TOPOGRAPHIC PLACEs.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="continent"/>
<xsd:enumeration value="interregion"/>
<xsd:enumeration value="country"/>
<xsd:enumeration value="continent">
<xsd:annotation>
<xsd:documentation>+v1.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="interregion">
<xsd:annotation>
<xsd:documentation>+v1.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="country">
<xsd:annotation>
<xsd:documentation>+v1.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="principality"/>
<xsd:enumeration value="state"/>
<xsd:enumeration value="province">
Expand All @@ -83,7 +95,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Locality is a city.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="municipality"/>
<xsd:enumeration value="municipality">
<xsd:annotation>
<xsd:documentation>+v1.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="quarter"/>
<xsd:enumeration value="suburb">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="carriage"/>
<xsd:enumeration value="engine"/>
<xsd:enumeration value="carTransporter"/>
<xsd:enumeration value="largeVehicleTransporter"/>
<xsd:enumeration value="largeVehicleTransporter">
<xsd:annotation>
<xsd:documentation>+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="sleeperCarriage"/>
<xsd:enumeration value="luggageVan"/>
<xsd:enumeration value="restaurantCarriage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ Rail transport, Roads and Road transport
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="VehicleEquipmentProfile"/>
<xsd:element ref="RechargingEquipmentProfile"/>
<xsd:element ref="RechargingEquipmentProfile">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,12 +764,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="PramPlaceCapacity" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The number of places on the vehicle that are suitable for prams.</xsd:documentation>
<xsd:documentation>The number of places on the vehicle that are suitable for prams. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BicycleRackCapacity" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The number of bicycle racks on the vehicle. Also non-rack places should be counted here. The name might change in future to BicycleCapacity.</xsd:documentation>
<xsd:documentation>The number of bicycle racks on the vehicle. Also non-rack places should be counted here. The name might change in future to BicycleCapacity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="taxiRanks" type="taxiRanksInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>TAXI RANKs in frame.</xsd:documentation>
<xsd:documentation>TAXI RANKs in frame. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="pointsOfInterest" type="pointsOfInterestInFrame_RelStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:element name="LiftCallEquipment" substitutionGroup="AccessEquipment">
<xsd:annotation>
<xsd:documentation>Specialisation of PLACE ACCESS EQUIPMENT for calling LIFTs (provides specific characteristics that may differ from floor to floor like button height, door, etc.).</xsd:documentation>
<xsd:documentation>Specialisation of PLACE ACCESS EQUIPMENT for calling LIFTs (provides specific characteristics that may differ from floor to floor like button height, door, etc.). +v1.3.1</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand Down Expand Up @@ -1068,7 +1068,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="GroundMarkAlignedWithButton" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates a tactile marker on floor under the buttons (or aligned with). +v1.1</xsd:documentation>
<xsd:documentation>Indicates a tactile marker on floor under the buttons (or aligned with).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AudioAnnouncements" type="xsd:boolean" minOccurs="0">
Expand All @@ -1078,7 +1078,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MagneticInductionLoop" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Indicates existence of a magnetic induction loop. +v1.1</xsd:documentation>
<xsd:documentation>Indicates existence of a magnetic induction loop.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorOrientation" type="CompassBearing8Enumeration" minOccurs="0" maxOccurs="2">
Expand All @@ -1088,7 +1088,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="MonitoringRemoteControl" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the lift is equipped with a remote operation control system</xsd:documentation>
<xsd:documentation>Whether the lift is equipped with a remote operation control system.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -1294,18 +1294,18 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="DoorOrientation" type="CompassBearing8Enumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Pointing towards outside (or, for doors within a StopPlace, to label the side as outside).</xsd:documentation>
<xsd:documentation>Pointing towards outside (or, for doors within a StopPlace, to label the side as outside). +v1.3.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorHandleOutside" type="DoorHandleEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of door handle.</xsd:documentation>
<xsd:documentation>Type of door handle. +v1.3.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DoorHandleInside" type="DoorHandleEnumeration" minOccurs="0"/>
<xsd:element name="KeptOpen" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the door is kept open.</xsd:documentation>
<xsd:documentation>Whether the door is kept open. +v1.3.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="RevolvingDoor" type="xsd:boolean" minOccurs="0">
Expand Down
Loading

0 comments on commit 8bfc8df

Please sign in to comment.