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

Jump to bottom

Feature duty daytype #684

Draft
wants to merge 29 commits into
base: next
Choose a base branch
from
Draft

Feature duty daytype #684

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f051656
Update netex_duty_version.xsd
nick-knowles Feb 15, 2023
e783e82
Proposal to Add Stretches, and other driving schedule elements to NeTEx
nick-knowles Feb 22, 2023
5d810af
Unrelated to this pull request
skinkie Mar 18, 2024
736655d
Update change log ofr changes
nick-knowles Feb 22, 2023
618bd5c
update
skinkie Mar 18, 2024
5646ba9
fixing validation
ue71603 Mar 19, 2024
76e65f7
Lint and update documentation tables
github-actions[bot] Mar 19, 2024
17f032d
Update xsd/netex_framework/netex_reusableComponents/netex_employee_ve…
ue71603 Mar 26, 2024
d45485c
Update xsd/netex_framework/netex_reusableComponents/netex_employee_ve…
ue71603 Mar 26, 2024
051b509
Update xsd/netex_framework/netex_reusableComponents/netex_employee_ve…
ue71603 Mar 26, 2024
b05f1b8
Update xsd/netex_framework/netex_reusableComponents/netex_employee_ve…
ue71603 Mar 26, 2024
3f704ef
Update xsd/netex_part_2/part2_driverManagement/netex_driver_version.xsd
ue71603 Mar 26, 2024
57a6e0e
Update xsd/netex_part_2/part2_driverManagement/netex_driver_version.xsd
ue71603 Mar 26, 2024
08d1891
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_vers…
ue71603 Mar 26, 2024
6286b63
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_vers…
ue71603 Mar 26, 2024
808d34f
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_vers…
ue71603 Mar 26, 2024
2631c02
Update xsd/netex_framework/netex_reusableComponents/netex_employee_ve…
ue71603 Mar 26, 2024
c7339dc
Update xsd/netex_part_2/part2_driverManagement/netex_accountableEleme…
ue71603 Mar 26, 2024
65c6c23
Update xsd/netex_part_2/part2_driverManagement/netex_accountableEleme…
ue71603 Mar 26, 2024
7b3c035
Update xsd/netex_part_2/part2_driverManagement/netex_accountableEleme…
ue71603 Mar 26, 2024
a5cd1b7
Update xsd/netex_part_2/part2_driverManagement/netex_dutyType_version…
ue71603 Mar 26, 2024
ed09a63
Update xsd/netex_part_2/part2_driverManagement/netex_accountableEleme…
ue71603 Mar 26, 2024
a3d2f3f
Update xsd/netex_part_2/part2_driverManagement/netex_accountableEleme…
ue71603 Mar 26, 2024
58c507d
Update xsd/netex_part_2/part2_driverManagement/netex_driverTrip_versi…
ue71603 Mar 26, 2024
adba36f
Update xsd/netex_part_2/part2_driverManagement/netex_driver_version.xsd
ue71603 Mar 26, 2024
a53ad7b
Update xsd/netex_part_2/part2_driverManagement/netex_driver_version.xsd
ue71603 Mar 26, 2024
9a2f8bf
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_supp…
ue71603 Mar 26, 2024
37d0cc0
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_vers…
ue71603 Mar 26, 2024
d611bc9
Update xsd/netex_part_2/part2_driverManagement/netex_dutyStretch_vers…
ue71603 Mar 26, 2024
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
20 changes: 17 additions & 3 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,19 @@
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_vehicleService_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_part_2_DM_RO">
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_accountableElement_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_accountableElement_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_all_objects_part2_driverManagement.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_driver_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_driver_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_driverTrip_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_driverTrip_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_duty_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_duty_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_dutyStretch_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_dutyStretch_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_dutyType_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_driverManagement\netex_dutyType_version.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
<Folder FolderName="netex_part_3 Fares">
Expand Down Expand Up @@ -676,7 +687,10 @@
<Folder FolderName="pointOfInterest">
<File FilePath="examples\functions\pointOfInterest\Netex_Sites_PoiClassification_1.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="vehicleSchedule"/>
<Folder FolderName="vehicleSchedule">
<File FilePath="examples\functions\vehicleSchedule\Netex_simpleDutyExample_01.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\vehicleSchedule\Netex_simpleVehicleSchedule_01.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="grouping">
<File FilePath="examples\functions\grouping\Netex_GroupingExample_General_01.xml" HomeFolder="Yes"/>
</Folder>
Expand Down
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.

418 changes: 223 additions & 195 deletions examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions 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,10 +2,11 @@
<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>
<capacities>
<PassengerCapacity>
<PassengerCapacity id="PC:1" version="any">
<FareClass>firstClass</FareClass>
<TotalCapacity>100</TotalCapacity>
<SeatingCapacity>80</SeatingCapacity>
Expand All @@ -14,7 +15,7 @@
<PushchairCapacity>2</PushchairCapacity>
<WheelchairPlaceCapacity>2</WheelchairPlaceCapacity>
</PassengerCapacity>
<PassengerCapacity>
<PassengerCapacity id="PC:2" version="any">
<FareClass>standardClass</FareClass>
<TotalCapacity>300</TotalCapacity>
<SeatingCapacity>250</SeatingCapacity>
Expand Down
14 changes: 14 additions & 0 deletions examples/standards/vdv452/timetable/NeTEx VDV Example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4029,6 +4029,20 @@
</DestinationDisplay>
</destinationDisplays>
<scheduledStopPoints>
<ScheduledStopPoint id="SSP_4607" version="1"/>
<ScheduledStopPoint id="SSP_2497" version="1"/>
<ScheduledStopPoint id="SSP_270" version="1"/>
<ScheduledStopPoint id="SSP_274" version="1"/>
<ScheduledStopPoint id="SSP_2445" version="1"/>
<ScheduledStopPoint id="SSP_2698" version="1"/>
<ScheduledStopPoint id="SSP_292" version="1"/>
<ScheduledStopPoint id="SSP_2993" version="1"/>
<ScheduledStopPoint id="SSP_2682" version="1"/>
<ScheduledStopPoint id="SSP_419" version="1"/>
<ScheduledStopPoint id="SSP_198" version="1"/>
<ScheduledStopPoint id="SSP_257" version="1"/>
<ScheduledStopPoint id="SSP_2687" version="1"/>
<ScheduledStopPoint id="SSP_2615" version="1"/>
<ScheduledStopPoint id="SSP_23" version="1">
<privateCodes>
<PrivateCode>2</PrivateCode>
Expand Down
Loading