Skip to content

Commit

Permalink
Seating Plan Seat Context changes
Browse files Browse the repository at this point in the history 
Changes from Netex meeting
(a) Remove hasTray
(b) Add blankRowEndNoAisle to seat context
(c) Update example
  • Loading branch information
@nick-knowles
nick-knowles committed Dec 11, 2024
1 parent d21722b commit a9d32de
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 56 deletions.
90 changes: 47 additions & 43 deletions examples/functions/deckPlans/DeckPlans-Example_train.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,46 +86,46 @@ Seats 13-36 Enter by forward door
|@@ A B C D @@@@ @| |@@ A B C @@@@ @|
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@:::::::::@|
|@ 01 [seat] @ @| |@ 01 [bed] @ @| r01 backwards
|@ Compartment 1 \ @| |@ Compartment 1 \ @|
|@ 1st Class @ @| |@ 1st Class @ @|
|> Compartment 1 \ <| |> Compartment 1 \ <|
|> 1st Class @ <| |> 1st Class @ <|
|@ 02 [seat] @ r02 @| |@ 02 [bed] @ @| r02 forwards
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @|
|@ 03 [seat] @ r03 @| |@ 03 [bed] @ @| r03 backwards
|@ Compartment 2 \ @| |@ Compartment 2 \ @|
|@ 1st Class @ @| |@ 1st Class @ @|
|> Compartment 2 \ <| |> Compartment 2 \ @|
|> 1st Class @ <| |> 1st Class @ <|
|@ 04 [seat] @ r04 @| |@ 04 [bed] @ @| r04 forwards
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @|
|@ 05 06 07 (08) @ r05 @| |@ 05 06 07 xx @ @| r05 backwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@ Compartment 3 \ @| |@ Compartment 3 \ @|
|@ 2nd Class @ @| |@ 2nd Class @ @|
|> Compartment 3 \ <| |> Compartment 3 \ <|
|> 2nd Class @ <| |> 2nd Class @ <|
|@ 09 10 11 (12) @ r06 @| |@ 09 10 11 xx @ @| r06 forwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @|
|@ 13 14 15 (16) @ r07 @| |@ 13 14 15 xx @ @| r07 backwards
|@ [seats] @ @| |@[bed] bed][bed]@ @|
|@ Compartment 4 \ @| |@ Compartment 4 \ @|
|@ 2nd Class @ @| |@ 2nd Class @ @|
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|> Compartment 4 \ <| |> Compartment 4 \ <|
|> 2nd Class @ <| |> 2nd Class @ <|
|@ 17 18 19 (20) @ r08 @| |@ 17 18 19 xx @ @| r08 forwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @|
|@ 21 22 23 (24) @ r09 @| |@ 21 22 23 xx @ @| r09 backwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@ Compartment 5 \ @| |@ Compartment 5 \ @|
|@ 2nd Class @ @| |@ 2nd Class @ @|
|> Compartment 5 \ <| |> Compartment 5 \ <|
|> 2nd Class @ <| |> 2nd Class @ <|
|@ 25 26 27 (28) @ r10 @| |@ 25 26 27 xx @ @| r10 forwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @|
|@ 29 30 31 (32) @ r11 @| |@ 29 30 31 xx @ @| r11 backwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@ Compartment 6 \ @| |@ Compartment 6 \ @@|
|@ 2nd Class @ @| |@ 2nd Class @ @|
|> Compartment 6 \ <| |> Compartment 6 \ <|
|> 2nd Class @ <| |> 2nd Class @ <|
|@ 33 34 35 (36) @ r12 @| |@ 33 34 35 xx @ @| r12 forwards
|@ [seats] @ @| |@[bed] bed][bed] @ @|
|@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@:::::::::@|
|@ \ @|
|@ Luggage van / @|
|@ [cycles] @ @|
|@ Luggage van / <|
|@ [cycles] @ <|
|@ C01 C02 C03 @ @|
@@@@@@@@@@@@@@@@@@@ @|
|@ [Bin] @|
Expand Down Expand Up @@ -154,56 +154,56 @@ Seats 13-36 Enter by forward door
|@ Seating @|
|@@@@@@@@@@@ @@@@@@@@@@@|
|@ A B C D @|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 01 + 02 + + 03 + 04 @| r01 forwards
|@++++++++++ ++++++++++@|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 05 + 06 + + 07 + 08 @| r02 forwards
|@++++++++++ ++++++++++@|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 09 + 10 + + 11 + 12 @| r03 forwards
|@++++++++++ ++++++++++@|
|@>::::::::+ +:::::::::<|
|@ 13 + 14 + + 15 + 16 @| r04 backwards
|@+[table]++ ++[table]+@|
|@>[table]++ ++[table]<@|
|@ 17 + 18 + + 19 + 20 @| r05 forwards
|@++++++++++ ++++++++++@|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 21 + 22 + + 23 + 24 @| r06 forwards
|@++++++++++ ++++++++++@| ==========
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 25 + 26 + + 27 + 28 @| r07 forwards
|@++++++++++ ++++++++++@|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 29 + 30 + + 31 + 32 @| r08 forwards
|@++++++++++ ++++++++++@|
|@:::::::::+ +:::::::::@|
|@>::::::::+ +:::::::::<|
|@ 33 + 34 + + 35 + 36 @| r09 forwards
|@++++++++++ ++++++++++@|
|@ 37 + 38 + + 39 + 40 @| r10 backwards
|+[table]++ ++[table]+@|
|>[table]++ ++[table]+<|
|@ 41 + 42 + + 43 + 44 @| r11 forwards
|@@+++++++++/:::::\@@@@@@@@@@@|
|@ 45 46 + @| r12 backwards
|@ [foldup] @|
|@ [Wheelchair] @|
|@@@@@@@@@@@@@@@:::::::::::::@|
|@ ::@ @|
|@ ::@ ::::@|
|@ ::@ ::::<|
|@ Galley \ ++++@|
|@ \ SNACK ++++@|
|@ ::@ TABLES::::@|
|@ ::@ ::::@|
|@ ::@ TABLES::::<|
|@ ::@ ::::<|
|@@:::::::::@@@@@ ++++@|
|@ ::@ ++++@|
|@ ::@ ::::@|
|@ ::@ ::::@|
|@ ::@ ::::<|
|@ ::@ ::::<|
|@ ::@ ++++@|
|@ BUFFET ::@ ++++@|
|@ ::@ ::::@|
|@ ::@ ::::@|
|@ ::@ ::::<|
|@ ::@ ::::<|
|@ ::@ ++++@|
|@ ::@ ++++@|
|@ ::@ ::::@|
|@ ::@ ::::<|
|@@@@@@@@@@@@@@@@ ++++@|
|@ [Bin] @@@@@@|
/ Entrance ENtrance\
Expand Down Expand Up @@ -3620,25 +3620,29 @@ The train reverse in the station and departs, oriented backwards to the right
<TableType>fixedFlat</TableType>
<HasPower>true</HasPower>
</PassengerSpot>
<!-- Row 06 for 21-24 (forward facing) with fold down table -->
<!-- etc etc -->
<!-- Row 12, for 46 , 47 or one wheelchair -->
<!-- Row 12, for 45 , 46 or one wheelchair -->
<PassengerSpot version="any" id="rc:PSp-bfc_deck_1@seating_area@row_12_col_A">
<Label>46</Label>
<validityConditions>
<ValidityConditionRef versionRef="EXTERNAL" ref="seatDown"/>
</validityConditions>
<Label>45</Label>
<Orientation>forwards</Orientation>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="rc:AVE-bfc_deck_1@seating_area@row_12_col_A@seat">
<validityConditions>
<ValidityConditionRef version="any" ref="rc:VC-as_fold_down_seat"/>
</validityConditions>
<SeatEquipmentRef version="any" ref="rc:SEq-standard_chair"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
<SpotRowRef version="any" ref="rc:SR-bfc_deck_1@row_06"/>
<SpotColumnRef version="any" ref="rc:SC-bfc_deck_1@col_A"/>
<SeatContext>byWindowNoAisle</SeatContext>
<TableType>fixedFlat</TableType>
<HasPower>true</HasPower>
<SeatContext>blankRowEndNoAisle</SeatContext>
<TableType>none</TableType>
<HasPower>false</HasPower>
</PassengerSpot>
<PassengerSpot version="any" id="rc:PSp-bfc_deck_1@seating_area@row_12_col_B">
<Label>47</Label>
<Label>46</Label>
<Orientation>forwards</Orientation>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="rc:AVE-bfc_deck_1@seating_area@row_12_col_B@seat">
Expand All @@ -3657,8 +3661,8 @@ The train reverse in the station and departs, oriented backwards to the right
<SpotRowRef version="any" ref="rc:SR-bfc_deck_1@row_06"/>
<SpotColumnRef version="any" ref="rc:SC-bfc_deck_1@col_B"/>
<SeatContext>byAisleNoWindow</SeatContext>
<TableType>fixedFlat</TableType>
<HasPower>true</HasPower>
<TableType>none</TableType>
<HasPower>false</HasPower>
</PassengerSpot>
</passengerSpots>
</PassengerSpace>
Expand Down
24 changes: 19 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
<Date>
<Created>2023-02-02</Created>
</Date>
<Date><Modified>2023-02-05</Modified>
<Date>
<Modified>2023-02-05</Modified>
Name Space changes
</Date>
<Date><Modified>2023-12-08</Modified>Move SENSOR IN SPOT declarations to here
<Date>
<Modified>2023-12-08</Modified>Move SENSOR IN SPOT declarations to here
</Date>
<Date><Modified>2024-01-17</Modified>Add bed to locatable spot type enumerations
<Date>
<Modified>2024-01-17</Modified>Add bed to locatable spot type enumerations
</Date>
<Date><Modified>2024-02-18</Modified>Norway review comment - Revise Aisle /Window to use enumeration.
<Date>
<Modified>2024-02-18</Modified>Norway review comment - Revise Aisle /Window to use enumeration.
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -391,7 +395,12 @@
</xsd:enumeration>
<xsd:enumeration value="inMiddle">
<xsd:annotation>
<xsd:documentation>Spot is in middle, i.e. not next to aisle or a window.</xsd:documentation>
<xsd:documentation>Spot is in middle, i.e. not next to aisle or a window with seat either side.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="blankRowEndNoAisle">
<xsd:annotation>
<xsd:documentation>Row is not next to aisle or a window e.g. at row end next to wall. </xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="unknown"/>
Expand Down Expand Up @@ -436,6 +445,11 @@
<xsd:annotation>
<xsd:documentation>Other type of table.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="unknown">
<xsd:annotation>
<xsd:documentation>Unknown whether there is table.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
Expand Down
17 changes: 9 additions & 8 deletions xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@
<Date>
<Created>2023-01-30</Created>
</Date>
<Date><Modified>2023-01-30</Modified>
<Date>
<Modified>2023-01-30</Modified>
Name Space changes
</Date>
<Date><Modified>2023-12-08</Modified>Move SENSOR IN SPOT declarations to here
<Date>
<Modified>2023-12-08</Modified>Move SENSOR IN SPOT declarations to here
</Date>
<Date>
<Modified>2024-02-18</Modified>Norway review comment - Revise AIsle /Window to use enumeration. Add TableType enum.
</Date>
<Date><Modified>2024-02-18</Modified>Norway review comment - Revise AIsle /Window to use enumeration. Add TableType enum.
<Date>
<Modified>2024-12-10</Modified>Drop has Tray , and noaislatRow end to seat context.
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -402,11 +408,6 @@
<xsd:documentation>Leg space available.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HasTray" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether PASSENGER SPOT has a tray.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HasPower" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether PASSENGER SPOT has a power socket.</xsd:documentation>
Expand Down

0 comments on commit a9d32de

Please sign in to comment.