From dd152daa7f4dbb98fb0745e1308db415f400f0b9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 13 Oct 2025 02:50:40 +0200 Subject: [PATCH 1/2] Initial implementation of required IdTypes. This is the list of objects that now have an id type. This list is also incomplete. All examples fixed. --- .../functions/deckPlans/DeckPlans-Example.xml | 4 +- .../deckPlans/DeckPlans-Example_bus.xml | 4 +- .../deckPlans/DeckPlans-Example_train.xml | 6 +- .../functions/line/Line_with_facilities.xml | 4 +- .../Netex_LineClassification_1.xml | 2 +- .../site/Netex_11_Sites_OlympicPark_1.xml | 84 +- .../site/Netex_21_Sites_Parking_2.xml | 2 +- ...FER_910GWIMBLDN-accessibility_20140601.xml | 212 ++--- .../Netex_01_Stops_SingleStopOnStreet_1.xml | 2 +- .../Netex_02_Stops_StopPairOnStreet_1.xml | 2 +- .../Netex_04_Stops_SimpleStation_1.xml | 8 +- ...topPlace_uk_ComplexStation_Wimbledon_1.xml | 212 ++--- .../Netex_10_StopPlace_withParking_1.xml | 212 ++--- ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml | 2 +- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 4 +- examples/standards/efp/NO_RailExample.xml | 8 +- examples/standards/epiap/eiap_test1_ramp.xml | 2 +- examples/standards/gbfs/Netex_gbfs_exm1.xml | 12 +- ...lendar_TimetableAndVehicleSchedule_PB2.xml | 1 - .../submodel-DestinationDisplay.xml | 4 +- ...odel-PathLinkWithProjection-DEPRECATED.xml | 4 +- .../submodel-PointWithProjection.xml | 4 +- .../submodel-ServiceFacilitySet.xml | 6 +- .../norway/other_resources/submodel-Zone.xml | 2 +- .../stops/BasicIndoorStopPlace_example.xml | 2 +- .../BasicStopPlace-two-quays_example.xml | 2 +- .../norway/stops/BasicStopPlace_example.xml | 2 +- .../norway/stops/OsloS_station_example.xml | 8 +- ...ace-with-equipment-and-parking_example.xml | 2 +- .../stops/submodel-MonomodalStopPlace.xml | 6 +- .../stops/submodel-StationWithEquipment.xml | 38 +- ...ubmodel-AvailabilityConditionAvailable.xml | 8 +- ...model-AvailabilityConditionUnavailable.xml | 6 +- .../vehicles/submodel-CompoundTrain.xml | 6 +- .../norway/vehicles/submodel-Train.xml | 6 +- ...TA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-full.xml | 36 +- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml | 36 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml | 8 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml | 26 +- .../standards/tap_tsi/TAP-TSDUPD-example1.xml | 2 +- .../TAP-TSDUPD-example2.1-Hilleroed.xml | 4 +- .../tap_tsi/TAP-TSDUPD-example2.2-Milano.xml | 2 +- .../standards/tap_tsi/TAP-TSDUPD-example2.xml | 6 +- .../vdv452/timetable/NeTEx VDV Example.xml | 104 +-- scripts/assign-id-by-parent.py | 34 + scripts/dependencygraph.py | 9 +- scripts/nameofclass.py | 10 + scripts/xsd_analyzer_v5.py | 759 ++++++++++++++++++ .../netex_compositeFrame_version.xsd | 2 +- .../netex_generalFrame_version.xsd | 2 +- .../netex_resourceFrame_version.xsd | 2 +- .../netex_serviceCalendarFrame_version.xsd | 2 +- .../netex_acsb_accessibility.xsd | 4 +- .../netex_acsb_passengerMobility.xsd | 4 +- .../netex_assignment_version.xsd | 4 +- .../netex_grouping_version.xsd | 6 +- .../netex_layer_version.xsd | 2 +- .../netex_organisation_version.xsd | 24 +- .../netex_path_version.xsd | 12 +- .../netex_place_version.xsd | 4 +- .../netex_pointAndLinkSequence_version.xsd | 4 +- .../netex_pointAndLink_version.xsd | 10 +- .../netex_projection_version.xsd | 12 +- .../netex_section_version.xsd | 6 +- .../netex_spatialFeature_version.xsd | 6 +- .../netex_zoneProjection_version.xsd | 2 +- .../netex_zone_version.xsd | 8 +- .../netex_dataSource_version.xsd | 2 +- .../netex_entity_version.xsd | 2 +- .../netex_responsibilitySet_version.xsd | 6 +- .../netex_typeOfValue_version.xsd | 2 +- .../netex_validityCondition_version.xsd | 8 +- .../netex_versionFrame_version.xsd | 4 +- .../netex_version_version.xsd | 4 +- .../netex_access_version.xsd | 2 +- .../netex_address_version.xsd | 4 +- .../netex_availabilityCondition_version.xsd | 4 +- .../netex_dayType_version.xsd | 6 +- .../netex_deckPath_version.xsd | 8 +- .../netex_deckPlan_version.xsd | 34 +- .../netex_environment_version.xsd | 2 +- .../netex_equipmentPlace_version.xsd | 4 +- ...etex_equipmentVehiclePassenger_version.xsd | 6 +- .../netex_equipment_version.xsd | 2 +- .../netex_facility_version.xsd | 10 +- .../netex_modeOfOperation_version.xsd | 18 +- .../netex_mode_version.xsd | 4 +- ...ex_nm_chargingEquipmentProfile_version.xsd | 2 +- .../netex_nm_equipmentEnergy_version.xsd | 10 +- .../netex_nm_fleetEquipment_version.xsd | 6 +- .../netex_nm_fleet_version.xsd | 4 +- .../netex_noticeAssignment_version.xsd | 2 +- .../netex_notice_version.xsd | 8 +- .../netex_otherOrganisation_version.xsd | 10 +- .../netex_schematicMap_version.xsd | 2 +- .../netex_seatingPlan_version.xsd | 12 +- .../netex_securityList_version.xsd | 10 +- .../netex_sensorEquipment_version.xsd | 12 +- .../netex_serviceCalendar_version.xsd | 10 +- .../netex_serviceRestrictions_version.xsd | 8 +- .../netex_spotEquipment_version.xsd | 10 +- .../netex_topographicPlace_version.xsd | 4 +- .../netex_trainElementType_version.xsd | 8 +- .../netex_trainElement_version.xsd | 10 +- .../netex_transportOrganisation_version.xsd | 16 +- .../netex_vehicleType_version.xsd | 26 +- .../netex_vehicle_version.xsd | 10 +- .../netex_infrastructureFrame_version.xsd | 2 +- .../part1_frames/netex_siteFrame_version.xsd | 2 +- .../netex_assistanceBooking_version.xsd | 2 +- .../netex_ifopt_checkConstraint_version.xsd | 8 +- .../netex_ifopt_equipmentAccess_version.xsd | 24 +- .../netex_ifopt_equipmentParking_version.xsd | 4 +- ...netex_ifopt_equipmentPassenger_version.xsd | 10 +- .../netex_ifopt_equipmentSigns_version.xsd | 6 +- .../netex_ifopt_equipmentWaiting_version.xsd | 12 +- .../netex_ifopt_flexibleStopPlace_version.xsd | 8 +- ...x_ifopt_localServiceCommercial_version.xsd | 10 +- .../netex_ifopt_localService_version.xsd | 14 +- .../netex_ifopt_navigationPath_version.xsd | 4 +- .../netex_ifopt_parking_version.xsd | 18 +- .../part1_ifopt/netex_ifopt_path_version.xsd | 10 +- .../netex_ifopt_pointOfInterest_version.xsd | 12 +- .../netex_ifopt_serviceFeature_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_site_version.xsd | 10 +- .../netex_ifopt_stopPlace_version.xsd | 22 +- ...etex_rechargingPointAssignment_version.xsd | 2 +- .../part1_ifopt/netex_taxiPlace_version.xsd | 6 +- .../netex_activation_version.xsd | 14 +- .../netex_flexibleNetwork_version.xsd | 8 +- .../netex_lineNetwork_version.xsd | 6 +- .../netex_line_version.xsd | 14 +- .../netex_networkInfrastructure_version.xsd | 12 +- .../netex_networkRestriction_version.xsd | 10 +- .../netex_routeInstruction_version.xsd | 2 +- .../netex_route_version.xsd | 12 +- .../netex_vehicleAndCrewPoint_version.xsd | 10 +- .../netex_commonSection_version.xsd | 2 +- .../netex_fareZone_version.xsd | 10 +- .../netex_journeyPatternTimings_version.xsd | 8 +- .../netex_journeyPattern_version.xsd | 10 +- .../netex_journeyTiming_version.xsd | 10 +- ..._passengerInformationEquipment_version.xsd | 8 +- .../netex_pathAssignment_version.xsd | 2 +- .../netex_routingConstraint_version.xsd | 6 +- .../netex_servicePattern_version.xsd | 14 +- .../netex_siteConnection_version.xsd | 4 +- .../netex_stopAssignment_version.xsd | 6 +- .../netex_timeDemandType_version.xsd | 8 +- .../netex_timingPattern_version.xsd | 12 +- .../netex_driverScheduleFrame_version.xsd | 2 +- .../netex_serviceFrame_version.xsd | 2 +- .../netex_timetableFrame_version.xsd | 2 +- .../netex_vehicleScheduleFrame_version.xsd | 2 +- .../part2_journeyTimes/netex_call_version.xsd | 2 +- .../netex_coupledJourney_version.xsd | 10 +- .../netex_datedPassingTimes_version.xsd | 2 +- .../netex_datedVehicleJourney_version.xsd | 6 +- .../netex_deckEntranceAssignment_version.xsd | 4 +- .../netex_deckPlanAssignment_version.xsd | 2 +- .../netex_flexibleService_version.xsd | 4 +- .../netex_interchangeRule_version.xsd | 4 +- .../netex_interchange_version.xsd | 8 +- .../netex_journeyAccounting_version.xsd | 2 +- .../netex_journey_facility_support.xsd | 2 +- .../netex_serviceJourney_version.xsd | 10 +- .../netex_timeDemandProfile_version.xsd | 4 +- .../netex_timeDemandTimes_version.xsd | 4 +- .../netex_vehicleJourneyFrequency_version.xsd | 6 +- ...x_vehicleJourneyStopAssignment_version.xsd | 8 +- .../netex_vehicleJourneyTimes_version.xsd | 6 +- .../netex_vehicleJourney_version.xsd | 8 +- .../netex_duty_version.xsd | 10 +- .../netex_vehicleRechargingPlan_version.xsd | 4 +- .../netex_vehicleService_version.xsd | 18 +- .../netex_accessRightParameter_version.xsd | 10 +- .../netex_calculationParameters_version.xsd | 22 +- .../netex_distanceMatrixElement_version.xsd | 8 +- .../part3_fares/netex_farePrice_version.xsd | 2 +- .../part3_fares/netex_fareProduct_version.xsd | 30 +- .../part3_fares/netex_fareSeries_version.xsd | 4 +- .../netex_fareStructureElement_version.xsd | 12 +- .../netex_fareStructure_version.xsd | 10 +- .../part3_fares/netex_fareTable_version.xsd | 12 +- ...etex_geographicStructureFactor_version.xsd | 10 +- .../netex_qualityStructureFactor_version.xsd | 10 +- .../netex_salesDistribution_version.xsd | 8 +- ...x_salesOfferPackageEntitlement_version.xsd | 4 +- .../netex_salesOfferPackage_version.xsd | 16 +- .../netex_timeStructureFactor_version.xsd | 10 +- .../netex_typeOfTravelDocument_version.xsd | 4 +- ...netex_usageParameterAfterSales_version.xsd | 10 +- .../netex_usageParameterBooking_version.xsd | 8 +- .../netex_usageParameterCharging_version.xsd | 6 +- ...etex_usageParameterEligibility_version.xsd | 16 +- ...etex_usageParameterEntitlement_version.xsd | 4 +- .../netex_usageParameterLuggage_version.xsd | 2 +- .../netex_usageParameterTravel_version.xsd | 16 +- .../netex_usageParameter_version.xsd | 6 +- .../netex_validableElement_version.xsd | 10 +- .../part3_frames/netex_fareFrame_version.xsd | 4 +- .../netex_salesTransactionFrame_version.xsd | 2 +- .../netex_monitoredCall_version.xsd | 6 +- .../netex_monitoredPassingTimes_version.xsd | 4 +- .../netex_parkingTariff_version.xsd | 6 +- .../netex_customerEligibility_version.xsd | 8 +- .../netex_customerPaymentMeans_version.xsd | 2 +- .../netex_customerPurchasePackage_version.xsd | 18 +- .../netex_fareDebit_version.xsd | 12 +- .../netex_mediumApplication_version.xsd | 14 +- .../netex_retailConsortium_version.xsd | 8 +- .../netex_salesContract_version.xsd | 22 +- .../netex_salesTransaction_version.xsd | 2 +- .../netex_spotAllocation_version.xsd | 4 +- .../netex_travelDocument_version.xsd | 4 +- ...nm_accessCredentialsAssignment_version.xsd | 4 +- .../netex_nm_individualTraveller_version.xsd | 6 +- ...x_nm_usageParameterEligibility_version.xsd | 2 +- .../netex_nm_usageParameterRental_version.xsd | 6 +- .../netex_nm_mobilityJourneyFrame_version.xsd | 2 +- .../netex_nm_mobilityServiceFrame_version.xsd | 2 +- ..._mobilityServiceConstraintZone_version.xsd | 6 +- .../netex_nm_vehicleMeetingPlace_version.xsd | 12 +- ..._vehicleMeetingPointAssignment_version.xsd | 6 +- .../netex_nm_vehicleMeetingPoint_version.xsd | 4 +- ..._vehicleParkingAreaInformation_version.xsd | 8 +- ..._vehicleServicePlaceAssignment_version.xsd | 10 +- .../netex_nm_mobilityService_version.xsd | 16 +- .../netex_nm_onlineService_version.xsd | 4 +- .../netex_nm_singleJourneyPath_version.xsd | 4 +- .../netex_nm_singleJourneyService_version.xsd | 4 +- 232 files changed, 2066 insertions(+), 1259 deletions(-) create mode 100644 scripts/assign-id-by-parent.py create mode 100644 scripts/xsd_analyzer_v5.py diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 2cf71e7a5..09b81c72a 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -310,7 +310,7 @@ true - + true false true @@ -880,7 +880,7 @@ false - + false false true diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index bed32e77e..a9e938f1b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -395,7 +395,7 @@ Lower deck true - + true true true @@ -997,7 +997,7 @@ Lower deck false - + false false true diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index e9a73f85e..43ad6f425 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1212,7 +1212,7 @@ The train reverse in the station and departs, oriented backwards to the right true - + true false true @@ -1345,7 +1345,7 @@ The train reverse in the station and departs, oriented backwards to the right true - + true false true @@ -3957,7 +3957,7 @@ The train reverse in the station and departs, oriented backwards to the right true - + true true diff --git a/examples/functions/line/Line_with_facilities.xml b/examples/functions/line/Line_with_facilities.xml index 6c0064e29..7ab8b11ef 100644 --- a/examples/functions/line/Line_with_facilities.xml +++ b/examples/functions/line/Line_with_facilities.xml @@ -56,7 +56,7 @@ true - + true unknown unknown @@ -90,7 +90,7 @@ true - + true unknown unknown diff --git a/examples/functions/simpleNetwork/Netex_LineClassification_1.xml b/examples/functions/simpleNetwork/Netex_LineClassification_1.xml index 62e4468b0..abfb81ee2 100644 --- a/examples/functions/simpleNetwork/Netex_LineClassification_1.xml +++ b/examples/functions/simpleNetwork/Netex_LineClassification_1.xml @@ -69,7 +69,7 @@ v1.1 revised ids true - + true diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml index a7e7eead9..ec4468049 100644 --- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml +++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml @@ -538,7 +538,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -577,7 +577,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -606,7 +606,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -643,7 +643,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -674,7 +674,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -703,7 +703,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -743,7 +743,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -774,7 +774,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -803,7 +803,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -840,7 +840,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -876,7 +876,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -905,7 +905,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -948,7 +948,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -1007,7 +1007,7 @@ Updated to give exampel of group of SItes false - + true true true @@ -1205,7 +1205,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -1409,7 +1409,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -1621,7 +1621,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -1833,7 +1833,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -2045,7 +2045,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -2180,7 +2180,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3252,7 +3252,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3291,7 +3291,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3330,7 +3330,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3369,7 +3369,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3408,7 +3408,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3447,7 +3447,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3486,7 +3486,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3525,7 +3525,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3629,7 +3629,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3668,7 +3668,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3706,7 +3706,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3745,7 +3745,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3784,7 +3784,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3823,7 +3823,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3862,7 +3862,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3901,7 +3901,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3940,7 +3940,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -3979,7 +3979,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -4018,7 +4018,7 @@ Updated to give exampel of group of SItes false - + false false true @@ -4127,7 +4127,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -4166,7 +4166,7 @@ Updated to give exampel of group of SItes true - + true true true @@ -4204,7 +4204,7 @@ Updated to give exampel of group of SItes true - + true true true diff --git a/examples/functions/site/Netex_21_Sites_Parking_2.xml b/examples/functions/site/Netex_21_Sites_Parking_2.xml index e96790974..73f41f1cd 100644 --- a/examples/functions/site/Netex_21_Sites_Parking_2.xml +++ b/examples/functions/site/Netex_21_Sites_Parking_2.xml @@ -161,7 +161,7 @@ v1.1 revised ids and corrections partial - + true true true diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index 1d854d1a3..b16dc9597 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -666,7 +666,7 @@ Changes true - + true true true @@ -788,7 +788,7 @@ Changes true - + true true @@ -1135,7 +1135,7 @@ Changes true - + true true true @@ -1201,7 +1201,7 @@ Changes true - + true true true @@ -1264,7 +1264,7 @@ Changes true - + true true true @@ -1368,7 +1368,7 @@ Changes true - + true true true @@ -1462,7 +1462,7 @@ Changes true - + true true true @@ -1536,7 +1536,7 @@ Changes true - + true true true @@ -1583,7 +1583,7 @@ Changes true - + true true true @@ -1626,7 +1626,7 @@ Changes true - + true true true @@ -1663,7 +1663,7 @@ Changes true - + true true true @@ -1700,7 +1700,7 @@ Changes true - + true true true @@ -1737,7 +1737,7 @@ Changes false - + false false true @@ -1759,7 +1759,7 @@ Changes false - + false false true @@ -1781,7 +1781,7 @@ Changes false - + false false true @@ -1803,7 +1803,7 @@ Changes true - + true true true @@ -1835,7 +1835,7 @@ Changes true - + true true true @@ -2268,7 +2268,7 @@ Changes false - + false false true @@ -2315,7 +2315,7 @@ Changes false - + false false true @@ -2361,7 +2361,7 @@ Changes false - + false false true @@ -2407,7 +2407,7 @@ Changes true - + true true true @@ -2473,7 +2473,7 @@ Changes true - + true true true @@ -2539,7 +2539,7 @@ Changes true - + true true true @@ -2854,7 +2854,7 @@ Changes true - + true true true @@ -2955,7 +2955,7 @@ Changes true - + true true true @@ -3009,7 +3009,7 @@ Changes false - + false false true @@ -3051,7 +3051,7 @@ Changes true - + true true true @@ -3105,7 +3105,7 @@ Changes false - + false false true @@ -3148,7 +3148,7 @@ Changes true - + true true true @@ -3208,7 +3208,7 @@ Changes false - + false false true @@ -3256,7 +3256,7 @@ Changes true - + true true true @@ -3316,7 +3316,7 @@ Changes false - + false false true @@ -3365,7 +3365,7 @@ Changes true - + true true true @@ -3425,7 +3425,7 @@ Changes false - + false false true @@ -3479,7 +3479,7 @@ Changes true - + true true true @@ -3539,7 +3539,7 @@ Changes false - + false false true @@ -3594,7 +3594,7 @@ Changes true - + true true true @@ -3648,7 +3648,7 @@ Changes false - + false false true @@ -3708,7 +3708,7 @@ Changes true - + true true true @@ -3762,7 +3762,7 @@ Changes false - + false false true @@ -3823,7 +3823,7 @@ Changes true - + true true true @@ -3881,7 +3881,7 @@ Changes false - + false false true @@ -3938,7 +3938,7 @@ Changes true - + true true true @@ -3996,7 +3996,7 @@ Changes false - + false false true @@ -4054,7 +4054,7 @@ Changes true - + true true true @@ -4112,7 +4112,7 @@ Changes false - + false false true @@ -4176,7 +4176,7 @@ Changes true - + true true true @@ -4234,7 +4234,7 @@ Changes false - + false false true @@ -4295,7 +4295,7 @@ Changes true - + true true true @@ -4343,7 +4343,7 @@ Changes false - + false false true @@ -4397,7 +4397,7 @@ Changes true - + true true true @@ -4445,7 +4445,7 @@ Changes false - + false false true @@ -4516,7 +4516,7 @@ Changes true - + true true true @@ -4621,7 +4621,7 @@ Changes true - + true true true @@ -4703,7 +4703,7 @@ Changes true - + true true true @@ -4777,7 +4777,7 @@ Changes true - + true true true @@ -4817,7 +4817,7 @@ Changes true - + false false true @@ -4906,7 +4906,7 @@ Changes true - + true true true @@ -4964,7 +4964,7 @@ Changes false - + false false true @@ -4997,7 +4997,7 @@ Changes false - + false false true @@ -5159,7 +5159,7 @@ Changes true - + true true true @@ -5231,7 +5231,7 @@ Changes true - + true true true @@ -5303,7 +5303,7 @@ Changes false - + false false true @@ -5363,7 +5363,7 @@ Changes false - + false false true @@ -5423,7 +5423,7 @@ Changes true - + true true true @@ -5438,7 +5438,7 @@ Changes true - + true true true @@ -5549,7 +5549,7 @@ Changes true - + true true true @@ -5655,7 +5655,7 @@ Changes true - + true true true @@ -5700,7 +5700,7 @@ Changes true - + true true true @@ -5745,7 +5745,7 @@ Changes true - + true true true @@ -5952,7 +5952,7 @@ Changes true - + true true true @@ -6097,7 +6097,7 @@ Changes true - + true true true @@ -6318,7 +6318,7 @@ Changes true - + true true true @@ -6767,7 +6767,7 @@ Changes true - + true true true @@ -6809,7 +6809,7 @@ Changes true - + true true true @@ -6851,7 +6851,7 @@ Changes true - + true true true @@ -6893,7 +6893,7 @@ Changes true - + true true true @@ -6935,7 +6935,7 @@ Changes true - + true true true @@ -6977,7 +6977,7 @@ Changes true - + true true true @@ -7018,7 +7018,7 @@ Changes true - + true true true @@ -7058,7 +7058,7 @@ Changes true - + true true true @@ -7102,7 +7102,7 @@ Changes true - + true true true @@ -7145,7 +7145,7 @@ Changes true - + true true true @@ -7188,7 +7188,7 @@ Changes true - + true true true @@ -7231,7 +7231,7 @@ Changes true - + true true true @@ -7275,7 +7275,7 @@ Changes true - + true true true @@ -7319,7 +7319,7 @@ Changes true - + true true true @@ -7360,7 +7360,7 @@ Changes true - + true true true @@ -7409,7 +7409,7 @@ Changes true - + true true true @@ -7452,7 +7452,7 @@ Changes true - + true true true @@ -7496,7 +7496,7 @@ Changes true - + true true true @@ -7540,7 +7540,7 @@ Changes true - + true true true @@ -7581,7 +7581,7 @@ Changes true - + true true true @@ -7625,7 +7625,7 @@ Changes true - + true true true @@ -7668,7 +7668,7 @@ Changes true - + true true true @@ -7717,7 +7717,7 @@ Changes true - + true true true @@ -7761,7 +7761,7 @@ Changes true - + true true true @@ -7802,7 +7802,7 @@ Changes true - + true true true @@ -7852,7 +7852,7 @@ Changes true - + true true true @@ -7896,7 +7896,7 @@ Changes true - + true true true @@ -7937,7 +7937,7 @@ Changes true - + true true true @@ -7983,7 +7983,7 @@ Changes true - + true true true @@ -8027,7 +8027,7 @@ Changes true - + true true true @@ -8068,7 +8068,7 @@ Changes true - + true true true @@ -8119,7 +8119,7 @@ Changes true - + true true true @@ -8161,7 +8161,7 @@ Changes true - + true true true diff --git a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml index 35a77e3ba..7731fbd70 100644 --- a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml +++ b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml @@ -150,7 +150,7 @@ B. Frames and grouping true - + true true diff --git a/examples/functions/stopPlace/Netex_02_Stops_StopPairOnStreet_1.xml b/examples/functions/stopPlace/Netex_02_Stops_StopPairOnStreet_1.xml index 2feb125da..96d9c859e 100644 --- a/examples/functions/stopPlace/Netex_02_Stops_StopPairOnStreet_1.xml +++ b/examples/functions/stopPlace/Netex_02_Stops_StopPairOnStreet_1.xml @@ -123,7 +123,7 @@ B. Frames and grouping true - + true true diff --git a/examples/functions/stopPlace/Netex_04_Stops_SimpleStation_1.xml b/examples/functions/stopPlace/Netex_04_Stops_SimpleStation_1.xml index 6e313d5e5..96003318a 100644 --- a/examples/functions/stopPlace/Netex_04_Stops_SimpleStation_1.xml +++ b/examples/functions/stopPlace/Netex_04_Stops_SimpleStation_1.xml @@ -340,7 +340,7 @@ B. Frames and grouping true - + true true true @@ -573,7 +573,7 @@ B. Frames and grouping true - + true true true @@ -609,7 +609,7 @@ B. Frames and grouping true - + true true true @@ -629,7 +629,7 @@ B. Frames and grouping true - + true true true diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml index 8ecd330a2..0f845a544 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml @@ -809,7 +809,7 @@ Changes true - + true true true @@ -931,7 +931,7 @@ Changes true - + true true @@ -1278,7 +1278,7 @@ Changes true - + true true true @@ -1338,7 +1338,7 @@ Changes true - + true true true @@ -1398,7 +1398,7 @@ Changes true - + true true true @@ -1486,7 +1486,7 @@ Changes true - + true true true @@ -1566,7 +1566,7 @@ Changes true - + true true true @@ -1640,7 +1640,7 @@ Changes true - + true true true @@ -1687,7 +1687,7 @@ Changes true - + true true true @@ -1730,7 +1730,7 @@ Changes true - + true true true @@ -1767,7 +1767,7 @@ Changes true - + true true true @@ -1804,7 +1804,7 @@ Changes true - + true true true @@ -1841,7 +1841,7 @@ Changes false - + false false true @@ -1863,7 +1863,7 @@ Changes false - + false false true @@ -1885,7 +1885,7 @@ Changes false - + false false true @@ -1907,7 +1907,7 @@ Changes true - + true true true @@ -1939,7 +1939,7 @@ Changes true - + true true true @@ -2372,7 +2372,7 @@ Changes false - + false false true @@ -2419,7 +2419,7 @@ Changes false - + false false true @@ -2465,7 +2465,7 @@ Changes false - + false false true @@ -2511,7 +2511,7 @@ Changes true - + true true true @@ -2577,7 +2577,7 @@ Changes true - + true true true @@ -2643,7 +2643,7 @@ Changes true - + true true true @@ -2958,7 +2958,7 @@ Changes true - + true true true @@ -3059,7 +3059,7 @@ Changes true - + true true true @@ -3118,7 +3118,7 @@ Changes false - + false false true @@ -3163,7 +3163,7 @@ Changes true - + true true true @@ -3222,7 +3222,7 @@ Changes false - + false false true @@ -3268,7 +3268,7 @@ Changes true - + true true true @@ -3334,7 +3334,7 @@ Changes false - + false false true @@ -3386,7 +3386,7 @@ Changes true - + true true true @@ -3452,7 +3452,7 @@ Changes false - + false false true @@ -3505,7 +3505,7 @@ Changes true - + true true true @@ -3571,7 +3571,7 @@ Changes false - + false false true @@ -3630,7 +3630,7 @@ Changes true - + true true true @@ -3696,7 +3696,7 @@ Changes false - + false false true @@ -3756,7 +3756,7 @@ Changes true - + true true true @@ -3815,7 +3815,7 @@ Changes false - + false false true @@ -3881,7 +3881,7 @@ Changes true - + true true true @@ -3940,7 +3940,7 @@ Changes false - + false false true @@ -4007,7 +4007,7 @@ Changes true - + true true true @@ -4070,7 +4070,7 @@ Changes false - + false false true @@ -4132,7 +4132,7 @@ Changes true - + true true true @@ -4195,7 +4195,7 @@ Changes false - + false false true @@ -4258,7 +4258,7 @@ Changes true - + true true true @@ -4321,7 +4321,7 @@ Changes false - + false false true @@ -4391,7 +4391,7 @@ Changes true - + true true true @@ -4454,7 +4454,7 @@ Changes false - + false false true @@ -4521,7 +4521,7 @@ Changes true - + true true true @@ -4573,7 +4573,7 @@ Changes false - + false false true @@ -4632,7 +4632,7 @@ Changes true - + true true true @@ -4684,7 +4684,7 @@ Changes false - + false false true @@ -4760,7 +4760,7 @@ Changes true - + true true true @@ -4860,7 +4860,7 @@ Changes true - + true true true @@ -4934,7 +4934,7 @@ Changes true - + true true true @@ -5005,7 +5005,7 @@ Changes true - + true true true @@ -5045,7 +5045,7 @@ Changes true - + false false true @@ -5134,7 +5134,7 @@ Changes true - + true true true @@ -5192,7 +5192,7 @@ Changes false - + false false true @@ -5225,7 +5225,7 @@ Changes false - + false false true @@ -5387,7 +5387,7 @@ Changes true - + true true true @@ -5467,7 +5467,7 @@ Changes true - + true true true @@ -5547,7 +5547,7 @@ Changes false - + false false true @@ -5613,7 +5613,7 @@ Changes false - + false false true @@ -5679,7 +5679,7 @@ Changes true - + true true true @@ -5694,7 +5694,7 @@ Changes true - + true true true @@ -5820,7 +5820,7 @@ Changes true - + true true true @@ -5928,7 +5928,7 @@ Changes true - + true true true @@ -5974,7 +5974,7 @@ Changes true - + true true true @@ -6020,7 +6020,7 @@ Changes true - + true true true @@ -6227,7 +6227,7 @@ Changes true - + true true true @@ -6396,7 +6396,7 @@ Changes true - + true true true @@ -6639,7 +6639,7 @@ Changes true - + true true true @@ -7089,7 +7089,7 @@ Changes true - + true true true @@ -7131,7 +7131,7 @@ Changes true - + true true true @@ -7173,7 +7173,7 @@ Changes true - + true true true @@ -7215,7 +7215,7 @@ Changes true - + true true true @@ -7257,7 +7257,7 @@ Changes true - + true true true @@ -7299,7 +7299,7 @@ Changes true - + true true true @@ -7340,7 +7340,7 @@ Changes true - + true true true @@ -7380,7 +7380,7 @@ Changes true - + true true true @@ -7424,7 +7424,7 @@ Changes true - + true true true @@ -7467,7 +7467,7 @@ Changes true - + true true true @@ -7510,7 +7510,7 @@ Changes true - + true true true @@ -7553,7 +7553,7 @@ Changes true - + true true true @@ -7597,7 +7597,7 @@ Changes true - + true true true @@ -7641,7 +7641,7 @@ Changes true - + true true true @@ -7682,7 +7682,7 @@ Changes true - + true true true @@ -7731,7 +7731,7 @@ Changes true - + true true true @@ -7774,7 +7774,7 @@ Changes true - + true true true @@ -7818,7 +7818,7 @@ Changes true - + true true true @@ -7862,7 +7862,7 @@ Changes true - + true true true @@ -7903,7 +7903,7 @@ Changes true - + true true true @@ -7947,7 +7947,7 @@ Changes true - + true true true @@ -7990,7 +7990,7 @@ Changes true - + true true true @@ -8039,7 +8039,7 @@ Changes true - + true true true @@ -8083,7 +8083,7 @@ Changes true - + true true true @@ -8124,7 +8124,7 @@ Changes true - + true true true @@ -8174,7 +8174,7 @@ Changes true - + true true true @@ -8218,7 +8218,7 @@ Changes true - + true true true @@ -8259,7 +8259,7 @@ Changes true - + true true true @@ -8305,7 +8305,7 @@ Changes true - + true true true @@ -8349,7 +8349,7 @@ Changes true - + true true true @@ -8390,7 +8390,7 @@ Changes true - + true true true @@ -8441,7 +8441,7 @@ Changes true - + true true true @@ -8483,7 +8483,7 @@ Changes true - + true true true diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index a54494a1a..c306718ff 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -802,7 +802,7 @@ Changes true - + true true true @@ -924,7 +924,7 @@ Changes true - + true true @@ -1298,7 +1298,7 @@ Changes true - + true true true @@ -1358,7 +1358,7 @@ Changes true - + true true true @@ -1418,7 +1418,7 @@ Changes true - + true true true @@ -1506,7 +1506,7 @@ Changes true - + true true true @@ -1573,7 +1573,7 @@ Changes true - + true true true @@ -1647,7 +1647,7 @@ Changes true - + true true true @@ -1694,7 +1694,7 @@ Changes true - + true true true @@ -1737,7 +1737,7 @@ Changes true - + true true true @@ -1774,7 +1774,7 @@ Changes true - + true true true @@ -1811,7 +1811,7 @@ Changes true - + true true true @@ -1848,7 +1848,7 @@ Changes false - + false false true @@ -1870,7 +1870,7 @@ Changes false - + false false true @@ -1892,7 +1892,7 @@ Changes false - + false false true @@ -1914,7 +1914,7 @@ Changes true - + true true true @@ -1946,7 +1946,7 @@ Changes true - + true true true @@ -2379,7 +2379,7 @@ Changes false - + false false true @@ -2426,7 +2426,7 @@ Changes false - + false false true @@ -2472,7 +2472,7 @@ Changes false - + false false true @@ -2518,7 +2518,7 @@ Changes true - + true true true @@ -2584,7 +2584,7 @@ Changes true - + true true true @@ -2650,7 +2650,7 @@ Changes true - + true true true @@ -2965,7 +2965,7 @@ Changes true - + true true true @@ -3066,7 +3066,7 @@ Changes true - + true true true @@ -3121,7 +3121,7 @@ Changes false - + false false true @@ -3163,7 +3163,7 @@ Changes true - + true true true @@ -3217,7 +3217,7 @@ Changes false - + false false true @@ -3260,7 +3260,7 @@ Changes true - + true true true @@ -3320,7 +3320,7 @@ Changes false - + false false true @@ -3368,7 +3368,7 @@ Changes true - + true true true @@ -3428,7 +3428,7 @@ Changes false - + false false true @@ -3477,7 +3477,7 @@ Changes true - + true true true @@ -3537,7 +3537,7 @@ Changes false - + false false true @@ -3591,7 +3591,7 @@ Changes true - + true true true @@ -3651,7 +3651,7 @@ Changes false - + false false true @@ -3706,7 +3706,7 @@ Changes true - + true true true @@ -3760,7 +3760,7 @@ Changes false - + false false true @@ -3820,7 +3820,7 @@ Changes true - + true true true @@ -3874,7 +3874,7 @@ Changes false - + false false true @@ -3935,7 +3935,7 @@ Changes true - + true true true @@ -3993,7 +3993,7 @@ Changes false - + false false true @@ -4050,7 +4050,7 @@ Changes true - + true true true @@ -4108,7 +4108,7 @@ Changes false - + false false true @@ -4166,7 +4166,7 @@ Changes true - + true true true @@ -4224,7 +4224,7 @@ Changes false - + false false true @@ -4288,7 +4288,7 @@ Changes true - + true true true @@ -4346,7 +4346,7 @@ Changes false - + false false true @@ -4407,7 +4407,7 @@ Changes true - + true true true @@ -4455,7 +4455,7 @@ Changes false - + false false true @@ -4509,7 +4509,7 @@ Changes true - + true true true @@ -4557,7 +4557,7 @@ Changes false - + false false true @@ -4630,7 +4630,7 @@ Changes true - + true true true @@ -4733,7 +4733,7 @@ Changes true - + true true true @@ -4807,7 +4807,7 @@ Changes true - + true true true @@ -4878,7 +4878,7 @@ Changes true - + true true true @@ -4918,7 +4918,7 @@ Changes true - + false false true @@ -5007,7 +5007,7 @@ Changes true - + true true true @@ -5065,7 +5065,7 @@ Changes false - + false false true @@ -5098,7 +5098,7 @@ Changes false - + false false true @@ -5260,7 +5260,7 @@ Changes true - + true true true @@ -5332,7 +5332,7 @@ Changes true - + true true true @@ -5404,7 +5404,7 @@ Changes false - + false false true @@ -5464,7 +5464,7 @@ Changes false - + false false true @@ -5524,7 +5524,7 @@ Changes true - + true true true @@ -5539,7 +5539,7 @@ Changes true - + true true true @@ -5651,7 +5651,7 @@ Changes true - + true true true @@ -5769,7 +5769,7 @@ Changes true - + true true true @@ -5815,7 +5815,7 @@ Changes true - + true true true @@ -5861,7 +5861,7 @@ Changes true - + true true true @@ -6068,7 +6068,7 @@ Changes true - + true true true @@ -6219,7 +6219,7 @@ Changes true - + true true true @@ -6470,7 +6470,7 @@ Changes true - + true true true @@ -6916,7 +6916,7 @@ Changes true - + true true true @@ -6958,7 +6958,7 @@ Changes true - + true true true @@ -7000,7 +7000,7 @@ Changes true - + true true true @@ -7042,7 +7042,7 @@ Changes true - + true true true @@ -7084,7 +7084,7 @@ Changes true - + true true true @@ -7126,7 +7126,7 @@ Changes true - + true true true @@ -7167,7 +7167,7 @@ Changes true - + true true true @@ -7207,7 +7207,7 @@ Changes true - + true true true @@ -7251,7 +7251,7 @@ Changes true - + true true true @@ -7294,7 +7294,7 @@ Changes true - + true true true @@ -7337,7 +7337,7 @@ Changes true - + true true true @@ -7380,7 +7380,7 @@ Changes true - + true true true @@ -7424,7 +7424,7 @@ Changes true - + true true true @@ -7468,7 +7468,7 @@ Changes true - + true true true @@ -7509,7 +7509,7 @@ Changes true - + true true true @@ -7558,7 +7558,7 @@ Changes true - + true true true @@ -7601,7 +7601,7 @@ Changes true - + true true true @@ -7645,7 +7645,7 @@ Changes true - + true true true @@ -7689,7 +7689,7 @@ Changes true - + true true true @@ -7730,7 +7730,7 @@ Changes true - + true true true @@ -7774,7 +7774,7 @@ Changes true - + true true true @@ -7817,7 +7817,7 @@ Changes true - + true true true @@ -7866,7 +7866,7 @@ Changes true - + true true true @@ -7910,7 +7910,7 @@ Changes true - + true true true @@ -7951,7 +7951,7 @@ Changes true - + true true true @@ -8001,7 +8001,7 @@ Changes true - + true true true @@ -8045,7 +8045,7 @@ Changes true - + true true true @@ -8086,7 +8086,7 @@ Changes true - + true true true @@ -8132,7 +8132,7 @@ Changes true - + true true true @@ -8176,7 +8176,7 @@ Changes true - + true true true @@ -8217,7 +8217,7 @@ Changes true - + true true true @@ -8268,7 +8268,7 @@ Changes true - + true true true @@ -8310,7 +8310,7 @@ Changes true - + true true true diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml index a3992ce18..cdc750340 100644 --- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml +++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml @@ -152,7 +152,7 @@ The Calendar is shown coded as Bravo Rd BRAV - + textToSpeech Bravo diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index 5fc9264b5..28fb84ab1 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -1143,7 +1143,7 @@ Q.4. Public holiday - Services do not run on a christams day - true - + true true true @@ -1193,7 +1193,7 @@ Q.4. Public holiday - Services do not run on a christams day - true - + true true true diff --git a/examples/standards/efp/NO_RailExample.xml b/examples/standards/efp/NO_RailExample.xml index acd03c233..152114358 100644 --- a/examples/standards/efp/NO_RailExample.xml +++ b/examples/standards/efp/NO_RailExample.xml @@ -317,14 +317,14 @@ The rail operators require the single tickets to be sold to a specific departure Alle tog for operatøren unntatt Bratsbergbanen AND - + true - + false @@ -339,12 +339,12 @@ The rail operators require the single tickets to be sold to a specific departure true AND - + - + diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index e76a83c8a..d08a66a92 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -5823,7 +5823,7 @@ true - + true true true diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml index 7ffe015a8..804a7658d 100644 --- a/examples/standards/gbfs/Netex_gbfs_exm1.xml +++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml @@ -360,27 +360,27 @@ GBFS file: geofencing_zones.json. - + forbiddenZone - + allUsesAllowed - + 10 - + - + - + mustPickUpAndDropOffAtSameStop true diff --git a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml index 6f799491c..c9fca3ead 100644 --- a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml +++ b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml @@ -346,7 +346,6 @@ is relevant for supplying an Integrator with partial data from multiple sources. PT1H Public note content - diff --git a/examples/standards/norway/other_resources/submodel-DestinationDisplay.xml b/examples/standards/norway/other_resources/submodel-DestinationDisplay.xml index 765eec831..494703e55 100644 --- a/examples/standards/norway/other_resources/submodel-DestinationDisplay.xml +++ b/examples/standards/norway/other_resources/submodel-DestinationDisplay.xml @@ -2,12 +2,12 @@ - + L23 Linje 23 Linje23 - + printed Linje 23 (buss) diff --git a/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml b/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml index 06646f56a..4d2d34187 100644 --- a/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml +++ b/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml @@ -2,14 +2,14 @@ - + pGNVZIcJ4ldFD 2017586184.321 2028559675.353 -2022783697.174 1915199261.096 -736940877.207 1690118703.459 204096403.425 -916241128.568 - + diff --git a/examples/standards/norway/other_resources/submodel-PointWithProjection.xml b/examples/standards/norway/other_resources/submodel-PointWithProjection.xml index b16d9b044..217125537 100644 --- a/examples/standards/norway/other_resources/submodel-PointWithProjection.xml +++ b/examples/standards/norway/other_resources/submodel-PointWithProjection.xml @@ -1,5 +1,5 @@ - + example -606731799.854 -1297377369.241 @@ -7,7 +7,7 @@ p-87oITOs - + diff --git a/examples/standards/norway/other_resources/submodel-ServiceFacilitySet.xml b/examples/standards/norway/other_resources/submodel-ServiceFacilitySet.xml index f698b84f4..373bee57b 100644 --- a/examples/standards/norway/other_resources/submodel-ServiceFacilitySet.xml +++ b/examples/standards/norway/other_resources/submodel-ServiceFacilitySet.xml @@ -1,5 +1,5 @@ - + reservation standing freeSeating unknown normal @@ -9,7 +9,7 @@ baggageStorage cyclesAllowedInCarriage noGroupsAllowed wheelchairOnlyReservations - + example unknown seating @@ -24,7 +24,7 @@ - + unknown overnightStayOnboardAllowed P2D diff --git a/examples/standards/norway/other_resources/submodel-Zone.xml b/examples/standards/norway/other_resources/submodel-Zone.xml index 188a85d10..ac9dc4700 100644 --- a/examples/standards/norway/other_resources/submodel-Zone.xml +++ b/examples/standards/norway/other_resources/submodel-Zone.xml @@ -1,5 +1,5 @@ - + 12345.67 diff --git a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml index 1e2bfc9bd..80a1f513d 100644 --- a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml +++ b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml @@ -23,7 +23,7 @@ Eksempelet tar utgangspunkt i offisielle NeTEx-XML eksempler og viser et enklest true - + true true diff --git a/examples/standards/norway/stops/BasicStopPlace-two-quays_example.xml b/examples/standards/norway/stops/BasicStopPlace-two-quays_example.xml index 97a60792d..5498bf1dc 100644 --- a/examples/standards/norway/stops/BasicStopPlace-two-quays_example.xml +++ b/examples/standards/norway/stops/BasicStopPlace-two-quays_example.xml @@ -44,7 +44,7 @@ Frames (gruppering) true - + true true diff --git a/examples/standards/norway/stops/BasicStopPlace_example.xml b/examples/standards/norway/stops/BasicStopPlace_example.xml index 6b27f8094..d070f77ef 100644 --- a/examples/standards/norway/stops/BasicStopPlace_example.xml +++ b/examples/standards/norway/stops/BasicStopPlace_example.xml @@ -24,7 +24,7 @@ Eksempelet tar utgangspunkt i offisielle NeTEx-XML eksempler og viser et enklest true - + true true diff --git a/examples/standards/norway/stops/OsloS_station_example.xml b/examples/standards/norway/stops/OsloS_station_example.xml index 7a99043a6..400029db3 100644 --- a/examples/standards/norway/stops/OsloS_station_example.xml +++ b/examples/standards/norway/stops/OsloS_station_example.xml @@ -194,7 +194,7 @@ true - + true true true @@ -256,7 +256,7 @@ true - + true true @@ -316,7 +316,7 @@ true - + true true @@ -378,7 +378,7 @@ true - + true true true diff --git a/examples/standards/norway/stops/StopPlace-with-equipment-and-parking_example.xml b/examples/standards/norway/stops/StopPlace-with-equipment-and-parking_example.xml index 0c61bc5fd..e20cbd474 100644 --- a/examples/standards/norway/stops/StopPlace-with-equipment-and-parking_example.xml +++ b/examples/standards/norway/stops/StopPlace-with-equipment-and-parking_example.xml @@ -70,7 +70,7 @@ true - + true true diff --git a/examples/standards/norway/stops/submodel-MonomodalStopPlace.xml b/examples/standards/norway/stops/submodel-MonomodalStopPlace.xml index e6ccd92a2..5dd5afcd2 100644 --- a/examples/standards/norway/stops/submodel-MonomodalStopPlace.xml +++ b/examples/standards/norway/stops/submodel-MonomodalStopPlace.xml @@ -19,10 +19,10 @@ This example desceribes a simple on-street stop place with quays, but without sp - + true - + true true true @@ -72,7 +72,7 @@ This example desceribes a simple on-street stop place with quays, but without sp 0 - + RoadNumber RoadName diff --git a/examples/standards/norway/stops/submodel-StationWithEquipment.xml b/examples/standards/norway/stops/submodel-StationWithEquipment.xml index fba26bb45..2f05791b8 100644 --- a/examples/standards/norway/stops/submodel-StationWithEquipment.xml +++ b/examples/standards/norway/stops/submodel-StationWithEquipment.xml @@ -2,7 +2,7 @@ - + example Station example @@ -14,10 +14,10 @@ This example contains a autogenerated example of a station with two levels, an a 1106172778.501 - + false - + false unknown unknown @@ -27,11 +27,11 @@ This example contains a autogenerated example of a station with two levels, an a - + luggageEncumbered suitable - + heartCondition notSuitable @@ -55,11 +55,11 @@ This example contains a autogenerated example of a station with two levels, an a - - + + false - + false false @@ -67,11 +67,11 @@ This example contains a autogenerated example of a station with two levels, an a false - - + + unknown - + true true partial @@ -81,7 +81,7 @@ This example contains a autogenerated example of a station with two levels, an a - + automaticDoor true @@ -102,11 +102,11 @@ This example contains a autogenerated example of a station with two levels, an a airport false - + wellLit true - + pavingStones true @@ -116,7 +116,7 @@ This example contains a autogenerated example of a station with two levels, an a - + all indoors unknown @@ -124,7 +124,7 @@ This example contains a autogenerated example of a station with two levels, an a true - + -113.148 @@ -135,7 +135,7 @@ This example contains a autogenerated example of a station with two levels, an a - + 10 railings false @@ -145,7 +145,7 @@ This example contains a autogenerated example of a station with two levels, an a - + rail bus true 4 @@ -163,7 +163,7 @@ This example contains a autogenerated example of a station with two levels, an a - + meetingPoint diff --git a/examples/standards/norway/validity/submodel-AvailabilityConditionAvailable.xml b/examples/standards/norway/validity/submodel-AvailabilityConditionAvailable.xml index b81567592..0a86da379 100644 --- a/examples/standards/norway/validity/submodel-AvailabilityConditionAvailable.xml +++ b/examples/standards/norway/validity/submodel-AvailabilityConditionAvailable.xml @@ -3,20 +3,20 @@ Example of AvailabilityCondition: - using operatingDays --> - + false - + 2016-09-05 05:00:00.000 PT20H - + 2016-09-06 05:00:00.000 PT20H - + 2016-09-07 05:00:00.000 PT20H diff --git a/examples/standards/norway/validity/submodel-AvailabilityConditionUnavailable.xml b/examples/standards/norway/validity/submodel-AvailabilityConditionUnavailable.xml index 3677277ec..14dc2be55 100644 --- a/examples/standards/norway/validity/submodel-AvailabilityConditionUnavailable.xml +++ b/examples/standards/norway/validity/submodel-AvailabilityConditionUnavailable.xml @@ -3,12 +3,12 @@ Example of AvailabilityCondition: - using dayTypes --> - + 2016-09-05T05:00:00Z 2016-12-08T01:00:00Z true - + Weekdays Mon, Tue, Wed, Thu, Fri @@ -19,7 +19,7 @@ Example of AvailabilityCondition: - + Weekend Sat, Sun diff --git a/examples/standards/norway/vehicles/submodel-CompoundTrain.xml b/examples/standards/norway/vehicles/submodel-CompoundTrain.xml index 56662f324..f3e2edf9b 100644 --- a/examples/standards/norway/vehicles/submodel-CompoundTrain.xml +++ b/examples/standards/norway/vehicles/submodel-CompoundTrain.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/examples/standards/norway/vehicles/submodel-Train.xml b/examples/standards/norway/vehicles/submodel-Train.xml index 5ad9a2972..5934a7ec1 100644 --- a/examples/standards/norway/vehicles/submodel-Train.xml +++ b/examples/standards/norway/vehicles/submodel-Train.xml @@ -1,14 +1,14 @@ - + 1 normal - + NSB Type 72 - + carriage standardClass diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml index eb3b17c12..919a164b7 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml @@ -589,7 +589,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ true - + 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 4b774fb85..d91d9ac7a 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 @@ -51988,13 +51988,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML - + billets online pas valide - + Online Ticket nicht gueltig - + Online Ticket not valid @@ -52007,13 +52007,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Für die Busstrecke Nürnberg - Praha gelten die gesetzlichen Vorschriften der jeweiligen Länder für die Personen- beförderung auf der Straße. - + Pour les lignes de bus Nürnberg - Praha, les dispositions légales de chaque pays pour le transport de voyageurs sur la route s'appliquent. - + Für die Busstrecke Nürnberg - Praha gelten die gesetzlichenVorschriften der jeweiligen Länder für die Personen-beförderung auf der Straße. - + For the bus route Nürnberg _ Praha, the legal regulations for passenger transportation by road of the respective countries are to be applied @@ -52026,13 +52026,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 6 bis inklusive 11 Jahren Die Mitnahme von Reisegepäck ist nicht möglich. RAILPLUS nicht zugelassen - + Les enfants âgés de 6 à 11 ans inclus L'emport de bagages n'est pas possible. RAILplus pas autorisé - + Kinder von 6 bis inklusive 11 JahrenDie Mitnahme von Reisegepäck ist nicht möglich.RAILPLUS nicht zugelassen - + Children between 6 and including 11 years The transportation of baggage is not possible. RAILPLUS not allowed @@ -52045,13 +52045,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 4 bis inklusive 14 Jahren Reservierungspflicht Servicetelefon +49 461 864 602 verkehrt voraussichtlich von April bis Oktober - + Les enfants âgés de 4 à 14 ans inclus Réservation obligatoire téléphone de service +49 461 864 602 ne circule qu'à partir d'avril jusqu'au octobre - + Kinder von 4 bis inklusive 14 JahrenReservierungspflichtServicetelefon +49 461 864 602verkehrt voraussichtlich von April bis Oktober - + Children between 4 and including 14 years Reservation is mandatory service telephone +49 461 864 602 goes expected from April to October @@ -52064,13 +52064,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 4 bis inklusive 14 Jahren RAILPLUS nicht zugelassen - + Les enfants âgés de 4 à 14 ans inclusRAILplus pas autorisé - + Kinder von 4 bis inklusive 14 JahrenRAILPLUS nicht zugelassen - + Children between 4 and including 15 years RAILPLUS not allowed @@ -52083,13 +52083,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML keine Kinderermäßigung RAILPLUS nicht zugelassen - + Pas de réduction pour les enfantsRAILplus pas autorisé - + keine KinderermäßigungRAILPLUS nicht zugelassen - + Children between 4 and including 16 RAILPLUS not allowed 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 0186da0d0..359e6938c 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 @@ -59111,13 +59111,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML - + billets online pas valide - + Online Ticket nicht gueltig - + Online Ticket not valid @@ -59132,13 +59132,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Für die Busstrecke Nürnberg - Praha gelten die gesetzlichen Vorschriften der jeweiligen Länder für die Personen- beförderung auf der Straße. - + Pour les lignes de bus Nürnberg - Praha, les dispositions légales de chaque pays pour le transport de voyageurs sur la route s'appliquent. - + Für die Busstrecke Nürnberg - Praha gelten die gesetzlichenVorschriften der jeweiligen Länder für die Personen-beförderung auf der Straße. - + For the bus route Nürnberg _ Praha, the legal regulations for passenger transportation by road of the respective countries are to be applied @@ -59153,13 +59153,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 6 bis inklusive 11 Jahren Die Mitnahme von Reisegepäck ist nicht möglich. RAILPLUS nicht zugelassen - + Les enfants âgés de 6 à 11 ans inclus L'emport de bagages n'est pas possible. RAILplus pas autorisé - + Kinder von 6 bis inklusive 11 JahrenDie Mitnahme von Reisegepäck ist nicht möglich.RAILPLUS nicht zugelassen - + Children between 6 and including 11 years The transportation of baggage is not possible. RAILPLUS not allowed @@ -59174,13 +59174,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 4 bis inklusive 14 Jahren Reservierungspflicht Servicetelefon +49 461 864 602 verkehrt voraussichtlich von April bis Oktober - + Les enfants âgés de 4 à 14 ans inclus Réservation obligatoire téléphone de service +49 461 864 602 ne circule qu'à partir d'avril jusqu'au octobre - + Kinder von 4 bis inklusive 14 JahrenReservierungspflichtServicetelefon +49 461 864 602verkehrt voraussichtlich von April bis Oktober - + Children between 4 and including 14 years Reservation is mandatory service telephone +49 461 864 602 goes expected from April to October @@ -59195,13 +59195,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML Kinder von 4 bis inklusive 14 Jahren RAILPLUS nicht zugelassen - + Les enfants âgés de 4 à 14 ans inclusRAILplus pas autorisé - + Kinder von 4 bis inklusive 14 JahrenRAILPLUS nicht zugelassen - + Children between 4 and including 15 years RAILPLUS not allowed @@ -59216,13 +59216,13 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML keine Kinderermäßigung RAILPLUS nicht zugelassen - + Pas de réduction pour les enfantsRAILplus pas autorisé - + keine KinderermäßigungRAILPLUS nicht zugelassen - + Children between 4 and including 16 RAILPLUS not allowed 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 f0c1ba821..f4dd3cfd0 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 @@ -4040,16 +4040,16 @@ PCGO1080XXX0003 FIP OCIO - + bla - + bla - + bla - + bla 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 c0157229f..3dbbdf7bb 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 @@ -11409,16 +11409,16 @@ PCZO0071XXX0143 Companion blind/weelchair - + Accompagn. aveugle/faut. roulant - + Begleiter - + Companion blind/weelchair - + Companion blind/weelchair @@ -11427,16 +11427,16 @@ PCZO0071XXX0143 Valid for passholders - + Réservé aux titulaires d_un - - Gültig für passholders Valid + + Gültig für passholders - + Valid for passholders - + Valid for passholders @@ -11445,16 +11445,16 @@ PCZO0071XXX0143 Unknown paxtype - + Unknown paxtype - + Unknown paxtype - + Unknown paxtype - + Unknown paxtype diff --git a/examples/standards/tap_tsi/TAP-TSDUPD-example1.xml b/examples/standards/tap_tsi/TAP-TSDUPD-example1.xml index ec6ddf1c3..d184850b6 100644 --- a/examples/standards/tap_tsi/TAP-TSDUPD-example1.xml +++ b/examples/standards/tap_tsi/TAP-TSDUPD-example1.xml @@ -290,7 +290,7 @@ TapTsi B.4.7009 true - + true diff --git a/examples/standards/tap_tsi/TAP-TSDUPD-example2.1-Hilleroed.xml b/examples/standards/tap_tsi/TAP-TSDUPD-example2.1-Hilleroed.xml index 1765dcf32..585200ed3 100644 --- a/examples/standards/tap_tsi/TAP-TSDUPD-example2.1-Hilleroed.xml +++ b/examples/standards/tap_tsi/TAP-TSDUPD-example2.1-Hilleroed.xml @@ -212,7 +212,7 @@ The bus terminal in front of the station is a major hub for transportation throu true - + true @@ -693,7 +693,7 @@ The bus terminal in front of the station is a major hub for transportation throu true - + true diff --git a/examples/standards/tap_tsi/TAP-TSDUPD-example2.2-Milano.xml b/examples/standards/tap_tsi/TAP-TSDUPD-example2.2-Milano.xml index 6679f2f25..c3ec8a550 100644 --- a/examples/standards/tap_tsi/TAP-TSDUPD-example2.2-Milano.xml +++ b/examples/standards/tap_tsi/TAP-TSDUPD-example2.2-Milano.xml @@ -136,7 +136,7 @@ UIC_Code1 UIC_Code2 Duration Duration_Unit 13 6_footPath_or_14_Hierarchy Attribu true - + true diff --git a/examples/standards/tap_tsi/TAP-TSDUPD-example2.xml b/examples/standards/tap_tsi/TAP-TSDUPD-example2.xml index 67271abac..530a3851d 100644 --- a/examples/standards/tap_tsi/TAP-TSDUPD-example2.xml +++ b/examples/standards/tap_tsi/TAP-TSDUPD-example2.xml @@ -136,7 +136,7 @@ The bus terminal in front of the station is a major hub for transportation throu true - + true @@ -386,7 +386,7 @@ The bus terminal in front of the station is a major hub for transportation throu true - + true @@ -709,7 +709,7 @@ The bus terminal in front of the station is a major hub for transportation throu true - + true diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml index 44dbb1b10..3436d78f7 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -117094,7 +117094,7 @@ 7380 - + P0Y0M0DT0H18M0S @@ -117111,7 +117111,7 @@ 540 - + P0Y0M0DT0H5M0S @@ -117128,7 +117128,7 @@ 6420 - + P0Y0M0DT0H14M0S @@ -117145,7 +117145,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117162,7 +117162,7 @@ 1089 - + P0Y0M0DT0H4M0S @@ -117179,7 +117179,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117196,7 +117196,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117213,7 +117213,7 @@ 7030 - + P0Y0M0DT0H17M0S @@ -117230,7 +117230,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117247,7 +117247,7 @@ 1089 - + P0Y0M0DT0H4M0S @@ -117264,7 +117264,7 @@ 5800 - + P0Y0M0DT0H13M0S @@ -117281,7 +117281,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117298,7 +117298,7 @@ 5150 - + P0Y0M0DT0H11M0S @@ -117315,7 +117315,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117332,7 +117332,7 @@ 2650 - + P0Y0M0DT0H9M0S @@ -117349,7 +117349,7 @@ 8600 - + P0Y0M0DT0H15M0S @@ -117366,7 +117366,7 @@ 4700 - + P0Y0M0DT0H10M0S @@ -117383,7 +117383,7 @@ 4700 - + P0Y0M0DT0H10M0S @@ -117400,7 +117400,7 @@ 68 - + P0Y0M0DT0H2M0S @@ -117417,7 +117417,7 @@ 68 - + P0Y0M0DT0H2M0S @@ -117434,7 +117434,7 @@ 68 - + P0Y0M0DT0H2M0S @@ -117451,7 +117451,7 @@ 65 - + P0Y0M0DT0H0M30S @@ -117468,7 +117468,7 @@ 350 - + P0Y0M0DT0H1M0S @@ -117485,7 +117485,7 @@ 3316 - + P0Y0M0DT0H13M0S @@ -117502,7 +117502,7 @@ 720 - + P0Y0M0DT0H5M0S @@ -117519,7 +117519,7 @@ 2600 - + P0Y0M0DT0H8M0S @@ -117536,7 +117536,7 @@ 2500 - + P0Y0M0DT0H9M0S @@ -117553,7 +117553,7 @@ 2660 - + P0Y0M0DT0H8M0S @@ -117570,7 +117570,7 @@ 2660 - + P0Y0M0DT0H8M0S @@ -117587,7 +117587,7 @@ 3850 - + P0Y0M0DT0H12M0S @@ -117604,7 +117604,7 @@ 2500 - + P0Y0M0DT0H11M0S @@ -117621,7 +117621,7 @@ 5400 - + P0Y0M0DT0H15M0S @@ -117638,7 +117638,7 @@ 3666 - + P0Y0M0DT0H14M0S @@ -117655,7 +117655,7 @@ 3000 - + P0Y0M0DT0H9M0S @@ -117672,7 +117672,7 @@ 640 - + P0Y0M0DT0H5M0S @@ -117689,7 +117689,7 @@ 640 - + P0Y0M0DT0H5M0S @@ -117747,7 +117747,7 @@ INNS_L03>INNS auf L11>Haid - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117785,7 +117785,7 @@ INNS_L11>INNS auf L03>BBN - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117823,7 +117823,7 @@ INNS_L03>INNS auf L11>Haid - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117861,7 +117861,7 @@ INNS_L03>INNS auf L11>Haid - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117899,7 +117899,7 @@ INNS_L11>INNS auf L03>BBN - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117937,7 +117937,7 @@ INNS_L11>INNS auf L03>BBN - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -117975,7 +117975,7 @@ MUZ_L03>MUZ auf L11>StG - + P0Y0M0DT0H4M0S P0Y0M0DT0H2M0S @@ -118014,7 +118014,7 @@ MUZ_L11>MUZ auf L03>ALI - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118053,7 +118053,7 @@ MUZ_L11>MUZ auf L03>ALI - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118092,7 +118092,7 @@ MUZ_L11>MUZ auf L03>ALI - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118131,7 +118131,7 @@ MUZ_L03>MUZ auf L14>StG - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118170,7 +118170,7 @@ MUZ_L03>MUZ auf L14>StG - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118209,7 +118209,7 @@ MUZ_L03>MUZ auf L14>StG - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -118248,7 +118248,7 @@ MUZ_L14>MUZ auf L03>ALI - + P0Y0M0DT0H3M0S P0Y0M0DT0H2M0S @@ -118286,7 +118286,7 @@ MUZ_L14>MUZ auf L03>ALI - + P0Y0M0DT0H3M0S P0Y0M0DT0H2M0S @@ -118326,7 +118326,7 @@ OLIF - + P0Y0M0DT0H0M10S P0Y0M0DT0H0M10S diff --git a/scripts/assign-id-by-parent.py b/scripts/assign-id-by-parent.py new file mode 100644 index 000000000..6d5f32239 --- /dev/null +++ b/scripts/assign-id-by-parent.py @@ -0,0 +1,34 @@ +from lxml import etree +from pathlib import Path +import sys + +for file_name in sys.argv[2:]: + # Bestandspad (pas aan indien nodig) + input_file = Path(file_name) + + # Namespace map + ns = {"n": "http://www.netex.org.uk/netex"} + + # Parser met behoud van whitespace + parser = etree.XMLParser(remove_blank_text=False) + tree = etree.parse(str(input_file), parser) + root = tree.getroot() + + # Zoek alle AccessibilityLimitation elementen zonder id + for elem in root.xpath(f"//n:{sys.argv[1]}[not(@id)]", namespaces=ns): + parent = elem.getparent() + if parent is not None: + if "id" in parent.attrib: + elem.set("id", parent.attrib["id"]) + elem.set("version", parent.attrib["version"]) + else: + parent = parent.getparent() + if parent is not None and "id" in parent.attrib: + elem.set("id", parent.attrib["id"]) + elem.set("version", parent.attrib["version"]) + + + + + # Schrijf bestand in-place terug, behoud exacte structuur + tree.write(str(input_file), encoding="utf-8", xml_declaration=True, pretty_print=False) diff --git a/scripts/dependencygraph.py b/scripts/dependencygraph.py index 6a9f5f49f..32a35a669 100644 --- a/scripts/dependencygraph.py +++ b/scripts/dependencygraph.py @@ -103,6 +103,12 @@ def _extract_elements(self, root: ET.Element) -> None: name = elem.get('name') if not name: continue + + substitutionGroup = elem.get('substitutionGroup', False) + type_ref = elem.get('type', False) + complex_type = elem.find(f"{{{self.XSD_NS}}}complexType") + if not type_ref and not substitutionGroup and complex_type is None: + continue abstract = elem.get('abstract', False) if abstract: @@ -485,8 +491,7 @@ def main(): if shown >= 3: break - print(analyzer._get_type_chain('PassengerEquipment')) - print(analyzer._get_type_chain('PassengerEquipmentRef')) + print(analyzer._get_type_chain('LinkRef')) if __name__ == "__main__": main() diff --git a/scripts/nameofclass.py b/scripts/nameofclass.py index 97f96d56e..fd7fc77f1 100644 --- a/scripts/nameofclass.py +++ b/scripts/nameofclass.py @@ -189,6 +189,9 @@ def update_nameofclass_ref_attributes( ): # Workaround parent_ref_name = "" + elif not l[0].startswith(ref_name) and not l[0].endswith('_InlineType'): + parent_ref_name = l[0] + elif l[1] == ref_name: # Workaround: We don't want circular either. parent_ref_name = l[2] @@ -204,6 +207,13 @@ def update_nameofclass_ref_attributes( if parent_ref_name == '': print(ref_name, l) + # print(ref_name, parent_ref_name, l) + # if ref_name == 'LinkRefStructure': + # print(ref_name, parent_ref_name, l) + # print(natural_class) + # print(analyzer._get_type_chain(natural_class + "Ref")) + # raise + restriction = etree.SubElement( new_simple_type, "{http://www.w3.org/2001/XMLSchema}restriction", diff --git a/scripts/xsd_analyzer_v5.py b/scripts/xsd_analyzer_v5.py new file mode 100644 index 000000000..150a86b31 --- /dev/null +++ b/scripts/xsd_analyzer_v5.py @@ -0,0 +1,759 @@ +""" +Namespaced XSD Schema Dependency Analyzer +Properly tracks elements and types with namespaces, builds complete dependency graphs, +and provides queryable in-memory interface. +""" + +# TODO implement the sub elements originating from groups + +import xml.etree.ElementTree as ET +from pathlib import Path +from typing import Dict, Set, List, Tuple, Optional, Any +from dataclasses import dataclass, field +from collections import defaultdict +import json + + +# Type alias for namespaced identifiers +QName = Tuple[str, str] # (namespace, local_name) + + +@dataclass +class AttributeDef: + """Represents an attribute declaration on a complex type.""" + name: str + type_ref: Optional[QName] = None + use: str = "optional" # 'required' or 'optional' + default: Optional[str] = None + fixed: Optional[str] = None + defined_in: Optional[QName] = None # the complexType qname where this attribute is declared + + +@dataclass +class SubElementDef: + """Represents a local element declaration inside a complex type.""" + name: str + type_ref: Optional[QName] = None + min_occurs: Optional[str] = None + max_occurs: Optional[str] = None + defined_in: Optional[QName] = None + + +@dataclass +class ComplexType: + """Represents a complex type definition.""" + namespace: str + name: str + base_type: Optional[QName] = None + derivation_method: Optional[str] = None # 'extension' or 'restriction' + attributes: Dict[str, AttributeDef] = field(default_factory=dict) + subelements: Dict[str, SubElementDef] = field(default_factory=dict) + + def qname(self) -> QName: + return (self.namespace, self.name) + + +@dataclass +class Element: + """Represents a top-level element definition.""" + namespace: str + name: str + type_ref: Optional[QName] = None + is_abstract: bool = False + substitution_group: Optional[QName] = None + + def qname(self) -> QName: + return (self.namespace, self.name) + + +class XSDSchemaAnalyzer: + """ + Analyzes XSD schemas with proper namespace handling. + Provides queryable interface for dependency analysis. + """ + + XSD_NS = "http://www.w3.org/2001/XMLSchema" + + def __init__(self): + # Core storage + self.elements: Dict[QName, Element] = {} + self.complex_types: Dict[QName, ComplexType] = {} + + # Namespace prefix mappings per file (for resolution) + self.ns_prefixes: Dict[str, Dict[str, str]] = {} # filepath -> {prefix: uri} + + # Computed relationships (built after parsing) + self._type_descendants: Dict[QName, Set[QName]] = defaultdict(set) + self._type_ancestors: Dict[QName, List[QName]] = {} + self._element_descendants: Dict[QName, Set[QName]] = defaultdict(set) + self._element_ancestors: Dict[QName, List[QName]] = {} + self._substitution_members: Dict[QName, Set[QName]] = defaultdict(set) + + self._built = False + + 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"): + if 'xsd/netex' in str(xsd_file) or 'xsd/gml' in str(xsd_file): + self._parse_schema_file(xsd_file) + + print(f"Parsed {len(self.elements)} elements and {len(self.complex_types)} complex types") + + def _parse_schema_file(self, filepath: Path) -> None: + """Parse a single XSD schema file.""" + try: + tree = ET.parse(filepath) + root = tree.getroot() + + # Extract namespace mappings from root element + ns_map = self._extract_namespace_map(root) + self.ns_prefixes[str(filepath)] = ns_map + + # Get target namespace + target_ns = root.get('targetNamespace', '') + target_prefix = self._get_prefix_for_namespace(ns_map, target_ns) + + if not target_prefix: + print(f"Warning: No target namespace prefix found in {filepath}") + return + + # Parse complex types + self._extract_complex_types(root, target_prefix, ns_map) + + # Parse elements + self._extract_elements(root, target_prefix, ns_map) + + except Exception as e: + print(f"Error parsing {filepath}: {e}") + + def _extract_namespace_map(self, root: ET.Element) -> Dict[str, str]: + """Extract namespace prefix to URI mappings from schema root.""" + # Note: for your NetEx files we previously used a fixed map; keep it but try to extract real mappings if present. + ns_map = {'gml': 'http://www.opengis.net/gml/3.2', 'netex': 'http://www.netex.org.uk/netex', 'siri': 'http://www.siri.org.uk/siri' } + + # Try to read declared xmlns attributes (ElementTree stores them in root.attrib with full names) + # For safety keep the default entries above and only override if discovered. + for attr_name, attr_value in root.attrib.items(): + if attr_name == 'xmlns': + ns_map[''] = attr_value + elif attr_name.startswith('xmlns:'): + prefix = attr_name.split(':', 1)[1] + ns_map[prefix] = attr_value + + # Also try to capture default namespace using tag + if root.tag.startswith('{'): + default_ns = root.tag.split('}')[0].strip('{') + if default_ns: + # Only set default if it's not already present as a known prefix + ns_map.setdefault('', default_ns) + + return ns_map + + def _get_prefix_for_namespace(self, ns_map: Dict[str, str], namespace: str) -> Optional[str]: + """Get the prefix for a given namespace URI.""" + for prefix, uri in ns_map.items(): + if uri == namespace: + # Prefer named prefixes over default namespace + if prefix: + return prefix + + # If no named prefix found, check if it's the default namespace + for prefix, uri in ns_map.items(): + if uri == namespace: + return prefix if prefix else 'default' + + return None + + def _resolve_qname(self, qname_str: str, ns_map: Dict[str, str], target_prefix: str) -> Optional[QName]: + """ + Resolve a QName string to (namespace_prefix, local_name). + Returns None if the QName is a built-in XSD type. + """ + if not qname_str: + return None + + if ':' in qname_str: + prefix, local_name = qname_str.split(':', 1) + # Skip XSD built-in types + if prefix in ('xs', 'xsd'): + return None + return (prefix, local_name) + else: + # No prefix means target namespace + return (target_prefix, qname_str) + + def _parse_attributes_from_element(self, xml_elem: ET.Element, ns_map: Dict[str, str], target_prefix: str, defined_in_qname: QName) -> Dict[str, AttributeDef]: + """ + Parse xsd:attribute nodes under xml_elem (not global attribute refs). + Returns dict name -> AttributeDef (per this defining complex type). + """ + attrs: Dict[str, AttributeDef] = {} + for attr_el in xml_elem.findall(f".//{{{self.XSD_NS}}}attribute"): + # Support both 'name' and 'ref' + name = attr_el.get('name') + ref = attr_el.get('ref') + if ref and not name: + # If it's a reference to a global attribute, resolve name from ref + resolved = self._resolve_qname(ref, ns_map, target_prefix) + if resolved: + name = resolved[1] + else: + # Built-in or unresolved; take local part + name = ref.split(':')[-1] + + if not name: + continue + + # type can be specified or inherited via ref (we don't resolve global attribute definitions) + type_str = attr_el.get('type', '') + type_ref = self._resolve_qname(type_str, ns_map, target_prefix) if type_str else None + + use = attr_el.get('use', 'optional') + default = attr_el.get('default') + fixed = attr_el.get('fixed') + + attr_def = AttributeDef( + name=name, + type_ref=type_ref, + use=use, + default=default, + fixed=fixed, + defined_in=defined_in_qname + ) + + attrs[name] = attr_def + + return attrs + + + def _parse_subelements_from_element(self, xml_elem: ET.Element, ns_map: Dict[str, str], + target_prefix: str, defined_in_qname: QName) -> Dict[str, SubElementDef]: + subs: Dict[str, SubElementDef] = {} + for sub_el in xml_elem.findall(f".//{{{self.XSD_NS}}}element"): + name = sub_el.get('name') + if not name: + continue + if name == 'ServiceJourneyPatternType': + print(name) + type_str = sub_el.get('type', '') + type_ref = self._resolve_qname(type_str, ns_map, target_prefix) if type_str else None + sub_def = SubElementDef( + name=name, + type_ref=type_ref, + min_occurs=sub_el.get('minOccurs'), + max_occurs=sub_el.get('maxOccurs'), + defined_in=defined_in_qname + ) + subs[name] = sub_def + return subs + + + def _extract_complex_types(self, root: ET.Element, target_prefix: str, ns_map: Dict[str, str]) -> None: + """Extract all complex type definitions.""" + for ctype in root.findall(f".//{{{self.XSD_NS}}}complexType"): + name = ctype.get('name') + if not name: + continue + + base_type = None + derivation_method = None + + # Check for extension + extension = ctype.find(f".//{{{self.XSD_NS}}}extension") + if extension is not None: + base_str = extension.get('base', '') + base_type = self._resolve_qname(base_str, ns_map, target_prefix) + derivation_method = 'extension' + + # Check for restriction + restriction = ctype.find(f".//{{{self.XSD_NS}}}restriction") + if restriction is not None: + base_str = restriction.get('base', '') + base_type = self._resolve_qname(base_str, ns_map, target_prefix) + derivation_method = 'restriction' + + complex_type = ComplexType( + namespace=target_prefix, + name=name, + base_type=base_type, + derivation_method=derivation_method + ) + + # Parse attributes declared in this complexType (including those inside extension/restriction blocks) + defined_in_qname = complex_type.qname() + parsed_attrs = self._parse_attributes_from_element(ctype, ns_map, target_prefix, defined_in_qname) + complex_type.attributes.update(parsed_attrs) + + parsed_subelements = self._parse_subelements_from_element(ctype, ns_map, target_prefix, defined_in_qname) + complex_type.subelements.update(parsed_subelements) + + self.complex_types[complex_type.qname()] = complex_type + + def _extract_elements(self, root: ET.Element, target_prefix: str, ns_map: Dict[str, str]) -> None: + """Extract all element definitions.""" + for elem in root.findall(f"./{{{self.XSD_NS}}}element"): + name = elem.get('name') + if not name: + continue + + # Type reference + type_str = elem.get('type', '') + type_ref = self._resolve_qname(type_str, ns_map, target_prefix) if type_str else None + + # Abstract attribute + is_abstract = elem.get('abstract', 'false').lower() == 'true' + + # Substitution group + subst_str = elem.get('substitutionGroup', '') + substitution_group = self._resolve_qname(subst_str, ns_map, target_prefix) if subst_str else None + + # Handle inline complex types + inline_ctype = elem.find(f"{{{self.XSD_NS}}}complexType") + if inline_ctype is not None and not type_ref: + # Create synthetic type name + inline_name = f"{name}_InlineType" + inline_qname = (target_prefix, inline_name) + + base_type = None + derivation_method = None + + restriction = inline_ctype.find(f".//{{{self.XSD_NS}}}restriction") + extension = inline_ctype.find(f".//{{{self.XSD_NS}}}extension") + + if restriction is not None: + base_str = restriction.get('base', '') + base_type = self._resolve_qname(base_str, ns_map, target_prefix) + derivation_method = 'restriction' + elif extension is not None: + base_str = extension.get('base', '') + base_type = self._resolve_qname(base_str, ns_map, target_prefix) + derivation_method = 'extension' + + if base_type: + inline_type = ComplexType( + namespace=target_prefix, + name=inline_name, + base_type=base_type, + derivation_method=derivation_method + ) + # Parse attributes on the inline complexType + parsed_attrs = self._parse_attributes_from_element(inline_ctype, ns_map, target_prefix, inline_qname) + inline_type.attributes.update(parsed_attrs) + + self.complex_types[inline_qname] = inline_type + type_ref = inline_qname + + element = Element( + namespace=target_prefix, + name=name, + type_ref=type_ref, + is_abstract=is_abstract, + substitution_group=substitution_group + ) + + self.elements[element.qname()] = element + + def build_relationships(self) -> None: + """Build all dependency and inheritance relationships.""" + print("Building relationships...") + + # Build type hierarchy relationships + self._build_type_hierarchy() + + # Build element hierarchy relationships + self._build_element_hierarchy() + + # Build substitution group relationships + self._build_substitution_groups() + + self._built = True + print("Relationships built successfully") + + def _build_type_hierarchy(self) -> None: + """Build ancestor and descendant relationships for types.""" + # Build ancestors (going up the hierarchy) + for qname, ctype in self.complex_types.items(): + ancestors = [] + current = ctype.base_type + + while current and current in self.complex_types: + ancestors.append(current) + current = self.complex_types[current].base_type + + self._type_ancestors[qname] = ancestors + + # Build descendants (going down the hierarchy) + for qname, ctype in self.complex_types.items(): + if ctype.base_type: + self._type_descendants[ctype.base_type].add(qname) + + # Make descendants transitive + self._type_descendants = self._compute_transitive_descendants(self._type_descendants) + + def _build_element_hierarchy(self) -> None: + """Build ancestor and descendant relationships for elements through their types.""" + # Build ancestors for elements + for elem_qname, element in self.elements.items(): + ancestors = [] + + if element.type_ref and element.type_ref in self.complex_types: + # Follow the type hierarchy + type_ancestors = self._type_ancestors.get(element.type_ref, []) + + # Find elements that use these ancestor types + for ancestor_type in type_ancestors: + for other_qname, other_elem in self.elements.items(): + if other_elem.type_ref == ancestor_type: + # Check if this type is "specific" to that element + if self._is_element_specific_type(other_qname, ancestor_type): + ancestors.append(other_qname) + break + + self._element_ancestors[elem_qname] = ancestors + + # Build descendants for elements + for elem_qname, element in self.elements.items(): + if not element.type_ref: + continue + + # Get all types that descend from this element's type + if element.type_ref in self._type_descendants: + descendant_types = self._type_descendants[element.type_ref] + + # Find elements that use these descendant types + for other_qname, other_elem in self.elements.items(): + if other_elem.type_ref in descendant_types: + # Check if the element's type name contains the element name + if self._is_element_specific_type(other_qname, other_elem.type_ref): + self._element_descendants[elem_qname].add(other_qname) + + def _is_element_specific_type(self, elem_qname: QName, type_qname: QName) -> bool: + """Check if a type is specific to an element (contains element name in type name).""" + elem_name = elem_qname[1] + type_name = type_qname[1] + return elem_name in type_name + + def _build_substitution_groups(self) -> None: + """Build substitution group relationships (recursive).""" + # Direct substitution relationships + direct_subst = defaultdict(set) + for elem_qname, element in self.elements.items(): + if element.substitution_group: + direct_subst[element.substitution_group].add(elem_qname) + + # Make it transitive: if B substitutes A, and C substitutes B, then C also substitutes A + self._substitution_members = self._compute_transitive_descendants(direct_subst) + + def _compute_transitive_descendants(self, direct_deps: Dict[QName, Set[QName]]) -> Dict[QName, Set[QName]]: + """Compute transitive closure of descendant relationships.""" + result = defaultdict(set) + + # Start with direct relationships + for parent, children in direct_deps.items(): + result[parent] = set(children) + + # Add transitive relationships + changed = True + while changed: + changed = False + for parent in list(result.keys()): + current_children = set(result[parent]) + for child in current_children: + if child in result: + for grandchild in result[child]: + if grandchild not in result[parent]: + result[parent].add(grandchild) + changed = True + + return result + + # New helper: format qname to readable string + def _qname_to_str(self, qn: Optional[QName]) -> Optional[str]: + if qn is None: + return None + return f"{qn[0]}:{qn[1]}" + + # New public API: combined attributes following inheritance rules + def get_combined_attributes(self, type_qname: QName) -> List[Dict[str, Any]]: + """ + Return the combined attributes for the given complex type, following XSD inheritance rules. + - Attributes from base types are included first. + - If derived types redeclare an attribute with the same name, the derived declaration replaces + the base declaration (the properties: type/use/default/fixed come from the most derived). + - The returned list preserves the initial order of first encounter (base-first). + Each entry is a dict with keys: name, type, use, default, fixed, defined_in + """ + if type_qname not in self.complex_types: + raise KeyError(f"Type {type_qname} not found in complex_types") + + # Build ancestor chain root-first -> immediate parent -> type itself + # If relationships built, use them; otherwise compute on the fly + if self._built: + ancestors = self.get_type_ancestor_chain(type_qname) # immediate parent -> root + chain = list(reversed(ancestors)) # root -> immediate parent + chain.append(type_qname) + else: + # Walk base_type pointers to collect chain + chain = [] + stack = [] + current = self.complex_types[type_qname].base_type + while current and current in self.complex_types: + stack.append(current) + current = self.complex_types[current].base_type + chain = list(reversed(stack)) + chain.append(type_qname) + + combined: Dict[str, AttributeDef] = {} + order: List[str] = [] + + for t_qn in chain: + ctype = self.complex_types.get(t_qn) + if not ctype: + continue + # attributes declared in this specific type + for attr_name, attr_def in ctype.attributes.items(): + if attr_name not in combined: + # first encounter -> record and preserve insertion order + combined[attr_name] = AttributeDef( + name=attr_def.name, + type_ref=attr_def.type_ref, + use=attr_def.use, + default=attr_def.default, + fixed=attr_def.fixed, + defined_in=attr_def.defined_in + ) + order.append(attr_name) + else: + # overridden/redeclared in derived type: update properties but keep order position + existing = combined[attr_name] + existing.type_ref = attr_def.type_ref + existing.use = attr_def.use + existing.default = attr_def.default + existing.fixed = attr_def.fixed + existing.defined_in = attr_def.defined_in + + # Build output list in preserved order + result: List[Dict[str, Any]] = [] + for name in order: + ad = combined[name] + result.append({ + 'name': ad.name, + 'type': self._qname_to_str(ad.type_ref), + 'use': ad.use, + 'default': ad.default, + 'fixed': ad.fixed, + 'defined_in': self._qname_to_str(ad.defined_in) + }) + + return result + + # Query API + + def get_element(self, qname: QName) -> Optional[Element]: + """Get an element by its qualified name.""" + return self.elements.get(qname) + + def get_complex_type(self, qname: QName) -> Optional[ComplexType]: + """Get a complex type by its qualified name.""" + return self.complex_types.get(qname) + + def is_abstract(self, element_qname: QName) -> bool: + """Check if an element is abstract.""" + element = self.elements.get(element_qname) + return element.is_abstract if element else False + + def get_ancestor_chain(self, element_qname: QName) -> List[QName]: + """ + Get the complete ancestor chain for an element (what it builds upon). + Returns list from immediate parent to root. + """ + if not self._built: + raise RuntimeError("Call build_relationships() first") + + return self._element_ancestors.get(element_qname, []) + + def get_all_descendants(self, element_qname: QName) -> Set[QName]: + """ + Get all elements that build upon this element (descendants). + """ + if not self._built: + raise RuntimeError("Call build_relationships() first") + + return self._element_descendants.get(element_qname, set()) + + def get_substitution_group_members(self, element_qname: QName) -> Set[QName]: + """ + Get all elements that can substitute for this element (recursive). + """ + if not self._built: + raise RuntimeError("Call build_relationships() first") + + return self._substitution_members.get(element_qname, set()) + + def get_implementations(self, abstract_element_qname: QName) -> Set[QName]: + """ + Get all concrete elements that implement an abstract element. + This includes: + 1. Elements in its substitution group + 2. Elements whose types extend this element's type + """ + if not self._built: + raise RuntimeError("Call build_relationships() first") + + implementations = set() + + # Add substitution group members + implementations.update(self._substitution_members.get(abstract_element_qname, set())) + + # Add type-based descendants + implementations.update(self._element_descendants.get(abstract_element_qname, set())) + + # Filter out abstract elements + return {qname for qname in implementations if not self.is_abstract(qname)} + + def get_type_ancestor_chain(self, type_qname: QName) -> List[QName]: + """Get the complete ancestor chain for a type.""" + if not self._built: + raise RuntimeError("Call build_relationships() first") + + return self._type_ancestors.get(type_qname, []) + + def get_type_descendants(self, type_qname: QName) -> Set[QName]: + """Get all types that descend from this type.""" + if not self._built: + raise RuntimeError("Call build_relationships() first") + + return self._type_descendants.get(type_qname, set()) + + def get_all_elements(self) -> Dict[QName, Element]: + """Get all elements.""" + return self.elements + + def get_all_types(self) -> Dict[QName, ComplexType]: + """Get all complex types.""" + return self.complex_types + + def get_abstract_elements(self) -> Set[QName]: + """Get all abstract elements.""" + return {qname for qname, elem in self.elements.items() if elem.is_abstract} + + # Export functions + + def export_to_json(self, output_path: Path) -> None: + """Export complete analysis to JSON.""" + if not self._built: + raise RuntimeError("Call build_relationships() first") + + result = { + 'elements': {}, + 'types': {}, + 'abstract_elements': [self._qname_to_str(qn) for qn in self.get_abstract_elements()] + } + + # Export elements + for qname, element in self.elements.items(): + qname_str = self._qname_to_str(qname) + result['elements'][qname_str] = { + 'namespace': element.namespace, + 'name': element.name, + 'type': self._qname_to_str(element.type_ref) if element.type_ref else None, + 'is_abstract': element.is_abstract, + 'substitution_group': self._qname_to_str(element.substitution_group) if element.substitution_group else None, + 'ancestors': [self._qname_to_str(a) for a in self.get_ancestor_chain(qname)], + 'descendants': [self._qname_to_str(d) for d in sorted(self.get_all_descendants(qname))], + 'substitution_members': [self._qname_to_str(s) for s in sorted(self.get_substitution_group_members(qname))], + } + + if element.is_abstract: + result['elements'][qname_str]['implementations'] = [ + self._qname_to_str(i) for i in sorted(self.get_implementations(qname)) + ] + + # Export types + for qname, ctype in self.complex_types.items(): + qname_str = self._qname_to_str(qname) + result['types'][qname_str] = { + 'namespace': ctype.namespace, + 'name': ctype.name, + 'base_type': self._qname_to_str(ctype.base_type) if ctype.base_type else None, + 'derivation_method': ctype.derivation_method, + 'ancestors': [self._qname_to_str(a) for a in self.get_type_ancestor_chain(qname)], + 'descendants': [self._qname_to_str(d) for d in sorted(self.get_type_descendants(qname))], + 'attributes': { + aname: { + 'type': self._qname_to_str(adef.type_ref), + 'use': adef.use, + 'default': adef.default, + 'fixed': adef.fixed, + 'defined_in': self._qname_to_str(adef.defined_in) + } for aname, adef in ctype.attributes.items() + }, + 'subelements': { + sname: { + 'type': self._qname_to_str(sdef.type_ref), + 'min_occurs': sdef.min_occurs, + 'max_occurs': sdef.max_occurs, + 'defined_in': self._qname_to_str(sdef.defined_in) + } for sname, sdef in ctype.subelements.items() + } + } + + with open(output_path, 'w') as f: + json.dump(result, f, indent=2) + + print(f"\nExported complete analysis to: {output_path}") + + +def main(): + """Example usage.""" + import sys + + if len(sys.argv) < 2: + print("Usage: python xsd_analyzer_v2.py ") + print(" schema_path: Path to XSD file or directory") + sys.exit(1) + + schema_path = Path(sys.argv[1]) + + # Create analyzer + analyzer = XSDSchemaAnalyzer() + + # Parse schemas + print(f"Parsing schemas from: {schema_path}") + analyzer.parse_schemas([schema_path]) + + # Build relationships + analyzer.build_relationships() + + # Example queries + print("\n" + "="*80) + print("EXAMPLE QUERIES") + print("="*80) + + # Find some abstract elements + abstract = list(analyzer.get_abstract_elements())[:3] + print(f"\nFound {len(analyzer.get_abstract_elements())} abstract elements") + + if abstract: + for elem_qname in abstract: + print(f"\nAbstract element: {elem_qname[0]}:{elem_qname[1]}") + impls = analyzer.get_implementations(elem_qname) + print(f" Implementations ({len(impls)}): {[f'{q[0]}:{q[1]}' for q in sorted(impls)][:5]}...") + + # Example: combined attributes for a type (replace with a real type present in your analysis) + # sample_type = ('netex', 'VersionOfObjectRefStructure') + # print("\nCombined attributes for", sample_type) + # print(analyzer.get_combined_attributes(sample_type)) + + # Export to JSON + output_path = Path("xsd_analysis_complete.json") + analyzer.export_to_json(output_path) + + +if __name__ == "__main__": + main() + diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd index 67c7aa5ae..a388123dd 100644 --- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd @@ -119,7 +119,7 @@ Rail transport, Roads and Road transport - + identifier of Frame. diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index 737c8f51c..1ab3b6076 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -152,7 +152,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index f542fb1f1..5182a0df4 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd index ce40497f8..e03b1f89e 100644 --- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd index d082ec6fd..cee8348d3 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd index 7015ea21f..9a0d43932 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport - + @@ -294,7 +294,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd index f1601b92f..aa443d575 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport - + @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd index fe52ba4f9..6843e6279 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -217,7 +217,7 @@ Rail transport, Roads and Road transport - + @@ -260,7 +260,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd index 6302bfa4d..8d18d41d9 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd @@ -92,7 +92,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 0a6549e5c..554658095 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport - + @@ -363,7 +363,7 @@ Rail transport, Roads and Road transport - + @@ -465,7 +465,7 @@ Rail transport, Roads and Road transport - + @@ -530,7 +530,7 @@ Rail transport, Roads and Road transport - + @@ -586,7 +586,7 @@ Rail transport, Roads and Road transport - + @@ -673,7 +673,7 @@ Rail transport, Roads and Road transport - + @@ -750,7 +750,7 @@ Rail transport, Roads and Road transport - + @@ -857,7 +857,7 @@ Rail transport, Roads and Road transport - + @@ -889,7 +889,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -926,7 +926,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -963,7 +963,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -1053,7 +1053,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 6dcffff68..6f67fbcca 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -81,7 +81,7 @@ Rail transport, Roads and Road transport - + @@ -183,7 +183,7 @@ Rail transport, Roads and Road transport - + @@ -332,7 +332,7 @@ Rail transport, Roads and Road transport - + @@ -417,7 +417,7 @@ The same PATH LINK may occur in different sequences in different NAVIGATION PATH - + Identifier of ENTITY. @@ -515,7 +515,7 @@ The same PATH LINK may occur in different sequences in different NAVIGATION PATH - + Identifier of ENTITY. @@ -585,7 +585,7 @@ The same PATH LINK may occur in different sequences in different NAVIGATION PATH - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 403aa109c..d61eb1119 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -219,7 +219,7 @@ Rail transport, Roads and Road transport - + @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd index 1b2298362..be746042f 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd @@ -228,7 +228,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -280,7 +280,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index 9c7092650..a431541e3 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -286,7 +286,7 @@ Rail transport, Roads and Road transport - + @@ -353,7 +353,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -390,7 +390,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -442,7 +442,7 @@ Rail transport, Roads and Road transport - + @@ -506,7 +506,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd index b27fe6300..5c8100adb 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd @@ -175,7 +175,7 @@ Rail transport, Roads and Road transport - + @@ -237,7 +237,7 @@ Rail transport, Roads and Road transport - + @@ -331,7 +331,7 @@ Rail transport, Roads and Road transport - + @@ -397,7 +397,7 @@ Rail transport, Roads and Road transport - + @@ -471,7 +471,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -526,7 +526,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd index ee5654917..85e84f168 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd @@ -155,7 +155,7 @@ Rail transport, Roads and Road transport - + Identifier of GENERAL SECTION. @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport - + Identifier of POINT ON SECTION. @@ -351,7 +351,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd index c7725c05e..f4d5aae23 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport - + @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -248,7 +248,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd index 2f304d54b..27a6e6b67 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index f902d0957..97bb08a02 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport - + @@ -215,7 +215,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF TARIFF ZONE. @@ -280,7 +280,7 @@ Rail transport, Roads and Road transport - + @@ -352,7 +352,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF ZONE. diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd index b32fd0f35..15d4cf680 100644 --- a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd @@ -117,7 +117,7 @@ References to a DATA SOURCE are useful in an interoperated computer system. - + Identifier of DATA SOURCE. diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd index 2b95c4f90..d603888ff 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd @@ -101,7 +101,7 @@ Rail transport, Roads and Road transport - + Identifier of CODESPACE. May be the same as Xmlns prefix. diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd index 50fd10445..8201bd85d 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd @@ -134,7 +134,7 @@ Rail transport, Roads and Road transport - + Identifier of RESPONSIBILITY SET. @@ -202,7 +202,7 @@ Rail transport, Roads and Road transport - + Identifier of RESPONSIBILITY SET. @@ -344,7 +344,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd index 5c0580e9c..d6c4ecf10 100644 --- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd @@ -171,7 +171,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd index 5baac24c1..0cde23925 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + @@ -298,7 +298,7 @@ Rail transport, Roads and Road transport - + @@ -380,7 +380,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd index fa2adc5fa..474662fe4 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd @@ -320,7 +320,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF FRAME. @@ -416,7 +416,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF VALIDITY. diff --git a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd index 3c761b974..e23df35c8 100644 --- a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd @@ -185,7 +185,7 @@ Rail transport, Roads and Road transport - + @@ -249,7 +249,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF VERSION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd index 4757dfa3a..61da57656 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd @@ -109,7 +109,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd index 59c333827..912932ade 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd @@ -193,7 +193,7 @@ Rail transport, Roads and Road transport - + Identifier of ROAD ADDRESS. @@ -302,7 +302,7 @@ Rail transport, Roads and Road transport - + Identifier of POSTAL ADDRESS. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd index bd4574c7f..c4ddaa49e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport - + @@ -231,7 +231,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd index 19e6d6f04..83f83a416 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport - + @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport - + @@ -367,7 +367,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index f05a2cd85..b48504d59 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -134,7 +134,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + @@ -347,7 +347,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -428,7 +428,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index c90a8eea1..ad01278d1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -116,7 +116,7 @@ - + Identifier of DECK PLAN. @@ -206,7 +206,7 @@ - + Identifier of VEHICLE EQUIPMENT PROFILE. @@ -354,7 +354,7 @@ - + Identifier of DECK SPACE. @@ -493,7 +493,7 @@ - + Identifier of PASSENGER SPACE. @@ -603,7 +603,7 @@ - + Identifier of OTHER DECK SPACE. @@ -684,7 +684,7 @@ - + Identifier of DECK ENTRANCE. @@ -817,7 +817,7 @@ - + Identifier of PASSENGER ENTRANCE. @@ -883,7 +883,7 @@ - + Identifier of DECK VEHICLE ENTRANCE. @@ -960,7 +960,7 @@ - + Identifier of OTHER DECK ENTRANCE. @@ -1016,7 +1016,7 @@ - + Identifier of VEHICLE EQUIPMENT PROILE. @@ -1099,7 +1099,7 @@ - + Identifier of DECK ENTRANCE COUPLE. @@ -1189,7 +1189,7 @@ - + Identifier of DECK WINDOW. @@ -1283,7 +1283,7 @@ - + Identifier of DECK LEVEL. @@ -1362,7 +1362,7 @@ - + Identifier of DECK SPACE CAPACITY. @@ -1425,7 +1425,7 @@ - + Identifier of TYPE OF DECK SPACE. @@ -1461,7 +1461,7 @@ - + Identifier of TYPE OF DECK ENTRANCE, @@ -1497,7 +1497,7 @@ - + Identifier of TYPE OF DECK ENTRANCE USAGE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd index 977c374af..6c1650483 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd index af1fa1874..f78b8b46f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport - + Identifier of EQUIPMENT PLACE. @@ -171,7 +171,7 @@ Rail transport, Roads and Road transport - + Identifier of EQUIPMENT POSITION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index afd8f06ba..caa9e4661 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + @@ -335,7 +335,7 @@ Rail transport, Roads and Road transport - + @@ -418,7 +418,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF WHEELCHAIR, diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd index 9b8f6da44..b679f60bf 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd @@ -289,7 +289,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index 38aa7774b..dbce71dcc 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -316,7 +316,7 @@ Rail transport, Roads and Road transport - + @@ -454,7 +454,7 @@ Rail transport, Roads and Road transport - + @@ -559,7 +559,7 @@ Rail transport, Roads and Road transport - + @@ -604,7 +604,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -700,7 +700,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd index ea9148964..9a74f6402 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -92,7 +92,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -194,7 +194,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -286,7 +286,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -326,7 +326,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE RENTAL MODE OF OPERATION. @@ -386,7 +386,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -440,7 +440,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -506,7 +506,7 @@ Rail transport, Roads and Road transport - + @@ -556,7 +556,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd index 747be0cbf..980293e62 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd @@ -93,7 +93,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -157,7 +157,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd index 15fb5204f..2ac0f7891 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd @@ -74,7 +74,7 @@ Rail transport, Roads and Road transport - + Identifier of RECHARGING EQUIPMENT PROFILE. 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 96efa6d67..837420eeb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -179,7 +179,7 @@ points cannot exceed this value. - + Identifier of ENTITY. @@ -239,7 +239,7 @@ points cannot exceed this value. - + Identifier of ENTITY. @@ -310,7 +310,7 @@ points cannot exceed this value. - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -347,7 +347,7 @@ points cannot exceed this value. - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd index b84ef4603..099a67827 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd @@ -100,7 +100,7 @@ Rail transport, Roads and Road transport - + Identifier of MODEL PROFILE. @@ -175,7 +175,7 @@ Rail transport, Roads and Road transport - + Identifier of CAR MODEL PROFILE. @@ -295,7 +295,7 @@ Rail transport, Roads and Road transport - + Identifier of CYCLE MODEL PROFILE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd index fca22986e..051fc17d1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd @@ -95,7 +95,7 @@ Rail transport, Roads and Road transport - + Identifier of FLEET. @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF FLEET. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd index b497fdae3..d81dcb718 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd @@ -131,7 +131,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd index eb19483bd..09537443f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd @@ -103,7 +103,7 @@ Rail transport, Roads and Road transport - + @@ -213,7 +213,7 @@ Rail transport, Roads and Road transport - + @@ -277,7 +277,7 @@ Rail transport, Roads and Road transport - + @@ -309,7 +309,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd index 16a5ff130..a5461d3b2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport - + Identifier of TRAVEL AGENT. @@ -158,7 +158,7 @@ Rail transport, Roads and Road transport - + Identifier of MANAGEMENT AGENT. @@ -197,7 +197,7 @@ Rail transport, Roads and Road transport - + Identifier of GENERAL ORGANISATION. @@ -241,7 +241,7 @@ Rail transport, Roads and Road transport - + Identifier of SERVICED ORGANISATION. @@ -293,7 +293,7 @@ Rail transport, Roads and Road transport - + Identifier of ORGANISATION DAY TYPE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd index 09b37a52c..6aea9674f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 30b89e082..80bc666a1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -102,7 +102,7 @@ - + Identifier of SPOT ROW. @@ -171,7 +171,7 @@ - + Identifier of SPOT COLUMN. @@ -398,7 +398,7 @@ - + Identifier of PASSENGER SPOT. @@ -530,7 +530,7 @@ - + Identifier of PASSENGER VEHICLE SPOT. @@ -617,7 +617,7 @@ - + Identifier of LUGGAGE SPOT. @@ -674,7 +674,7 @@ - + Identifier of TYPE OF LOCATABLE SPOT. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd index 369425339..67e42bd66 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -213,7 +213,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -284,7 +284,7 @@ Rail transport, Roads and Road transport - + @@ -333,7 +333,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -395,7 +395,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd index 932d64efb..6f030ce1d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -78,7 +78,7 @@ - + Identifier of ENTITY. @@ -108,7 +108,7 @@ - + Identifier of ENTITY. @@ -166,7 +166,7 @@ - + Identifier of ENTITY. @@ -218,7 +218,7 @@ - + Identifier of ENTITY. @@ -276,7 +276,7 @@ - + Identifier of SENSOR IN SPOT. @@ -337,7 +337,7 @@ - + Identifier of SENSOR IN ENTRANCE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd index be6153454..70bc0c263 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - + @@ -288,7 +288,7 @@ Rail transport, Roads and Road transport - + @@ -408,7 +408,7 @@ Rail transport, Roads and Road transport - + @@ -500,7 +500,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -578,7 +578,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 5ea192fcd..b5e69e60f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -104,7 +104,7 @@ Rail transport, Roads and Road transport - + Identifier of CLASS OF USE. @@ -476,7 +476,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF PAYMENT METHOD. @@ -546,7 +546,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF SERVICE. @@ -585,7 +585,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF PRODUCT CATEGORY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index 1540257d9..e217f2d0f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -74,7 +74,7 @@ - + Identifier of ENTITY. @@ -104,7 +104,7 @@ - + Identifier of ENTITY. @@ -187,7 +187,7 @@ - + Identifier of ENTITY. @@ -275,7 +275,7 @@ - + Identifier of ENTITY. @@ -348,7 +348,7 @@ - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd index f7ec83b72..c69b3c172 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport - + Identifier of TOPOGRAPHIC PLACE. @@ -299,7 +299,7 @@ Rail transport, Roads and Road transport - + Identifier of GROUP OF PLACES. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index 5fd12939d..17272af2d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -116,7 +116,7 @@ Rail transport, Roads and Road transport - + @@ -176,7 +176,7 @@ Rail transport, Roads and Road transport - + @@ -221,7 +221,7 @@ Rail transport, Roads and Road transport - + @@ -266,7 +266,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index 7fadfd6cb..502135bf7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -195,7 +195,7 @@ Rail transport, Roads and Road transport - + @@ -269,7 +269,7 @@ Rail transport, Roads and Road transport - + @@ -312,7 +312,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -339,7 +339,7 @@ Rail transport, Roads and Road transport - + @@ -487,7 +487,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd index 3de39013a..11aa18887 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd @@ -190,7 +190,7 @@ Rail transport, Roads and Road transport - + Identifier of TRANSPORT ORGANISATION. @@ -307,7 +307,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATOR. @@ -355,7 +355,7 @@ Rail transport, Roads and Road transport - + Identifier of AUTHORITY. @@ -411,7 +411,7 @@ Rail transport, Roads and Road transport - + Identifier of GROUP OF OPERATORs. @@ -468,7 +468,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATIONAL CONTEXT. @@ -543,7 +543,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATING DEPARTMENT. @@ -635,7 +635,7 @@ Rail transport, Roads and Road transport - + Identifier of CONTROL CENTRE. @@ -705,7 +705,7 @@ Rail transport, Roads and Road transport - + Identifier of TRANSPORT ADMINISTRATIVE ZONE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 0a3708b4f..8e6b9ce9d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -127,7 +127,7 @@ Rail transport, Roads and Road transport - + Identifier of TRANSPORT TYPE. @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE TYPE. @@ -453,7 +453,7 @@ Rail transport, Roads and Road transport - + Identifier of PERSONAL TRANSPORT TYPE. @@ -541,7 +541,7 @@ Rail transport, Roads and Road transport - + Identifier of ACCEPTED DRIVER PERMIT. @@ -651,7 +651,7 @@ Rail transport, Roads and Road transport - + Identifier of PASSENGER CARRYING REQUIREMENT. @@ -814,7 +814,7 @@ Rail transport, Roads and Road transport - + Identifier of PASSENGER VEHICLE CAPACITY. @@ -931,7 +931,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE MANOEVRING REQUIREMENT. @@ -1044,7 +1044,7 @@ Rail transport, Roads and Road transport - + Identifier of FACILITY REQUIREMENT. @@ -1094,7 +1094,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE MODEL. @@ -1191,7 +1191,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE EQUIPMENT PROFILE. @@ -1278,7 +1278,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE EQUIPMENT PROILE. @@ -1340,7 +1340,7 @@ Rail transport, Roads and Road transport - + Identifier of PURPOSE OF EQUIPMENT PROFILE. @@ -1376,7 +1376,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF DRIVER PERMIT. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index 947cf384a..7f36e3cba 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE. @@ -283,7 +283,7 @@ Rail transport, Roads and Road transport - + Identifier of ROLLING STOCK ITEM. @@ -347,7 +347,7 @@ Rail transport, Roads and Road transport - + Identifier of TRAILING ROLLING STOCK ITEM @@ -401,7 +401,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -465,7 +465,7 @@ Rail transport, Roads and Road transport - + Identifier of ROLLING STOCK ITEM. 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 4ba28e12d..b0ccd1c53 100644 --- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport - + 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 b0ed7a82d..772340d7e 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -121,7 +121,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd index 488a8eedb..a68f2cc35 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd @@ -104,7 +104,7 @@ - + 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 27b809b24..4466646d2 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 @@ -167,7 +167,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + Reference to RESPONSIBILITY SET for managing the object. If absent, then responsibility is same as for containing context of this object. @@ -304,7 +304,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + @@ -390,7 +390,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + @@ -454,7 +454,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_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 5fc6f7fbb..0be8f6d27 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -221,7 +221,7 @@ Rail transport, Roads and Road transport - + @@ -293,7 +293,7 @@ Rail transport, Roads and Road transport - + @@ -467,7 +467,7 @@ Rail transport, Roads and Road transport - + @@ -546,7 +546,7 @@ Rail transport, Roads and Road transport - + @@ -629,7 +629,7 @@ Rail transport, Roads and Road transport - + @@ -702,7 +702,7 @@ Rail transport, Roads and Road transport - + @@ -789,7 +789,7 @@ Rail transport, Roads and Road transport - + @@ -1032,7 +1032,7 @@ Rail transport, Roads and Road transport - + @@ -1126,7 +1126,7 @@ Rail transport, Roads and Road transport - + @@ -1255,7 +1255,7 @@ Rail transport, Roads and Road transport - + @@ -1487,7 +1487,7 @@ Rail transport, Roads and Road transport - + @@ -1561,7 +1561,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd index e4e181db2..294a73081 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd @@ -86,7 +86,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 00d86eaf2..920621250 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - + @@ -281,7 +281,7 @@ Rail transport, Roads and Road transport - + @@ -384,7 +384,7 @@ Rail transport, Roads and Road transport - + @@ -468,7 +468,7 @@ Rail transport, Roads and Road transport - + @@ -542,7 +542,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd index 2ee56dd34..a2dca614e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd @@ -222,7 +222,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -273,7 +273,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -360,7 +360,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd index 37f8f1fdd..374eda37c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd @@ -116,7 +116,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -321,7 +321,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -387,7 +387,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -464,7 +464,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -531,7 +531,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd index 803a5f4d4..02499677d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd @@ -127,7 +127,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + @@ -371,7 +371,7 @@ Rail transport, Roads and Road transport - + @@ -445,7 +445,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd index e3337fbb9..e4732839b 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -146,7 +146,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -204,7 +204,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -262,7 +262,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -320,7 +320,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd index 89c04e9d2..d2dba7a35 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - + @@ -250,7 +250,7 @@ Rail transport, Roads and Road transport - + @@ -331,7 +331,7 @@ Rail transport, Roads and Road transport - + @@ -442,7 +442,7 @@ Rail transport, Roads and Road transport - + @@ -486,7 +486,7 @@ Rail transport, Roads and Road transport - + @@ -584,7 +584,7 @@ Rail transport, Roads and Road transport - + @@ -636,7 +636,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 9a450b057..34c9019fd 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - + @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd index c88aa4396..6f6d14287 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -434,7 +434,7 @@ Rail transport, Roads and Road transport - + @@ -516,7 +516,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -578,7 +578,7 @@ Rail transport, Roads and Road transport - + @@ -707,7 +707,7 @@ Rail transport, Roads and Road transport - + @@ -804,7 +804,7 @@ Rail transport, Roads and Road transport - + @@ -914,7 +914,7 @@ Rail transport, Roads and Road transport - + @@ -1022,7 +1022,7 @@ Rail transport, Roads and Road transport - + @@ -1115,7 +1115,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF PARKING. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index 1c4d598a9..f7f0bb28d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + @@ -309,7 +309,7 @@ Rail transport, Roads and Road transport - + @@ -361,7 +361,7 @@ Rail transport, Roads and Road transport - + @@ -431,7 +431,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd index 9add6d836..3ba92b008 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd @@ -146,7 +146,7 @@ Rail transport, Roads and Road transport - + Identifier of a POINT OF INTEREST CLASSIFICATION. @@ -248,7 +248,7 @@ Rail transport, Roads and Road transport - + Identifier of POINT OF INTEREST HIERARCHY. @@ -360,7 +360,7 @@ Rail transport, Roads and Road transport - + Identifier of POINT OF INTEREST. @@ -491,7 +491,7 @@ Rail transport, Roads and Road transport - + Identifier of POINT OF INTEREST SPACE. @@ -615,7 +615,7 @@ Rail transport, Roads and Road transport - + Identifier of POINT OF INTEREST ENTRANCE. @@ -666,7 +666,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd index 5c2c75425..2d98f249e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd @@ -79,7 +79,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF SERVICE FEATURE. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 8467493a0..1de07d52a 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd @@ -469,7 +469,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE ENTRANCE. @@ -538,7 +538,7 @@ Rail transport, Roads and Road transport - + @@ -637,7 +637,7 @@ Rail transport, Roads and Road transport - + @@ -846,7 +846,7 @@ Rail transport, Roads and Road transport - + @@ -916,7 +916,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index f7e1cc19f..d02e019ea 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -184,7 +184,7 @@ Rail transport, Roads and Road transport - + Identifier of STOP PLACE. @@ -500,7 +500,7 @@ contained within its parent QUAY. - + Identifier of QUAY. @@ -745,7 +745,7 @@ contained within its parent QUAY. - + Identifier of ACCESS SPACE. @@ -851,7 +851,7 @@ contained within its parent QUAY. - + Identifier of BOARDING POSITION. @@ -933,7 +933,7 @@ contained within its parent QUAY. - + Identifier of STOP PLACE ENTRANCE. @@ -1007,7 +1007,7 @@ contained within its parent QUAY. - + Identifier of STOP PLACE ENTRANCE. @@ -1083,7 +1083,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE STOPPING POSITION. @@ -1193,7 +1193,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE STOPPING POSITION. @@ -1273,7 +1273,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE QUAY ALIGNMENT. @@ -1343,7 +1343,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE POSTION ALIGNMENT. @@ -1401,7 +1401,7 @@ contained within its parent QUAY. - + Identifier of GROUP of STOP PLACEs. diff --git a/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd index d2c719249..3afe22c48 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd @@ -261,7 +261,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd index f28b6a925..c21d9c574 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + Identifier of TAXI RANK. @@ -233,7 +233,7 @@ Rail transport, Roads and Road transport - + @@ -304,7 +304,7 @@ Rail transport, Roads and Road transport - + Identifier of TAXI PARKING AREA. diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd index b92a491c4..e3485b95b 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd @@ -167,7 +167,7 @@ Rail transport, Roads and Road transport - + @@ -225,7 +225,7 @@ Rail transport, Roads and Road transport - + @@ -287,7 +287,7 @@ Rail transport, Roads and Road transport - + @@ -322,7 +322,7 @@ Rail transport, Roads and Road transport - + @@ -367,7 +367,7 @@ Rail transport, Roads and Road transport - + @@ -439,7 +439,7 @@ Rail transport, Roads and Road transport - + @@ -498,7 +498,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd index 321c72784..0dc1ece32 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd @@ -65,7 +65,7 @@ Rail transport, Roads and Road transport - + @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport - + @@ -185,7 +185,7 @@ Rail transport, Roads and Road transport - + @@ -261,7 +261,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd index 09bf1692b..bdafd7504 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport - + @@ -192,7 +192,7 @@ Rail transport, Roads and Road transport - + @@ -301,7 +301,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. 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 1356ab7b9..40f5462c8 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + @@ -302,7 +302,7 @@ Rail transport, Roads and Road transport - + @@ -577,7 +577,7 @@ Rail transport, Roads and Road transport - + @@ -640,7 +640,7 @@ Rail transport, Roads and Road transport - + @@ -771,7 +771,7 @@ Rail transport, Roads and Road transport - + @@ -926,7 +926,7 @@ Rail transport, Roads and Road transport - + @@ -1140,7 +1140,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_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd index b3bc61fa4..e1c458c56 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd @@ -145,7 +145,7 @@ Rail transport, Roads and ROAD transport - + Identifier of RAILWAY JUNCTION. @@ -181,7 +181,7 @@ Rail transport, Roads and ROAD transport - + Identifier of ROAD JUNCTION. @@ -217,7 +217,7 @@ Rail transport, Roads and ROAD transport - + Identifier of WIRE JUNCTION. @@ -295,7 +295,7 @@ Rail transport, Roads and ROAD transport - + @@ -353,7 +353,7 @@ Rail transport, Roads and ROAD transport - + @@ -411,7 +411,7 @@ Rail transport, Roads and ROAD transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd index 54ad3488e..67d676b5a 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd @@ -151,7 +151,7 @@ Rail transport, Roads and ROAD transport - + @@ -219,7 +219,7 @@ Rail transport, Roads and ROAD transport - + @@ -288,7 +288,7 @@ Rail transport, Roads and ROAD transport - + @@ -342,7 +342,7 @@ Rail transport, Roads and ROAD transport - + Identifier of ENTITY. @@ -432,7 +432,7 @@ Rail transport, Roads and ROAD transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 7ae01e8ab..cc8cf737c 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -107,7 +107,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd index c35496263..e6d806d25 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + @@ -326,7 +326,7 @@ Rail transport, Roads and Road transport - + @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport - + @@ -437,7 +437,7 @@ Rail transport, Roads and Road transport - + @@ -507,7 +507,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd index 8637a1b36..27ea73073 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - + Identifier of a CREW BASE. @@ -205,7 +205,7 @@ Rail transport, Roads and Road transport - + Identifier of a RELIEF POINT. @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + Identifier of a PARKING POINT. @@ -319,7 +319,7 @@ Rail transport, Roads and Road transport - + Identifier of GARAGE POINT. @@ -368,7 +368,7 @@ Rail transport, Roads and Road transport - + Identifier of GARAGE. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd index 8f1618b38..e1e1e5832 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport - + Identifier of COMMON SECTION. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd index c1fa8d87c..39ff71e5b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd @@ -178,7 +178,7 @@ Rail transport, Roads and Road transport - + @@ -255,7 +255,7 @@ Rail transport, Roads and Road transport - + @@ -355,7 +355,7 @@ Rail transport, Roads and Road transport - + @@ -445,7 +445,7 @@ Rail transport, Roads and Road transport - + @@ -545,7 +545,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd index 85dc285b2..57bd1d1a1 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport - + @@ -194,7 +194,7 @@ Rail transport, Roads and Road transport - + @@ -258,7 +258,7 @@ Rail transport, Roads and Road transport - + @@ -321,7 +321,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd index e1c5e8ae3..5265696e3 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd @@ -117,7 +117,7 @@ Rail transport, Roads and Road transport - + @@ -255,7 +255,7 @@ Rail transport, Roads and Road transport - + @@ -304,7 +304,7 @@ Rail transport, Roads and Road transport - + @@ -406,7 +406,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -475,7 +475,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd index 8cc446def..cfcd99378 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport - + @@ -199,7 +199,7 @@ Rail transport, Roads and Road transport - + @@ -263,7 +263,7 @@ Rail transport, Roads and Road transport - + @@ -327,7 +327,7 @@ Rail transport, Roads and Road transport - + @@ -395,7 +395,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index 9e1ac2790..8afa66072 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -146,7 +146,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + @@ -214,7 +214,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + @@ -363,7 +363,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. Order in which to show ASSIGNMENT. -v2.0 - + Identifier of DISPLAY ASSIGNMENT. @@ -442,7 +442,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd index e758acc89..6794d9e07 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd @@ -82,7 +82,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd index 67af4a3fa..564434f02 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd @@ -207,7 +207,7 @@ Rail transport, Roads and Road transport - + @@ -280,7 +280,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -357,7 +357,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 4c0e0d8e2..d72f3d0c1 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -201,7 +201,7 @@ Rail transport, Roads and Road transport - + @@ -410,7 +410,7 @@ Rail transport, Roads and Road transport - + @@ -474,7 +474,7 @@ Rail transport, Roads and Road transport - + @@ -534,7 +534,7 @@ Rail transport, Roads and Road transport - + @@ -639,7 +639,7 @@ Rail transport, Roads and Road transport - + @@ -713,7 +713,7 @@ Rail transport, Roads and Road transport - + @@ -805,7 +805,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd index 64f4e9d8c..276bc283f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + @@ -226,7 +226,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index f82060784..4329c1d5c 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -205,7 +205,7 @@ Rail transport, Roads and Road transport - + @@ -313,7 +313,7 @@ Rail transport, Roads and Road transport - + @@ -412,7 +412,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd index 4bda3be72..3093adc2e 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - + @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + @@ -291,7 +291,7 @@ Rail transport, Roads and Road transport - + @@ -338,7 +338,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd index 69ad6b852..ac0eec4d3 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -179,7 +179,7 @@ Rail transport, Roads and Road transport - + @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + Identifier of TIMING LINK. @@ -309,7 +309,7 @@ Rail transport, Roads and Road transport - + @@ -399,7 +399,7 @@ Rail transport, Roads and Road transport - + @@ -457,7 +457,7 @@ Rail transport, Roads and Road transport - + @@ -509,7 +509,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd index d5cd9b877..fdbfdff77 100644 --- a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd @@ -25,7 +25,7 @@ - + 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 c72da916c..26f22745a 100644 --- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 47203ece8..fc37a91eb 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -89,7 +89,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd index b8c10f56f..c0e984f77 100644 --- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd @@ -27,7 +27,7 @@ - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd index 98d07e9e9..2dcb4fba3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd @@ -107,7 +107,7 @@ Rail transport, Roads and Road transport --> - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd index a78f49628..bcee07323 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - + @@ -297,7 +297,7 @@ Rail transport, Roads and Road transport - + @@ -372,7 +372,7 @@ Rail transport, Roads and Road transport - + @@ -444,7 +444,7 @@ Rail transport, Roads and Road transport - + @@ -539,7 +539,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd index d599e5c79..8fc16d72a 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd @@ -128,7 +128,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd index 7c0477bf7..5bbe458c6 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -271,7 +271,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -381,7 +381,7 @@ The VIEW includes derived ancillary data from referenced entities. - + Identifier of ENTITY. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd index 3a5886b63..a86cec513 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd @@ -106,7 +106,7 @@ - + Identifier of DECK ENTRANCE ASSIGNMENT. @@ -177,7 +177,7 @@ - + Identifier of TRAIN COMPONENT STOP ASSIGNMENT. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index 39a4b7edd..e5a8b216a 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -104,7 +104,7 @@ - + Identifier of DECK PLAN ASSIGNMENT. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd index 577ab2b35..8bfb1e831 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd @@ -200,7 +200,7 @@ Rail transport, Roads and Road transport - + @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd index e8c4cc2a4..efd8a76e7 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - + @@ -402,7 +402,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index 77053f14f..e3607ea9d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -127,7 +127,7 @@ Rail transport, Roads and Road transport - + @@ -365,7 +365,7 @@ Rail transport, Roads and Road transport - + @@ -610,7 +610,7 @@ Default is false. - + @@ -682,7 +682,7 @@ Default is false. - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd index ac632536a..9584c4170 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - + 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 7f743b422..e8cba8b29 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 @@ -66,7 +66,7 @@ - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd index bea35c068..571fff379 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd @@ -113,7 +113,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -317,7 +317,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -370,7 +370,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -451,7 +451,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -696,7 +696,7 @@ The VIEW includes derived ancillary data from referenced entities. - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd index e9ca7bf98..4c989c2f6 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd @@ -79,7 +79,7 @@ Rail transport, Roads and Road transport - + @@ -166,7 +166,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd index 4a5e09e1c..97ec5bc6a 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd index 28c7ec1e5..ff0ec49a0 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd @@ -146,7 +146,7 @@ Rail transport, Roads and Road transport - + @@ -291,7 +291,7 @@ Rail transport, Roads and Road transport - + @@ -340,7 +340,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd index 122cf5611..6bb362513 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport - + @@ -197,7 +197,7 @@ Rail transport, Roads and Road transport - + @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + @@ -332,7 +332,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd index 192c68adb..7c2b43c5b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + @@ -228,7 +228,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd index dfd00f2c2..5e3b0f3a3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -134,7 +134,7 @@ Rail transport, Roads and Road transport - + @@ -327,7 +327,7 @@ Rail transport, Roads and Road transport - + @@ -380,7 +380,7 @@ Rail transport, Roads and Road transport - + @@ -438,7 +438,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd index 78abf9c34..7d0ec188c 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - + @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + @@ -299,7 +299,7 @@ Rail transport, Roads and Road transport - + @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport - + @@ -473,7 +473,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd index a8fb2c8d1..40efc31c2 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd @@ -108,7 +108,7 @@ Rail transport, Roads and Road transport - + @@ -248,7 +248,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd index a927194f3..835b2bcbd 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + @@ -330,7 +330,7 @@ Rail transport, Roads and Road transport - + @@ -392,7 +392,7 @@ Rail transport, Roads and Road transport - + @@ -461,7 +461,7 @@ Rail transport, Roads and Road transport - + @@ -533,7 +533,7 @@ Rail transport, Roads and Road transport - + @@ -602,7 +602,7 @@ Rail transport, Roads and Road transport - + @@ -673,7 +673,7 @@ Rail transport, Roads and Road transport - + @@ -742,7 +742,7 @@ Rail transport, Roads and Road transport - + @@ -845,7 +845,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index fcde361c9..84642dd7c 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -1,4 +1,4 @@ - + @@ -799,7 +799,7 @@ Rail transport, Roads and Road transport - + @@ -897,7 +897,7 @@ Rail transport, Roads and Road transport - + @@ -972,7 +972,7 @@ Rail transport, Roads and Road transport - + @@ -1013,7 +1013,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd index 22b9cf71a..6d2e88b62 100644 --- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd @@ -92,7 +92,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -197,7 +197,7 @@ Rail transport, Roads and Road transport - + @@ -255,7 +255,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -322,7 +322,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -392,7 +392,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -440,7 +440,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -519,7 +519,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -602,7 +602,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -670,7 +670,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -814,7 +814,7 @@ Rail transport, Roads and Road transport - + @@ -872,7 +872,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd index 58dd9f87a..0162e82de 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd @@ -150,7 +150,7 @@ Rail transport, Roads and Road transport - + @@ -250,7 +250,7 @@ Rail transport, Roads and Road transport - + @@ -466,7 +466,7 @@ Rail transport, Roads and Road transport - + @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd index 8f4db9d67..df1b5b97e 100644 --- a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd @@ -503,7 +503,7 @@ The RULE STEP RESULT Adjustment Amount is the difference beteen the original i - + diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd index 4606dfa01..065bf668e 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -145,7 +145,7 @@ Rail transport, Roads and Road transport - + @@ -222,7 +222,7 @@ Rail transport, Roads and Road transport - + @@ -357,7 +357,7 @@ Rail transport, Roads and Road transport - + @@ -406,7 +406,7 @@ Rail transport, Roads and Road transport - + @@ -474,7 +474,7 @@ Rail transport, Roads and Road transport - + @@ -532,7 +532,7 @@ Rail transport, Roads and Road transport - + @@ -585,7 +585,7 @@ Rail transport, Roads and Road transport - + @@ -633,7 +633,7 @@ Rail transport, Roads and Road transport - + @@ -704,7 +704,7 @@ Rail transport, Roads and Road transport - + @@ -826,7 +826,7 @@ Rail transport, Roads and Road transport - + @@ -889,7 +889,7 @@ Rail transport, Roads and Road transport - + @@ -949,7 +949,7 @@ Rail transport, Roads and Road transport - + @@ -1052,7 +1052,7 @@ Rail transport, Roads and Road transport - + Identifier of CHARGING MOMENT. @@ -1105,7 +1105,7 @@ Rail transport, Roads and Road transport - + @@ -1167,7 +1167,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd index 0ae939a12..7e0e39173 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd @@ -126,7 +126,7 @@ - + relative number of series for same OD pair (TAP Route number) -v2.0 @@ -312,7 +312,7 @@ - + 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 67c95225d..d4d2aa3f7 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + @@ -371,7 +371,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -428,7 +428,7 @@ Rail transport, Roads and Road transport - + @@ -570,7 +570,7 @@ Rail transport, Roads and Road transport - + @@ -634,7 +634,7 @@ Rail transport, Roads and Road transport - + @@ -679,7 +679,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd index 243b1688a..6953e7fd6 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport - + @@ -201,7 +201,7 @@ Rail transport, Roads and Road transport - + @@ -254,7 +254,7 @@ Rail transport, Roads and Road transport - + @@ -294,7 +294,7 @@ Rail transport, Roads and Road transport - + @@ -337,7 +337,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_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd index 2d730e6ed..232a9b8e2 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -186,7 +186,7 @@ Rail transport, Roads and Road transport - + @@ -362,7 +362,7 @@ Rail transport, Roads and Road transport - + @@ -507,7 +507,7 @@ Rail transport, Roads and Road transport - + @@ -795,7 +795,7 @@ Rail transport, Roads and Road transport Order in which FARE TABLE COLUMN HEADING is to appear in a view. -v2.0 - + @@ -882,7 +882,7 @@ Rail transport, Roads and Road transport - + Order in which FARE TABLE ROW is to appear in a view. -v2.0 @@ -965,7 +965,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd index 4216bde73..fa6bb2348 100644 --- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd @@ -133,7 +133,7 @@ Rail transport, Roads and Road transport - + Identifier of a GEOGRAPHICAL UNIT. @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + @@ -309,7 +309,7 @@ Rail transport, Roads and Road transport - + @@ -389,7 +389,7 @@ Rail transport, Roads and Road transport - + @@ -460,7 +460,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd index 663faca58..f37a86812 100644 --- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport - + @@ -209,7 +209,7 @@ Rail transport, Roads and Road transport - + @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + @@ -376,7 +376,7 @@ Rail transport, Roads and Road transport - + @@ -434,7 +434,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd index a98e17874..f385ea20f 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd @@ -146,7 +146,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -260,7 +260,7 @@ Rail transport, Roads and Road transport - + @@ -328,7 +328,7 @@ Rail transport, Roads and Road transport - + @@ -417,7 +417,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd index adef547ea..96d09aa99 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport - + @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd index 87485a8bd..173a11f5c 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport - + @@ -305,7 +305,7 @@ Rail transport, Roads and Road transport - + @@ -393,7 +393,7 @@ Rail transport, Roads and Road transport - + @@ -456,7 +456,7 @@ Rail transport, Roads and Road transport - + @@ -508,7 +508,7 @@ Rail transport, Roads and Road transport - + @@ -577,7 +577,7 @@ Rail transport, Roads and Road transport - + @@ -639,7 +639,7 @@ Rail transport, Roads and Road transport - + @@ -808,7 +808,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd index 8ca2943cf..f433d0fef 100644 --- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport - + @@ -213,7 +213,7 @@ Rail transport, Roads and Road transport - + @@ -319,7 +319,7 @@ Rail transport, Roads and Road transport - + @@ -370,7 +370,7 @@ Rail transport, Roads and Road transport - + @@ -435,7 +435,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd index 7581c9904..ab20f047e 100644 --- a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd @@ -162,7 +162,7 @@ Rail transport, Roads and Road transport - + @@ -250,7 +250,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index 2bc9770c5..c8c1ea1fc 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + @@ -278,7 +278,7 @@ Rail transport, Roads and Road transport - + @@ -350,7 +350,7 @@ Rail transport, Roads and Road transport - + @@ -423,7 +423,7 @@ Rail transport, Roads and Road transport - + @@ -472,7 +472,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd index dc46326b1..31eb99682 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + @@ -188,7 +188,7 @@ Rail transport, Roads and Road transport - + @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + @@ -369,7 +369,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd index 217fd49d5..fb32ad206 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd @@ -91,7 +91,7 @@ Rail transport, Roads and Road transport - + @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + @@ -234,7 +234,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd index 940cc61eb..2ba327cfe 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd @@ -97,7 +97,7 @@ Rail transport, Roads and Road transport - + @@ -229,7 +229,7 @@ Rail transport, Roads and Road transport - + @@ -290,7 +290,7 @@ Rail transport, Roads and Road transport - + @@ -442,7 +442,7 @@ Rail transport, Roads and Road transport - + @@ -528,7 +528,7 @@ Rail transport, Roads and Road transport - + @@ -622,7 +622,7 @@ Rail transport, Roads and Road transport - + @@ -670,7 +670,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF PROOF . @@ -714,7 +714,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd index 4eb54722c..12e04838c 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + @@ -144,7 +144,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd index 908f32cd7..6222f0576 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd index 51f888d27..3aa183196 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport - + @@ -171,7 +171,7 @@ Rail transport, Roads and Road transport - + @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + @@ -314,7 +314,7 @@ Rail transport, Roads and Road transport - + @@ -389,7 +389,7 @@ Rail transport, Roads and Road transport - + @@ -559,7 +559,7 @@ Rail transport, Roads and Road transport - + @@ -638,7 +638,7 @@ Rail transport, Roads and Road transport - + @@ -727,7 +727,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd index 7a50bd8fa..b1b62efd6 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd @@ -116,7 +116,7 @@ Rail transport, Roads and Road transport - + @@ -181,7 +181,7 @@ Rail transport, Roads and Road transport - + @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd index 6df64144f..a3b71c355 100644 --- a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - + @@ -239,7 +239,7 @@ Rail transport, Roads and Road transport - + @@ -312,7 +312,7 @@ Rail transport, Roads and Road transport - + @@ -386,7 +386,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -457,7 +457,7 @@ Rail transport, Roads and Road transport - + 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 e7220578c..d7b8ed236 100644 --- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd @@ -116,7 +116,7 @@ Rail transport, Roads and Road transport - + @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport - + 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 d95c72b4d..df7d0730e 100644 --- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd index 54e984920..e8c8f2680 100644 --- a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd +++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -179,7 +179,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd index aed95dce8..1bfff4b24 100644 --- a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd +++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd @@ -96,7 +96,7 @@ Rail transport, Roads and Road transport - + @@ -210,7 +210,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd index 30f77c3de..126ad598e 100644 --- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd +++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd @@ -118,7 +118,7 @@ Rail transport, Roads and Road transport - + @@ -254,7 +254,7 @@ Rail transport, Roads and Road transport - + @@ -335,7 +335,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd index 144c24cdd..d31ac011f 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd @@ -68,7 +68,7 @@ Rail transport, Roads and Road transport - + Identifier of CUSTOMER ELIGIBILITY. @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - + Identifier of USER PROFILE ELIGIBILITY. @@ -175,7 +175,7 @@ Rail transport, Roads and Road transport - + Identifier of COMMERCIAL PROFILE ELIGIBILITY. @@ -226,7 +226,7 @@ Rail transport, Roads and Road transport - + Identifier of RESIDENTIAL QUALIFICATION ELIGIBILITY. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_version.xsd index 800607fe5..d459eb9d1 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_version.xsd @@ -96,7 +96,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd index eaf21d2cc..67e377543 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + @@ -292,7 +292,7 @@ Rail transport, Roads and Road transport - + @@ -357,7 +357,7 @@ Rail transport, Roads and Road transport - + @@ -422,7 +422,7 @@ Rail transport, Roads and Road transport - + @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport - + @@ -689,7 +689,7 @@ Rail transport, Roads and Road transport - + @@ -777,7 +777,7 @@ Rail transport, Roads and Road transport - + @@ -870,7 +870,7 @@ Rail transport, Roads and Road transport - + @@ -942,7 +942,7 @@ Rail transport, Roads and Road transport - + 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 2b04c4daa..3bc524618 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_fareDebit_version.xsd @@ -103,7 +103,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - + @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport - + @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - + @@ -282,7 +282,7 @@ Rail transport, Roads and Road transport - + @@ -324,7 +324,7 @@ Rail transport, Roads and Road transport - + 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 2b467fcb7..d5ab6ceea 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd @@ -119,7 +119,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -184,7 +184,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -220,7 +220,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -259,7 +259,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -322,7 +322,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -390,7 +390,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -441,7 +441,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF MEDIUM ACCESS DEVICE. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd index 9c419f538..a9a5b2e12 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - + Identifier of RETAIL CONSORTIUM. @@ -238,7 +238,7 @@ Rail transport, Roads and Road transport - + Identifier of RETAIL DEVICE. @@ -313,7 +313,7 @@ Rail transport, Roads and Road transport - + @@ -344,7 +344,7 @@ Rail transport, Roads and Road transport - + Identifier of RETAIL DEVICE SECURITY LISTING. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd index 424276807..891ba0c6f 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -354,7 +354,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -455,7 +455,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -534,7 +534,7 @@ Rail transport, Roads and Road transport - + @@ -575,7 +575,7 @@ Rail transport, Roads and Road transport - + @@ -620,7 +620,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -750,7 +750,7 @@ Rail transport, Roads and Road transport - + @@ -795,7 +795,7 @@ Rail transport, Roads and Road transport - + @@ -834,7 +834,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -889,7 +889,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -944,7 +944,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd index 0c05c8fa2..026c8d07f 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_version.xsd index fe8386532..0f7f2eb4d 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_spotAllocation_version.xsd @@ -96,7 +96,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -179,7 +179,7 @@ Rail transport, Roads and Road transport - + Identifier of PASSENGER SPOT ALLOCATION. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd index d5d5ab33a..d6cc4a928 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport - + @@ -194,7 +194,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd index af1d5dc02..cf9e8ed5d 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd @@ -87,7 +87,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -162,7 +162,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd index 6775cb850..f5e724270 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd @@ -117,7 +117,7 @@ Rail transport, Roads and Road transport - + @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - + @@ -325,7 +325,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_version.xsd index 6380e7a08..eddf17689 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_version.xsd @@ -86,7 +86,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_version.xsd index 854c4dbf6..c8b7089ae 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_version.xsd @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport - + @@ -157,7 +157,7 @@ Rail transport, Roads and Road transport - + @@ -202,7 +202,7 @@ Rail transport, Roads and Road transport - + 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 acaa882bd..c9d89a5ef 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 @@ -115,7 +115,7 @@ Rail transport, Roads and Road transport - + 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 b023b2cdb..ac8eebb4b 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 @@ -119,7 +119,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd index 662390986..c75da0242 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd @@ -91,7 +91,7 @@ Rail transport, Roads and Road transport - + @@ -167,7 +167,7 @@ Rail transport, Roads and Road transport - + @@ -248,7 +248,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd index cf073b16d..912f49982 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd @@ -107,7 +107,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -234,7 +234,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE SHARING PARKING AREA. @@ -303,7 +303,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE POOLING PARKING AREA. @@ -372,7 +372,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE SHARING PARKING BAY. @@ -441,7 +441,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE POOLING PARKING BAY. diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd index c82c6981a..76da6bafa 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE MEETING POINT ASSIGNMENT. @@ -138,7 +138,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_version.xsd index 0fb2f7851..0e2408c02 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_version.xsd @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport - + @@ -163,7 +163,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd index 66d95ddfc..636006e3b 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - + Identifier of MONITORED VEHICLE SHARING PARKING BAY. @@ -211,7 +211,7 @@ Rail transport, Roads and Road transport - + Identifier of PARKING BAY STATUS. @@ -262,7 +262,7 @@ Rail transport, Roads and Road transport - + Identifier of RENTAL AVAILABILITYS. @@ -346,7 +346,7 @@ Rail transport, Roads and Road transport - + Identifier of PARKING BAY STATUS. diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_version.xsd index 8094fefd9..b9ca71178 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_version.xsd @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE SERVICE PLACE ASSIGNMENT. @@ -126,7 +126,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -180,7 +180,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -239,7 +239,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -300,7 +300,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd index f0e198927..186460435 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd @@ -173,7 +173,7 @@ Rail transport, Roads and Road transport - + @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + @@ -311,7 +311,7 @@ Rail transport, Roads and Road transport - + Identifier of TAXI SERVICE @@ -373,7 +373,7 @@ Rail transport, Roads and Road transport - + Identifier of GENERAL POOLIMG SERVICE. @@ -435,7 +435,7 @@ Rail transport, Roads and Road transport - + Identifier of CHAUFFEURED VEHICLE SERVICE @@ -490,7 +490,7 @@ Rail transport, Roads and Road transport - + @@ -572,7 +572,7 @@ Rail transport, Roads and Road transport - + @@ -636,7 +636,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_version.xsd b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_version.xsd index 24b969d36..226c4dc6a 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_version.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_version.xsd @@ -81,7 +81,7 @@ Rail transport, Roads and Road transport - + Identifier of ONLINE SERVICE. @@ -184,7 +184,7 @@ Rail transport, Roads and Road transport - + Identifier of an ONLINE SERVICE. diff --git a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_version.xsd b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_version.xsd index 83f758511..f23615fe9 100644 --- a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_version.xsd +++ b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_version.xsd @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd index d36ff994f..e34932526 100644 --- a/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd +++ b/xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd @@ -103,7 +103,7 @@ Rail transport, Roads and Road transport - + @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport - + From b797e7fe69cfa7523f5252c9f6b4dea7d7372e19 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 13 Oct 2025 04:45:19 +0200 Subject: [PATCH 2/2] Phase 2: restrict objects that did not have the restriction infrastructure yet. --- .../netex_dataSource_version.xsd | 6 +--- .../netex_responsibilitySet_version.xsd | 31 ++++++++++++++++++- .../netex_equipment_support.xsd | 7 +++++ .../netex_equipment_version.xsd | 20 +++++++++++- .../netex_modeOfOperation_version.xsd | 25 ++++++++++++++- .../netex_otherOrganisation_version.xsd | 22 ++++++++++++- .../netex_spotAffinity_version.xsd | 24 +++++++++++++- .../netex_servicePattern_version.xsd | 24 +++++++++++++- .../netex_passingTimes_version.xsd | 1 + .../netex_accessRightParameter_version.xsd | 30 ++++++++++++++++-- .../part3_fares/netex_fareProduct_version.xsd | 23 +++++++++++++- .../part3_fares/netex_fareTable_version.xsd | 21 ++++++++++++- 12 files changed, 219 insertions(+), 15 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd index 15d4cf680..10db571b3 100644 --- a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd @@ -184,11 +184,7 @@ References to a DATA SOURCE are useful in an interoperated computer system. - - - Identity of object from which this object of ENTITY was derived. Normally the same. - - + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd index 8201bd85d..213e79881 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd @@ -237,10 +237,39 @@ Rail transport, Roads and Road transport - + Assignment of a specific RESPONSIBILITY ROLE to a specific organisation and/or subdivision. + + + + + + + + + + + + + + + Description of RESPONSIBILITY ROLE ASSIGNMENT. + + + + + + Identification of holder of responsibility. May be specified to different levels of specificity. + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd index 8b4db5129..7c158aec5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd @@ -282,4 +282,11 @@ Rail transport, Roads and Road transport + + + + Type for identifier of a OTHER PLACE EQUIPMENT. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd index b679f60bf..15e80cf4c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd @@ -252,10 +252,28 @@ Rail transport, Roads and Road transport - + Equipment that may be in a fixed within a SITE. + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd index 9a74f6402..4305e9fe3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -232,7 +232,30 @@ Rail transport, Roads and Road transport - + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd index a5461d3b2..038876970 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd @@ -61,7 +61,27 @@ Rail transport, Roads and Road transport - + + + + + + + + + + + + Details for ORGANISATION. + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd index 658968796..dae33a4c6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd @@ -73,11 +73,33 @@ - + A group of proximate seats suitable for selection for use by a group of travellers, for example, as being side by side, face to face, around a table, near a wheelchair spot, etc. +v2.0 + + + + + + + + + + + + + + Elements for a SPOT AFFINITY. + + + + + + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index d72f3d0c1..05f21f6d0 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -951,10 +951,32 @@ Rail transport, Roads and Road transport - + The use of a SERVICE LINK in a specified order. within a JOURNEY PATTERN or SERVICE PATTERN. + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd index edc839a5b..1faa2c962 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd @@ -132,6 +132,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 84642dd7c..e2c44b3c9 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -1,4 +1,4 @@ - + @@ -219,10 +219,36 @@ Rail transport, Roads and Road transport The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). - + The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). + + + + + + + + + + + + + + + + + + + + + Order in which to show an ASSIGNMENT. In some rare cases order makes no sense. The convention should be that order="1" is set then for all elements. -v2.0 + + + + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd index 065bf668e..4ae2e778c 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -1007,10 +1007,31 @@ Rail transport, Roads and Road transport - + A VALIDABLE ELEMENT as a part of a PRE-ASSIGNED FARE PRODUCT, including its possible order in the set of all VALIDABLE ELEMENTs grouped together to define the access right assigned to that PRE-ASSIGNED FARE PRODUCT. + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd index 232a9b8e2..ad0f5544d 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -337,10 +337,29 @@ Rail transport, Roads and Road transport - + A grouping of prices that may be associated with a DISTANCE MATRIX ELEMENT, FARE STRUCTURE ELEMENT or other PRICEABLE OBJECT. OPTIMIZATION - Alias for FARE TABLE That does not require an ID to be present. + + + + + + + + + + + + + + + + + + +