From 2ab5070de2cf54b47480a80816feeedfb3824dce Mon Sep 17 00:00:00 2001 From: ue71603 Date: Thu, 30 Jun 2022 17:33:58 +0200 Subject: [PATCH 1/8] First draft of the clean up of MODE * Better explanations in VEHICLE MODE * AccessMode now works TRANSFERs and OTHER LEG (for OJP) * Some depreciations --- .../netex_mode_support.xsd | 112 ++++++++++++++---- .../netex_submode_version.xsd | 12 +- 2 files changed, 99 insertions(+), 25 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 53a39f1d8..75f217c57 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -68,19 +68,23 @@ Rail transport, Roads and Road transport - Access MODE for SITEs. + Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if OTHER LEG for the Trip model a monomodal non-public transport is used. - Allowed values for Access MODEs for SITEs. + Allowed values for Access MODEs for SITEs, VEHICLE MEETING POINTS and TRANSFER and for monomodal non-public transport OTHER LEG in TRIP. - + + + Taxi can now be modeled as VEHICLE MODE as well. + + @@ -210,36 +214,98 @@ Rail transport, Roads and Road transport - Allowed values for MODES of Transport : TPEG pti_table 01. + Allowed values for MODES of Transport : roughly based onTPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used. - - + + + If all modes are meant. + + + + + Use only when no other entry applies. + + - + + + Special type of bus with two overhead wires using spring-loaded trolley poles. + + - + + + Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different. + + - - - - - - - - + + + Depreciated. Use Mode rail with RailSubmode longDistance. + + + + + Depreciated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + + + + + Within an urban area. For underground and railway. + + + + + All air related Mode. No special distinction is done. + + + + + Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. + + + + + Can be only two cabines or multiple. + + + + + cable railway on steep slope using two counterbalanced carriages. + + + + + A collection for all Mode involving snow and ice. + + - - + + + Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route. + + + + + General Mode for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. + + - See pti12_x. + For all alternative modes where a vehicle is driven by the user .See pti12_x. - - - - + + + To be avoided. + + + + + Use only when no other entry applies. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index e63f4f081..85c6131d3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -261,8 +261,16 @@ Local train adapted for running in mountain railway lines. - - + + + Depreciated. Use metro + + + + + Replaces the Mode urbanRail. + + From 30efb7944c6cd163995774082c77f3f9c42f22c6 Mon Sep 17 00:00:00 2001 From: ue71603 Date: Thu, 30 Jun 2022 17:40:22 +0200 Subject: [PATCH 2/8] added a mode to Connection --- .../netex_genericFramework/netex_place_version.xsd | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 9987b6efa..5f1245388 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -2,6 +2,8 @@ + + @@ -158,6 +160,11 @@ Rail transport, Roads and Road transport Whether timings and validity applies to both directions (true) or just to the from-to direction of the TRANSFER. + + + If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode. + + From b8beee6ed137100399d5d1dab0f34491e0e5a7f8 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 1 Jul 2022 18:05:42 +0200 Subject: [PATCH 3/8] Update netex_mode_support.xsd Deprecated not Depreciated ;-) --- .../netex_reusableComponents/netex_mode_support.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 75f217c57..8b79e79bb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -242,12 +242,12 @@ Rail transport, Roads and Road transport - Depreciated. Use Mode rail with RailSubmode longDistance. + Deprecated. Use Mode rail with RailSubmode longDistance. - Depreciated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). From d483e8e222750d29d1c9e75f03efa27ab9351813 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 1 Jul 2022 18:07:56 +0200 Subject: [PATCH 4/8] Update netex_submode_version.xsd Deprecated not Depreciated ;-) --- .../netex_reusableComponents/netex_submode_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index 85c6131d3..164f0d609 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -263,7 +263,7 @@ Local train adapted for running in mountain railway lines. - Depreciated. Use metro + Deprecated. Use metro From 000c1374868ce57a1e4a59f131aa23b44872d500 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 17:36:54 +0200 Subject: [PATCH 5/8] Apply suggestions from code review --- .../netex_reusableComponents/netex_mode_support.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 8b79e79bb..522eebc23 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -214,7 +214,7 @@ Rail transport, Roads and Road transport - Allowed values for MODES of Transport : roughly based onTPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used. + Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used. @@ -293,7 +293,7 @@ Rail transport, Roads and Road transport - For all alternative modes where a vehicle is driven by the user .See pti12_x. + For all alternative modes where a vehicle is driven by the user. See pti12_x. From 947869a9ec49f20346345b707fa0b2b0e78869f3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:43:15 +0000 Subject: [PATCH 6/8] Lint and update documentation tables --- .../netex_place_version.xsd | 3 +- .../netex_mode_support.xsd | 104 +++++++++--------- .../netex_submode_version.xsd | 12 +- 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 5f1245388..e814d0b59 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -3,7 +3,6 @@ - @@ -163,7 +162,7 @@ Rail transport, Roads and Road transport If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode. - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 522eebc23..bedda197a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -81,9 +81,9 @@ Rail transport, Roads and Road transport - - Taxi can now be modeled as VEHICLE MODE as well. - + + Taxi can now be modeled as VEHICLE MODE as well. + @@ -218,78 +218,78 @@ Rail transport, Roads and Road transport - - If all modes are meant. - + + If all modes are meant. + - - Use only when no other entry applies. - - + + Use only when no other entry applies. + + - - Special type of bus with two overhead wires using spring-loaded trolley poles. - + + Special type of bus with two overhead wires using spring-loaded trolley poles. + - - Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different. - + + Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different. + - - Deprecated. Use Mode rail with RailSubmode longDistance. - + + Deprecated. Use Mode rail with RailSubmode longDistance. + - - Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). - + + Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + - - Within an urban area. For underground and railway. - + + Within an urban area. For underground and railway. + - - All air related Mode. No special distinction is done. - + + All air related Mode. No special distinction is done. + - - Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. - + + Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. + - - Can be only two cabines or multiple. - + + Can be only two cabines or multiple. + - - cable railway on steep slope using two counterbalanced carriages. - + + cable railway on steep slope using two counterbalanced carriages. + - - A collection for all Mode involving snow and ice. - + + A collection for all Mode involving snow and ice. + - - Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route. - + + Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route. + - - General Mode for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. - + + General Mode for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. + @@ -297,14 +297,14 @@ Rail transport, Roads and Road transport - - To be avoided. - + + To be avoided. + - - Use only when no other entry applies. - + + Use only when no other entry applies. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index 164f0d609..776a8f7f2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -262,14 +262,14 @@ Local train adapted for running in mountain railway lines. - - Deprecated. Use metro - + + Deprecated. Use metro + - - Replaces the Mode urbanRail. - + + Replaces the Mode urbanRail. + From 717ab3fc0436365346222e8b51140d5688ddf1a9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 21:39:54 +0200 Subject: [PATCH 7/8] Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_mode_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index bedda197a..2c6b5457e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -68,7 +68,7 @@ Rail transport, Roads and Road transport - Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if OTHER LEG for the Trip model a monomodal non-public transport is used. + Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if in OTHER LEG of the TRIP a monomodal non-public transport is used. From 4894f9d63b9f1c9b2f849721a38b140d9f69336a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Sep 2023 21:55:42 +0200 Subject: [PATCH 8/8] Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_mode_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 2c6b5457e..472cc728b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -288,7 +288,7 @@ Rail transport, Roads and Road transport - General Mode for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. + General Mode for elevators and for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that.