Skip to content

Commit

Permalink
Bug_fix_01 (NeTEx-CEN#306)
Browse files Browse the repository at this point in the history 
* Bug_fix_01

First part of bugs / typos found during reading for acceptance.

* Update netex_units.xsd

corrected a copy&paste mistake
  • Loading branch information
@ue71603 @erlendnils1
ue71603 authored and erlendnils1 committed Oct 31, 2023
1 parent db665f6 commit 91967ce
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 9,842 deletions.
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_genericFramework/netex_contact_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ Rail transport, Roads and Road transport
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="any"/>
<xsd:enumeration value="information"/>
<xsd:enumeration value="reservations"/>
<xsd:enumeration value="reservation"/>
<xsd:enumeration value="lostProperty"/>
<xsd:enumeration value="complaints"/>
<xsd:enumeration value="complaint"/>
<xsd:enumeration value="emergency"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
Expand Down
2 changes: 2 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ Rail transport, Roads and Road transport
<xsd:restriction base="xsd:string">
<xsd:enumeration value="dawn"/>
<xsd:enumeration value="dusk"/>
<xsd:enumeration value="noon"/>
<xsd:enumeration value="midnight"/>
<xsd:enumeration value="curfewStart"/>
<xsd:enumeration value="curfewEnd"/>
</xsd:restriction>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element ref="ChargingEquipmentProfile" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Chargingequipment profile for VEHICLE.</xsd:documentation>
<xsd:documentation>Charging equipment profile for VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Rail transport, Roads and Road transport
</xsd:group>
<xsd:complexType name="ServiceBookingArrangementsStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for SERVICE OOKING ARRANGEMENTs.</xsd:documentation>
<xsd:documentation>Type for SERVICE BOOKING ARRANGEMENTs.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="BookingArrangementsStructure">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ Rail transport, Roads and Road transport
<!-- ==GROUP OF OPERATORss============================================================ -->
<xsd:complexType name="groupsOfOperatorsRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of references to list of GROUPs OFOPERATORS.</xsd:documentation>
<xsd:documentation>Type for a list of references to list of GROUPs OF OPERATORS.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="oneToManyRelationshipStructure">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_utility/netex_units.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Speed = Metres per second.</xsd:documentation>
</xsd:simpleType>
<xsd:simpleType name="VoltageType">
<xsd:annotation>
<xsd:documentation>Voltage time in SI Volts.ed by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres.</xsd:documentation>
<xsd:documentation>Voltage type in SI Volts</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:decimal"/>
</xsd:simpleType>
Expand Down
171 changes: 3 additions & 168 deletions xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,62 +68,7 @@ Rail transport, Roads and Road transport
</xsd:appinfo>
<xsd:documentation>NeTEx MOBILITY SERVICE CONSTRAINT ZONE Types</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
<Aggregation>main schema</Aggregation>
<Audience>e-service developers</Audience>
<Contributor>Nicholas Knowles</Contributor>
<Contributor>Christophe Duquesne</Contributor>
<Coverage>Europe</Coverage>
<Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
<Date>
<Created>2020-10-26</Created>Add for New Modes
</Date>
<Date>
<Modified>2020-10-26</Modified>Revise
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the MEETING POINT identifier Types.</p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
<Description>XML schema, W3C Recommendation 2001</Description>
</Format>
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_5/netex_newModes}netex_nm_mobilityServiceConstraintZone_support.xsd</Identifier>
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>CEN TC278 WG3 SG9</Publisher>
<Relation>
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2019-2020</Copyright>
</Rights>
<Source>
<ul>
<li>Derived from the Transmodel standard.</li>
</ul>
</Source>
<Status>Version 1.0 Draft for approval</Status>
<Subject>
<Category>Arts, recreation and travel, Tourism, Travel (tourism), Transport,
Air transport, Airports,
Ports and maritime transport, Ferries (marine),
Public transport, Bus services, Coach services, Bus stops and stations,
Rail transport, Railway stations and track, Train services, Underground trains,
Business and industry, Transport, Air transport , Ports and maritime transport, Public transport,
Rail transport, Roads and Road transport
</Category>
<Project>CEN TC278 WG3 SG9.</Project>
</Subject>
<Title>NeTEx MOBILITY SERVICE CONSTRAINT ZONE types.</Title>
<Type>Standard</Type>
</Metadata>
</xsd:appinfo>
<xsd:documentation>MOBILITY SERVICE CONSTRAINT Types</xsd:documentation>
</xsd:annotation>

