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

Duty stretch extensions #421

Open
wants to merge 7 commits into
base: next
Choose a base branch
from
Open

Duty stretch extensions #421

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
9832304
Implement Duty Stretch etch and add example
nick-knowles Feb 22, 2023
b62226e
Further changes to Duty and stretch and full example
nick-knowles Feb 28, 2023
b6f02c6
Text correction
nick-knowles Feb 28, 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
159 changes: 105 additions & 54 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.

65 changes: 65 additions & 0 deletions examples/functions/stopPlace/Netex_01_StopValidation_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>SYS001</ParticipantRef>
<!--- =============== RESULTS =========== -->
<dataObjects>
<ServiceFrame version="any" id="SVF004">
<!--- ======= CODESPACEs======== -->
<codespaces>
<Codespace id="mybus">
<Xmlns>mybus</Xmlns>
<XmlnsUrl>http://www.mybus.fr/</XmlnsUrl>
<Description>My buses</Description>
</Codespace>
</codespaces>
<!--- =======FRAME DEFAULTS======== -->
<FrameDefaults>
<DefaultCodespaceRef ref="mybus"/>
</FrameDefaults>

<lines>
<Line version="1.0" id="016">
<Name>HCTY Line 16</Name>
<!-- NK NB4 DataCorrectness: Use correct operator data ie line 16, not 354 -->
<Description>Acomb _ Hamilton Drive _ York</Description>
<!-- NK NB4 DataCorrectness - Correct the line name to match the fare data -->
<Url>http://www.connexionsbuses.com/routes-fares/16-acomb-hamilton-drive-york/</Url>
<!-- NK NB3 GoodPractice - Record the web source -->
<PublicCode>16</PublicCode>
<PrivateCode type="noc">10327</PrivateCode>
<OperatorRef version="1.0" ref="noc:HCTY">noc:137122</OperatorRef>
</Line>
</lines>


<scheduledStopPoints>
<ScheduledStopPoint version="032" created="2000-12-17T09:30:47.0Z" changed="2002-12-17T09:30:47.0Z" id="SSP0042A">
<Name>Poste, St Jean</Name>
<Location>
<Longitude>-0.2071397147</Longitude>
<Latitude>51.4217482061</Latitude>
</Location>



<PublicCode>16</PublicCode>

<PrivateCode type="noc">10327</PrivateCode>
<Url>http://www.mybus.fr/st_jean/</Url>

<VehicleModes>bus</VehicleModes>

</ScheduledStopPoint>
<ScheduledStopPoint version="032" created="2000-12-17T11:30:47.0Z" changed="2002-12-17T09:32:47.0Z" id="SNCF0047">
<Name>Gare, St Jean</Name>
<Location>
<Longitude>-0.2071397153</Longitude>
<Latitude>51.4217482054</Latitude>
</Location>
<VehicleModes>rail</VehicleModes>
</ScheduledStopPoint>
</scheduledStopPoints>
</ServiceFrame>
</dataObjects>
</PublicationDelivery>
2,187 changes: 2,187 additions & 0 deletions examples/functions/vehicleSchedule/Netex_simpleDutyExample_01.xml
View file
Open in desktop

Large diffs are not rendered by default.

523 changes: 304 additions & 219 deletions examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml
View file
Open in desktop

Large diffs are not rendered by default.

100 changes: 44 additions & 56 deletions examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
<TypeOfFrameRef version="fxc:v1.0" ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP"/>
<directions>
<Direction version="1" id="stg:SCWW@86@outbound">
</Direction>
</Direction>
<Direction version="1" id="stg:SCWW@86@inbound">
</Direction>
</Direction>
</directions>
<!-- ====== LINES ======= -->
<lines>
Expand Down Expand Up @@ -899,7 +899,6 @@
<ServiceFrame id="epd:UK:SCCW_ServiceFrame_UK_PI_NETWORK:SCWW@R86@Routes_as_ServicePatterns" version="stg:1.0">
<Name>TXC Route ==&gt; NeTEX Service Pattern </Name>
<TypeOfFrameRef version="fxc:v1.0" ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP"/>

<serviceLinks>
<ServiceLink version="1" id="stg:ServiceLink@11507_1">
<Distance>525</Distance>
Expand Down Expand Up @@ -2066,19 +2065,19 @@
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11528" order="27">
<ScheduledStopPointRef version="1" ref="naptStop:4200F080500"/>
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11536_2"/> -->
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11536_2"/> -->
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11534" order="28">
<ScheduledStopPointRef version="1" ref="naptStop:4200F080501"/>
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11536_3"/> -->
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11536_3"/> -->
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11534" order="39">
<ScheduledStopPointRef version="1" ref="naptStop:4200F011200"/> <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11545_1"/>
<ScheduledStopPointRef version="1" ref="naptStop:4200F011200"/>
<OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11545_1"/>
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11534" order="30">
<ScheduledStopPointRef version="1" ref="naptStop:4200F015601"/>
<OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11545_2"/>

<OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11545_2"/>
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11534" order="31">
<ScheduledStopPointRef version="1" ref="naptStop:4200F153331"/>
Expand Down Expand Up @@ -2134,7 +2133,7 @@
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11550" order="44">
<ScheduledStopPointRef version="1" ref="naptStop:4200F132380"/>
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11550_5"/> -->
<!-- <OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11550_5"/> -->
</StopPointInJourneyPattern>
<StopPointInJourneyPattern version="1" id="stg:11550" order="45">
<ScheduledStopPointRef version="1" ref="naptStop:4200F058001"/>
Expand Down Expand Up @@ -2230,7 +2229,7 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="29" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="30" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_2"/>
Expand All @@ -2240,11 +2239,11 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="32" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_4">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="33" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_5">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="34" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_6"/>
Expand All @@ -2257,15 +2256,15 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="37" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="38" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_2">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="39" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_3">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="40" version="1" id="Route@11551">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_4"/>
Expand Down Expand Up @@ -2337,32 +2336,28 @@
<!-- etc etc -->
<!-- etc etc -->
<ServiceLinkInJourneyPattern order="14" version="1" id="stg:Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_1">
</ServiceLinkRef>
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_1">
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="15" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_2">

</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="16" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_3">

</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="17" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_4">

</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="18" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11522_5">

</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="41" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11553_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="23" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11534_1"/>
Expand All @@ -2378,15 +2373,15 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="27" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11534_5">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="28" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11536_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="29" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="30" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_2"/>
Expand All @@ -2396,11 +2391,11 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="32" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_4">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="33" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_5">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="34" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11545_6"/>
Expand All @@ -2413,29 +2408,25 @@
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="37" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_1">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="38" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_2">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="39" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_3">
</ServiceLinkRef>
</ServiceLinkRef>
</ServiceLinkInJourneyPattern>
<ServiceLinkInJourneyPattern order="40" version="1" id="Route@11556">
<ServiceLinkRef version="1" ref="stg:ServiceLink@11550_4"/>
</ServiceLinkInJourneyPattern>
</linksInSequence>
</ServicePattern>
</servicePatterns>


<journeyPatterns>

<journeyPatterns>
<ServiceJourneyPattern version="1" id="stg:JourneyPattern@1">

<Name>Rugby - Coventry</Name>
<Name>Rugby - Coventry</Name>
<DirectionType>outbound</DirectionType>
<TypeOfJourneyPatternRef version="txc:v2.1" ref="txc:Type_of_JourneyPattern@JourneyPattern"/>
<pointsInSequence>
Expand All @@ -2448,9 +2439,9 @@
<OnwardServiceLinkRef version="1" ref="stg:ServiceLink@11507_2"/>
</StopPointInJourneyPattern>
<!-- etc etc -->
</pointsInSequence>
</ServiceJourneyPattern>
</journeyPatterns>
</pointsInSequence>
</ServiceJourneyPattern>
</journeyPatterns>
</ServiceFrame>
<ServiceFrame id="epd:UK:SCCW_ServiceFrame_UK_PI_NETWORK:SCWW@R86@JourneyPatternTimingLinks_as_TimingPatterns" version=".0">
<Name>TXC JPTL ==&gt; NeTEX Timing Pattern </Name>
Expand Down Expand Up @@ -2478,12 +2469,10 @@
</JourneyPattern> -->
<pointsInSequence>
<TimingPointInJourneyPattern version="1" id="stg:JourneyPatternSection@3" order="1">

<TimingPointRef version="1" ref="stg:JPS@3@StopPoint@43000001304@TP"></TimingPointRef>

