Skip to content

Commit 1c92daa

Browse files
committed
Remove all order attributes in favor of XML ordering.
Fix #810
1 parent dab7346 commit 1c92daa

File tree

96 files changed

+19950
-20209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+19950
-20209
lines changed

.github/scripts/validate-examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99

1010
echo "Validating NeTEx XML examples ..."
1111

12-
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
12+
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/deckPlans/*.xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
1313
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
1414
else
1515
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'

examples/functions/deckPlans/DeckPlans-Example.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,14 +1654,14 @@
16541654
<Name>Deck Plan Assignment Example</Name>
16551655
<Description>This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry .</Description>
16561656
<stopAssignments>
1657-
<PassengerStopAssignment version="any" id="sj001a" order="1">
1657+
<PassengerStopAssignment version="any" id="sj001a-1">
16581658
<Name>To a particalr stopt</Name>
16591659
<ScheduledStopPointRef versionRef="EXTERNAL" ref="Gotham_bus_station"/>
16601660
<StopPlaceRef versionRef="EXTERNAL" ref="Gotham_bus"/>
16611661
<QuayRef versionRef="EXTERNAL" ref="Gotham_bus@P1"/>
16621662
<BoardingPositionRef versionRef="EXTERNAL" ref="Gotham_bus@P1@A"/>
16631663
<trainElements>
1664-
<TrainStopAssignment version="any" id="sj001a" order="1">
1664+
<TrainStopAssignment version="any" id="sj001a-1">
16651665
<BoardingUse>true</BoardingUse>
16661666
<AlightingUse>false</AlightingUse>
16671667
<PositionOfTrainElement>1</PositionOfTrainElement>
@@ -1673,7 +1673,7 @@
16731673
</DeckEntranceAssignment>
16741674
</deckEntranceAssignments>
16751675
</TrainStopAssignment>
1676-
<TrainStopAssignment version="any" id="sj001a" order="2">
1676+
<TrainStopAssignment version="any" id="sj001a-2">
16771677
<BoardingUse>false</BoardingUse>
16781678
<AlightingUse>true</AlightingUse>
16791679
<PositionOfTrainElement>1</PositionOfTrainElement>
@@ -1724,14 +1724,14 @@
17241724
</vehicleJourneys>
17251725
<deckPlanAssignments>
17261726
<!-- This is an highly artifical exampel to shwo a different deck plan assignment on two different journey parts -->
1727-
<DeckPlanAssignment version="any" id="sj001a" order="1">
1727+
<DeckPlanAssignment version="any" id="sj001a-1">
17281728
<Name>Assign double decker bus to Journey - doors shut</Name>
17291729
<DeckPlanRef version="any" ref="double_decker_bus"/>
17301730
<VehicleTypeRef version="any" ref="double_decker"/>
17311731
<ServiceJourneyRef version="any" ref="sj001"/>
17321732
<JourneyPartRef version="any" ref="sj001@a"/>
17331733
</DeckPlanAssignment>
1734-
<DeckPlanAssignment version="any" id="sj001b" order="2">
1734+
<DeckPlanAssignment version="any" id="sj001b-2">
17351735
<Name>Assign double decker bus to Journey - doors open</Name>
17361736
<DeckPlanRef versionRef="EXTERNAL" ref="double_decker_bus_ALTERNATIVE_CONFIG"/>
17371737
<VehicleTypeRef version="any" ref="double_decker"/>
@@ -1740,10 +1740,10 @@
17401740
</DeckPlanAssignment>
17411741
</deckPlanAssignments>
17421742
<vehicleJourneyStopAssignments>
1743-
<VehicleJourneyStopAssignment version="any" id="sj001a" order="1">
1743+
<VehicleJourneyStopAssignment version="any" id="sj001a-1">
17441744
<Name>Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY </Name>
17451745
<VehicleJourneyRef version="any" ref="sj001"/>
1746-
<PassengerStopAssignmentRef version="any" ref="sj001a"/>
1746+
<PassengerStopAssignmentRef version="any" ref="sj001a-1"/>
17471747
</VehicleJourneyStopAssignment>
17481748
</vehicleJourneyStopAssignments>
17491749
</TimetableFrame>

0 commit comments

Comments
 (0)