Skip to content

Commit 4cb93e6

Browse files
nick-knowlesnick-knowles
committed
FIX NTA example and XML project references
1 parent d9e52fe commit 4cb93e6

File tree

2 files changed

+0
-143
lines changed

2 files changed

+0
-143
lines changed

‎NeTEx.spp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,6 @@
790790
<Folder FolderName="uk">
791791
<File FilePath="examples\standards\fxc\FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml"/>
792792
<File FilePath="examples\standards\fxc\FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml"/>
793-
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01..xml" HomeFolder="Yes"/>
794793
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml" HomeFolder="Yes"/>
795794
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml" HomeFolder="Yes"/>
796795
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml" HomeFolder="Yes"/>

‎examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml‎

Lines changed: 0 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,7 +1447,6 @@ RS 0 100 10 Reservations available#
14471447
<servicePatterns>
14481448
<ServicePattern version="any" id="ir:00122@outbound">
14491449
<pointsInSequence>
1450-
<<<<<<< HEAD
14511450
<StopPointInJourneyPattern version="any" id="ir:00122@01" order="1">
14521451
<ScheduledStopPointRef version="any" ref="uic:6000036">Dublin Connolly$Con</ScheduledStopPointRef>
14531452
</StopPointInJourneyPattern>
@@ -1506,66 +1505,6 @@ RS 0 100 10 Reservations available#
15061505
<ScheduledStopPointRef version="any" ref="uic:7003280">Lisburn</ScheduledStopPointRef>
15071506
</StopPointInJourneyPattern>
15081507
<StopPointInJourneyPattern version="any" id="ir:00122@20" order="20">
1509-
=======
1510-
<StopPointInJourneyPattern version="any" id="ir:00122-01" order="1">
1511-
<ScheduledStopPointRef version="any" ref="uic:6000036">Dublin Connolly$Con</ScheduledStopPointRef>
1512-
</StopPointInJourneyPattern>
1513-
<StopPointInJourneyPattern version="any" id="ir:00122-02" order="2">
1514-
<ScheduledStopPointRef version="any" ref="uic:6010013">Clontarf Road</ScheduledStopPointRef>
1515-
</StopPointInJourneyPattern>
1516-
<StopPointInJourneyPattern version="any" id="ir:00122-03" order="3">
1517-
<ScheduledStopPointRef version="any" ref="uic:6010034">Killester</ScheduledStopPointRef>
1518-
</StopPointInJourneyPattern>
1519-
<StopPointInJourneyPattern version="any" id="ir:00122-04" order="4">
1520-
<ScheduledStopPointRef version="any" ref="uic:6010025">Harmonstown</ScheduledStopPointRef>
1521-
</StopPointInJourneyPattern>
1522-
<StopPointInJourneyPattern version="any" id="ir:00122-05" order="5">
1523-
<ScheduledStopPointRef version="any" ref="uic:6010044">Raheny</ScheduledStopPointRef>
1524-
</StopPointInJourneyPattern>
1525-
<StopPointInJourneyPattern version="any" id="ir:00122-06" order="6">
1526-
<ScheduledStopPointRef version="any" ref="uic:6010028">Kilbarrack</ScheduledStopPointRef>
1527-
</StopPointInJourneyPattern>
1528-
<StopPointInJourneyPattern version="any" id="ir:00122-07" order="7">
1529-
<ScheduledStopPointRef version="any" ref="uic:6010026">Howth Junction and</ScheduledStopPointRef>
1530-
</StopPointInJourneyPattern>
1531-
<StopPointInJourneyPattern version="any" id="ir:00122-08" order="8">
1532-
<ScheduledStopPointRef version="any" ref="uic:6010043">Portmarnock</ScheduledStopPointRef>
1533-
</StopPointInJourneyPattern>
1534-
<StopPointInJourneyPattern version="any" id="ir:00122-09" order="9">
1535-
<ScheduledStopPointRef version="any" ref="uic:6000057">Malahide</ScheduledStopPointRef>
1536-
</StopPointInJourneyPattern>
1537-
<StopPointInJourneyPattern version="any" id="ir:00122-10" order="10">
1538-
<ScheduledStopPointRef version="any" ref="uic:6010053">Skerries</ScheduledStopPointRef>
1539-
</StopPointInJourneyPattern>
1540-
<StopPointInJourneyPattern version="any" id="ir:00122-11" order="11">
1541-
<ScheduledStopPointRef version="any" ref="uic:6000006">Balbriggan</ScheduledStopPointRef>
1542-
</StopPointInJourneyPattern>
1543-
<StopPointInJourneyPattern version="any" id="ir:00122-12" order="12">
1544-
<ScheduledStopPointRef version="any" ref="uic:6000061">Mosney</ScheduledStopPointRef>
1545-
</StopPointInJourneyPattern>
1546-
<StopPointInJourneyPattern version="any" id="ir:00122-13" order="13">
1547-
<ScheduledStopPointRef version="any" ref="uic:6000034">Drogheda (MacBride)</ScheduledStopPointRef>
1548-
</StopPointInJourneyPattern>
1549-
<StopPointInJourneyPattern version="any" id="ir:00122-14" order="14">
1550-
<ScheduledStopPointRef version="any" ref="uic:6000040">Dundalk (Clarke)</ScheduledStopPointRef>
1551-
</StopPointInJourneyPattern>
1552-
<StopPointInJourneyPattern version="any" id="ir:00122-15" order="15">
1553-
<ScheduledStopPointRef version="any" ref="uic:7003300">Newry</ScheduledStopPointRef>
1554-
</StopPointInJourneyPattern>
1555-
<StopPointInJourneyPattern version="any" id="ir:00122-16" order="16">
1556-
<ScheduledStopPointRef version="any" ref="uic:6100000">PPASS</ScheduledStopPointRef>
1557-
</StopPointInJourneyPattern>
1558-
<StopPointInJourneyPattern version="any" id="ir:00122-17" order="17">
1559-
<ScheduledStopPointRef version="any" ref="uic:7003310">Portadown</ScheduledStopPointRef>
1560-
</StopPointInJourneyPattern>
1561-
<StopPointInJourneyPattern version="any" id="ir:00122-18" order="18">
1562-
<ScheduledStopPointRef version="any" ref="uic:6010039">Lurgan</ScheduledStopPointRef>
1563-
</StopPointInJourneyPattern>
1564-
<StopPointInJourneyPattern version="any" id="ir:00122-19" order="19">
1565-
<ScheduledStopPointRef version="any" ref="uic:7003280">Lisburn</ScheduledStopPointRef>
1566-
</StopPointInJourneyPattern>
1567-
<StopPointInJourneyPattern version="any" id="ir:00122-20" order="20">
1568-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
15691508
<ScheduledStopPointRef version="any" ref="uic:9990840">Belfast</ScheduledStopPointRef>
15701509
</StopPointInJourneyPattern>
15711510
</pointsInSequence>
@@ -1640,181 +1579,100 @@ etc -->
16401579
<DirectionType>outbound</DirectionType>
16411580
<passingTimes>
16421581
<TimetabledPassingTime version="any" id="ir:00122@1">
1643-
<<<<<<< HEAD
16441582
<PointInJourneyPatternRef version="any" ref="ir:00122@01" order="1">6000036:Dublin Connolly$Con</PointInJourneyPatternRef>
16451583
<DepartureTime>00:07:35</DepartureTime>
16461584
</TimetabledPassingTime>
16471585
<TimetabledPassingTime version="any" id="ir:00122@2">
16481586
<PointInJourneyPatternRef version="any" ref="ir:00122@02" order="2">6010013:Clontarf Road</PointInJourneyPatternRef>
1649-
=======
1650-
<PointInJourneyPatternRef version="any" ref="ir:00122-01" order="1">6000036:Dublin Connolly$Con</PointInJourneyPatternRef>
16511587
<DepartureTime>00:07:35</DepartureTime>
16521588
</TimetabledPassingTime>
1653-
<TimetabledPassingTime version="any" id="ir:00122@2">
1654-
<PointInJourneyPatternRef version="any" ref="ir:00122-02" order="2">6010013:Clontarf Road</PointInJourneyPatternRef>
1655-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
1656-
<ArrivalTime>00:07:37</ArrivalTime>
1657-
<DepartureTime>00:07:37</DepartureTime>
1658-
</TimetabledPassingTime>
16591589
<TimetabledPassingTime version="any" id="ir:00122@3">
1660-
<<<<<<< HEAD
16611590
<PointInJourneyPatternRef version="any" ref="ir:00122@03" order="3">6010034:Killester</PointInJourneyPatternRef>
1662-
=======
1663-
<PointInJourneyPatternRef version="any" ref="ir:00122-03" order="3">6010034:Killester</PointInJourneyPatternRef>
1664-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
16651591
<ArrivalTime>00:07:39</ArrivalTime>
16661592
<DepartureTime>00:07:39</DepartureTime>
16671593
</TimetabledPassingTime>
16681594
<TimetabledPassingTime version="any" id="ir:00122@4">
1669-
<<<<<<< HEAD
16701595
<PointInJourneyPatternRef version="any" ref="ir:00122@04" order="4">6010025:Harmonstown</PointInJourneyPatternRef>
1671-
=======
1672-
<PointInJourneyPatternRef version="any" ref="ir:00122-04" order="4">6010025:Harmonstown</PointInJourneyPatternRef>
1673-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
16741596
<ArrivalTime>00:07:40</ArrivalTime>
16751597
<DepartureTime>00:07:40</DepartureTime>
16761598
</TimetabledPassingTime>
16771599
<TimetabledPassingTime version="any" id="ir:00122@5">
1678-
<<<<<<< HEAD
16791600
<PointInJourneyPatternRef version="any" ref="ir:00122@05" order="5">6010044:Raheny</PointInJourneyPatternRef>
1680-
=======
1681-
<PointInJourneyPatternRef version="any" ref="ir:00122-05" order="5">6010044:Raheny</PointInJourneyPatternRef>
1682-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
16831601
<ArrivalTime>00:07:43</ArrivalTime>
16841602
<DepartureTime>00:07:43</DepartureTime>
16851603
</TimetabledPassingTime>
16861604
<TimetabledPassingTime version="any" id="ir:00122@6">
1687-
<<<<<<< HEAD
16881605
<PointInJourneyPatternRef version="any" ref="ir:00122@06" order="6">6010028:Kilbarrack</PointInJourneyPatternRef>
1689-
=======
1690-
<PointInJourneyPatternRef version="any" ref="ir:00122-06" order="6">6010028:Kilbarrack</PointInJourneyPatternRef>
1691-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
16921606
<ArrivalTime>00:07:45</ArrivalTime>
16931607
<DepartureTime>00:07:45</DepartureTime>
16941608
</TimetabledPassingTime>
16951609
<TimetabledPassingTime version="any" id="ir:00122@7">
1696-
<<<<<<< HEAD
16971610
<PointInJourneyPatternRef version="any" ref="ir:00122@07" order="7">6010026:Howth Junction and</PointInJourneyPatternRef>
1698-
=======
1699-
<PointInJourneyPatternRef version="any" ref="ir:00122-07" order="7">6010026:Howth Junction and</PointInJourneyPatternRef>
1700-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17011611
<ArrivalTime>00:07:46</ArrivalTime>
17021612
<DepartureTime>00:07:46</DepartureTime>
17031613
</TimetabledPassingTime>
17041614
<TimetabledPassingTime version="any" id="ir:00122@8">
1705-
<<<<<<< HEAD
17061615
<PointInJourneyPatternRef version="any" ref="ir:00122@08" order="8">6010043:Portmarnock</PointInJourneyPatternRef>
1707-
=======
1708-
<PointInJourneyPatternRef version="any" ref="ir:00122-08" order="8">6010043:Portmarnock</PointInJourneyPatternRef>
1709-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17101616
<ArrivalTime>00:07:47</ArrivalTime>
17111617
<DepartureTime>00:07:47</DepartureTime>
17121618
</TimetabledPassingTime>
17131619
<TimetabledPassingTime version="any" id="ir:00122@9">
1714-
<<<<<<< HEAD
17151620
<PointInJourneyPatternRef version="any" ref="ir:00122@09" order="9">6000057:Malahide</PointInJourneyPatternRef>
1716-
=======
1717-
<PointInJourneyPatternRef version="any" ref="ir:00122-09" order="9">6000057:Malahide</PointInJourneyPatternRef>
1718-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17191621
<ArrivalTime>00:07:50</ArrivalTime>
17201622
<DepartureTime>00:07:50</DepartureTime>
17211623
</TimetabledPassingTime>
17221624
<TimetabledPassingTime version="any" id="ir:00122@10">
1723-
<<<<<<< HEAD
17241625
<PointInJourneyPatternRef version="any" ref="ir:00122@10" order="10">6010053:Skerries</PointInJourneyPatternRef>
1725-
=======
1726-
<PointInJourneyPatternRef version="any" ref="ir:00122-10" order="10">6010053:Skerries</PointInJourneyPatternRef>
1727-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17281626
<ArrivalTime>00:07:57</ArrivalTime>
17291627
<DepartureTime>00:07:57</DepartureTime>
17301628
</TimetabledPassingTime>
17311629
<TimetabledPassingTime version="any" id="ir:00122@11">
1732-
<<<<<<< HEAD
17331630
<PointInJourneyPatternRef version="any" ref="ir:00122@11" order="11">6000006:Balbriggan</PointInJourneyPatternRef>
1734-
=======
1735-
<PointInJourneyPatternRef version="any" ref="ir:00122-11" order="11">6000006:Balbriggan</PointInJourneyPatternRef>
1736-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17371631
<ArrivalTime>00:08:00</ArrivalTime>
17381632
<DepartureTime>00:08:00</DepartureTime>
17391633
</TimetabledPassingTime>
17401634
<TimetabledPassingTime version="any" id="ir:00122@12">
1741-
<<<<<<< HEAD
17421635
<PointInJourneyPatternRef version="any" ref="ir:00122@12" order="12">6000061:Mosney</PointInJourneyPatternRef>
1743-
=======
1744-
<PointInJourneyPatternRef version="any" ref="ir:00122-12" order="12">6000061:Mosney</PointInJourneyPatternRef>
1745-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17461636
<ArrivalTime>00:08:03</ArrivalTime>
17471637
<DepartureTime>00:08:03</DepartureTime>
17481638
</TimetabledPassingTime>
17491639
<TimetabledPassingTime version="any" id="ir:00122@13">
1750-
<<<<<<< HEAD
17511640
<PointInJourneyPatternRef version="any" ref="ir:00122@13" order="13">6000034:Drogheda (MacBride)</PointInJourneyPatternRef>
1752-
=======
1753-
<PointInJourneyPatternRef version="any" ref="ir:00122-13" order="13">6000034:Drogheda (MacBride)</PointInJourneyPatternRef>
1754-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17551641
<ArrivalTime>00:08:09</ArrivalTime>
17561642
<DepartureTime>00:08:10</DepartureTime>
17571643
</TimetabledPassingTime>
17581644
<TimetabledPassingTime version="any" id="ir:00122@14">
1759-
<<<<<<< HEAD
17601645
<PointInJourneyPatternRef version="any" ref="ir:00122@14" order="14">6000040:Dundalk (Clarke)</PointInJourneyPatternRef>
1761-
=======
1762-
<PointInJourneyPatternRef version="any" ref="ir:00122-14" order="14">6000040:Dundalk (Clarke)</PointInJourneyPatternRef>
1763-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17641646
<ArrivalTime>00:08:31</ArrivalTime>
17651647
<DepartureTime>00:08:31</DepartureTime>
17661648
</TimetabledPassingTime>
17671649
<TimetabledPassingTime version="any" id="ir:00122@15">
1768-
<<<<<<< HEAD
17691650
<PointInJourneyPatternRef version="any" ref="ir:00122@15" order="15">7003300:Newry</PointInJourneyPatternRef>
1770-
=======
1771-
<PointInJourneyPatternRef version="any" ref="ir:00122-15" order="15">7003300:Newry</PointInJourneyPatternRef>
1772-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17731651
<ArrivalTime>00:08:48</ArrivalTime>
17741652
<DepartureTime>00:08:49</DepartureTime>
17751653
</TimetabledPassingTime>
17761654
<TimetabledPassingTime version="any" id="ir:00122@16">
1777-
<<<<<<< HEAD
17781655
<PointInJourneyPatternRef version="any" ref="ir:00122@16" order="16">6100000:PPASS</PointInJourneyPatternRef>
1779-
=======
1780-
<PointInJourneyPatternRef version="any" ref="ir:00122-16" order="16">6100000:PPASS</PointInJourneyPatternRef>
1781-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17821656
<ArrivalTime>00:08:58</ArrivalTime>
17831657
<DepartureTime>00:08:58</DepartureTime>
17841658
</TimetabledPassingTime>
17851659
<TimetabledPassingTime version="any" id="ir:00122@17">
1786-
<<<<<<< HEAD
17871660
<PointInJourneyPatternRef version="any" ref="ir:00122@17" order="17">7003310:Portadown</PointInJourneyPatternRef>
1788-
=======
1789-
<PointInJourneyPatternRef version="any" ref="ir:00122-17" order="17">7003310:Portadown</PointInJourneyPatternRef>
1790-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
17911661
<ArrivalTime>00:09:09</ArrivalTime>
17921662
<DepartureTime>00:09:09</DepartureTime>
17931663
</TimetabledPassingTime>
17941664
<TimetabledPassingTime version="any" id="ir:00122@18">
1795-
<<<<<<< HEAD
17961665
<PointInJourneyPatternRef version="any" ref="ir:00122@18" order="18">6010039:Lurgan</PointInJourneyPatternRef>
1797-
=======
1798-
<PointInJourneyPatternRef version="any" ref="ir:00122-18" order="18">6010039:Lurgan</PointInJourneyPatternRef>
1799-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
18001666
<ArrivalTime>00:09:17</ArrivalTime>
18011667
<DepartureTime>00:09:17</DepartureTime>
18021668
</TimetabledPassingTime>
18031669
<TimetabledPassingTime version="any" id="ir:00122@19">
1804-
<<<<<<< HEAD
18051670
<PointInJourneyPatternRef version="any" ref="ir:00122@19" order="19">7003280:Lisburn</PointInJourneyPatternRef>
1806-
=======
1807-
<PointInJourneyPatternRef version="any" ref="ir:00122-19" order="19">7003280:Lisburn</PointInJourneyPatternRef>
1808-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
18091671
<ArrivalTime>00:09:31</ArrivalTime>
18101672
<DepartureTime>00:09:31</DepartureTime>
18111673
</TimetabledPassingTime>
18121674
<TimetabledPassingTime version="any" id="ir:00122@20">
1813-
<<<<<<< HEAD
18141675
<PointInJourneyPatternRef version="any" ref="ir:00122@20" order="20">9990840:Belfast</PointInJourneyPatternRef>
1815-
=======
1816-
<PointInJourneyPatternRef version="any" ref="ir:00122-20" order="20">9990840:Belfast</PointInJourneyPatternRef>
1817-
>>>>>>> c262a183592a5bda2a9e817d5933fda75ca625d4
18181676
<ArrivalTime>00:09:45</ArrivalTime>
18191677
</TimetabledPassingTime>
18201678
</passingTimes>

0 commit comments

Comments
 (0)