<TimingPointRef version="1" ref="stg:JPS@3@StopPoint@43000001304@TP"/>
</TimingPointInJourneyPattern>
<TimingPointInJourneyPattern version="1" id="stg:JourneyPatternSection@3" order="2">
<TimingPointRef version="1" ref="stg:JPS@3@StopPoint@43000007102@TP"></TimingPointRef>
<TimingPointRef version="1" ref="stg:JPS@3@StopPoint@43000007102@TP"/>
</TimingPointInJourneyPattern>
</pointsInSequence>
<points>
Expand Down Expand Up @@ -6034,7 +6023,7 @@ TXC NETEX
-->
<PrivateCode type="txc:TicketMachineJourneyCode">894416</PrivateCode>
<DepartureTime>07:32:00</DepartureTime>
<ServiceJourneyPatternRef version="1" ref="stg:JourneyPattern@1"/>
<ServiceJourneyPatternRef version="1" ref="stg:JourneyPattern@1"/>
<!--
<Operational>
<Block>
Expand All @@ -6051,7 +6040,7 @@ TXC NETEX
</Operational> -->
<VehicleTypeRef versionRef="EXTERNAL" ref="stg:VehicleType@B6"/>
<BlockRef versionRef="EXTERNAL" ref="121"/>
<LineRef version="1" ref="stg:SCWW@86"/>
<LineRef version="1" ref="stg:SCWW@86"/>
<DirectionType>outbound</DirectionType>
<groupsOfServices>
<GroupOfServicesRef version="1" ref="stg:Service@R86@out@monday+friday"/>
Expand All @@ -6064,7 +6053,7 @@ TXC NETEX
</TimetabledPassingTime>
<TimetabledPassingTime id="stg:VehicleJourney@894416_02" version="1">
<StopPointInJourneyPatternRef ref="stg:JourneyPattern@1" order="2"/>
<DepartureTime>07:33:07</DepartureTime>
<DepartureTime>07:33:07</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="stg:VehicleJourney@894416_03" version="1">
<StopPointInJourneyPatternRef ref="stg:JourneyPattern@1" order="3"/>
Expand Down Expand Up @@ -6120,7 +6109,7 @@ TXC NETEX
<OnwardTimingLinkView>
<!-- <VehicleJourneyTimingLink id="50">
<JourneyPatternTimingLinkRef>4</JourneyPatternTimingLinkRef>
<RunTime>PT1M7S</RunTime> -->
<RunTime>PT1M7S</RunTime> -->
<TimingLinkRef version="1" ref="stg:JourneyPatternTimingLink@4"/>
<!-- <ToPointRef version="any" ref="napt:ScheduledStopPoint:43000007102"/> -->
<RunTime>PT1M7S</RunTime>
Expand Down Expand Up @@ -7261,7 +7250,6 @@ TXC NETEX
</dayTypes>
<DirectionType>outbound</DirectionType>
<Origin>

</Origin>
<members>
<GroupOfServicesMember id="stg:Service@R86@out@monday+friday" version="1" order="1">
Expand Down Expand Up @@ -7296,7 +7284,7 @@ TXC NETEX
<DriverScheduleFrame id="stg:txc-example_OperationalDetails@SCWW@R86" version="stg:1.0">
<Name>AUGMENTED PROFILE- Frame with operational data elements</Name>
<duties>
<Duty version="any" id="stg:Duty@01">
<AssignedDuty version="any" id="stg:Duty@01">
<Description/>
<dutyParts>
<DutyPart version="any" id="stg:crew@01">
Expand All @@ -7306,11 +7294,11 @@ TXC NETEX
<Description>Duty crew code 02</Description>
</DutyPart>
</dutyParts>
</Duty>
</AssignedDuty>
</duties>
</DriverScheduleFrame>
<!-- ===DAYS================================================= -->
<ServiceCalendarFrame id="stg:txc-example_profile_asDayTypes@SCWW@R86" version="stg:1.0">
<ServiceCalendarFrame id="stg:txc-example_profile_asDayTypes@SCWW@R86" version="stg:1.0">
<validityConditions>
<AvailabilityCondition version="any" id="stg:89441@AvailabilityCondition@FULLW_001">
<FromDate>2004-03-04T00:00:00</FromDate>
Expand Down Expand Up @@ -8122,7 +8110,7 @@ TXC NETEX
<values>
<TypeOfJourneyPattern version="txc:v2.1" id="txc:Type_of_JourneyPattern@Route">
</TypeOfJourneyPattern>
<TypeOfJourneyPattern version="txc:v2.1" id="txc:Type_of_JourneyPattern@JourneyPattern">
<TypeOfJourneyPattern version="txc:v2.1" id="txc:Type_of_JourneyPattern@JourneyPattern">
</TypeOfJourneyPattern>
</values>
</ValueSet>
Expand Down
4 changes: 2 additions & 2 deletions examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7810,7 +7810,7 @@ TXC NETEX
<DriverScheduleFrame id="stg:txc-example_OperationalDetails@SCWW@R86" version="stg:1.0">
<Name>Schedule Frame with operational data elements</Name>
<duties>
<Duty version="any" id="stg:Duty@01">
<AssignedDuty version="any" id="stg:Duty@01">
<Description/>
<dutyParts>
<DutyPart version="any" id="stg:crew@01">
Expand All @@ -7820,7 +7820,7 @@ TXC NETEX
<Description>Duty crew code 02</Description>
</DutyPart>
</dutyParts>
</Duty>
</AssignedDuty>
</duties>
</DriverScheduleFrame>
<!-- ===DAYS================================================= -->
Expand Down
Loading