<xsd:complexType name="mobilityServiceConstraintZoneRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of MOBILITY SERVICE CONSTRAINT ZONEs.</xsd:documentation>
Expand Down Expand Up @@ -160,62 +105,7 @@ Rail transport, Roads and Road transport
<xsd:extension base="ZoneRefStructure"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
<Aggregation>main schema</Aggregation>
<Audience>e-service developers</Audience>
<Contributor>Nicholas Knowles</Contributor>
<Contributor>Christophe Duquesne</Contributor>
<Coverage>Europe</Coverage>
<Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
<Date>
<Created>2020-10-26</Created>Add for New Modes
</Date>
<Date>
<Modified>2020-10-26</Modified>Revise
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the MEETING POINT identifier Types.</p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
<Description>XML schema, W3C Recommendation 2001</Description>
</Format>
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_5/netex_newModes}netex_nm_mobilityServiceConstraintZone_support.xsd</Identifier>
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>CEN TC278 WG3 SG9</Publisher>
<Relation>
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2019-2020</Copyright>
</Rights>
<Source>
<ul>
<li>Derived from the Transmodel standard.</li>
</ul>
</Source>
<Status>Version 1.0 Draft for approval</Status>
<Subject>
<Category>Arts, recreation and travel, Tourism, Travel (tourism), Transport,
Air transport, Airports,
Ports and maritime transport, Ferries (marine),
Public transport, Bus services, Coach services, Bus stops and stations,
Rail transport, Railway stations and track, Train services, Underground trains,
Business and industry, Transport, Air transport , Ports and maritime transport, Public transport,
Rail transport, Roads and Road transport
</Category>
<Project>CEN TC278 WG3 SG9.</Project>
</Subject>
<Title>NeTEx MOBILITY SERVICE CONSTRAINT ZONE types.</Title>
<Type>Standard</Type>
</Metadata>
</xsd:appinfo>
<xsd:documentation>VEHICLE TYPE ZONE RESTRICTION Types</xsd:documentation>
</xsd:annotation>

<xsd:complexType name="vehicleTypeZoneRestrictionRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of VEHICLE TYPE ZONE RESTRICTIONs.</xsd:documentation>
Expand Down Expand Up @@ -279,62 +169,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="outside"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
<Aggregation>main schema</Aggregation>
<Audience>e-service developers</Audience>
<Contributor>Nicholas Knowles</Contributor>
<Contributor>Christophe Duquesne</Contributor>
<Coverage>Europe</Coverage>
<Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
<Date>
<Created>2020-10-26</Created>Add for New Modes
</Date>
<Date>
<Modified>2020-10-26</Modified>Revise
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the MEETING POINT identifier Types.</p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
<Description>XML schema, W3C Recommendation 2001</Description>
</Format>
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_5/netex_newModes}netex_nm_mobilityServiceConstraintZone_support.xsd</Identifier>
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>CEN TC278 WG3 SG9</Publisher>
<Relation>
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2019-2020</Copyright>
</Rights>
<Source>
<ul>
<li>Derived from the Transmodel standard.</li>
</ul>
</Source>
<Status>Version 1.0 Draft for approval</Status>
<Subject>
<Category>Arts, recreation and travel, Tourism, Travel (tourism), Transport,
Air transport, Airports,
Ports and maritime transport, Ferries (marine),
Public transport, Bus services, Coach services, Bus stops and stations,
Rail transport, Railway stations and track, Train services, Underground trains,
Business and industry, Transport, Air transport , Ports and maritime transport, Public transport,
Rail transport, Roads and Road transport
</Category>
<Project>CEN TC278 WG3 SG9.</Project>
</Subject>
<Title>NeTEx MOBILITY SERVICE CONSTRAINT ZONE types.</Title>
<Type>Standard</Type>
</Metadata>
</xsd:appinfo>
<xsd:documentation>POOL OF VEHICLE Types</xsd:documentation>
</xsd:annotation>

<xsd:complexType name="PoolOfVehiclesRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of POOL OF VEHICLEs.</xsd:documentation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ Rail transport, Roads and Road transport
<xsd:element ref="OperatingDayRef" minOccurs="0"/>
<xsd:element name="datedPassingTimes" type="targetPassingTimes_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DATED PASSING TIMEsfor SINGLE JORUNEY</xsd:documentation>
<xsd:documentation>DATED PASSING TIMEsfor SINGLE JOURNEY</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="meetingPointAssignments" type="vehicleMeetingPointAssignments_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>MEETING POINT ASSIGNMENTS for SINGLE JORUNEY</xsd:documentation>
<xsd:documentation>MEETING POINT ASSIGNMENTS for SINGLE JOURNEY</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Loading

0 comments on commit 91967ce

Please sign in to comment.