diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 922d86dcb..4acc8943b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -3,13 +3,13 @@ @@ -104,8 +104,8 @@ 2023-01-01T00:00:00 2023-12-31T12:00:00 - Deck Plan Example - This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + Deck Plan Example + This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seats, an entrance and sensor equipment. @@ -427,8 +427,8 @@ - + true + true @@ -440,10 +440,11 @@ - + true + true + + true + true @@ -467,9 +468,10 @@ - + true + true + --> @@ -481,22 +483,21 @@ - + true + true - + rightwards - 1 - + - + true + true @@ -509,8 +510,22 @@ - + true + true + + + + rightwards + + + 1 + + + + + + true + true @@ -523,11 +538,11 @@ - + true + false - + forwards @@ -536,8 +551,8 @@ - + false + true @@ -549,8 +564,8 @@ - + false + true @@ -562,8 +577,8 @@ - + true + false @@ -576,11 +591,11 @@ - + true + false - + forwards @@ -589,8 +604,8 @@ - + false + true @@ -602,8 +617,8 @@ - + false + true @@ -615,8 +630,8 @@ - + true + false @@ -629,11 +644,11 @@ - + true + false - + forwards @@ -642,8 +657,8 @@ - + false + true @@ -655,8 +670,8 @@ - + false + true @@ -668,8 +683,8 @@ - + true + false @@ -682,8 +697,8 @@ - + true + false @@ -695,8 +710,9 @@ - + false + false + true @@ -708,8 +724,10 @@ - + false + false + true + true @@ -721,8 +739,9 @@ - + false + false + true @@ -734,8 +753,8 @@ - + true + false @@ -853,7 +872,7 @@ Upper Deck - + @@ -872,7 +891,7 @@ false - ENtrance to top of stairs + Entrance to top of stairs 0.80 2.00 internal @@ -891,10 +910,10 @@ - + forwards - + @@ -905,14 +924,14 @@ - + true + false - + forwards - + @@ -923,14 +942,14 @@ - + false + true - + forwards - + @@ -941,14 +960,14 @@ - + false + true - + forwards - + @@ -959,15 +978,15 @@ - + true + false - + forwards - + @@ -978,14 +997,14 @@ - + true + false - + forwards - + @@ -996,14 +1015,14 @@ - + false + true - + forwards - + @@ -1014,14 +1033,14 @@ - + false + true - + forwards - + @@ -1032,15 +1051,15 @@ - + true + false - + forwards - + @@ -1051,14 +1070,14 @@ - + true + false - + forwards - + @@ -1069,14 +1088,14 @@ - + false + true - + forwards - + @@ -1087,14 +1106,14 @@ - + false + true - + forwards - + @@ -1105,15 +1124,15 @@ - + true + false - + forwards - + @@ -1124,14 +1143,14 @@ - + true + false - + forwards - + @@ -1142,15 +1161,15 @@ - + false + true - + forwards - + @@ -1161,14 +1180,14 @@ - + true + false - + forwards - + @@ -1179,15 +1198,15 @@ - + false + true - + forwards - + @@ -1198,14 +1217,14 @@ - + true + false - + forwards - + @@ -1216,14 +1235,14 @@ - + false + true - + forwards - + @@ -1234,14 +1253,14 @@ - + false + true - + forwards - + @@ -1252,15 +1271,15 @@ - + true + false - + forwards - + @@ -1271,14 +1290,14 @@ - + true + false - + forwards - + @@ -1289,14 +1308,14 @@ - + false + true - + forwards - + @@ -1307,14 +1326,14 @@ - + false + true - + forwards - + @@ -1325,15 +1344,15 @@ - + true + false - + forwards - + @@ -1344,14 +1363,14 @@ - + true + false - + forwards - + @@ -1362,14 +1381,14 @@ - + false + true - + forwards - + @@ -1380,14 +1399,14 @@ - + false + true - + forwards - + @@ -1398,15 +1417,15 @@ - + true + false - + forwards - + @@ -1417,14 +1436,14 @@ - + true + false - + forwards - + @@ -1435,14 +1454,14 @@ - + false + true - + forwards - + @@ -1453,14 +1472,14 @@ - + false + true - + forwards - + @@ -1471,15 +1490,15 @@ - + true + false forwards - + @@ -1490,14 +1509,14 @@ - + true + false forwards - + @@ -1508,14 +1527,15 @@ - + false + false + true forwards - + @@ -1526,14 +1546,16 @@ - + false + false + true + true forwards - + @@ -1544,14 +1566,15 @@ - + false + false + true forwards - + @@ -1562,8 +1585,8 @@ - + true + false diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index ecd70d891..ea2294532 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -3,21 +3,21 @@ @@ -538,7 +538,8 @@ Lower deck - byAisleAndWindow + true + true @@ -550,7 +551,8 @@ Lower deck - byAisleAndWindow + true + true @@ -563,7 +565,8 @@ Lower deck - byAisleAndWindow + true + true @@ -575,7 +578,8 @@ Lower deck - byAisleAndWindow + true + true @@ -588,7 +592,8 @@ Lower deck - byAisleAndWindow + true + true @@ -605,7 +610,8 @@ Lower deck - byAisleAndWindow + true + true @@ -618,7 +624,8 @@ Lower deck - byAisleAndWindow + true + true @@ -631,7 +638,8 @@ Lower deck - byAisleAndWindow + true + true @@ -644,7 +652,8 @@ Lower deck - byAisleNoWindow + false + true @@ -656,7 +665,8 @@ Lower deck - byAisleNoWindow + false + true @@ -668,7 +678,8 @@ Lower deck - byAisleNoWindow + false + true @@ -680,7 +691,8 @@ Lower deck - byWindowNoAisle + true + false @@ -693,10 +705,11 @@ Lower deck - byWindowNoAisle + true + false - + forwards @@ -705,7 +718,8 @@ Lower deck - byAisleNoWindow + false + true @@ -717,7 +731,8 @@ Lower deck - byAisleNoWindow + false + true @@ -729,7 +744,8 @@ Lower deck - byWindowNoAisle + true + false @@ -742,10 +758,11 @@ Lower deck - byWindowNoAisle + true + false - + forwards @@ -754,7 +771,8 @@ Lower deck - byAisleNoWindow + false + true @@ -766,7 +784,8 @@ Lower deck - byAisleNoWindow + false + true @@ -778,7 +797,8 @@ Lower deck - byWindowNoAisle + true + false @@ -791,7 +811,8 @@ Lower deck - byWindowNoAisle + true + false @@ -803,7 +824,9 @@ Lower deck - inMiddleNoWindow + false + false + true @@ -815,7 +838,10 @@ Lower deck - inMiddleAisleInFront + false + false + true + true @@ -827,7 +853,9 @@ Lower deck - inMiddleNoWindow + false + false + true @@ -839,7 +867,8 @@ Lower deck - byWindowNoAisle + true + false @@ -1056,10 +1085,10 @@ Lower deck - + forwards - + @@ -1070,13 +1099,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1087,13 +1117,14 @@ Lower deck - byAisleAndWindow + true + true - + forwards - + @@ -1104,13 +1135,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1121,14 +1153,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1139,13 +1172,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1156,13 +1190,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1173,13 +1208,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1190,14 +1226,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1208,13 +1245,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1225,13 +1263,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1242,13 +1281,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1259,14 +1299,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1277,13 +1318,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1294,14 +1336,15 @@ Lower deck - byAisleAndWindow + true + true - + forwards - + @@ -1312,13 +1355,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1329,14 +1373,15 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1347,13 +1392,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1364,13 +1410,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1381,13 +1428,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1398,14 +1446,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1416,13 +1465,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1433,13 +1483,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1450,13 +1501,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1467,14 +1519,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1485,13 +1538,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1502,13 +1556,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1519,13 +1574,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1536,14 +1592,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1554,13 +1611,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1571,13 +1629,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1588,13 +1647,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1605,14 +1665,15 @@ Lower deck - byWindowNoAisle + true + false forwards - + @@ -1623,13 +1684,14 @@ Lower deck - byWindowNoAisle + true + false forwards - + @@ -1640,13 +1702,15 @@ Lower deck - inMiddleNoWindow + false + false + true forwards - + @@ -1657,13 +1721,16 @@ Lower deck - inMiddleAisleInFront + false + false + true + true forwards - + @@ -1674,13 +1741,15 @@ Lower deck - inMiddleNoWindow + false + false + true forwards - + @@ -1691,7 +1760,8 @@ Lower deck - byWindowNoAisle + true + false diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index a927e48c3..02018193b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -2,46 +2,46 @@ @@ -1327,9 +1328,10 @@ The train reverse in the station and departs, oriented backwards to the right seat - byAisleAndWindow fixedFlat true + true + true @@ -1427,8 +1429,9 @@ The train reverse in the station and departs, oriented backwards to the right seat - byAisleAndWindow true + true + true @@ -1448,7 +1451,8 @@ The train reverse in the station and departs, oriented backwards to the right seat - byAisleAndWindow + true + true @@ -1530,9 +1534,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -1554,8 +1559,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1577,8 +1583,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1594,8 +1601,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -1617,9 +1625,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -1640,8 +1649,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1662,8 +1672,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1679,8 +1690,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -1758,9 +1770,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -1781,8 +1794,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1803,8 +1817,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1820,8 +1835,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -1843,9 +1859,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -1866,8 +1883,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1888,8 +1906,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -1905,8 +1924,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -1984,9 +2004,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -2007,8 +2028,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2029,8 +2051,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2046,8 +2069,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -2069,9 +2093,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -2092,8 +2117,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2114,8 +2140,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2131,8 +2158,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -2210,9 +2238,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -2233,8 +2262,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2255,8 +2285,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2272,8 +2303,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -2295,9 +2327,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -2318,8 +2351,9 @@ The train reverse in the station and departs, oriented backwards to the right - inMiddleNoWindow true + false + true @@ -2340,8 +2374,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -2357,8 +2392,9 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow true + false + true @@ -3165,9 +3201,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle none true + true + false @@ -3179,9 +3216,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow none true + false + true @@ -3193,9 +3231,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow none true + false + true @@ -3207,9 +3246,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle none true + true + false @@ -3222,9 +3262,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3236,9 +3277,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3250,9 +3292,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3264,9 +3307,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3279,9 +3323,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3293,9 +3338,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3307,9 +3353,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3321,9 +3368,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3336,9 +3384,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3350,9 +3399,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3364,9 +3414,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3378,9 +3429,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3393,9 +3445,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3407,9 +3460,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3421,9 +3475,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3435,9 +3490,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3450,9 +3506,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3464,9 +3521,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3478,9 +3536,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3492,9 +3551,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3507,9 +3567,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3521,9 +3582,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3535,9 +3597,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow seatBackFolding true + false + true @@ -3549,9 +3612,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle seatBackFolding true + true + false @@ -3564,9 +3628,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3578,9 +3643,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3592,9 +3658,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3606,9 +3673,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3621,9 +3689,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3635,9 +3704,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3649,9 +3719,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow fixedFlat true + false + true @@ -3663,9 +3734,10 @@ The train reverse in the station and departs, oriented backwards to the right - byWindowNoAisle fixedFlat true + true + false @@ -3684,9 +3756,11 @@ The train reverse in the station and departs, oriented backwards to the right - rowEndNoWindowNoAisle none false + false + false + true @@ -3707,9 +3781,10 @@ The train reverse in the station and departs, oriented backwards to the right - byAisleNoWindow none false + false + true diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index 98a652a23..f1171e743 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -578,9 +578,10 @@ - byWindowNoAisle none true + true + false @@ -592,9 +593,10 @@ - byAisleNoWindow none true + false + true @@ -606,9 +608,10 @@ - byAisleNoWindow none true + false + true @@ -620,9 +623,10 @@ - byWindowNoAisle none true + true + false @@ -635,9 +639,10 @@ - byWindowNoAisle none true + true + false @@ -649,9 +654,10 @@ - byAisleNoWindow none true + false + true @@ -663,9 +669,10 @@ - byAisleNoWindow none true + false + true @@ -677,9 +684,10 @@ - byAisleAndWindow none true + true + true @@ -692,9 +700,10 @@ - byWindowNoAisle none true + true + false @@ -706,9 +715,10 @@ - byAisleNoWindow none true + false + true @@ -720,9 +730,10 @@ - byAisleNoWindow none true + false + true @@ -734,9 +745,10 @@ - byWindowNoAisle none true + true + false @@ -749,9 +761,10 @@ - byWindowNoAisle none true + true + false @@ -763,9 +776,10 @@ - byAisleNoWindow none true + false + true @@ -777,9 +791,10 @@ - byAisleNoWindow none true + false + true @@ -791,9 +806,10 @@ - byWindowNoAisle none true + true + false @@ -806,9 +822,10 @@ - byWindowNoAisle none true + true + false @@ -820,9 +837,10 @@ - byAisleNoWindow none true + false + true @@ -834,9 +852,10 @@ - byAisleNoWindow none true + false + true @@ -848,9 +867,10 @@ - byWindowNoAisle none true + true + false @@ -863,9 +883,10 @@ - byWindowNoAisle fixedFlat true + true + false @@ -877,9 +898,10 @@ - byAisleNoWindow fixedFlat true + false + true @@ -891,9 +913,10 @@ - byAisleNoWindow fixedFlat true + false + true @@ -905,9 +928,10 @@ - byWindowNoAisle fixedFlat true + true + false @@ -920,9 +944,10 @@ - byWindowNoAisle fixedFlat true + true + false @@ -934,9 +959,10 @@ - byAisleNoWindow fixedFlat true + false + true @@ -948,9 +974,10 @@ - byAisleNoWindow fixedFlat true + false + true @@ -962,9 +989,10 @@ - byWindowNoAisle fixedFlat true + true + false @@ -977,9 +1005,10 @@ - byWindowNoAisle none true + true + false @@ -991,9 +1020,10 @@ - byAisleNoWindow none true + false + true @@ -1005,9 +1035,10 @@ - byAisleNoWindow none true + false + true @@ -1019,9 +1050,10 @@ - byWindowNoAisle none true + true + false @@ -1034,9 +1066,10 @@ - byWindowNoAisle none true + true + false @@ -1048,9 +1081,10 @@ - byAisleNoWindow none true + false + true @@ -1062,9 +1096,10 @@ - byAisleNoWindow none true + false + true @@ -1076,9 +1111,10 @@ - byWindowNoAisle none true + true + false @@ -1091,9 +1127,10 @@ - byWindowNoAisle none true + true + false @@ -1105,9 +1142,10 @@ - byAisleNoWindow none true + false + true @@ -1119,9 +1157,10 @@ - byAisleNoWindow none true + false + true @@ -1133,9 +1172,10 @@ - byWindowNoAisle none true + true + false @@ -1148,9 +1188,10 @@ - byWindowNoAisle none true + true + false @@ -1162,9 +1203,10 @@ - byAisleNoWindow none true + false + true @@ -1176,9 +1218,10 @@ - byAisleNoWindow none true + false + true @@ -1190,9 +1233,10 @@ - byWindowNoAisle none true + true + false @@ -1205,9 +1249,10 @@ - byWindowNoAisle none true + true + false @@ -1219,9 +1264,10 @@ - byAisleNoWindow none true + false + true @@ -1233,9 +1279,10 @@ - byAisleNoWindow none true + false + true @@ -1247,9 +1294,10 @@ - byWindowNoAisle none true + true + false @@ -1262,9 +1310,10 @@ - byWindowNoAisle none true + true + false @@ -1276,9 +1325,10 @@ - byAisleNoWindow none true + false + true @@ -1290,9 +1340,10 @@ - byAisleNoWindow none true + false + true @@ -1304,9 +1355,10 @@ - byWindowNoAisle none true + true + false @@ -1319,9 +1371,10 @@ - byWindowNoAisle none true + true + false @@ -1333,9 +1386,10 @@ - byAisleNoWindow none true + false + true @@ -1347,9 +1401,10 @@ - byAisleNoWindow none true + false + true @@ -1361,9 +1416,10 @@ - byWindowNoAisle none true + true + false @@ -1376,9 +1432,10 @@ - byWindowNoAisle none true + true + false @@ -1390,9 +1447,10 @@ - byAisleNoWindow none true + false + true @@ -1404,9 +1462,10 @@ - byAisleNoWindow none true + false + true @@ -1418,9 +1477,10 @@ - byWindowNoAisle none true + true + false @@ -1433,9 +1493,10 @@ - byWindowNoAisle seatBackFolding true + true + false @@ -1447,9 +1508,10 @@ - byAisleNoWindow seatBackFolding true + false + true @@ -1461,9 +1523,10 @@ - byAisleNoWindow seatBackFolding true + false + true @@ -1475,9 +1538,10 @@ - byWindowNoAisle seatBackFolding true + true + false @@ -1490,9 +1554,10 @@ - byWindowNoAisle seatBackFolding true + true + false @@ -1504,9 +1569,10 @@ - byAisleNoWindow seatBackFolding true + false + true @@ -1518,9 +1584,10 @@ - byAisleNoWindow seatBackFolding true + false + true @@ -1532,9 +1599,10 @@ - byWindowNoAisle seatBackFolding true + true + false @@ -1547,9 +1615,10 @@ - byWindowNoAisle none true + true + false @@ -1561,9 +1630,10 @@ - byAisleNoWindow none true + false + true @@ -1575,9 +1645,10 @@ - byAisleNoWindow none true + false + true @@ -1589,9 +1660,10 @@ - byWindowNoAisle none true + true + false @@ -1604,9 +1676,10 @@ - byWindowNoAisle none true + true + false @@ -1618,9 +1691,10 @@ - byAisleNoWindow none true + false + true @@ -1632,9 +1706,10 @@ - byAisleNoWindow none true + false + true @@ -1646,9 +1721,10 @@ - byWindowNoAisle none true + true + false @@ -1661,9 +1737,10 @@ - byWindowNoAisle none true + true + false @@ -1675,9 +1752,10 @@ - byAisleNoWindow none true + false + true @@ -1689,9 +1767,10 @@ - byAisleNoWindow none true + false + true @@ -1703,9 +1782,10 @@ - byWindowNoAisle none true + true + false diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index f7f68c574..ddf73ec81 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -370,42 +370,6 @@ - - - - Allowed values for Seat Context. - - - - - Spot is next to an aisle (but not a window). - - - - - Spot is next to a window (but not an aisle). - - - - - Spot is next to an aisle and a window. - - - - - Spot is in middle, i.e. not next to aisle or a window with seat either side. - - - - - - - Row is not next to aisle or a window e.g. at row end next to wall. - - - - - Allowed values for Type of Table. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 9a77548bb..7f3072236 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -390,11 +390,6 @@ Elements for a PASSENGER SPOT. - - - Whether PASSENGER SPOT is by an Aisle, window, etc. - - Whether PASSENGER SPOT faces table. @@ -410,11 +405,46 @@ Leg space available. - + Whether PASSENGER SPOT has a power socket. + + + Whether PASSENGER SPOT is near a window. + + + + + Whether PASSENGER SPOT is next to an aisle. + + + + + Whether PASSENGER SPOT is between two seats, i.e. not next to aisle or a window with seat on either side. + + + + + Whether PASSENGER SPOT is in the front row. + + + + + Whether PASSENGER SPOT is in the end row, next to a wall. + + + + + Whether PASSENGER SPOT is facing a window. + + + + + Whether PASSENGER SPOT is facing an aisle. + +