From 34076f1675ab76fd4548fbfb8a14cb900bad55f2 Mon Sep 17 00:00:00 2001 From: ue71603 Date: Thu, 30 Jun 2022 17:33:58 +0200 Subject: [PATCH 1/5] 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 4fbc99e9b..4a90f7123 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -73,19 +73,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. + + @@ -215,36 +219,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 6c8f37961..61b0bbc69 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -270,8 +270,16 @@ Local train adapted for running in mountain railway lines. - - + + + Depreciated. Use metro + + + + + Replaces the Mode urbanRail. + + From c319460e82af9284fb1ded4d9f091d4ae1c3169f Mon Sep 17 00:00:00 2001 From: ue71603 Date: Thu, 30 Jun 2022 17:40:22 +0200 Subject: [PATCH 2/5] 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 312ca8245..da56461d9 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 @@ + + @@ -159,6 +161,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 0ce3633a75da13f70933c01686c176c35d9b9c07 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 1 Jul 2022 18:05:42 +0200 Subject: [PATCH 3/5] 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 4a90f7123..69855abbb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -247,12 +247,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 fd96e3abdf6028837d0b430674db94f83fa16a95 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 1 Jul 2022 18:07:56 +0200 Subject: [PATCH 4/5] 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 61b0bbc69..2ccc916ed 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -272,7 +272,7 @@ Local train adapted for running in mountain railway lines. - Depreciated. Use metro + Deprecated. Use metro From 1a6156eec1d81084f748a6a0163a1926394447df Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 17:36:54 +0200 Subject: [PATCH 5/5] 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 69855abbb..057aa80dd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -219,7 +219,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. @@ -298,7 +298,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.