Skip to content

Commit

Permalink
PublicCode settled
Browse files Browse the repository at this point in the history
  • Loading branch information
@ue71603
ue71603 committed Dec 16, 2023
1 parent 18b48c6 commit f53c3a0
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 29 deletions.
6 changes: 3 additions & 3 deletions xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Code details for an ORGANISATION.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public code to use for ORGANISATION.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -394,7 +394,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of ORGANISATIONAL UNIT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Additional public code used for department.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -689,7 +689,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for an ADMINISTRATIVE ZONE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public Code assosociated with Zone</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Presentation values to use in printed material for ZONE such as a colour. +v1.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public identifier code of TARIFF ZONE.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>A Public code which may be displayed on equipment to identify it.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Text content of NOTICe.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Alternative code associated with Notice.</xsd:documentation>
</xsd:annotation>
Expand Down
15 changes: 15 additions & 0 deletions xsd/netex_framework/netex_utility/netex_utility_types.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,21 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<!-- ======================================================================= -->
<xsd:complexType name="PublicCodeType">
<xsd:annotation>
<xsd:documentation>Unique identifier of a stop for SMS and other customer facing delivery channels</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="xsd:normalizedString">
<xsd:attribute name="type" type="xsd:normalizedString">
<xsd:annotation>
<xsd:documentation>Nature of code.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="TimeZoneOffsetType">
<xsd:annotation>
<xsd:documentation>Offset from Greenwich in hours. e.g. +5 ,- 2</xsd:documentation>
Expand Down
10 changes: 7 additions & 3 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_ifopt_equipmentAccess_support">
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd" />

<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand All @@ -15,7 +17,8 @@
<Date>
<Modified>2007-06-12</Modified>
</Date>
<Date><Modified>2019-03-25</Modified>FR49 CD #65 Accessibility changes
<Date>
<Modified>2019-03-25</Modified>FR49 CD #65 Accessibility changes
CD add NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown
CD add LightingMethodEnumeration with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other
NJSK Review: correct typo on stepDetector Add value_alwaysOn_ to LightingMethodEnumeration. Rename to LightinOnMethod.
Expand All @@ -24,7 +27,8 @@
CD add BorderTypeEnumeration with values _wall, grass, dirt, barrier, road, cyclingLane, step, rail, plants, trees, mud, solidEdge, water, gravel, noPhysicalBorder, otherPhysicalBorder, unknown, other,_
NJSK Review: Move TactileWarningStripEnumeration, here from netex_path_support , use lower camel case for values.
</Date>
<Date><Modified>2021-07-14</Modified>Fix catch up - Make Access Equipment Abstarct
<Date>
<Modified>2021-07-14</Modified>Fix catch up - Make Access Equipment Abstarct
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines ACCESS EQUIPMENT types for Place access.</p>
Expand Down
9 changes: 2 additions & 7 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_ifopt_parking_support">
<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd" />
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
Expand Down Expand Up @@ -348,18 +349,12 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="ParkingPublicCodeType">
<xsd:annotation>
<xsd:documentation>Unique identifier of a parking for SMS and other customer facing delivery channels.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString"/>
</xsd:simpleType>
<xsd:group name="ParkingIdentifierGroup">
<xsd:annotation>
<xsd:documentation>Alternative identifiers of a PARKING.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="ParkingPublicCodeType" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Short public code for passengers to use when uniquely identifying the stop by SMS and other self-service channels.</xsd:documentation>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements of a SITE ENTRANCE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Alternative identifier of ENTRANCE shown to Public.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -590,7 +590,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of LEVEL.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public code for LEVEL.</xsd:documentation>
</xsd:annotation>
Expand Down
6 changes: 0 additions & 6 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,6 @@ Rail transport, Roads and Road transport
</xsd:simpleContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="PublicCodeType">
<xsd:annotation>
<xsd:documentation>Unique identifier of a stop for SMS and other customer facing delivery channels.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString"/>
</xsd:simpleType>
<xsd:simpleType name="PlateCodeType">
<xsd:annotation>
<xsd:documentation>The plate identifier placed on the stop.</xsd:documentation>
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Alternative Code Elements of a LINE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public identifier of a LINe.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -720,7 +720,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Short code associated with Destination display used vehicle display controller which describes the format of the destination text in the front and side display in the vehicle. (VDV).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public code to show for Destination.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -1038,7 +1038,7 @@ Rail transport, Roads and Road transport
<xsd:extension base="DerivedViewStructure">
<xsd:sequence>
<xsd:element ref="LineRef" minOccurs="0"/>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Identifier of LINE.</xsd:documentation>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>An alternative short code that t identifies the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PrivateCodeStructure" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>A PUBLIC code that uniquely identifies the STOP POINT.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -491,7 +491,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for a STOP AREA.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
<xsd:element name="PublicCode" type="PublicCodeType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Alternative public facing Code that uniquely identifies the STOP AREA.</xsd:documentation>
</xsd:annotation>
Expand Down

0 comments on commit f53c3a0

Please sign in to comment.