Skip to content

Propagate fixes #502

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

Merged
skinkie merged 6 commits into from
Sep 27, 2023
Merged

Propagate fixes #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b43b406
Remove unused xsd files. (#498)
skinkie Sep 24, 2023
a139d7e
Fix issue #469 (#483)
skinkie Sep 26, 2023
1934771
Update netex_routeInstruction_version.xsd (#468)
ue71603 Sep 26, 2023
c68eaef
Fix typo (#499)
skinkie Sep 27, 2023
c2749fe
Fixing enum problems (#500)
skinkie Sep 27, 2023
1f98fd4
Doc version status enumeration (#501)
skinkie Sep 27, 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
6 changes: 3 additions & 3 deletions xsd/NX.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="fareStructureFactor" minOccurs="0">
<xsd:element name="fareStructureFactors" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="FareStructureFactor"/>
Expand Down Expand Up @@ -251,7 +251,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="fareStructure" minOccurs="0">
<xsd:element name="fareStructures" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="fareStructureFactors" minOccurs="0">
Expand Down Expand Up @@ -406,7 +406,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="parkingTariff" minOccurs="0">
<xsd:element name="parkingTariffs" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="ParkingTariff" minOccurs="0" maxOccurs="unbounded"/>
Expand Down
119 changes: 0 additions & 119 deletions xsd/netex_framework/netex_genericFramework/netex_contact_support.xsd
View file
Open in desktop

This file was deleted.

135 changes: 0 additions & 135 deletions xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd
View file
Open in desktop

This file was deleted.

30 changes: 25 additions & 5 deletions xsd/netex_framework/netex_responsibility/netex_version_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,31 @@ Rail transport, Roads and Road transport
<xsd:documentation>Allowed values for Statuses of VERSION.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="draft"/>
<xsd:enumeration value="proposed"/>
<xsd:enumeration value="versioned"/>
<xsd:enumeration value="deprecated"/>
<xsd:enumeration value="other"/>
<xsd:enumeration value="draft">
<xsd:annotation>
<xsd:documentation>This version is a draft: it is currently under construction and should not be used for operational purposes.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="proposed">
<xsd:annotation>
<xsd:documentation>This version is comprehensive but not yet validated.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="versioned">
<xsd:annotation>
<xsd:documentation>This is a finalised version frozen from further modifications.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="deprecated">
<xsd:annotation>
<xsd:documentation>This is an old version: it should not be used for operational purposes any more.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>Like draft, proposed, and deprecated, this version should not be used for operational purposes (for other reasons, however). </xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="VersionTypeEnumeration">
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:simpleType name="TrainElementTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for TYPE OF TRAIIN ELEMENT.</xsd:documentation>
<xsd:documentation>Allowed values for TYPE OF TRAIN ELEMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="buffetCar"/>
Expand Down Expand Up @@ -211,7 +211,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:simpleType name="TrainSizeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for TYPE OF TRAIIN ELEMENT.</xsd:documentation>
<xsd:documentation>The size of a train in relative terms.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="normal"/>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_vehicleSeating_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:simpleType name="SeatAllocationMethodEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Seat Alllocation Method.</xsd:documentation>
<xsd:documentation>Allowed values for Seat Allocation Method.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="autoAssigned">
Expand Down
22 changes: 2 additions & 20 deletions xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,10 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="strictContainmentAggregationStructure">
<xsd:sequence>
<xsd:element name="RouteInstruction" maxOccurs="unbounded">
<xsd:element ref="RouteInstruction" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A POINT used to define the shape of a ROUTE through the network.</xsd:documentation>
<xsd:documentation>An Instruction on how to follow a ROUTE through the network.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="RouteInstruction_VersionStructure">
<xsd:sequence>
<xsd:sequence>
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="DataManagedObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="RouteInstructionGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="RouteInstructionIdType"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
</xsd:extension>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="excludedJourneyPatternRefs" type="journeyPatternRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Excluded other JOIURNEY PATTERNs.</xsd:documentation>
<xsd:documentation>Excluded other JOURNEY PATTERNs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down