Skip to content

Commit

Permalink
Merge branch 'next' into Customer-Information-On-Vehicle
Browse files Browse the repository at this point in the history
  • Loading branch information
@ue71603
ue71603 authored Jul 25, 2024
2 parents 168b6fd + f2a8c7f commit c665677
Show file tree
Hide file tree
Showing 130 changed files with 5,832 additions and 1,162 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/validate-examples.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e

echo "Validating NeTEx XML examples ..."

if xmllint --noout --schema xsd/NeTEx_publication.xsd 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
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
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
Expand Down
20 changes: 13 additions & 7 deletions NeTEx.spp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_seatingPlan_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_spotAffinity_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_spotAffinity_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_spotAffinity_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_spotAffinity_version.xsd"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElementType_support.xsd" HomeFolder="Yes"/>
Expand Down Expand Up @@ -316,18 +316,12 @@
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedPassingTimes_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckEntranceAlignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckEntranceAlignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckPlanAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckPlanAssignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchangeRule_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journey_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyDesignator_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_version.xsd" HomeFolder="Yes"/>
Expand All @@ -344,6 +338,17 @@
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyTimes_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleService_support.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_part_2_JA">
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_all_objects_part2_journeyAssignments.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckEntranceAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckEntranceAssignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckPlanAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_deckPlanAssignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyStopAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyStopAssignment_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_part_2_TI_VS">
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_all_objects_part2_vehicleService.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_vehicleRechargingPlan_support.xsd" HomeFolder="Yes"/>
Expand Down Expand Up @@ -665,6 +670,7 @@
<File FilePath="examples\functions\variant\Netex_VariantExample_Step_05.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="network">
<File FilePath="examples\functions\simpleNetwork\Netex_LineClassification_1.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\simpleNetwork\Netex_SimpleNetwork_1.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\simpleNetwork\Netex_uk_underground_1.xml" HomeFolder="Yes"/>
</Folder>
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,14 @@ The schema is systematically divided into small modular files. Generally, for ea
| ----------- | ------------------------------------------------------- | ----------------------------------------------- |
| `master` | Current head of the project | [GitHub](https://github.com/NeTEx-CEN/NeTEx) |
| `next` | Work for the next release | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/next) |
| `epiap` | CEN NeTEx European Passenger Information Accessibility Profile | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/EPIAP) |

# Change Log
## Releases
| Release Number | Release Date | Description | Link | Release Notes |
| -------------- | ------------- | ---------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------- |
| 1.2 | March 2022 | Latest productive version before new modes merge | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2/README.md) |
| 1.2.2 | August 2023 | First version of new modes | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2.2/README.md) |
| 1.3 | 2024 | European Passenger Information Accessibility Profile (EPIAP) - upcoming | N/A | N/A |
| 1.3.1 | May 2024 | European Passenger Information Accessibility Profile (EPIAP) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.3.1) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.3.1/README.md) |
| 2.0 | 2024 | Upcoming release ⏳ | N/A | N/A |
## Full Version History 📚
The comprehensive versions history is available in [change_log.md](https://github.com/ITxPT/NeTEx/blob/NeTEx/change_log.md)
24 changes: 8 additions & 16 deletions examples/functions/deckPlans/DeckPlans-Example_bus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1793,35 +1793,27 @@ Lower deck
<StopPlaceRef versionRef="EXTERNAL" ref="mb:SP-Gotham_bus_interchange"/>
<QuayRef versionRef="EXTERNAL" ref="mb:Qy-Gotham_bus_interchange@P1"/>
<BoardingPositionRef versionRef="EXTERNAL" ref="mb:BP-Gotham_bus_interchange@P1@A"/>
<trainElements>
<TrainStopAssignment version="any" id="mb:TSA-sj001a" order="1">
<passengerBoardingPositionAssignments>
<DeckEntranceAssignment version="any" id="mb:DEA-sj001a@front" order="1">
<Name>Board at front from position A</Name>
<BoardingUse>true</BoardingUse>
<AlightingUse>false</AlightingUse>
<PositionOfTrainElement>1</PositionOfTrainElement>
<BoardingPositionRef versionRef="EXTERNAL" ref="mb:BP-Gotham_bus_interchange@P1@A"/>
<EntranceToVehicle>Board at front</EntranceToVehicle>
<deckEntranceAssignments>
<DeckEntranceAssignment version="any" id="mb:DEA-sj001a@front">
<PassengerEntranceRef version="any" ref="mb:PE-ddb_deck_1@seating_area@forward_left_entrance"/>
</DeckEntranceAssignment>
</deckEntranceAssignments>
</TrainStopAssignment>
<TrainStopAssignment version="any" id="mb:TSA-sj001a" order="2">
<PassengerEntranceRef version="any" ref="mb:PE-ddb_deck_1@seating_area@forward_left_entrance"/>
</DeckEntranceAssignment>
<DeckEntranceAssignment version="any" id="mb:DEA-sj001a@rear" order="2">
<Name>Exit at rear from position A</Name>
<!-- NB to do which side -->
<BoardingUse>false</BoardingUse>
<AlightingUse>true</AlightingUse>
<PositionOfTrainElement>1</PositionOfTrainElement>
<BoardingPositionRef versionRef="EXTERNAL" ref="mb:BP-Gotham_bus_interchange@P1@B"/>
<EntranceToVehicle>exit at rear</EntranceToVehicle>
<deckEntranceAssignments>
<DeckEntranceAssignment version="any" id="mb:DEA-sj001a@rear">
<PassengerEntranceRef version="any" ref="mb:PE-ddb_deck_1@seating_area@rear_entrance"/>
</DeckEntranceAssignment>
</deckEntranceAssignments>
</TrainStopAssignment>
</trainElements>
<PassengerEntranceRef version="any" ref="mb:PE-ddb_deck_1@seating_area@rear_entrance"/>
</DeckEntranceAssignment>
</passengerBoardingPositionAssignments>
</PassengerStopAssignment>
</stopAssignments>
</ServiceFrame>
Expand Down
Loading

0 comments on commit c665677

Please sign in to comment.