Skip to content

Commit

Permalink
Labelling v2.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
trurlurl committed Aug 4, 2024
1 parent e30f7a9 commit b527912
Show file tree
Hide file tree
Showing 39 changed files with 140 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
</Date>
<Date><Modified>2023-02-02</Modified>Add DECK PLAN CHANGES.
</Date>
<Date><Modified>2023-11-06</Modified>Add contracts to RESOURCE FRAME.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.</p>
</Description>
Expand Down Expand Up @@ -146,7 +148,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="contracts" type="contractsInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>CONTRACTs used in frame +v2.0</xsd:documentation>
<xsd:documentation>CONTRACTs used in frame. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
</Date>
<Date><Modified>2017-10-01</Modified>CR0006 Add infolinks to GroupOfEntities so can have links on timetable etc.
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines GROUPING types.</p>
</Description>
Expand Down Expand Up @@ -117,7 +119,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="infoLinks" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
<Modified>2020-11-06 New Modes (Norway): Add related organisations.
Add external Contact details</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 Organisation: add VATNumber.
</Date>
<Date><Modified>2024-06-26</Modified>CR0594 Deprecate ExternalOperatorRef.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines ORGANISATION types.</p>
</Description>
Expand Down Expand Up @@ -208,7 +214,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="CompanyNumber" type="xsd:normalizedString" minOccurs="0">
Expand All @@ -218,12 +224,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="VATNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Company registered tax number including Country prefix.</xsd:documentation>
<xsd:documentation>Company registered tax number including Country prefix. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalOperatorRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. DEPRECATED - use PrivateCode -v2.0</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -401,7 +407,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
<Modified>2011-02-05</Modified>
<!-- Name Space changes -->
</Date>
<Date><Modified>2017-12-05</Modified>cd Fix error in type for Place- should be Place_versionStructure

