diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 1ffdb74eb..11baf46dc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -212,6 +212,11 @@ Rail transport, Roads and Road transport Company registration number including Country prefix. + + + Company registered tax number including Country prefix. + + An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 9987b6efa..e814d0b59 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -2,6 +2,7 @@ + @@ -158,6 +159,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. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index f1cb87545..e6c910cb9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -484,7 +484,6 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index fcce32eb5..551cae7e5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -1099,6 +1099,13 @@ Rail transport, Roads and Road transport + + + + List of values for PASSENGER INFORMATION EQUIPMENT. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 53a39f1d8..472cc728b 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 in OTHER LEG of the TRIP 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 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. - - + + + 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. + + - - - - - - - - + + + Deprecated. Use Mode rail with RailSubmode longDistance. + + + + + Deprecated. 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 elevators and 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_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index 372d6958f..56225bcf1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -214,8 +214,13 @@ Rail transport, Roads and Road transport - - + + + depreciated. Will be panthograph. + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index e63f4f081..776a8f7f2 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. - - + + + Deprecated. Use metro + + + + + Replaces the Mode urbanRail. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index e1bc0abc2..b2b66ead9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -35,6 +35,8 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the VEHICLE TYPE identifier Types.

@@ -449,7 +451,7 @@ Rail transport, Roads and Road transport - Allowed values for type of power +v1/2/2 + Allowed values for type of power +v1/2/2 @@ -483,7 +485,7 @@ Rail transport, Roads and Road transport - Allowed values for Personal Vehicle Categories _v1.2.2 + Allowed values for Personal Vehicle Categories _v1.2.2 @@ -557,5 +559,57 @@ Rail transport, Roads and Road transport + + + + Type for identifier of an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + Type for a reference to an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + + + + + Type for identifier of a TYPE OF DRIVER PERMIT. + + + + + + Reference to a TYPE OF DRIVER PERMIT. + + + + + Type for a reference to a TYPE OF DRIVER PERMIT. + + + + + + Reference to a TYPE OF DRIVER PERMIT. + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 62fe9f55d..e7499a046 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -38,6 +38,8 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the VEHICLE TYPE types.

@@ -100,8 +102,7 @@ Rail transport, Roads and Road transport - A classification of any type of VEHICLE according to its properties. - + A classification of any type of VEHICLE according to its properties. @@ -201,7 +202,7 @@ Rail transport, Roads and Road transport - The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2 + The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2 @@ -457,10 +458,79 @@ Rail transport, Roads and Road transport - Whether vehicle can be carried easily, e.g. scooter, skateboard, collapsible bicycle. - + Whether vehicle can be carried easily, e.g. scooter, skateboard, foldable bicycle. + + + + + Required permit to operate the vehicle. + + + + + + + + Type for a list of ACCEPTED DRIVER PERMITs. + + + + + + + + + + + + Accepted TYPE OF DRIVER PERMIT for a given SIMPLE VEHICLE TYPE. +V2.0 + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROFILE. + + + + + + + + + Type for an ACCEPTED DRIVER PERMIT. + + + + + + Elements for an ACCEPTED DRIVER PERMIT. + + + + + + + + Elements for a ACCEPTED DRIVER PERMIT. + + + + + Name of ACCEPTED DRIVER PERMIT. + @@ -634,7 +704,7 @@ Rail transport, Roads and Road transport - The total capacity of vehicles of the type. For a requirement this is the minimum needed. + The total capacity of vehicles of the type. For a requirement this is the minimum needed. @@ -644,7 +714,7 @@ Rail transport, Roads and Road transport - The standing capacity of vehicles of the type. For a requirement this is the minimum needed. + The standing capacity of vehicles of the type. For a requirement this is the minimum needed. @@ -973,7 +1043,7 @@ Rail transport, Roads and Road transport - Dae of registration or commissioning - may be used to determin age oif vehice + Date of registration or commissioning - may be used to determine the age of a vehice. @@ -1170,5 +1240,41 @@ Rail transport, Roads and Road transport + + + + A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence ). +V2.0 + + + + + + + + + + + + + + + + + + Identifier of the TYPE OF DRIVER PERMIT. + + + + + + + + + Type for a TYPE OF DRIVER PERMIT. + + + + + diff --git a/xsd/netex_framework/netex_utility/netex_units.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd index d058cabe6..c65e9a14f 100644 --- a/xsd/netex_framework/netex_utility/netex_units.xsd +++ b/xsd/netex_framework/netex_utility/netex_units.xsd @@ -81,11 +81,6 @@ Weight = Kilos Speed = Metres per second. - - - TYPO - DEPRECATED. - - 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 49ad9f364..2b994544c 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 @@ -758,22 +758,22 @@ Rail transport, Roads and Road transport - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd index f510fde3f..3ee3e7969 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd @@ -168,7 +168,6 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index f8dce69d0..dbca82563 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -240,10 +240,15 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. + + + List of PASSENGER INFORMATION Equipments. + + - List of predefined Passenger Info EQUIPMENT f. + List of predefined Passenger Info EQUIPMENT. diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd index 9e8052300..47918c6a2 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd @@ -136,7 +136,7 @@ Rail transport, Roads and Road transport - Allowed values for Meeting Usage. +v1.2.2 + Allowed values for meeting usage of VEHICLE MEETING POINTs. +v1.2.2