Skip to content

Fix add missing day type to duty #418

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

Closed
nick-knowles wants to merge 7 commits into from
Closed

Fix add missing day type to duty #418

Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ A new Part5 is added for new modes, with examples
The new Part 5 CEN Specification document describes the additions and changes.




### 2023.02.15 Stretches: Add DUty and Stretch model elements and example
### 2023.02.015 Add DeckPlan, Seating Plan etc model and example

### 2021.09.01 NewModes: CommentAction Add __PoolOfVehicles__.
* Add __mustpickupanddropoffInSameZone_ value to __mobilityConstraintZone__ restiction values.
Expand Down
148 changes: 97 additions & 51 deletions NeTEx.spp
View file
Open in desktop

Large diffs are not rendered by default.

1,752 changes: 1,752 additions & 0 deletions examples/functions/deckPlans/DeckPlans-Example.xml
View file
Open in desktop

Large diffs are not rendered by default.

2,109 changes: 2,109 additions & 0 deletions examples/functions/vehicleSchedule/Netex_simpleDutyExample_01.xml
View file
Open in desktop

Large diffs are not rendered by default.

441 changes: 235 additions & 206 deletions examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/standards/norway/vehicles/submodel-VehicleType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<VehicleType xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd">
<Name>example</Name>
<Description>V</Description>
<EuroClass>Euro 6</EuroClass>
<SelfPropelled>true</SelfPropelled>
<TypeOfFuel>diesel</TypeOfFuel>
<EuroClass>Euro 6</EuroClass>
<capacities>
<PassengerCapacity>
<FareClass>firstClass</FareClass>
Expand Down
1,568 changes: 1,331 additions & 237 deletions xsd/NeTEx_publication.xsd
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6368,45 +6368,45 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====AccountableElementPart ============================== -->
<!-- =====AccountableElementPart unique========================== -->
<xsd:unique name="AccountableElementPart_UniqueBy_Id_Version">
<!-- =====TimeAccountableActivityPart ============================== -->
<!-- =====TimeAccountableActivityPart unique========================== -->
<xsd:unique name="TimeAccountableActivityPart_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccountableElementPart Id + Version] must be unique within document.</xsd:documentation>
<xsd:documentation>Every [TimeAccountableActivityPart Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccountableElementPart"/>
<xsd:selector xpath=".//netex:TimeAccountableActivityPart"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<!-- =====AccountableElementPart Key ========================== -->
<xsd:keyref name="AccountableElementPart_KeyRef" refer="netex:AccountableElementPart_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccountableElementPartRef"/>
<!-- =====TimeAccountableActivityPart Key ========================== -->
<xsd:keyref name="TimeAccountableActivityPart_KeyRef" refer="netex:TimeAccountableActivityPart_AnyVersionedKey">
<xsd:selector xpath=".//netex:TimeAccountableActivityPartRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="AccountableElementPart_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccountableElementPart"/>
<xsd:key name="TimeAccountableActivityPart_AnyVersionedKey">
<xsd:selector xpath=".//netex:TimeAccountableActivityPart"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====AccountableElement ============================== -->
<!-- =====AccountableElement unique========================== -->
<xsd:unique name="AccountableElement_UniqueBy_Id_Version">
<!-- =====TimeAccountableActivity ============================== -->
<!-- =====TimeAccountableActivity unique========================== -->
<xsd:unique name="TimeAccountableActivity_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccountableElement Id + Version] must be unique within document.</xsd:documentation>
<xsd:documentation>Every [TimeAccountableActivity Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccountableElement"/>
<xsd:selector xpath=".//netex:TimeAccountableActivity"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<!-- =====AccountableElement Key ========================== -->
<xsd:keyref name="AccountableElement_KeyRef" refer="netex:AccountableElement_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccountableElementRef"/>
<!-- =====TimeAccountableActivity Key ========================== -->
<xsd:keyref name="TimeAccountableActivity_KeyRef" refer="netex:TimeAccountableActivity_AnyVersionedKey">
<xsd:selector xpath=".//netex:TimeAccountableActivityRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="AccountableElement_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccountableElement"/>
<xsd:key name="TimeAccountableActivity_AnyVersionedKey">
<xsd:selector xpath=".//netex:TimeAccountableActivity"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
Expand Down
49 changes: 29 additions & 20 deletions xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,29 @@
<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:schemer@netex.org.uk</Creator>
<Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
<Date>
<Created>2010-09-04</Created>
</Date>
<Date>
<Modified>2011-02-05</Modified>
</Date>
<Date>
<Modified>2017-03-28</Modified>CR031 Add Zones to RESOURCE FRAME
</Date>
<Modified>2017-03-28</Modified>
CR031 Add Zones to RESOURCE FRAME
</Date>
<Date>
<Modified>2017-06-28</Modified>CR048 Add Security Lists to RESOURCE FRAME
</Date>
<Modified>2017-06-28</Modified>
CR048 Add Security Lists to RESOURCE FRAME
</Date>
<Date>
<Modified>2020-08-12</Modified>Issue 104 Add ResponsibilityRoles to RESOURCE FRAME
</Date>
<Modified>2020-08-12</Modified>
Issue 104 Add ResponsibilityRoles to RESOURCE FRAME
</Date>
<Date>
<Modified>2020-10-20</Modified>New Modes Add Facility sets to RESOURCE FRAME.
</Date>
<Modified>2020-10-20</Modified>
New Modes Add Facility sets to RESOURCE FRAME.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.</p>
</Description>
Expand All @@ -40,8 +44,9 @@
<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_version-1.0.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-2014</Copyright>
</Rights>
<Source>
<ul>
Expand All @@ -51,13 +56,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 - RESOURCE FRAME types.</Title>
Expand All @@ -69,7 +76,8 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:element name="ResourceFrame" substitutionGroup="CommonFrame">
<xsd:annotation>
<xsd:documentation>A coherent set of reference values for TYPE OF VALUEs , ORGANISATIONs, VEHICLE TYPEs etc that have a common validity, as specified by a set of frame VALIDITY CONDITIONs. Used to define common resources that will be referenced by other types of FRAME.</xsd:documentation>
<xsd:documentation>A coherent set of reference values for TYPE OF VALUEs , ORGANISATIONs, VEHICLE TYPEs etc that have a common validity, as specified by a set of frame VALIDITY CONDITIONs. Used
to define common resources that will be referenced by other types of FRAME.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand Down Expand Up @@ -117,6 +125,7 @@ Rail transport, Roads and Road transport
<xsd:group ref="EquipmentInFrameGroup"/>
<xsd:group ref="FacilitySetsInFrameGroup"/>
<xsd:group ref="VehicleInFrameGroup"/>
<xsd:group ref="DeckPlanInFrameGroup"/>
<xsd:group ref="SchematicMapInFrameGroup"/>
<xsd:group ref="GeneralElementstInFrameGroup"/>
<xsd:group ref="SecurityListsInFrameGroup"/>
Expand Down Expand Up @@ -146,7 +155,7 @@ Rail transport, Roads and Road transport
</xsd:group>
<xsd:group name="GeneralElementstInFrameGroup">
<xsd:annotation>
<xsd:documentation>General Elements of a RESOURCE FRAME.</xsd:documentation>
<xsd:documentation>General Elements of a RESOURCE FRAME.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="groupsOfEntities" type="groupOfEntitiesInFrame_RelStructure" minOccurs="0">
Expand Down
12 changes: 11 additions & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_all_objects_reusableComponents">
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_all_objects_reusableComponents">
<!-- ====== Topographic ==================================================== -->
<xsd:include schemaLocation="netex_address_support.xsd"/>
<xsd:include schemaLocation="netex_address_version.xsd"/>
Expand All @@ -21,6 +21,10 @@
<xsd:include schemaLocation="netex_equipment_version.xsd"/>
<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
<xsd:include schemaLocation="netex_spotEquipment_support.xsd"/>
<xsd:include schemaLocation="netex_spotEquipment_version.xsd"/>
<xsd:include schemaLocation="netex_sensorEquipment_support.xsd"/>
<xsd:include schemaLocation="netex_sensorEquipment_version.xsd"/>
<xsd:include schemaLocation="netex_nm_equipmentEnergy_support.xsd"/>
<xsd:include schemaLocation="netex_nm_equipmentEnergy_version.xsd"/>
<xsd:include schemaLocation="netex_nm_chargingEquipmentProfile_support.xsd"/>
Expand All @@ -41,6 +45,8 @@
<xsd:include schemaLocation="netex_transportOrganisation_version.xsd"/>
<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
<xsd:include schemaLocation="netex_otherOrganisation_version.xsd"/>
<xsd:include schemaLocation="netex_employee_support.xsd"/>
<xsd:include schemaLocation="netex_employee_version.xsd"/>
<!-- ======General====================================================== -->
<xsd:include schemaLocation="netex_linkByValue_support.xsd"/>
<xsd:include schemaLocation="netex_serviceRestrictions_support.xsd"/>
Expand All @@ -55,4 +61,8 @@
<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
<xsd:include schemaLocation="netex_trainElement_version.xsd"/>
<xsd:include schemaLocation="netex_seatingPlan_support.xsd"/>
<xsd:include schemaLocation="netex_seatingPlan_version.xsd"/>
<xsd:include schemaLocation="netex_deckPlan_support.xsd"/>
<xsd:include schemaLocation="netex_deckPlan_version.xsd"/>
</xsd:schema>
Loading