Merge branch 'GroupOfFacilities' of https://github.com/NeTEx-CEN/NeTEx …

…into GroupOfFacilities
NeTEx-CEN · Oct 1, 2024 · 0c4ca4a · 0c4ca4a
2 parents c63e774 + 54a1336
commit 0c4ca4a
Show file tree

Hide file tree

Showing 442 changed files with 4,895 additions and 1,589 deletions.
diff --git a/NeTEx.spp b/NeTEx.spp
@@ -316,19 +316,13 @@
 				<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_facility_support.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"/>
@@ -345,6 +339,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"/>
@@ -355,6 +360,10 @@
 				<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"/>
 			</Folder>
+			<Folder FolderName="netex_part_2_OC">
+				<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
+			</Folder>
 		</Folder>
 		<Folder FolderName="netex_part_3 Fares">
 			<Folder FolderName="netex_part_3_FM">
@@ -433,6 +442,8 @@
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPaymentMeans_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_fareDebit_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_fareDebit_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_mediumApplication_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_mediumApplication_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_retailConsortium_support.xsd" HomeFolder="Yes"/>
@@ -600,6 +611,10 @@
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
+			<Folder FolderName="netec_part5_NM_OC">
+				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
+			</Folder>
 			<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="netex_service">

diff --git a/README.md b/README.md
@@ -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)
diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
@@ -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>