Skip to content
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

Fix add missing day type to duty #418

Closed
wants to merge 7 commits into from
+14,200 −1,060
Closed

Fix add missing day type to duty #418

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe2fc0b
DECK Plan CR- New SPOT EQUIPMENT elements for DECK Plan CR
nick-knowles Feb 14, 2023
d382a49
Enhancement- Sensor components for Deck plan
nick-knowles Feb 14, 2023
9b39880
Fix to Vehicle equipment profile member and Actual Vehicle Equipment
nick-knowles Feb 14, 2023
45cd167
Deck Plann and Seating plan enhancements, with Example
nick-knowles Feb 14, 2023
111be44
Update netex_duty_version.xsd
nick-knowles Feb 15, 2023
dc0afa5
Proposal to Add Stretches, and other driving schedule elements to NeTEx
nick-knowles Feb 22, 2023
528d23d
Update change log ofr changes
nick-knowles Feb 22, 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
Prev Previous commit
Next Next commit
Fix to Vehicle equipment profile member and Actual Vehicle Equipment 
Prereq for Deck plans
@nick-knowles
nick-knowles committed Feb 14, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 9b398806822d9f3a5a319fcc27d95a0251738b87
55 changes: 40 additions & 15 deletions xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<?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.0" id="netex_equipmentVehiclePassenger_support">
<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="2.0" id="netex_equipmentVehiclePassenger_support">
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
<Aggregation>main schema</Aggregation>
<Audience>e-service developers</Audience>
<Coverage>Europe</Coverage>
<Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:[email protected]</Creator>
<Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:[email protected]</Creator>
<Date>
<Created>2007-06-12</Created>
</Date>
<Date>
<Modified>2007-06-12</Modified>
</Date>
<Date>
<Modified>2023-02-12</Modified> Correct reference to WheelchairEquipmenRef to WheelchairVehicleEquipmentRef. Deprecate WheelchairEquipmenRef
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines VEHICLE EQUIPMENT types for Place access.</p>
<p>NeTEx - Network Exchange. This subschema defines VEHICLE EQUIPMENT types for Place access.</p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
@@ -25,8 +28,9 @@
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support.xsd</Identifier>
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
<Rights>
Unclassified
<Copyright>CEN, Crown Copyright 2009-2023</Copyright>
</Rights>
<Source>
<ul>
@@ -36,13 +40,15 @@
<Status>Version 1.0</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>
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 Network Exchange - VEHICLE EQUIPMENT identifier types.</Title>
@@ -113,10 +119,29 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:element name="WheelchairVehicleRef" type="WheelchairVehicleRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
<xsd:documentation>DEPRECATED</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="WheelchairVehicleRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>DEPRECATED</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="VehicleEquipmentRefStructure">
<xsd:attribute name="ref" type="WheelchairVehicleEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a POINT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:element name="WheelchairVehicleEquipmentRef" type="WheelchairVehicleRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="WheelchairVehicleEquipmentRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
@@ -133,7 +158,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:simpleType name="AssistedBoardingLocationEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for assisted boarding locations.</xsd:documentation>
<xsd:documentation>Allowed values for assisted boarding locations.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="boardAtAnyDoor"/>
@@ -143,7 +168,7 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:simpleType name="AssistanceNeededEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for assistance needed.</xsd:documentation>
<xsd:documentation>Allowed values for assistance needed.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="levelAccess"/>
65 changes: 45 additions & 20 deletions xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?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.1" id="netex_equipmentVehiclePassenger_version">
<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="2.0" id="netex_equipmentVehiclePassenger_version">
<xsd:annotation>
<xsd:appinfo>
<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
<Aggregation>main schema</Aggregation>
<Audience>e-service developers</Audience>
<Coverage>Europe</Coverage>
<Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:[email protected]</Creator>
<Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:[email protected]</Creator>
<Date>
<Created>2010-09-04</Created>
</Date>
@@ -17,23 +17,34 @@
<Modified>2011-12-16</Modified>
</Date>
<Date>
<Modified>2021-01-29</Modified>BUG Issue #143: Correct data type on GapToPlatform
<Modified>2021-01-29</Modified>
BUG Issue #143: Correct data type on GapToPlatform
</Date>
<Date>
<Modified>2023-02-07</Modified>
Add actual Vehicle Equipment list. Make Actual
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT </p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
<Syntax>http://www.w3.org/2 <Date>
<Modified>2019-03-25</Modified>Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList.
</Date>001/XMLSchema</Syntax>
<Syntax>
http://www.w3.org/2
<Date>
<Modified>2019-03-25</Modified>
Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList.
</Date>
001/XMLSchema
</Syntax>
<Description>XML schema, W3C Recommendation 2001</Description>
</Format>
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version.xsd</Identifier>
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
<Rights>
Unclassified
<Copyright>CEN, Crown Copyright 2009-2023</Copyright>
</Rights>
<Source>
<ul>
@@ -43,13 +54,15 @@
<Status>Version 1.0</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>
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 Network Exchange - TICKETING EQUIPMENT types.</Title>
@@ -87,12 +100,24 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
<!-- ====ACCESS=================================================================== -->
<xsd:element name="ActualVehicleEquipment" type="ActualVehicleEquipment_VersionStructure" abstract="true" substitutionGroup="PassengerEquipment">
<xsd:complexType name="actualVehicleEquipments_RelStructure">
<xsd:annotation>
<xsd:documentation>List of VACTUAL EHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="ActualVehicleEquipment" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="ActualVehicleEquipment" type="ActualVehicleEquipment_VersionStructure" abstract="false" substitutionGroup="PassengerEquipment">
<xsd:annotation>
<xsd:documentation>An item of EQUIPMENT of a particular type actually available in an individual VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="ActualVehicleEquipment_VersionStructure" abstract="true">
<xsd:complexType name="ActualVehicleEquipment_VersionStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Abstract Type for an ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
@@ -195,7 +220,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Hoist" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs.</xsd:documentation>
<xsd:documentation>VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HoistOperatingRadius" type="LengthType" minOccurs="0">
@@ -205,7 +230,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Ramp" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether a ramp may be used to access VEHICLE.</xsd:documentation>
<xsd:documentation>Whether a ramp may be used to access VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="RampBearingCapacity" type="WeightType" minOccurs="0">
@@ -269,7 +294,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="AssistedBoardingLocation" type="AssistedBoardingLocationEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether special position on platform is needed for boarding.</xsd:documentation>
<xsd:documentation>Whether special position on platform is needed for boarding.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="GuideDogsAllowed" type="xsd:boolean" default="true" minOccurs="0">
Loading