From e5fc5e66ca19cda5f32269523e984abccdd24198 Mon Sep 17 00:00:00 2001
From: trurlurl <82838870+trurlurl@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:48:30 +0200
Subject: [PATCH 1/3] Refactoring three transport mode enumerations
---
.../netex_access_version.xsd | 4 +-
.../netex_mode_support.xsd | 48 ++++---------------
.../netex_mode_version.xsd | 4 +-
.../netex_transportOrganisation_version.xsd | 6 +--
...netex_ifopt_equipmentTicketing_version.xsd | 4 +-
.../netex_ifopt_localService_version.xsd | 2 +-
.../netex_ifopt_stopPlace_version.xsd | 2 +-
.../netex_lineNetwork_version.xsd | 14 +++---
.../netex_route_version.xsd | 2 +-
.../netex_servicePattern_version.xsd | 6 +--
.../netex_timetableFrame_version.xsd | 6 +--
.../netex_vehicleScheduleFrame_version.xsd | 4 +-
.../netex_duty_version.xsd | 4 +-
.../netex_accessRightParameter_version.xsd | 10 ++--
14 files changed, 44 insertions(+), 72 deletions(-)
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
index 3749cb3fc..6c3014466 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
@@ -148,9 +148,9 @@ Rail transport, Roads and Road transport
Type for ACCESS link end.
-
+
- Identifier of MODE of end point of ACCESS link. Default is all modes.
+ Identifier of MODE of TRANSPORT of end point of ACCESS link. Default is all modes.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
index 5fdefb9ae..0cba1c39c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
@@ -112,41 +112,13 @@ Rail transport, Roads and Road transport
-
+
- VEHICLE MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).
+ VEHICLE TRANSPORT MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).
-
-
- Allowed values for MODES of Public Transport applicable to timetabled public transport.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Allowed values for List of PT MODES of transport applicable to timetabled public transport.
-
-
-
-
-
+
Road Vehicle MODE: a characterisation of the operation according to the means of transport (bus, tram, coach).
@@ -174,9 +146,9 @@ Rail transport, Roads and Road transport
All MODEs including vehicle transport and self drive.
-
+
- Allowed values for r MODES: TPEG pti_table 01.
+ Allowed values for MODES of TRANSPORT: TPEG pti_table 01.
@@ -213,15 +185,15 @@ Rail transport, Roads and Road transport
-
+
- Allowed values for List of ALL MODES of transport.
+ Allowed values for List of ALL MODES of TRANSPORT.
-
+
-
+
- Allowed values for List of PT MODES of transport applicable to timetabled public transport.
+ Allowed values for List of PT MODES of TRANSPORT applicable to timetabled public transport.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
index b5c3c6f3f..73a99c3ac 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
@@ -43,9 +43,9 @@ Rail transport, Roads and Road transport
Elements for a Transport MODE.
-
+
- Categorisation of mode.
+ Categorisation of MODE of TRANSPORT.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
index 4030d4533..8f1ffb29b 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
@@ -276,9 +276,9 @@ Rail transport, Roads and Road transport
MODE elements of an TRANSPORT ORGANISATION.
-
+
- Primary transport MODE of TRANSPORT ORGANISATION
+ Primary TRANSPORT MODE of TRANSPORT ORGANISATION
@@ -731,7 +731,7 @@ Rail transport, Roads and Road transport
Elements for an TRANSPORT ADMINISTRATIVE ZONE.
-
+
TRANSPORT MODEs for which this zone applies. Default is all.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
index 8825a4322..18916baca 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
@@ -114,9 +114,9 @@ Rail transport, Roads and Road transport
Elements for a TICKETING EQUIPMENT.
-
+
- Modes for which ticketing services apply.
+ MODES of TRANSPORT for which ticketing services apply.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
index 7f691c626..fd41d4205 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
@@ -178,7 +178,7 @@ Rail transport, Roads and Road transport
Elements for a TICKETING SERVICE.
-
+
Modes for which TICKETING SERVICEs apply.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
index e97d7a8c1..59e9f4d93 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
@@ -350,7 +350,7 @@ Rail transport, Roads and Road transport
Mode Elements of a SITE COMPONENT. +v1.2.2
-
+
Public transport MODES which may be accessed through associated place.
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
index 3d4453fa3..7ff73e335 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
@@ -312,7 +312,7 @@ Rail transport, Roads and Road transport
- Type for a POINT on LINE SECTION.
+ Type for a POINT on LINE SECTION.
@@ -324,29 +324,29 @@ Rail transport, Roads and Road transport
- Elements for a POINT ON LINE SECTION.
+ Elements for a POINT ON LINE SECTION.
- Classification of Point Member.
+ Classification of POINT member.
- Whether point is to be shown as Accessible.
+ Whether POINT is to be shown as accessible.
-
+
- Connecting Vehicle Modes to show for Point if different from point.
+ Connecting VEHICLE MODEs of TRANSPORT to show for POINT if different from POINT.
- [DEPRECATED use POINT ON LINE SECTION INSTEAD ] An ordered set of LINKs for a line.
+ [DEPRECATED - use POINT ON LINE SECTION INSTEAD] An ordered set of LINKs for a line.
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
index 2db0f23fa..bf153d2fd 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
@@ -593,7 +593,7 @@ Rail transport, Roads and Road transport
- Mode of ROUTE.
+ MODE of TRANSPORT of ROUTE.
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index 696e4bd8f..bda7b1766 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -334,9 +334,9 @@ Rail transport, Roads and Road transport
Elements for properties of a SCHEDULED STOP POINT.
-
+
- TRANSPORT MODE or MODES of STOP POINT.
+ TRANSPORT MODE or TRANPORT MODEs of STOP POINT.
@@ -588,7 +588,7 @@ Rail transport, Roads and Road transport
Type for a CONNECTION END.
-
+
MODE of end Point of CONNECTION. Default is all modes, MODE of SCHEDULED STOP POINT can be derived.
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index 473305b7d..aa8750e3a 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -134,9 +134,9 @@ Rail transport, Roads and Road transport
-
+
- Default VEHICLE MODE to use on JOURNEYs in TIMETABLE.
+ Default VEHICLE MODE of TRANSPORT to use on JOURNEYs in TIMETABLE.
@@ -154,7 +154,7 @@ Rail transport, Roads and Road transport
Additional descriptive properties of TIMETABLE FRAME.
-
+
Modes of VEHICLE JOURNEYs in timetable.
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
index ad7fd8f49..fc7d90bce 100644
--- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
@@ -59,9 +59,9 @@
Additional descriptive properties of a VEHICLE SCHEDULE FRAME.
-
+
- Modes of VEHICLE SCHEDULE.
+ TRANPORT MODEs of VEHICLE SCHEDULE.
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
index 33e752a40..d385d7e2d 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
@@ -506,9 +506,9 @@ Rail transport, Roads and Road transport
How long the DRIVER TRIP takes.
-
+
- Mode of Transport.
+ MODE of TRANSPORT.
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 6b5655381..4077c884d 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -421,12 +421,12 @@ Rail transport, Roads and Road transport
-
+
- VEHICLE MODEs to which ACCESS RIGHTs apply. DEPRECATED - keep for backwards compatibility. -v1.2.2
+ VEHICLE TRANPORT MODEs to which ACCESS RIGHTs apply. DEPRECATED - keep for backwards compatibility. -v1.2.2
-
+
Any MODE to which mode validity parameters apply. +v1.2.2
@@ -566,7 +566,7 @@ Rail transport, Roads and Road transport
- EQUIPMENT and LOCAL SERVICE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. +V1.2.2
+ EQUIPMENT and LOCAL SERVICE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. +V1.2.2
@@ -597,7 +597,7 @@ Rail transport, Roads and Road transport
- EQUIPMENT and LOCAL SERVICE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT.
+ EQUIPMENT and LOCAL SERVICE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT.
From a66808f2cbc57452e4caf55fc034af207e5a7af9 Mon Sep 17 00:00:00 2001
From: trurlurl <82838870+trurlurl@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:38:13 +0100
Subject: [PATCH 2/3] Renamed AllVehicleModesOfTransportEnum/List and
AllModesOfTransportEnum/List
---
.../netex_access_version.xsd | 4 +--
.../netex_modeOfOperation_version.xsd | 6 ++--
.../netex_mode_support.xsd | 30 +++++++++----------
.../netex_mode_version.xsd | 8 ++---
.../netex_transportOrganisation_version.xsd | 12 ++++----
.../netex_vehicleType_version.xsd | 4 +--
.../netex_ifopt_equipmentSigns_version.xsd | 2 +-
...netex_ifopt_equipmentTicketing_version.xsd | 4 +--
.../netex_ifopt_flexibleStopPlace_version.xsd | 12 ++++----
.../netex_ifopt_localService_version.xsd | 4 +--
.../part1_ifopt/netex_ifopt_site_version.xsd | 4 +--
.../netex_ifopt_stopPlace_version.xsd | 16 +++++-----
.../netex_lineNetwork_version.xsd | 4 +--
.../netex_line_version.xsd | 16 +++++-----
.../netex_route_version.xsd | 4 +--
.../netex_siteConnection_version.xsd | 8 ++---
.../netex_vehicleScheduleFrame_version.xsd | 4 +--
.../netex_interchangeRule_version.xsd | 8 ++---
.../netex_journey_version.xsd | 4 +--
.../netex_duty_version.xsd | 4 +--
.../netex_accessRightParameter_version.xsd | 6 ++--
.../netex_usageParameterTravel_version.xsd | 8 ++---
.../part3_frames/netex_fareFrame_version.xsd | 4 +--
23 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
index 6c3014466..3749cb3fc 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
@@ -148,9 +148,9 @@ Rail transport, Roads and Road transport
Type for ACCESS link end.
-
+
- Identifier of MODE of TRANSPORT of end point of ACCESS link. Default is all modes.
+ Identifier of MODE of end point of ACCESS link. Default is all modes.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd
index f016e50de..61827123a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd
@@ -24,12 +24,12 @@ Rail transport, Roads and Road transport
- Elements characterfising a MODE
+ Elements characterising a PUBLIC TRANSPORT MODE.
-
+
- A TRANSPORT MODE for a Vehicle
+ A PUBLIC TRANSPORT MODE.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
index 0cba1c39c..35dce2189 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
@@ -112,9 +112,9 @@ Rail transport, Roads and Road transport
-
+
- VEHICLE TRANSPORT MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).
+ PUBLIC TRANSPORT MODE: a characterisation of the operation according to the means of transport (bus, tram, metro, train, ferry, ship).
@@ -141,14 +141,14 @@ Rail transport, Roads and Road transport
-
+
- All MODEs including vehicle transport and self drive.
+ All PUBLIC TRANSPORT MODEs including self drive.
-
+
- Allowed values for MODES of TRANSPORT: TPEG pti_table 01.
+ All MODEs (PUBLIC TRANSPORT MODEs and PERSONAL MODEs).
@@ -185,21 +185,21 @@ Rail transport, Roads and Road transport
-
+
- Allowed values for List of ALL MODES of TRANSPORT.
+ Allowed values for List of ALL MODES.
-
+
-
+
- Allowed values for List of PT MODES of TRANSPORT applicable to timetabled public transport.
+ Allowed values for List of PT MODES applicable to timetabled public transport.
-
+
-
+
- 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.
+ PUBLIC TRANSPORT MODE: A MODE used for public transport services (e.g., by bus, by tram, by metro, by train, by ferry, by ship, by shared taxi car, by shared car) under either a CONVENTIONAL MODE OF OPERATION or an ALTERNATIVE MODE OF OPERATION (i.e., excluding a PERSONAL MODE OF OPERATION). Note: Prior to TM 6.2 this was named VEHICLE MODE.
@@ -382,7 +382,7 @@ Rail transport, Roads and Road transport
-
+
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
index 73a99c3ac..362148e75 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
@@ -40,12 +40,12 @@ Rail transport, Roads and Road transport
- Elements for a Transport MODE.
+ Elements for a MODE.
-
+
- Categorisation of MODE of TRANSPORT.
+ Categorisation of MODE.
@@ -53,7 +53,7 @@ Rail transport, Roads and Road transport
- Type for a TRANSPORT MODE.
+ Type for a MODE.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
index 8f1ffb29b..e131100ab 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
@@ -276,9 +276,9 @@ Rail transport, Roads and Road transport
MODE elements of an TRANSPORT ORGANISATION.
-
+
- Primary TRANSPORT MODE of TRANSPORT ORGANISATION
+ Primary MODE of TRANSPORT ORGANISATION
@@ -510,9 +510,9 @@ Rail transport, Roads and Road transport
-
+
- Vehicle mode to which context applies.
+ PT MODE to which context applies.
@@ -731,9 +731,9 @@ Rail transport, Roads and Road transport
Elements for an TRANSPORT ADMINISTRATIVE ZONE.
-
+
- TRANSPORT MODEs for which this zone applies. Default is all.
+ PUBLIC TRANSPORT MODEs for which this zone applies. Default is all.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
index f212de689..8e0ee23d3 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -173,9 +173,9 @@ Rail transport, Roads and Road transport
-
+
- MODE of Vehicle transport associated with VEHICLE TYPE. +v1.2.2
+ PT MODE associated with VEHICLE TYPE. +v1.2.2
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
index 1c595b04a..926b720f9 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
@@ -315,7 +315,7 @@ Rail transport, Roads and Road transport
Content of Stop.
-
+
Description of MODE of LINE.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
index 18916baca..72519a09b 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
@@ -114,9 +114,9 @@ Rail transport, Roads and Road transport
Elements for a TICKETING EQUIPMENT.
-
+
- MODES of TRANSPORT for which ticketing services apply.
+ PT MODEs for which ticketing services apply.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
index 661af6888..403479d79 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
@@ -119,9 +119,9 @@ Rail transport, Roads and Road transport
-
+
- Primary MODE of Vehicle transport.
+ Primary PT MODE.
@@ -144,9 +144,9 @@ Rail transport, Roads and Road transport
-
+
- Primary MODE of Vehicle transport.
+ Primary PT MODE.
@@ -298,9 +298,9 @@ Rail transport, Roads and Road transport
-
+
- Primary MODE of Vehicle transport.
+ Primary PT MODE.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
index fd41d4205..4f23d3ae9 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
@@ -178,9 +178,9 @@ Rail transport, Roads and Road transport
Elements for a TICKETING SERVICE.
-
+
- Modes for which TICKETING SERVICEs apply.
+ PT MODEs for which TICKETING SERVICEs apply.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
index 2bafa0087..368493fd6 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
@@ -305,9 +305,9 @@ Rail transport, Roads and Road transport
Mode Elements of a SITE COMPONENT.
-
+
- Primary MODE of Vehicle transport associated by this component.
+ Primary PT MODE associated by this component.
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
index 59e9f4d93..8cd3f539d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
@@ -350,9 +350,9 @@ Rail transport, Roads and Road transport
Mode Elements of a SITE COMPONENT. +v1.2.2
-
+
- Public transport MODES which may be accessed through associated place.
+ PUBLIC TRANSPORT MODES which may be accessed through associated place.
@@ -1439,9 +1439,9 @@ contained within its parent QUAY.
-
+
- Primary MODE of Vehicle transport associated by this component. +v1.2
+ Primary PT MODE associated by this component. +v1.2
@@ -1482,9 +1482,9 @@ contained within its parent QUAY.
Type of STOP PLACE.
-
+
- Primary MODE of Vehicle transport.
+ Primary PT MODE.
@@ -1526,9 +1526,9 @@ contained within its parent QUAY.
Type of STOP PLACE.
-
+
- Primary MODE of Vehicle transport.
+ Primary PT MODE.
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
index 7ff73e335..5a5e03d1a 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
@@ -337,9 +337,9 @@ Rail transport, Roads and Road transport
Whether POINT is to be shown as accessible.
-
+
- Connecting VEHICLE MODEs of TRANSPORT to show for POINT if different from POINT.
+ Connecting PT MODEs to show for POINT if different from POINT.
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
index 4a09a091b..d50837848 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
@@ -245,9 +245,9 @@ Rail transport, Roads and Road transport
Primary LINE in GROUP OF LINEs, if relevant.
-
+
- Primary Transport MODE of NETWORK.
+ Primary PUBLIC TRANSPORT MODE of NETWORK.
@@ -351,9 +351,9 @@ Rail transport, Roads and Road transport
Description of LINE.
-
+
- Transport MODE of LINE.
+ PT MODE of LINE.
@@ -1016,9 +1016,9 @@ Rail transport, Roads and Road transport
Name of NETWORK.
-
+
- TRANSPORT MODE of NETWORK.
+ PUBLIC TRANSPORT MODE of NETWORK.
@@ -1059,9 +1059,9 @@ Rail transport, Roads and Road transport
Short name of LINE.
-
+
- TRANSPORT MODE of LINE.
+ PUBLIC TRANSPORT MODE of LINE.
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
index bf153d2fd..62d64ff46 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
@@ -591,9 +591,9 @@ Rail transport, Roads and Road transport
-
+
- MODE of TRANSPORT of ROUTE.
+ PT MODE of ROUTE.
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
index bb4b18265..6a3f37b1f 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
@@ -134,9 +134,9 @@ Rail transport, Roads and Road transport
Type for a SITE CONNECTION End.
-
+
- MODE of end point of TRANSFER . Default is all modes, i.e. all modes of referenced stop place and or stop point.
+ PT MODE of end point of TRANSFER . Default is all modes, i.e. all modes of referenced stop place and or stop point.
@@ -270,9 +270,9 @@ Rail transport, Roads and Road transport
Type for a DEFAULT TRANSFER.
-
+
- Identifier of MODE of end point of TRANSFER.
+ Identifier of PT MODE of end point of TRANSFER.
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
index fc7d90bce..053908e73 100644
--- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
@@ -59,9 +59,9 @@
Additional descriptive properties of a VEHICLE SCHEDULE FRAME.
-
+
- TRANPORT MODEs of VEHICLE SCHEDULE.
+ PUBLIC TRANPORT MODEs of VEHICLE SCHEDULE.
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
index d72d539eb..700cbf4a9 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
@@ -211,9 +211,9 @@ Rail transport, Roads and Road transport
Type for INTERCHANGE RULE PARAMETER.
-
+
- Identifier of MODE of end Point of TRANSFER . Default is all modes.
+ Identifier of PT MODE of end Point of TRANSFER . Default is all modes.
@@ -356,9 +356,9 @@ Rail transport, Roads and Road transport
Maximum interval for making INTERCHANGe.
-
+
- Identifier of MODE of end Point of TRANSFER . Default is all modes.
+ Identifier of PT MODE of end Point of TRANSFER . Default is all modes.
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index 6f8f0dd28..1eca93f0b 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -102,9 +102,9 @@ Rail transport, Roads and Road transport
Elements for a JOURNEY.
-
+
- Mode of transport of JOURNEY.
+ PT MODE of JOURNEY.
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
index d385d7e2d..c223b39cd 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
@@ -506,9 +506,9 @@ Rail transport, Roads and Road transport
How long the DRIVER TRIP takes.
-
+
- MODE of TRANSPORT.
+ MODE.
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 4077c884d..f522778c1 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -421,12 +421,12 @@ Rail transport, Roads and Road transport
-
+
- VEHICLE TRANPORT MODEs to which ACCESS RIGHTs apply. DEPRECATED - keep for backwards compatibility. -v1.2.2
+ PUBLIC TRANPORT MODEs to which ACCESS RIGHTs apply. DEPRECATED - keep for backwards compatibility. -v1.2.2
-
+
Any MODE to which mode validity parameters apply. +v1.2.2
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
index 9d7e7aa98..016e85f37 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
@@ -666,14 +666,14 @@ Rail transport, Roads and Road transport
Whether an Jinterchange can be made.
-
+
- Mode from which interchange is made.
+ PT MODE from which interchange is made.
-
+
- Mode to which interchange is made.
+ PT MODE to which interchange is made.
diff --git a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
index 21b221f41..601ad0805 100644
--- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
@@ -149,9 +149,9 @@ Rail transport, Roads and Road transport
Default descriptive properties of a FARE FRAME Apply to all members unless overridden.
-
+
- Default TRANSPORT MODE.
+ Default PUBLIC TRANSPORT MODE.
From 0246e53bc30828c4578d3db7f01ceb81246eafa0 Mon Sep 17 00:00:00 2001
From: trurlurl <82838870+trurlurl@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:03:54 +0100
Subject: [PATCH 3/3] Further renamings
Occurrences were somehow missed by search.
---
.../netex_servicePattern_version.xsd | 6 +++---
.../part2_frames/netex_timetableFrame_version.xsd | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index bda7b1766..16aa75c06 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -334,9 +334,9 @@ Rail transport, Roads and Road transport
Elements for properties of a SCHEDULED STOP POINT.
-
+
- TRANSPORT MODE or TRANPORT MODEs of STOP POINT.
+ PUBLIC TRANSPORT MODEs of STOP POINT.
@@ -588,7 +588,7 @@ Rail transport, Roads and Road transport
Type for a CONNECTION END.
-
+
MODE of end Point of CONNECTION. Default is all modes, MODE of SCHEDULED STOP POINT can be derived.
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index aa8750e3a..8266190ea 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -134,9 +134,9 @@ Rail transport, Roads and Road transport
-
+
- Default VEHICLE MODE of TRANSPORT to use on JOURNEYs in TIMETABLE.
+ Default PT MODE to use on JOURNEYs in TIMETABLE.
@@ -154,9 +154,9 @@ Rail transport, Roads and Road transport
Additional descriptive properties of TIMETABLE FRAME.
-
+
- Modes of VEHICLE JOURNEYs in timetable.
+ PT MODEs of VEHICLE JOURNEYs in timetable.