From 1faa5acab1a1cad23b0bbdf62e09a3c6f0b77951 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:00:36 +0200 Subject: [PATCH 01/20] Update netex_seatingPlan_support.xsd --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index f7f68c574..3700d3ffd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -373,7 +373,7 @@ - Allowed values for Seat Context. + Allowed values for Seat Context. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 From b36355e91098e50c30dffb246bd26690daba6ff5 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:01:47 +0200 Subject: [PATCH 02/20] Update netex_seatingPlan_version.xsd --- .../netex_seatingPlan_version.xsd | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 9a77548bb..512c8f674 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -391,8 +391,7 @@ - - Whether PASSENGER SPOT is by an Aisle, window, etc. + Whether PASSENGER SPOT is by an Aisle, window, etc. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 @@ -415,6 +414,41 @@ 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 in the middle, 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. + + From 13e53b3a46eda0e10210c42ec581f90beb4802e0 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:02:51 +0200 Subject: [PATCH 03/20] Update DeckPlans-Example.xml --- .../functions/deckPlans/DeckPlans-Example.xml | 443 +++++++++--------- 1 file changed, 230 insertions(+), 213 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 922d86dcb..8d6d411a0 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,8 @@ - + false + false @@ -708,8 +723,9 @@ - + false + false + true @@ -721,8 +737,8 @@ - + false + false @@ -734,8 +750,8 @@ - + true + false @@ -853,7 +869,7 @@ Upper Deck - + @@ -872,7 +888,7 @@ false - ENtrance to top of stairs + Entrance to top of stairs 0.80 2.00 internal @@ -891,10 +907,10 @@ - + forwards - + @@ -905,14 +921,14 @@ - + true + false - + forwards - + @@ -923,14 +939,14 @@ - + false + true - + forwards - + @@ -941,14 +957,14 @@ - + false + true - + forwards - + @@ -959,15 +975,15 @@ - + true + false - + forwards - + @@ -978,14 +994,14 @@ - + true + false - + forwards - + @@ -996,14 +1012,14 @@ - + false + true - + forwards - + @@ -1014,14 +1030,14 @@ - + false + true - + forwards - + @@ -1032,15 +1048,15 @@ - + true + false - + forwards - + @@ -1051,14 +1067,14 @@ - + true + false - + forwards - + @@ -1069,14 +1085,14 @@ - + false + true - + forwards - + @@ -1087,14 +1103,14 @@ - + false + true - + forwards - + @@ -1105,15 +1121,15 @@ - + true + false - + forwards - + @@ -1124,14 +1140,14 @@ - + true + false - + forwards - + @@ -1142,15 +1158,15 @@ - + false + true - + forwards - + @@ -1161,14 +1177,14 @@ - + true + false - + forwards - + @@ -1179,15 +1195,15 @@ - + false + true - + forwards - + @@ -1198,14 +1214,14 @@ - + true + false - + forwards - + @@ -1216,14 +1232,14 @@ - + false + true - + forwards - + @@ -1234,14 +1250,14 @@ - + false + true - + forwards - + @@ -1252,15 +1268,15 @@ - + true + false - + forwards - + @@ -1271,14 +1287,14 @@ - + true + false - + forwards - + @@ -1289,14 +1305,14 @@ - + false + true - + forwards - + @@ -1307,14 +1323,14 @@ - + false + true - + forwards - + @@ -1325,15 +1341,15 @@ - + true + false - + forwards - + @@ -1344,14 +1360,14 @@ - + true + false - + forwards - + @@ -1362,14 +1378,14 @@ - + false + true - + forwards - + @@ -1380,14 +1396,14 @@ - + false + true - + forwards - + @@ -1398,15 +1414,15 @@ - + true + false - + forwards - + @@ -1417,14 +1433,14 @@ - + true + false - + forwards - + @@ -1439,10 +1455,10 @@ false --> - + forwards - + @@ -1453,14 +1469,14 @@ - + false + true - + forwards - + @@ -1471,15 +1487,15 @@ - + true + false forwards - + @@ -1490,14 +1506,14 @@ - + true + false forwards - + @@ -1508,14 +1524,14 @@ - + false + false forwards - + @@ -1526,14 +1542,15 @@ - + false + false + true forwards - + @@ -1544,14 +1561,14 @@ - + false + false forwards - + @@ -1562,8 +1579,8 @@ - + true + false From b9df2a5698077655d746c63b16316cc47d2d1ee5 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:03:10 +0200 Subject: [PATCH 04/20] Update DeckPlans-Example_bus.xml --- .../deckPlans/DeckPlans-Example_bus.xml | 355 ++++++++++-------- 1 file changed, 208 insertions(+), 147 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index ecd70d891..1762ab21a 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 @@ -605,7 +609,8 @@ Lower deck - byAisleAndWindow + true + true @@ -618,7 +623,8 @@ Lower deck - byAisleAndWindow + true + true @@ -631,7 +637,8 @@ Lower deck - byAisleAndWindow + true + true @@ -644,7 +651,8 @@ Lower deck - byAisleNoWindow + false + true @@ -655,8 +663,9 @@ Lower deck - - byAisleNoWindow + + false + true @@ -668,7 +677,8 @@ Lower deck - byAisleNoWindow + false + true @@ -680,7 +690,8 @@ Lower deck - byWindowNoAisle + true + false @@ -693,10 +704,11 @@ Lower deck - byWindowNoAisle + true + false - + forwards @@ -705,7 +717,8 @@ Lower deck - byAisleNoWindow + false + true @@ -717,7 +730,8 @@ Lower deck - byAisleNoWindow + false + true @@ -729,7 +743,8 @@ Lower deck - byWindowNoAisle + true + false @@ -742,10 +757,11 @@ Lower deck - byWindowNoAisle + true + false - + forwards @@ -754,7 +770,8 @@ Lower deck - byAisleNoWindow + false + true @@ -766,7 +783,8 @@ Lower deck - byAisleNoWindow + false + true @@ -778,7 +796,8 @@ Lower deck - byWindowNoAisle + true + false @@ -791,7 +810,8 @@ Lower deck - byWindowNoAisle + true + false @@ -803,7 +823,8 @@ Lower deck - inMiddleNoWindow + false + true @@ -815,7 +836,8 @@ Lower deck - inMiddleAisleInFront + true + true @@ -827,7 +849,8 @@ Lower deck - inMiddleNoWindow + false + true @@ -839,7 +862,8 @@ Lower deck - byWindowNoAisle + true + false @@ -1056,10 +1080,10 @@ Lower deck - + forwards - + @@ -1070,13 +1094,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1087,13 +1112,14 @@ Lower deck - byAisleAndWindow + true + true - + forwards - + @@ -1104,13 +1130,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1121,14 +1148,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1139,13 +1167,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1156,13 +1185,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1173,13 +1203,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1190,14 +1221,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1208,13 +1240,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1225,13 +1258,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1242,13 +1276,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1259,14 +1294,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1277,13 +1313,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1294,14 +1331,15 @@ Lower deck - byAisleAndWindow + true + true - + forwards - + @@ -1312,13 +1350,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1329,14 +1368,15 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1347,13 +1387,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1364,13 +1405,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1381,13 +1423,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1398,14 +1441,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1416,13 +1460,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1433,13 +1478,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1450,13 +1496,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1467,14 +1514,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1485,13 +1533,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1502,13 +1551,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1519,13 +1569,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1536,14 +1587,15 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1554,13 +1606,14 @@ Lower deck - byWindowNoAisle + true + false - + forwards - + @@ -1571,13 +1624,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1588,13 +1642,14 @@ Lower deck - byAisleNoWindow + false + true - + forwards - + @@ -1605,14 +1660,15 @@ Lower deck - byWindowNoAisle + true + false forwards - + @@ -1623,13 +1679,14 @@ Lower deck - byWindowNoAisle + true + false forwards - + @@ -1640,13 +1697,14 @@ Lower deck - inMiddleNoWindow + false + true forwards - + @@ -1657,13 +1715,14 @@ Lower deck - inMiddleAisleInFront + true + true forwards - + @@ -1674,13 +1733,14 @@ Lower deck - inMiddleNoWindow + false + true forwards - + @@ -1691,7 +1751,8 @@ Lower deck - byWindowNoAisle + true + false From 3847dbe340a8dc7d0af603b7accfea49d4483768 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:03:37 +0200 Subject: [PATCH 05/20] Update DeckPlans-Example_train.xml --- .../deckPlans/DeckPlans-Example_train.xml | 253 ++++++++++++------ 1 file changed, 164 insertions(+), 89 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index a927e48c3..1b9b30739 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 From 8cf77ac2d7a4136659ac9fc50098b5e9f2ea5a3b Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 27 May 2025 01:04:01 +0200 Subject: [PATCH 06/20] Update DeckPlans-Example_train_simple.xml --- .../DeckPlans-Example_train_simple.xml | 268 ++++++++++++------ 1 file changed, 174 insertions(+), 94 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index 98a652a23..3e367bbf1 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 + true + false + true @@ -620,9 +623,10 @@ - byWindowNoAisle none - true + true + true + false @@ -635,9 +639,10 @@ - byWindowNoAisle none - true + true + true + false @@ -649,9 +654,10 @@ - byAisleNoWindow none - true + true + false + true @@ -663,9 +669,10 @@ - byAisleNoWindow none - true + true + false + true @@ -677,9 +684,10 @@ - byAisleAndWindow none - true + true + true + true @@ -692,9 +700,10 @@ - byWindowNoAisle none - true + true + true + false @@ -706,9 +715,10 @@ - byAisleNoWindow none - true + true + false + true @@ -720,9 +730,10 @@ - byAisleNoWindow none - true + true + false + true @@ -734,9 +745,10 @@ - byWindowNoAisle none - true + true + true + false @@ -749,9 +761,10 @@ - byWindowNoAisle none - true + true + true + false @@ -763,9 +776,10 @@ - byAisleNoWindow none - true + true + false + true @@ -777,9 +791,10 @@ - byAisleNoWindow none - true + true + false + true @@ -791,9 +806,10 @@ - byWindowNoAisle none - true + 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 From f87d45c0e47aee60681f6154366ea3499c9e5fce Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 27 May 2025 08:16:34 +0200 Subject: [PATCH 07/20] Fix bug --- .../functions/deckPlans/DeckPlans-Example.xml | 4 +-- .../deckPlans/DeckPlans-Example_bus.xml | 2 +- .../DeckPlans-Example_train_simple.xml | 28 +++++++++---------- .../netex_seatingPlan_version.xsd | 3 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 8d6d411a0..45ab878b0 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -604,8 +604,8 @@ - false - true + false + true diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 1762ab21a..9b1b2a889 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -663,7 +663,7 @@ Lower deck - + false true diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index 3e367bbf1..36a733bb5 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -609,7 +609,7 @@ none - true + true false true @@ -624,7 +624,7 @@ none - true + true true false @@ -640,7 +640,7 @@ none - true + true true false @@ -655,7 +655,7 @@ none - true + true false true @@ -670,7 +670,7 @@ none - true + true false true @@ -685,7 +685,7 @@ none - true + true true true @@ -701,7 +701,7 @@ none - true + true true false @@ -716,7 +716,7 @@ none - true + true false true @@ -731,7 +731,7 @@ none - true + true false true @@ -746,7 +746,7 @@ none - true + true true false @@ -762,7 +762,7 @@ none - true + true true false @@ -777,7 +777,7 @@ none - true + true false true @@ -792,7 +792,7 @@ none - true + true false true @@ -807,7 +807,7 @@ none - true + true true false diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 512c8f674..9e889e3e8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -391,7 +391,8 @@ - Whether PASSENGER SPOT is by an Aisle, window, etc. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 + + Whether PASSENGER SPOT is by an Aisle, window, etc. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 From 17f070fd0a1a76fba306131fc343821993e4ad89 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 27 May 2025 08:22:01 +0200 Subject: [PATCH 08/20] Since deckplan was introduced in the next branch, it does not make sence to keep deprecated structures before there was even a release. --- .../deckPlans/DeckPlans-Example_bus.xml | 3 +- .../netex_seatingPlan_support.xsd | 36 ------------------- .../netex_seatingPlan_version.xsd | 5 --- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 9b1b2a889..6718efa08 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -592,7 +592,8 @@ Lower deck - byAisleAndWindow + true + true diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 3700d3ffd..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. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 - - - - - 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 9e889e3e8..62020c764 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. DEPRECATED: please use other booleans from the group to describe the seat context. -v2.0 - - Whether PASSENGER SPOT faces table. From cb62fa9df6776193d2d1c5de4bcd0257149bdaa9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 27 May 2025 11:29:47 +0200 Subject: [PATCH 09/20] Apply suggestions from code review --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 62020c764..865b6f603 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -435,12 +435,12 @@ 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. From 564dab1fa4f08d346f80944437e7ccccd6ad885b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 27 May 2025 11:30:45 +0200 Subject: [PATCH 10/20] Apply suggestions from code review --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 865b6f603..f4d599a96 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -422,7 +422,7 @@ - Whether PASSENGER SPOT is in the middle, i.e. not next to aisle or a window with seat on either side. + Whether PASSENGER SPOT is in the middle, i.e. not next to aisle or a window with seat on either side. From ba92a64fde7e5b2672fc475c2b19887f34f3f4a2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 27 May 2025 12:05:58 +0200 Subject: [PATCH 11/20] Fix HasAisleinFront in the examples too --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 6718efa08..201f6d594 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -838,7 +838,7 @@ Lower deck true - true + true @@ -1717,7 +1717,7 @@ Lower deck true - true + true From e5fc09e65deca035338c61aa1f6e396d31ea739b Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 30 May 2025 10:40:39 +0200 Subject: [PATCH 12/20] Change IsInMiddle netex_seatingPlan_version.xsd Change of IsInMiddle to BetweenSeats for better clarity --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index f4d599a96..f669dfdd0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -420,9 +420,9 @@ Whether PASSENGER SPOT is next to an aisle. - + - Whether PASSENGER SPOT is in the middle, i.e. not next to aisle or a window with seat on either side. + Whether PASSENGER SPOT is between two seats, i.e. not next to aisle or a window with seat on either side. From 88f2622ac61b2cfe7307a6fcfd7eae75b860668e Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 30 May 2025 10:42:00 +0200 Subject: [PATCH 13/20] Update DeckPlans-Example.xml Change of IsInMiddle to BetweenSeats for clarity --- examples/functions/deckPlans/DeckPlans-Example.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 45ab878b0..494fd92ef 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -725,7 +725,7 @@ false false - true + true @@ -1544,7 +1544,7 @@ false false - true + true From 74a7e7a4dd0b3099d4d9e7579b9fe65bd2d2382a Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 30 May 2025 10:42:51 +0200 Subject: [PATCH 14/20] Update DeckPlans-Example_bus.xml Change IsInMiddle to BetweenSeats for clarity --- .../functions/deckPlans/DeckPlans-Example_bus.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 201f6d594..33dab7fd6 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -825,7 +825,7 @@ Lower deck false - true + true @@ -837,7 +837,7 @@ Lower deck - true + true true @@ -851,7 +851,7 @@ Lower deck false - true + true @@ -1699,7 +1699,7 @@ Lower deck false - true + true @@ -1716,7 +1716,7 @@ Lower deck - true + true true @@ -1735,7 +1735,7 @@ Lower deck false - true + true From 2450c4a53e843f63766456b5b47bbd406755f389 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 30 May 2025 10:44:34 +0200 Subject: [PATCH 15/20] Update DeckPlans-Example_train.xml Change IsInMiddle for BetweenSeats for clarity --- .../deckPlans/DeckPlans-Example_train.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 1b9b30739..220d5f7e5 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1561,7 +1561,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1585,7 +1585,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1651,7 +1651,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1674,7 +1674,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1796,7 +1796,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1819,7 +1819,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1885,7 +1885,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -1908,7 +1908,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2030,7 +2030,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2053,7 +2053,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2119,7 +2119,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2142,7 +2142,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2264,7 +2264,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2287,7 +2287,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true @@ -2353,7 +2353,7 @@ The train reverse in the station and departs, oriented backwards to the right true false - true + true From 9f6d643cdb1607a0805da88e7fb43d9c2a172a8f Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 30 May 2025 18:00:00 +0200 Subject: [PATCH 16/20] Make booleans clearer Changes are: ByAisle -> IsByAisle, ByWindows -> IsByWindows, BetweenSeats -> IsBetweenSeats --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index f669dfdd0..7f5a36dc3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -410,17 +410,17 @@ 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. From 914954ec21ec4bf051688196a13cacf96e1d5dc0 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Mon, 2 Jun 2025 20:51:25 +0200 Subject: [PATCH 17/20] Adjust names for booleans in XSD & update examples --- .../functions/deckPlans/DeckPlans-Example.xml | 258 +++++++------- .../deckPlans/DeckPlans-Example_bus.xml | 256 +++++++------- .../deckPlans/DeckPlans-Example_train.xml | 296 ++++++++-------- .../DeckPlans-Example_train_simple.xml | 320 +++++++++--------- .../netex_seatingPlan_version.xsd | 4 +- 5 files changed, 574 insertions(+), 560 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 494fd92ef..a1b8aef82 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -427,8 +427,8 @@ - true - true + true + true @@ -440,8 +440,8 @@ - true - true + true + true @@ -483,8 +483,8 @@ - true - true + true + true @@ -496,8 +496,8 @@ - true - true + true + true @@ -510,8 +510,8 @@ - true - true + true + true @@ -524,8 +524,8 @@ - true - true + true + true @@ -538,8 +538,8 @@ - true - false + true + false @@ -551,8 +551,8 @@ - false - true + false + true @@ -564,8 +564,8 @@ - false - true + false + true @@ -577,8 +577,8 @@ - true - false + true + false @@ -591,8 +591,8 @@ - true - false + true + false @@ -604,8 +604,8 @@ - false - true + false + true @@ -617,8 +617,8 @@ - false - true + false + true @@ -630,8 +630,8 @@ - true - false + true + false @@ -644,8 +644,8 @@ - true - false + true + false @@ -657,8 +657,8 @@ - false - true + false + true @@ -670,8 +670,8 @@ - false - true + false + true @@ -683,8 +683,8 @@ - true - false + true + false @@ -697,8 +697,8 @@ - true - false + true + false @@ -710,8 +710,9 @@ - false - false + false + false + true @@ -723,9 +724,10 @@ - false - false - true + false + false + true + true @@ -737,8 +739,9 @@ - false - false + false + false + true @@ -750,8 +753,8 @@ - true - false + true + false @@ -921,8 +924,8 @@ - true - false + true + false @@ -939,8 +942,8 @@ - false - true + false + true @@ -957,8 +960,8 @@ - false - true + false + true @@ -975,8 +978,8 @@ - true - false + true + false @@ -994,8 +997,8 @@ - true - false + true + false @@ -1012,8 +1015,8 @@ - false - true + false + true @@ -1030,8 +1033,8 @@ - false - true + false + true @@ -1048,8 +1051,8 @@ - true - false + true + false @@ -1067,8 +1070,8 @@ - true - false + true + false @@ -1085,8 +1088,8 @@ - false - true + false + true @@ -1103,8 +1106,8 @@ - false - true + false + true @@ -1121,8 +1124,8 @@ - true - false + true + false @@ -1140,8 +1143,8 @@ - true - false + true + false @@ -1158,8 +1161,8 @@ - false - true + false + true @@ -1177,8 +1180,8 @@ - true - false + true + false @@ -1195,8 +1198,8 @@ - false - true + false + true @@ -1214,8 +1217,8 @@ - true - false + true + false @@ -1232,8 +1235,8 @@ - false - true + false + true @@ -1250,8 +1253,8 @@ - false - true + false + true @@ -1268,8 +1271,8 @@ - true - false + true + false @@ -1287,8 +1290,8 @@ - true - false + true + false @@ -1305,8 +1308,8 @@ - false - true + false + true @@ -1323,8 +1326,8 @@ - false - true + false + true @@ -1341,8 +1344,8 @@ - true - false + true + false @@ -1360,8 +1363,8 @@ - true - false + true + false @@ -1378,8 +1381,8 @@ - false - true + false + true @@ -1396,8 +1399,8 @@ - false - true + false + true @@ -1414,8 +1417,8 @@ - true - false + true + false @@ -1433,8 +1436,8 @@ - true - false + true + false @@ -1451,8 +1454,8 @@ - + true + false @@ -1469,8 +1472,8 @@ - false - true + false + true @@ -1487,8 +1490,8 @@ - true - false + true + false @@ -1506,8 +1509,8 @@ - true - false + true + false @@ -1524,8 +1527,9 @@ - false - false + false + false + true @@ -1542,9 +1546,10 @@ - false - false - true + false + false + true + true @@ -1561,8 +1566,9 @@ - false - false + false + false + true @@ -1579,8 +1585,8 @@ - true - false + true + false diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 33dab7fd6..c57e514f5 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -538,8 +538,8 @@ Lower deck - true - true + true + true @@ -551,8 +551,8 @@ Lower deck - true - true + true + true @@ -565,8 +565,8 @@ Lower deck - true - true + true + true @@ -578,8 +578,8 @@ Lower deck - true - true + true + true @@ -592,8 +592,8 @@ Lower deck - true - true + true + true @@ -610,8 +610,8 @@ Lower deck - true - true + true + true @@ -624,8 +624,8 @@ Lower deck - true - true + true + true @@ -638,8 +638,8 @@ Lower deck - true - true + true + true @@ -652,8 +652,8 @@ Lower deck - false - true + false + true @@ -665,8 +665,8 @@ Lower deck - false - true + false + true @@ -678,8 +678,8 @@ Lower deck - false - true + false + true @@ -691,8 +691,8 @@ Lower deck - true - false + true + false @@ -705,8 +705,8 @@ Lower deck - true - false + true + false @@ -718,8 +718,8 @@ Lower deck - false - true + false + true @@ -731,8 +731,8 @@ Lower deck - false - true + false + true @@ -744,8 +744,8 @@ Lower deck - true - false + true + false @@ -758,8 +758,8 @@ Lower deck - true - false + true + false @@ -771,8 +771,8 @@ Lower deck - false - true + false + true @@ -784,8 +784,8 @@ Lower deck - false - true + false + true @@ -797,8 +797,8 @@ Lower deck - true - false + true + false @@ -811,8 +811,8 @@ Lower deck - true - false + true + false @@ -824,8 +824,9 @@ Lower deck - false - true + false + false + true @@ -837,8 +838,10 @@ Lower deck - true - true + false + false + true + true @@ -850,8 +853,9 @@ Lower deck - false - true + false + false + true @@ -863,8 +867,8 @@ Lower deck - true - false + true + false @@ -1095,8 +1099,8 @@ Lower deck - true - false + true + false @@ -1113,8 +1117,8 @@ Lower deck - true - true + true + true @@ -1131,8 +1135,8 @@ Lower deck - false - true + false + true @@ -1149,8 +1153,8 @@ Lower deck - true - false + true + false @@ -1168,8 +1172,8 @@ Lower deck - true - false + true + false @@ -1186,8 +1190,8 @@ Lower deck - false - true + false + true @@ -1204,8 +1208,8 @@ Lower deck - false - true + false + true @@ -1222,8 +1226,8 @@ Lower deck - true - false + true + false @@ -1241,8 +1245,8 @@ Lower deck - true - false + true + false @@ -1259,8 +1263,8 @@ Lower deck - false - true + false + true @@ -1277,8 +1281,8 @@ Lower deck - false - true + false + true @@ -1295,8 +1299,8 @@ Lower deck - true - false + true + false @@ -1314,8 +1318,8 @@ Lower deck - true - false + true + false @@ -1332,8 +1336,8 @@ Lower deck - true - true + true + true @@ -1351,8 +1355,8 @@ Lower deck - true - false + true + false @@ -1369,8 +1373,8 @@ Lower deck - false - true + false + true @@ -1388,8 +1392,8 @@ Lower deck - true - false + true + false @@ -1406,8 +1410,8 @@ Lower deck - false - true + false + true @@ -1424,8 +1428,8 @@ Lower deck - false - true + false + true @@ -1442,8 +1446,8 @@ Lower deck - true - false + true + false @@ -1461,8 +1465,8 @@ Lower deck - true - false + true + false @@ -1479,8 +1483,8 @@ Lower deck - false - true + false + true @@ -1497,8 +1501,8 @@ Lower deck - false - true + false + true @@ -1515,8 +1519,8 @@ Lower deck - true - false + true + false @@ -1534,8 +1538,8 @@ Lower deck - true - false + true + false @@ -1552,8 +1556,8 @@ Lower deck - false - true + false + true @@ -1570,8 +1574,8 @@ Lower deck - false - true + false + true @@ -1588,8 +1592,8 @@ Lower deck - true - false + true + false @@ -1607,8 +1611,8 @@ Lower deck - true - false + true + false @@ -1625,8 +1629,8 @@ Lower deck - false - true + false + true @@ -1643,8 +1647,8 @@ Lower deck - false - true + false + true @@ -1661,8 +1665,8 @@ Lower deck - true - false + true + false @@ -1680,8 +1684,8 @@ Lower deck - true - false + true + false @@ -1698,8 +1702,9 @@ Lower deck - false - true + false` + false + true @@ -1716,8 +1721,10 @@ Lower deck - true - true + false` + false + true + true @@ -1734,8 +1741,9 @@ Lower deck - false - true + false` + false + true @@ -1752,8 +1760,8 @@ Lower deck - true - false + true + false diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 220d5f7e5..02018193b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1307,8 +1307,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - true + true + true @@ -1330,8 +1330,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - true + true + true @@ -1430,8 +1430,8 @@ The train reverse in the station and departs, oriented backwards to the right true - true - true + true + true @@ -1451,8 +1451,8 @@ The train reverse in the station and departs, oriented backwards to the right seat - true - true + true + true @@ -1536,8 +1536,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -1560,8 +1560,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1584,8 +1584,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1602,8 +1602,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1627,8 +1627,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -1650,8 +1650,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1673,8 +1673,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1691,8 +1691,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1772,8 +1772,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -1795,8 +1795,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1818,8 +1818,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1836,8 +1836,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1861,8 +1861,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -1884,8 +1884,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1907,8 +1907,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -1925,8 +1925,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2006,8 +2006,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -2029,8 +2029,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2052,8 +2052,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2070,8 +2070,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2095,8 +2095,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -2118,8 +2118,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2141,8 +2141,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2159,8 +2159,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2240,8 +2240,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -2263,8 +2263,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2286,8 +2286,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2304,8 +2304,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2329,8 +2329,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -2352,8 +2352,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2375,8 +2375,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -2393,8 +2393,8 @@ The train reverse in the station and departs, oriented backwards to the right true - false - true + false + true @@ -3203,8 +3203,8 @@ The train reverse in the station and departs, oriented backwards to the right none true - true - false + true + false @@ -3218,8 +3218,8 @@ The train reverse in the station and departs, oriented backwards to the right none true - false - true + false + true @@ -3233,8 +3233,8 @@ The train reverse in the station and departs, oriented backwards to the right none true - false - true + false + true @@ -3248,8 +3248,8 @@ The train reverse in the station and departs, oriented backwards to the right none true - true - false + true + false @@ -3264,8 +3264,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3279,8 +3279,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3294,8 +3294,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3309,8 +3309,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3325,8 +3325,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3340,8 +3340,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3355,8 +3355,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3370,8 +3370,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3386,8 +3386,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3401,8 +3401,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3416,8 +3416,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3431,8 +3431,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3447,8 +3447,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3462,8 +3462,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3477,8 +3477,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3492,8 +3492,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3508,8 +3508,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3523,8 +3523,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3538,8 +3538,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3553,8 +3553,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3569,8 +3569,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3584,8 +3584,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3599,8 +3599,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - false - true + false + true @@ -3614,8 +3614,8 @@ The train reverse in the station and departs, oriented backwards to the right seatBackFolding true - true - false + true + false @@ -3630,8 +3630,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3645,8 +3645,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3660,8 +3660,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3675,8 +3675,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3691,8 +3691,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3706,8 +3706,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3721,8 +3721,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - false - true + false + true @@ -3736,8 +3736,8 @@ The train reverse in the station and departs, oriented backwards to the right fixedFlat true - true - false + true + false @@ -3758,8 +3758,8 @@ The train reverse in the station and departs, oriented backwards to the right none false - false - false + false + false true @@ -3783,8 +3783,8 @@ The train reverse in the station and departs, oriented backwards to the right none false - false - true + false + true diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index 36a733bb5..bea5d26a0 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -580,8 +580,8 @@ none true - true - false + true + false @@ -595,8 +595,8 @@ none true - false - true + false + true @@ -610,8 +610,8 @@ none true - false - true + false + true @@ -625,8 +625,8 @@ none true - true - false + true + false @@ -641,8 +641,8 @@ none true - true - false + true + false @@ -656,8 +656,8 @@ none true - false - true + false + true @@ -671,8 +671,8 @@ none true - false - true + false + true @@ -686,8 +686,8 @@ none true - true - true + true + true @@ -702,8 +702,8 @@ none true - true - false + true + false @@ -717,8 +717,8 @@ none true - false - true + false + true @@ -732,8 +732,8 @@ none true - false - true + false + true @@ -747,8 +747,8 @@ none true - true - false + true + false @@ -763,8 +763,8 @@ none true - true - false + true + false @@ -778,8 +778,8 @@ none true - false - true + false + true @@ -793,8 +793,8 @@ none true - false - true + false + true @@ -808,8 +808,8 @@ none true - true - false + true + false @@ -824,8 +824,8 @@ none true - true - false + true + false @@ -839,8 +839,8 @@ none true - false - true + false + true @@ -854,8 +854,8 @@ none true - false - true + false + true @@ -869,8 +869,8 @@ none true - true - false + true + false @@ -885,8 +885,8 @@ fixedFlat true - true - false + true + false @@ -900,8 +900,8 @@ fixedFlat true - false - true + false + true @@ -915,8 +915,8 @@ fixedFlat true - false - true + false + true @@ -930,8 +930,8 @@ fixedFlat true - true - false + true + false @@ -946,8 +946,8 @@ fixedFlat true - true - false + true + false @@ -961,8 +961,8 @@ fixedFlat true - false - true + false + true @@ -976,8 +976,8 @@ fixedFlat true - false - true + false + true @@ -991,8 +991,8 @@ fixedFlat true - true - false + true + false @@ -1007,8 +1007,8 @@ none true - true - false + true + false @@ -1022,8 +1022,8 @@ none true - false - true + false + true @@ -1037,8 +1037,8 @@ none true - false - true + false + true @@ -1052,8 +1052,8 @@ none true - true - false + true + false @@ -1068,8 +1068,8 @@ none true - true - false + true + false @@ -1083,8 +1083,8 @@ none true - false - true + false + true @@ -1098,8 +1098,8 @@ none true - false - true + false + true @@ -1113,8 +1113,8 @@ none true - true - false + true + false @@ -1129,8 +1129,8 @@ none true - true - false + true + false @@ -1144,8 +1144,8 @@ none true - false - true + false + true @@ -1159,8 +1159,8 @@ none true - false - true + false + true @@ -1174,8 +1174,8 @@ none true - true - false + true + false @@ -1190,8 +1190,8 @@ none true - true - false + true + false @@ -1205,8 +1205,8 @@ none true - false - true + false + true @@ -1220,8 +1220,8 @@ none true - false - true + false + true @@ -1235,8 +1235,8 @@ none true - true - false + true + false @@ -1251,8 +1251,8 @@ none true - true - false + true + false @@ -1266,8 +1266,8 @@ none true - false - true + false + true @@ -1281,8 +1281,8 @@ none true - false - true + false + true @@ -1296,8 +1296,8 @@ none true - true - false + true + false @@ -1312,8 +1312,8 @@ none true - true - false + true + false @@ -1327,8 +1327,8 @@ none true - false - true + false + true @@ -1342,8 +1342,8 @@ none true - false - true + false + true @@ -1357,8 +1357,8 @@ none true - true - false + true + false @@ -1373,8 +1373,8 @@ none true - true - false + true + false @@ -1388,8 +1388,8 @@ none true - false - true + false + true @@ -1403,8 +1403,8 @@ none true - false - true + false + true @@ -1418,8 +1418,8 @@ none true - true - false + true + false @@ -1434,8 +1434,8 @@ none true - true - false + true + false @@ -1449,8 +1449,8 @@ none true - false - true + false + true @@ -1464,8 +1464,8 @@ none true - false - true + false + true @@ -1479,8 +1479,8 @@ none true - true - false + true + false @@ -1495,8 +1495,8 @@ seatBackFolding true - true - false + true + false @@ -1510,8 +1510,8 @@ seatBackFolding true - false - true + false + true @@ -1525,8 +1525,8 @@ seatBackFolding true - false - true + false + true @@ -1540,8 +1540,8 @@ seatBackFolding true - true - false + true + false @@ -1556,8 +1556,8 @@ seatBackFolding true - true - false + true + false @@ -1571,8 +1571,8 @@ seatBackFolding true - false - true + false + true @@ -1586,8 +1586,8 @@ seatBackFolding true - false - true + false + true @@ -1601,8 +1601,8 @@ seatBackFolding true - true - false + true + false @@ -1617,8 +1617,8 @@ none true - true - false + true + false @@ -1632,8 +1632,8 @@ none true - false - true + false + true @@ -1647,8 +1647,8 @@ none true - false - true + false + true @@ -1662,8 +1662,8 @@ none true - true - false + true + false @@ -1678,8 +1678,8 @@ none true - true - false + true + false @@ -1693,8 +1693,8 @@ none true - false - true + false + true @@ -1708,8 +1708,8 @@ none true - false - true + false + true @@ -1723,8 +1723,8 @@ none true - true - false + true + false @@ -1739,8 +1739,8 @@ none true - true - false + true + false @@ -1754,8 +1754,8 @@ none true - false - true + false + true @@ -1769,8 +1769,8 @@ none true - false - true + false + true @@ -1784,8 +1784,8 @@ none true - true - false + true + false diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 7f5a36dc3..21a5768ad 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -435,12 +435,12 @@ 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. From 6e0a287f894c48210b2541611a294d228776b154 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 2 Jun 2025 21:52:41 +0200 Subject: [PATCH 18/20] Apply suggestions from code review --- .../functions/deckPlans/DeckPlans-Example_train_simple.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index bea5d26a0..f1171e743 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -794,7 +794,7 @@ none true false - true + true @@ -1434,7 +1434,7 @@ none true - true + true false From 7d4c7dfe5fe470730ca16a6979e609bf6591df8c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 2 Jun 2025 22:27:21 +0200 Subject: [PATCH 19/20] Fix examples --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index a1b8aef82..4acc8943b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1454,8 +1454,8 @@ - true false + true diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index c57e514f5..ea2294532 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1702,7 +1702,7 @@ Lower deck - false` + false false true @@ -1721,7 +1721,7 @@ Lower deck - false` + false false true true @@ -1741,7 +1741,7 @@ Lower deck - false` + false false true From 1046f14c4c72dfb5cf0b79b99d2cd4078d2c1a3c Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Tue, 3 Jun 2025 11:39:30 +0200 Subject: [PATCH 20/20] Setting default to false --- .../netex_seatingPlan_version.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 21a5768ad..7f3072236 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -405,42 +405,42 @@ 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.