<Date><Modified>2017-12-05</Modified>cd Fix error in type for Place - should be Place_versionStructure.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 Transfer: add TransferMode.
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -161,7 +162,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="TransferMode" type="AccessModeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode.</xsd:documentation>
<xsd:documentation>If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
</Date>
<Date><Modified>2010-11-30</Modified> Add projections, revise for revised Section Mode
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines POINT AND LINK SEQUENCE types.</p>
</Description>
Expand Down Expand Up @@ -103,7 +105,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="projections" type="projections_RelStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<Date>
<Created>2010-09-04</Created>
</Date>
<Date><Modified>2023-11-06</Modified>CR0530 Add ContractTypeEnum, LegalStatusEnum.
</Date>
<Date><Modified>2024-03-01</Modified>Split off from responsibilyu_support, add CONTRACT
</Date>
<Description>
Expand Down Expand Up @@ -111,7 +113,7 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:simpleType name="ContractTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for TYPE OF CONTRACT.</xsd:documentation>
<xsd:documentation>Allowed values for TYPE OF CONTRACT. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="formal"/>
Expand All @@ -123,7 +125,7 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:simpleType name="LegalStatusEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Legal Status of a CONTRACT.</xsd:documentation>
<xsd:documentation>Allowed values for Legal Status of a CONTRACT. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="binding"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<Date>
<Modified>2020-08-12 Issue 104 Add ResponsibilityRoles to RESOURCE FRAME</Modified>
</Date>
<Date><Modified>2023-11-06</Modified>CR0530 Add Contract, AssociatedContract in ResponsibilityRoleAssignment.
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines data administration base types.</p>
</Description>
Expand Down Expand Up @@ -158,7 +162,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="roles" type="responsibilityRoleAssignments_RelStructure" minOccurs="0">
Expand Down Expand Up @@ -302,7 +306,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Administrative area to which this RESPONSIBILITY SET is assigned.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AssociatedContract" type="ContractRef_RelStructure" minOccurs="0"/>
<xsd:element name="AssociatedContract" type="ContractRef_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Associated CONTRACT. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="responsibilityRoleAssignments_RelStructure">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<Date>
<Modified>2017-11-11 Fix allow version of dereived view id</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Add privateCodes.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines RESPONSIBILITY types.</p>
</Description>
Expand Down Expand Up @@ -224,7 +226,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:element name="privateCodes" type="PrivateCodesStructure">
<xsd:annotation>
<xsd:documentation>A list of private codes that uniquely identifiy the element. May be used for inter-operating with other (legacy) systems.</xsd:documentation>
<xsd:documentation>A list of private codes that uniquely identifiy the element. May be used for inter-operating with other (legacy) systems. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:unique name="PrivateCodeType">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<Date>
<Modified>217-03-27 Change to use responsibility 1.1 with AlternativeText</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines TYPE OF VALUE types.</p>
</Description>
Expand Down Expand Up @@ -145,7 +147,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<Date>
<Modified>217-03-27 Change to use responsibility 1.1 with AlternativeText</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines Time base types.</p>
</Description>
Expand Down Expand Up @@ -237,7 +239,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
</Date>
<Date><Modified>2021-07-07</Modified>NewModesAdd TimeOfDayEnumeration with dawn, dusk
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines DAY TYPE types </p>
</Description>
Expand Down Expand Up @@ -176,7 +178,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="DaySpanGroup">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
</Date>
<Date><Modified>2019-04-05</Modified>Add back missing infolinks
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines EQUIPMENT base types.</p>
</Description>
Expand Down Expand Up @@ -127,7 +129,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
</Date>
<Date><Modified>2021-09-02</Modified>New Modes: Add Battery and TypeOfBatteryChemistry, PlugType, etc.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 CouplingTypeEnumeration: deprecated pantographAbove.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines ENERGY EQUIPMENT types for Place access.</p>
</Description>
Expand Down Expand Up @@ -216,7 +218,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="plug"/>
<xsd:enumeration value="pantographAbove">
<xsd:annotation>
<xsd:documentation>DEPRECATED. Will be panthograph.</xsd:documentation>
<xsd:documentation>DEPRECATED. Will be panthograph. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="pantograph"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<Date>
<Modified>2017-03-24 CR004 Add Short name</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines common NOTICE identifier types.</p>
</Description>
Expand Down Expand Up @@ -168,7 +170,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfNoticeRef" minOccurs="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
</Date>
<Date><Modified>2020-08-09</Modified>Issues #107 Fix UIcOperatingPeriod
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines SERVICE CALENDAR types.</p>
</Description>
Expand Down Expand Up @@ -335,7 +337,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="DaySpanGroup"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<Date><Modified>2020-11-27</Modified>NewModes: Drop PublicTransportOperator, alternativeTransportOperator.
Revis TransportAdministrativeZone to apply to list of all mdo0es rather than just vehicle modes.
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines NetEX:TRANSPORT ORGANISATION types.</p>
</Description>
Expand Down Expand Up @@ -504,7 +506,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationPartRef" minOccurs="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
</Date>
<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 Add AcceptedDriverPermit.
</Date>
<Date><Modified>2024-02-07</Modified>Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her
</Date>
<Description>
Expand Down Expand Up @@ -482,7 +486,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="acceptedDriverPermits" type="acceptedDriverPermits_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Required permit to operate the vehicle.</xsd:documentation>
<xsd:documentation>Required permit to operate the vehicle. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand All @@ -502,7 +506,7 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:element name="AcceptedDriverPermit" substitutionGroup="DataManagedObject">
<xsd:annotation>
<xsd:documentation>Accepted TYPE OF DRIVER PERMIT for a given SIMPLE VEHICLE TYPE. +V2.0</xsd:documentation>
<xsd:documentation>Accepted TYPE OF DRIVER PERMIT for a given SIMPLE VEHICLE TYPE. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand Down Expand Up @@ -1144,7 +1148,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Private code of the vehicle.</xsd:documentation>
<xsd:documentation>Private code of the vehicle. DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
</Date>
<Date><Modified>2017-06-13</Modified>Issue #125 Add Multimodal to QuayType enums
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines STOP PLACE base types.</p>
</Description>
Expand Down Expand Up @@ -326,7 +328,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element ref="PrivateCode">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
<xsd:documentation>DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IdentifierType" type="xsd:normalizedString" minOccurs="0">
Expand Down
Loading

0 comments on commit b527912

Please sign in to comment.