Skip to content

Commit

Permalink
Implement privateCodes, deprecate PrivateCode, replace #403
Browse files Browse the repository at this point in the history
  • Loading branch information
skinkie committed Nov 3, 2023
1 parent 076f847 commit f73092e
Show file tree
Hide file tree
Showing 33 changed files with 221 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a PURPOSE OF GROUPING.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="infoLinks" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Hyperlinks associated with GROUP OF ENTITIES.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Public code to use for ORGANISATION.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="CompanyNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Company registration number including Country prefix.</xsd:documentation>
Expand Down Expand Up @@ -390,7 +394,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Additional public code used for department.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Contact details for ORGANISATION PART for Public use.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Overall distance of LINK SEQUENCE. Can be derived from component LINKs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="projections" type="projections_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>PROJECTIONs of LINK SEQUENCE onto another ENTITY or layer.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Explanation of RESPONSIBILITY SET.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="roles" type="responsibilityRoleAssignments_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Roles defined by this RESPONSIBILITY SET.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>A list of alternative Key values for an element.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="privateCodes" minOccurs="0">
<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:annotation>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
<xsd:element ref="BrandingRef" minOccurs="0"/>
</xsd:sequence>
Expand Down Expand Up @@ -217,6 +222,27 @@ Rail transport, Roads and Road transport
</xsd:attribute>
</xsd:complexType>
<!-- ======================================================================= -->
<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:annotation>
<xsd:unique name="PrivateCodeType">
<xsd:annotation>
<xsd:documentation>Every PrivateCode type must be unique.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:PrivateCode"/>
<xsd:field xpath="@type"/>
</xsd:unique>
</xsd:element>
<xsd:complexType name="PrivateCodesStructure">
<xsd:annotation>
<xsd:documentation>Type for Private Codes.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="PrivateCode" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:attribute name="id" type="ObjectIdType">
<xsd:annotation>
<xsd:documentation>Identifier of Object of which this is a view.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Default URL for TYPE OF VALUE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Entity on which Trigger is based - Trigger value is taken from it.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of DAY TYPE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="DaySpanGroup">
<xsd:annotation>
<xsd:documentation>DAY TYPE length.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Name of EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="PrivateCode" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>A Public code which may be displayed on equipment to identify it.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Alternative short code associated with Notice.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfNoticeRef" minOccurs="0"/>
<xsd:element name="CanBeAdvertised" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Day Number if different from Id.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="DaySpanGroup"/>
</xsd:sequence>
</xsd:group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>A short name of the OPERATIONAL CONTEXT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationPartRef" minOccurs="0"/>
<xsd:element name="VehicleMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of TRANSPORT TYPE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="TransportTypePropertiesGroup"/>
<xsd:element name="TransportMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
<xsd:annotation>
Expand Down Expand Up @@ -999,7 +1003,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Operational Number of VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ====== VEHICLE MODEL ====================================================== -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Alternative Private Code for a STOP PLACE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="PrivateCode"/>
<xsd:element ref="PrivateCode">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IdentifierType" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of identifier.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Short Name of ACTIVATION POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfActivationRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
Expand Down
12 changes: 10 additions & 2 deletions xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Public identifier of a LINe.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalLineRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the LINE specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
Expand Down Expand Up @@ -721,7 +725,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Public code to show for Destination.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>A PUBLIC code that uniquely identifies the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalStopPointRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the STOP POINT. pecifically for use in AVMS systems that require an alias, if. For VDV compatibility.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether alignment is for alighting use. Default is 'true'.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reference or inline declaration of SCHEDULED STOP POINT which is being assigned </xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of TIME DEMAND TYPE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfTimeDemandTypeRef" minOccurs="0"/>
<xsd:element name="Presentation" type="PresentationStructure" minOccurs="0">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of SCHEDULED STOP POINT feeding INTERCHANGE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalInterchangeRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the INTERCHANGE. Specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of BLOCK.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="BlockTimingGroup">
Expand Down Expand Up @@ -773,7 +777,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Numeric identifier of COURSE of JOURNEYS.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PreparationDuration" type="xsd:duration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>How long the run takes to prepare.</xsd:documentation>
Expand Down
6 changes: 5 additions & 1 deletion xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of FARE PRICE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="StartDate" type="xsd:date" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Start date for selling product or service at the PRICE.</xsd:documentation>
Expand Down
6 changes: 5 additions & 1 deletion xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>DescriptionElements for a PRODUCT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="InfoUrl" type="xsd:anyURI" minOccurs="0">
<xsd:annotation>
<xsd:documentation>URL for further information.</xsd:documentation>
Expand Down
6 changes: 5 additions & 1 deletion xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description Elements for a SERIES CONSTRAINT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="PrivateCode" minOccurs="0"/>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Itinerary" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>String to use to represent Itinerary.</xsd:documentation>
Expand Down
Loading

0 comments on commit f73092e

Please sign in to comment.