From 237fe94b4d7d2fc9fcb5d13a5b36bc9092c687ca Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Oct 2025 19:38:39 +0200 Subject: [PATCH 01/20] Transform non-extensions for reference to a regular restriction --- .../netex_generalFrame_version.xsd | 6 +-- .../netex_organisation_support.xsd | 6 +-- .../netex_path_support.xsd | 2 +- .../netex_spatialFeature_support.xsd | 4 +- .../netex_responsibility_support.xsd | 4 +- .../netex_country_support.xsd | 6 +-- .../netex_topographicPlace_support.xsd | 6 +-- .../netex_transportOrganisation_support.xsd | 26 ++++----- .../netex_ifopt_equipmentWaiting_support.xsd | 2 +- .../netex_ifopt_stopPlace_support.xsd | 2 +- .../netex_fareZone_support.xsd | 6 +-- .../netex_journeyTiming_support.xsd | 6 +-- .../netex_routingConstraint_support.xsd | 2 +- .../netex_servicePattern_support.xsd | 2 +- ...x_salesOfferPackageEntitlement_support.xsd | 2 +- .../part3_fares/netex_trip_support.xsd | 54 +++++++++---------- ...etex_usageParameterEligibility_support.xsd | 2 +- ..._mobilityServiceConstraintZone_support.xsd | 30 +++++------ 18 files changed, 84 insertions(+), 84 deletions(-) diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index 21cb9c098..23d151a0c 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -211,9 +211,9 @@ Rail transport, Roads and Road transport Type for a reference to a GENERAL FRAME MEMBER. - - - + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd index 93c244e43..55e5b4fa2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd @@ -177,9 +177,9 @@ Rail transport, Roads and Road transport Type for Reference to an ADMINISTRATIVE ZONE. Left untyped so as to avoid forwards dependency. - - - + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 0904e9865..30c2f7d66 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport Type for a reference to a PATH INSTRUCTION. - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd index 20a91c332..d055abb54 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd @@ -77,7 +77,7 @@ Rail transport, Roads and Road transport Type for a reference to a SIMPLE FEATURE. - + @@ -109,7 +109,7 @@ Rail transport, Roads and Road transport Type for a reference to a COMPLEX FEATURE. - + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index 4cf05bf2d..d86ba775a 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -228,7 +228,7 @@ Rail transport, Roads and Road transport Type for a reference to an ORGANISATION. - + @@ -302,7 +302,7 @@ Rail transport, Roads and Road transport Type for a reference to a BRANDING. - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd index d3244c564..792c1a8e0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd @@ -1337,9 +1337,9 @@ Rail transport, Roads and Road transport Reference to a country ISO 3166-1 Note that GB is used for UK . May be qualified with a 3166-2 subdivision e.g. gb +m ENG, GB + SCT, GB See www.iso.org/iso/country_codes/iso_3166_code_lists.htm. - - - + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd index 95b4081af..90c5082b5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd @@ -236,8 +236,8 @@ Rail transport, Roads and Road transport Type for a reference to a TOPOGRAPHIC PROJECTION - - - + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 367f42ca6..ff287bdde 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -67,7 +67,7 @@ Rail transport, Roads and Road transport Type for a reference to all TRANSPORT ORGANISATIONs. - + @@ -127,9 +127,9 @@ Rail transport, Roads and Road transport Type for a reference to all TRANSPORT ORGANISATIONs. - - - + + + @@ -165,9 +165,9 @@ Rail transport, Roads and Road transport Type for a reference to all OPERATORss. - - - + + + @@ -218,9 +218,9 @@ Rail transport, Roads and Road transport Type for a reference to all AUTHORITIES. - - - + + + @@ -380,9 +380,9 @@ Rail transport, Roads and Road transport Type for a reference to a TRANSPORT ADMINISTRATIVE ZONE. - - - + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd index 6f92f80f4..f6087c28c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport Type for a reference to an WAITING ROOM EQUIPMENT. - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 17cd88e84..30ed006f4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport Type for reference a STOP PLACE SPACE. - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd index 3dd7319ce..cbd0b629d 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd @@ -207,9 +207,9 @@ Rail transport, Roads and Road transport Type for Reference to a FARE ZONE. - - - + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd index ce944e5c2..5c0d007b0 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd @@ -120,9 +120,9 @@ Rail transport, Roads and Road transport Type for a reference to a HEADWAY. - - - + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index ba1f445fa..f62a1ea14 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport Type for a reference to a ROUTING CONSTRAINT ZONE. - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index 8d411d102..35d52b3bb 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -343,7 +343,7 @@ Rail transport, Roads and Road transport Type for a reference to a STOP AREA. - + diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd index 95efa3d08..94a692131 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd @@ -74,7 +74,7 @@ Rail transport, Roads and Road transport Type for Reference to a E SALES OFFER ENTITLEMENT REQUIRED parameter. - + diff --git a/xsd/netex_part_3/part3_fares/netex_trip_support.xsd b/xsd/netex_part_3/part3_fares/netex_trip_support.xsd index 9e0e989d2..96fa30c17 100644 --- a/xsd/netex_part_3/part3_fares/netex_trip_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_trip_support.xsd @@ -137,9 +137,9 @@ Rail transport, Roads and Road transport Type for Reference to a LEG. - - - + + + @@ -157,9 +157,9 @@ Rail transport, Roads and Road transport Type for Reference to a RIDE LEG. - - - + + + @@ -183,9 +183,9 @@ Rail transport, Roads and Road transport Type for Reference to a PT RIDE LEG. - - - + + + @@ -203,9 +203,9 @@ Rail transport, Roads and Road transport Type for Reference to a ALTERNATIVE MODE LEG. - - - + + + @@ -223,9 +223,9 @@ Rail transport, Roads and Road transport Type for Reference to a PRIVATE LEG. - - - + + + @@ -243,9 +243,9 @@ Rail transport, Roads and Road transport Type for Reference to a TRANSFER LEG. - - - + + + @@ -263,9 +263,9 @@ Rail transport, Roads and Road transport Type for Reference to a PT CONNECTION LEG. - - - + + + @@ -283,9 +283,9 @@ Rail transport, Roads and Road transport Type for Reference to a ACCESS LEG. - - - + + + @@ -303,9 +303,9 @@ Rail transport, Roads and Road transport Type for Reference to a RIDE PART. - - - + + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd index 819b591f1..31f2ad3fe 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd @@ -398,7 +398,7 @@ Rail transport, Roads and Road transport Type for a reference to a TYPE OF PROOF. - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index 3baeaffd3..9179a8eac 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -95,9 +95,9 @@ Rail transport, Roads and Road transport Type for Reference to an MOBILITY SERVICE CONSTRAINT ZONE. Left untyped so as to avoid forwards dependency. - - - + + + @@ -122,18 +122,18 @@ Rail transport, Roads and Road transport Reference to an VEHICLE TYPE ZONE RESTRICTION. +v1.2.2 - - - + + + Type for Reference to an VEHICLE TYPE ZONE RESTRICTION. Left untyped so as to avoid forwards dependency. - - - + + + @@ -190,18 +190,18 @@ Rail transport, Roads and Road transport Reference to an POOL OF VEHICLEs. +v1.2.2 - - - + + + Type for Reference to an POOL OF VEHICLEs ZONE. - - - + + + From 76a76481849c0f67a3b9982bc2b4a618fba11e16 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Oct 2025 20:30:29 +0200 Subject: [PATCH 02/20] Disable all fixed names that do not even appear in the schema. --- .../netex_organisation_version.xsd | 5 ++++- .../netex_genericFramework/netex_path_support.xsd | 3 +++ .../netex_nm_equipmentEnergy_version.xsd | 10 ++++++++-- .../netex_networkInfrastructure_support.xsd | 9 +++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 704190469..99a0aaecd 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -964,11 +964,14 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 30c2f7d66..1e02df4c7 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -114,11 +114,14 @@ Rail transport, Roads and Road transport Identifier of a POINT. at which LINK ends. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd index 616e06ee1..00184d4ab 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -311,11 +311,14 @@ points cannot exceed this value. - + @@ -348,11 +351,14 @@ points cannot exceed this value. - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd index a40d98d2b..be215fa55 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd @@ -239,11 +239,14 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. + @@ -295,11 +298,14 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. + @@ -351,11 +357,14 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. + From 477677ced3379dd96ee18dae3f3968ed97f08c80 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Oct 2025 20:56:53 +0200 Subject: [PATCH 03/20] Remove all abstract and unknown classes from NameOfClass fixed attributes --- .../netex_organisation_version.xsd | 9 +++------ .../netex_genericFramework/netex_path_support.xsd | 5 +---- .../netex_pointAndLinkSequence_version.xsd | 2 +- .../netex_pointAndLink_version.xsd | 4 ++-- .../netex_versionFrame_version.xsd | 2 +- .../netex_nm_equipmentEnergy_version.xsd | 10 ++-------- .../netex_ifopt_checkConstraint_version.xsd | 2 +- .../netex_line_version.xsd | 2 +- .../netex_networkInfrastructure_support.xsd | 15 +++------------ .../netex_fareStructureElement_version.xsd | 2 +- 10 files changed, 16 insertions(+), 37 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 99a0aaecd..0a6549e5c 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -890,7 +890,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -927,7 +927,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -964,14 +964,11 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 1e02df4c7..e92d094fa 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -114,14 +114,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. at which LINK ends. - diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd index 7a6128e3b..1b2298362 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd @@ -229,7 +229,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index aa6879bc6..9c7092650 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -354,7 +354,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -391,7 +391,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd index 245215a2b..fa2adc5fa 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd @@ -325,7 +325,7 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FRAME. - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd index 00184d4ab..96efa6d67 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -311,14 +311,11 @@ points cannot exceed this value. - @@ -351,14 +348,11 @@ points cannot exceed this value. - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd index a614152cf..27b809b24 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd @@ -455,7 +455,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. 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 06a645566..1356ab7b9 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -1141,7 +1141,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd index be215fa55..fa0b26c9f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd @@ -239,14 +239,11 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. - @@ -298,14 +295,11 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. - @@ -357,14 +351,11 @@ Rail transport, Roads and ROAD transport Identifier of a POINT. at which LINK ends. - diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd index 4c9b83014..67c95225d 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd @@ -372,7 +372,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. From f7cd25606c395460b8614e1b303ac6914eb839ec Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Oct 2025 21:04:30 +0200 Subject: [PATCH 04/20] Introduce highly controversial NameOfClass validation and fixes. --- .../simpleNetwork/Netex_uk_underground_1.xml | 6 +- ...07.2_Bus_FlexibleTimetable_WithPattern.xml | 12 +- .../validityCondition/NeTEx_trigger-01.xml | 2 +- .../variant/Netex_VariantExample_Step_05.xml | 2 +- .../standards/epip/epip_common_profile.xml | 195 +- ...AMSY_NETWORK_FARE_Arriva-pass_20200417.xml | 6 +- ...AMSY_NETWORK_FARE_Arriva-trip_20200417.xml | 6 +- ...FirstSheffield-pass-by-period_20200310.xml | 6 +- ...E_FirstSheffield-pass-by-user_20200310.xml | 6 +- ...RE_FirstSheffield-pass-simple_20200310.xml | 6 +- ...K_FARE_Metrorider-pass+others_20170101.xml | 6 +- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 6 +- ...RK_FARE_Metrorider-pass_basic_20170101.xml | 6 +- ...ETWORK_FARE_Travelmaster-pass_20200315.xml | 6 +- .../fxc/uk_fxc_addon_HSP_plusbus.xml | 6 +- .../standards/fxc/uk_fxc_common_profile.xml | 6 +- .../gtfs/Netex_gtfs_exm1_zz_Composite.xml | 4 +- ..._gtfs_fares_Example_7_zoneSequenceFare.xml | 2 +- .../RATP_Line7bis-extract-2009-NeTEx.xml | 6 +- ...PI-01_EI_NTA_Operators_COMMON_20200601.xml | 112 +- ...I-01_UK_DFT_STOP_NPTG-extract_20170101.xml | 6 +- ...K_DFT_STOP_NaPTAN-060+086+110_20171217.xml | 6 +- ..._SCWW_LINE_SCWW-86-simplified_20190101.xml | 6 +- .../txc/uk_nap_naptan_stops_extract1.xml | 8 +- .../txc/uk_nptg_localities_extract1.xml | 4 +- .../uk_txc_SCWW-86_extract1-with-sections.xml | 6 +- .../uk_txc_SCWW-86_extract2-simplified.xml | 6 +- examples/standards/txc/uk_txc_extract1.xml | 6 +- scripts/nameofclass.py | 235 + .../netex_entity_support.xsd | 4062 ++++++++++++++++- 30 files changed, 4521 insertions(+), 231 deletions(-) create mode 100644 scripts/nameofclass.py diff --git a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml index 2b7dc69db..dafba9574 100644 --- a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml +++ b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml @@ -114,10 +114,10 @@ A COMPOSITE FRAME Is used to group the above frames as a cohernet version. UK NaPTAN Stop Types - - Tram or Metro stop + + Tram or Metro stop - + Rail Station Entrance diff --git a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml index 183194286..0a46b7c29 100644 --- a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml +++ b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml @@ -455,26 +455,26 @@ The Calendar is shown coded as After Alpha t1 - + After Alpha t1 to After Alpha t2 - - + + After Alpha t2 to Bravo - + Bravo to After Bravo t1 - + After Bravo t1 to Charley - + diff --git a/examples/functions/validityCondition/NeTEx_trigger-01.xml b/examples/functions/validityCondition/NeTEx_trigger-01.xml index 5db37ef76..981f817c4 100644 --- a/examples/functions/validityCondition/NeTEx_trigger-01.xml +++ b/examples/functions/validityCondition/NeTEx_trigger-01.xml @@ -31,7 +31,7 @@ Use when Icy - EXTERNAL + EXTERNAL roadCondition EQ icy diff --git a/examples/functions/variant/Netex_VariantExample_Step_05.xml b/examples/functions/variant/Netex_VariantExample_Step_05.xml index 6e6ee91dc..20db27d1c 100644 --- a/examples/functions/variant/Netex_VariantExample_Step_05.xml +++ b/examples/functions/variant/Netex_VariantExample_Step_05.xml @@ -116,7 +116,7 @@ This is variant on the multistep SImple Network Version example on versioning. Use when Icy - EXTERNAL + EXTERNAL roadCondition EQ icy diff --git a/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml index 5df942c3c..24db66791 100644 --- a/examples/standards/epip/epip_common_profile.xml +++ b/examples/standards/epip/epip_common_profile.xml @@ -100,7 +100,7 @@ - + optional byReference @@ -111,7 +111,7 @@ - + optional byReference @@ -154,8 +154,8 @@ - - + + required byReference @@ -165,8 +165,8 @@ inline - - + + required byReference @@ -187,17 +187,17 @@ - + all required - - - - - - + + + + + + all @@ -206,13 +206,13 @@ - + all required - + memberReferences optional @@ -268,7 +268,7 @@ - + members @@ -279,7 +279,7 @@ - + all required @@ -396,7 +396,7 @@ - + all optional @@ -498,7 +498,7 @@ - + optional @@ -574,7 +574,7 @@ - + optional @@ -616,7 +616,7 @@ - + all optional @@ -698,7 +698,7 @@ - + members optional @@ -709,7 +709,7 @@ - + members optional @@ -727,7 +727,7 @@ - + members optional @@ -764,37 +764,35 @@ required - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all @@ -803,28 +801,27 @@ - + all required - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + all @@ -833,28 +830,28 @@ - + all required - - - - - - + + + + + + all EPIP Profile metadata - + - - - - + + + + @@ -875,23 +872,23 @@ Use Common definitions Use Common definitions - + all required - + all required - + all required - + all required - + all optional @@ -914,12 +911,12 @@ Use Common definitions Use Common definitions - epip:EU_PI_COMMON - epip:EU_PI_STOP - epip:EU_PI_NETWORK - epip:EU_PI_TIMETABLE - epip:EU_PI_CALENDAR - + epip:EU_PI_COMMON + epip:EU_PI_STOP + epip:EU_PI_NETWORK + epip:EU_PI_TIMETABLE + epip:EU_PI_CALENDAR + @@ -939,9 +936,9 @@ Use Common definitions Use Common definitions - - - + + + diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml index 64ee9b480..25b4a0dc6 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml @@ -3307,7 +3307,7 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -3467,7 +3467,7 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml index 8b0c1d227..1ba082580 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml @@ -2111,7 +2111,7 @@ We group the elements in separate frames NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -2271,7 +2271,7 @@ We group the elements in separate frames - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml index d74d4bdee..c4d4612b7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml @@ -7942,7 +7942,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -8102,7 +8102,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml index 76ee5a8d6..6b0824de3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml @@ -8031,7 +8031,7 @@ FirstUnlimited: 28 day | £74.00 NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -8191,7 +8191,7 @@ FirstUnlimited: 28 day | £74.00 - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index c523c96f7..88d42c1dc 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -8707,7 +8707,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -8867,7 +8867,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index 223e6e08a..4a4e0f639 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -7643,7 +7643,7 @@ This Shows sample Purchases NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -7803,7 +7803,7 @@ This Shows sample Purchases - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml index 1979db23f..9e171375d 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml @@ -4911,7 +4911,7 @@ This Shows sample Purchases NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -5071,7 +5071,7 @@ This Shows sample Purchases - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml index 0853004eb..983810af2 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml @@ -2407,7 +2407,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -2567,7 +2567,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml index 7950df0d5..339bb18d9 100644 --- a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml +++ b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml @@ -12513,7 +12513,7 @@ AllZone: SyConnect NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -12673,7 +12673,7 @@ AllZone: SyConnect - + required diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 191033a86..0449328f7 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -5392,7 +5392,7 @@ West Midlands Railway NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -5552,7 +5552,7 @@ West Midlands Railway - + required diff --git a/examples/standards/fxc/uk_fxc_common_profile.xml b/examples/standards/fxc/uk_fxc_common_profile.xml index 9a9403a72..fe09ce96e 100644 --- a/examples/standards/fxc/uk_fxc_common_profile.xml +++ b/examples/standards/fxc/uk_fxc_common_profile.xml @@ -1825,7 +1825,7 @@ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -1985,7 +1985,7 @@ - + required diff --git a/examples/standards/gtfs/Netex_gtfs_exm1_zz_Composite.xml b/examples/standards/gtfs/Netex_gtfs_exm1_zz_Composite.xml index ce2e16887..19168131c 100644 --- a/examples/standards/gtfs/Netex_gtfs_exm1_zz_Composite.xml +++ b/examples/standards/gtfs/Netex_gtfs_exm1_zz_Composite.xml @@ -1719,7 +1719,7 @@ version 1.1 with revised ids - + members @@ -1734,7 +1734,7 @@ version 1.1 with revised ids members - + optional inline all diff --git a/examples/standards/gtfs/Netex_gtfs_fares_Example_7_zoneSequenceFare.xml b/examples/standards/gtfs/Netex_gtfs_fares_Example_7_zoneSequenceFare.xml index 5fdb79094..a81e365de 100644 --- a/examples/standards/gtfs/Netex_gtfs_fares_Example_7_zoneSequenceFare.xml +++ b/examples/standards/gtfs/Netex_gtfs_fares_Example_7_zoneSequenceFare.xml @@ -440,7 +440,7 @@ v1.1 Revised to use Tarifff - + GTFS Built in Charging Methods: FareAttribute@payment_method diff --git a/examples/standards/neptune/RATP_Line7bis-extract-2009-NeTEx.xml b/examples/standards/neptune/RATP_Line7bis-extract-2009-NeTEx.xml index df64695c2..0b66098db 100644 --- a/examples/standards/neptune/RATP_Line7bis-extract-2009-NeTEx.xml +++ b/examples/standards/neptune/RATP_Line7bis-extract-2009-NeTEx.xml @@ -112,11 +112,11 @@ So the NeTEx File will probably be something like 50% bigger with the same level - + Neptune Profile:ServiceCalendar Frame - + - + diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml index 362f2163d..926b5a4d6 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml @@ -762,74 +762,74 @@ This Example shows an extract of real Irish Operator data encoded in NeT Typpes of Organisation - + All Eire - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Coach - + Coach - - - - - + + + + + Local Link - - - - - - + + + + + + Dublin - - - - - - - - - - - - - - + + + + + + + + + + + + + + Ferry - + Ferry diff --git a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml index 4a6c77be9..06c900dc5 100644 --- a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml +++ b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml @@ -9658,7 +9658,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -9818,7 +9818,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + required diff --git a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml index a14d6a465..9e744b4d0 100644 --- a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml +++ b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml @@ -925,7 +925,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -1085,7 +1085,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + required diff --git a/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml b/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml index 37cce43c7..264f14d8c 100644 --- a/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml +++ b/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml @@ -8687,7 +8687,7 @@ TXC NETEX NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -8847,7 +8847,7 @@ TXC NETEX - + required diff --git a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml index dd833b9c6..548a80f82 100644 --- a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml +++ b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml @@ -1161,7 +1161,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + optional @@ -1406,7 +1406,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -1566,7 +1566,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + required diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml index 3784f5bf1..dc3d002f2 100644 --- a/examples/standards/txc/uk_nptg_localities_extract1.xml +++ b/examples/standards/txc/uk_nptg_localities_extract1.xml @@ -9622,7 +9622,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + optional byVersionedReference @@ -9643,7 +9643,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + required diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml index e75149170..5987deb19 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml @@ -9262,7 +9262,7 @@ TXC NETEX NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -9422,7 +9422,7 @@ TXC NETEX - + required diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml index 37dad24be..adaa62734 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml @@ -8620,7 +8620,7 @@ TXC NETEX NPTG Locations and Tariff Zones Frame - + - + optional byVersionedReference @@ -8780,7 +8780,7 @@ TXC NETEX - + required diff --git a/examples/standards/txc/uk_txc_extract1.xml b/examples/standards/txc/uk_txc_extract1.xml index 5b492da19..2dae24857 100644 --- a/examples/standards/txc/uk_txc_extract1.xml +++ b/examples/standards/txc/uk_txc_extract1.xml @@ -8776,7 +8776,7 @@ TXC NETEX - + optional @@ -9160,7 +9160,7 @@ TXC NETEX - + optional byVersionedReference @@ -9181,7 +9181,7 @@ TXC NETEX - + required diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py new file mode 100644 index 000000000..8f6a04a22 --- /dev/null +++ b/scripts/nameofclass.py @@ -0,0 +1,235 @@ +import json +import sys + +from lxml import etree +from pathlib import Path +from collections import defaultdict + +def update_nameofclass_simpletype(schema_file: Path, element_names: list[str]): + """ + Replace existing definition with a + generated one containing enumerations for all element names. + """ + ns = {"xsd": "http://www.w3.org/2001/XMLSchema"} + + parser = etree.XMLParser(remove_blank_text=False) + tree = etree.parse(str(schema_file), parser) + root = tree.getroot() + + existing = root.find(".//xsd:simpleType[@name='NameOfClass']", namespaces=ns) + if existing is None: + print(f"⚠️ No NameOfClass found in {schema_file.name}") + return + + indent = " " + newline = "\n" + + new_simple_type = etree.Element("{http://www.w3.org/2001/XMLSchema}simpleType", name="NameOfClass") + new_simple_type.text = newline + indent + + annotation = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation") + annotation.text = newline + indent * 2 + doc = etree.SubElement(annotation, "{http://www.w3.org/2001/XMLSchema}documentation") + doc.text = "Type for name of all classes within NeTEx." + doc.tail = newline + indent + annotation.tail = newline + indent + + restriction = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:Name") + restriction.text = newline + indent * 2 + + for name in element_names: + enum_el = etree.SubElement(restriction, "{http://www.w3.org/2001/XMLSchema}enumeration", value=name) + enum_el.tail = newline + indent * 2 + + restriction.tail = newline + indent + new_simple_type.tail = newline + indent + + # Plaats op zelfde plek als de oude + parent = existing.getparent() + parent.replace(existing, new_simple_type) + + tree.write( + str(schema_file), + encoding="utf-8", + xml_declaration=True, + pretty_print=True, + ) + + print(f"✅ Updated NameOfClass in {schema_file.name} ({len(element_names)} enumerations)") + +def update_nameofclass_ref_attributes( + base_dir: Path, + entity_file: Path, + entity_dependency_graph: dict[str, list[str]], + abstract_classes: set[str], +): + """ + Update all RefStructures across XSD files: + - Generate or replace NameOfClassXXX simpleTypes in entity_file. + - Add or replace `nameOfRefClass` attribute in each RefStructure. + - Supports Variant A: preserves sequences/choices/all/groups; handles simpleContent/complexContent. + """ + ns = {"xsd": "http://www.w3.org/2001/XMLSchema"} + parser = etree.XMLParser(remove_blank_text=True) + + # --- Load entity_file (where NameOfClassXXX types will be added) --- + entity_tree = etree.parse(str(entity_file), parser) + entity_root = entity_tree.getroot() + name_of_class_elem = entity_root.find(".//xsd:simpleType[@name='NameOfClass']", namespaces=ns) + if name_of_class_elem is None: + raise RuntimeError(f"No NameOfClass found in {entity_file.name}") + + # --- Iterate over all schema files --- + for schema_file in base_dir.rglob("*.xsd"): + if "xsd/netex" not in str(schema_file): + continue + + tree = etree.parse(str(schema_file), parser) + root = tree.getroot() + modified = False + dont = False + + # --- Find all complexTypes ending with RefStructure --- + for ref_complex in root.findall(".//xsd:complexType", namespaces=ns): + ref_name = ref_complex.get("name") + if not ref_name or not ref_name.endswith("RefStructure"): + continue + + natural_class = ref_name.replace("RefStructure", "") + if natural_class == 'LinkSequence': + pass + + if natural_class in entity_dependency_graph.keys(): + # Determine all concrete descendants + concrete_classes = [ + cls + for cls in entity_dependency_graph.get(natural_class, []) + if cls not in abstract_classes + ] + if natural_class not in abstract_classes: + concrete_classes.append(natural_class) + concrete_classes = sorted(set(concrete_classes)) + if not concrete_classes: + continue # nothing to add + + # --- Generate or replace NameOfClassXXX simpleType in entity_file --- + simple_type_name = f"NameOfClass{ref_name}" + existing_st = entity_root.find(f".//xsd:simpleType[@name='{simple_type_name}']", namespaces=ns) + + new_simple_type = etree.Element("{http://www.w3.org/2001/XMLSchema}simpleType", name=simple_type_name) + ann = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation") + doc = etree.SubElement(ann, "{http://www.w3.org/2001/XMLSchema}documentation") + doc.text = f"Type for all concrete EntityStructures that can be referenced from {natural_class}" + + restriction = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", base="NameOfClass") + for cls in concrete_classes: + etree.SubElement(restriction, "{http://www.w3.org/2001/XMLSchema}enumeration", value=cls) + + if existing_st is not None: + parent = existing_st.getparent() + parent.replace(existing_st, new_simple_type) + else: + idx = list(entity_root).index(name_of_class_elem) + entity_root.insert(idx + 1, new_simple_type) + + # --- Determine where to place the attribute --- + # Variant A: if there are child elements (sequence/choice/all/group), place directly in complexType + child_container = None + for tag in ("sequence", "choice", "all", "group"): + child_container = ref_complex.find(f"{{http://www.w3.org/2001/XMLSchema}}{tag}") + if child_container is not None: + break + + if child_container is not None: + # Place attribute directly in complexType + parent_for_attr = ref_complex + else: + # Search for existing simpleContent or complexContent + extension/restriction + parent_for_attr = None + for tag in ("simpleContent", "complexContent"): + elem = ref_complex.find(f"{{http://www.w3.org/2001/XMLSchema}}{tag}") + if elem is not None: + # take the first child (extension or restriction) + child = next((c for c in elem if etree.QName(c).localname in ("extension", "restriction")), None) + if child is not None: + if etree.QName(child).localname == 'extension': + print(f"WARNING: extension found in {ref_complex}") + dont = True + + parent_for_attr = child + break + else: + # If simpleContent exists but no extension/restriction → create restriction + parent_for_attr = etree.SubElement(elem, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:string") + break + # If still None, create new simpleContent/restriction + if parent_for_attr is None: + elem = etree.SubElement(ref_complex, "{http://www.w3.org/2001/XMLSchema}simpleContent") + parent_for_attr = etree.SubElement(elem, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:string") + + # --- Add or replace nameOfRefClass attribute --- + existing_attr = parent_for_attr.find("{http://www.w3.org/2001/XMLSchema}attribute[@name='nameOfRefClass']") + if existing_attr is not None: + parent_for_attr.remove(existing_attr) + + attrib = etree.Element( + "{http://www.w3.org/2001/XMLSchema}attribute", + name="nameOfRefClass", + type=simple_type_name, + ) + if natural_class in abstract_classes: + # attrib.attrib["use"] = "required" + pass + else: + attrib.attrib["default"] = natural_class + + ann = etree.SubElement(attrib, "{http://www.w3.org/2001/XMLSchema}annotation") + doc = etree.SubElement(ann, "{http://www.w3.org/2001/XMLSchema}documentation") + doc.text = f"Automatic reference class for {ref_name}" + + parent_for_attr.append(attrib) + modified = True + else: + print(f"WARNING: {ref_name} has an unknown {natural_class}. Skipping") + + # --- Write file if modified --- + if modified and not dont: + str(schema_file), + tree.write( + str(schema_file), + encoding="utf-8", + xml_declaration=True, + pretty_print=True, + ) + print(f"🔧 Updated RefStructures in {schema_file.name}") + + # --- Write back entity_file with updated NameOfClassXXX --- + entity_tree.write( + str(entity_file), + encoding="utf-8", + xml_declaration=True, + pretty_print=True, + ) + print(f"✅ Updated NameOfClassXXX simpleTypes in {entity_file.name}") + + +if __name__ == "__main__": + from dependencygraph import XSDDependencyAnalyzer + + base_dir = Path(sys.argv[1]) + target_namespace = "http://www.netex.org.uk/netex" # pas aan indien nodig + schema_with_nameofclass = base_dir / "netex_framework/netex_responsibility/netex_entity_support.xsd" + + # Bouw dependency graph + abstract classes + analyzer = XSDDependencyAnalyzer() + analyzer.parse_schemas([base_dir]) + analyzer.build_dependency_graph() + entity_dependency_graph = analyzer.get_simple_graph(None) + abstract_classes = analyzer.abstract_elements + + # NameOfClass vervangen + interesting_classes = set([x for x in entity_dependency_graph.keys() if not x.endswith("_Dummy") and not x.endswith("_DummyType")]) + update_nameofclass_simpletype(schema_with_nameofclass, sorted(list(interesting_classes))) + + # Update RefStructure types + nameOfRefClass attribuut + # update_nameofclass_ref_attributes(base_dir, schema_with_nameofclass, entity_dependency_graph, abstract_classes) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 5f476ac09..8f9c3d9e3 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -109,9 +109,4067 @@ Rail transport, Roads and Road transport - Type for name of a class of an ENTITY. + Type for name of all classes within NeTEx. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ad834cf88186ae61023eb85e17d0d883ca5aeabe Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 01:30:51 +0200 Subject: [PATCH 05/20] First referencing class constraints This is the first working attempt to add additional information to NeTEx references, enabling access to the class that each reference points to. The implementation processes all VersionOfObjectRefStructure variants and builds a hierarchical tree of them. This allows defining defaults, for example, a ScheduledStopPointRef normally points to a ScheduledStopPoint. If it instead points to a FareScheduledStopPoint, this is validated and allowed, because FareScheduledStopPoint is a descendant of ScheduledStopPoint. The reverse, however, is not allowed: a TimingPoint cannot be referenced by a ScheduledStopPointRef. There are several issues that still need to be addressed. Therefore, this implementation deliberately takes an incremental approach rather than aiming for a 100% complete solution, especially since the NeTEx XML Schema itself is not fully consistent or correct. The complex-types-included file is generated by a script that computes all *Ref elements ultimately derived from VersionOfObjectRefStructure. For these elements, all associated complex types are extracted and stored in complex-types-included. There is also a negative list, complex-types-excluded. During development of this feature, it became clear that several complex types or cascades caused issues; instead of fixing hundreds of validation errors immediately, this list allows us to focus on the positive results of the working cases first. In addition to the exclusion list, the script/nameofclass.py logic skips variants for which no clear relationship can be found between a reference and its corresponding class. Given the number of references now correctly resolved, it is clear how valuable this approach is and why it should be further pursued to reduce the exclusion list over time. --- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-full.xml | 2 +- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml | 2 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml | 2 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml | 2 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml | 2 +- scripts/complex-types-excluded | 47 + scripts/complex-types-included | 733 ++ scripts/nameofclass.py | 185 +- .../netex_compositeFrame_version.xsd | 5 + .../netex_generalFrame_version.xsd | 13 +- .../netex_resourceFrame_support.xsd | 5 + .../netex_acsb_support.xsd | 5 + .../netex_alternativeName_support.xsd | 8 +- .../netex_assignment_support.xsd | 5 + .../netex_grouping_support.xsd | 15 + .../netex_layer_support.xsd | 5 + .../netex_loggable_support.xsd | 5 + .../netex_organisation_support.xsd | 30 + .../netex_path_support.xsd | 28 +- .../netex_place_support.xsd | 25 + .../netex_pointAndLinkSequence_support.xsd | 10 + .../netex_pointAndLink_support.xsd | 20 + .../netex_projection_support.xsd | 35 + .../netex_section_support.xsd | 10 + .../netex_spatialFeature_support.xsd | 5 + .../netex_zone_support.xsd | 5 + .../netex_zone_version.xsd | 5 + .../netex_alternativeText_support.xsd | 8 +- .../netex_entity_support.xsd | 6072 +++++++++++++++++ .../netex_relationship.xsd | 5 + .../netex_relationship_support.xsd | 10 + .../netex_responsibilitySet_support.xsd | 10 + .../netex_responsibility_support.xsd | 31 +- .../netex_validityCondition_support.xsd | 15 + .../netex_versionFrame_support.xsd | 15 + .../netex_address_support.xsd | 15 + .../netex_availabilityCondition_support.xsd | 5 + .../netex_dayType_support.xsd | 15 + .../netex_deckPath_support.xsd | 15 + .../netex_deckPlan_support.xsd | 85 + ...etex_equipmentVehiclePassenger_support.xsd | 5 + .../netex_equipment_support.xsd | 30 + .../netex_facility_support.xsd | 30 + .../netex_modeOfOperation_support.xsd | 20 + .../netex_mode_support.xsd | 10 + ...ex_nm_chargingEquipmentProfile_support.xsd | 5 + .../netex_nm_equipmentEnergy_support.xsd | 25 + .../netex_nm_fleetEquipment_support.xsd | 15 + .../netex_nm_fleet_support.xsd | 10 + .../netex_notice_support.xsd | 20 + .../netex_otherOrganisation_support.xsd | 25 + .../netex_schematicMap_support.xsd | 5 + .../netex_seatingPlan_support.xsd | 40 + .../netex_securityList_support.xsd | 25 + .../netex_sensorEquipment_support.xsd | 25 + .../netex_serviceCalendar_support.xsd | 20 + .../netex_serviceRestrictions_support.xsd | 20 + .../netex_spotAffinity_support.xsd | 5 + .../netex_spotEquipment_support.xsd | 20 + .../netex_topographicPlace_support.xsd | 18 +- .../netex_trainElementType_support.xsd | 20 + .../netex_trainElement_support.xsd | 20 + .../netex_transportOrganisation_support.xsd | 30 + .../netex_vehicleType_support.xsd | 75 + .../netex_vehicle_support.xsd | 30 + .../netex_infrastructureFrame_version.xsd | 5 + .../part1_frames/netex_siteFrame_version.xsd | 5 + .../netex_assistanceBooking_support.xsd | 5 + .../netex_ifopt_checkConstraint_support.xsd | 20 + .../netex_ifopt_equipmentAccess_support.xsd | 25 + .../netex_ifopt_equipmentParking_support.xsd | 10 + .../netex_ifopt_equipmentSigns_support.xsd | 15 + ...netex_ifopt_equipmentTicketing_support.xsd | 10 + .../netex_ifopt_equipmentWaiting_support.xsd | 33 +- .../netex_ifopt_flexibleStopPlace_support.xsd | 20 + ...x_ifopt_localServiceCommercial_support.xsd | 25 + .../netex_ifopt_localService_support.xsd | 45 + .../netex_ifopt_parking_support.xsd | 39 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 15 + .../netex_ifopt_pointOfInterest_support.xsd | 15 + .../netex_ifopt_serviceFeature_support.xsd | 5 + .../part1_ifopt/netex_ifopt_site_support.xsd | 50 + .../netex_ifopt_stopPlace_support.xsd | 43 +- .../netex_ifopt_vehicleStopping_support.xsd | 20 + ...etex_rechargingPointAssignment_support.xsd | 15 + .../part1_ifopt/netex_taxiPlace_support.xsd | 15 + .../netex_activation_support.xsd | 35 + .../netex_flexibleNetwork_support.xsd | 15 + .../netex_lineNetwork_support.xsd | 10 + .../netex_line_support.xsd | 35 + .../netex_networkInfrastructure_support.xsd | 10 + .../netex_networkRestriction_support.xsd | 30 + .../netex_routeInstruction_support.xsd | 5 + .../netex_route_support.xsd | 30 + .../netex_timingPattern_support.xsd | 20 + .../netex_vehicleAndCrewPoint_support.xsd | 25 + .../netex_commonSection_support.xsd | 5 + .../netex_fareZone_support.xsd | 20 + .../netex_journeyPatternTimings_support.xsd | 10 + .../netex_journeyPattern_support.xsd | 35 + .../netex_journeyTiming_support.xsd | 18 +- ..._passengerInformationEquipment_support.xsd | 20 + .../netex_routingConstraint_support.xsd | 10 + .../netex_servicePattern_support.xsd | 30 + .../netex_siteConnection_support.xsd | 10 + .../netex_stopAssignment_support.xsd | 20 + .../netex_timeDemandType_support.xsd | 20 + .../netex_serviceFrame_version.xsd | 5 + .../netex_timetableFrame_support.xsd | 15 + .../part2_journeyTimes/netex_call_support.xsd | 5 + .../netex_coupledJourney_support.xsd | 40 + .../netex_datedVehicleJourney_support.xsd | 5 + .../netex_deckEntranceAssignment_support.xsd | 5 + .../netex_deckPlanAssignment_support.xsd | 5 + .../netex_flexibleService_support.xsd | 10 + .../netex_interchange_support.xsd | 35 + .../netex_journeyAccounting_support.xsd | 5 + .../netex_journey_facility_support.xsd | 5 + .../netex_serviceJourney_support.xsd | 15 + .../netex_vehicleJourneyFrequency_support.xsd | 20 + ...x_vehicleJourneyStopAssignment_support.xsd | 20 + .../netex_vehicleJourney_support.xsd | 25 + .../netex_vehicleService_support.xsd | 25 + .../netex_oc_occupancy_version.xsd | 5 + .../netex_duty_support.xsd | 25 + .../netex_vehicleRechargingPlan_support.xsd | 10 + .../netex_accessRightParameter_support.xsd | 5 + .../netex_calculationParameters_support.xsd | 40 + .../netex_distanceMatrixElement_support.xsd | 5 + .../part3_fares/netex_farePrice_support.xsd | 15 + .../part3_fares/netex_fareProduct_support.xsd | 80 + .../part3_fares/netex_fareSeries_support.xsd | 10 + .../netex_fareStructureElement_support.xsd | 30 + .../netex_fareStructure_support.xsd | 25 + .../part3_fares/netex_fareTable_support.xsd | 30 + ...etex_geographicStructureFactor_support.xsd | 25 + .../netex_qualityStructureFactor_support.xsd | 20 + .../netex_salesDistribution_support.xsd | 15 + ...x_salesOfferPackageEntitlement_support.xsd | 13 +- .../netex_salesOfferPackage_support.xsd | 35 + .../netex_timeStructureFactor_support.xsd | 25 + .../netex_typeOfTravelDocument_support.xsd | 10 + ...netex_usageParameterAfterSales_support.xsd | 25 + .../netex_usageParameterBooking_support.xsd | 20 + .../netex_usageParameterCharging_support.xsd | 15 + ...etex_usageParameterEligibility_support.xsd | 38 +- ...etex_usageParameterEntitlement_support.xsd | 10 + .../netex_usageParameterLuggage_support.xsd | 5 + .../netex_usageParameterTravel_support.xsd | 40 + .../netex_usageParameter_support.xsd | 20 + .../netex_validableElement_support.xsd | 25 + .../part3_frames/netex_fareFrame_version.xsd | 10 + .../netex_salesTransactionFrame_version.xsd | 5 + .../netex_parkingTariff_support.xsd | 15 + .../netex_customerEligibility_support.xsd | 20 + .../netex_customerPaymentMeans_support.xsd | 5 + .../netex_customerPurchasePackage_support.xsd | 30 + .../netex_fareDebit_support.xsd | 30 + .../netex_mediumApplication_support.xsd | 35 + .../netex_retailConsortium_support.xsd | 20 + .../netex_salesContract_support.xsd | 55 + .../netex_salesTransaction_support.xsd | 5 + .../netex_spotAllocation_support.xsd | 10 + .../netex_travelDocument_support.xsd | 10 + ...nm_accessCredentialsAssignment_support.xsd | 10 + .../netex_nm_individualTraveller_support.xsd | 15 + ...x_nm_usageParameterEligibility_support.xsd | 5 + .../netex_nm_usageParameterRental_support.xsd | 15 + .../netex_nm_mobilityJourneyFrame_version.xsd | 5 + .../netex_nm_mobilityServiceFrame_version.xsd | 5 + .../netex_nm_vehicleMeetingPlace_support.xsd | 30 + ..._vehicleMeetingPointAssignment_support.xsd | 10 + .../netex_nm_vehicleMeetingPoint_support.xsd | 5 + ..._vehicleParkingAreaInformation_support.xsd | 10 + ..._vehicleServicePlaceAssignment_support.xsd | 20 + .../netex_nm_mobilityService_support.xsd | 45 + .../netex_nm_onlineService_support.xsd | 10 + .../netex_nm_singleJourneyPath_support.xsd | 5 + .../netex_nm_singleJourneyService_support.xsd | 10 + 180 files changed, 10157 insertions(+), 67 deletions(-) create mode 100644 scripts/complex-types-excluded create mode 100644 scripts/complex-types-included diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index 81cbe3723..5fc9264b5 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -3809,7 +3809,7 @@ Q.4. Public holiday - Services do not run on a christams day - true - + diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml index 85a056748..4b774fb85 100644 --- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml +++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml @@ -59,7 +59,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML collects distributes operation reservation - + diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml index 23bbcbf8e..0186da0d0 100644 --- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml +++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml @@ -55,7 +55,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML collects distributes operation reservation - + diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml index f61f143e2..f0c1ba821 100644 --- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml +++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml @@ -19780,7 +19780,7 @@ PCGO1080XXX0003 collects distributes operation reservation - + diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml index a77ae2db9..41281cae0 100644 --- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml +++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml @@ -18140,7 +18140,7 @@ PCZO1181XXX0143 collects distributes operation reservation - + diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml index 528898f17..c0157229f 100644 --- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml +++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml @@ -29671,7 +29671,7 @@ PCZO0071XXX0143 collects distributes operation reservation - + diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded new file mode 100644 index 000000000..df6612c25 --- /dev/null +++ b/scripts/complex-types-excluded @@ -0,0 +1,47 @@ +PointOnLinkRefStructure +GroupOfPointsRefStructure +TariffZoneRefStructure +AdministrativeZoneRefStructure +PassengerEquipmentRefStructure +AuthorityRefStructure +TransportAdministrativeZoneRefStructure +ClassOfUseRefStructure +TypeOfPaymentMethodRefStructure +AccessVehicleEquipmentRefStructure +CompoundTrainRefStructure +ServiceCalendarFrameRefStructure +TurnaroundTimeLimitTimeRefStructure +VehicleTypePreferenceRefStructure +PointOfInterestSpaceRefStructure +ParkingPassengerEntranceRefStructure +ParkingEntranceForVehiclesRefStructure +DistanceMatrixElementRefStructure +SeriesConstraintRefStructure +MobilityServiceConstraintZoneRefStructure +VehicleTypeZoneRestrictionRefStructure +PoolOfVehiclesRefStructure +RubbishDisposalEquipmentRefStructure +PassengerBeaconEquipmentRefStructure +HelpPointEquipmentRefStructure +PassengerSafetyEquipmentRefStructure +SanitaryEquipmentRefStructure +FareZoneRefStructure +ZoneRefStructure +ComplexFeatureRefStructure +SimpleFeatureRefStructure +AccessZoneRefStructure +StopAreaRefStructure +RoutingConstraintZoneRefStructure +GenericPathJunctionRefStructure +PassingTimeRefStructure +PricingRuleRefStructure +SitePathJunctionRefStructure +TimetabledPassingTimeRefStructure +EstimatedPassingTimeRefStructure +ObservedPassingTimeRefStructure +TargetPassingTimeRefStructure +PassengerAtStopTimeRefStructure +DiscountingRuleRefStructure +LimitingRuleRefStructure +TypeOfOrganisationPartRefStructure +SchematicMapMemberRefStructure diff --git a/scripts/complex-types-included b/scripts/complex-types-included new file mode 100644 index 000000000..61140884c --- /dev/null +++ b/scripts/complex-types-included @@ -0,0 +1,733 @@ +AcceptedDriverPermitRefStructure +AccessEquipmentRefStructure +AccessibilityAssessmentRefStructure +AccessLegRefStructure +AccessRefStructure +AccessRightInProductRefStructure +AccessSpaceRefStructure +AccessVehicleEquipmentRefStructure +AccessZoneRefStructure +AccommodationRefStructure +AccountableElementRefStructure +ActivatedEquipmentRefStructure +ActivationAssignmentRefStructure +ActivationLinkRefStructure +ActivationPointRefStructure +AdditionalDriverOptionRefStructure +AddressablePlaceRefStructure +AddressRefStructure +AdministrativeZoneRefStructure +AllAuthoritiesRefStructure +AllCountriesRefStructure +AllOperatorsRefStructure +AllOrganisationsRefStructure +AllowedLineDirectionRefStructure +AllPublicTransportOrganisationsRefStructure +AllTransportOrganisationsRefStructure +AlternativeModeLegRefStructure +AlternativeModeOfOperationRefStructure +AlternativeNameRefStructure +AlternativeTextRefStructure +AmountOfPriceUnitProductRefStructure +AssignmentRefStructure +AssistanceBookingServiceRefStructure +AssistanceServiceRefStructure +AuthorityRefStructure +AvailabilityConditionRefStructure +BatteryEquipmentRefStructure +BeaconPointRefStructure +BedEquipmentRefStructure +BlacklistRefStructure +BlockPartRefStructure +BlockRefStructure +BoardingPositionRefStructure +BookingArrangementRefStructure +BookingDebitRefStructure +BookingPolicyRefStructure +BorderPointRefStructure +BrandingRefStructure +CallRefStructure +CancellingRefStructure +CappedDiscountRightRefStructure +CappingRulePriceRefStructure +CappingRuleRefStructure +CarModelProfileRefStructure +CarPoolingServiceRefStructure +CateringServiceRefStructure +CellRefStructure +ChargingMomentRefStructure +ChargingPolicyRefStructure +ChauffeuredVehicleServiceRefStructure +CheckConstraintDelayRefStructure +CheckConstraintRefStructure +CheckConstraintThroughputRefStructure +ClassOfUseRefStructure +CommercialProfileEligibilityRefStructure +CommercialProfileRefStructure +CommonSectionRefStructure +CommonVehicleServiceRefStructure +CommunicationServiceRefStructure +CompanionProfileRefStructure +ComplaintsServiceRefStructure +ComplexFeatureProjectionRefStructure +ComplexFeatureRefStructure +CompositeFrameRefStructure +CompoundBlockRefStructure +CompoundTrainRefStructure +ConnectionRefStructure +ContactRefStructure +ContractRefStructure +ControlCentreRefStructure +ControllableElementInSequenceRefStructure +ControllableElementPriceRefStructure +ControllableElementRefStructure +ConventionalModeOfOperationRefStructure +CoupledJourneyRefStructure +CourseOfJourneysRefStructure +CrewBaseRefStructure +CustomerAccountRefStructure +CustomerAccountSecurityListingRefStructure +CustomerAccountStatusRefStructure +CustomerEligibilityRefStructure +CustomerPaymentMeansRefStructure +CustomerPurchasePackageElementRefStructure +CustomerPurchasePackagePriceRefStructure +CustomerPurchasePackageRefStructure +CustomerRefStructure +CustomerSecurityListingRefStructure +CustomerServiceRefStructure +CycleModelProfileRefStructure +CycleStorageEquipmentRefStructure +DataSourceRefStructure +DatedSpecialServiceRefStructure +DayTypeAssignmentRefStructure +DayTypeRefStructure +DeadRunJourneyPatternRefStructure +DeadRunRefStructure +DeckComponentRefStructure +deckEntranceAssignmentRefStructure +DeckEntranceCoupleRefStructure +DeckEntranceRefStructure +DeckEntranceUsageRefStructure +DeckLevelRefStructure +DeckNavigationPathRefStructure +DeckPathLinkRefStructure +DeckPlaceInSequenceRefStructure +DeckPlanAssignmentRefStructure +DeckPlanRefStructure +DeckRefStructure +DeckSpaceCapacityRefStructure +DeckSpaceRefStructure +DeckVehicleEntranceRefStructure +DeckWindowRefStructure +DefaultConnectionRefStructure +DefaultDeadRunRunTimeRefStructure +DefaultInterchangeRefStructure +DefaultServiceJourneyTimeRefStructure +DeliveryVariantRefStructure +DepartmentRefStructure +DestinationDisplayRefStructure +DestinationDisplayVariantRefStructure +DirectionRefStructure +DiscountingRuleRefStructure +DisplayAssignmentRefStructure +DistanceMatrixElementPriceRefStructure +DistanceMatrixElementRefStructure +DistributionAssignmentRefStructure +DriverRefStructure +DriverScheduleFrameRefStructure +DriverTripRefStructure +DriverTripTimeRefStructure +DutyPartRefStructure +DutyRefStructure +DynamicStopAssignmentRefStructure +DynamicVehicleMeetingPointAssignmentRefStructure +EligibilityChangePolicyRefStructure +EmvCardRefStructure +EntitlementGivenRefStructure +EntitlementProductRefStructure +EntitlementRequiredRefStructure +EntranceEquipmentRefStructure +EntranceRefStructure +EntranceSensorRefStructure +EquipmentPlaceRefStructure +EquipmentPositionRefStructure +EquipmentRefStructure +EstimatedPassingTimeRefStructure +ExchangingRefStructure +FacilityRefStructure +FacilityRequirementRefStructure +FacilitySetRefStructure +FareContractEntryRefStructure +FareContractRefStructure +FareContractSecurityListingRefStructure +FareDayTypeRefStructure +FareDebitRefStructure +FareDemandFactorRefStructure +FareElementInSequenceRefStructure +FareFrameRefStructure +FareIntervalRefStructure +FarePointInPatternRefStructure +FarePriceFrameRefStructure +FarePriceRefStructure +FareProductPriceRefStructure +FareProductRefStructure +FareProductSaleDebitRefStructure +FareQuotaFactorRefStructure +FareRequestRefStructure +FareScheduledStopPointRefStructure +FareSectionRefStructure +FareStructureElementInSequenceRefStructure +FareStructureElementPriceRefStructure +FareStructureElementRefStructure +FareStructureFactorRefStructure +FareTableColumnRefStructure +FareTableRefStructure +FareTableRowRefStructure +FareUnitRefStructure +FareZoneRefStructure +FleetRefStructure +FlexibleAreaRefStructure +FlexibleLineRefStructure +FlexibleLinkPropertiesRefStructure +FlexibleModeOfOperationRefStructure +FlexiblePointPropertiesRefStructure +FlexibleQuayRefStructure +FlexibleServiceAssignmentRefStructure +FlexibleServicePropertiesRefStructure +FlexibleStopPlaceRefStructure +FrequencyOfUseRefStructure +FulfilmentMethodPriceRefStructure +FulfilmentMethodRefStructure +GaragePointRefStructure +GarageRefStructure +GeneralFrameMemberRefStructure +GeneralFrameRefStructure +GeneralGroupOfEntitiesRefStructure +GeneralOrganisationRefStructure +GeneralSectionRefStructure +GeneralSignRefStructure +GenericNavigationPathRefStructure +GenericPathJunctionRefStructure +GenericPathLinkRefStructure +GeographicalIntervalPriceRefStructure +GeographicalIntervalRefStructure +GeographicalStructureFactorRefStructure +GeographicalUnitPriceRefStructure +GeographicalUnitRefStructure +GroupOfCustomerPurchasePackagesRefStructure +GroupOfDistributionChannelsRefStructure +GroupOfEntitiesRefStructure +GroupOfLinesRefStructure +GroupOfOperatorsRefStructure +GroupOfPlacesRefStructure +GroupOfPointsRefStructure +GroupOfSalesOfferPackagesRefStructure +GroupOfServicesRefStructure +GroupOfSingleJourneysRefStructure +GroupOfSitesRefStructure +GroupOfStopPlacesRefStructure +GroupOfTariffZonesRefStructure +GroupOfTimebandsRefStructure +GroupOfTimingLinksRefStructure +GroupTicketRefStructure +HailAndRideAreaRefStructure +HeadingSignRefStructure +HeadwayJourneyGroupRefStructure +HeadwayRefStructure +HelpPointEquipmentRefStructure +HireServiceRefStructure +IndividualPassengerInfoRefStructure +IndividualTravellerRefStructure +InfrastructureFrameRefStructure +InfrastructureLinkRefStructure +InfrastructureLinkRestrictionRefStructure +InfrastructurePointRefStructure +InstalledEquipmentRefStructure +InterchangeRefStructure +InterchangeRuleRefStructure +InterchangeRuleTimingRefStructure +InterchangingRefStructure +JourneyAccountingRefStructure +JourneyFrequencyGroupRefStructure +JourneyMeetingRefStructure +JourneyPartCoupleRefStructure +JourneyPartRefStructure +JourneyPatternLayoverRefStructure +JourneyPatternRefStructure +JourneyPatternRunTimeRefStructure +JourneyRefStructure +JourneyTimingRefStructure +LayerRefStructure +LeftLuggageServiceRefStructure +LegRefStructure +LevelInStructureRefStructure +LevelRefStructure +LimitingRuleRefStructure +LineLinkRefStructure +LineNetworkRefStructure +LineRefStructure +LineSectionRefStructure +LinkInJourneyPatternRefStructure +LinkInSequenceRefStructure +LinkProjectionRefStructure +LinkRefStructure +LinkSequenceProjectionRefStructure +LinkSequenceRefStructure +LocalServiceRefStructure +LocatableSpotRefStructure +LogEntryRefStructure +LogicalDisplayRefStructure +LogRefStructure +LostPropertyServiceRefStructure +LuggageAllowanceRefStructure +LuggageLockerEquipmentRefStructure +LuggageServiceRefStructure +LuggageSpotEquipmentRefStructure +LuggageSpotRefStructure +ManagementAgentRefStructure +MediumAccessDeviceRefStructure +MediumAccessDeviceSecurityListingRefStructure +MediumApplicationInstanceRefStructure +MeetingPointServiceRefStructure +MeetingRestrictionRefStructure +MinimumStayRefStructure +MobileDeviceRefStructure +MobilityJourneyFrameRefStructure +MobilityServiceConstraintZoneRefStructure +MobilityServiceFrameRefStructure +MobilityServiceRefStructure +ModeOfOperationRefStructure +ModeRestrictionAssessmentRefStructure +MoneyServiceRefStructure +MonitoredVehicleSharingParkingBayRefStructure +MonthValidityOffsetRefStructure +NetworkRefStructure +NetworkRestrictionRefStructure +NoticeRefStructure +ObservedPassingTimeRefStructure +OccupancyViewRefStructure +OffenceDebitRefStructure +OfferedTravelSpecificationRefStructure +OffSitePathLinkRefStructure +OnboardSpaceRefStructure +OnboardStayRefStructure +OnlineServiceOperatorRefStructure +OnlineServiceRefStructure +OpenTransportModeRefStructure +OperatingDayRefStructure +OperatingDepartmentRefStructure +OperatingPeriodRefStructure +OperationalContextRefStructure +OperatorRefStructure +OrganisationalUnitRefStructure +OrganisationPartRefStructure +OrganisationRefStructure +OtherDebitRefStructure +OtherDeckEntranceRefStructure +OtherDeckSpaceRefStructure +OtherOrganisationRefStructure +OvertakingPossibilityRefStructure +ParkingAreaRefStructure +ParkingBayRefStructure +ParkingBayStatusRefStructure +ParkingCapacityRefStructure +ParkingChargeBandRefStructure +ParkingEntranceForVehiclesRefStructure +ParkingEntranceRefStructure +ParkingPassengerEntranceRefStructure +ParkingPointRefStructure +ParkingPriceRefStructure +ParkingPropertiesRefStructure +ParkingRefStructure +ParkingTariffRefStructure +PassengerAtStopTimeRefStructure +PassengerBeaconEquipmentRefStructure +PassengerBoardingPositionAssignmentRefStructure +PassengerCapacityRefStructure +PassengerCarryingRequirementRefStructure +PassengerEntranceRefStructure +PassengerEquipmentRefStructure +PassengerInformationEquipmentRefStructure +PassengerInformationRequestRefStructure +PassengerSafetyEquipmentRefStructure +PassengerSeatRefStructure +PassengerSpaceRefStructure +PassengerSpotAllocationRefStructure +PassengerSpotRefStructure +PassengerStopAssignmentRefStructure +PassengerVehicleCapacityRefStructure +PassengerVehicleSpotRefStructure +PassingTimeRefStructure +PathAssignmentRefStructure +PathInstructionRefStructure +PathLinkInSequenceRefStructure +PenaltyPolicyRefStructure +PersonalModeOfOperationRefStructure +PlaceEquipmentRefStructure +PlaceInSequenceRefStructure +PlaceRefStructure +PlaceSignRefStructure +PointInJourneyPatternRefStructure +PointInSequenceRefStructure +PointInSingleJourneyPathRefStructure +PointOfInterestClassificationRefStructure +PointOfInterestHierarchyRefStructure +PointOfInterestRefStructure +PointOfInterestSpaceRefStructure +PointOfInterestVehicleEntranceRefStructure +PointOnLinkRefStructure +PointOnRouteRefStructure +PointProjectionRefStructure +PointRefStructure +PoolOfVehiclesRefStructure +PostalAddressRefStructure +PoweredTrainRefStructure +PreassignedFareProductRefStructure +PriceableObjectRefStructure +PriceGroupRefStructure +PriceUnitRefStructure +PricingParameterSetRefStructure +PricingRuleRefStructure +PricingServiceRefStructure +PrivateLegRefStructure +ProjectionRefStructure +PtConnectionLegRefStructure +PtRideLegRefStructure +PurchaseWindowRefStructure +PurposeOfEquipmentProfileRefStructure +PurposeOfGroupingRefStructure +PurposeOfJourneyPartitionRefStructure +QualityStructureFactorPriceRefStructure +QualityStructureFactorRefStructure +QuayRefStructure +RailwayLinkRefStructure +RailwayPointRefStructure +RechargingBayRefStructure +RechargingEquipmentProfileRefStructure +RechargingPlanRefStructure +RechargingPointAssignmentRefStructure +RechargingStationRefStructure +RechargingStepRefStructure +RefuellingEquipmentRefStructure +RefundingRefStructure +ReliefOpportunityRefStructure +ReliefPointRefStructure +RentalOptionRefStructure +RentalPenaltyPolicyRefStructure +RepeatedTripFareRequestRefStructure +ReplacingRefStructure +RequestedTravelSpecificationRefStructure +ResellingRefStructure +ReservingRefStructure +ResidentialQualificationEligibilityRefStructure +ResidentialQualificationRefStructure +ResourceFrameRefStructure +ResponsibilityRoleRefStructure +ResponsibilitySetRefStructure +RestrictedManoeuvreRefStructure +RestrictedServiceFacilitySetRefStructure +RetailConsortiumRefStructure +RetailDeviceRefStructure +RetailDeviceSecurityListingRefStructure +RetailServiceRefStructure +RhythmicalJourneyGroupRefStructure +RideLegRefStructure +RidePartRefStructure +RoadLinkRefStructure +RoadPointRefStructure +RollingStockInventoryRefStructure +RollingStockItemRefStructure +RoughSurfaceRefStructure +RoundingRefStructure +RoundingStepRefStructure +RoundTripRefStructure +RouteInstructionRefStructure +RouteLinkRefStructure +RoutePointRefStructure +RouteRefStructure +RoutingConstraintZoneRefStructure +RoutingRefStructure +RubbishDisposalEquipmentRefStructure +SaleDiscountRightRefStructure +SalesOfferPackageElementRefStructure +SalesOfferPackageEntitlementGivenRefStructure +SalesOfferPackageEntitlementRequiredRefStructure +SalesOfferPackagePriceRefStructure +SalesOfferPackageRefStructure +SalesOfferPackageSubstitutionRefStructure +SalesTransactionFrameRefStructure +SalesTransactionRefStructure +SanitaryEquipmentRefStructure +ScheduledModeOfOperationRefStructure +ScheduledStopPointRefStructure +ScheduleRequestRefStructure +SchematicMapMemberRefStructure +SchematicMapRefStructure +SeatEquipmentRefStructure +SeatingEquipmentRefStructure +SectionRefStructure +SecurityListingRefStructure +SecurityListRefStructure +SensorEquipmentRefStructure +SensorInEntranceRefStructure +SensorInSpotRefStructure +SeriesConstraintPriceRefStructure +SeriesConstraintRefStructure +ServiceAccessCodeRefStructure +ServiceAccessRightRefStructure +ServiceBookingArrangementRefStructure +ServiceCalendarFrameRefStructure +ServiceCalendarRefStructure +ServicedOrganisationRefStructure +ServiceExclusionRefStructure +ServiceFacilitySetRefStructure +ServiceFrameRefStructure +ServiceJourneyInterchangeRefStructure +ServiceJourneyPatternInterchangeRefStructure +ServiceJourneyPatternRefStructure +ServiceJourneyRefStructure +ServiceLinkInSequenceRefStructure +ServiceLinkRefStructure +ServicePatternRefStructure +ServiceSiteRefStructure +ShelterEquipmentRefStructure +SimpleFeatureRefStructure +SimpleVehicleTypeRefStructure +SingleJourneyPathRefStructure +SingleJourneyRefStructure +SingleTripFareRequestRefStructure +SiteComponentRefStructure +SiteConnectionRefStructure +SiteElementRefStructure +SiteEquipmentRefStructure +SiteFacilitySetRefStructure +SiteFrameRefStructure +SiteNavigationPathRefStructure +SitePathJunctionRefStructure +SitePathLinkRefStructure +SiteRefStructure +SiteStructureRefStructure +SmartcardRefStructure +SpecialServiceRefStructure +SpotAffinityRefStructure +SpotAllocationMethodRefStructure +SpotColumnRefStructure +SpotEquipmentRefStructure +SpotRowRefStructure +SpotSensorRefStructure +StaircaseEquipmentRefStructure +StandardFareTableRefStructure +StepLimitRefStructure +StopAreaRefStructure +StopAssignmentRefStructure +StopEventRequestRefStructure +StopFinderRequestRefStructure +StopPlaceEntranceRefStructure +StopPlaceRefStructure +StopPlaceSpaceRefStructure +StopPlaceVehicleEntranceRefStructure +StopPointInJourneyPatternRefStructure +SubmodeRefStructure +SubscribingRefStructure +SupplementProductRefStructure +SupplyContractRefStructure +SuspendingRefStructure +TargetPassingTimeRefStructure +TariffRefStructure +TariffZoneRefStructure +TaxiParkingAreaRefStructure +TaxiRankRefStructure +TaxiServicePlaceAssignmentRefStructure +TaxiServiceRefStructure +TaxiStandRefStructure +TemplateServiceJourneyRefStructure +ThirdPartyProductRefStructure +TicketingEquipmentRefStructure +TicketingServiceRefStructure +TicketValidatorEquipmentRefStructure +TimebandRefStructure +TimeDemandProfileRefStructure +TimeDemandTypeAssignmentRefStructure +TimeDemandTypeRefStructure +TimeIntervalPriceRefStructure +TimeIntervalRefStructure +TimeStructureFactorRefStructure +TimetabledPassingTimeRefStructure +TimetableFrameRefStructure +TimeUnitPriceRefStructure +TimeUnitRefStructure +TimingAlgorithmTypeRefStructure +TimingLinkInJourneyPatternRefStructure +TimingLinkRefStructure +TimingPatternRefStructure +TimingPointInJourneyPatternRefStructure +TimingPointRefStructure +TopographicPlaceRefStructure +TopographicProjectionRefStructure +TractiveElementTypeRefStructure +TractiveRollingStockItemRefStructure +TrafficControlPointRefStructure +TrailingElementTypeRefStructure +TrailingRollingStockItemRefStructure +TrainBlockPartRefStructure +TrainBlockRefStructure +TrainComponentLabelAssignmentRefStructure +TrainComponentRefStructure +TrainComponentStopAssignmentRefStructure +TrainElementTypeRefStructure +TrainInCompoundTrainRefStructure +TrainNumberRefStructure +TrainRefStructure +TrainStopAssignmentRefStructure +TransferabilityRefStructure +TransferLegRefStructure +TransferRefStructure +TransferRestrictionRefStructure +TransportAdministrativeZoneRefStructure +TransportOrganisationRefStructure +TransportTypeRefStructure +TravelAgentRefStructure +TravelatorEquipmentRefStructure +TravelDocumentRefStructure +TravelDocumentSecurityListingRefStructure +TravelSpecificationRefStructure +TripDebitRefStructure +TripPatternRefStructure +TripPlanRequestRefStructure +TripRefStructure +TrolleyStandEquipmentRefStructure +TurnaroundTimeLimitTimeRefStructure +TypeOfAccessRightAssignmentRefStructure +TypeOfActivationRefStructure +TypeOfBatteryChemistryRefStructure +TypeOfCodespaceAssignmentRefStructure +TypeOfConcessionRefStructure +TypeOfCongestionRefStructure +TypeOfCustomerAccountRefStructure +TypeOfDeckEntranceRefStructure +TypeOfDeckEntranceUsageRefStructure +TypeOfDeckSpaceProfileRefStructure +TypeOfDeliveryVariantRefStructure +TypeOfDriverPermitRefStructure +TypeOfEquipmentRefStructure +TypeOfFacilityRefStructure +TypeOfFareContractEntryRefStructure +TypeOfFareContractRefStructure +TypeOfFareProductRefStructure +TypeOfFareStructureElementRefStructure +TypeOfFareStructureFactorRefStructure +TypeOfFareTableRefStructure +TypeOfFeatureRefStructure +TypeOfFleetRefStructure +TypeOfFlexibleServiceRefStructure +TypeOfFrameRefStructure +TypeOfJourneyPatternRefStructure +TypeOfLineRefStructure +TypeOfLinkRefStructure +TypeOfLinkSequenceRefStructure +TypeOfLocatableSpotRefStructure +TypeOfMachineReadabilityRefStructure +TypeOfMediumAccessDeviceRefStructure +TypeOfMobilityServiceRefStructure +TypeOfModeOfOperationRefStructure +TypeOfNoticeRefStructure +TypeOfOperationRefStructure +TypeOfOrganisationPartRefStructure +TypeOfOrganisationRefStructure +TypeOfParkingRefStructure +TypeOfPassengerInformationEquipmentRefStructure +TypeOfPaymentMethodRefStructure +TypeOfPlaceRefStructure +TypeOfPlugRefStructure +TypeOfPointRefStructure +TypeOfPricingRuleRefStructure +TypeOfProductCategoryRefStructure +TypeOfProjectionRefStructure +TypeOfProofRefStructure +TypeOfResponsibilityRoleRefStructure +TypeOfRetailDeviceRefStructure +TypeOfRollingStockRefStructure +TypeOfSalesOfferPackageRefStructure +TypeOfSecurityListRefStructure +TypeOfServiceFeatureRefStructure +TypeOfServiceRefStructure +TypeOfTariffRefStructure +TypeOfTimeDemandTypeRefStructure +TypeOfTransferRefStructure +TypeOfTravelDocumentRefStructure +TypeOfUsageParameterRefStructure +TypeOfValidityRefStructure +TypeOfValueRefStructure +TypeOfWheelchairRefStructure +TypeOfZoneRefStructure +UnpoweredTrainRefStructure +UsageDiscountRightRefStructure +UsageParameterPriceRefStructure +UsageParameterRefStructure +UsageValidityPeriodRefStructure +UserProfileEligibilityRefStructure +UserProfileRefStructure +ValidableElementPriceRefStructure +ValidableElementRefStructure +ValidityConditionRefStructure +ValidityRuleParameterRefStructure +ValidityTriggerRefStructure +VehicleAccessCredentialsAssignmentRefStructure +VehicleChargingEquipmentRefStructure +VehicleEntranceRefStructure +VehicleEquipmentProfileMemberRefStructure +VehicleEquipmentProfileRefStructure +VehicleEquipmentRefStructure +VehicleJourneyRefStructure +VehicleJourneySpotAllocationRefStructure +VehicleJourneyStopAssignmentRefStructure +VehicleManoeuvringRequirementRefStructure +VehicleMeetingLinkRefStructure +VehicleMeetingPlaceRefStructure +VehicleMeetingPointAssignmentRefStructure +VehicleModelProfileRefStructure +VehicleModelRefStructure +VehiclePoolerProfileRefStructure +VehiclePoolingDriverInfoRefStructure +VehiclePoolingMeetingPlaceRefStructure +VehiclePoolingModeOfOperationRefStructure +VehiclePoolingParkingAreaRefStructure +VehiclePoolingParkingBayRefStructure +VehiclePoolingPlaceAssignmentRefStructure +VehiclePoolingServiceRefStructure +VehiclePositionAlignmentRefStructure +VehicleProfileRefStructure +VehicleQuayAlignmentRefStructure +VehicleRefStructure +VehicleReleaseEquipmentRefStructure +VehicleRentalModeOfOperationRefStructure +VehicleRentalServiceRefStructure +VehicleRequirementRefStructure +VehicleScheduleFrameRefStructure +VehicleServicePartRefStructure +VehicleServicePlaceAssignmentRefStructure +VehicleServiceRefStructure +VehicleSharingModeOfOperationRefStructure +VehicleSharingParkingAreaRefStructure +VehicleSharingParkingBayRefStructure +VehicleSharingPlaceAssignmentRefStructure +VehicleSharingServiceRefStructure +VehicleStoppingPlaceRefStructure +VehicleStoppingPositionRefStructure +VehicleTypeAtPointRefStructure +VehicleTypePreferenceRefStructure +VehicleTypeRefStructure +VehicleTypeStopAssignmentRefStructure +VehicleTypeZoneRestrictionRefStructure +VersionFrameRefStructure +VersionRefStructure +WaitingEquipmentRefStructure +WaitingRoomEquipmentRefStructure +WheelchairVehicleRefStructure +WhitelistRefStructure +WireLinkRefStructure +WirePointRefStructure +ZoneInSeriesRefStructure +ZoneProjectionRefStructure +ZoneRefStructure diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index 8f6a04a22..ed218dabf 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -1,10 +1,12 @@ import json import sys +import re from lxml import etree from pathlib import Path from collections import defaultdict + def update_nameofclass_simpletype(schema_file: Path, element_names: list[str]): """ Replace existing definition with a @@ -24,21 +26,33 @@ def update_nameofclass_simpletype(schema_file: Path, element_names: list[str]): indent = " " newline = "\n" - new_simple_type = etree.Element("{http://www.w3.org/2001/XMLSchema}simpleType", name="NameOfClass") + new_simple_type = etree.Element( + "{http://www.w3.org/2001/XMLSchema}simpleType", name="NameOfClass" + ) new_simple_type.text = newline + indent - annotation = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation") + annotation = etree.SubElement( + new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation" + ) annotation.text = newline + indent * 2 - doc = etree.SubElement(annotation, "{http://www.w3.org/2001/XMLSchema}documentation") + doc = etree.SubElement( + annotation, "{http://www.w3.org/2001/XMLSchema}documentation" + ) doc.text = "Type for name of all classes within NeTEx." doc.tail = newline + indent annotation.tail = newline + indent - restriction = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:Name") + restriction = etree.SubElement( + new_simple_type, + "{http://www.w3.org/2001/XMLSchema}restriction", + base="xsd:Name", + ) restriction.text = newline + indent * 2 for name in element_names: - enum_el = etree.SubElement(restriction, "{http://www.w3.org/2001/XMLSchema}enumeration", value=name) + enum_el = etree.SubElement( + restriction, "{http://www.w3.org/2001/XMLSchema}enumeration", value=name + ) enum_el.tail = newline + indent * 2 restriction.tail = newline + indent @@ -55,13 +69,17 @@ def update_nameofclass_simpletype(schema_file: Path, element_names: list[str]): pretty_print=True, ) - print(f"✅ Updated NameOfClass in {schema_file.name} ({len(element_names)} enumerations)") + print( + f"✅ Updated NameOfClass in {schema_file.name} ({len(element_names)} enumerations)" + ) + def update_nameofclass_ref_attributes( base_dir: Path, entity_file: Path, entity_dependency_graph: dict[str, list[str]], abstract_classes: set[str], + analyzer, ): """ Update all RefStructures across XSD files: @@ -75,10 +93,17 @@ def update_nameofclass_ref_attributes( # --- Load entity_file (where NameOfClassXXX types will be added) --- entity_tree = etree.parse(str(entity_file), parser) entity_root = entity_tree.getroot() - name_of_class_elem = entity_root.find(".//xsd:simpleType[@name='NameOfClass']", namespaces=ns) + name_of_class_elem = entity_root.find( + ".//xsd:simpleType[@name='NameOfClass']", namespaces=ns + ) if name_of_class_elem is None: raise RuntimeError(f"No NameOfClass found in {entity_file.name}") + complex_todo = set( + open("scripts/complex-types-included", "r").read().split("\n") + ) - set(open("scripts/complex-types-excluded", "r").read().split("\n")) + print(complex_todo) + # --- Iterate over all schema files --- for schema_file in base_dir.rglob("*.xsd"): if "xsd/netex" not in str(schema_file): @@ -92,12 +117,14 @@ def update_nameofclass_ref_attributes( # --- Find all complexTypes ending with RefStructure --- for ref_complex in root.findall(".//xsd:complexType", namespaces=ns): ref_name = ref_complex.get("name") - if not ref_name or not ref_name.endswith("RefStructure"): + if ( + not ref_name + or not ref_name.endswith("RefStructure") + or ref_name not in complex_todo + ): continue - natural_class = ref_name.replace("RefStructure", "") - if natural_class == 'LinkSequence': - pass + natural_class = re.sub("RefStructure$", "", ref_name) if natural_class in entity_dependency_graph.keys(): # Determine all concrete descendants @@ -106,6 +133,17 @@ def update_nameofclass_ref_attributes( for cls in entity_dependency_graph.get(natural_class, []) if cls not in abstract_classes ] + + for cls in entity_dependency_graph.get(natural_class + "Ref", []): + mycls = re.sub("Ref$", "", cls) + if ( + mycls not in abstract_classes + and mycls not in concrete_classes + and mycls in entity_dependency_graph.keys() + and not mycls.endswith("_Dummy") + ): + concrete_classes.append(mycls) + if natural_class not in abstract_classes: concrete_classes.append(natural_class) concrete_classes = sorted(set(concrete_classes)) @@ -114,16 +152,56 @@ def update_nameofclass_ref_attributes( # --- Generate or replace NameOfClassXXX simpleType in entity_file --- simple_type_name = f"NameOfClass{ref_name}" - existing_st = entity_root.find(f".//xsd:simpleType[@name='{simple_type_name}']", namespaces=ns) + existing_st = entity_root.find( + f".//xsd:simpleType[@name='{simple_type_name}']", namespaces=ns + ) - new_simple_type = etree.Element("{http://www.w3.org/2001/XMLSchema}simpleType", name=simple_type_name) - ann = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation") - doc = etree.SubElement(ann, "{http://www.w3.org/2001/XMLSchema}documentation") + new_simple_type = etree.Element( + "{http://www.w3.org/2001/XMLSchema}simpleType", + name=simple_type_name, + ) + ann = etree.SubElement( + new_simple_type, "{http://www.w3.org/2001/XMLSchema}annotation" + ) + doc = etree.SubElement( + ann, "{http://www.w3.org/2001/XMLSchema}documentation" + ) doc.text = f"Type for all concrete EntityStructures that can be referenced from {natural_class}" - restriction = etree.SubElement(new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", base="NameOfClass") + l = analyzer._get_type_chain(natural_class + "Ref") + if len(l) < 2 or l[1] in ( + "VersionOfObjectRefStructure", + "OrderedVersionOfObjectRefStructure", + "ObjectIdType", + "normalizedString", + "ClassRefStructure", + "ObjectIdType", + "LinkInSequenceRefStructure", + "PointInSequenceRefStructure", + "GroupOfEntitiesRefStructure_Dummy", + "PointOnLinkRefStructure_Dummy", + "VehicleEquipmentRefStructure", + "ParkingEntranceRefStructure", + ): + # Workaround + parent_ref_name = "" + elif l[1] == ref_name: + # Workaround: We don't want circular either. + parent_ref_name = "" + else: + parent_ref_name = l[1] + + restriction = etree.SubElement( + new_simple_type, + "{http://www.w3.org/2001/XMLSchema}restriction", + base=f"NameOfClass{parent_ref_name}", + ) for cls in concrete_classes: - etree.SubElement(restriction, "{http://www.w3.org/2001/XMLSchema}enumeration", value=cls) + etree.SubElement( + restriction, + "{http://www.w3.org/2001/XMLSchema}enumeration", + value=cls, + ) if existing_st is not None: parent = existing_st.getparent() @@ -136,7 +214,9 @@ def update_nameofclass_ref_attributes( # Variant A: if there are child elements (sequence/choice/all/group), place directly in complexType child_container = None for tag in ("sequence", "choice", "all", "group"): - child_container = ref_complex.find(f"{{http://www.w3.org/2001/XMLSchema}}{tag}") + child_container = ref_complex.find( + f"{{http://www.w3.org/2001/XMLSchema}}{tag}" + ) if child_container is not None: break @@ -147,12 +227,22 @@ def update_nameofclass_ref_attributes( # Search for existing simpleContent or complexContent + extension/restriction parent_for_attr = None for tag in ("simpleContent", "complexContent"): - elem = ref_complex.find(f"{{http://www.w3.org/2001/XMLSchema}}{tag}") + elem = ref_complex.find( + f"{{http://www.w3.org/2001/XMLSchema}}{tag}" + ) if elem is not None: # take the first child (extension or restriction) - child = next((c for c in elem if etree.QName(c).localname in ("extension", "restriction")), None) + child = next( + ( + c + for c in elem + if etree.QName(c).localname + in ("extension", "restriction") + ), + None, + ) if child is not None: - if etree.QName(child).localname == 'extension': + if etree.QName(child).localname == "extension": print(f"WARNING: extension found in {ref_complex}") dont = True @@ -160,15 +250,28 @@ def update_nameofclass_ref_attributes( break else: # If simpleContent exists but no extension/restriction → create restriction - parent_for_attr = etree.SubElement(elem, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:string") + parent_for_attr = etree.SubElement( + elem, + "{http://www.w3.org/2001/XMLSchema}restriction", + base="xsd:string", + ) break # If still None, create new simpleContent/restriction if parent_for_attr is None: - elem = etree.SubElement(ref_complex, "{http://www.w3.org/2001/XMLSchema}simpleContent") - parent_for_attr = etree.SubElement(elem, "{http://www.w3.org/2001/XMLSchema}restriction", base="xsd:string") + elem = etree.SubElement( + ref_complex, + "{http://www.w3.org/2001/XMLSchema}simpleContent", + ) + parent_for_attr = etree.SubElement( + elem, + "{http://www.w3.org/2001/XMLSchema}restriction", + base="xsd:string", + ) # --- Add or replace nameOfRefClass attribute --- - existing_attr = parent_for_attr.find("{http://www.w3.org/2001/XMLSchema}attribute[@name='nameOfRefClass']") + existing_attr = parent_for_attr.find( + "{http://www.w3.org/2001/XMLSchema}attribute[@name='nameOfRefClass']" + ) if existing_attr is not None: parent_for_attr.remove(existing_attr) @@ -183,8 +286,12 @@ def update_nameofclass_ref_attributes( else: attrib.attrib["default"] = natural_class - ann = etree.SubElement(attrib, "{http://www.w3.org/2001/XMLSchema}annotation") - doc = etree.SubElement(ann, "{http://www.w3.org/2001/XMLSchema}documentation") + ann = etree.SubElement( + attrib, "{http://www.w3.org/2001/XMLSchema}annotation" + ) + doc = etree.SubElement( + ann, "{http://www.w3.org/2001/XMLSchema}documentation" + ) doc.text = f"Automatic reference class for {ref_name}" parent_for_attr.append(attrib) @@ -218,7 +325,9 @@ def update_nameofclass_ref_attributes( base_dir = Path(sys.argv[1]) target_namespace = "http://www.netex.org.uk/netex" # pas aan indien nodig - schema_with_nameofclass = base_dir / "netex_framework/netex_responsibility/netex_entity_support.xsd" + schema_with_nameofclass = ( + base_dir / "netex_framework/netex_responsibility/netex_entity_support.xsd" + ) # Bouw dependency graph + abstract classes analyzer = XSDDependencyAnalyzer() @@ -228,8 +337,22 @@ def update_nameofclass_ref_attributes( abstract_classes = analyzer.abstract_elements # NameOfClass vervangen - interesting_classes = set([x for x in entity_dependency_graph.keys() if not x.endswith("_Dummy") and not x.endswith("_DummyType")]) - update_nameofclass_simpletype(schema_with_nameofclass, sorted(list(interesting_classes))) + interesting_classes = set( + [ + x + for x in entity_dependency_graph.keys() + if not x.endswith("_Dummy") and not x.endswith("_DummyType") + ] + ) + update_nameofclass_simpletype( + schema_with_nameofclass, sorted(list(interesting_classes)) + ) # Update RefStructure types + nameOfRefClass attribuut - # update_nameofclass_ref_attributes(base_dir, schema_with_nameofclass, entity_dependency_graph, abstract_classes) + update_nameofclass_ref_attributes( + base_dir, + schema_with_nameofclass, + entity_dependency_graph, + abstract_classes, + analyzer, + ) diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd index cb20c74f0..67c7aa5ae 100644 --- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd @@ -77,6 +77,11 @@ Rail transport, Roads and Road transport Identifier of a COMPOSITE FRAME. + + + Automatic reference class for CompositeFrameRefStructure + + diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index 23d151a0c..737c8f51c 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -123,6 +123,11 @@ Rail transport, Roads and Road transport Identifier of a GENERAL FRAME. + + + Automatic reference class for GeneralFrameRefStructure + + @@ -212,7 +217,13 @@ Rail transport, Roads and Road transport Type for a reference to a GENERAL FRAME MEMBER. - + + + + Automatic reference class for GeneralFrameMemberRefStructure + + + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd index bb3743e74..6317ce013 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd @@ -76,6 +76,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for ResourceFrameRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd index cc5d61ea3..7896b89fd 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd @@ -98,6 +98,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for AccessibilityAssessmentRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd index 3d03a441d..79e46a3e0 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd @@ -73,14 +73,14 @@ Rail transport, Roads and Road transport - + - Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type. + Identifier of an ALTERNATIVE NAME. - + - Identifier of an ALTERNATIVE NAME. + Automatic reference class for AlternativeNameRefStructure diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd index f11747b5d..7700ef405 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd @@ -74,6 +74,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for AssignmentRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd index 24a756a2d..818a4022d 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd @@ -109,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for GroupOfEntitiesRefStructure + + @@ -135,6 +140,11 @@ Rail transport, Roads and Road transport Reference to a PURPOSE OF GROUPING. + + + Automatic reference class for PurposeOfGroupingRefStructure + + @@ -175,6 +185,11 @@ Rail transport, Roads and Road transport Identifier of a GENERAL GROUP OF ENTITies. + + + Automatic reference class for GeneralGroupOfEntitiesRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd index eb8bc88c6..2ba44bb8a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for LayerRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd index 1ff0c0316..6b2ecde23 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd @@ -99,6 +99,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for LogEntryRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd index 55e5b4fa2..a24d5556f 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of DEPARTMENT. + + + Automatic reference class for DepartmentRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of ORGANISATIONAL UNIT. + + + Automatic reference class for OrganisationalUnitRefStructure + + @@ -216,6 +226,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF VALUE. + + + Automatic reference class for TypeOfCodespaceAssignmentRefStructure + + @@ -254,6 +269,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF VALUE. + + + Automatic reference class for TypeOfOrganisationRefStructure + + @@ -317,6 +337,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF VALUE. + + + Automatic reference class for TypeOfOperationRefStructure + + @@ -487,6 +512,11 @@ Rail transport, Roads and Road transport Identifier of CONTACT. + + + Automatic reference class for ContactRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index e92d094fa..504561668 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -89,6 +89,11 @@ Rail transport, Roads and Road transport Identifier of a PATH LINK. + + + Automatic reference class for GenericPathLinkRefStructure + + @@ -165,7 +170,13 @@ Rail transport, Roads and Road transport Type for a reference to a PATH INSTRUCTION. - + + + + Automatic reference class for PathInstructionRefStructure + + + @@ -205,6 +216,11 @@ Rail transport, Roads and Road transport Identifier of a NAVIGATION PATH. + + + Automatic reference class for GenericNavigationPathRefStructure + + @@ -238,6 +254,11 @@ Rail transport, Roads and Road transport Identifier of a PLACE IN SEQUENCE. + + + Automatic reference class for PlaceInSequenceRefStructure + + @@ -276,6 +297,11 @@ Rail transport, Roads and Road transport Identifier of a PATH LINK IN SEQUENCE. + + + Automatic reference class for PathLinkInSequenceRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd index bab834982..a115e5381 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd @@ -104,6 +104,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for PlaceRefStructure + + @@ -154,6 +159,11 @@ Rail transport, Roads and Road transport Identifier of a TRANSFER. + + + Automatic reference class for TransferRefStructure + + @@ -192,6 +202,11 @@ Rail transport, Roads and Road transport Identifier of an ACCESS link. + + + Automatic reference class for AccessRefStructure + + @@ -218,6 +233,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF TRANSFER identifier. + + + Automatic reference class for TypeOfTransferRefStructure + + @@ -244,6 +264,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF PLACE. + + + Automatic reference class for TypeOfPlaceRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd index 6482353f5..74fb7eb7e 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a LINK SEQUENCE. + + + Automatic reference class for LinkSequenceRefStructure + + @@ -171,6 +176,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF LINK SEQUENCE. + + + Automatic reference class for TypeOfLinkSequenceRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd index fabe9b7c4..cbe4db47a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for PointRefStructure + + @@ -131,6 +136,11 @@ Rail transport, Roads and Road transport Identifier of a LINK. + + + Automatic reference class for LinkRefStructure + + @@ -258,6 +268,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF POINT. + + + Automatic reference class for TypeOfPointRefStructure + + @@ -300,6 +315,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF LINK. + + + Automatic reference class for TypeOfLinkRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd index b2678def9..34b4df785 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a PROJECTION. + + + Automatic reference class for ProjectionRefStructure + + @@ -104,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of a POINT PROJECTION. + + + Automatic reference class for PointProjectionRefStructure + + @@ -130,6 +140,11 @@ Rail transport, Roads and Road transport Identifier of a LINK PROJECTION. + + + Automatic reference class for LinkProjectionRefStructure + + @@ -156,6 +171,11 @@ Rail transport, Roads and Road transport Identifier of a ZONE PROJECTION. + + + Automatic reference class for ZoneProjectionRefStructure + + @@ -182,6 +202,11 @@ Rail transport, Roads and Road transport Identifier of a PROJECTION. + + + Automatic reference class for LinkSequenceProjectionRefStructure + + @@ -208,6 +233,11 @@ Rail transport, Roads and Road transport Identifier of a PROJECTION. + + + Automatic reference class for ComplexFeatureProjectionRefStructure + + @@ -241,6 +271,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF PROJECTION. + + + Automatic reference class for TypeOfProjectionRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd index 3c3799e55..cd627d076 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd @@ -75,6 +75,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for SectionRefStructure + + @@ -106,6 +111,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for GeneralSectionRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd index d055abb54..82e7055c0 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd @@ -151,6 +151,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF FEATURE. + + + Automatic reference class for TypeOfFeatureRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 383852248..f1253663a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -147,6 +147,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF ZONE. + + + Automatic reference class for TypeOfZoneRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 0f555b558..f902d0957 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -325,6 +325,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF TARIFF ZONEs. + + + Automatic reference class for GroupOfTariffZonesRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd index 91ce85523..e55128912 100644 --- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd @@ -70,14 +70,14 @@ Rail transport, Roads and Road transport - + - Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type. + Identifier of an ALTERNATIVE TEXT. - + - Identifier of an ALTERNATIVE TEXT. + Automatic reference class for AlternativeTextRefStructure diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 8f9c3d9e3..f69b9f50f 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,6078 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from AssistanceBookingService + + + + + + + + Type for all concrete EntityStructures that can be referenced from TicketValidatorEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TicketingEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrolleyStandEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from SeatingEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from ShelterEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from WaitingRoomEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from WaitingEquipment + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteEquipment + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from Entrance + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from LevelInStructure + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteStructure + + + + + + + + Type for all concrete EntityStructures that can be referenced from Level + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteComponent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceSite + + + + + + + + Type for all concrete EntityStructures that can be referenced from Site + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteElement + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfSites + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopPlaceVehicleEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopPlaceEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from BoardingPosition + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessSpace + + + + + + + + Type for all concrete EntityStructures that can be referenced from Quay + + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopPlaceSpace + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfStopPlaces + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopPlace + + + + + + + + + Type for all concrete EntityStructures that can be referenced from HeadingSign + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralSign + + + + + + + + Type for all concrete EntityStructures that can be referenced from PlaceSign + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleReleaseEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from CycleStorageEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from RoughSurface + + + + + + + + Type for all concrete EntityStructures that can be referenced from StaircaseEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TravelatorEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from EntranceEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessEquipment + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfServiceFeature + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePositionAlignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleQuayAlignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleStoppingPosition + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleStoppingPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfParking + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingBay + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingArea + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingProperties + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingCapacity + + + + + + + + Type for all concrete EntityStructures that can be referenced from Parking + + + + + + + + + Type for all concrete EntityStructures that can be referenced from CateringService + + + + + + + + Type for all concrete EntityStructures that can be referenced from RetailService + + + + + + + + Type for all concrete EntityStructures that can be referenced from MoneyService + + + + + + + + Type for all concrete EntityStructures that can be referenced from HireService + + + + + + + + Type for all concrete EntityStructures that can be referenced from CommunicationService + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingPointAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingStation + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingBay + + + + + + + + Type for all concrete EntityStructures that can be referenced from TaxiParkingArea + + + + + + + + Type for all concrete EntityStructures that can be referenced from TaxiStand + + + + + + + + Type for all concrete EntityStructures that can be referenced from TaxiRank + + + + + + + + Type for all concrete EntityStructures that can be referenced from CheckConstraintThroughput + + + + + + + + Type for all concrete EntityStructures that can be referenced from CheckConstraintDelay + + + + + + + + Type for all concrete EntityStructures that can be referenced from CheckConstraint + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfCongestion + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteNavigationPath + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OffSitePathLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from SitePathLink + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointOfInterestVehicleEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointOfInterestClassification + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointOfInterest + + + + + + + + Type for all concrete EntityStructures that can be referenced from MeetingPointService + + + + + + + + Type for all concrete EntityStructures that can be referenced from LeftLuggageService + + + + + + + + Type for all concrete EntityStructures that can be referenced from LuggageService + + + + + + + + Type for all concrete EntityStructures that can be referenced from LostPropertyService + + + + + + + + Type for all concrete EntityStructures that can be referenced from ComplaintsService + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerService + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AssistanceService + + + + + + + + Type for all concrete EntityStructures that can be referenced from TicketingService + + + + + + + + Type for all concrete EntityStructures that can be referenced from LocalService + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from HailAndRideArea + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleArea + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleQuay + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleStopPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from InfrastructureFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from DefaultConnection + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteConnection + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerBoardingPositionAssignment + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainStopAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerStopAssignment + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopAssignment + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareSection + + + + + + + + Type for all concrete EntityStructures that can be referenced from FarePointInPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from BorderPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareScheduledStopPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from DefaultDeadRunRunTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from Headway + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyTiming + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingLinkInJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingPointInJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from LinkInJourneyPattern + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointInJourneyPattern + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeadRunJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyPattern + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopPointInJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceJourneyPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServicePattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from Connection + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ScheduledStopPoint + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TransferRestriction + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceExclusion + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyPatternLayover + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyPatternRunTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfTimeDemandType + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeDemandProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeDemandTypeAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeDemandType + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPassengerInformationEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from LogicalDisplay + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerInformationEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from DisplayAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from CommonSection + + + + + + + + Type for all concrete EntityStructures that can be referenced from InfrastructureLink + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from InfrastructurePoint + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexiblePointProperties + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleLinkProperties + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleLine + + + + + + + + Type for all concrete EntityStructures that can be referenced from LineNetwork + + + + + + + + Type for all concrete EntityStructures that can be referenced from LineSection + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfActivation + + + + + + + + Type for all concrete EntityStructures that can be referenced from ActivationAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from ActivationLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrafficControlPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from BeaconPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from ActivationPoint + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ActivatedEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from CrewBase + + + + + + + + Type for all concrete EntityStructures that can be referenced from Garage + + + + + + + + Type for all concrete EntityStructures that can be referenced from GaragePoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingPoint + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ReliefPoint + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfLine + + + + + + + + Type for all concrete EntityStructures that can be referenced from DestinationDisplayVariant + + + + + + + + Type for all concrete EntityStructures that can be referenced from DestinationDisplay + + + + + + + + Type for all concrete EntityStructures that can be referenced from Network + + + + + + + + Type for all concrete EntityStructures that can be referenced from AllowedLineDirection + + + + + + + + Type for all concrete EntityStructures that can be referenced from Line + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfLines + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OvertakingPossibility + + + + + + + + Type for all concrete EntityStructures that can be referenced from MeetingRestriction + + + + + + + + Type for all concrete EntityStructures that can be referenced from RestrictedManoeuvre + + + + + + + + Type for all concrete EntityStructures that can be referenced from InfrastructureLinkRestriction + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleTypeAtPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from NetworkRestriction + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ModeRestrictionAssessment + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointOnRoute + + + + + + + + Type for all concrete EntityStructures that can be referenced from RouteLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from RoutePoint + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Route + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Direction + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfTimingLinks + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingLink + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingPoint + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingPattern + + + + + + + + Type for all concrete EntityStructures that can be referenced from RouteInstruction + + + + + + + + Type for all concrete EntityStructures that can be referenced from MobilityJourneyFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from MobilityServiceFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from OnlineService + + + + + + + + Type for all concrete EntityStructures that can be referenced from OnlineServiceOperator + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfMobilityService + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleRentalService + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleSharingService + + + + + + + + Type for all concrete EntityStructures that can be referenced from ChauffeuredVehicleService + + + + + + + + Type for all concrete EntityStructures that can be referenced from TaxiService + + + + + + + + Type for all concrete EntityStructures that can be referenced from CarPoolingService + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingService + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from CommonVehicleService + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from MobilityService + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfSingleJourneys + + + + + + + + Type for all concrete EntityStructures that can be referenced from SingleJourney + + + + + + + + Type for all concrete EntityStructures that can be referenced from SingleJourneyPath + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingBayStatus + + + + + + + + Type for all concrete EntityStructures that can be referenced from MonitoredVehicleSharingParkingBay + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleMeetingLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingPlaceAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleSharingPlaceAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TaxiServicePlaceAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleServicePlaceAssignment + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingParkingBay + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleSharingParkingBay + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingParkingArea + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleSharingParkingArea + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingMeetingPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleMeetingPlace + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DynamicVehicleMeetingPointAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleMeetingPointAssignment + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AdditionalDriverOption + + + + + + + + Type for all concrete EntityStructures that can be referenced from RentalOption + + + + + + + + + Type for all concrete EntityStructures that can be referenced from RentalPenaltyPolicy + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleAccessCredentialsAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceAccessCode + + + + + + + + Type for all concrete EntityStructures that can be referenced from IndividualPassengerInfo + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolingDriverInfo + + + + + + + + Type for all concrete EntityStructures that can be referenced from IndividualTraveller + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehiclePoolerProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from OccupancyView + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingStep + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingPlan + + + + + + + + Type for all concrete EntityStructures that can be referenced from DriverTripTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from DriverTrip + + + + + + + + Type for all concrete EntityStructures that can be referenced from DutyPart + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccountableElement + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Duty + + + + + + + + Type for all concrete EntityStructures that can be referenced from InterchangeRuleTiming + + + + + + + + Type for all concrete EntityStructures that can be referenced from InterchangeRule + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceJourneyPatternInterchange + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceJourneyInterchange + + + + + + + + Type for all concrete EntityStructures that can be referenced from DefaultInterchange + + + + + + + + Type for all concrete EntityStructures that can be referenced from Interchange + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyMeeting + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFlexibleService + + + + + + + + Type for all concrete EntityStructures that can be referenced from FlexibleServiceProperties + + + + + + + + Type for all concrete EntityStructures that can be referenced from RhythmicalJourneyGroup + + + + + + + + Type for all concrete EntityStructures that can be referenced from HeadwayJourneyGroup + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyFrequencyGroup + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TemplateServiceJourney + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyAccounting + + + + + + + + Type for all concrete EntityStructures that can be referenced from DatedSpecialService + + + + + + + + Type for all concrete EntityStructures that can be referenced from Call + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DynamicStopAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainComponentLabelAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleJourneyStopAssignment + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleTypeStopAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainComponentStopAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from RestrictedServiceFacilitySet + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckPlanAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainBlockPart + + + + + + + + Type for all concrete EntityStructures that can be referenced from BlockPart + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainBlock + + + + + + + + Type for all concrete EntityStructures that can be referenced from Block + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PurposeOfJourneyPartition + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyPartCouple + + + + + + + + Type for all concrete EntityStructures that can be referenced from CoupledJourney + + + + + + + + Type for all concrete EntityStructures that can be referenced from JourneyPart + + + + + + + + Type for all concrete EntityStructures that can be referenced from ReliefOpportunity + + + + + + + + Type for all concrete EntityStructures that can be referenced from CourseOfJourneys + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleServicePart + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleService + + + + + + + + Type for all concrete EntityStructures that can be referenced from CompoundBlock + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimingAlgorithmType + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainNumber + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeadRun + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleJourney + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Journey + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfServices + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpecialService + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceJourney + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from DriverScheduleFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleScheduleFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimetableFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessibilityAssessment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPlug + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfBatteryChemistry + + + + + + + + Type for all concrete EntityStructures that can be referenced from BatteryEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from RefuellingEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleChargingEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfLocatableSpot + + + + + + + + Type for all concrete EntityStructures that can be referenced from LuggageSpot + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerVehicleSpot + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerSpot + + + + + + + + Type for all concrete EntityStructures that can be referenced from LocatableSpot + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OnboardSpace + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpotColumn + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpotRow + + + + + + + + Type for all concrete EntityStructures that can be referenced from SchematicMap + + + + + + + + Type for all concrete EntityStructures that can be referenced from RechargingEquipmentProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfDriverPermit + + + + + + + + Type for all concrete EntityStructures that can be referenced from AcceptedDriverPermit + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleEquipmentProfileMember + + + + + + + + Type for all concrete EntityStructures that can be referenced from PurposeOfEquipmentProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleEquipmentProfile + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleModel + + + + + + + + Type for all concrete EntityStructures that can be referenced from FacilityRequirement + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleManoeuvringRequirement + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerVehicleCapacity + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerCapacity + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerCarryingRequirement + + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleRequirement + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SimpleVehicleType + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleType + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TransportType + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DayTypeAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from OperatingPeriod + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OperatingDay + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceCalendar + + + + + + + + Type for all concrete EntityStructures that can be referenced from PlaceEquipment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from EquipmentPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from EquipmentPosition + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from InstalledEquipment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Equipment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PostalAddress + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AddressablePlace + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Address + + + + + + + + + Type for all concrete EntityStructures that can be referenced from LuggageSpotEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from BedEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from SeatEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpotEquipment + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpotAffinity + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceBookingArrangement + + + + + + + + Type for all concrete EntityStructures that can be referenced from BookingArrangement + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfProductCategory + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfService + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFacility + + + + + + + + Type for all concrete EntityStructures that can be referenced from OnboardStay + + + + + + + + Type for all concrete EntityStructures that can be referenced from Accommodation + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceFacilitySet + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SiteFacilitySet + + + + + + + + Type for all concrete EntityStructures that can be referenced from FacilitySet + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrailingElementType + + + + + + + + Type for all concrete EntityStructures that can be referenced from TractiveElementType + + + + + + + + Type for all concrete EntityStructures that can be referenced from UnpoweredTrain + + + + + + + + Type for all concrete EntityStructures that can be referenced from PoweredTrain + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfSecurityList + + + + + + + + Type for all concrete EntityStructures that can be referenced from SecurityListing + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Whitelist + + + + + + + + Type for all concrete EntityStructures that can be referenced from Blacklist + + + + + + + + Type for all concrete EntityStructures that can be referenced from SecurityList + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfDeckEntranceUsage + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfDeckEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckSpaceCapacity + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckLevel + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckWindow + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckEntranceCouple + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckEntranceUsage + + + + + + + + Type for all concrete EntityStructures that can be referenced from OtherDeckEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckVehicleEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckEntrance + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OtherDeckSpace + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerSpace + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckSpace + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckComponent + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Deck + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckPlan + + + + + + + + Type for all concrete EntityStructures that can be referenced from AvailabilityCondition + + + + + + + + Type for all concrete EntityStructures that can be referenced from SensorInEntrance + + + + + + + + Type for all concrete EntityStructures that can be referenced from SensorInSpot + + + + + + + + Type for all concrete EntityStructures that can be referenced from EntranceSensor + + + + + + + + Type for all concrete EntityStructures that can be referenced from SpotSensor + + + + + + + + Type for all concrete EntityStructures that can be referenced from SensorEquipment + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ControlCentre + + + + + + + + Type for all concrete EntityStructures that can be referenced from OperatingDepartment + + + + + + + + Type for all concrete EntityStructures that can be referenced from OperationalContext + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfOperators + + + + + + + + Type for all concrete EntityStructures that can be referenced from Operator + + + + + + + + Type for all concrete EntityStructures that can be referenced from TransportOrganisation + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfWheelchair + + + + + + + + Type for all concrete EntityStructures that can be referenced from TopographicProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfPlaces + + + + + + + + Type for all concrete EntityStructures that can be referenced from TopographicPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfTimebands + + + + + + + + Type for all concrete EntityStructures that can be referenced from Timeband + + + + + + + + Type for all concrete EntityStructures that can be referenced from DayType + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckNavigationPath + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckPlaceInSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeckPathLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfModeOfOperation + + + + + + + + Type for all concrete EntityStructures that can be referenced from PersonalModeOfOperation + + + + + + + + Type for all concrete EntityStructures that can be referenced from AlternativeModeOfOperation + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ModeOfOperation + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Submode + + + + + + + + + Type for all concrete EntityStructures that can be referenced from OpenTransportMode + + + + + + + + + Type for all concrete EntityStructures that can be referenced from CycleModelProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from CarModelProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleModelProfile + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfDeliveryVariant + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfNotice + + + + + + + + Type for all concrete EntityStructures that can be referenced from DeliveryVariant + + + + + + + + Type for all concrete EntityStructures that can be referenced from Notice + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfRollingStock + + + + + + + + Type for all concrete EntityStructures that can be referenced from RollingStockInventory + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrailingRollingStockItem + + + + + + + + Type for all concrete EntityStructures that can be referenced from TractiveRollingStockItem + + + + + + + + Type for all concrete EntityStructures that can be referenced from RollingStockItem + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Vehicle + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainComponent + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainElementType + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TrainInCompoundTrain + + + + + + + + Type for all concrete EntityStructures that can be referenced from Train + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralOrganisation + + + + + + + + Type for all concrete EntityStructures that can be referenced from ManagementAgent + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServicedOrganisation + + + + + + + + Type for all concrete EntityStructures that can be referenced from TravelAgent + + + + + + + + Type for all concrete EntityStructures that can be referenced from OtherOrganisation + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFleet + + + + + + + + Type for all concrete EntityStructures that can be referenced from Fleet + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfValue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ValidityRuleParameter + + + + + + + + Type for all concrete EntityStructures that can be referenced from ValidityTrigger + + + + + + + + Type for all concrete EntityStructures that can be referenced from ValidityCondition + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Contract + + + + + + + + Type for all concrete EntityStructures that can be referenced from ResponsibilityRole + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfValidity + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from VersionFrame + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AlternativeText + + + + + + + + Type for all concrete EntityStructures that can be referenced from DataSource + + + + + + + + Type for all concrete EntityStructures that can be referenced from Version + + + + + + + + Type for all concrete EntityStructures that can be referenced from Branding + + + + + + + + Type for all concrete EntityStructures that can be referenced from OrganisationPart + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Organisation + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfResponsibilityRole + + + + + + + + Type for all concrete EntityStructures that can be referenced from ResponsibilitySet + + + + + + + + Type for all concrete EntityStructures that can be referenced from CompositeFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from ResourceFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralFrameMember + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfLinkSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from LinkSequence + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfLink + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPoint + + + + + + + + Type for all concrete EntityStructures that can be referenced from Link + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Point + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AlternativeName + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfZone + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralGroupOfEntities + + + + + + + + Type for all concrete EntityStructures that can be referenced from PurposeOfGrouping + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfEntities + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfTariffZones + + + + + + + + Type for all concrete EntityStructures that can be referenced from PathLinkInSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from PlaceInSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from GenericNavigationPath + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PathInstruction + + + + + + + + Type for all concrete EntityStructures that can be referenced from GenericPathLink + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeneralSection + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Section + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFeature + + + + + + + + Type for all concrete EntityStructures that can be referenced from Contact + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfOperation + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfOrganisation + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfCodespaceAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from OrganisationalUnit + + + + + + + + Type for all concrete EntityStructures that can be referenced from Department + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPlace + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfTransfer + + + + + + + + Type for all concrete EntityStructures that can be referenced from Access + + + + + + + + Type for all concrete EntityStructures that can be referenced from Transfer + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Layer + + + + + + + + Type for all concrete EntityStructures that can be referenced from LogEntry + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from ComplexFeatureProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from LinkSequenceProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from ZoneProjection + + + + + + + + + Type for all concrete EntityStructures that can be referenced from LinkProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from PointProjection + + + + + + + + Type for all concrete EntityStructures that can be referenced from Projection + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Assignment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from QualityStructureFactorPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareQuotaFactor + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareDemandFactor + + + + + + + + Type for all concrete EntityStructures that can be referenced from QualityStructureFactor + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfAccessRightAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeIntervalPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeUnitPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeStructureFactor + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeInterval + + + + + + + + Type for all concrete EntityStructures that can be referenced from TimeUnit + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from ChargingMoment + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessRightInProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from CappingRulePrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareProductPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from SupplementProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from PreassignedFareProduct + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AmountOfPriceUnitProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from CappingRule + + + + + + + + Type for all concrete EntityStructures that can be referenced from CappedDiscountRight + + + + + + + + Type for all concrete EntityStructures that can be referenced from UsageDiscountRight + + + + + + + + Type for all concrete EntityStructures that can be referenced from ThirdPartyProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from EntitlementProduct + + + + + + + + Type for all concrete EntityStructures that can be referenced from SaleDiscountRight + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareProduct + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceAccessRight + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Subscribing + + + + + + + + Type for all concrete EntityStructures that can be referenced from PenaltyPolicy + + + + + + + + Type for all concrete EntityStructures that can be referenced from ChargingPolicy + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfConcession + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfUsageParameter + + + + + + + + Type for all concrete EntityStructures that can be referenced from UsageParameterPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from UsageParameter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareStructureElementInSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareStructureElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareStructureElementPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareStructureElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfTariff + + + + + + + + Type for all concrete EntityStructures that can be referenced from Tariff + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PriceGroup + + + + + + + + Type for all concrete EntityStructures that can be referenced from FarePrice + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PriceableObject + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeographicalIntervalPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeographicalUnitPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeographicalStructureFactor + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeographicalInterval + + + + + + + + Type for all concrete EntityStructures that can be referenced from GeographicalUnit + + + + + + + + Type for all concrete EntityStructures that can be referenced from ControllableElementPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from ControllableElementInSequence + + + + + + + + Type for all concrete EntityStructures that can be referenced from ControllableElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from ValidableElementPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from ValidableElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from LuggageAllowance + + + + + + + + Type for all concrete EntityStructures that can be referenced from FulfilmentMethodPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfDistributionChannels + + + + + + + + Type for all concrete EntityStructures that can be referenced from FulfilmentMethod + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPricingRule + + + + + + + + Type for all concrete EntityStructures that can be referenced from MonthValidityOffset + + + + + + + + Type for all concrete EntityStructures that can be referenced from PricingService + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareDayType + + + + + + + + Type for all concrete EntityStructures that can be referenced from RoundingStep + + + + + + + + Type for all concrete EntityStructures that can be referenced from Rounding + + + + + + + + Type for all concrete EntityStructures that can be referenced from PriceUnit + + + + + + + + Type for all concrete EntityStructures that can be referenced from PricingParameterSet + + + + + + + + Type for all concrete EntityStructures that can be referenced from Cancelling + + + + + + + + Type for all concrete EntityStructures that can be referenced from Reserving + + + + + + + + Type for all concrete EntityStructures that can be referenced from BookingPolicy + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PurchaseWindow + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfMachineReadability + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfTravelDocument + + + + + + + + Type for all concrete EntityStructures that can be referenced from DistanceMatrixElementPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackageEntitlementGiven + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackageEntitlementRequired + + + + + + + + Type for all concrete EntityStructures that can be referenced from Transferability + + + + + + + + Type for all concrete EntityStructures that can be referenced from Replacing + + + + + + + + Type for all concrete EntityStructures that can be referenced from Refunding + + + + + + + + Type for all concrete EntityStructures that can be referenced from Exchanging + + + + + + + + Type for all concrete EntityStructures that can be referenced from Reselling + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareTable + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareTableRow + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareTableColumn + + + + + + + + Type for all concrete EntityStructures that can be referenced from Cell + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from StandardFareTable + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareTable + + + + + + + + + Type for all concrete EntityStructures that can be referenced from EligibilityChangePolicy + + + + + + + + Type for all concrete EntityStructures that can be referenced from ResidentialQualification + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfProof + + + + + + + + Type for all concrete EntityStructures that can be referenced from CompanionProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupTicket + + + + + + + + Type for all concrete EntityStructures that can be referenced from CommercialProfile + + + + + + + + Type for all concrete EntityStructures that can be referenced from UserProfile + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from EntitlementGiven + + + + + + + + Type for all concrete EntityStructures that can be referenced from EntitlementRequired + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfSalesOfferPackage + + + + + + + + Type for all concrete EntityStructures that can be referenced from DistributionAssignment + + + + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfSalesOfferPackages + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackageSubstitution + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackagePrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackageElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesOfferPackage + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareStructureFactor + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareInterval + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareUnit + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareStructureFactor + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareElementInSequence + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ZoneInSeries + + + + + + + + Type for all concrete EntityStructures that can be referenced from SeriesConstraintPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from MinimumStay + + + + + + + + Type for all concrete EntityStructures that can be referenced from Interchanging + + + + + + + + Type for all concrete EntityStructures that can be referenced from FrequencyOfUse + + + + + + + + Type for all concrete EntityStructures that can be referenced from Suspending + + + + + + + + Type for all concrete EntityStructures that can be referenced from UsageValidityPeriod + + + + + + + + Type for all concrete EntityStructures that can be referenced from StepLimit + + + + + + + + Type for all concrete EntityStructures that can be referenced from Routing + + + + + + + + Type for all concrete EntityStructures that can be referenced from RoundTrip + + + + + + + + Type for all concrete EntityStructures that can be referenced from ResidentialQualificationEligibility + + + + + + + + Type for all concrete EntityStructures that can be referenced from CommercialProfileEligibility + + + + + + + + Type for all concrete EntityStructures that can be referenced from UserProfileEligibility + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerEligibility + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TravelDocumentSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from TravelDocument + + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerPaymentMeans + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerSpotAllocation + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleJourneySpotAllocation + + + + + + + + Type for all concrete EntityStructures that can be referenced from OffenceDebit + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareProductSaleDebit + + + + + + + + Type for all concrete EntityStructures that can be referenced from TripDebit + + + + + + + + Type for all concrete EntityStructures that can be referenced from BookingDebit + + + + + + + + Type for all concrete EntityStructures that can be referenced from OtherDebit + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareDebit + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesTransaction + + + + + + + + Type for all concrete EntityStructures that can be referenced from RetailDeviceSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfRetailDevice + + + + + + + + Type for all concrete EntityStructures that can be referenced from RetailDevice + + + + + + + + Type for all concrete EntityStructures that can be referenced from RetailConsortium + + + + + + + + Type for all concrete EntityStructures that can be referenced from MediumAccessDeviceSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfMediumAccessDevice + + + + + + + + Type for all concrete EntityStructures that can be referenced from MediumApplicationInstance + + + + + + + + Type for all concrete EntityStructures that can be referenced from MobileDevice + + + + + + + + Type for all concrete EntityStructures that can be referenced from EmvCard + + + + + + + + Type for all concrete EntityStructures that can be referenced from Smartcard + + + + + + + + Type for all concrete EntityStructures that can be referenced from MediumAccessDevice + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerAccountStatus + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfCustomerAccount + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerAccountSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerAccount + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareContractEntry + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareContractEntry + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareContractSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfFareContract + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareContract + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerSecurityListing + + + + + + + + Type for all concrete EntityStructures that can be referenced from Customer + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerPurchasePackagePrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerPurchasePackageElement + + + + + + + + Type for all concrete EntityStructures that can be referenced from CustomerPurchasePackage + + + + + + + + Type for all concrete EntityStructures that can be referenced from OfferedTravelSpecification + + + + + + + + Type for all concrete EntityStructures that can be referenced from RequestedTravelSpecification + + + + + + + + Type for all concrete EntityStructures that can be referenced from TravelSpecification + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from FarePriceFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from SalesTransactionFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingPrice + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingChargeBand + + + + + + + + Type for all concrete EntityStructures that can be referenced from ParkingTariff + + + + + Reference to a Type of an ENTITY. diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd index 2513d1968..362d50ed7 100644 --- a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd @@ -103,6 +103,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF VALUE. + + + Automatic reference class for TypeOfValueRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd index 722d556b7..a00eae102 100644 --- a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd @@ -156,6 +156,11 @@ Rail transport, Roads and Road transport Identifier of VERSION. + + + Automatic reference class for VersionRefStructure + + @@ -176,6 +181,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for DataSourceRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_support.xsd index ae2757d61..a89113a6e 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_support.xsd @@ -75,6 +75,11 @@ Rail transport, Roads and Road transport Identifier of a RESPONSIBILITY ROLE. + + + Automatic reference class for ResponsibilityRoleRefStructure + + @@ -108,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of a CONTRACT. + + + Automatic reference class for ContractRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index d86ba775a..52f3d55c3 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of a RESPONSIBILITY SET. + + + Automatic reference class for ResponsibilitySetRefStructure + + @@ -191,6 +196,11 @@ Rail transport, Roads and Road transport Identifier of an TYPE OF RESPONSIBILITY ROLE. + + + Automatic reference class for TypeOfResponsibilityRoleRefStructure + + @@ -228,7 +238,13 @@ Rail transport, Roads and Road transport Type for a reference to an ORGANISATION. - + + + + Automatic reference class for OrganisationRefStructure + + + @@ -282,6 +298,11 @@ Rail transport, Roads and Road transport Identifier of an ORGANISATION PART. + + + Automatic reference class for OrganisationPartRefStructure + + @@ -302,7 +323,13 @@ Rail transport, Roads and Road transport Type for a reference to a BRANDING. - + + + + Automatic reference class for BrandingRefStructure + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd index 401f5fcc2..cbcef466e 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a VALIDITY CONDITION. + + + Automatic reference class for ValidityConditionRefStructure + + @@ -233,6 +238,11 @@ Rail transport, Roads and Road transport Identifier of a VALIDITY TRIGGER. + + + Automatic reference class for ValidityTriggerRefStructure + + @@ -271,6 +281,11 @@ Rail transport, Roads and Road transport Identifier of a VALIDITY RULE PARAMETER. + + + Automatic reference class for ValidityRuleParameterRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd index 762a9ed3e..1ae62f088 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd @@ -70,6 +70,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for VersionFrameRefStructure + + @@ -137,6 +142,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FRAME. + + + Automatic reference class for TypeOfFrameRefStructure + + @@ -163,6 +173,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF VALIDITY. + + + Automatic reference class for TypeOfValidityRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd index 450075833..12fb6048e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of an ADDRESS. + + + Automatic reference class for AddressRefStructure + + @@ -107,6 +112,11 @@ Rail transport, Roads and Road transport Identifier of an AddressedPlace. + + + Automatic reference class for AddressablePlaceRefStructure + + @@ -158,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a POSTAL ADDRESS. + + + Automatic reference class for PostalAddressRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd index 43a36ee96..1d55448ba 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd @@ -75,6 +75,11 @@ Rail transport, Roads and Road transport Identifier of an AVAILABILITY CONDITION. + + + Automatic reference class for AvailabilityConditionRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd index 48f3ace80..e9b0c725b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd @@ -91,6 +91,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for DayTypeRefStructure + + @@ -129,6 +134,11 @@ Rail transport, Roads and Road transport Identifier of TIMEBANd. + + + Automatic reference class for TimebandRefStructure + + @@ -155,6 +165,11 @@ Rail transport, Roads and Road transport Identifier of GROUP OF TIMEBANDs. + + + Automatic reference class for GroupOfTimebandsRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 8f9ca0178..d2f6e3587 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -74,6 +74,11 @@ Rail transport, Roads and Road transport Identifier of a DECK PATH LINK. + + + Automatic reference class for DeckPathLinkRefStructure + + @@ -126,6 +131,11 @@ Rail transport, Roads and Road transport Identifier of a DECK PLACE IN SEQUENCE. + + + Automatic reference class for DeckPlaceInSequenceRefStructure + + @@ -164,6 +174,11 @@ Rail transport, Roads and Road transport Identifier of a DECK NAVIGATION PATH. + + + Automatic reference class for DeckNavigationPathRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index e272135ab..59c133f86 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -100,6 +100,11 @@ Identifier of a DECK PLAN. + + + Automatic reference class for DeckPlanRefStructure + + @@ -148,6 +153,11 @@ Identifier of a DECK. + + + Automatic reference class for DeckRefStructure + + @@ -174,6 +184,11 @@ Identifier of referenced entity. + + + Automatic reference class for DeckComponentRefStructure + + @@ -200,6 +215,11 @@ Identifier of a DECK SPACE. + + + Automatic reference class for DeckSpaceRefStructure + + @@ -226,6 +246,11 @@ Identifier of a PASSENGER SPACE. + + + Automatic reference class for PassengerSpaceRefStructure + + @@ -280,6 +305,11 @@ Identifier of a OTHER DECK SPACE. + + + Automatic reference class for OtherDeckSpaceRefStructure + + @@ -306,6 +336,11 @@ Identifier of a DECK ENTRANCE. + + + Automatic reference class for DeckEntranceRefStructure + + @@ -388,6 +423,11 @@ Identifier of a PASSENGER ENTRANCE. + + + Automatic reference class for PassengerEntranceRefStructure + + @@ -414,6 +454,11 @@ Identifier of a DECK VEHICLE ENTRANCE. + + + Automatic reference class for DeckVehicleEntranceRefStructure + + @@ -440,6 +485,11 @@ Identifier of a OTHER DECK ENTRANCE. + + + Automatic reference class for OtherDeckEntranceRefStructure + + @@ -466,6 +516,11 @@ Identifier of a DECK ENTRANCE USAGE. + + + Automatic reference class for DeckEntranceUsageRefStructure + + @@ -514,6 +569,11 @@ Identifier of a DECK ENTRANCE COUPLE. + + + Automatic reference class for DeckEntranceCoupleRefStructure + + @@ -540,6 +600,11 @@ Identifier of a DECK WINDOW. + + + Automatic reference class for DeckWindowRefStructure + + @@ -598,6 +663,11 @@ Identifier of a DECK LEVEL. + + + Automatic reference class for DeckLevelRefStructure + + @@ -624,6 +694,11 @@ Identifier of a DECK SPACE CAPACITY. + + + Automatic reference class for DeckSpaceCapacityRefStructure + + @@ -676,6 +751,11 @@ Reference to a TYPE OF DECK ENTRANCE. + + + Automatic reference class for TypeOfDeckEntranceRefStructure + + @@ -702,6 +782,11 @@ Reference to a TYPE OF DECK VEHICLE ENTRANCE USAGE. + + + Automatic reference class for TypeOfDeckEntranceUsageRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index d0aeea470..12502a2eb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -188,6 +188,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF WHEELCHAIR. + + + Automatic reference class for TypeOfWheelchairRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd index 83a71ea7e..bb1193be2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd @@ -77,6 +77,11 @@ Rail transport, Roads and Road transport Identifier of an EQUIPMENT. + + + Automatic reference class for EquipmentRefStructure + + @@ -97,6 +102,11 @@ Rail transport, Roads and Road transport Identifier of an INSTALLED EQUIPMENT. + + + Automatic reference class for InstalledEquipmentRefStructure + + @@ -129,6 +139,11 @@ Rail transport, Roads and Road transport Reference to identifier of a TYPE OF EQUIPMENT. + + + Automatic reference class for TypeOfEquipmentRefStructure + + @@ -155,6 +170,11 @@ Rail transport, Roads and Road transport Identifier of an EQUIPMENT POSITION. + + + Automatic reference class for EquipmentPositionRefStructure + + @@ -181,6 +201,11 @@ Rail transport, Roads and Road transport Identifier of an EQUIPMENT PLACE. + + + Automatic reference class for EquipmentPlaceRefStructure + + @@ -227,6 +252,11 @@ Rail transport, Roads and Road transport Identifier of a PLACE EQUIPMENT. + + + Automatic reference class for PlaceEquipmentRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 1b1b921c3..06eb36bbe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -906,6 +906,11 @@ Rail transport, Roads and Road transport Identifier of a FACILITY. + + + Automatic reference class for FacilitySetRefStructure + + @@ -926,6 +931,11 @@ Rail transport, Roads and Road transport Identifier of a FACILITY. + + + Automatic reference class for SiteFacilitySetRefStructure + + @@ -958,6 +968,11 @@ Rail transport, Roads and Road transport Identifier of a FACILITY SET. + + + Automatic reference class for ServiceFacilitySetRefStructure + + @@ -984,6 +999,11 @@ Rail transport, Roads and Road transport Identifier of a FACILITY. + + + Automatic reference class for AccommodationRefStructure + + @@ -1004,6 +1024,11 @@ Rail transport, Roads and Road transport Identifier of a FACILITY. + + + Automatic reference class for OnboardStayRefStructure + + @@ -1048,6 +1073,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FACILITY. + + + Automatic reference class for TypeOfFacilityRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd index 1e9991638..a98c98804 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a MODE OF OPERATION. + + + Automatic reference class for ModeOfOperationRefStructure + + @@ -201,6 +206,11 @@ Rail transport, Roads and Road transport Identifier of a ALTERNATIVE MODE OF OPERATION. + + + Automatic reference class for AlternativeModeOfOperationRefStructure + + @@ -339,6 +349,11 @@ Rail transport, Roads and Road transport Identifier of a PERSONAL MODE OF OPERATION. + + + Automatic reference class for PersonalModeOfOperationRefStructure + + @@ -378,6 +393,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF MODE OF OPERATION. + + + Automatic reference class for TypeOfModeOfOperationRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 172d22c0b..7291c84be 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -339,6 +339,11 @@ Rail transport, Roads and Road transport Identifier of MODe. + + + Automatic reference class for OpenTransportModeRefStructure + + @@ -365,6 +370,11 @@ Rail transport, Roads and Road transport Identifier of SUBMODe. + + + Automatic reference class for SubmodeRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd index cf3e19609..aaba834e8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd @@ -74,6 +74,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING EQUIPMENT PROFILE. + + + Automatic reference class for RechargingEquipmentProfileRefStructure + + 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 1f6244d02..d7bd20df5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE CHARGING EQUIPMENT. + + + Automatic reference class for VehicleChargingEquipmentRefStructure + + @@ -120,6 +125,11 @@ Rail transport, Roads and Road transport Identifier of a REFUELLING EQUIPMENT. + + + Automatic reference class for RefuellingEquipmentRefStructure + + @@ -146,6 +156,11 @@ Rail transport, Roads and Road transport Identifier of a BATTERY EQUIPMENT. + + + Automatic reference class for BatteryEquipmentRefStructure + + @@ -172,6 +187,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF BATTERY CHEMISTRY. + + + Automatic reference class for TypeOfBatteryChemistryRefStructure + + @@ -198,6 +218,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF PLUG. + + + Automatic reference class for TypeOfPlugRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd index 54dee999d..0e04cfc72 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for VehicleModelProfileRefStructure + + @@ -106,6 +111,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for CarModelProfileRefStructure + + @@ -132,6 +142,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for CycleModelProfileRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_support.xsd index c3c1eb26b..c4fc558db 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_support.xsd @@ -91,6 +91,11 @@ Rail transport, Roads and Road transport Identifier of a FLEET. + + + Automatic reference class for FleetRefStructure + + @@ -117,6 +122,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FLEET. + + + Automatic reference class for TypeOfFleetRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd index 7bfeb6681..90b9aef5e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a NOTICE. + + + Automatic reference class for NoticeRefStructure + + @@ -139,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a NOTICE DELIVERY VARIANT. + + + Automatic reference class for DeliveryVariantRefStructure + + @@ -165,6 +175,11 @@ Rail transport, Roads and Road transport Identifier of a NOTICE. + + + Automatic reference class for TypeOfNoticeRefStructure + + @@ -191,6 +206,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF DELVIERY VARIANT. + + + Automatic reference class for TypeOfDeliveryVariantRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd index 4960f70fd..51f762842 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd @@ -74,6 +74,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for OtherOrganisationRefStructure + + @@ -100,6 +105,11 @@ Rail transport, Roads and Road transport Identifier of TRAVEL AGENT entity. + + + Automatic reference class for TravelAgentRefStructure + + @@ -142,6 +152,11 @@ Rail transport, Roads and Road transport Identifier of SERVICED ORGANISATION entity. + + + Automatic reference class for ServicedOrganisationRefStructure + + @@ -168,6 +183,11 @@ Rail transport, Roads and Road transport Identifier of MANAGEMENT AGENT entity. + + + Automatic reference class for ManagementAgentRefStructure + + @@ -194,6 +214,11 @@ Rail transport, Roads and Road transport Identifier of GENERAL ORGANISATION entity. + + + Automatic reference class for GeneralOrganisationRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd index 65a084850..9dbfa811c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd @@ -75,6 +75,11 @@ Rail transport, Roads and Road transport Identifier of a SCHEMATIC MAP. + + + Automatic reference class for SchematicMapRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index a1628eab7..f46347e25 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -102,6 +102,11 @@ Identifier of a SPOT ROW. + + + Automatic reference class for SpotRowRefStructure + + @@ -140,6 +145,11 @@ Identifier of a SPOT COLUMN. + + + Automatic reference class for SpotColumnRefStructure + + @@ -166,6 +176,11 @@ Identifier of referenced entity. + + + Automatic reference class for OnboardSpaceRefStructure + + @@ -204,6 +219,11 @@ Identifier of referenced entity. + + + Automatic reference class for LocatableSpotRefStructure + + @@ -256,6 +276,11 @@ Identifier of a PASSENGER SPOT. + + + Automatic reference class for PassengerSpotRefStructure + + @@ -282,6 +307,11 @@ Identifier of a PASSENGER VEHICLE SPOT. + + + Automatic reference class for PassengerVehicleSpotRefStructure + + @@ -308,6 +338,11 @@ Identifier of a LUGGAGE SPOT. + + + Automatic reference class for LuggageSpotRefStructure + + @@ -334,6 +369,11 @@ Reference to a TYPE OF LOCATABLE SPOT. + + + Automatic reference class for TypeOfLocatableSpotRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd index aba2639aa..152977e73 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of a SECURITY LIST.. + + + Automatic reference class for SecurityListRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of a BLACKLIST. + + + Automatic reference class for BlacklistRefStructure + + @@ -168,6 +178,11 @@ Rail transport, Roads and Road transport Identifier of a WHITELIST. + + + Automatic reference class for WhitelistRefStructure + + @@ -207,6 +222,11 @@ Rail transport, Roads and Road transport Identifier of a SECURITY LISTING. + + + Automatic reference class for SecurityListingRefStructure + + @@ -245,6 +265,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF SECURITY LIST. + + + Automatic reference class for TypeOfSecurityListRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd index 90d8d748a..4ac5767a2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -82,6 +82,11 @@ Identifier of a SENSOR EQUIPMENT. + + + Automatic reference class for SensorEquipmentRefStructure + + @@ -118,6 +123,11 @@ Identifier of a SPOT SENSOR. + + + Automatic reference class for SpotSensorRefStructure + + @@ -144,6 +154,11 @@ Identifier of a ENTRANCE SENSOR. + + + Automatic reference class for EntranceSensorRefStructure + + @@ -170,6 +185,11 @@ Identifier of a SENSOR IN SPOT. + + + Automatic reference class for SensorInSpotRefStructure + + @@ -196,6 +216,11 @@ Identifier of a SENSOR IN ENTRANCE. + + + Automatic reference class for SensorInEntranceRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd index 8899b91e1..311088a58 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd @@ -76,6 +76,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE CALENDAR. + + + Automatic reference class for ServiceCalendarRefStructure + + @@ -102,6 +107,11 @@ Rail transport, Roads and Road transport Identifier of an OPERATING DAY. + + + Automatic reference class for OperatingDayRefStructure + + @@ -128,6 +138,11 @@ Rail transport, Roads and Road transport Identifier of an OPERATING PERIOD. + + + Automatic reference class for OperatingPeriodRefStructure + + @@ -180,6 +195,11 @@ Rail transport, Roads and Road transport Identifier of a DAY TYPE ASSIGNMENT. + + + Automatic reference class for DayTypeAssignmentRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd index bae477b2e..7466ecf43 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -790,6 +790,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF SERVICE. + + + Automatic reference class for TypeOfServiceRefStructure + + @@ -829,6 +834,11 @@ See ERA B.4 7037 Characteristic description code. Reference to a TYPE OF PRODUCT CATEGORY. + + + Automatic reference class for TypeOfProductCategoryRefStructure + + @@ -867,6 +877,11 @@ See ERA B.4 7037 Characteristic description code. Identifier of a BOOKING ARRANGEMENT. + + + Automatic reference class for BookingArrangementRefStructure + + @@ -893,6 +908,11 @@ See ERA B.4 7037 Characteristic description code. Identifier of a SERVICE BOOKING ARRANGEMENT. + + + Automatic reference class for ServiceBookingArrangementRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd index 8f39beae3..ec7f38926 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd @@ -81,6 +81,11 @@ Identifier of referenced entity. + + + Automatic reference class for SpotAffinityRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd index e1ee424ec..86128d05b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -79,6 +79,11 @@ Identifier of a SPOT EQUIPMENT. + + + Automatic reference class for SpotEquipmentRefStructure + + @@ -105,6 +110,11 @@ Identifier of a SEAT EQUIPMENT. + + + Automatic reference class for SeatEquipmentRefStructure + + @@ -131,6 +141,11 @@ Identifier of a BED EQUIPMENT. + + + Automatic reference class for BedEquipmentRefStructure + + @@ -173,6 +188,11 @@ Identifier of a LUGGAGE SPOT EQUIPMENT. + + + Automatic reference class for LuggageSpotEquipmentRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd index 90c5082b5..e1c9561c6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd @@ -168,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a TOPOGRAPHIC PLACE. + + + Automatic reference class for TopographicPlaceRefStructure + + @@ -211,6 +216,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF PLACEs. + + + Automatic reference class for GroupOfPlacesRefStructure + + @@ -237,7 +247,13 @@ Rail transport, Roads and Road transport Type for a reference to a TOPOGRAPHIC PROJECTION - + + + + Automatic reference class for TopographicProjectionRefStructure + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd index e9e67ef68..b74957d94 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of a POWERED TRAIN. + + + Automatic reference class for PoweredTrainRefStructure + + @@ -106,6 +111,11 @@ Rail transport, Roads and Road transport Identifier of a UNPOWERED TRAIN. + + + Automatic reference class for UnpoweredTrainRefStructure + + @@ -132,6 +142,11 @@ Rail transport, Roads and Road transport Identifier of a TRACTIVE ELEMENT TYPE. + + + Automatic reference class for TractiveElementTypeRefStructure + + @@ -158,6 +173,11 @@ Rail transport, Roads and Road transport Identifier of a TRAILING ELEMENT TYPE. + + + Automatic reference class for TrailingElementTypeRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index 167d9b588..0e433e8fe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN. + + + Automatic reference class for TrainRefStructure + + @@ -139,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN IN COMPOUND TRAIN. + + + Automatic reference class for TrainInCompoundTrainRefStructure + + @@ -170,6 +180,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN ELEMENT TYPE. + + + Automatic reference class for TrainElementTypeRefStructure + + @@ -216,6 +231,11 @@ Rail transport, Roads and Road transport Identifier of TRAIN COMPONENT. + + + Automatic reference class for TrainComponentRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index ff287bdde..e30bcb828 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -114,6 +114,11 @@ Rail transport, Roads and Road transport Identifier of an TRANSPORT ORGANISATION. + + + Automatic reference class for TransportOrganisationRefStructure + + @@ -153,6 +158,11 @@ Rail transport, Roads and Road transport Identifier of an OPERATOR. + + + Automatic reference class for OperatorRefStructure + + @@ -266,6 +276,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF OPERATORs. + + + Automatic reference class for GroupOfOperatorsRefStructure + + @@ -292,6 +307,11 @@ Rail transport, Roads and Road transport Identifier of an OPERATIONAL CONTEXT. + + + Automatic reference class for OperationalContextRefStructure + + @@ -330,6 +350,11 @@ Rail transport, Roads and Road transport Identifier of an OPERATING DEPARTMENT. + + + Automatic reference class for OperatingDepartmentRefStructure + + @@ -356,6 +381,11 @@ Rail transport, Roads and Road transport Identifier of a CONTROL CENTRE. + + + Automatic reference class for ControlCentreRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 9e829adea..355457cea 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -116,6 +116,11 @@ Rail transport, Roads and Road transport Identifier of a TRANSPORT TYPE. + + + Automatic reference class for TransportTypeRefStructure + + @@ -154,6 +159,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE TYPE. + + + Automatic reference class for VehicleTypeRefStructure + + @@ -192,6 +202,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE TYPE. + + + Automatic reference class for SimpleVehicleTypeRefStructure + + @@ -218,6 +233,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for VehicleRequirementRefStructure + + @@ -244,6 +264,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER CARRYING REQUIREMENT. + + + Automatic reference class for PassengerCarryingRequirementRefStructure + + @@ -270,6 +295,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE. + + + Automatic reference class for PassengerCapacityRefStructure + + @@ -296,6 +326,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE. + + + Automatic reference class for PassengerVehicleCapacityRefStructure + + @@ -322,6 +357,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for VehicleManoeuvringRequirementRefStructure + + @@ -348,6 +388,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for FacilityRequirementRefStructure + + @@ -374,6 +419,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE MODEL. + + + Automatic reference class for VehicleModelRefStructure + + @@ -412,6 +462,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE EQUIPMENT PROFILE. + + + Automatic reference class for VehicleEquipmentProfileRefStructure + + @@ -652,6 +707,11 @@ Rail transport, Roads and Road transport Reference to a PURPOSE OF EQUIPMENT PROFILE. + + + Automatic reference class for PurposeOfEquipmentProfileRefStructure + + @@ -690,6 +750,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE EQUIPMENT PROFILE MEMBER. + + + Automatic reference class for VehicleEquipmentProfileMemberRefStructure + + @@ -716,6 +781,11 @@ Rail transport, Roads and Road transport Reference to an ACCEPTED DRIVER PERMIT. + + + Automatic reference class for AcceptedDriverPermitRefStructure + + @@ -742,6 +812,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF DRIVER PERMIT. + + + Automatic reference class for TypeOfDriverPermitRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd index a68bcc609..0a5812a6d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd @@ -91,6 +91,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE. + + + Automatic reference class for VehicleRefStructure + + @@ -129,6 +134,11 @@ Rail transport, Roads and Road transport Identifier of a ROLLING STOCK ITEM. + + + Automatic reference class for RollingStockItemRefStructure + + @@ -155,6 +165,11 @@ Rail transport, Roads and Road transport Identifier of a TRACTIVE ROLLING STOCK ITEM. + + + Automatic reference class for TractiveRollingStockItemRefStructure + + @@ -181,6 +196,11 @@ Rail transport, Roads and Road transport Identifier of a TRAILING ROLLING STOCK ITEM. + + + Automatic reference class for TrailingRollingStockItemRefStructure + + @@ -219,6 +239,11 @@ Rail transport, Roads and Road transport Identifier of a ROLLING STOCK INVENTORY. + + + Automatic reference class for RollingStockInventoryRefStructure + + @@ -245,6 +270,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF ROLLING STOCK. + + + Automatic reference class for TypeOfRollingStockRefStructure + + diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd index 9bd777f71..4ba28e12d 100644 --- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of an INFRASTRUCTURE FRAME. + + + Automatic reference class for InfrastructureFrameRefStructure + + diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index 44ab3156e..b0ed7a82d 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -91,6 +91,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for SiteFrameRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd index dcf05bfd1..758a19541 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of ASSISTANCE BOOKING SERVICE. + + + Automatic reference class for AssistanceBookingServiceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd index 7522a93b1..85f2ff44d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF CONGESTION. + + + Automatic reference class for TypeOfCongestionRefStructure + + @@ -106,6 +111,11 @@ Rail transport, Roads and Road transport Identifier of a CHECK CONSTRAINT. + + + Automatic reference class for CheckConstraintRefStructure + + @@ -132,6 +142,11 @@ Rail transport, Roads and Road transport Identifier of a CHECK CONSTRAINT DELAY. + + + Automatic reference class for CheckConstraintDelayRefStructure + + @@ -158,6 +173,11 @@ Rail transport, Roads and Road transport Identifier of a CHECK CONSTRAINT THROUGHPUT. + + + Automatic reference class for CheckConstraintThroughputRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 0cc78f9d0..8106721ab 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of a ACCESS EQUIPMENT. + + + Automatic reference class for AccessEquipmentRefStructure + + @@ -116,6 +121,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for EntranceEquipmentRefStructure + + @@ -326,6 +336,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for TravelatorEquipmentRefStructure + + @@ -378,6 +393,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for StaircaseEquipmentRefStructure + + @@ -404,6 +424,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for RoughSurfaceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd index 4e6f63f47..04966ba4e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd @@ -84,6 +84,11 @@ Rail transport, Roads and Road transport Identifier of a CYCLE STORAGE EQUIPMENT. + + + Automatic reference class for CycleStorageEquipmentRefStructure + + @@ -141,6 +146,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE RELEASE EQUIPMENT. + + + Automatic reference class for VehicleReleaseEquipmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd index ea0407520..186c81621 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of a PLACE SIGN. + + + Automatic reference class for PlaceSignRefStructure + + @@ -116,6 +121,11 @@ Rail transport, Roads and Road transport Identifier of a GENERAL SIGN. + + + Automatic reference class for GeneralSignRefStructure + + @@ -142,6 +152,11 @@ Rail transport, Roads and Road transport Identifier of a HEADING SIGN. + + + Automatic reference class for HeadingSignRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd index 72d781d7a..cbebdc9d2 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd @@ -75,6 +75,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for TicketingEquipmentRefStructure + + @@ -113,6 +118,11 @@ Rail transport, Roads and Road transport Identifier of a TICKET VALIDATOR. + + + Automatic reference class for TicketValidatorEquipmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd index f6087c28c..8accba5e7 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a SITE EQUIPMENT. + + + Automatic reference class for SiteEquipmentRefStructure + + @@ -105,6 +110,11 @@ Rail transport, Roads and Road transport Identifier of a WAITING EQUIPMENT. + + + Automatic reference class for WaitingEquipmentRefStructure + + @@ -125,7 +135,13 @@ Rail transport, Roads and Road transport Type for a reference to an WAITING ROOM EQUIPMENT. - + + + + Automatic reference class for WaitingRoomEquipmentRefStructure + + + @@ -215,6 +231,11 @@ Rail transport, Roads and Road transport Identifier of a SHELTER EQUIPMENT. + + + Automatic reference class for ShelterEquipmentRefStructure + + @@ -241,6 +262,11 @@ Rail transport, Roads and Road transport Identifier of a SEATING EQUIPMENT. + + + Automatic reference class for SeatingEquipmentRefStructure + + @@ -267,6 +293,11 @@ Rail transport, Roads and Road transport Identifier of a TROLLEY STAND EQUIPMENT. + + + Automatic reference class for TrolleyStandEquipmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd index 8f67666ef..3455d4d08 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a FLEXIBLE STOP PLACE. + + + Automatic reference class for FlexibleStopPlaceRefStructure + + @@ -117,6 +122,11 @@ Rail transport, Roads and Road transport Identifier of a FLIEXIBLE QUAY. + + + Automatic reference class for FlexibleQuayRefStructure + + @@ -143,6 +153,11 @@ Rail transport, Roads and Road transport Identifier of a FLEXIBLE AREa. + + + Automatic reference class for FlexibleAreaRefStructure + + @@ -169,6 +184,11 @@ Rail transport, Roads and Road transport Identifier of a HAIL AND RIDE AREA. + + + Automatic reference class for HailAndRideAreaRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd index 389030737..e0aa83302 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a COMMUNICATION SERVICE. + + + Automatic reference class for CommunicationServiceRefStructure + + @@ -104,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of a HIRE SERVICE. + + + Automatic reference class for HireServiceRefStructure + + @@ -151,6 +161,11 @@ Rail transport, Roads and Road transport Identifier of a MONEY SERVICE. + + + Automatic reference class for MoneyServiceRefStructure + + @@ -196,6 +211,11 @@ Rail transport, Roads and Road transport Identifier of a RETAIL SERVICE. + + + Automatic reference class for RetailServiceRefStructure + + @@ -243,6 +263,11 @@ Rail transport, Roads and Road transport Identifier of a CATERING SERVICE. + + + Automatic reference class for CateringServiceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd index e90f8a39d..151895b8d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd @@ -69,6 +69,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for LocalServiceRefStructure + + @@ -101,6 +106,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for TicketingServiceRefStructure + + @@ -127,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of a ASSISTANCE SERVICE. + + + Automatic reference class for AssistanceServiceRefStructure + + @@ -153,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER SERVICE. + + + Automatic reference class for CustomerServiceRefStructure + + @@ -179,6 +199,11 @@ Rail transport, Roads and Road transport Identifier of a COMPLAINTS SERVICE. + + + Automatic reference class for ComplaintsServiceRefStructure + + @@ -205,6 +230,11 @@ Rail transport, Roads and Road transport Identifier of a LOST PROPERTY SERVICE. + + + Automatic reference class for LostPropertyServiceRefStructure + + @@ -231,6 +261,11 @@ Rail transport, Roads and Road transport Identifier of a LUGGAGE SERVICE. + + + Automatic reference class for LuggageServiceRefStructure + + @@ -257,6 +292,11 @@ Rail transport, Roads and Road transport Identifier of a LEFT LUGGAGE SERVICE. + + + Automatic reference class for LeftLuggageServiceRefStructure + + @@ -283,6 +323,11 @@ Rail transport, Roads and Road transport Identifier of a MEETING POINT SERVICE. + + + Automatic reference class for MeetingPointServiceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd index 953d23a60..134702e65 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd @@ -102,14 +102,14 @@ Rail transport, Roads and Road transport - + - Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type. + Identifier of a PARKING. - + - Identifier of a PARKING. + Automatic reference class for ParkingRefStructure @@ -133,14 +133,14 @@ Rail transport, Roads and Road transport - + - Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type. + Identifier of a PARKING. - + - Identifier of a PARKING. + Automatic reference class for ParkingCapacityRefStructure @@ -163,14 +163,14 @@ Rail transport, Roads and Road transport - + - Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type. + Identifier of a PARKING PROPERTY. - + - Identifier of a PARKING PROPERTY. + Automatic reference class for ParkingPropertiesRefStructure @@ -295,6 +295,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING AREA. + + + Automatic reference class for ParkingAreaRefStructure + + @@ -333,6 +338,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING BAY. + + + Automatic reference class for ParkingBayRefStructure + + @@ -662,6 +672,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF PARKING. + + + Automatic reference class for TypeOfParkingRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 3f0ccaaa0..a41c53c97 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -95,6 +95,11 @@ Rail transport, Roads and Road transport Identifier of a SITE PATH LINK. + + + Automatic reference class for SitePathLinkRefStructure + + @@ -170,6 +175,11 @@ Rail transport, Roads and Road transport Identifier of a OFF SITE PATH LINK. + + + Automatic reference class for OffSitePathLinkRefStructure + + @@ -210,6 +220,11 @@ Rail transport, Roads and Road transport Identifier of a SITE NAVIGATION PATH. + + + Automatic reference class for SiteNavigationPathRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd index 07f903ef6..66a0cab6b 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of a POINT OF INTEREST. + + + Automatic reference class for PointOfInterestRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of a POINT OF INTEREST CLASSIFICATION. + + + Automatic reference class for PointOfInterestClassificationRefStructure + + @@ -281,6 +291,11 @@ Rail transport, Roads and Road transport Identifier of an VEHICLE ENTRANCE. + + + Automatic reference class for PointOfInterestVehicleEntranceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd index 9641a344b..8577a896b 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF Service FEATURE. + + + Automatic reference class for TypeOfServiceFeatureRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 83fec51a3..49c18306a 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF SITEs. + + + Automatic reference class for GroupOfSitesRefStructure + + @@ -113,6 +118,11 @@ Rail transport, Roads and Road transport Identifier of a SITE COMPONENT. + + + Automatic reference class for SiteElementRefStructure + + @@ -139,6 +149,11 @@ Rail transport, Roads and Road transport Identifier of a PLACE. + + + Automatic reference class for SiteRefStructure + + @@ -177,6 +192,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE SITE. + + + Automatic reference class for ServiceSiteRefStructure + + @@ -203,6 +223,11 @@ Rail transport, Roads and Road transport Identifier of a SITE COMPONENT. + + + Automatic reference class for SiteComponentRefStructure + + @@ -229,6 +254,11 @@ Rail transport, Roads and Road transport Identifier of a LEVEL. + + + Automatic reference class for LevelRefStructure + + @@ -255,6 +285,11 @@ Rail transport, Roads and Road transport Identifier of a SITE STRUCTURE. + + + Automatic reference class for SiteStructureRefStructure + + @@ -293,6 +328,11 @@ Rail transport, Roads and Road transport Identifier of a LEVEL IN STRUCTURE. + + + Automatic reference class for LevelInStructureRefStructure + + @@ -319,6 +359,11 @@ Rail transport, Roads and Road transport Identifier of an ENTRANCE. + + + Automatic reference class for EntranceRefStructure + + @@ -357,6 +402,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE ENTRANCE. + + + Automatic reference class for VehicleEntranceRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 30ed006f4..91e93e050 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -87,6 +87,11 @@ Rail transport, Roads and Road transport Identifier of a STOP PLACE. + + + Automatic reference class for StopPlaceRefStructure + + @@ -125,6 +130,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF STOP PLACEs. + + + Automatic reference class for GroupOfStopPlacesRefStructure + + @@ -139,7 +149,13 @@ Rail transport, Roads and Road transport Type for reference a STOP PLACE SPACE. - + + + + Automatic reference class for StopPlaceSpaceRefStructure + + + @@ -165,6 +181,11 @@ Rail transport, Roads and Road transport Identifier of a QUAY. + + + Automatic reference class for QuayRefStructure + + @@ -203,6 +224,11 @@ Rail transport, Roads and Road transport Identifier of an ACCESS SPACE. + + + Automatic reference class for AccessSpaceRefStructure + + @@ -241,6 +267,11 @@ Rail transport, Roads and Road transport Identifier of a BOARDING POSITION. + + + Automatic reference class for BoardingPositionRefStructure + + @@ -267,6 +298,11 @@ Rail transport, Roads and Road transport Identifier of a STOP PLACE ENTRANCE. + + + Automatic reference class for StopPlaceEntranceRefStructure + + @@ -293,6 +329,11 @@ Rail transport, Roads and Road transport Identifier of a STOP PLACE VEHICLE ENTRANCE. + + + Automatic reference class for StopPlaceVehicleEntranceRefStructure + + 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 3cb7eea9b..f1a4f293a 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 @@ -78,6 +78,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE STOPPING PLACE. + + + Automatic reference class for VehicleStoppingPlaceRefStructure + + @@ -104,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE STOPPING POSITION. + + + Automatic reference class for VehicleStoppingPositionRefStructure + + @@ -130,6 +140,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE QUAY ALIGNMENT. + + + Automatic reference class for VehicleQuayAlignmentRefStructure + + @@ -156,6 +171,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE POSITION ALIGNMENT. + + + Automatic reference class for VehiclePositionAlignmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_support.xsd index 34daddcf7..5e89eecf6 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING BAY. + + + Automatic reference class for RechargingBayRefStructure + + @@ -105,6 +110,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING STATION. + + + Automatic reference class for RechargingStationRefStructure + + @@ -131,6 +141,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING POINT ASSIGNMENT. + + + Automatic reference class for RechargingPointAssignmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_support.xsd index f2e4a9bc0..f8c45ab7d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a TAXI RANK. + + + Automatic reference class for TaxiRankRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of TAXI STAND. + + + Automatic reference class for TaxiStandRefStructure + + @@ -146,6 +156,11 @@ Rail transport, Roads and Road transport Identifier of a TAXI PARKING AREA. + + + Automatic reference class for TaxiParkingAreaRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd index 1153401a5..7156d49c3 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of an ACTIVATED EQUIPMENT. + + + Automatic reference class for ActivatedEquipmentRefStructure + + @@ -109,6 +114,11 @@ Rail transport, Roads and Road transport Identifier of an ACTIVATION POINT. + + + Automatic reference class for ActivationPointRefStructure + + @@ -135,6 +145,11 @@ Rail transport, Roads and Road transport Identifier of BEACON POINT. + + + Automatic reference class for BeaconPointRefStructure + + @@ -161,6 +176,11 @@ Rail transport, Roads and Road transport Identifier of a TRAFFIC CONTROL POINT. + + + Automatic reference class for TrafficControlPointRefStructure + + @@ -187,6 +207,11 @@ Rail transport, Roads and Road transport Identifier of an ACTIVATION LINK. + + + Automatic reference class for ActivationLinkRefStructure + + @@ -243,6 +268,11 @@ Rail transport, Roads and Road transport Identifier of an ACTIVATION ASSIGNMENT. + + + Automatic reference class for ActivationAssignmentRefStructure + + @@ -285,6 +315,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF ACTIVATION. + + + Automatic reference class for TypeOfActivationRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd index b5b5c0415..b5f06a756 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a LINE. + + + Automatic reference class for FlexibleLineRefStructure + + @@ -169,6 +174,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for FlexibleLinkPropertiesRefStructure + + @@ -195,6 +205,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for FlexiblePointPropertiesRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd index 0a54be875..078fd87e8 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd @@ -140,6 +140,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF ENTITies. + + + Automatic reference class for LineSectionRefStructure + + @@ -192,6 +197,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for LineNetworkRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd index 8e53003d0..b6be1105f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd @@ -52,6 +52,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF LINEs. + + + Automatic reference class for GroupOfLinesRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of a LINE. + + + Automatic reference class for LineRefStructure + + @@ -193,6 +203,11 @@ Rail transport, Roads and Road transport Identifier of an ALLOWED LINE DIRECTION. + + + Automatic reference class for AllowedLineDirectionRefStructure + + @@ -219,6 +234,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for NetworkRefStructure + + @@ -257,6 +277,11 @@ Rail transport, Roads and Road transport Identifier of a DESTINATION DISPLAY. + + + Automatic reference class for DestinationDisplayRefStructure + + @@ -295,6 +320,11 @@ Rail transport, Roads and Road transport Identifier of a DESTINATION DISPLAY. + + + Automatic reference class for DestinationDisplayVariantRefStructure + + @@ -345,6 +375,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF LINe. + + + Automatic reference class for TypeOfLineRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd index fa0b26c9f..bdc89e6eb 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for InfrastructurePointRefStructure + + @@ -188,6 +193,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for InfrastructureLinkRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd index a0986fe7d..274f40506 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd @@ -87,6 +87,11 @@ Rail transport, Roads and ROAD transport Relative order of element. + + + Automatic reference class for NetworkRestrictionRefStructure + + @@ -113,6 +118,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for VehicleTypeAtPointRefStructure + + @@ -139,6 +149,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for InfrastructureLinkRestrictionRefStructure + + @@ -165,6 +180,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for RestrictedManoeuvreRefStructure + + @@ -191,6 +211,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for MeetingRestrictionRefStructure + + @@ -217,6 +242,11 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. + + + Automatic reference class for OvertakingPossibilityRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd index 86c989be8..8fab0c326 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of a ROUTE INSTRUCTION. + + + Automatic reference class for RouteInstructionRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd index cbdba31a9..88f0e4217 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd @@ -98,6 +98,11 @@ Rail transport, Roads and Road transport Reference to a DIRECTION. + + + Automatic reference class for DirectionRefStructure + + @@ -124,6 +129,11 @@ Rail transport, Roads and Road transport Identifier of a ROUTE. + + + Automatic reference class for RouteRefStructure + + @@ -162,6 +172,11 @@ Rail transport, Roads and Road transport Identifier of a ROUTE POINT. + + + Automatic reference class for RoutePointRefStructure + + @@ -188,6 +203,11 @@ Rail transport, Roads and Road transport Identifier of a ROUTE LINK. + + + Automatic reference class for RouteLinkRefStructure + + @@ -244,6 +264,11 @@ Rail transport, Roads and Road transport Identifier of a POINT IN SEQUENCE. + + + Automatic reference class for PointOnRouteRefStructure + + @@ -270,6 +295,11 @@ Rail transport, Roads and Road transport Identifier of a POINT IN SEQUENCE. + + + Automatic reference class for ModeRestrictionAssessmentRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd index afdbb92a4..5fc2dd2f0 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd @@ -84,6 +84,11 @@ Rail transport, Roads and Road transport Identifier of a TIMING PATTERN. + + + Automatic reference class for TimingPatternRefStructure + + @@ -110,6 +115,11 @@ Rail transport, Roads and Road transport Identifier of a TIMING POINT. + + + Automatic reference class for TimingPointRefStructure + + @@ -149,6 +159,11 @@ Rail transport, Roads and Road transport Identifier of a TIMING LINK. + + + Automatic reference class for TimingLinkRefStructure + + @@ -205,6 +220,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF TIMING LINKs. + + + Automatic reference class for GroupOfTimingLinksRefStructure + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd index a0d2b1067..1218c5e1e 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of a RELIEF POINT. + + + Automatic reference class for ReliefPointRefStructure + + @@ -108,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING POINT. + + + Automatic reference class for ParkingPointRefStructure + + @@ -135,6 +145,11 @@ Rail transport, Roads and Road transport Identifier of a GARAGE POINT. + + + Automatic reference class for GaragePointRefStructure + + @@ -161,6 +176,11 @@ Rail transport, Roads and Road transport Identifier of GARAGE. + + + Automatic reference class for GarageRefStructure + + @@ -212,6 +232,11 @@ Rail transport, Roads and Road transport Identifier of a CREW BASE. + + + Automatic reference class for CrewBaseRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd index 3ed376092..526e75c52 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd @@ -74,6 +74,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for CommonSectionRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd index cbd0b629d..f26448a0f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd @@ -87,6 +87,11 @@ Rail transport, Roads and Road transport Identifier of FARE SCHEDULED STOP POINT. + + + Automatic reference class for FareScheduledStopPointRefStructure + + @@ -125,6 +130,11 @@ Rail transport, Roads and Road transport Reference to a BORDER POINT. + + + Automatic reference class for BorderPointRefStructure + + @@ -151,6 +161,11 @@ Rail transport, Roads and Road transport Identifier of a FARE POINT IN JOURNEY PATTERN. + + + Automatic reference class for FarePointInPatternRefStructure + + @@ -188,6 +203,11 @@ Rail transport, Roads and Road transport Identifier of a FARE SECTION. + + + Automatic reference class for FareSectionRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd index 2b2ee259f..cf09da7f6 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd @@ -109,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of a JOURNEY PATTERN RUN TIME. + + + Automatic reference class for JourneyPatternRunTimeRefStructure + + @@ -135,6 +140,11 @@ Rail transport, Roads and Road transport Identifier of a JOURNEY PATTERN LAYOVER. + + + Automatic reference class for JourneyPatternLayoverRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd index 7502eecb9..dcb05f203 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a JOURNEY PATTERN. + + + Automatic reference class for JourneyPatternRefStructure + + @@ -120,6 +125,11 @@ Rail transport, Roads and Road transport Identifier of a DEAD RUN JOURNEY PATTERN. + + + Automatic reference class for DeadRunJourneyPatternRefStructure + + @@ -146,6 +156,11 @@ Rail transport, Roads and Road transport Identifier of a POINT IN JOURNEY PATTERN. + + + Automatic reference class for PointInJourneyPatternRefStructure + + @@ -172,6 +187,11 @@ Rail transport, Roads and Road transport Identifier of a LINK IN JOURNEY PATTERN. + + + Automatic reference class for LinkInJourneyPatternRefStructure + + @@ -198,6 +218,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF JOURNEY PATTERN. + + + Automatic reference class for TypeOfJourneyPatternRefStructure + + @@ -225,6 +250,11 @@ Rail transport, Roads and Road transport Identifier of a TIMING POINT. + + + Automatic reference class for TimingPointInJourneyPatternRefStructure + + @@ -251,6 +281,11 @@ Rail transport, Roads and Road transport Identifier of a TIMING LINK. + + + Automatic reference class for TimingLinkInJourneyPatternRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd index 5c0d007b0..8edea0888 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for JourneyTimingRefStructure + + @@ -121,7 +126,13 @@ Rail transport, Roads and Road transport Type for a reference to a HEADWAY. - + + + + Automatic reference class for HeadwayRefStructure + + + @@ -179,6 +190,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for DefaultDeadRunRunTimeRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd index c9957f5d3..18f4384f3 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd @@ -89,6 +89,11 @@ Rail transport, Roads and Road transport Identifier of DISPLAY ASSIGNMENT. + + + Automatic reference class for DisplayAssignmentRefStructure + + @@ -125,6 +130,11 @@ Rail transport, Roads and Road transport Identifier of PASSENGER INFORMATION EQUIPMENT. + + + Automatic reference class for PassengerInformationEquipmentRefStructure + + @@ -151,6 +161,11 @@ Rail transport, Roads and Road transport Identifier of a LOGICAL DISPLAY. + + + Automatic reference class for LogicalDisplayRefStructure + + @@ -177,6 +192,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF PASSENGER INFORMATION EQUIPMENT. + + + Automatic reference class for TypeOfPassengerInformationEquipmentRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index f62a1ea14..fe1cde1d1 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE EXCLUSION. + + + Automatic reference class for ServiceExclusionRefStructure + + @@ -109,6 +114,11 @@ Rail transport, Roads and Road transport Identifier of a TRANSFER RESTRICTION. + + + Automatic reference class for TransferRestrictionRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index 35d52b3bb..7d1019173 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of SCHEDULED STOP POINT. + + + Automatic reference class for ScheduledStopPointRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of CONNECTION link. + + + Automatic reference class for ConnectionRefStructure + + @@ -158,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE LINK. + + + Automatic reference class for ServiceLinkRefStructure + + @@ -214,6 +229,11 @@ Rail transport, Roads and Road transport Identifier of referenced to a SERVICE PATTERN. + + + Automatic reference class for ServicePatternRefStructure + + @@ -240,6 +260,11 @@ Rail transport, Roads and Road transport Identifier of referenced to a SERVICE JOURNEY PATTERN. + + + Automatic reference class for ServiceJourneyPatternRefStructure + + @@ -290,6 +315,11 @@ Rail transport, Roads and Road transport Identifier of referenced to a SERVICE JOURNEY PATTERN. + + + Automatic reference class for StopPointInJourneyPatternRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd index 36b49f5e5..8af985715 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of SITE CONNECTION link. + + + Automatic reference class for SiteConnectionRefStructure + + @@ -107,6 +112,11 @@ Rail transport, Roads and Road transport Identifier of DEFAULT TRANSFER. + + + Automatic reference class for DefaultConnectionRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index 11c5cbef3..34eed654a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a STOP ASSIGNMENT. + + + Automatic reference class for StopAssignmentRefStructure + + @@ -107,6 +112,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER STOP ASSIGNMENT. + + + Automatic reference class for PassengerStopAssignmentRefStructure + + @@ -133,6 +143,11 @@ Rail transport, Roads and Road transport DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. + + + Automatic reference class for TrainStopAssignmentRefStructure + + @@ -159,6 +174,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER BOARDING POSITION ASSIGNMENT. + + + Automatic reference class for PassengerBoardingPositionAssignmentRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd index 5a1261bcb..0b6a7f54b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a TIME DEMAND TYPE. + + + Automatic reference class for TimeDemandTypeRefStructure + + @@ -120,6 +125,11 @@ Rail transport, Roads and Road transport Identifier of a TIME DEMAND ASSIGNMENT. + + + Automatic reference class for TimeDemandTypeAssignmentRefStructure + + @@ -146,6 +156,11 @@ Rail transport, Roads and Road transport Identifier of a TIME DEMAND PROFILE. + + + Automatic reference class for TimeDemandProfileRefStructure + + @@ -178,6 +193,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF TIME DEMAND TYPE. + + + Automatic reference class for TypeOfTimeDemandTypeRefStructure + + diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd index 5094b004f..c72da916c 100644 --- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd @@ -76,6 +76,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE FRAME. + + + Automatic reference class for ServiceFrameRefStructure + + diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd index bce24f28b..e3e52fd4a 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a TIMETABLE FRAME. + + + Automatic reference class for TimetableFrameRefStructure + + @@ -103,6 +108,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for VehicleScheduleFrameRefStructure + + @@ -125,6 +135,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for DriverScheduleFrameRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd index aa2ac3188..a82c2bca6 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of an AddressedPlace. + + + Automatic reference class for CallRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd index 530f2d4fe..a7ed92c24 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd @@ -84,6 +84,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF ENTITies. + + + Automatic reference class for JourneyPartRefStructure + + @@ -122,6 +127,11 @@ Rail transport, Roads and Road transport Identifier of a COUPLED JOURNEY. + + + Automatic reference class for CoupledJourneyRefStructure + + @@ -148,6 +158,11 @@ Rail transport, Roads and Road transport Identifier of JOURNEY PART COUPLE. + + + Automatic reference class for JourneyPartCoupleRefStructure + + @@ -210,6 +225,11 @@ Rail transport, Roads and Road transport Reference to a PURPOSE OF JOURNEY PARTITION. + + + Automatic reference class for PurposeOfJourneyPartitionRefStructure + + @@ -249,6 +269,11 @@ Rail transport, Roads and Road transport Identifier of a BLOCK. + + + Automatic reference class for BlockRefStructure + + @@ -275,6 +300,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN BLOCK. + + + Automatic reference class for TrainBlockRefStructure + + @@ -302,6 +332,11 @@ Rail transport, Roads and Road transport Identifier of a BLOCK PART. + + + Automatic reference class for BlockPartRefStructure + + @@ -328,6 +363,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN BLOCK PART. + + + Automatic reference class for TrainBlockPartRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd index c7a66eb2f..017b8b577 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd @@ -157,6 +157,11 @@ Rail transport, Roads and Road transport Identifier of a DATED SPECIAL SERVICE. + + + Automatic reference class for DatedSpecialServiceRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd index 6e70812ef..a115f2baa 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd @@ -132,6 +132,11 @@ Identifier of a TRAIN COMPONENT STOP ASSIGNMENT. + + + Automatic reference class for TrainComponentStopAssignmentRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd index 35e7fa3ae..85064ba11 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -97,6 +97,11 @@ Identifier of a DECK PLAN ASSIGNMENT. + + + Automatic reference class for DeckPlanAssignmentRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd index c71a5382d..b692a22f4 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for FlexibleServicePropertiesRefStructure + + @@ -134,6 +139,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FLEXIBLE SERVICE. + + + Automatic reference class for TypeOfFlexibleServiceRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd index fd35e4a75..806043a04 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of a JOURNEY MEETING. + + + Automatic reference class for JourneyMeetingRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of an INTERCHANGe. + + + Automatic reference class for InterchangeRefStructure + + @@ -158,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a DEFAULT INTERCHANGe. + + + Automatic reference class for DefaultInterchangeRefStructure + + @@ -184,6 +199,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE JOURNEY INTERCHANGe. + + + Automatic reference class for ServiceJourneyInterchangeRefStructure + + @@ -210,6 +230,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE JOURNEY INTERCHANGe. + + + Automatic reference class for ServiceJourneyPatternInterchangeRefStructure + + @@ -236,6 +261,11 @@ Rail transport, Roads and Road transport Identifier of an INTERCHANGe. + + + Automatic reference class for InterchangeRuleRefStructure + + @@ -289,6 +319,11 @@ Rail transport, Roads and Road transport Identifier of an INTERCHANGe. + + + Automatic reference class for InterchangeRuleTimingRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd index 2c03654c0..120b12406 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd @@ -107,6 +107,11 @@ Rail transport, Roads and Road transport Identifier of JOURNEY ACCOUNTING. + + + Automatic reference class for JourneyAccountingRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd index 9749287ee..7f743b422 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd @@ -133,6 +133,11 @@ Identifier of a restricted SERVICE FACILITY SET. + + + Automatic reference class for RestrictedServiceFacilitySetRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd index d082de601..384679649 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd @@ -99,6 +99,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE JOURNEY. + + + Automatic reference class for ServiceJourneyRefStructure + + @@ -125,6 +130,11 @@ Rail transport, Roads and Road transport Identifier of a SPECIAL SERVICE. + + + Automatic reference class for SpecialServiceRefStructure + + @@ -163,6 +173,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF Services. + + + Automatic reference class for GroupOfServicesRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd index 4ee132b5e..3526f6aaa 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd @@ -100,6 +100,11 @@ Rail transport, Roads and Road transport Identifier of a TEMPLATE VEHICLE JOURNEY. + + + Automatic reference class for TemplateServiceJourneyRefStructure + + @@ -126,6 +131,11 @@ Rail transport, Roads and Road transport Reference to a JOURNEY FREQUENCY GROUP. + + + Automatic reference class for JourneyFrequencyGroupRefStructure + + @@ -174,6 +184,11 @@ Rail transport, Roads and Road transport Reference to a HEADWAY JOURNEY GROUP. + + + Automatic reference class for HeadwayJourneyGroupRefStructure + + @@ -200,6 +215,11 @@ Rail transport, Roads and Road transport Reference to a RHYTHMICAL JOURNEY GROUP. + + + Automatic reference class for RhythmicalJourneyGroupRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd index 01aba8bea..837dcbd1b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of referenced a VEHICLE TYPE STOP ASSIGNMENT. + + + Automatic reference class for VehicleTypeStopAssignmentRefStructure + + @@ -106,6 +111,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER STOP ASSIGNMENT. + + + Automatic reference class for VehicleJourneyStopAssignmentRefStructure + + @@ -132,6 +142,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN COMPONENT NUMBER ASSIGNNMENT. + + + Automatic reference class for TrainComponentLabelAssignmentRefStructure + + @@ -170,6 +185,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER STOP ASSIGNMENT. + + + Automatic reference class for DynamicStopAssignmentRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd index 3cd64ecff..47a6773bc 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd @@ -87,6 +87,11 @@ Rail transport, Roads and Road transport Identifier of a JOURNEY. + + + Automatic reference class for JourneyRefStructure + + @@ -114,6 +119,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE JOURNEY. + + + Automatic reference class for VehicleJourneyRefStructure + + @@ -152,6 +162,11 @@ Rail transport, Roads and Road transport Identifier of a DEAD RUN. + + + Automatic reference class for DeadRunRefStructure + + @@ -201,6 +216,11 @@ Rail transport, Roads and Road transport Identifier of a TRAIN NUMBER. + + + Automatic reference class for TrainNumberRefStructure + + @@ -239,6 +259,11 @@ Rail transport, Roads and Road transport Reference to a TIMING ALGORITHM TYPE. + + + Automatic reference class for TimingAlgorithmTypeRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd index 86cabf31c..2e81502e5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of a COMPOUND BLOCK. + + + Automatic reference class for CompoundBlockRefStructure + + @@ -108,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE SERVICE. + + + Automatic reference class for VehicleServiceRefStructure + + @@ -134,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE SERVICE PART. + + + Automatic reference class for VehicleServicePartRefStructure + + @@ -186,6 +201,11 @@ Rail transport, Roads and Road transport Identifier of a COURSE OF JOURNEYS. + + + Automatic reference class for CourseOfJourneysRefStructure + + @@ -212,6 +232,11 @@ Rail transport, Roads and Road transport Identifier of a RELIEF OPPORTUNITY. + + + Automatic reference class for ReliefOpportunityRefStructure + + diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd index b5ed703b4..f6909c95b 100644 --- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd +++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd @@ -202,6 +202,11 @@ More accurate data can be provided by the individual occupancies or capacities b Identifier of referenced entity. + + + Automatic reference class for OccupancyViewRefStructure + + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd index def2502aa..fd37fd296 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a Duty. + + + Automatic reference class for DutyRefStructure + + @@ -108,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of an ACCOUNTABLE ELEMENT. + + + Automatic reference class for AccountableElementRefStructure + + @@ -134,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a BLOCK PART. + + + Automatic reference class for DutyPartRefStructure + + @@ -161,6 +176,11 @@ Rail transport, Roads and Road transport Identifier of a DRIVER TRIP. + + + Automatic reference class for DriverTripRefStructure + + @@ -187,6 +207,11 @@ Rail transport, Roads and Road transport Identifier of a DRIVER TRIP TIME. + + + Automatic reference class for DriverTripTimeRefStructure + + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_support.xsd index ec01a5698..73557e9ee 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_support.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING PLAN. + + + Automatic reference class for RechargingPlanRefStructure + + @@ -105,6 +110,11 @@ Rail transport, Roads and Road transport Identifier of a RECHARGING STEP. + + + Automatic reference class for RechargingStepRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd index 58223d33b..dd23d71cb 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd @@ -224,6 +224,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF ACCESS RIGHT ASSIGNMENT. + + + Automatic reference class for TypeOfAccessRightAssignmentRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd index 45d96c739..2458d5e00 100644 --- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a PRICING PARAMETERS. + + + Automatic reference class for PricingParameterSetRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of a PRICE UNIT. + + + Automatic reference class for PriceUnitRefStructure + + @@ -145,6 +155,11 @@ Rail transport, Roads and Road transport Identifier of a ROUNDING. + + + Automatic reference class for RoundingRefStructure + + @@ -171,6 +186,11 @@ Rail transport, Roads and Road transport Identifier of a ROUNDING STEP. + + + Automatic reference class for RoundingStepRefStructure + + @@ -210,6 +230,11 @@ Rail transport, Roads and Road transport Identifier of a FARE DAY TYPE. + + + Automatic reference class for FareDayTypeRefStructure + + @@ -236,6 +261,11 @@ Rail transport, Roads and Road transport Identifier of a PRICING SERVICE. + + + Automatic reference class for PricingServiceRefStructure + + @@ -340,6 +370,11 @@ Rail transport, Roads and Road transport Identifier of a MONTH VALIDITY OFFSET. + + + Automatic reference class for MonthValidityOffsetRefStructure + + @@ -402,6 +437,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF PRICING RULE. + + + Automatic reference class for TypeOfPricingRuleRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd index 4812700be..f3c0227a4 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd @@ -213,6 +213,11 @@ Rail transport, Roads and Road transport Identifier of a DISTANCE MATRIX ELEMENT PRICE. + + + Automatic reference class for DistanceMatrixElementPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd index a99240e9d..49c9e513e 100644 --- a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd @@ -95,6 +95,11 @@ Rail transport, Roads and Road transport Identifier of a PRICEABLE ELEMENT. + + + Automatic reference class for PriceableObjectRefStructure + + @@ -121,6 +126,11 @@ Rail transport, Roads and Road transport Identifier of a FARE PRICE. + + + Automatic reference class for FarePriceRefStructure + + @@ -153,6 +163,11 @@ Rail transport, Roads and Road transport Identifier of a PRICE GROUP. + + + Automatic reference class for PriceGroupRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd index 6c39215bd..08afce466 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd @@ -116,6 +116,11 @@ Rail transport, Roads and Road transport Identifier of a SERVICE ACCESS RIGHT. + + + Automatic reference class for ServiceAccessRightRefStructure + + @@ -162,6 +167,11 @@ Rail transport, Roads and Road transport Identifier of a FARE PRODUCT. + + + Automatic reference class for FareProductRefStructure + + @@ -188,6 +198,11 @@ Rail transport, Roads and Road transport Identifier of a SALES DISCOUNT RIGHT. + + + Automatic reference class for SaleDiscountRightRefStructure + + @@ -225,6 +240,11 @@ Rail transport, Roads and Road transport Identifier of a ENTITLEMENT PRODUCT. + + + Automatic reference class for EntitlementProductRefStructure + + @@ -263,6 +283,11 @@ Rail transport, Roads and Road transport Identifier of a THIRD PARTY PRODUCT. + + + Automatic reference class for ThirdPartyProductRefStructure + + @@ -302,6 +327,11 @@ Rail transport, Roads and Road transport Identifier of a USAGE DISCOUNT RIGHT. + + + Automatic reference class for UsageDiscountRightRefStructure + + @@ -338,6 +368,11 @@ Rail transport, Roads and Road transport Identifier of a CAPPED DISCOUNT RIGHT. + + + Automatic reference class for CappedDiscountRightRefStructure + + @@ -364,6 +399,11 @@ Rail transport, Roads and Road transport Identifier of a CAPPING RULE. + + + Automatic reference class for CappingRuleRefStructure + + @@ -413,6 +453,11 @@ Rail transport, Roads and Road transport Identifier of an AMOUNT OF PRICE UNIT PRODUCT. + + + Automatic reference class for AmountOfPriceUnitProductRefStructure + + @@ -451,6 +496,11 @@ Rail transport, Roads and Road transport Identifier of a PREASSIGNED FARE PRODUCT. + + + Automatic reference class for PreassignedFareProductRefStructure + + @@ -494,6 +544,11 @@ Rail transport, Roads and Road transport Identifier of a SUPPLEMENT PRODUCT. + + + Automatic reference class for SupplementProductRefStructure + + @@ -542,6 +597,11 @@ Rail transport, Roads and Road transport Identifier of a FARE PRODUCT PRICE. + + + Automatic reference class for FareProductPriceRefStructure + + @@ -568,6 +628,11 @@ Rail transport, Roads and Road transport Identifier of a CAPPING RULE PRICE. + + + Automatic reference class for CappingRulePriceRefStructure + + @@ -611,6 +676,11 @@ Rail transport, Roads and Road transport Identifier of an ACCESS RIGHT IN PRODUCT. + + + Automatic reference class for AccessRightInProductRefStructure + + @@ -631,6 +701,11 @@ Rail transport, Roads and Road transport Reference to a CHARGING METHOd. + + + Automatic reference class for ChargingMomentRefStructure + + @@ -740,6 +815,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF FARE PRODUCT. + + + Automatic reference class for TypeOfFareProductRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd index c2a56581c..b4cf4eb22 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd @@ -172,6 +172,11 @@ Identifier of a SERIES CONSTRAINT PRICE. + + + Automatic reference class for SeriesConstraintPriceRefStructure + + @@ -198,6 +203,11 @@ Identifier of a ZONE IN SERIES. + + + Automatic reference class for ZoneInSeriesRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd index 15f512ded..6279b2999 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd @@ -99,6 +99,11 @@ Rail transport, Roads and Road transport Identifier of a TARIFF. + + + Automatic reference class for TariffRefStructure + + @@ -193,6 +198,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF TARIFF. + + + Automatic reference class for TypeOfTariffRefStructure + + @@ -231,6 +241,11 @@ Rail transport, Roads and Road transport Identifier of a FARE STRUCTURE ELEMENT. + + + Automatic reference class for FareStructureElementRefStructure + + @@ -257,6 +272,11 @@ Rail transport, Roads and Road transport Identifier of a FARE STRUCTURE ELEMENT PRICE. + + + Automatic reference class for FareStructureElementPriceRefStructure + + @@ -295,6 +315,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FARE STRUCTURE ELEMENT. + + + Automatic reference class for TypeOfFareStructureElementRefStructure + + @@ -310,6 +335,11 @@ Rail transport, Roads and Road transport Identifier of a FARE STRUCTURE ELEMENT IN SEQUENCE. + + + Automatic reference class for FareStructureElementInSequenceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd index 2a325c218..343ca1370 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd @@ -101,6 +101,11 @@ Rail transport, Roads and Road transport -v2.0 + + + Automatic reference class for FareElementInSequenceRefStructure + + @@ -127,6 +132,11 @@ Rail transport, Roads and Road transport Identifier of a FARE STRUCTURE FACTOR. + + + Automatic reference class for FareStructureFactorRefStructure + + @@ -153,6 +163,11 @@ Rail transport, Roads and Road transport Identifier of a FARE UNIT. + + + Automatic reference class for FareUnitRefStructure + + @@ -179,6 +194,11 @@ Rail transport, Roads and Road transport Identifier of a FARE INTERVAL. + + + Automatic reference class for FareIntervalRefStructure + + @@ -205,6 +225,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF FARE STRUCTURE FACTOR. + + + Automatic reference class for TypeOfFareStructureFactorRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd index 48b48cd32..cf83a5f48 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF ENTITies. + + + Automatic reference class for FareTableRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF ENTITies. + + + Automatic reference class for StandardFareTableRefStructure + + @@ -165,6 +175,11 @@ Rail transport, Roads and Road transport Identifier of a FARE TABLE COLUMN. + + + Automatic reference class for CellRefStructure + + @@ -191,6 +206,11 @@ Rail transport, Roads and Road transport Identifier of a FARE TABLE COLUMN. + + + Automatic reference class for FareTableColumnRefStructure + + @@ -222,6 +242,11 @@ Rail transport, Roads and Road transport Identifier of a FARE TABLE COLUMN. + + + Automatic reference class for FareTableRowRefStructure + + @@ -248,6 +273,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF FARE TABLE. + + + Automatic reference class for TypeOfFareTableRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd index 14132927d..69fb21c42 100644 --- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a GEOGRAPHICAL UNIT. + + + Automatic reference class for GeographicalUnitRefStructure + + @@ -107,6 +112,11 @@ Rail transport, Roads and Road transport Identifier of a GEOGRAPHICAL INTERVAL. + + + Automatic reference class for GeographicalIntervalRefStructure + + @@ -133,6 +143,11 @@ Rail transport, Roads and Road transport Identifier of a GEOGRAPHICAL STRUCTURE FACTOR. + + + Automatic reference class for GeographicalStructureFactorRefStructure + + @@ -159,6 +174,11 @@ Rail transport, Roads and Road transport Identifier of a GEOGRAPHICAL UNIT PRICE. + + + Automatic reference class for GeographicalUnitPriceRefStructure + + @@ -185,6 +205,11 @@ Rail transport, Roads and Road transport Identifier of a GEOGRAPHICAL INTERVAL PRICE. + + + Automatic reference class for GeographicalIntervalPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd index 624a02efd..03d3c74c2 100644 --- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of a QUALITY STRUCTURE FACTOR. + + + Automatic reference class for QualityStructureFactorRefStructure + + @@ -109,6 +114,11 @@ Rail transport, Roads and Road transport Identifier of a FARE DEMAND FACTOR. + + + Automatic reference class for FareDemandFactorRefStructure + + @@ -158,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a FARE QUOTA FACTOR. + + + Automatic reference class for FareQuotaFactorRefStructure + + @@ -184,6 +199,11 @@ Rail transport, Roads and Road transport Identifier of a QUALITY STRUCTURE FACTOR PRICE. + + + Automatic reference class for QualityStructureFactorPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd index 534d822e0..382f7a4c4 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd @@ -97,6 +97,11 @@ Rail transport, Roads and Road transport Identifier of a FULFILMENT METHOD. + + + Automatic reference class for FulfilmentMethodRefStructure + + @@ -224,6 +229,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF DISTRIBUTION CHANNELs. + + + Automatic reference class for GroupOfDistributionChannelsRefStructure + + @@ -260,6 +270,11 @@ Rail transport, Roads and Road transport Identifier of a FULFILMENT METHOD PRICE. + + + Automatic reference class for FulfilmentMethodPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd index 94a692131..31f629fd1 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_support.xsd @@ -74,7 +74,13 @@ Rail transport, Roads and Road transport Type for Reference to a E SALES OFFER ENTITLEMENT REQUIRED parameter. - + + + + Automatic reference class for SalesOfferPackageEntitlementRequiredRefStructure + + + @@ -100,6 +106,11 @@ Rail transport, Roads and Road transport Identifier of a SALES OFFER ENTITLEMENT GIVEN parameter. + + + Automatic reference class for SalesOfferPackageEntitlementGivenRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd index 28db648be..9b25a81bd 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd @@ -97,6 +97,11 @@ Rail transport, Roads and Road transport Identifier of a SALES OFFER PACKAGE. + + + Automatic reference class for SalesOfferPackageRefStructure + + @@ -123,6 +128,11 @@ Rail transport, Roads and Road transport Identifier of a SALES OFFER PACKAGE ELEMENT. + + + Automatic reference class for SalesOfferPackageElementRefStructure + + @@ -149,6 +159,11 @@ Rail transport, Roads and Road transport Identifier of a SALES OFFER PACKAGE PRICE. + + + Automatic reference class for SalesOfferPackagePriceRefStructure + + @@ -175,6 +190,11 @@ Rail transport, Roads and Road transport Identifier of a SALES OFFER PACKAGE SUBSTITUTION. + + + Automatic reference class for SalesOfferPackageSubstitutionRefStructure + + @@ -213,6 +233,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF SALES OFFER PACKAGEs. + + + Automatic reference class for GroupOfSalesOfferPackagesRefStructure + + @@ -260,6 +285,11 @@ Rail transport, Roads and Road transport Identifier of a DISTRIBUTION ASSIGNMENT. + + + Automatic reference class for DistributionAssignmentRefStructure + + @@ -298,6 +328,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF SALES OFFER PACKAGE. + + + Automatic reference class for TypeOfSalesOfferPackageRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd index bce4b7d1c..2d78c358e 100644 --- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a TIME UNIT. + + + Automatic reference class for TimeUnitRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of a TIME INTERVAL. + + + Automatic reference class for TimeIntervalRefStructure + + @@ -145,6 +155,11 @@ Rail transport, Roads and Road transport Identifier of a TIME STRUCTURE FACTOR. + + + Automatic reference class for TimeStructureFactorRefStructure + + @@ -171,6 +186,11 @@ Rail transport, Roads and Road transport Identifier of a TIME UNIT PRICE. + + + Automatic reference class for TimeUnitPriceRefStructure + + @@ -197,6 +217,11 @@ Rail transport, Roads and Road transport Identifier of a TIME INTERVAL PRICE. + + + Automatic reference class for TimeIntervalPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_support.xsd b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_support.xsd index c1415895b..ed5b35a14 100644 --- a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF TRAVEL DOCUMENT. + + + Automatic reference class for TypeOfTravelDocumentRefStructure + + @@ -131,6 +136,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF MACHINE READABILITY. + + + Automatic reference class for TypeOfMachineReadabilityRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd index 37ca97601..8f873db13 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd @@ -113,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of a RESELLING USAGE PARAMETER. + + + Automatic reference class for ResellingRefStructure + + @@ -181,6 +186,11 @@ Rail transport, Roads and Road transport Identifier of a EXCHANGING USAGE PARAMETER. + + + Automatic reference class for ExchangingRefStructure + + @@ -225,6 +235,11 @@ Rail transport, Roads and Road transport Identifier of a REFUNDING USAGE PARAMETER. + + + Automatic reference class for RefundingRefStructure + + @@ -339,6 +354,11 @@ Rail transport, Roads and Road transport Identifier of a REPLACING USAGE PARAMETER. + + + Automatic reference class for ReplacingRefStructure + + @@ -365,6 +385,11 @@ Rail transport, Roads and Road transport Identifier of a TRANSFERABILITY USAGE PARAMETER. + + + Automatic reference class for TransferabilityRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd index 13421429b..ce006293c 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd @@ -97,6 +97,11 @@ Rail transport, Roads and Road transport Identifier of a PURCHASE WINDOW PARAMETER. + + + Automatic reference class for PurchaseWindowRefStructure + + @@ -153,6 +158,11 @@ Rail transport, Roads and Road transport Identifier of a BOOKING POLICY USAGE PARAMETER. + + + Automatic reference class for BookingPolicyRefStructure + + @@ -179,6 +189,11 @@ Rail transport, Roads and Road transport Identifier of a RESERVING USAGE PARAMETER. + + + Automatic reference class for ReservingRefStructure + + @@ -205,6 +220,11 @@ Rail transport, Roads and Road transport Identifier of a CANCELLING USAGEPARAMETER. + + + Automatic reference class for CancellingRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd index ba621b9ef..14d9780ed 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a CHARGING POLICY PARAMETER. + + + Automatic reference class for ChargingPolicyRefStructure + + @@ -196,6 +201,11 @@ Rail transport, Roads and Road transport Identifier of a PENALTY POLICY PARAMETER. + + + Automatic reference class for PenaltyPolicyRefStructure + + @@ -247,6 +257,11 @@ Rail transport, Roads and Road transport Identifier of a SUBSCRIBING usage parameter. + + + Automatic reference class for SubscribingRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd index 31f2ad3fe..2294283e7 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd @@ -164,6 +164,11 @@ Rail transport, Roads and Road transport Identifier of a USER PROFILE usage parameter + + + Automatic reference class for UserProfileRefStructure + + @@ -190,6 +195,11 @@ Rail transport, Roads and Road transport Identifier of a COMMERCIAL PROFILE usage parameter + + + Automatic reference class for CommercialProfileRefStructure + + @@ -227,6 +237,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP TICKET usage parameter + + + Automatic reference class for GroupTicketRefStructure + + @@ -306,6 +321,11 @@ Rail transport, Roads and Road transport Identifier of a COMPANION PROFILE usage parameter + + + Automatic reference class for CompanionProfileRefStructure + + @@ -398,7 +418,13 @@ Rail transport, Roads and Road transport Type for a reference to a TYPE OF PROOF. - + + + + Automatic reference class for TypeOfProofRefStructure + + + @@ -419,6 +445,11 @@ Rail transport, Roads and Road transport Identifier of a RESIDENTIAL QUALIFICATION usage parameter + + + Automatic reference class for ResidentialQualificationRefStructure + + @@ -452,6 +483,11 @@ Rail transport, Roads and Road transport Identifier of an ELIGIBILITY CHANGE POLICY usage parameter. + + + Automatic reference class for EligibilityChangePolicyRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd index e9dba29cc..036a20f9c 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a ENTITLEMENT REQUIRED PARAMETER. + + + Automatic reference class for EntitlementRequiredRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of a ENTITLEMENT GIVEN PARAMETER. + + + Automatic reference class for EntitlementGivenRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd index f1b0509d0..53d9dcb45 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of a LUGGAGE ALLOWANCE PARAMETER. + + + Automatic reference class for LuggageAllowanceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd index 42e3262d1..3f4ba0fc8 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd @@ -138,6 +138,11 @@ Rail transport, Roads and Road transport Identifier of a ROUND TRIP PARAMETER. + + + Automatic reference class for RoundTripRefStructure + + @@ -197,6 +202,11 @@ Rail transport, Roads and Road transport Identifier of a ROUTING PARAMETER. + + + Automatic reference class for RoutingRefStructure + + @@ -223,6 +233,11 @@ Rail transport, Roads and Road transport Identifier of a STEP LIMIT PARAMETER. + + + Automatic reference class for StepLimitRefStructure + + @@ -263,6 +278,11 @@ Rail transport, Roads and Road transport Identifier of a USAGE VALIDITY PERIOD. + + + Automatic reference class for UsageValidityPeriodRefStructure + + @@ -448,6 +468,11 @@ Rail transport, Roads and Road transport Identifier of a SUSPENDING. + + + Automatic reference class for SuspendingRefStructure + + @@ -544,6 +569,11 @@ Rail transport, Roads and Road transport Identifier of a FREQUENCY OF USE. + + + Automatic reference class for FrequencyOfUseRefStructure + + @@ -581,6 +611,11 @@ Rail transport, Roads and Road transport Identifier of a INTERCHANGING. + + + Automatic reference class for InterchangingRefStructure + + @@ -645,6 +680,11 @@ Rail transport, Roads and Road transport Identifier of a MINIMUM STAY PARAMETER. + + + Automatic reference class for MinimumStayRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd index 10325439f..744307ccc 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a USAGE PARAMETER. + + + Automatic reference class for UsageParameterRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of a USAGE PARAMETER PRICE. + + + Automatic reference class for UsageParameterPriceRefStructure + + @@ -158,6 +168,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF USAGE PARAMETER. + + + Automatic reference class for TypeOfUsageParameterRefStructure + + @@ -184,6 +199,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF CONCESSION. + + + Automatic reference class for TypeOfConcessionRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd index 555f20f0f..963ec383d 100644 --- a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of a VALIDABLE ELEMENT. + + + Automatic reference class for ValidableElementRefStructure + + @@ -108,6 +113,11 @@ Rail transport, Roads and Road transport Identifier of a VALIDABLE ELEMENT PRICE. + + + Automatic reference class for ValidableElementPriceRefStructure + + @@ -134,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a CONTROLLABLE ELEMENT. + + + Automatic reference class for ControllableElementRefStructure + + @@ -160,6 +175,11 @@ Rail transport, Roads and Road transport Identifier of an CONTROLLABLE ELEMENT IN SEQUENCE. + + + Automatic reference class for ControllableElementInSequenceRefStructure + + @@ -186,6 +206,11 @@ Rail transport, Roads and Road transport Identifier of a CONTROLLABLE ELEMENT PRICE. + + + Automatic reference class for ControllableElementPriceRefStructure + + 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 7d50970dd..e7220578c 100644 --- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd @@ -87,6 +87,11 @@ Rail transport, Roads and Road transport Identifier of a FARE FRAME. + + + Automatic reference class for FareFrameRefStructure + + @@ -217,6 +222,11 @@ Rail transport, Roads and Road transport Identifier of a FARE FRAME. + + + Automatic reference class for FarePriceFrameRefStructure + + diff --git a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd index b90f5675a..d95c72b4d 100644 --- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a SALES TRANSACTION FRAME. + + + Automatic reference class for SalesTransactionFrameRefStructure + + diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd index 9822fdb6d..0910030d2 100644 --- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd +++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd @@ -84,6 +84,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING TARIFF. + + + Automatic reference class for ParkingTariffRefStructure + + @@ -110,6 +115,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING TARIFF CHARGE BAND. + + + Automatic reference class for ParkingChargeBandRefStructure + + @@ -136,6 +146,11 @@ Rail transport, Roads and Road transport Identifier of a PARKING TARIFF PRICE. + + + Automatic reference class for ParkingPriceRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd index 28cb9a6e1..f666de346 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER ELIGIBILITY. + + + Automatic reference class for CustomerEligibilityRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of a USER PROFILE ELIGIBILITY. + + + Automatic reference class for UserProfileEligibilityRefStructure + + @@ -145,6 +155,11 @@ Rail transport, Roads and Road transport Identifier of a COMMERCIAL PROFILE ELIGIBILITY. + + + Automatic reference class for CommercialProfileEligibilityRefStructure + + @@ -171,6 +186,11 @@ Rail transport, Roads and Road transport Identifier of a RESIDENTIAL QUALIFICATION ELIGIBILITY. + + + Automatic reference class for ResidentialQualificationEligibilityRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_support.xsd index aff2d0c61..5dd9a5b59 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of CUSTOMER PAYMENT MEANS . + + + Automatic reference class for CustomerPaymentMeansRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd index 7838088f5..33a2ce3f8 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd @@ -101,6 +101,11 @@ Rail transport, Roads and Road transport Identifier of a TRAVEL SPECIFICATION. + + + Automatic reference class for TravelSpecificationRefStructure + + @@ -127,6 +132,11 @@ Rail transport, Roads and Road transport Identifier of a REQUESTED TRAVEL SPECIFICATION. + + + Automatic reference class for RequestedTravelSpecificationRefStructure + + @@ -153,6 +163,11 @@ Rail transport, Roads and Road transport Identifier of a OFFERED TRAVEL SPECIFICATION. + + + Automatic reference class for OfferedTravelSpecificationRefStructure + + @@ -212,6 +227,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER PURCHASE PACKAGE. + + + Automatic reference class for CustomerPurchasePackageRefStructure + + @@ -238,6 +258,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER PURCHASE PACKAGE ELEMENT. + + + Automatic reference class for CustomerPurchasePackageElementRefStructure + + @@ -328,6 +353,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER PURCHASE PACKAGE PRICE. + + + Automatic reference class for CustomerPurchasePackagePriceRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_support.xsd index 4e0aa7c7a..4adeac76d 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of a FARE DEBIT. + + + Automatic reference class for FareDebitRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of an OTHER DEBIT. + + + Automatic reference class for OtherDebitRefStructure + + @@ -145,6 +155,11 @@ Rail transport, Roads and Road transport Identifier of a BOOKING DEBIT. + + + Automatic reference class for BookingDebitRefStructure + + @@ -171,6 +186,11 @@ Rail transport, Roads and Road transport Identifier of a TRIP DEBIT. + + + Automatic reference class for TripDebitRefStructure + + @@ -197,6 +217,11 @@ Rail transport, Roads and Road transport Identifier of a FARE PRODUCT SALES DEBIT. + + + Automatic reference class for FareProductSaleDebitRefStructure + + @@ -223,6 +248,11 @@ Rail transport, Roads and Road transport Identifier of a OFFENCE DEBIT. + + + Automatic reference class for OffenceDebitRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd index c2474c943..31c20970f 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of MEDIUM ACCESS DEVICE. + + + Automatic reference class for MediumAccessDeviceRefStructure + + @@ -118,6 +123,11 @@ Rail transport, Roads and Road transport Identifier of SMARTCARD. + + + Automatic reference class for SmartcardRefStructure + + @@ -144,6 +154,11 @@ Rail transport, Roads and Road transport Identifier of EMV CARD. + + + Automatic reference class for EmvCardRefStructure + + @@ -170,6 +185,11 @@ Rail transport, Roads and Road transport Identifier of MOBILE DEVICE. + + + Automatic reference class for MobileDeviceRefStructure + + @@ -208,6 +228,11 @@ Rail transport, Roads and Road transport Identifier of MEDIUM APPLICATION INSTANCE. + + + Automatic reference class for MediumApplicationInstanceRefStructure + + @@ -234,6 +259,11 @@ Rail transport, Roads and Road transport Reference to a TYPE OF MEDIUM ACCESS DEVICE. + + + Automatic reference class for TypeOfMediumAccessDeviceRefStructure + + @@ -272,6 +302,11 @@ Rail transport, Roads and Road transport Identifier of a MEDIUM ACCESS DEVICE SECURITY LISTING.. + + + Automatic reference class for MediumAccessDeviceSecurityListingRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd index 59261ed96..229bf1543 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd @@ -94,6 +94,11 @@ Rail transport, Roads and Road transport Identifier of a RETAIL CONSORTIUM. + + + Automatic reference class for RetailConsortiumRefStructure + + @@ -132,6 +137,11 @@ Rail transport, Roads and Road transport Identifier of a RETAIL DEVICE. + + + Automatic reference class for RetailDeviceRefStructure + + @@ -170,6 +180,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF RETAIL DEVICE. + + + Automatic reference class for TypeOfRetailDeviceRefStructure + + @@ -208,6 +223,11 @@ Rail transport, Roads and Road transport Identifier of a RETAIL DEVICE SECURITY LISTING.. + + + Automatic reference class for RetailDeviceSecurityListingRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd index dee3490c9..985b4c4ff 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd @@ -109,6 +109,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER. + + + Automatic reference class for CustomerRefStructure + + @@ -169,6 +174,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER SECURITY LISTING.. + + + Automatic reference class for CustomerSecurityListingRefStructure + + @@ -208,6 +218,11 @@ Rail transport, Roads and Road transport Identifier of a FARE CONTRACT. + + + Automatic reference class for FareContractRefStructure + + @@ -246,6 +261,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF FARE CONTRACT. + + + Automatic reference class for TypeOfFareContractRefStructure + + @@ -261,6 +281,11 @@ Rail transport, Roads and Road transport Identifier of a FARE CONTRACT SECURITY LISTING.. + + + Automatic reference class for FareContractSecurityListingRefStructure + + @@ -310,6 +335,11 @@ Rail transport, Roads and Road transport Identifier of a FARE CONTRACT ENTRY. + + + Automatic reference class for FareContractEntryRefStructure + + @@ -348,6 +378,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF FARE CONTRACT ENTRY. + + + Automatic reference class for TypeOfFareContractEntryRefStructure + + @@ -386,6 +421,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER ACCOUNT. + + + Automatic reference class for CustomerAccountRefStructure + + @@ -413,6 +453,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER ACCOUNT SECURITY LISTING.. + + + Automatic reference class for CustomerAccountSecurityListingRefStructure + + @@ -462,6 +507,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF CUSTOMER ACCOUNT . + + + Automatic reference class for TypeOfCustomerAccountRefStructure + + @@ -500,6 +550,11 @@ Rail transport, Roads and Road transport Identifier of a CUSTOMER ACCOUNT STATUS . + + + Automatic reference class for CustomerAccountStatusRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd index e7617f43f..0d32940d9 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd @@ -104,6 +104,11 @@ Rail transport, Roads and Road transport Identifier of a SALES TRANSACTION. + + + Automatic reference class for SalesTransactionRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_support.xsd index 932ceaba4..26098983b 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE JOURNEY SPOT ALLOCATION. + + + Automatic reference class for VehicleJourneySpotAllocationRefStructure + + @@ -128,6 +133,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER SPOT ALLOCATION. + + + Automatic reference class for PassengerSpotAllocationRefStructure + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_support.xsd index 493cee3bd..6db94f3db 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_support.xsd @@ -85,6 +85,11 @@ Rail transport, Roads and Road transport Identifier of a TRAVEL DOCUMENT. + + + Automatic reference class for TravelDocumentRefStructure + + @@ -123,6 +128,11 @@ Rail transport, Roads and Road transport Identifier of a TRAVEL DOCUMENT SECURITY LISTING.. + + + Automatic reference class for TravelDocumentSecurityListingRefStructure + + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_support.xsd b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_support.xsd index 3940d7eaf..1147a450b 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_support.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_support.xsd @@ -93,6 +93,11 @@ Rail transport, Roads and Road transport Identifier of SERVICE ACCESS CODE. + + + Automatic reference class for ServiceAccessCodeRefStructure + + @@ -131,6 +136,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE ACCESS CREDENTIALS ASSIGNMENT. + + + Automatic reference class for VehicleAccessCredentialsAssignmentRefStructure + + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd index 22e10f7eb..ecad81e21 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of INDIVIDUAL TRAVELLER. + + + Automatic reference class for IndividualTravellerRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE POOLING DRIVER INFO. + + + Automatic reference class for VehiclePoolingDriverInfoRefStructure + + @@ -179,6 +189,11 @@ Rail transport, Roads and Road transport Identifier of INDIVIDUAL PASSENGER INFO. + + + Automatic reference class for IndividualPassengerInfoRefStructure + + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_support.xsd b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_support.xsd index 0a35c588b..73d67cb11 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_support.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE POOLER PROFILE usage parameter + + + Automatic reference class for VehiclePoolerProfileRefStructure + + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_support.xsd b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_support.xsd index e56a2161d..75b645eb2 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_support.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a RENTAL PENALTY POLICY PARAMETER. + + + Automatic reference class for RentalPenaltyPolicyRefStructure + + @@ -126,6 +131,11 @@ Rail transport, Roads and Road transport Identifier of a RENTAL OPTION PARAMETER. + + + Automatic reference class for RentalOptionRefStructure + + @@ -152,6 +162,11 @@ Rail transport, Roads and Road transport Identifier of a ADDITIONAL DRIVER OPTION PARAMETER. + + + Automatic reference class for AdditionalDriverOptionRefStructure + + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd index 464af6415..acaa882bd 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd @@ -85,6 +85,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for MobilityJourneyFrameRefStructure + + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd index 061c872de..b023b2cdb 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd @@ -89,6 +89,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for MobilityServiceFrameRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd index fb59e3b0d..4af253120 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE MEETING PLACE. + + + Automatic reference class for VehicleMeetingPlaceRefStructure + + @@ -107,6 +112,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE POOLING MEETING PLACE. + + + Automatic reference class for VehiclePoolingMeetingPlaceRefStructure + + @@ -134,6 +144,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE SHARING PARKING AREA. + + + Automatic reference class for VehicleSharingParkingAreaRefStructure + + @@ -160,6 +175,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE POOLING PARKING AREA. + + + Automatic reference class for VehiclePoolingParkingAreaRefStructure + + @@ -186,6 +206,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE SHARING PARKING BAY. + + + Automatic reference class for VehicleSharingParkingBayRefStructure + + @@ -212,6 +237,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE POOLING PARKING BAY. + + + Automatic reference class for VehiclePoolingParkingBayRefStructure + + 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 9f6fb72de..0ae2e1c13 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 @@ -91,6 +91,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE MEETING POINT ASSIGNMENT. + + + Automatic reference class for VehicleMeetingPointAssignmentRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of DYNAMIC VEHICLE MEETING POINT ASSIGNMENT. + + + Automatic reference class for DynamicVehicleMeetingPointAssignmentRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd index 85e1da6bc..83a5975f0 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd @@ -119,6 +119,11 @@ Rail transport, Roads and Road transport Identifier of a VEHICLE MEETING LINK. + + + Automatic reference class for VehicleMeetingLinkRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd index 0611ec0bf..7a101c026 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of a MONITORED VEHICLE SHARING PARKING BAY. + + + Automatic reference class for MonitoredVehicleSharingParkingBayRefStructure + + @@ -109,6 +114,11 @@ Rail transport, Roads and Road transport Reference to a PARKING BAY STATUS. + + + Automatic reference class for ParkingBayStatusRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_support.xsd index ade6d6cce..099fab543 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE SERVICE PLACE ASSIGNMENT. + + + Automatic reference class for VehicleServicePlaceAssignmentRefStructure + + @@ -130,6 +135,11 @@ Rail transport, Roads and Road transport Identifier of TAXI SERVICE PLACE ASSIGNMENT. + + + Automatic reference class for TaxiServicePlaceAssignmentRefStructure + + @@ -168,6 +178,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE SHARING PLACE ASSIGNMENT. + + + Automatic reference class for VehicleSharingPlaceAssignmentRefStructure + + @@ -206,6 +221,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE POOLING PLACE ASSIGNMENT. + + + Automatic reference class for VehiclePoolingPlaceAssignmentRefStructure + + diff --git a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd index 2d2261afa..30649b13a 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd @@ -81,6 +81,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for MobilityServiceRefStructure + + @@ -125,6 +130,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for CommonVehicleServiceRefStructure + + @@ -151,6 +161,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for VehiclePoolingServiceRefStructure + + @@ -177,6 +192,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for CarPoolingServiceRefStructure + + @@ -203,6 +223,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for TaxiServiceRefStructure + + @@ -229,6 +254,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for ChauffeuredVehicleServiceRefStructure + + @@ -255,6 +285,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for VehicleSharingServiceRefStructure + + @@ -281,6 +316,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING SERVICE. + + + Automatic reference class for VehicleRentalServiceRefStructure + + @@ -307,6 +347,11 @@ Rail transport, Roads and Road transport Identifier of a MOBILITY SERVICE. + + + Automatic reference class for TypeOfMobilityServiceRefStructure + + diff --git a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd index 1d59ab466..edab908c0 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd @@ -90,6 +90,11 @@ Rail transport, Roads and Road transport Identifier of an ONLINE SERVICE OPERATOR. + + + Automatic reference class for OnlineServiceOperatorRefStructure + + @@ -128,6 +133,11 @@ Rail transport, Roads and Road transport Identifier of an ONLINE SERVICE. + + + Automatic reference class for OnlineServiceRefStructure + + diff --git a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_support.xsd b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_support.xsd index bdb57405e..e15e4230e 100644 --- a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_support.xsd +++ b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of SINGLE JOURNEY PATH. + + + Automatic reference class for SingleJourneyPathRefStructure + + diff --git a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_support.xsd b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_support.xsd index f5803d230..6e93d5f2f 100644 --- a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_support.xsd +++ b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_support.xsd @@ -92,6 +92,11 @@ Rail transport, Roads and Road transport Identifier of SINGLE JOURNEY. + + + Automatic reference class for SingleJourneyRefStructure + + @@ -119,6 +124,11 @@ Rail transport, Roads and Road transport Identifier of a GROUP OF SINGLE JOURNEYs. + + + Automatic reference class for GroupOfSingleJourneysRefStructure + + From b9945df196bdb5e500f1fcfc7e303f3d3978cc97 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 11:37:19 +0200 Subject: [PATCH 06/20] Add dependencies for scripts --- scripts/analyse-refs-2.py | 157 ++++++++++++ scripts/dependencygraph.py | 487 +++++++++++++++++++++++++++++++++++++ 2 files changed, 644 insertions(+) create mode 100644 scripts/analyse-refs-2.py create mode 100644 scripts/dependencygraph.py diff --git a/scripts/analyse-refs-2.py b/scripts/analyse-refs-2.py new file mode 100644 index 000000000..d23b978af --- /dev/null +++ b/scripts/analyse-refs-2.py @@ -0,0 +1,157 @@ +from lxml import etree +from pathlib import Path +import copy + +XSD_ROOT = Path("xsd") +XSD_NS = {"xsd": "http://www.w3.org/2001/XMLSchema"} + +def get_version_of_object_ref_attrs(xsd_file: Path): + """Return all and similar children under VersionOfObjectRefStructure/extension.""" + tree = etree.parse(str(xsd_file)) + ext = tree.xpath( + "//xsd:complexType[@name='VersionOfObjectRefStructure']/xsd:simpleContent/xsd:extension", + namespaces=XSD_NS, + ) + if not ext: + raise ValueError("VersionOfObjectRefStructure niet gevonden of geen extension") + return [copy.deepcopy(c) for c in ext[0] if isinstance(c.tag, str)] + +def collect_ref_elements(root_dir: Path): + """Collect (xsd_file, type_name) for all complexTypes ending with RefStructure.""" + results = [] + for f in root_dir.rglob("*.xsd"): + if 'xsd/netex' in str(f): + tree = etree.parse(str(f)) + for ctype in tree.xpath("//xsd:element[substring(@name, string-length(@name) - string-length('Ref') +1) = 'Ref']", namespaces=XSD_NS): + name = ctype.get("name") + yield (f, name) + +def collect_ref_complextypes(root_dir: Path): + """Collect (xsd_file, type_name) for all complexTypes ending with RefStructure.""" + results = [] + for f in root_dir.rglob("*.xsd"): + tree = etree.parse(str(f)) + for ctype in tree.xpath("//xsd:complexType[substring(@name, string-length(@name) - string-length('RefStructure') +1) = 'RefStructure']", namespaces=XSD_NS): + name = ctype.get("name") + yield (f, name) + +def add_missing_attrs(restriction_elem, version_attrs): + """Ensure all attributes from VersionOfObjectRefStructure exist, append if missing.""" + existing_names = {a.get("name") for a in restriction_elem.findall("xsd:attribute", XSD_NS)} + for attr in version_attrs: + if attr.tag.endswith("attribute"): + if attr.get("name") not in existing_names: + restriction_elem.append(copy.deepcopy(attr)) + +def ensure_nameofrefclass(restriction_elem, type_name: str): + """Ensure nameOfRefClass attribute exists with correct type and default.""" + existing = restriction_elem.xpath("xsd:attribute[@name='nameOfRefClass']", namespaces=XSD_NS) + if existing: + return + # derive "XXX" from "ScheduledStopPointRefStructure" → "ScheduledStopPoint" + base = type_name.replace("RefStructure", "") + attr = etree.Element(f"{{{XSD_NS['xsd']}}}attribute") + attr.set("name", "nameOfRefClass") + attr.set("type", f"NameOfClass{base}") + attr.set("default", base) + restriction_elem.append(attr) + +def process_refstructure_complex_types(xsd_file, version_attrs, valid_ref_classes): + """Replace extension with restriction for RefStructures that inherit from VersionOfObjectRefStructure.""" + tree = etree.parse(str(xsd_file)) + modified = False + + for ctype in tree.xpath("//xsd:complexType[substring(@name, string-length(@name) - string-length('RefStructure') +1) = 'RefStructure']", namespaces=XSD_NS): + name = ctype.get("name") + if name not in valid_ref_classes: + continue # skip unrelated RefStructures + + ext = ctype.xpath(".//xsd:extension", namespaces=XSD_NS) + if not ext: + continue + ext_elem = ext[0] + base = ext_elem.get("base") + + restriction = etree.Element(f"{{{XSD_NS['xsd']}}}restriction", base=base) + + # Kopieer bestaande attributen uit huidige extension + for child in ext_elem: + restriction.append(copy.deepcopy(child)) + + # Voeg alle ontbrekende attributen van VersionOfObjectRefStructure toe + add_missing_attrs(restriction, version_attrs) + + # Zorg voor nameOfRefClass + ensure_nameofrefclass(restriction, name) + + # Vervang in simpleContent + simple_content = ctype.find("xsd:simpleContent", XSD_NS) + if simple_content is not None: + for child in list(simple_content): + simple_content.remove(child) + simple_content.append(restriction) + modified = True + + if modified: + tree.write(str(xsd_file), encoding="utf-8", xml_declaration=True, pretty_print=True) + return modified + + +def has_extension(xsd_file: Path, type_name: str) -> str | None: + """ + Check if a complexType with given name uses an . + Returns the base type if found, else None. + """ + tree = etree.parse(str(xsd_file)) + ext = tree.xpath( + f"//xsd:complexType[@name='{type_name}']//xsd:extension", + namespaces=XSD_NS + ) + if ext: + return ext[0].get("base") + return None + +def main(): + version_attrs = get_version_of_object_ref_attrs( + XSD_ROOT / "netex_framework/netex_responsibility/netex_relationship_support.xsd" + ) + + # Hier zou jouw analyzer gebruikt worden om te bepalen welke RefStructures erven van VersionOfObjectRefStructure + # Voorbeeld: valid_ref_classes = {"ScheduledStopPointRefStructure", "StopPlaceRefStructure", ...} + # → hier voorlopig als placeholder + from dependencygraph import XSDDependencyAnalyzer # vervang door jouw echte analyzer + ref_elements = set(collect_ref_elements(XSD_ROOT)) + + analyzer = XSDDependencyAnalyzer() + + analyzer.parse_schemas([XSD_ROOT]) + analyzer.build_dependency_graph() + + all_complex_types = set([]) + + for xsd_file, name in ref_elements: + type_chain = analyzer._get_type_chain(name) + if "VersionOfObjectRefStructure" not in type_chain: + continue + for x in type_chain: + all_complex_types.add(x) + + for xsd_file, name in collect_ref_complextypes(XSD_ROOT): + if name in all_complex_types: + base = has_extension(xsd_file, name) + if base: + pass + # print(f"{xsd_file}: {name} (extends {base})") + else: + print(name) + + # Pas enkel de relevante bestanden aan + # for xsd_file in XSD_ROOT.rglob("*.xsd"): + # if not str(xsd_file).startswith("xsd/netex"): + # continue + # if process_refstructure_complex_types(xsd_file, version_attrs, valid_ref_classes): + # print(f"[MODIFIED] {xsd_file}") + +if __name__ == "__main__": + main() + diff --git a/scripts/dependencygraph.py b/scripts/dependencygraph.py new file mode 100644 index 000000000..4d89ada9a --- /dev/null +++ b/scripts/dependencygraph.py @@ -0,0 +1,487 @@ +""" +XSD Schema Dependency Analyzer +Builds an inverted dependency graph showing which elements depend on a given element +through type hierarchy (extension/restriction relationships). +""" + +import xml.etree.ElementTree as ET +from pathlib import Path +from typing import Dict, Set, List +from collections import defaultdict +import json + + +class XSDDependencyAnalyzer: + """Analyzes XSD schemas to build inverted dependency graphs based on type hierarchies.""" + + XSD_NS = "http://www.w3.org/2001/XMLSchema" + + def __init__(self): + # Element name -> its type name (or inline type identifier) + self.element_to_type = {} + + # Type name -> its base type name (for extensions/restrictions) + self.type_hierarchy = {} + + # Element name -> set of elements that depend on it (through type hierarchy) + self.element_dependencies = defaultdict(set) + + # For debugging: store type derivation info + self.type_info = {} + + # Abstract Elements + self.abstract_elements = set([]) + + def parse_schemas(self, schema_paths: List[Path]) -> None: + """Parse all XSD schemas from the given paths.""" + for path in schema_paths: + if path.is_file(): + self._parse_schema_file(path) + elif path.is_dir(): + for xsd_file in path.rglob("*.xsd"): + self._parse_schema_file(xsd_file) + + def _parse_schema_file(self, filepath: Path) -> None: + """Parse a single XSD schema file.""" + try: + tree = ET.parse(filepath) + root = tree.getroot() + + # First pass: collect all type definitions + self._extract_types(root) + + # Second pass: collect elements and their types + self._extract_elements(root) + + except Exception as e: + print(f"Error parsing {filepath}: {e}") + + def _extract_types(self, root: ET.Element) -> None: + """Extract all type definitions and their base types.""" + # Complex types + for ctype in root.findall(f".//{{{self.XSD_NS}}}complexType"): + name = ctype.get('name') + if not name: + continue + + base_type = None + derivation = None + + # Check for extension + extension = ctype.find(f".//{{{self.XSD_NS}}}extension") + if extension is not None: + base_type = self._strip_ns(extension.get('base', '')) + derivation = 'extension' + + # Check for restriction + restriction = ctype.find(f".//{{{self.XSD_NS}}}restriction") + if restriction is not None: + base_type = self._strip_ns(restriction.get('base', '')) + derivation = 'restriction' + + if base_type: + self.type_hierarchy[name] = base_type + self.type_info[name] = {'base': base_type, 'derivation': derivation} + + # Simple types + for stype in root.findall(f".//{{{self.XSD_NS}}}simpleType"): + name = stype.get('name') + if not name: + continue + + restriction = stype.find(f"{{{self.XSD_NS}}}restriction") + if restriction is not None: + base_type = self._strip_ns(restriction.get('base', '')) + self.type_hierarchy[name] = base_type + self.type_info[name] = {'base': base_type, 'derivation': 'restriction'} + + def _extract_elements(self, root: ET.Element) -> None: + """Extract all element definitions and map them to their types.""" + for elem in root.findall(f".//{{{self.XSD_NS}}}element"): + name = elem.get('name') + if not name: + continue + + abstract = elem.get('abstract', False) + if abstract: + self.abstract_elements.add(name) + + # Check for direct type reference + type_ref = elem.get('type') + if type_ref: + self.element_to_type[name] = self._strip_ns(type_ref) + continue + + # Check for inline complex type + complex_type = elem.find(f"{{{self.XSD_NS}}}complexType") + if complex_type is not None: + # Look for restriction or extension in inline type + restriction = complex_type.find(f".//{{{self.XSD_NS}}}restriction") + extension = complex_type.find(f".//{{{self.XSD_NS}}}extension") + + if restriction is not None: + base_type = self._strip_ns(restriction.get('base', '')) + if base_type: + # Create a synthetic type name for the inline type + inline_type_name = f"{name}_InlineType" + self.element_to_type[name] = inline_type_name + self.type_hierarchy[inline_type_name] = base_type + self.type_info[inline_type_name] = {'base': base_type, 'derivation': 'restriction'} + + elif extension is not None: + base_type = self._strip_ns(extension.get('base', '')) + if base_type: + inline_type_name = f"{name}_InlineType" + self.element_to_type[name] = inline_type_name + self.type_hierarchy[inline_type_name] = base_type + self.type_info[inline_type_name] = {'base': base_type, 'derivation': 'extension'} + + def _strip_ns(self, qname: str) -> str: + """Strip namespace prefix from a qualified name.""" + if ':' in qname: + return qname.split(':', 1)[1] + return qname + + def build_dependency_graph(self) -> None: + """Build the inverted dependency graph with transitive relationships through element-specific types.""" + # First, build direct dependencies between element-specific types + direct_deps = defaultdict(set) + + for elem_name in self.element_to_type.keys(): + elem_specific_types = self._get_element_specific_types(elem_name) + if not elem_specific_types: + continue + + for other_elem_name in self.element_to_type.keys(): + if other_elem_name == elem_name: + continue + + other_specific_types = self._get_element_specific_types(other_elem_name) + + # Check if any of the other element's specific types extend this element's specific types + for other_spec_type in other_specific_types: + base = self.type_hierarchy.get(other_spec_type) + if base and base in elem_specific_types: + direct_deps[elem_name].add(other_elem_name) + break + + # Now compute transitive closure: if B depends on A, and C depends on B, then C depends on A + self.element_dependencies = self._compute_transitive_closure(direct_deps) + + def _compute_transitive_closure(self, direct_deps: Dict[str, Set[str]]) -> Dict[str, Set[str]]: + """Compute transitive closure of dependencies.""" + result = defaultdict(set) + + # Start with direct dependencies + for elem, deps in direct_deps.items(): + result[elem] = set(deps) + + # Add transitive dependencies + changed = True + while changed: + changed = False + for elem in list(result.keys()): + current_deps = set(result[elem]) + for dep in current_deps: + # If dep has its own dependencies, add them to elem's dependencies + if dep in result: + for transitive_dep in result[dep]: + if transitive_dep not in result[elem]: + result[elem].add(transitive_dep) + changed = True + + return result + + def _get_element_specific_types(self, elem_name: str) -> Set[str]: + """Get types that are specific to this element (contain the element name in the type name).""" + specific_types = set() + + elem_type = self.element_to_type.get(elem_name) + if not elem_type: + return specific_types + + # Start with the element's direct type + current_type = elem_type + + # Walk up the type hierarchy and collect types that contain the element name + while current_type: + # Check if this type name contains the element name + # For example: "ScheduledStopPoint_VersionStructure" contains "ScheduledStopPoint" + if elem_name in current_type: + specific_types.add(current_type) + else: + # Stop when we hit a generic type that doesn't contain the element name + break + + current_type = self.type_hierarchy.get(current_type) + + return specific_types + + def _get_type_chain(self, elem_name: str) -> List[str]: + """Get the complete type hierarchy chain for an element (most specific to most general).""" + chain = [] + + current_type = self.element_to_type.get(elem_name) + if not current_type: + return chain + + # Follow the type hierarchy up + while current_type: + chain.append(current_type) + current_type = self.type_hierarchy.get(current_type) + + return chain + + def _depends_on(self, derived_chain: List[str], base_chain: List[str]) -> bool: + """Check if derived_chain extends base_chain through shared type hierarchy.""" + if not base_chain or not derived_chain: + return False + + # Check if any type from base_chain appears in derived_chain + # If it does, and there are types before it in derived_chain, + # then derived depends on base + for base_type in base_chain: + if base_type in derived_chain: + derived_idx = derived_chain.index(base_type) + # If the shared type appears later in derived chain (index > 0), + # it means derived extends/restricts through this shared type + if derived_idx > 0: + return True + + return False + + def get_dependents(self, element_name: str) -> Set[str]: + """Get all elements that depend on the given element.""" + return self.element_dependencies.get(element_name, set()) + + def get_dependency_path(self, base_elem: str, derived_elem: str) -> str: + """Get the type hierarchy path showing the dependency (direct or transitive).""" + base_specific_types = self._get_element_specific_types(base_elem) + derived_specific_types = self._get_element_specific_types(derived_elem) + + if not base_specific_types or not derived_specific_types: + return "No element-specific type information" + + # Check for direct connection + for derived_type in derived_specific_types: + base_of_derived = self.type_hierarchy.get(derived_type) + if base_of_derived and base_of_derived in base_specific_types: + derivation = self.type_info.get(derived_type, {}).get('derivation', 'unknown') + return f"{derived_type} --[{derivation}]--> {base_of_derived} (direct)" + + # Check for transitive connection through intermediate elements + # Find elements that derived depends on and that depend on base + for intermediate in self.element_to_type.keys(): + if intermediate == base_elem or intermediate == derived_elem: + continue + + intermediate_specific = self._get_element_specific_types(intermediate) + + # Check if derived extends intermediate + derived_extends_intermediate = False + for derived_type in derived_specific_types: + base_of_derived = self.type_hierarchy.get(derived_type) + if base_of_derived and base_of_derived in intermediate_specific: + derived_extends_intermediate = True + break + + # Check if intermediate extends base + intermediate_extends_base = False + for inter_type in intermediate_specific: + base_of_inter = self.type_hierarchy.get(inter_type) + if base_of_inter and base_of_inter in base_specific_types: + intermediate_extends_base = True + break + + if derived_extends_intermediate and intermediate_extends_base: + return f"via {intermediate} (transitive)" + + return "No connection found" + + def print_all_dependencies(self) -> None: + """Print dependency information for all elements.""" + print("\n" + "="*80) + print("INVERTED DEPENDENCY GRAPH") + print("="*80) + + for elem_name in sorted(self.element_to_type.keys()): + dependents = self.get_dependents(elem_name) + if dependents: + print(f"\n{elem_name}:") + print(f" Type chain: {' → '.join(self._get_type_chain(elem_name))}") + print(f" Depended on by:") + for dep in sorted(dependents): + path = self.get_dependency_path(elem_name, dep) + print(f" - {dep}") + print(f" via: {path}") + + def print_dependencies(self, element_name: str) -> None: + """Print dependency information for a specific element.""" + if element_name not in self.element_to_type: + print(f"Element '{element_name}' not found in schemas.") + return + + print(f"\n{'='*80}") + print(f"Dependencies for: {element_name}") + print(f"{'='*80}") + + type_chain = self._get_type_chain(element_name) + print(f"\nType chain: {' → '.join(type_chain)}") + + # Show which types are considered "specific" to this element + specific_types = self._get_element_specific_types(element_name) + if specific_types: + print(f"\nElement-specific types: {', '.join(sorted(specific_types))}") + + dependents = self.get_dependents(element_name) + if dependents: + print(f"\nElements that depend on '{element_name}':") + for dep in sorted(dependents): + path = self.get_dependency_path(element_name, dep) + print(f" - {dep}") + print(f" via: {path}") + else: + print(f"\nNo elements depend on '{element_name}'") + print("(Only showing dependencies on element-specific types, not shared ancestor types)") + + def export_to_json(self, output_path: Path) -> None: + """Export the dependency graph to JSON.""" + result = {} + + for elem_name in sorted(self.element_to_type.keys()): + dependents = self.get_dependents(elem_name) + if dependents or elem_name: # Include all elements + result[elem_name] = { + 'type_chain': self._get_type_chain(elem_name), + 'depended_on_by': [ + { + 'element': dep, + 'via_type_chain': self.get_dependency_path(elem_name, dep) + } + for dep in sorted(dependents) + ] + } + + with open(output_path, 'w') as f: + json.dump(result, f, indent=2) + + print(f"\n{'='*80}") + print(f"Exported dependency graph to: {output_path}") + print(f"{'='*80}") + + def get_simple_graph(self, root_type: str = None) -> Dict[str, List[str]]: + """ + Get a simple dictionary mapping element names to lists of dependent elements. + + Args: + root_type: If specified, only include elements whose type chain ends with this type. + For example, 'EntityStructure' to filter entities. + + Returns: + Dict mapping element_name -> [list of dependent element names] + """ + result = {} + + for elem_name in sorted(self.element_to_type.keys()): + # Filter by root type if specified + if root_type: + type_chain = self._get_type_chain(elem_name) + if not type_chain or type_chain[-1] != root_type: + continue + + dependents = self.get_dependents(elem_name) + result[elem_name] = sorted(dependents) + + return result + + def export_simple_graph(self, output_path: Path, root_type: str = None) -> None: + """ + Export a simple dependency graph as a clean dictionary. + + Args: + output_path: Path to save the JSON file + root_type: If specified, only include elements whose type chain ends with this type + """ + graph = self.get_simple_graph(root_type) + + with open(output_path, 'w') as f: + json.dump({'graph': graph, 'abstract': list(self.abstract_elements)}, f, indent=2) + + filter_msg = f" (filtered to {root_type})" if root_type else "" + print(f"\n{'='*80}") + print(f"Exported simple dependency graph to: {output_path}{filter_msg}") + print(f"Total elements: {len(graph)}") + print(f"{'='*80}") + + +def main(): + """Example usage.""" + import sys + + if len(sys.argv) < 2: + print("Usage: python xsd_analyzer.py [element_name]") + print(" schema_path: Path to XSD file or directory") + print(" element_name: (optional) Specific element to analyze") + print("\nIf no element_name is provided, shows dependencies for ALL elements") + sys.exit(1) + + schema_path = Path(sys.argv[1]) + element_name = sys.argv[2] if len(sys.argv) > 2 else None + + # Create analyzer + analyzer = XSDDependencyAnalyzer() + + # Parse schemas + print(f"Parsing schemas from: {schema_path}") + if schema_path.is_file(): + analyzer.parse_schemas([schema_path]) + else: + analyzer.parse_schemas([schema_path]) + + print(f"Found {len(analyzer.element_to_type)} elements") + print(f"Found {len(analyzer.type_hierarchy)} type relationships") + + # Build dependency graph + print("Building dependency graph...") + analyzer.build_dependency_graph() + + # Print results + # if element_name: + # analyzer.print_dependencies(element_name) + # else: + # analyzer.print_all_dependencies() + + # Export detailed JSON + # output_path = Path("xsd_dependencies.json") + # analyzer.export_to_json(output_path) + + # Export simple graph (all elements) + simple_path = Path("xsd_simple_graph.json") + analyzer.export_simple_graph(simple_path) + + # Export simple graph filtered to EntityStructure + # entity_path = Path("xsd_entity_graph.json") + # analyzer.export_simple_graph(entity_path, root_type="EntityStructure") + + # Show example of using the simple graph + print("\nExample: Simple graph structure") + print("="*80) + graph = analyzer.get_simple_graph(root_type="EntityStructure") + + # Show a few examples + shown = 0 + for elem, deps in list(graph.items())[:3]: + if deps: # Only show elements with dependencies + print(f"graph['{elem}'] = {deps}") + shown += 1 + if shown >= 3: + break + + print(analyzer._get_type_chain('ServiceLink')) + print(analyzer._get_type_chain('TimingLink')) + print(analyzer._get_type_chain('StandardFareTable')) + print(analyzer._get_type_chain('ParkingTariff')) + print(analyzer._get_type_chain('ScheduledStopPointRef')) + +if __name__ == "__main__": + main() From cf0833922e7037e308bded6c523527b7e0101ce7 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 13:36:11 +0200 Subject: [PATCH 07/20] Fix AuthorityRef This still required some manual intervention for both PlaceRef as AuthorityRef. Will fix the automatic processing later (if possible). --- scripts/complex-types-excluded | 1 - .../netex_responsibility/netex_entity_support.xsd | 8 ++++++++ .../netex_transportOrganisation_support.xsd | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index df6612c25..a31314662 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -3,7 +3,6 @@ GroupOfPointsRefStructure TariffZoneRefStructure AdministrativeZoneRefStructure PassengerEquipmentRefStructure -AuthorityRefStructure TransportAdministrativeZoneRefStructure ClassOfUseRefStructure TypeOfPaymentMethodRefStructure diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index f69b9f50f..413ea7cb4 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,14 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from Authority + + + + + Type for all concrete EntityStructures that can be referenced from AssistanceBookingService diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index e30bcb828..655c49802 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -99,13 +99,13 @@ Rail transport, Roads and Road transport - Type for identifier of a TRANSPORT ORGANISATION.. + Type for identifier of a TRANSPORT ORGANISATION. - Type for a reference to an TRANSPORT ORGANISATION.. + Type for a reference to an TRANSPORT ORGANISATION. @@ -216,6 +216,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for AuthorityRefStructure + + From 958782beb078f13d9790a978167e99851ac2426f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 19:42:54 +0200 Subject: [PATCH 08/20] Manual fixes for GroupOfPointsRefStructure, ZoneRefStructure, StopAreaRefStructure --- scripts/complex-types-excluded | 3 - .../netex_pointAndLink_support.xsd | 5 + .../netex_zone_support.xsd | 8 +- .../netex_entity_support.xsd | 153 ++++++++++++++++++ .../netex_servicePattern_support.xsd | 8 +- 5 files changed, 172 insertions(+), 5 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index a31314662..3152eb727 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,5 +1,4 @@ PointOnLinkRefStructure -GroupOfPointsRefStructure TariffZoneRefStructure AdministrativeZoneRefStructure PassengerEquipmentRefStructure @@ -25,11 +24,9 @@ HelpPointEquipmentRefStructure PassengerSafetyEquipmentRefStructure SanitaryEquipmentRefStructure FareZoneRefStructure -ZoneRefStructure ComplexFeatureRefStructure SimpleFeatureRefStructure AccessZoneRefStructure -StopAreaRefStructure RoutingConstraintZoneRefStructure GenericPathJunctionRefStructure PassingTimeRefStructure diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd index cbe4db47a..706536166 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd @@ -358,6 +358,11 @@ Rail transport, Roads and Road transport + + + Automatic reference class for GroupOfPointsRefStructure + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index f1253663a..22fef378d 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -70,7 +70,13 @@ Rail transport, Roads and Road transport Type for a reference to a ZONE. - + + + + Automatic reference class for ZoneRefStructure + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 413ea7cb4..35d412cff 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,159 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from GroupOfPoints + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from Zone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from StopArea + + + + + Type for all concrete EntityStructures that can be referenced from Authority diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index 7d1019173..f14bd755d 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -373,7 +373,13 @@ Rail transport, Roads and Road transport Type for a reference to a STOP AREA. - + + + + Automatic reference class for StopAreaRefStructure + + + From 2af84b097e9f7f46e32c47d85b722f338266a3d5 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 20:36:48 +0200 Subject: [PATCH 09/20] Fixes --- scripts/complex-types-excluded | 19 ++++----- scripts/nameofclass.py | 12 +++++- .../netex_organisation_support.xsd | 8 +++- .../netex_zone_support.xsd | 8 +++- .../netex_entity_support.xsd | 42 +++++++++++++++++++ .../netex_transportOrganisation_support.xsd | 8 +++- .../part1_ifopt/netex_ifopt_site_support.xsd | 8 +++- .../netex_fareZone_support.xsd | 8 +++- 8 files changed, 94 insertions(+), 19 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index 3152eb727..f52bc4290 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,11 +1,6 @@ PointOnLinkRefStructure -TariffZoneRefStructure -AdministrativeZoneRefStructure -PassengerEquipmentRefStructure -TransportAdministrativeZoneRefStructure ClassOfUseRefStructure TypeOfPaymentMethodRefStructure -AccessVehicleEquipmentRefStructure CompoundTrainRefStructure ServiceCalendarFrameRefStructure TurnaroundTimeLimitTimeRefStructure @@ -18,15 +13,8 @@ SeriesConstraintRefStructure MobilityServiceConstraintZoneRefStructure VehicleTypeZoneRestrictionRefStructure PoolOfVehiclesRefStructure -RubbishDisposalEquipmentRefStructure -PassengerBeaconEquipmentRefStructure -HelpPointEquipmentRefStructure -PassengerSafetyEquipmentRefStructure -SanitaryEquipmentRefStructure -FareZoneRefStructure ComplexFeatureRefStructure SimpleFeatureRefStructure -AccessZoneRefStructure RoutingConstraintZoneRefStructure GenericPathJunctionRefStructure PassingTimeRefStructure @@ -41,3 +29,10 @@ DiscountingRuleRefStructure LimitingRuleRefStructure TypeOfOrganisationPartRefStructure SchematicMapMemberRefStructure +AccessVehicleEquipmentRefStructure +RubbishDisposalEquipmentRefStructure +PassengerBeaconEquipmentRefStructure +PassengerEquipmentRefStructure +HelpPointEquipmentRefStructure +PassengerSafetyEquipmentRefStructure +SanitaryEquipmentRefStructure diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index ed218dabf..c31e70344 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -102,7 +102,7 @@ def update_nameofclass_ref_attributes( complex_todo = set( open("scripts/complex-types-included", "r").read().split("\n") ) - set(open("scripts/complex-types-excluded", "r").read().split("\n")) - print(complex_todo) + # print(complex_todo) # --- Iterate over all schema files --- for schema_file in base_dir.rglob("*.xsd"): @@ -146,6 +146,7 @@ def update_nameofclass_ref_attributes( if natural_class not in abstract_classes: concrete_classes.append(natural_class) + concrete_classes = sorted(set(concrete_classes)) if not concrete_classes: continue # nothing to add @@ -187,10 +188,17 @@ def update_nameofclass_ref_attributes( parent_ref_name = "" elif l[1] == ref_name: # Workaround: We don't want circular either. - parent_ref_name = "" + parent_ref_name = l[2] + if parent_ref_name.endswith('_Dummy'): + parent_ref_name = l[3] + if parent_ref_name == 'VersionOfObjectRefStructure': + parent_ref_name = '' else: parent_ref_name = l[1] + if parent_ref_name == '': + print(ref_name, l) + restriction = etree.SubElement( new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd index a24d5556f..899c4b435 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd @@ -188,7 +188,13 @@ Rail transport, Roads and Road transport Type for Reference to an ADMINISTRATIVE ZONE. Left untyped so as to avoid forwards dependency. - + + + + Automatic reference class for AdministrativeZoneRefStructure + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 22fef378d..1a1e80824 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -115,7 +115,13 @@ Rail transport, Roads and Road transport Type for a reference to a TARIFF ZONE. - + + + + Automatic reference class for TariffZoneRefStructure + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 35d412cff..ec2455b55 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,48 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from AdministrativeZone + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TariffZone + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TransportAdministrativeZone + + + + + + + + Type for all concrete EntityStructures that can be referenced from FareZone + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessZone + + + + + Type for all concrete EntityStructures that can be referenced from GroupOfPoints diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 655c49802..90b85d807 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -416,7 +416,13 @@ Rail transport, Roads and Road transport Type for a reference to a TRANSPORT ADMINISTRATIVE ZONE. - + + + + Automatic reference class for TransportAdministrativeZoneRefStructure + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 49c18306a..fb171d3d5 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -427,7 +427,13 @@ Rail transport, Roads and Road transport Type for reference to an ACCESS ZONE. - + + + + Automatic reference class for AccessZoneRefStructure + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd index f26448a0f..5baa05db1 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd @@ -228,7 +228,13 @@ Rail transport, Roads and Road transport Type for Reference to a FARE ZONE. - + + + + Automatic reference class for FareZoneRefStructure + + + From b3a7a7c88be980775d3ac26ea4860d7afa6f8b37 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 20:39:39 +0200 Subject: [PATCH 10/20] Fixes --- scripts/complex-types-excluded | 3 --- .../netex_organisation_support.xsd | 5 ++++ .../netex_entity_support.xsd | 24 +++++++++++++++++++ .../netex_serviceRestrictions_support.xsd | 10 ++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index f52bc4290..11b2c0f0f 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,6 +1,4 @@ PointOnLinkRefStructure -ClassOfUseRefStructure -TypeOfPaymentMethodRefStructure CompoundTrainRefStructure ServiceCalendarFrameRefStructure TurnaroundTimeLimitTimeRefStructure @@ -27,7 +25,6 @@ TargetPassingTimeRefStructure PassengerAtStopTimeRefStructure DiscountingRuleRefStructure LimitingRuleRefStructure -TypeOfOrganisationPartRefStructure SchematicMapMemberRefStructure AccessVehicleEquipmentRefStructure RubbishDisposalEquipmentRefStructure diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd index 899c4b435..3617755a4 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd @@ -317,6 +317,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF VALUE. + + + Automatic reference class for TypeOfOrganisationPartRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index ec2455b55..5d1a08cd8 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,30 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from ClassOfUse + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfOrganisationPart + + + + + + + + Type for all concrete EntityStructures that can be referenced from TypeOfPaymentMethod + + + + + Type for all concrete EntityStructures that can be referenced from AdministrativeZone diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd index 7466ecf43..fb5be38aa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -103,6 +103,11 @@ Rail transport, Roads and Road transport Identifier of a CLASS OF USE. + + + Automatic reference class for ClassOfUseRefStructure + + @@ -692,6 +697,11 @@ Rail transport, Roads and Road transport Identifier of a TYPE OF PAYMENT METHOD. + + + Automatic reference class for TypeOfPaymentMethodRefStructure + + From 6eeca907200d801371d07754077f0914ca7f50f2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 20:42:02 +0200 Subject: [PATCH 11/20] Fixes --- scripts/complex-types-excluded | 3 --- .../netex_serviceCalendarFrame_support.xsd | 5 ++++ .../netex_entity_support.xsd | 24 +++++++++++++++++++ .../netex_trainElement_support.xsd | 5 ++++ ..._mobilityServiceConstraintZone_support.xsd | 8 ++++++- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index 11b2c0f0f..67a389eb4 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,6 +1,4 @@ PointOnLinkRefStructure -CompoundTrainRefStructure -ServiceCalendarFrameRefStructure TurnaroundTimeLimitTimeRefStructure VehicleTypePreferenceRefStructure PointOfInterestSpaceRefStructure @@ -10,7 +8,6 @@ DistanceMatrixElementRefStructure SeriesConstraintRefStructure MobilityServiceConstraintZoneRefStructure VehicleTypeZoneRestrictionRefStructure -PoolOfVehiclesRefStructure ComplexFeatureRefStructure SimpleFeatureRefStructure RoutingConstraintZoneRefStructure diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd index 3711fe781..6a9a2f852 100644 --- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd +++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd @@ -82,6 +82,11 @@ Rail transport, Roads and Road transport Identifier of SERVICE CALENDAR FRAME. + + + Automatic reference class for ServiceCalendarFrameRefStructure + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 5d1a08cd8..94c2796ea 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,30 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from CompoundTrain + + + + + + + + Type for all concrete EntityStructures that can be referenced from ServiceCalendarFrame + + + + + + + + Type for all concrete EntityStructures that can be referenced from PoolOfVehicles + + + + + Type for all concrete EntityStructures that can be referenced from ClassOfUse diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index 0e433e8fe..7ab1d6807 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -118,6 +118,11 @@ Rail transport, Roads and Road transport Identifier of a COMPOUND TRAIN. + + + Automatic reference class for CompoundTrainRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index 9179a8eac..ec194a05d 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -200,7 +200,13 @@ Rail transport, Roads and Road transport Type for Reference to an POOL OF VEHICLEs ZONE. - + + + + Automatic reference class for PoolOfVehiclesRefStructure + + + From f7c56af0b2236ba303133eb208c54072b72c995b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 21:45:19 +0200 Subject: [PATCH 12/20] Fixes --- scripts/complex-types-excluded | 23 ++---- scripts/nameofclass.py | 2 + .../netex_spatialFeature_support.xsd | 16 +++- .../netex_entity_support.xsd | 73 +++++++++++++++++++ .../netex_journeyTiming_support.xsd | 5 ++ .../netex_routingConstraint_support.xsd | 8 +- .../netex_timeDemandType_support.xsd | 5 ++ .../netex_distanceMatrixElement_support.xsd | 5 ++ .../part3_fares/netex_fareSeries_support.xsd | 5 ++ ..._mobilityServiceConstraintZone_support.xsd | 16 +++- 10 files changed, 137 insertions(+), 21 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index 67a389eb4..bd4e98677 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,27 +1,11 @@ -PointOnLinkRefStructure -TurnaroundTimeLimitTimeRefStructure -VehicleTypePreferenceRefStructure -PointOfInterestSpaceRefStructure -ParkingPassengerEntranceRefStructure -ParkingEntranceForVehiclesRefStructure -DistanceMatrixElementRefStructure -SeriesConstraintRefStructure -MobilityServiceConstraintZoneRefStructure -VehicleTypeZoneRestrictionRefStructure -ComplexFeatureRefStructure -SimpleFeatureRefStructure -RoutingConstraintZoneRefStructure GenericPathJunctionRefStructure PassingTimeRefStructure -PricingRuleRefStructure SitePathJunctionRefStructure TimetabledPassingTimeRefStructure EstimatedPassingTimeRefStructure ObservedPassingTimeRefStructure TargetPassingTimeRefStructure PassengerAtStopTimeRefStructure -DiscountingRuleRefStructure -LimitingRuleRefStructure SchematicMapMemberRefStructure AccessVehicleEquipmentRefStructure RubbishDisposalEquipmentRefStructure @@ -30,3 +14,10 @@ PassengerEquipmentRefStructure HelpPointEquipmentRefStructure PassengerSafetyEquipmentRefStructure SanitaryEquipmentRefStructure +PricingRuleRefStructure +DiscountingRuleRefStructure +LimitingRuleRefStructure +PointOnLinkRefStructure +PointOfInterestSpaceRefStructure +ParkingPassengerEntranceRefStructure +ParkingEntranceForVehiclesRefStructure diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index c31e70344..df5115880 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -195,6 +195,8 @@ def update_nameofclass_ref_attributes( parent_ref_name = '' else: parent_ref_name = l[1] + if parent_ref_name.endswith('_Dummy'): + parent_ref_name = l[2] if parent_ref_name == '': print(ref_name, l) diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd index 82e7055c0..a6efd3f3a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd @@ -77,7 +77,13 @@ Rail transport, Roads and Road transport Type for a reference to a SIMPLE FEATURE. - + + + + Automatic reference class for SimpleFeatureRefStructure + + + @@ -109,7 +115,13 @@ Rail transport, Roads and Road transport Type for a reference to a COMPLEX FEATURE. - + + + + Automatic reference class for ComplexFeatureRefStructure + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 94c2796ea..e165d9ce3 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -4171,6 +4171,79 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from RoutingConstraintZone + + + + + + + + Type for all concrete EntityStructures that can be referenced from SimpleFeature + + + + + + + + Type for all concrete EntityStructures that can be referenced from ComplexFeature + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleTypeZoneRestriction + + + + + + + + Type for all concrete EntityStructures that can be referenced from MobilityServiceConstraintZone + + + + + + + + Type for all concrete EntityStructures that can be referenced from SeriesConstraint + + + + + + + + Type for all concrete EntityStructures that can be referenced from TurnaroundTimeLimitTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from VehicleTypePreference + + + + + + + + Type for all concrete EntityStructures that can be referenced from DistanceMatrixElement + + + + + + Type for all concrete EntityStructures that can be referenced from CompoundTrain diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd index 8edea0888..9defd9705 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd @@ -163,6 +163,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for TurnaroundTimeLimitTimeRefStructure + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd index fe1cde1d1..1afa5a3a6 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd @@ -139,7 +139,13 @@ Rail transport, Roads and Road transport Type for a reference to a ROUTING CONSTRAINT ZONE. - + + + + Automatic reference class for RoutingConstraintZoneRefStructure + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd index 0b6a7f54b..70cb932ee 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd @@ -229,6 +229,11 @@ Rail transport, Roads and Road transport Identifier of VEHICLE TYPE PREFERENCE. + + + Automatic reference class for VehicleTypePreferenceRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd index f3c0227a4..6359a3da6 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd @@ -145,6 +145,11 @@ Rail transport, Roads and Road transport Identifier of a PRICEABLE ELEMENT. + + + Automatic reference class for DistanceMatrixElementRefStructure + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd index b4cf4eb22..36b818960 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd @@ -113,6 +113,11 @@ Identifier of a SERIES CONSTRAINT. + + + Automatic reference class for SeriesConstraintRefStructure + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd index ec194a05d..1759a8715 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd @@ -96,7 +96,13 @@ Rail transport, Roads and Road transport Type for Reference to an MOBILITY SERVICE CONSTRAINT ZONE. Left untyped so as to avoid forwards dependency. - + + + + Automatic reference class for MobilityServiceConstraintZoneRefStructure + + + @@ -132,7 +138,13 @@ Rail transport, Roads and Road transport Type for Reference to an VEHICLE TYPE ZONE RESTRICTION. Left untyped so as to avoid forwards dependency. - + + + + Automatic reference class for VehicleTypeZoneRestrictionRefStructure + + + From 88983f84bd7983a6027670465c1985997a9b06d4 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 21:47:19 +0200 Subject: [PATCH 13/20] Done for now --- scripts/complex-types-excluded | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index bd4e98677..c5ffd0732 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,6 +1,4 @@ -GenericPathJunctionRefStructure PassingTimeRefStructure -SitePathJunctionRefStructure TimetabledPassingTimeRefStructure EstimatedPassingTimeRefStructure ObservedPassingTimeRefStructure @@ -21,3 +19,5 @@ PointOnLinkRefStructure PointOfInterestSpaceRefStructure ParkingPassengerEntranceRefStructure ParkingEntranceForVehiclesRefStructure +GenericPathJunctionRefStructure +SitePathJunctionRefStructure From f8636899b3fcd4561897ff2212141a0595ae5c41 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 22:34:45 +0200 Subject: [PATCH 14/20] Rename _DummyType to _Dummy --- .../netex_trainElementType_version.xsd | 4 ++-- .../netex_trainElement_version.xsd | 14 +++++++------- .../netex_vehicleType_version.xsd | 8 ++++---- .../netex_vehicle_version.xsd | 8 ++++---- .../netex_fareDebit_version.xsd | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index d09ba0543..5fd12939d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -84,7 +84,7 @@ Rail transport, Roads and Road transport - + A TRAIN that is able to move under its own power. +v2.0 @@ -140,7 +140,7 @@ Rail transport, Roads and Road transport - + A TRAIN that is able to move under its own power. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index 6756ef013..7fadfd6cb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -118,7 +118,7 @@ Rail transport, Roads and Road transport - + @@ -168,12 +168,12 @@ Rail transport, Roads and Road transport - + Dummy type to work around SG limitations - + A vehicle composed of TRAIN ELEMENTs in a certain order, i.e. of wagons assembled together and propelled by a locomotive or one of the wagons. @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + A vehicle composed of COMPOUND TRAIN ELEMENTs in a certain order, i.e. of wagons assembled together and propelled by a locomotive or one of the wagons. @@ -297,7 +297,7 @@ Rail transport, Roads and Road transport - + Dummy Tpe for Train Element substitution @@ -618,8 +618,8 @@ Rail transport, Roads and Road transport Reference to a TRAIN. - - + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 4a6200c4d..0a3708b4f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -104,12 +104,12 @@ Rail transport, Roads and Road transport - + Dummy type to work around SG limitations - + A classification of any type of VEHICLE according to its properties. @@ -243,7 +243,7 @@ Rail transport, Roads and Road transport - + A classification of public transport vehicles according to the vehicle scheduling requirements in mode and capacity (e.g. standard bus, double-deck, ...). @@ -432,7 +432,7 @@ Rail transport, Roads and Road transport - + A classification of personal use vehicles according to their properties, +v1.2.2 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index aee05634c..947cf384a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + A specific instance of an elementary unit of rolling stock (e.g., railcar, wagon, locomotive). Its properties are given by a TRAIN ELEMENT TYPE. @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport - + An area within a Site. May be connected to Quays by PATH LINKs. @@ -323,7 +323,7 @@ Rail transport, Roads and Road transport - + An unpowered item of rolling stock such as a specific passenger carriage, luggage van, passenger vehicle carrier wagon or freight wagon. +v2.0 @@ -377,7 +377,7 @@ Rail transport, Roads and Road transport - + A powered item of rolling stock, such as a specific locomotive or powered railcar. +v2.0 diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd index acd5bfb52..f2548d5a8 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd @@ -80,12 +80,12 @@ Rail transport, Roads and Road transport - + Dummy type for FARE DEBIT - + A LOG ENTRY recording data about a debiting action relating to a fare or use of a fare. @@ -138,7 +138,7 @@ Rail transport, Roads and Road transport - + A LOG ENTRY recording data about a debiting action for a booking fee. @@ -180,7 +180,7 @@ Rail transport, Roads and Road transport - + A LOG ENTRY recording data about a debiting action for post-payment for a specific trip. @@ -222,7 +222,7 @@ Rail transport, Roads and Road transport - + A LOG ENTRY recording data about a debiting action for a payment type other than a FARE PRODUCT SALE DEBIT, TRIP DEBIT, OFFENCE DEBIT or BOOKING DEBIT. @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + A LOG ENTRY recording data about a debiting action made to purchase a FARE PRODUCT. @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - + A LOG ENTRY recording data about a debiting action for a fine for an OFFENCE or penalty fare. From ca19e87ca7b6047090bb7875f030a1a5a2ddcd46 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 22:41:54 +0200 Subject: [PATCH 15/20] Fix broken substitutionGroup on MediumAccessDevice --- .../part3_salesTransactions/netex_mediumApplication_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd index ab63478c2..2b467fcb7 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd @@ -101,7 +101,7 @@ Rail transport, Roads and Road transport - + A component (mobile phone, smart card, etc) with the necessary facilities (hardware and software) to host a MEDIUM APPLICATION INSTANCE and communicate with a control device. +v1.2.2. From be88eb9f78234d4054d95e697b37ec3b3628ab84 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 23:08:44 +0200 Subject: [PATCH 16/20] Make FareDebit_Dummy abstract --- .../part3_salesTransactions/netex_fareDebit_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd index f2548d5a8..2b04c4daa 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd @@ -80,7 +80,7 @@ Rail transport, Roads and Road transport - + Dummy type for FARE DEBIT From 85b89f0b7b4154c6734d108b104634c0c3a7a61d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 23:21:54 +0200 Subject: [PATCH 17/20] Changes in script and included classes. The script included all xsd sub-folders, but the examples naively referenced classes without any prefixed. For GML we now have explicitly added them (manually) to the script, with the gml: prefix. The examples were updated accordingly. This significantly reduces the enumerations, and reduces them to NeTEx only (without prefix). In addition substitutionGroups 'results' have been added to the enumeration of the classes. --- ...AMSY_NETWORK_FARE_Arriva-pass_20200417.xml | 4 +- ...AMSY_NETWORK_FARE_Arriva-trip_20200417.xml | 4 +- ...FirstSheffield-pass-by-period_20200310.xml | 4 +- ...E_FirstSheffield-pass-by-user_20200310.xml | 4 +- ...RE_FirstSheffield-pass-simple_20200310.xml | 4 +- ...K_FARE_Metrorider-pass+others_20170101.xml | 4 +- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 4 +- ...RK_FARE_Metrorider-pass_basic_20170101.xml | 4 +- ...ETWORK_FARE_Travelmaster-pass_20200315.xml | 4 +- .../fxc/uk_fxc_addon_HSP_plusbus.xml | 4 +- .../standards/fxc/uk_fxc_common_profile.xml | 4 +- ...I-01_UK_DFT_STOP_NPTG-extract_20170101.xml | 4 +- ...K_DFT_STOP_NaPTAN-060+086+110_20171217.xml | 4 +- ..._SCWW_LINE_SCWW-86-simplified_20190101.xml | 4 +- .../txc/uk_nap_naptan_stops_extract1.xml | 4 +- .../txc/uk_nptg_localities_extract1.xml | 4 +- .../uk_txc_SCWW-86_extract1-with-sections.xml | 4 +- .../uk_txc_SCWW-86_extract2-simplified.xml | 4 +- examples/standards/txc/uk_txc_extract1.xml | 4 +- scripts/dependencygraph.py | 10 +- scripts/nameofclass.py | 10 +- .../netex_entity_support.xsd | 374 ++++-------------- 22 files changed, 132 insertions(+), 338 deletions(-) diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml index 25b4a0dc6..28e6e1707 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml @@ -3573,13 +3573,13 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml index 1ba082580..54cc7149a 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml @@ -2377,13 +2377,13 @@ We group the elements in separate frames - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml index c4d4612b7..e06d74ef2 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml @@ -8208,13 +8208,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml index 6b0824de3..409e8fa29 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml @@ -8297,13 +8297,13 @@ FirstUnlimited: 28 day | £74.00 - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index 88d42c1dc..4f510a1e7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -8973,13 +8973,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index 4a4e0f639..9c609d770 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -7909,13 +7909,13 @@ This Shows sample Purchases - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml index 9e171375d..5428a2d47 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml @@ -5177,13 +5177,13 @@ This Shows sample Purchases - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml index 983810af2..e2fbdfc84 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml @@ -2673,13 +2673,13 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + required inline - + required diff --git a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml index 339bb18d9..7a499b34f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml +++ b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml @@ -12779,13 +12779,13 @@ AllZone: SyConnect - + required inline - + required diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 0449328f7..a7d3ce9f4 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -5658,13 +5658,13 @@ West Midlands Railway - + required inline - + required diff --git a/examples/standards/fxc/uk_fxc_common_profile.xml b/examples/standards/fxc/uk_fxc_common_profile.xml index fe09ce96e..17391beed 100644 --- a/examples/standards/fxc/uk_fxc_common_profile.xml +++ b/examples/standards/fxc/uk_fxc_common_profile.xml @@ -2091,13 +2091,13 @@ - + required inline - + required diff --git a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml index 06c900dc5..062022098 100644 --- a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml +++ b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml @@ -9924,13 +9924,13 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + required inline - + required diff --git a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml index 9e744b4d0..5e6dcde72 100644 --- a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml +++ b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NaPTAN-060+086+110_20171217.xml @@ -1191,13 +1191,13 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + required inline - + required diff --git a/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml b/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml index 264f14d8c..ddd337631 100644 --- a/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml +++ b/examples/standards/txc/FX-PI-01_UK_SCWW_LINE_SCWW-86-simplified_20190101.xml @@ -8953,13 +8953,13 @@ TXC NETEX - + required inline - + required diff --git a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml index 548a80f82..9db85b563 100644 --- a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml +++ b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml @@ -1672,13 +1672,13 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + required inline - + required diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml index dc3d002f2..878c8f110 100644 --- a/examples/standards/txc/uk_nptg_localities_extract1.xml +++ b/examples/standards/txc/uk_nptg_localities_extract1.xml @@ -9749,13 +9749,13 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + required inline - + required diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml index 5987deb19..fe0c0c9cf 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml @@ -9528,13 +9528,13 @@ TXC NETEX - + required inline - + required diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml index adaa62734..2d9e3b96a 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml @@ -8886,13 +8886,13 @@ TXC NETEX - + required inline - + required diff --git a/examples/standards/txc/uk_txc_extract1.xml b/examples/standards/txc/uk_txc_extract1.xml index 2dae24857..59b906c22 100644 --- a/examples/standards/txc/uk_txc_extract1.xml +++ b/examples/standards/txc/uk_txc_extract1.xml @@ -9287,13 +9287,13 @@ TXC NETEX - + required inline - + required diff --git a/scripts/dependencygraph.py b/scripts/dependencygraph.py index 4d89ada9a..6c60221fe 100644 --- a/scripts/dependencygraph.py +++ b/scripts/dependencygraph.py @@ -31,6 +31,7 @@ def __init__(self): # Abstract Elements self.abstract_elements = set([]) + self.substitutionGroups: dict[str, set[str]] = {} def parse_schemas(self, schema_paths: List[Path]) -> None: """Parse all XSD schemas from the given paths.""" @@ -39,7 +40,8 @@ def parse_schemas(self, schema_paths: List[Path]) -> None: self._parse_schema_file(path) elif path.is_dir(): for xsd_file in path.rglob("*.xsd"): - self._parse_schema_file(xsd_file) + if 'xsd/netex' in str(xsd_file): + self._parse_schema_file(xsd_file) def _parse_schema_file(self, filepath: Path) -> None: """Parse a single XSD schema file.""" @@ -106,6 +108,12 @@ def _extract_elements(self, root: ET.Element) -> None: if abstract: self.abstract_elements.add(name) + substitutionGroup = elem.get('substitutionGroup', False) + if substitutionGroup: + l = self.substitutionGroups.get(name, set([])) + l.add(substitutionGroup) + self.substitutionGroups[name] = l + # Check for direct type reference type_ref = elem.get('type') if type_ref: diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index df5115880..940b3705b 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -79,6 +79,7 @@ def update_nameofclass_ref_attributes( entity_file: Path, entity_dependency_graph: dict[str, list[str]], abstract_classes: set[str], + substitutionGroups: dict[str, set], analyzer, ): """ @@ -147,6 +148,12 @@ def update_nameofclass_ref_attributes( if natural_class not in abstract_classes: concrete_classes.append(natural_class) + for cls in concrete_classes: + if cls in substitutionGroups: + for scls in substitutionGroups[cls]: + if scls not in abstract_classes: + concrete_classes.append(scls) + concrete_classes = sorted(set(concrete_classes)) if not concrete_classes: continue # nothing to add @@ -355,7 +362,7 @@ def update_nameofclass_ref_attributes( ] ) update_nameofclass_simpletype( - schema_with_nameofclass, sorted(list(interesting_classes)) + schema_with_nameofclass, sorted(list(interesting_classes) + ['gml:Polygon', 'gml:MultiPolygon', 'gml:MultiSurface', 'gml:pos', 'gml:LineString']) ) # Update RefStructure types + nameOfRefClass attribuut @@ -364,5 +371,6 @@ def update_nameofclass_ref_attributes( schema_with_nameofclass, entity_dependency_graph, abstract_classes, + analyzer.substitutionGroups, analyzer, ) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index e165d9ce3..7eaebc2b9 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -114,25 +114,7 @@ Rail transport, Roads and Road transport - - - - - - - - - - - - - - - - - - @@ -146,7 +128,6 @@ Rail transport, Roads and Road transport - @@ -176,8 +157,6 @@ Rail transport, Roads and Road transport - - @@ -243,22 +222,17 @@ Rail transport, Roads and Road transport - - - - - @@ -267,8 +241,6 @@ Rail transport, Roads and Road transport - - @@ -287,15 +259,6 @@ Rail transport, Roads and Road transport - - - - - - - - - @@ -329,7 +292,6 @@ Rail transport, Roads and Road transport - @@ -374,7 +336,6 @@ Rail transport, Roads and Road transport - @@ -451,10 +412,6 @@ Rail transport, Roads and Road transport - - - - @@ -513,13 +470,7 @@ Rail transport, Roads and Road transport - - - - - - @@ -563,7 +514,6 @@ Rail transport, Roads and Road transport - @@ -585,10 +535,8 @@ Rail transport, Roads and Road transport - - @@ -603,13 +551,8 @@ Rail transport, Roads and Road transport - - - - - @@ -642,7 +585,6 @@ Rail transport, Roads and Road transport - @@ -703,13 +645,11 @@ Rail transport, Roads and Road transport - - @@ -717,18 +657,9 @@ Rail transport, Roads and Road transport - - - - - - - - - @@ -812,13 +743,6 @@ Rail transport, Roads and Road transport - - - - - - - @@ -850,7 +774,6 @@ Rail transport, Roads and Road transport - @@ -887,7 +810,6 @@ Rail transport, Roads and Road transport - @@ -973,9 +895,6 @@ Rail transport, Roads and Road transport - - - @@ -1004,7 +923,6 @@ Rail transport, Roads and Road transport - @@ -1013,10 +931,6 @@ Rail transport, Roads and Road transport - - - - @@ -1044,11 +958,9 @@ Rail transport, Roads and Road transport - - @@ -1133,7 +1045,6 @@ Rail transport, Roads and Road transport - @@ -1252,7 +1163,6 @@ Rail transport, Roads and Road transport - @@ -1278,37 +1188,9 @@ Rail transport, Roads and Road transport - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1369,8 +1251,6 @@ Rail transport, Roads and Road transport - - @@ -1378,7 +1258,6 @@ Rail transport, Roads and Road transport - @@ -1408,9 +1287,6 @@ Rail transport, Roads and Road transport - - - @@ -1445,7 +1321,6 @@ Rail transport, Roads and Road transport - @@ -1467,7 +1342,6 @@ Rail transport, Roads and Road transport - @@ -1487,8 +1361,6 @@ Rail transport, Roads and Road transport - - @@ -1500,7 +1372,6 @@ Rail transport, Roads and Road transport - @@ -1536,8 +1407,6 @@ Rail transport, Roads and Road transport - - @@ -1639,7 +1508,6 @@ Rail transport, Roads and Road transport - @@ -1652,10 +1520,6 @@ Rail transport, Roads and Road transport - - - - @@ -1732,7 +1596,6 @@ Rail transport, Roads and Road transport - @@ -1743,7 +1606,6 @@ Rail transport, Roads and Road transport - @@ -1827,8 +1689,6 @@ Rail transport, Roads and Road transport - - @@ -1911,10 +1771,6 @@ Rail transport, Roads and Road transport - - - - @@ -1928,7 +1784,6 @@ Rail transport, Roads and Road transport - @@ -1946,7 +1801,6 @@ Rail transport, Roads and Road transport - @@ -1957,23 +1811,7 @@ Rail transport, Roads and Road transport - - - - - - - - - - - - - - - - @@ -2003,7 +1841,6 @@ Rail transport, Roads and Road transport - @@ -2087,7 +1924,6 @@ Rail transport, Roads and Road transport - @@ -2103,8 +1939,6 @@ Rail transport, Roads and Road transport - - @@ -2118,7 +1952,6 @@ Rail transport, Roads and Road transport - @@ -2165,8 +1998,6 @@ Rail transport, Roads and Road transport - - @@ -2304,7 +2135,6 @@ Rail transport, Roads and Road transport - @@ -2325,7 +2155,6 @@ Rail transport, Roads and Road transport - @@ -2352,10 +2181,6 @@ Rail transport, Roads and Road transport - - - - @@ -2384,12 +2209,7 @@ Rail transport, Roads and Road transport - - - - - @@ -2456,7 +2276,6 @@ Rail transport, Roads and Road transport - @@ -2494,21 +2313,13 @@ Rail transport, Roads and Road transport - - - - - - - - @@ -2541,10 +2352,6 @@ Rail transport, Roads and Road transport - - - - @@ -2739,15 +2546,11 @@ Rail transport, Roads and Road transport - - - - @@ -2766,17 +2569,12 @@ Rail transport, Roads and Road transport - - - - - @@ -2789,7 +2587,6 @@ Rail transport, Roads and Road transport - @@ -2813,9 +2610,6 @@ Rail transport, Roads and Road transport - - - @@ -2845,8 +2639,6 @@ Rail transport, Roads and Road transport - - @@ -2912,7 +2704,6 @@ Rail transport, Roads and Road transport - @@ -2943,58 +2734,19 @@ Rail transport, Roads and Road transport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3061,9 +2813,6 @@ Rail transport, Roads and Road transport - - - @@ -3071,9 +2820,6 @@ Rail transport, Roads and Road transport - - - @@ -3240,11 +2986,9 @@ Rail transport, Roads and Road transport - - @@ -3395,8 +3139,6 @@ Rail transport, Roads and Road transport - - @@ -3422,13 +3164,7 @@ Rail transport, Roads and Road transport - - - - - - @@ -3464,7 +3200,6 @@ Rail transport, Roads and Road transport - @@ -3504,7 +3239,6 @@ Rail transport, Roads and Road transport - @@ -3599,7 +3333,6 @@ Rail transport, Roads and Road transport - @@ -3612,14 +3345,11 @@ Rail transport, Roads and Road transport - - - @@ -3631,7 +3361,6 @@ Rail transport, Roads and Road transport - @@ -3677,10 +3406,6 @@ Rail transport, Roads and Road transport - - - - @@ -3707,7 +3432,6 @@ Rail transport, Roads and Road transport - @@ -3730,7 +3454,6 @@ Rail transport, Roads and Road transport - @@ -3757,7 +3480,6 @@ Rail transport, Roads and Road transport - @@ -3788,14 +3510,12 @@ Rail transport, Roads and Road transport - - @@ -3817,7 +3537,6 @@ Rail transport, Roads and Road transport - @@ -3848,7 +3567,11 @@ Rail transport, Roads and Road transport - + + + + + @@ -3866,7 +3589,6 @@ Rail transport, Roads and Road transport - @@ -3874,7 +3596,6 @@ Rail transport, Roads and Road transport - @@ -3902,7 +3623,6 @@ Rail transport, Roads and Road transport - @@ -3913,7 +3633,6 @@ Rail transport, Roads and Road transport - @@ -3960,15 +3679,12 @@ Rail transport, Roads and Road transport - - - @@ -4004,7 +3720,6 @@ Rail transport, Roads and Road transport - @@ -4046,7 +3761,6 @@ Rail transport, Roads and Road transport - @@ -4069,10 +3783,6 @@ Rail transport, Roads and Road transport - - - - @@ -4123,7 +3833,6 @@ Rail transport, Roads and Road transport - @@ -4133,7 +3842,6 @@ Rail transport, Roads and Road transport - @@ -4177,6 +3885,7 @@ Rail transport, Roads and Road transport + @@ -4185,6 +3894,7 @@ Rail transport, Roads and Road transport + @@ -4193,6 +3903,7 @@ Rail transport, Roads and Road transport + @@ -4209,6 +3920,7 @@ Rail transport, Roads and Road transport + @@ -4281,6 +3993,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfOrganisationPart + @@ -4332,6 +4045,7 @@ Rail transport, Roads and Road transport + @@ -4386,6 +4100,7 @@ Rail transport, Roads and Road transport + @@ -4485,6 +4200,7 @@ Rail transport, Roads and Road transport + @@ -4577,6 +4293,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from VehicleEntrance + @@ -4746,6 +4463,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from StopPlaceVehicleEntrance + @@ -4754,6 +4472,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from StopPlaceEntrance + @@ -4818,6 +4537,7 @@ Rail transport, Roads and Road transport + @@ -4826,6 +4546,7 @@ Rail transport, Roads and Road transport + @@ -4834,6 +4555,7 @@ Rail transport, Roads and Road transport + @@ -5116,6 +4838,7 @@ Rail transport, Roads and Road transport + @@ -5152,6 +4875,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from PointOfInterestVehicleEntrance + @@ -5176,6 +4900,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from MeetingPointService + @@ -5184,6 +4909,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from LeftLuggageService + @@ -5200,6 +4926,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from LostPropertyService + @@ -5209,6 +4936,7 @@ Rail transport, Roads and Road transport + @@ -5393,6 +5121,7 @@ Rail transport, Roads and Road transport + @@ -5401,6 +5130,7 @@ Rail transport, Roads and Road transport + @@ -5424,6 +5154,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from JourneyTiming + @@ -5470,6 +5201,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfJourneyPattern + @@ -5561,6 +5293,7 @@ Rail transport, Roads and Road transport + @@ -5601,6 +5334,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfTimeDemandType + @@ -5633,6 +5367,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfPassengerInformationEquipment + @@ -5734,6 +5469,7 @@ Rail transport, Roads and Road transport + @@ -5757,6 +5493,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TrafficControlPoint + @@ -5833,6 +5570,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfLine + @@ -5971,6 +5709,7 @@ Rail transport, Roads and Road transport + @@ -6020,6 +5759,7 @@ Rail transport, Roads and Road transport + @@ -6078,6 +5818,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfMobilityService + @@ -6508,6 +6249,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFlexibleService + @@ -6867,6 +6609,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfPlug + @@ -6876,6 +6619,7 @@ Rail transport, Roads and Road transport + @@ -7211,6 +6955,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfEquipment + @@ -7468,6 +7213,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfService + @@ -7476,6 +7222,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFacility + @@ -7734,6 +7481,7 @@ Rail transport, Roads and Road transport + @@ -7930,6 +7678,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfModeOfOperation + @@ -8013,6 +7762,7 @@ Rail transport, Roads and Road transport + @@ -8020,6 +7770,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfNotice + @@ -8044,6 +7795,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfRollingStock + @@ -8270,7 +8022,6 @@ Rail transport, Roads and Road transport - @@ -8345,6 +8096,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFrame + @@ -8435,6 +8187,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfResponsibilityRole + @@ -8483,6 +8236,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfLinkSequence + @@ -8524,6 +8278,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfLink + @@ -8532,6 +8287,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfPoint + @@ -8595,6 +8351,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfZone + @@ -8679,6 +8436,7 @@ Rail transport, Roads and Road transport + @@ -8696,6 +8454,7 @@ Rail transport, Roads and Road transport + @@ -8797,6 +8556,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFeature + @@ -8813,6 +8573,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfOperation + @@ -8821,6 +8582,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfOrganisation + @@ -8854,6 +8616,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfPlace + @@ -8862,6 +8625,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfTransfer + @@ -8909,6 +8673,7 @@ Rail transport, Roads and Road transport + @@ -8968,6 +8733,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfProjection + @@ -9116,6 +8882,7 @@ Rail transport, Roads and Road transport + @@ -9164,6 +8931,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFareProduct + @@ -9404,6 +9172,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFareStructureElement + @@ -9428,6 +9197,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfTariff + @@ -9768,6 +9538,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfTravelDocument + @@ -9968,6 +9739,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfSalesOfferPackage + @@ -10024,6 +9796,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFareStructureFactor + @@ -10300,6 +10073,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfRetailDevice + @@ -10384,6 +10158,7 @@ Rail transport, Roads and Road transport + @@ -10392,6 +10167,7 @@ Rail transport, Roads and Road transport + @@ -10415,6 +10191,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFareContractEntry + @@ -10442,6 +10219,7 @@ Rail transport, Roads and Road transport Type for all concrete EntityStructures that can be referenced from TypeOfFareContract + From e89ab39bdf24a4da7c053c3b342202fefbae1aef Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Oct 2025 23:39:49 +0200 Subject: [PATCH 18/20] Fixes: PassingTimeRefStructure and likes --- scripts/complex-types-excluded | 6 -- scripts/nameofclass.py | 4 -- .../netex_entity_support.xsd | 56 +++++++++++++++++++ .../netex_passengerAtStopTime_support.xsd | 5 ++ .../netex_passingTimes_support.xsd | 25 +++++++++ 5 files changed, 86 insertions(+), 10 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index c5ffd0732..314d16ae4 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,9 +1,3 @@ -PassingTimeRefStructure -TimetabledPassingTimeRefStructure -EstimatedPassingTimeRefStructure -ObservedPassingTimeRefStructure -TargetPassingTimeRefStructure -PassengerAtStopTimeRefStructure SchematicMapMemberRefStructure AccessVehicleEquipmentRefStructure RubbishDisposalEquipmentRefStructure diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index 940b3705b..ddd4a5627 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -186,10 +186,6 @@ def update_nameofclass_ref_attributes( "ObjectIdType", "LinkInSequenceRefStructure", "PointInSequenceRefStructure", - "GroupOfEntitiesRefStructure_Dummy", - "PointOnLinkRefStructure_Dummy", - "VehicleEquipmentRefStructure", - "ParkingEntranceRefStructure", ): # Workaround parent_ref_name = "" diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 7eaebc2b9..4051f1221 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -3879,6 +3879,62 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from TimetabledPassingTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from EstimatedPassingTime + + + + + + + + + Type for all concrete EntityStructures that can be referenced from ObservedPassingTime + + + + + + + + + Type for all concrete EntityStructures that can be referenced from TargetPassingTime + + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerAtStopTime + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassingTime + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from RoutingConstraintZone diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd index 0f5a100da..6024c110d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd @@ -80,6 +80,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for PassengerAtStopTimeRefStructure + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd index 52640d72d..0ecf16c6b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd @@ -83,6 +83,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for PassingTimeRefStructure + + @@ -109,6 +114,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for TargetPassingTimeRefStructure + + @@ -135,6 +145,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for ObservedPassingTimeRefStructure + + @@ -161,6 +176,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for EstimatedPassingTimeRefStructure + + @@ -187,6 +207,11 @@ Rail transport, Roads and Road transport Identifier of referenced entity. + + + Automatic reference class for TimetabledPassingTimeRefStructure + + From 48856c8b24eb7fb66f0152824728d5e9ca221e9a Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 9 Oct 2025 00:48:38 +0200 Subject: [PATCH 19/20] Manual fixes for *EquipmentRef --- scripts/complex-types-excluded | 7 -- scripts/dependencygraph.py | 7 +- scripts/nameofclass.py | 8 +- .../netex_entity_support.xsd | 74 +++++++++++++++++++ ...etex_equipmentVehiclePassenger_support.xsd | 10 +++ .../netex_equipment_support.xsd | 5 ++ ...netex_ifopt_equipmentPassenger_support.xsd | 25 +++++++ 7 files changed, 120 insertions(+), 16 deletions(-) diff --git a/scripts/complex-types-excluded b/scripts/complex-types-excluded index 314d16ae4..c354efa7b 100644 --- a/scripts/complex-types-excluded +++ b/scripts/complex-types-excluded @@ -1,11 +1,4 @@ SchematicMapMemberRefStructure -AccessVehicleEquipmentRefStructure -RubbishDisposalEquipmentRefStructure -PassengerBeaconEquipmentRefStructure -PassengerEquipmentRefStructure -HelpPointEquipmentRefStructure -PassengerSafetyEquipmentRefStructure -SanitaryEquipmentRefStructure PricingRuleRefStructure DiscountingRuleRefStructure LimitingRuleRefStructure diff --git a/scripts/dependencygraph.py b/scripts/dependencygraph.py index 6c60221fe..6a9f5f49f 100644 --- a/scripts/dependencygraph.py +++ b/scripts/dependencygraph.py @@ -485,11 +485,8 @@ def main(): if shown >= 3: break - print(analyzer._get_type_chain('ServiceLink')) - print(analyzer._get_type_chain('TimingLink')) - print(analyzer._get_type_chain('StandardFareTable')) - print(analyzer._get_type_chain('ParkingTariff')) - print(analyzer._get_type_chain('ScheduledStopPointRef')) + print(analyzer._get_type_chain('PassengerEquipment')) + print(analyzer._get_type_chain('PassengerEquipmentRef')) if __name__ == "__main__": main() diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index ddd4a5627..97f96d56e 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -127,7 +127,7 @@ def update_nameofclass_ref_attributes( natural_class = re.sub("RefStructure$", "", ref_name) - if natural_class in entity_dependency_graph.keys(): + if natural_class in entity_dependency_graph.keys() or (ref_name in ('VehicleEquipmentRefStructure', 'PassengerEquipmentRefStructure')): # Determine all concrete descendants concrete_classes = [ cls @@ -145,13 +145,13 @@ def update_nameofclass_ref_attributes( ): concrete_classes.append(mycls) - if natural_class not in abstract_classes: + if natural_class not in abstract_classes and natural_class in entity_dependency_graph.keys(): concrete_classes.append(natural_class) for cls in concrete_classes: if cls in substitutionGroups: for scls in substitutionGroups[cls]: - if scls not in abstract_classes: + if scls not in abstract_classes and scls in entity_dependency_graph.keys(): concrete_classes.append(scls) concrete_classes = sorted(set(concrete_classes)) @@ -293,7 +293,7 @@ def update_nameofclass_ref_attributes( name="nameOfRefClass", type=simple_type_name, ) - if natural_class in abstract_classes: + if natural_class in abstract_classes or natural_class not in entity_dependency_graph.keys(): # attrib.attrib["use"] = "required" pass else: diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 4051f1221..f4ad30bb1 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -3879,6 +3879,80 @@ Rail transport, Roads and Road transport + + + Type for all concrete EntityStructures that can be referenced from VehicleEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from RubbishDisposalEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerBeaconEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from HelpPointEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerSafetyEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from SanitaryEquipment + + + + + + + + Type for all concrete EntityStructures that can be referenced from PassengerEquipment + + + + + + + + + + + + + + + + + + Type for all concrete EntityStructures that can be referenced from AccessVehicleEquipment + + + + + Type for all concrete EntityStructures that can be referenced from TimetabledPassingTime diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 12502a2eb..ca1016379 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for VehicleEquipmentRefStructure + + @@ -105,6 +110,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for AccessVehicleEquipmentRefStructure + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd index bb1193be2..8b4db5129 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd @@ -232,6 +232,11 @@ Rail transport, Roads and Road transport Identifier of a POINT. + + + Automatic reference class for PassengerEquipmentRefStructure + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 66550f152..15db73227 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -79,6 +79,11 @@ Rail transport, Roads and Road transport Identifier of a SANITARY FACILITY EQUIPMENT. + + + Automatic reference class for SanitaryEquipmentRefStructure + + @@ -105,6 +110,11 @@ Rail transport, Roads and Road transport Identifier of a PASSENGER SAFETY EQUIPMENT. + + + Automatic reference class for PassengerSafetyEquipmentRefStructure + + @@ -131,6 +141,11 @@ Rail transport, Roads and Road transport Identifier of a HELP POINT EQUIPMENT. + + + Automatic reference class for HelpPointEquipmentRefStructure + + @@ -157,6 +172,11 @@ Rail transport, Roads and Road transport Identifier of a BEACON EQUIPMENT. + + + Automatic reference class for PassengerBeaconEquipmentRefStructure + + @@ -244,6 +264,11 @@ Rail transport, Roads and Road transport Identifier of a TICKETING EQUIPMENT. + + + Automatic reference class for RubbishDisposalEquipmentRefStructure + + From 6341ea4065e157e2491c712b45354ff4f7008371 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Fri, 10 Oct 2025 09:15:38 +0200 Subject: [PATCH 20/20] Update analyse-refs-2.py --- scripts/analyse-refs-2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analyse-refs-2.py b/scripts/analyse-refs-2.py index d23b978af..9111a3bc7 100644 --- a/scripts/analyse-refs-2.py +++ b/scripts/analyse-refs-2.py @@ -13,7 +13,7 @@ def get_version_of_object_ref_attrs(xsd_file: Path): namespaces=XSD_NS, ) if not ext: - raise ValueError("VersionOfObjectRefStructure niet gevonden of geen extension") + raise ValueError("VersionOfObjectRefStructure not found or no extension") return [copy.deepcopy(c) for c in ext[0] if isinstance(c.tag, str)] def collect_ref_elements(root_dir: Path):