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

Jump to bottom

Labelling v2.0 changes, second series #764

Merged
merged 3 commits into from
Sep 3, 2024
Merged

Labelling v2.0 changes, second series #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3df288
Labels +v1.2.2 for PR 305
trurlurl Aug 17, 2024
ccf4a4d
Lint and update documentation tables
github-actions[bot] Aug 17, 2024
925b630
Update xsd/netex_framework/netex_reusableComponents/netex_submode_ver…
ue71603 Aug 17, 2024
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
18 changes: 15 additions & 3 deletions xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,17 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="Reservation"/>
<xsd:enumeration value="EntityLegalOwnership"/>
<xsd:enumeration value="FareManagement"/>
<xsd:enumeration value="Financing"/>
<xsd:enumeration value="Financing">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="SecurityManagement"/>
<xsd:enumeration value="CustomerService"/>
<xsd:enumeration value="CustomerService">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="DataRegistrar"/>
<xsd:enumeration value="Tenant"/>
<xsd:enumeration value="FacilityManagement"/>
Expand Down Expand Up @@ -145,7 +153,11 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="distributes"/>
<xsd:enumeration value="secures"/>
<xsd:enumeration value="redistributes"/>
<xsd:enumeration value="supports"/>
<xsd:enumeration value="supports">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="owns"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@ Rail transport, Roads and Road transport
</xsd:enumeration>
<xsd:enumeration value="NAND">
<xsd:annotation>
<xsd:documentation>Successive elements are logically ANDed together; comparison must satisfy all specified values. The result is then negated.</xsd:documentation>
<xsd:documentation>Successive elements are logically ANDed together; comparison must satisfy all specified values. The result is then negated. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="NOR">
<xsd:annotation>
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy at least one specified value. The result is then negated.</xsd:documentation>
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy at least one specified value. The result is then negated. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="XNOR">
<xsd:annotation>
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy only one specified value. The result is then negated.</xsd:documentation>
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy only one specified value. The result is then negated. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:simpleType name="TimeOfDayEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for TimeOfDay.</xsd:documentation>
<xsd:documentation>Allowed values for TimeOfDay. +v1.2.2</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="dawn"/>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="StartEvent" type="TimeOfDayEnumeration">
<xsd:annotation>
<xsd:documentation>Event marking start of timeband, e.,g , dusk +V1.2.2 dawn</xsd:documentation>
<xsd:documentation>Event marking start of timeband, e.g., dusk, dawn. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand All @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="EndEvent" type="TimeOfDayEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Event marking start of timeband, e.,g dawn, dusk. +V1.2.2 dawn</xsd:documentation>
<xsd:documentation>Event marking end of timeband, e.g., dusk, dawn. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand Down
84 changes: 70 additions & 14 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 @@ -395,7 +395,11 @@ Rail transport, Roads and Road transport
<xsd:restriction base="xsd:string">
<xsd:enumeration value="female"/>
<xsd:enumeration value="male"/>
<xsd:enumeration value="unspecified"/>
<xsd:enumeration value="unspecified">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="HireFacilityEnumeration">
Expand All @@ -404,15 +408,31 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="scooterHire"/>
<xsd:enumeration value="vehicleHire"/>
<xsd:enumeration value="scooterHire">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="vehicleHire">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="carHire"/>
<xsd:enumeration value="motorCycleHire"/>
<xsd:enumeration value="cycleHire"/>
<xsd:enumeration value="taxi"/>
<xsd:enumeration value="boatHire"/>
<xsd:enumeration value="boatHire">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="recreationDeviceHire"/>
<xsd:enumeration value="other"/>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="LightingControlFacilityEnumeration">
Expand Down Expand Up @@ -440,8 +460,16 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="noBaggageStorage"/>
<xsd:enumeration value="baggageStorage"/>
<xsd:enumeration value="luggageRacks"/>
<xsd:enumeration value="skiRacks"/>
<xsd:enumeration value="skiRacksOnRear"/>
<xsd:enumeration value="skiRacks">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="skiRacksOnRear">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="extraLargeLuggageRacks"/>
<xsd:enumeration value="baggageVan"/>
<xsd:enumeration value="noCycles"/>
Expand Down Expand Up @@ -530,7 +558,11 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="noSmoking"/>
<xsd:enumeration value="familyArea"/>
<xsd:enumeration value="childfreeArea"/>
<xsd:enumeration value="animalsAllowed"/>
<xsd:enumeration value="animalsAllowed">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="noAnimals"/>
<xsd:enumeration value="breastfeedingFriendly"/>
<xsd:enumeration value="mobilePhoneUseZone"/>
Expand All @@ -557,17 +589,41 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="valetParking"/>
<xsd:enumeration value="valetParking">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="carWash"/>
<xsd:enumeration value="valetCarWash"/>
<xsd:enumeration value="valetCarWash">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="carValetClean"/>
<xsd:enumeration value="oilChange"/>
<xsd:enumeration value="engineWarming"/>
<xsd:enumeration value="petrol"/>
<xsd:enumeration value="batteryCare"/>
<xsd:enumeration value="recharging"/>
<xsd:enumeration value="tyreCheck"/>
<xsd:enumeration value="other"/>
<xsd:enumeration value="batteryCare">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="recharging">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="tyreCheck">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="MedicalFacilityEnumeration">
Expand Down
22 changes: 17 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,16 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="other"/>
<xsd:enumeration value="phoneAtStop"/>
<xsd:enumeration value="text"/>
<xsd:enumeration value="mobileApp"/>
<xsd:enumeration value="atOffice"/>
<xsd:enumeration value="mobileApp">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="atOffice">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="none"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down Expand Up @@ -621,16 +629,20 @@ Rail transport, Roads and Road transport
<xsd:documentation>Purchase and payment.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="blockFullAmountOnCard"/>
<xsd:enumeration value="blockFullAmountOnCard">
<xsd:annotation>
<xsd:documentation>The full amount is blocked on card against customer’s credit limit but not charged.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="deposit">
<xsd:annotation>
<xsd:documentation>Purchase with deferred payment.</xsd:documentation>
<xsd:documentation>Purchase with deferred payment.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="none"/>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>Reervation but not necessarily payment</xsd:documentation>
<xsd:documentation>Reservation but not necessarily payment.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
Expand Down
72 changes: 52 additions & 20 deletions xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport
</xsd:group>
<xsd:element name="TransportSubmode" type="TransportSubmodeStructure">
<xsd:annotation>
<xsd:documentation>A submode of a Public Transport MODE. </xsd:documentation>
<xsd:documentation>A submode of a public or private TRANSPORT MODE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="TransportSubmodeStructure">
Expand Down Expand Up @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="WaterSubmode"/>
<xsd:element ref="SnowAndIceSubmode">
<xsd:annotation>
<xsd:documentation>Extra: Snow and Ice Submode. +v1.1s</xsd:documentation>
<xsd:documentation>Extra: Snow and Ice Submode. +v1.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand Down Expand Up @@ -472,18 +472,46 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="undefined"/>
<xsd:enumeration value="undefined">
<xsd:annotation>
<xsd:documentation>Undefined / other than any of the available types.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="communalTaxi"/>
<xsd:enumeration value="charterTaxi"/>
<xsd:enumeration value="charterTaxi">
<xsd:annotation>
<xsd:documentation>+v1.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="waterTaxi"/>
<xsd:enumeration value="railTaxi"/>
<xsd:enumeration value="bikeTaxi"/>
<xsd:enumeration value="bikeTaxi">
<xsd:annotation>
<xsd:documentation>Bike taxi (other than cycleRickshaw, +v1.2.2).</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="blackCab"/>
<xsd:enumeration value="miniCab"/>
<xsd:enumeration value="appTaxi"/>
<xsd:enumeration value="fiacre"/>
<xsd:enumeration value="rickshaw"/>
<xsd:enumeration value="cycleRickshaw"/>
<xsd:enumeration value="appTaxi">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="fiacre">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="rickshaw">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="cycleRickshaw">
<xsd:annotation>
<xsd:documentation>+v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="allTaxiServices"/>
</xsd:restriction>
</xsd:simpleType>
Expand All @@ -502,56 +530,60 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
<xsd:enumeration value="undefined"/>
<xsd:enumeration value="hireScooter">
<xsd:annotation>
<xsd:documentation> Rental scooter (Small wheeled low platform vehicles, - includes push scooters, electric scooters, skateboards, Sedgeways, etc). +v1.2.2</xsd:documentation>
<xsd:documentation>Rental scooter (small wheeled low platform vehicles - includes push scooters, electric scooters, skateboards, Segways, etc). +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="hireCycle">
<xsd:annotation>
<xsd:documentation>Rental cycle (Bicycle, tandem, tricycle, pedal or electric ; use SimpleVehicleType / VehicleCategory to specify exact model. Includes pedal cycles, electric bikes, hybrids, etc). +v1.2.2</xsd:documentation>
<xsd:documentation>Rental cycle (bicycle, tandem, tricycle, pedal or electric; use SimpleVehicleType / VehicleCategory to specify exact model. Includes pedal cycles, electric bikes, hybrids, etc). +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="hireMotorbike">
<xsd:annotation>
<xsd:documentation>Rental motorcycle (moped, velo, motorbike, quadbike, etc ; use SimpleVehicleType / VehicleCategory to specify exact model. </xsd:documentation>
<xsd:documentation>Rental motorcycle (moped, velo, motorbike, quadbike, etc ; use SimpleVehicleType / VehicleCategory to specify exact model. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="hireCar">
<xsd:annotation>
<xsd:documentation>Rental car - Includes all sizes (Small, mini, medium, large, etc)</xsd:documentation>
<xsd:documentation>Rental car - includes all sizes (small, mini, medium, large, etc.).</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="hireVan">
<xsd:annotation>
<xsd:documentation>Rental van - Includes all categories of small to large minivan, minibus and transporter.</xsd:documentation>
<xsd:documentation>Rental van - includes all categories of small to large minivan, minibus and transporter.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ownScooter">
<xsd:annotation>
<xsd:documentation>Own scooter (Small wheeled low platform vehicles, - includes push scooters, electric scooters, skateboards, Sedgeways, etc). +v1.2.2</xsd:documentation>
<xsd:documentation>Own scooter (small wheeled low platform vehicles - includes push scooters, electric scooters, skateboards, Segways, etc.). +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ownCycle">
<xsd:annotation>
<xsd:documentation>Own cycle (Bicycle, tandem, tricile, pedal or electric ; use SimpleVehicleType / VehicleCategory to specify exact model. Includes push scooters, electric scooters, skateboards, Sedgeways, etc). +v1.2.2</xsd:documentation>
<xsd:documentation>Own cycle (bicycle, tandem, tricile, pedal or electric; use SimpleVehicleType / VehicleCategory to specify exact model. Includes push scooters, electric scooters, skateboards, Segways, etc.). +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ownMotorbike">
<xsd:annotation>
<xsd:documentation>Own motorcycle (moped, velo, motorbike, quadbike, etc ; use SimpleVehicleType / VehicleCategory to specify exact model. +v1.2.2</xsd:documentation>
<xsd:documentation>Own motorcycle (moped, velo, motorbike, quadbike, etc.; use SimpleVehicleType / VehicleCategory to specify exact model. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ownCar">
<xsd:annotation>
<xsd:documentation>OWn car. Includes all sizes (Small, mini, medium, large, etc) +v1.2.2</xsd:documentation>
<xsd:documentation>Own car. Includes all sizes (small, mini, medium, large, etc.). +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ownVan">
<xsd:annotation>
<xsd:documentation>Own van - Includes all categories of small to large minivan, minibus and transporter.+v1.2.2</xsd:documentation>
<xsd:documentation>Own van - includes all categories of small to large minivan, minibus and transporter. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="allHireVehicles"/>
<xsd:enumeration value="allVehicles"/>
<xsd:enumeration value="allVehicles">
<xsd:annotation>
<xsd:documentation>Hire and own vehicles. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
Expand Down
Loading
Loading