Skip to content

Commit

Permalink
Merge branch 'next' into Occupancy
Browse files Browse the repository at this point in the history
  • Loading branch information
@skinkie
skinkie authored Jul 25, 2024
2 parents b428089 + 3465eec commit 8b3ccad
Show file tree
Hide file tree
Showing 50 changed files with 1,926 additions and 791 deletions.
21 changes: 14 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 @@ -436,6 +441,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"/>
Expand Down
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
113 changes: 54 additions & 59 deletions examples/functions/deckPlans/DeckPlans-Example_train.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Small cars only
The Train hasa default
We assign the deck plans to a specific SERVICE JOURNEY , with different configuratiosn for each journey part
A PASSENGER STOP ASSIGNMENT with individual TRAIN STOP ASSIGNMENTs specify which carriages are aligned with which BOARDING POSITION
A PASSENGER STOP ASSIGNMENT with individual PASSENGER BOARDING POSITION ASSIGNMENTs specify which carriages are aligned with which BOARDING POSITION
NAVIGATION PATH + DECK NAVIGATION PATH to reach a seat
Expand Down Expand Up @@ -4932,10 +4932,9 @@ The train reverse in the station and departs, oriented backwards to the right
<DepartsToRight>false</DepartsToRight>
<StopPlaceRef version="any" ref="xx:SP-station_765"/>
<QuayRef version="any" ref="xx:Qy-station_765@quay_2"/>
<trainElements>
<TrainStopAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="1">
<Name>Front half of Carriage F01</Name>
<Description>Carriage F01 Seats 01-12 can use Boarding Position A</Description>
<passengerBoardingPositionAssignments>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_1@forward" order="1">
<Name>Entrance to F01 is at Boarding Position A via forward door on right hand side of train</Name>
<BoardingUse>true</BoardingUse>
<AlightingUse>true</AlightingUse>
<TrainComponentView>
Expand All @@ -4947,20 +4946,15 @@ The train reverse in the station and departs, oriented backwards to the right
<BoardingPositionRef version="any" ref="xx:BP-station_765@quay_2@A"/>
<IsAllowed>true</IsAllowed>
<EntranceToVehicle>Board at front</EntranceToVehicle>
<deckEntranceAssignments>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_1@forward">
<Name>Entrance to F01 is at Boarding Position A via forward door on right hand side of train</Name>
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@forward_external_right"/>
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_1@row_01_col_A">Seat 01</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_3@row_06_col_D">Seat 12</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
</deckEntranceAssignments>
</TrainStopAssignment>
<TrainStopAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="2">
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@forward_external_right"/>
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_1@row_01_col_A">Seat 01</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_3@row_06_col_D">Seat 12</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_1@rear" order="2">
<Name>Rear half of Carriage F01</Name>
<Description>Carriage F01 Seats 03-26 can use Boarding Position B</Description>
<BoardingUse>true</BoardingUse>
Expand All @@ -4974,22 +4968,17 @@ The train reverse in the station and departs, oriented backwards to the right
<BoardingPositionRef version="any" ref="xx:BP-station_765@quay_2@B"/>
<IsAllowed>true</IsAllowed>
<EntranceToVehicle>Exit by rear doors</EntranceToVehicle>
<deckEntranceAssignments>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_1@rear">
<Name>Entrance to F01 seats 13-26 at Boarding Position B via rear door on right hand side of train</Name>
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@rear_external_right"/>
<EntranceSetting>shut</EntranceSetting>
<!-- Passenger must open door themselves -->
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_4@row_07_col_A">Seat 13</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_6@row_12_col_D">Seat 36</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
</deckEntranceAssignments>
</TrainStopAssignment>
<TrainStopAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="3">
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@rear_external_right"/>
<EntranceSetting>shut</EntranceSetting>
<!-- Passenger must open door themselves -->
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_4@row_07_col_A">Seat 13</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_6@row_12_col_D">Seat 36</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_2@forward" order="3">
<Name>Carriage F02 front </Name>
<Description>Carriage F02 All seats must use forward door to Boarding Position C. Rear door shut</Description>
<BoardingUse>true</BoardingUse>
Expand All @@ -5003,26 +4992,32 @@ The train reverse in the station and departs, oriented backwards to the right
<BoardingPositionRef version="any" ref="xx:BP-station_765@quay_2@C"/>
<IsAllowed>true</IsAllowed>
<EntranceToVehicle>Exit through front carriages</EntranceToVehicle>
<deckEntranceAssignments>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_2@forward">
<Name>Entrance to F03 at Boarding Position A via forward door on right hand side of train</Name>
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@forward_external_right"/>
<EntranceSetting>shut</EntranceSetting>
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_1@row_01_col_A">Seat 01</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_6@row_12_col_D">Seat 36</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_2@rear">
<Name>No Entrance to F02 via rear door on right hand side of train</Name>
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@rear_external_right"/>
<EntranceSetting>lockedShut</EntranceSetting>
</DeckEntranceAssignment>
</deckEntranceAssignments>
</TrainStopAssignment>
<TrainStopAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="4">
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@forward_external_right"/>
<EntranceSetting>shut</EntranceSetting>
<StartSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_1@row_01_col_A">Seat 01</PassengerSpotRef>
</StartSpot>
<EndSpot>
<PassengerSpotRef version="any" ref="rc:PSp-slw_deck_1@compartment_6@row_12_col_D">Seat 36</PassengerSpotRef>
</EndSpot>
</DeckEntranceAssignment>
<DeckEntranceAssignment version="any" id="rc:DEA-rail_sleeper_train_1@carriage_2@rear">
<Name>No Entrance to F02 via rear door on right hand side of train</Name>
<BoardingUse>false</BoardingUse>
<AlightingUse>false</AlightingUse>
<TrainComponentView>
<TrainComponentRef version="any" ref="rco:TC-rail_sleeper_train_1" order="3"/>
<Label>F02</Label>
<TrainElementTypeType>sleeperCarriage</TrainElementTypeType>
</TrainComponentView>
<PositionOfTrainElement>3</PositionOfTrainElement>
<BoardingPositionRef version="any" ref="xx:BP-station_765@quay_2@C"/>
<IsAllowed>false</IsAllowed>
<EntranceToVehicle>Exit through front carriages</EntranceToVehicle>
<PassengerEntranceRef version="any" ref="rc:PE-slw_deck_1@rear_external_right"/>
<EntranceSetting>lockedShut</EntranceSetting>
</DeckEntranceAssignment>
<PassengerBoardingPositionAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="4">
<Name>Short platform means F03 (buffet car) doors cannot be used</Name>
<BoardingUse>false</BoardingUse>
<AlightingUse>false</AlightingUse>
Expand All @@ -5034,8 +5029,8 @@ The train reverse in the station and departs, oriented backwards to the right
<PositionOfTrainElement>4</PositionOfTrainElement>
<IsAllowed>false</IsAllowed>
<EntranceToVehicle>Move to front 2 carriages to access platfrom</EntranceToVehicle>
</TrainStopAssignment>
<TrainStopAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="6">
</PassengerBoardingPositionAssignment>
<PassengerBoardingPositionAssignment version="any" id="rc:TSA-rail_sleeper_train_1" order="6">
<Name>Short platform means F04 (sleeper wagon) doors cannot be used</Name>
<BoardingUse>false</BoardingUse>
<AlightingUse>false</AlightingUse>
Expand All @@ -5047,8 +5042,8 @@ The train reverse in the station and departs, oriented backwards to the right
<PositionOfTrainElement>5</PositionOfTrainElement>
<IsAllowed>false</IsAllowed>
<EntranceToVehicle>Move to front 2 carriages to access platfrom</EntranceToVehicle>
</TrainStopAssignment>
</trainElements>
</PassengerBoardingPositionAssignment>
</passengerBoardingPositionAssignments>
</PassengerStopAssignment>
</stopAssignments>
</ServiceFrame>
Expand Down
1 change: 1 addition & 0 deletions examples/functions/fares/rail/Netex_era_distance_ro.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7822,6 +7822,7 @@ c
<SalesTransaction version="any" id="tfc_t:ANONYMOUS@trans12345001">
<Description>Single Ticket - Bucharest North to Buzau, first class, adult, bought at ticket machine, issued as paper ticket </Description>
<Date>2018-07-08T01:07:00</Date>
<IsValid>true</IsValid>
<TypeOfFareContractEntryRef ref="eura:product_purchase"/>
<Amount>36.30</Amount>
<PriceUnitRef ref="eura:Kilometres"/>
Expand Down
10 changes: 8 additions & 2 deletions examples/functions/newModes/NewModes-CarClubExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@
</ContactDetails>
<ContactType>information</ContactType>
</Contact>
<Contact id="contact1" version="any">
<ContactDetails>
<Phone>+41 1 800 80 80</Phone>
</ContactDetails>
</Contact>
</contacts>
<organisations>
<!-- ==== ORGANISATIONS ==== -->
Expand Down Expand Up @@ -374,6 +379,7 @@
<members>
<Vehicle version="any" id="car_01">
<OperatorRef version="any" ref="coc:MCR"/>
<ContactRef ref="contact1" version="any"/>
<SimpleVehicleTypeRef version="any" ref="small_car"/>
<VehicleModelRef version="any" ref="mini_whiz"/>
<CarModelProfileRef version="any" ref="model_a"/>
Expand Down Expand Up @@ -507,9 +513,9 @@
<Name>Qualified driver</Name>
<UserType>adult</UserType>
<MinimumAge>18</MinimumAge>
<typesOfProofRequiredRef>
<typesOfProofAcceptedRef>
<TypeOfProofRef versionRef="external" ref="driving_licence"/>
</typesOfProofRequiredRef>
</typesOfProofAcceptedRef>
</UserProfile>
</limitations>
</GenericParameterAssignment>
Expand Down
3 changes: 3 additions & 0 deletions examples/functions/newModes/NewModes-CarPoolingExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
<Name>Adult</Name>
<UserType>adult</UserType>
<MinimumAge>16</MinimumAge>
<typesOfProofAcceptedRef>
<TypeOfProofRef versionRef="external" ref="id"/>
</typesOfProofAcceptedRef>
<SmokingAllowed>true</SmokingAllowed>
<PetsAllowed>true</PetsAllowed>
<DetourAccepted>false</DetourAccepted>
Expand Down
Loading

0 comments on commit 8b3ccad

Please sign in to comment.