From 4ec8571d556c975965ab79f5f8d51c7fe91166bb Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 26 Jul 2023 19:52:12 +0200 Subject: [PATCH 01/33] More required IdType fixes --- .../netex_compositeFrame_version.xsd | 2 +- .../netex_generalFrame_version.xsd | 4 +- .../netex_resourceFrame_version.xsd | 2 +- .../netex_serviceCalendarFrame_version.xsd | 2 +- .../netex_acsb_accessibility.xsd | 4 +- .../netex_acsb_passengerMobility.xsd | 4 +- .../netex_alternativeName_version.xsd | 2 +- .../netex_contact_version.xsd | 2 +- .../netex_grouping_version.xsd | 4 +- .../netex_layer_version.xsd | 4 +- .../netex_organisation_version.xsd | 26 +++++------ .../netex_place_version.xsd | 4 +- .../netex_pointAndLinkSequence_version.xsd | 4 +- .../netex_pointAndLink_version.xsd | 10 ++--- .../netex_projection_version.xsd | 12 ++--- .../netex_section_version.xsd | 8 ++-- .../netex_spatialFeature_version.xsd | 8 ++-- .../netex_zoneProjection_version.xsd | 2 +- .../netex_zone_version.xsd | 6 +-- .../netex_dataSource_version.xsd | 7 ++- .../netex_entity_version.xsd | 4 +- .../netex_responsibilitySet_version.xsd | 6 +-- .../netex_typeOfValue_version.xsd | 2 +- .../netex_validityCondition_version.xsd | 6 +-- .../netex_versionDelta_version.xsd | 2 +- .../netex_versionFrame_version.xsd | 4 +- .../netex_version_version.xsd | 4 +- .../netex_access_version.xsd | 2 +- .../netex_address_version.xsd | 4 +- .../netex_availabilityCondition_version.xsd | 6 +-- .../netex_dayType_version.xsd | 6 +-- .../netex_equipmentPlace_version.xsd | 4 +- ...etex_equipmentVehiclePassenger_version.xsd | 4 +- .../netex_equipment_version.xsd | 2 +- .../netex_facility_version.xsd | 10 ++--- .../netex_modeOfOperation_version.xsd | 17 ++++--- .../netex_mode_version.xsd | 4 +- ...ex_nm_chargingEquipmentProfile_version.xsd | 2 +- .../netex_nm_equipmentEnergy_version.xsd | 25 ++++------- .../netex_nm_fleetEquipment_version.xsd | 4 +- .../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_securityList_version.xsd | 6 +-- .../netex_serviceCalendar_version.xsd | 10 ++--- .../netex_serviceRestrictions_version.xsd | 8 ++-- .../netex_topographicPlace_version.xsd | 6 +-- .../netex_trainElement_version.xsd | 8 ++-- .../netex_transportOrganisation_version.xsd | 16 +++---- .../netex_vehicleType_version.xsd | 20 ++++----- .../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 | 22 ++++----- .../netex_ifopt_equipmentParking_version.xsd | 4 +- ...netex_ifopt_equipmentPassenger_version.xsd | 8 ++-- .../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 | 8 ++-- .../netex_ifopt_parking_version.xsd | 18 ++++---- .../part1_ifopt/netex_ifopt_path_version.xsd | 8 ++-- .../netex_ifopt_pointOfInterest_version.xsd | 12 ++--- .../netex_ifopt_serviceFeature_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_site_version.xsd | 8 ++-- .../netex_ifopt_stopPlace_version.xsd | 24 +++++----- .../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 | 4 +- .../netex_route_version.xsd | 16 +++---- .../netex_vehicleAndCrewPoint_version.xsd | 12 ++--- .../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 | 10 ++--- .../netex_timeDemandType_version.xsd | 8 ++-- .../netex_timingPattern_version.xsd | 14 +++--- .../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 | 8 ++-- .../netex_coupledJourney_version.xsd | 10 ++--- .../netex_datedPassingTimes_version.xsd | 2 +- .../netex_datedVehicleJourney_version.xsd | 12 ++--- .../netex_flexibleService_version.xsd | 6 +-- .../netex_interchangeRule_version.xsd | 4 +- .../netex_interchange_version.xsd | 8 ++-- .../netex_journeyAccounting_version.xsd | 2 +- .../netex_serviceJourney_version.xsd | 10 ++--- .../netex_timeDemandProfile_version.xsd | 2 +- .../netex_timeDemandTimes_version.xsd | 4 +- .../netex_vehicleJourneyFrequency_version.xsd | 6 +-- .../netex_vehicleJourneyTimes_version.xsd | 6 +-- .../netex_vehicleJourney_version.xsd | 14 +++--- .../netex_duty_version.xsd | 10 ++--- .../netex_vehicleService_version.xsd | 18 ++++---- .../netex_accessRightParameter_version.xsd | 14 +++--- .../netex_calculationParameters_version.xsd | 26 +++++------ .../netex_distanceMatrixElement_version.xsd | 6 +-- .../part3_fares/netex_farePrice_version.xsd | 2 +- .../part3_fares/netex_fareProduct_version.xsd | 45 +++++++++---------- .../part3_fares/netex_fareSeries_version.xsd | 4 +- .../netex_fareStructureElement_version.xsd | 10 ++--- .../netex_fareStructure_version.xsd | 10 ++--- .../part3_fares/netex_fareTable_version.xsd | 16 +++---- ...etex_geographicStructureFactor_version.xsd | 10 ++--- .../netex_qualityStructureFactor_version.xsd | 8 ++-- .../netex_salesDistribution_version.xsd | 8 ++-- ...x_salesOfferPackageEntitlement_version.xsd | 6 +-- .../netex_salesOfferPackage_version.xsd | 32 ++++++------- .../netex_timeStructureFactor_version.xsd | 10 ++--- .../netex_typeOfTravelDocument_version.xsd | 4 +- ...netex_usageParameterAfterSales_version.xsd | 24 +++++----- .../netex_usageParameterBooking_version.xsd | 6 +-- .../netex_usageParameterCharging_version.xsd | 6 +-- ...etex_usageParameterEligibility_version.xsd | 18 ++++---- ...etex_usageParameterEntitlement_version.xsd | 6 +-- .../netex_usageParameterLuggage_version.xsd | 2 +- .../netex_usageParameterTravel_version.xsd | 16 +++---- .../netex_usageParameter_version.xsd | 9 ++-- .../netex_validableElement_version.xsd | 10 ++--- .../part3_frames/netex_fareFrame_version.xsd | 2 +- .../netex_salesTransactionFrame_version.xsd | 2 +- .../netex_monitoredCall_version.xsd | 6 +-- .../netex_monitoredPassingTimes_version.xsd | 4 +- .../netex_parkingTariff_version.xsd | 6 +-- .../netex_customerEligibility_version.xsd | 6 +-- .../netex_customerPaymentMeans_version.xsd | 2 +- .../netex_customerPurchasePackage_version.xsd | 18 ++++---- .../netex_mediumApplication_version.xsd | 14 +++--- .../netex_retailConsortium_version.xsd | 10 ++--- .../netex_salesContract_version.xsd | 31 ++++++------- .../netex_salesTransaction_version.xsd | 2 +- .../netex_travelDocument_version.xsd | 4 +- ...nm_accessCredentialsAssignment_version.xsd | 7 ++- .../netex_nm_individualTraveller_version.xsd | 17 +++---- ...x_nm_usageParameterEligibility_version.xsd | 5 +-- .../netex_nm_usageParameterRental_version.xsd | 6 +-- .../netex_nm_mobilityJourneyFrame_version.xsd | 2 +- .../netex_nm_mobilityServiceFrame_version.xsd | 2 +- ...x_nm_ParkingCapacityAssignment_version.xsd | 2 +- ..._mobilityServiceConstraintZone_version.xsd | 9 ++-- .../netex_nm_vehicleMeetingPlace_version.xsd | 23 +++++----- ..._vehicleMeetingPointAssignment_version.xsd | 8 ++-- .../netex_nm_vehicleMeetingPoint_version.xsd | 8 ++-- ..._vehicleParkingAreaInformation_version.xsd | 16 +++---- ..._vehicleServicePlaceAssignment_version.xsd | 17 +++---- .../netex_nm_mobilityService_version.xsd | 16 +++---- .../netex_nm_onlineService_version.xsd | 4 +- .../netex_nm_singleJourneyPath_version.xsd | 4 +- .../netex_nm_singleJourneyService_version.xsd | 4 +- xsd/ynotation/netex_thing_version.xsd | 6 +-- 170 files changed, 692 insertions(+), 730 deletions(-) diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd index 01b9c3c30..d720321b5 100644 --- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd @@ -114,7 +114,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 8da1194eb..4a1f3604d 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + @@ -228,7 +228,7 @@ Rail transport, Roads and Road transport - Elements of a GENERAL FRAME MEMBER. Note that VersionOfObjectRef is used too implement ENTITY IN VERSION IN FRAME. + Elements of a GENERAL FRAME MEMBER. Note that VersionOfObjectRef is used to implement ENTITY IN VERSION IN FRAME. diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index ddd5e8e9e..541a0e229 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -84,7 +84,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 20a4ffa89..3b5196caf 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 a5213d0b0..9ec80724d 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 e96588136..967685e32 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_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd index 0acaf4344..1b27aeec0 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. - + Name of source of the data. diff --git a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd index daf5db5d5..9cac53240 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd index 396061e2b..c1afc9d8e 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd @@ -150,7 +150,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -211,7 +211,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 b5a57e020..ed62fcea6 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd @@ -87,12 +87,12 @@ Rail transport, Roads and Road transport - Members of GROUP OF ENTITies. + Members of GROUP OF ENTITies. - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 1ffdb74eb..720af83a1 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -119,7 +119,7 @@ Rail transport, Roads and Road transport - + @@ -348,7 +348,7 @@ Rail transport, Roads and Road transport - + @@ -446,7 +446,7 @@ Rail transport, Roads and Road transport - + @@ -511,7 +511,7 @@ Rail transport, Roads and Road transport - + @@ -567,7 +567,7 @@ Rail transport, Roads and Road transport - + @@ -654,7 +654,7 @@ Rail transport, Roads and Road transport - + @@ -731,7 +731,7 @@ Rail transport, Roads and Road transport - + @@ -818,7 +818,7 @@ Rail transport, Roads and Road transport - Classification of an CODESPACE ASSIGNMENT + Classification of an CODESPACE ASSIGNMENT @@ -834,7 +834,7 @@ Rail transport, Roads and Road transport - + @@ -866,7 +866,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -903,7 +903,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -940,7 +940,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -1030,7 +1030,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 9987b6efa..55e9bc995 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -212,7 +212,7 @@ Rail transport, Roads and Road transport - + @@ -244,7 +244,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 45aceb9f8..7946b5719 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd @@ -222,7 +222,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -274,7 +274,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 6d72c9ef0..1badd0a8b 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 - + @@ -355,7 +355,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -392,7 +392,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -444,7 +444,7 @@ Rail transport, Roads and Road transport - + @@ -508,7 +508,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 a98c73c5d..ebee24476 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + @@ -226,7 +226,7 @@ Rail transport, Roads and Road transport - + @@ -320,7 +320,7 @@ Rail transport, Roads and Road transport - + @@ -386,7 +386,7 @@ Rail transport, Roads and Road transport - + @@ -460,7 +460,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -515,7 +515,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 f592fc9b4..bae25dc0f 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. @@ -346,12 +346,12 @@ Rail transport, Roads and Road transport - Whether link is navigated in to / from, i.e. reverse direction . Default is false, i.e. from to. + Whether link is navigated in to / from, i.e. reverse direction. Default is false, i.e. from to. - + 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 723a1ebea..06efae784 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. @@ -220,7 +220,7 @@ Rail transport, Roads and Road transport - Reference to a SIMPLE FEATURe. + Reference to a SIMPLE FEATURE. @@ -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 c0fbf964e..bd1ee251c 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 95163aca1..6a35e03b8 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - + @@ -207,7 +207,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF TARIFF ZONE. @@ -264,7 +264,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 76bbd7c0f..02f819305 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. @@ -184,6 +184,11 @@ References to a DATA SOURCE are useful in an interoperated computer system. + + + Identifier of Branding + + Identity of object from which this object of ENTITY was derived. Normally the same. diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd index 9e33a0022..829517e16 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd @@ -100,9 +100,9 @@ Rail transport, Roads and Road transport - + - Identifier of CODESPACE. May be the same as Xmlns prefix. + Identifier of CODESPACE. Maybe 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 a72b6bcb4..a9a101a4a 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport - + Identifier of RESPONSIBILITY SET. @@ -193,7 +193,7 @@ Rail transport, Roads and Road transport - + Identifier of RESPONSIBILITY SET. @@ -330,7 +330,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 4db6c2639..7b9f37dd1 100644 --- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd @@ -165,7 +165,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 ea88cc249..2a0bd12da 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport - + @@ -208,7 +208,7 @@ Rail transport, Roads and Road transport - + @@ -292,7 +292,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd index 5102e9ea4..342d9a51b 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd @@ -142,7 +142,7 @@ Rail transport, Roads and Road transport - A record of the detailed changes of a given ENTITY IN VERSION from one VERSION to the next one. A DELTA contains pairs of attributes' old values - new values. + A record of the detailed changes of a given ENTITY IN VERSION from one VERSION to the next one. A DELTA contains pairs of attributes' old values - new values. diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd index 8141be879..f8f51ebe1 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 4eb39b822..b6bd43ac9 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 a461d3949..792a3efdc 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 86fe34f8e..8d63575d6 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 7de00e5a3..62a8ef731 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. @@ -287,7 +287,7 @@ Rail transport, Roads and Road transport - Simple version of an AVAILABILITY CONDITION used in order to characterise a given VERSION of a VERSION FRAME. Comprises a simple period and DAY TYPE. + Simple version of an AVAILABILITY CONDITION used in order to characterise a given VERSION of a VERSION FRAME. Comprises a simple period and DAY TYPE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd index 8ac7b22b7..e47cd8f08 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport - + @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - + @@ -361,7 +361,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 aa6215c09..ed3991d0c 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 0e8d7e5c8..8f53f7e2a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -149,7 +149,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_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd index ee9dcf6f9..72fb1de25 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd @@ -278,7 +278,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 fcce32eb5..a3692b140 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - + @@ -444,7 +444,7 @@ Rail transport, Roads and Road transport - + @@ -549,7 +549,7 @@ Rail transport, Roads and Road transport - + @@ -594,7 +594,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -690,7 +690,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 fd16d6282..4be063442 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -229,8 +229,7 @@ Rail transport, Roads and Road transport - Passenger transport operation linked to a fixed network/schedule but offering flexibility, in order for instance, to optimise the service or to satisfy passenger demand. +v1.2.2 - + Passenger transport operation linked to a fixed network/schedule but offering flexibility, in order for instance, to optimise the service or to satisfy passenger demand. +v1.2.2 @@ -289,7 +288,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -329,7 +328,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE RENTAL MODE OF OPERATION. @@ -390,7 +389,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -444,7 +443,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -505,12 +504,12 @@ Rail transport, Roads and Road transport - Allowed values for PERSONAL MODE. OF OPERATION + Allowed values for PERSONAL MODE OF OPERATION - + @@ -561,7 +560,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 4ce16b843..012d1dac2 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 9ff17117d..4e47afe9c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. 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 8ff34ee2f..9bfd7a4f7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -84,7 +84,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -162,7 +162,7 @@ points cannot exceed this value. - + Identifier of ENTITY. @@ -217,7 +217,7 @@ points cannot exceed this value. - + Identifier of ENTITY. @@ -245,29 +245,22 @@ points cannot exceed this value. - Battery capacity stated by the manufacturer in Watt Hours [Wh] - + Battery capacity stated by the manufacturer in Watt Hours [Wh] - Usable battery capacity stated in Watt Hours [Wh] - - + Usable battery capacity stated in Watt Hours [Wh] - Voltage for battery in volts. - + Voltage for battery in volts. - Maximum charging power of the grid -supply [W]. The sum of the current -power of all connected charging -points cannot exceed this value. + Maximum charging power of the grid supply [W]. The sum of the current power of all connected charging points cannot exceed this value. @@ -292,7 +285,7 @@ points cannot exceed this value. - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -329,7 +322,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 db59be5ac..a08429869 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd @@ -167,7 +167,7 @@ Rail transport, Roads and Road transport - + Identifier of CAR MODEL PROFILE. @@ -287,7 +287,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 a5096a522..e09b8960f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport - + Identifier of FLEET. @@ -153,7 +153,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 56f12a329..5fc7cfdd1 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 b4939c303..98c38e9ed 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd @@ -101,7 +101,7 @@ Rail transport, Roads and Road transport - + @@ -207,7 +207,7 @@ Rail transport, Roads and Road transport - + @@ -271,7 +271,7 @@ Rail transport, Roads and Road transport - + @@ -303,7 +303,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 879f12aef..e220e8346 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 2d70b6ba9..f15be6c8f 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_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd index 6fe17ebe1..bb1fc01a3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd @@ -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_serviceCalendar_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd index 5bb9b23de..d1993f4fe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - + @@ -286,7 +286,7 @@ Rail transport, Roads and Road transport - + @@ -379,7 +379,7 @@ Rail transport, Roads and Road transport - + @@ -471,7 +471,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -549,7 +549,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 7204af5b5..1d97fda27 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -98,7 +98,7 @@ Rail transport, Roads and Road transport - + Identifier of CLASS OF USE. @@ -254,7 +254,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF PAYMENT METHOD. @@ -324,7 +324,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF SERVICE. @@ -363,7 +363,7 @@ Rail transport, Roads and Road transport - + Reference to a TYPE OF PRODUCT CATEGORY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd index 5e8b16bed..bb10f6966 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. @@ -403,7 +403,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index f40bb3cf2..e74141ead 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport - + @@ -272,7 +272,7 @@ Rail transport, Roads and Road transport - + @@ -322,7 +322,7 @@ Rail transport, Roads and Road transport - + @@ -419,7 +419,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 4e9be603e..7cdf8fb98 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd @@ -305,7 +305,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATOR. @@ -353,7 +353,7 @@ Rail transport, Roads and Road transport - + Identifier of AUTHORITY. @@ -409,7 +409,7 @@ Rail transport, Roads and Road transport - + Identifier of GROUP OF OPERATORs. @@ -466,7 +466,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATIONAL CONTEXT. @@ -537,7 +537,7 @@ Rail transport, Roads and Road transport - + Identifier of OPERATING DEPARTMENT. @@ -629,9 +629,9 @@ Rail transport, Roads and Road transport - + - Identifier of CONTROL CENTRE. + Identifier of CONTROL CENTRE. @@ -699,7 +699,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 62fe9f55d..8cf487d7f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -117,7 +117,7 @@ Rail transport, Roads and Road transport - + Identifier of TRANSPORT TYPE. @@ -234,7 +234,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE TYPE. @@ -413,7 +413,7 @@ Rail transport, Roads and Road transport - + Identifier of PERSONAL TRANSPORT TYPE. @@ -532,7 +532,7 @@ Rail transport, Roads and Road transport - + Identifier of PASSENGER CARRYING REQUIREMENT. @@ -743,7 +743,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE MANOEVRING REQUIREMENT. @@ -856,7 +856,7 @@ Rail transport, Roads and Road transport - + Identifier of FACILITY REQUIREMENT. @@ -925,7 +925,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE. @@ -1018,7 +1018,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE MODEL. @@ -1085,7 +1085,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE EQUIPMENT PROILE. @@ -1153,7 +1153,7 @@ Rail transport, Roads and Road transport - + Identifier of PURPOSE OF EQUIMENT PROFILE. 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 8bc9a71aa..34cf182c9 100644 --- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd @@ -105,7 +105,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 eacd4a944..5492aa785 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -111,7 +111,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 050fddfdd..5953f6074 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd @@ -102,7 +102,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 b4a8f4198..707ac193a 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 @@ -164,7 +164,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. @@ -301,7 +301,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + @@ -387,7 +387,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + @@ -451,7 +451,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 0f05acb5d..366b2d0db 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 @@ -211,7 +211,7 @@ Rail transport, Roads and Road transport - + @@ -278,7 +278,7 @@ Rail transport, Roads and Road transport - + @@ -432,7 +432,7 @@ Rail transport, Roads and Road transport - + @@ -506,7 +506,7 @@ Rail transport, Roads and Road transport - + @@ -589,7 +589,7 @@ Rail transport, Roads and Road transport - + @@ -662,7 +662,7 @@ Rail transport, Roads and Road transport - + @@ -749,7 +749,7 @@ Rail transport, Roads and Road transport - + @@ -982,7 +982,7 @@ Rail transport, Roads and Road transport - + @@ -1081,7 +1081,7 @@ Rail transport, Roads and Road transport - + @@ -1277,7 +1277,7 @@ Rail transport, Roads and Road transport - + @@ -1351,7 +1351,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 a3df83656..b3c069035 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 eb933ace0..5d2238152 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 @@ -131,7 +131,7 @@ Rail transport, Roads and Road transport - + @@ -265,7 +265,7 @@ Rail transport, Roads and Road transport - + @@ -368,7 +368,7 @@ Rail transport, Roads and Road transport - + @@ -452,7 +452,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 55473b8c7..5d5299323 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. @@ -278,7 +278,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -365,7 +365,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 3fe5a01c3..cfd6f5f0d 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. @@ -316,7 +316,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -382,7 +382,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -459,7 +459,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -526,7 +526,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 956f6a13f..f60808062 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 0344eaa92..de86ce0d1 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 dec3250d4..812c6a23e 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 6883f9530..a63377c80 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 @@ -217,7 +217,7 @@ Rail transport, Roads and Road transport - + @@ -335,7 +335,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -438,7 +438,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -514,7 +514,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 7e4d37405..2dfc79143 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. @@ -425,7 +425,7 @@ Rail transport, Roads and Road transport - + @@ -503,7 +503,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -565,7 +565,7 @@ Rail transport, Roads and Road transport - + @@ -689,7 +689,7 @@ Rail transport, Roads and Road transport - + @@ -782,7 +782,7 @@ Rail transport, Roads and Road transport - + @@ -892,7 +892,7 @@ Rail transport, Roads and Road transport - + @@ -1000,7 +1000,7 @@ Rail transport, Roads and Road transport - + @@ -1081,7 +1081,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 862a4f4b3..96c08ca92 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 @@ -215,7 +215,7 @@ Rail transport, Roads and Road transport - + @@ -351,7 +351,7 @@ Rail transport, Roads and Road transport - + @@ -421,7 +421,7 @@ Rail transport, Roads and Road transport - + @@ -502,7 +502,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 5a0996be5..738514a69 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 0a0ca2888..dde043eec 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 49ad9f364..56f494e69 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 @@ -484,7 +484,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE ENTRANCE. @@ -553,7 +553,7 @@ Rail transport, Roads and Road transport - + @@ -658,7 +658,7 @@ Rail transport, Roads and Road transport - + @@ -728,7 +728,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 59b2831c0..ae7573cc5 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 @@ -180,7 +180,7 @@ Rail transport, Roads and Road transport - + Identifier of STOP PLACE. @@ -486,7 +486,7 @@ contained within its parent QUAY. - + Identifier of QUAY. @@ -707,7 +707,7 @@ contained within its parent QUAY. - + Identifier of ACCESS SPACE. @@ -813,7 +813,7 @@ contained within its parent QUAY. - + Identifier of BOARDING POSITION. @@ -894,7 +894,7 @@ contained within its parent QUAY. - + Identifier of STOP PLACE ENTRANCE. @@ -968,7 +968,7 @@ contained within its parent QUAY. - + Identifier of STOP PLACE ENTRANCE. @@ -1044,7 +1044,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE STOPPING POSITION. @@ -1154,7 +1154,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE STOPPING POSITION. @@ -1234,7 +1234,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE QUAY ALIGNMENT. @@ -1304,7 +1304,7 @@ contained within its parent QUAY. - + Identifier of VEHICLE POSTION ALIGNMENT. @@ -1362,7 +1362,7 @@ contained within its parent QUAY. - + Identifier of GROUP of STOP PLACEs. @@ -1450,7 +1450,7 @@ contained within its parent QUAY. - + Identifier of Object of which this is a view. 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 839197dd6..bf9f22973 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + Identifier of TAXI RANK. @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - + @@ -289,7 +289,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 6fa5e40fb..7ff691a67 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd @@ -165,7 +165,7 @@ Rail transport, Roads and Road transport - + @@ -223,7 +223,7 @@ Rail transport, Roads and Road transport - + @@ -281,7 +281,7 @@ Rail transport, Roads and Road transport - + @@ -316,7 +316,7 @@ Rail transport, Roads and Road transport - + @@ -361,7 +361,7 @@ Rail transport, Roads and Road transport - + @@ -433,7 +433,7 @@ Rail transport, Roads and Road transport - + @@ -492,7 +492,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 657717014..7bfa70b8e 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd @@ -75,7 +75,7 @@ Rail transport, Roads and Road transport - + @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport - + @@ -190,7 +190,7 @@ Rail transport, Roads and Road transport - + @@ -266,7 +266,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 6a48c0ebc..d2dd4d7fd 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 62e982a4a..eec334cb0 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -200,7 +200,7 @@ Rail transport, Roads and Road transport - + @@ -322,7 +322,7 @@ Rail transport, Roads and Road transport - + @@ -565,7 +565,7 @@ Rail transport, Roads and Road transport - + @@ -628,7 +628,7 @@ Rail transport, Roads and Road transport - + @@ -755,7 +755,7 @@ Rail transport, Roads and Road transport - + @@ -905,7 +905,7 @@ Rail transport, Roads and Road transport - + @@ -1114,7 +1114,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 8ec189db1..4cface079 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 df72bca67..ce661834e 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 - + @@ -338,7 +338,7 @@ Rail transport, Roads and ROAD transport - + Identifier of ENTITY. @@ -428,7 +428,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 9d2a51455..bcd3ef2cb 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -91,7 +91,7 @@ Rail transport, Roads and Road transport - + @@ -118,7 +118,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 f0b599701..97998b409 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 - + @@ -508,7 +508,7 @@ Rail transport, Roads and Road transport - + @@ -564,7 +564,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. @@ -630,7 +630,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 1ed2ee029..1dea85ae4 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. @@ -327,7 +327,7 @@ Rail transport, Roads and Road transport - + Identifier of GARAGE POINT. @@ -384,9 +384,9 @@ Rail transport, Roads and Road transport - + - Identifier of GARAGE. + 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 b6bf89ab8..020e7a60b 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 7ec6854b5..342716aae 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 5d88a114c..5b9a60b3b 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 5377cc9ed..aeaefe154 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd @@ -118,7 +118,7 @@ Rail transport, Roads and Road transport - + @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport - + @@ -300,7 +300,7 @@ Rail transport, Roads and Road transport - + @@ -402,7 +402,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -471,7 +471,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 ebdbcdb6b..157e23081 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 f8dce69d0..57d457252 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -143,7 +143,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + @@ -211,7 +211,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + @@ -350,7 +350,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. Order in which to show ASSIGNMENT, - + Identifier of DISPLAY ASSIGNMENT. @@ -429,7 +429,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 36db8ea1f..416c0fc3c 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 d1afb3977..2190f1cd5 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + @@ -215,7 +215,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -292,7 +292,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 a5efdce6f..268d59c25 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + @@ -391,7 +391,7 @@ Rail transport, Roads and Road transport - + @@ -455,7 +455,7 @@ Rail transport, Roads and Road transport - + @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport - + @@ -620,7 +620,7 @@ Rail transport, Roads and Road transport - + @@ -694,7 +694,7 @@ Rail transport, Roads and Road transport - + @@ -786,7 +786,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 21261b3cc..eb90eb515 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 20fcf2cb7..80ed1f4ad 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - + @@ -246,7 +246,7 @@ Rail transport, Roads and Road transport - + @@ -316,7 +316,7 @@ Rail transport, Roads and Road transport - + @@ -384,7 +384,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. @@ -462,7 +462,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 d968bb1fe..f53271631 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + @@ -239,7 +239,7 @@ Rail transport, Roads and Road transport - + @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + @@ -332,7 +332,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 bcf3a54c9..245db9f26 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 - + @@ -566,7 +566,7 @@ Rail transport, Roads and Road transport - + Identifier of TIMING LINK of which this is a view. 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 a0be96d7a..4a3fb85fa 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 be397201c..fc0a73cfc 100644 --- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd @@ -101,7 +101,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 4aabad0c7..7e224d4a7 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -81,7 +81,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 9b7a3ceef..515be1558 100644 --- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd @@ -26,7 +26,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 84fd7388b..fd8636720 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd @@ -109,7 +109,7 @@ Rail transport, Roads and Road transport --> - + @@ -136,7 +136,7 @@ Rail transport, Roads and Road transport --> - + Identifier of ENTITY. @@ -473,7 +473,7 @@ Rail transport, Roads and Road transport - + @@ -515,7 +515,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 db0366d9a..77f44c620 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -145,7 +145,7 @@ Rail transport, Roads and Road transport - + @@ -284,7 +284,7 @@ of the corresponding VEHICLE TYPE. true for forward. - + @@ -359,7 +359,7 @@ of the corresponding VEHICLE TYPE. true for forward. - + @@ -431,7 +431,7 @@ of the corresponding VEHICLE TYPE. true for forward. - + @@ -526,7 +526,7 @@ of the corresponding VEHICLE TYPE. true for forward. - + 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 9c2c0c955..917b3859f 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 2df9f7ad9..78a36e790 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. @@ -228,7 +228,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -286,7 +286,7 @@ The VIEW includes derived ancillary data from referenced entities. - + Identifier of NORMAL DATED VEHICLE JORUNEY. @@ -346,18 +346,18 @@ The VIEW includes derived ancillary data from referenced entities. - PASSING TIMEs for JOURNEY. + PASSING TIMEs for JOURNEY. - DATED CALLs for JOURNEY. + DATED CALLs for JOURNEY. - + Identifier of ENTITY. 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 f0eb0fdf1..1b39bc165 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport - + @@ -187,7 +187,7 @@ Rail transport, Roads and Road transport - + @@ -232,7 +232,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 5a747e6e5..cab163621 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 1dccc4ade..7fad871a3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport - + @@ -337,7 +337,7 @@ Rail transport, Roads and Road transport - + @@ -578,7 +578,7 @@ Default is false. - + @@ -634,7 +634,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 a1e066cf9..8ba584213 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd @@ -123,7 +123,7 @@ Rail transport, Roads and Road transport - + 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 d7752cc00..9ac22d671 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. - + @@ -441,7 +441,7 @@ The VIEW includes derived ancillary data from referenced entities. - + @@ -686,7 +686,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 6fbd8a3d7..4081b2672 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 - + 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 f88e760f9..efe42a889 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 d86f30cce..a2f4f2d25 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 - + @@ -265,7 +265,7 @@ Rail transport, Roads and Road transport - + @@ -319,7 +319,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 589c4daa4..c0b3d15cf 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 2cb42aad4..b764b12be 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + @@ -323,7 +323,7 @@ Rail transport, Roads and Road transport - + @@ -377,7 +377,7 @@ Rail transport, Roads and Road transport - + @@ -453,7 +453,7 @@ Rail transport, Roads and Road transport - + @@ -525,7 +525,7 @@ Rail transport, Roads and Road transport - + @@ -576,7 +576,7 @@ Rail transport, Roads and Road transport - + @@ -632,7 +632,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 c5ef0c65d..1ff47adc5 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_vehicleService_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd index c6b38cd5c..74ed22806 100644 --- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd +++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd @@ -163,7 +163,7 @@ Rail transport, Roads and Road transport - + @@ -324,7 +324,7 @@ Rail transport, Roads and Road transport - + @@ -386,7 +386,7 @@ Rail transport, Roads and Road transport - + @@ -455,7 +455,7 @@ Rail transport, Roads and Road transport - + @@ -527,7 +527,7 @@ Rail transport, Roads and Road transport - + @@ -596,7 +596,7 @@ Rail transport, Roads and Road transport - + @@ -667,7 +667,7 @@ Rail transport, Roads and Road transport - + @@ -736,7 +736,7 @@ Rail transport, Roads and Road transport - + @@ -835,7 +835,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 5e392fc7d..09590bcdc 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -186,14 +186,12 @@ 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.). - 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.). @@ -673,7 +671,7 @@ Rail transport, Roads and Road transport - + @@ -771,7 +769,7 @@ Rail transport, Roads and Road transport - + @@ -846,7 +844,7 @@ Rail transport, Roads and Road transport - + @@ -889,7 +887,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 1d021cab6..1459c155e 100644 --- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd @@ -76,7 +76,7 @@ Rail transport, Roads and Road transport - Parameters governing the calculation of fares. + Parameters governing the calculation of fares. @@ -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. @@ -392,7 +392,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -424,7 +424,7 @@ Rail transport, Roads and Road transport - Days before (negative) or after (positive) the start of the month that a product with a calendar period driven activation becomes valid. + Days before (negative) or after (positive) the start of the month that a product with a calendar period driven activation becomes valid. @@ -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. @@ -785,7 +785,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 4e22285a2..31b196bdf 100644 --- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd @@ -148,7 +148,7 @@ Rail transport, Roads and Road transport - + @@ -243,7 +243,7 @@ Rail transport, Roads and Road transport - + @@ -459,7 +459,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 1d90fe9f9..aa4a22ec6 100644 --- a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd @@ -499,7 +499,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 75698aed4..511476738 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -119,14 +119,12 @@ Rail transport, Roads and Road transport - An immaterial marketable element - + An immaterial marketable element - An immaterial marketable element dedicated to accessing some services. - + An immaterial marketable element dedicated to accessing some services. @@ -145,7 +143,7 @@ Rail transport, Roads and Road transport - + @@ -220,7 +218,7 @@ Rail transport, Roads and Road transport - + @@ -334,8 +332,7 @@ Rail transport, Roads and Road transport - A classification of FARE PRODUCTs expressing their general functionalities and local functional characteristics specific to the operator. Types of FARE PRODUCTs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. - + A classification of FARE PRODUCTs expressing their general functionalities and local functional characteristics specific to the operator. Types of FARE PRODUCTs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. @@ -352,7 +349,7 @@ Rail transport, Roads and Road transport - + @@ -402,7 +399,7 @@ Rail transport, Roads and Road transport - + @@ -472,7 +469,7 @@ Rail transport, Roads and Road transport - + @@ -530,7 +527,7 @@ Rail transport, Roads and Road transport - + @@ -584,7 +581,7 @@ Rail transport, Roads and Road transport - + @@ -633,7 +630,7 @@ Rail transport, Roads and Road transport - + @@ -704,7 +701,7 @@ Rail transport, Roads and Road transport - + @@ -828,7 +825,7 @@ Rail transport, Roads and Road transport - + @@ -892,7 +889,7 @@ Rail transport, Roads and Road transport - + @@ -953,7 +950,7 @@ Rail transport, Roads and Road transport - + @@ -1013,8 +1010,7 @@ 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. - + 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. @@ -1041,8 +1037,7 @@ Rail transport, Roads and Road transport - A classification of FARE PRODUCTs according to the payment method and the account location: pre-payment with cancellation (throw-away), pre-payment with debit on a value card, pre-payment without consumption registration (pass), post-payment etc. - + A classification of FARE PRODUCTs according to the payment method and the account location: pre-payment with cancellation (throw-away), pre-payment with debit on a value card, pre-payment without consumption registration (pass), post-payment etc. @@ -1058,7 +1053,7 @@ Rail transport, Roads and Road transport - + Identifier of CHARGING MOMENT. @@ -1111,7 +1106,7 @@ Rail transport, Roads and Road transport - + @@ -1173,7 +1168,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 ccb2572bc..2c4090854 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport - + relative number of series for same OD pair (TAP Route number) @@ -299,7 +299,7 @@ Rail transport, Roads and Road transport - + 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 4fc6160bd..47fd99bd9 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport - + @@ -365,7 +365,7 @@ Rail transport, Roads and Road transport - + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. @@ -422,7 +422,7 @@ Rail transport, Roads and Road transport - + @@ -628,7 +628,7 @@ Rail transport, Roads and Road transport - + @@ -674,7 +674,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 11ffb1718..22704de7e 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd @@ -81,7 +81,7 @@ Rail transport, Roads and Road transport - + @@ -195,7 +195,7 @@ Rail transport, Roads and Road transport - + @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + @@ -328,7 +328,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 c500d70ca..6708bcf57 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -187,7 +187,7 @@ Rail transport, Roads and Road transport - + @@ -363,7 +363,7 @@ Rail transport, Roads and Road transport - + @@ -495,7 +495,7 @@ Rail transport, Roads and Road transport - An individual combination of features in a FARE TABLE, used to associate a FARE PRICE. + An individual combination of features in a FARE TABLE, used to associate a FARE PRICE. @@ -508,7 +508,7 @@ Rail transport, Roads and Road transport - + @@ -771,7 +771,7 @@ Rail transport, Roads and Road transport - + @@ -858,8 +858,8 @@ Rail transport, Roads and Road transport - - + + Order in which FARE TABLE ROW is to appear. @@ -942,7 +942,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 7457ad7c8..e3e26523a 100644 --- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd @@ -131,7 +131,7 @@ Rail transport, Roads and Road transport - + Identifier of a GEOGRAPHICAL UNIT. @@ -208,7 +208,7 @@ Rail transport, Roads and Road transport - + @@ -303,7 +303,7 @@ Rail transport, Roads and Road transport - + @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport - + @@ -454,7 +454,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 23cfcef99..e3724e800 100644 --- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd @@ -129,7 +129,7 @@ Rail transport, Roads and Road transport - + @@ -203,7 +203,7 @@ Rail transport, Roads and Road transport - + @@ -275,7 +275,7 @@ Rail transport, Roads and Road transport - + @@ -362,7 +362,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 bf6adaeeb..f9d37b8bc 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -262,7 +262,7 @@ Rail transport, Roads and Road transport - + @@ -332,7 +332,7 @@ Rail transport, Roads and Road transport - + @@ -421,7 +421,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 af0abdf40..38bc8ab7e 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackageEntitlement_version.xsd @@ -63,7 +63,7 @@ Rail transport, Roads and Road transport - A right to a SALES OFFER PACKAGE given by a SALES OFFER PACKAGE . + A right to a SALES OFFER PACKAGE given by a SALES OFFER PACKAGE . @@ -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 4754b4331..f4824d02b 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd @@ -188,7 +188,7 @@ Rail transport, Roads and Road transport - + @@ -302,7 +302,7 @@ Rail transport, Roads and Road transport - + @@ -390,7 +390,7 @@ Rail transport, Roads and Road transport - + @@ -432,8 +432,7 @@ Rail transport, Roads and Road transport - A particular tariff, described by a combination of parameters. - + A particular tariff, described by a combination of parameters. @@ -454,7 +453,7 @@ Rail transport, Roads and Road transport - + @@ -487,8 +486,7 @@ Rail transport, Roads and Road transport - A package to be sold as a whole, consisting of one or several FARE PRODUCTs materialised thanks to one or several TRAVEL DOCUMENTs. The FARE PRODUCTs may be either directly attached to the TRAVEL DOCUMENTs, or may be reloadable on the TRAVEL DOCUMENTs. - + A package to be sold as a whole, consisting of one or several FARE PRODUCTs materialised thanks to one or several TRAVEL DOCUMENTs. The FARE PRODUCTs may be either directly attached to the TRAVEL DOCUMENTs, or may be reloadable on the TRAVEL DOCUMENTs. @@ -507,7 +505,7 @@ Rail transport, Roads and Road transport - + @@ -552,8 +550,7 @@ Rail transport, Roads and Road transport - The assignment of a NOTICE to a SALES OFFER PACKAGE or a GROUP OF SALES OFFER PACKAGEs. - + The assignment of a NOTICE to a SALES OFFER PACKAGE or a GROUP OF SALES OFFER PACKAGEs. @@ -577,7 +574,7 @@ Rail transport, Roads and Road transport - + @@ -620,9 +617,7 @@ Rail transport, Roads and Road transport - An assignment of the COUNTRY and/or DISTRIBUTION CHANNEL through which a product may or may not be distributed. - - + An assignment of the COUNTRY and/or DISTRIBUTION CHANNEL through which a product may or may not be distributed. @@ -641,7 +636,7 @@ Rail transport, Roads and Road transport - + @@ -785,8 +780,7 @@ Rail transport, Roads and Road transport - A TYPE OF SALES OFFER PACKAGE specifying access rights for the SALES OFFER PACKAGE ELEMENTs within the range of this UNIT: 0-5 km, 4-6 zones etc. - + A TYPE OF SALES OFFER PACKAGE specifying access rights for the SALES OFFER PACKAGE ELEMENTs within the range of this UNIT: 0-5 km, 4-6 zones etc. @@ -812,7 +806,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 0d881a4d7..8e46d18a5 100644 --- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport - + @@ -211,7 +211,7 @@ Rail transport, Roads and Road transport - + @@ -313,7 +313,7 @@ Rail transport, Roads and Road transport - + @@ -364,7 +364,7 @@ Rail transport, Roads and Road transport - + @@ -429,7 +429,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 0a9fd4e22..aae7479f9 100644 --- a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + @@ -253,7 +253,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 d9b84b8f4..5c3e7a5ea 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -68,16 +68,16 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG9. - NeTEx FARE After Sales USAGE PARAMETER types. + NeTEx FARE After Sales USAGE PARAMETER types. Standard - NeTEX: After Sales USAGE PARAMETER types. + NeTEX: After Sales USAGE PARAMETER types. - Common resale conditions (i.e. for exchange or refund) attaching to the product + Common resale conditions (i.e. for exchange or refund) attaching to the product @@ -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 - + @@ -384,12 +384,12 @@ Rail transport, Roads and Road transport - Basis on which partial refunds of period passes etc are calculated. +v1.1 + Basis on which partial refunds of period passes etc. are calculated. +v1.1 - DEPRECATED - use PaymentMethods on RESELLING + DEPRECATED - use PaymentMethods on RESELLING @@ -423,7 +423,7 @@ Rail transport, Roads and Road transport - + @@ -472,7 +472,7 @@ Rail transport, Roads and Road transport - + @@ -501,7 +501,7 @@ Rail transport, Roads and Road transport - If product can be used by a named group , eg parents of a family, maximum number of named holders allowed. + If product can be used by a named group, e.g. parents of a family, maximum number of named holders allowed. @@ -511,7 +511,7 @@ Rail transport, Roads and Road transport - Indicates the nature of the permitted sharing, if any, of products that can be shared, e.g. trips from a multi-trip carnet. +v1.1 + Indicates the nature of the permitted sharing, if any, of products that can be shared, e.g. trips from a multi-trip carnet. +v1.1 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 e3306e51e..cf9c9b277 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd @@ -97,7 +97,7 @@ Rail transport, Roads and Road transport - + @@ -244,7 +244,7 @@ Rail transport, Roads and Road transport - + @@ -361,7 +361,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 c9dab1bae..bdded8bb6 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 80d22393b..ecdbeae59 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 - + @@ -224,7 +224,7 @@ Rail transport, Roads and Road transport - + @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport - + I @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + @@ -437,7 +437,7 @@ Rail transport, Roads and Road transport - + @@ -523,7 +523,7 @@ Rail transport, Roads and Road transport - + @@ -617,7 +617,7 @@ Rail transport, Roads and Road transport - + @@ -665,7 +665,7 @@ Rail transport, Roads and Road transport - + Identifier of TYPE OF PROOF . @@ -709,7 +709,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 a8ee3709a..f7af29483 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd @@ -66,7 +66,7 @@ Rail transport, Roads and Road transport - A right to a SERVICE ACCESS RIGHT is given by a FARE PRODUCT. + A right to a SERVICE ACCESS RIGHT is given by a FARE PRODUCT. @@ -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 253825715..cc3f439e7 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 2577c24fe..73350582d 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -100,7 +100,7 @@ Rail transport, Roads and Road transport - + @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport - + @@ -238,7 +238,7 @@ Rail transport, Roads and Road transport - + @@ -312,7 +312,7 @@ Rail transport, Roads and Road transport - + @@ -387,7 +387,7 @@ Rail transport, Roads and Road transport - + @@ -558,7 +558,7 @@ Rail transport, Roads and Road transport - + @@ -637,7 +637,7 @@ Rail transport, Roads and Road transport - + @@ -726,7 +726,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 d1326051b..620cc3900 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 - + @@ -224,8 +224,7 @@ Rail transport, Roads and Road transport - Category of USAGE PARAMETER user - + Category of USAGE PARAMETER user @@ -241,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 252d43b17..1efb25045 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 21b221f41..ab090cd02 100644 --- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd @@ -111,7 +111,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 0a06749f4..9a348d23b 100644 --- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd +++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd @@ -119,7 +119,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 b26979952..e6fee2843 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 16435d525..5dbdf52e6 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 8e7bb6281..d46d4b904 100644 --- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd +++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd @@ -116,7 +116,7 @@ Rail transport, Roads and Road transport - + @@ -248,7 +248,7 @@ Rail transport, Roads and Road transport - + @@ -329,7 +329,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 9268f32c8..06e0dc6e2 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd @@ -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 50cdf86d8..0f06bf727 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 abc77fe22..edf2559ac 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -157,7 +157,7 @@ Rail transport, Roads and Road transport - + @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport - + @@ -318,7 +318,7 @@ Rail transport, Roads and Road transport - + @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport - + @@ -476,7 +476,7 @@ Rail transport, Roads and Road transport - + @@ -633,7 +633,7 @@ Rail transport, Roads and Road transport - + @@ -717,7 +717,7 @@ Rail transport, Roads and Road transport - + @@ -800,7 +800,7 @@ Rail transport, Roads and Road transport - + @@ -872,7 +872,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 2daf3be32..bb0ffea99 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd @@ -121,7 +121,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -187,7 +187,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -223,7 +223,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -262,7 +262,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -325,7 +325,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -394,7 +394,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -445,7 +445,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 950afea69..8018cc5ef 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + Identifier of RETAIL CONSORTIUM. @@ -231,7 +231,7 @@ Rail transport, Roads and Road transport - + Identifier of RETAIL DEVICE. @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - + @@ -314,7 +314,7 @@ Rail transport, Roads and Road transport - A listing of a RETAIL DEVICE on a sSECURITY LIST. + A listing of a RETAIL DEVICE on a SECURITY LIST. @@ -337,7 +337,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 a241c1825..fab437027 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd @@ -186,7 +186,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -335,10 +335,7 @@ Rail transport, Roads and Road transport - A contract with a particular (but possibly anonymous) customer, ruling the consumption of transport services (and joint services). A FARE CONTRACT may be designed for a fixed SALES OFFER PACKAGE (e.g. ticket) or to allow successive purchases of SALES OFFER PACKAGEs. - - - + A contract with a particular (but possibly anonymous) customer, ruling the consumption of transport services (and joint services). A FARE CONTRACT may be designed for a fixed SALES OFFER PACKAGE (e.g. ticket) or to allow successive purchases of SALES OFFER PACKAGEs. @@ -354,7 +351,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -436,9 +433,7 @@ Rail transport, Roads and Road transport - A log entry describing an event referring to the life of a FARE CONTRACT: initial contracting, sales, validation entries, etc. A subset of a FARE CONTRACT ENTRY is often materialised on a TRAVEL DOCUMENT. - - + A log entry describing an event referring to the life of a FARE CONTRACT: initial contracting, sales, validation entries, etc. A subset of a FARE CONTRACT ENTRY is often materialised on a TRAVEL DOCUMENT. @@ -457,7 +452,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -536,7 +531,7 @@ Rail transport, Roads and Road transport - + @@ -578,7 +573,7 @@ Rail transport, Roads and Road transport - + @@ -626,7 +621,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -751,7 +746,7 @@ Rail transport, Roads and Road transport - + @@ -796,7 +791,7 @@ Rail transport, Roads and Road transport - + @@ -835,7 +830,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -890,7 +885,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -945,7 +940,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 46d5383ff..3e3b4eda1 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd @@ -147,7 +147,7 @@ Rail transport, Roads and Road transport - + 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 35a832687..73a1c0873 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd @@ -121,7 +121,7 @@ Rail transport, Roads and Road transport - + @@ -189,7 +189,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 e4833ea09..80eb2d1e5 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 @@ -67,8 +67,7 @@ Rail transport, Roads and Road transport - Code to access a service, can be numerical code, barcode, flashcode, etc. - +V1.2.2 + Code to access a service, can be numerical code, barcode, flashcode, etc. +V1.2.2 @@ -87,7 +86,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -162,7 +161,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 31786cdec..3894e4262 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 @@ -101,8 +101,7 @@ Rail transport, Roads and Road transport - Individual travelling person. +v1.2.2 - + Individual travelling person. +v1.2.2 @@ -118,7 +117,7 @@ Rail transport, Roads and Road transport - + @@ -203,9 +202,7 @@ Rail transport, Roads and Road transport - Information characterising an INDIVIDUAL TRAVELER as a driver of a VEHICLE POOLING SERVICE. - +v1.2.2 - + Information characterising an INDIVIDUAL TRAVELER as a driver of a VEHICLE POOLING SERVICE. +v1.2.2 @@ -221,7 +218,7 @@ Rail transport, Roads and Road transport - + @@ -307,9 +304,7 @@ Rail transport, Roads and Road transport - Information characterising an INDIVIDUAL TRAVELER as a driver of a VEHICLE POOLING SERVICE. - +v1.2.2 - + Information characterising an INDIVIDUAL TRAVELER as a driver of a VEHICLE POOLING SERVICE. +v1.2.2 @@ -325,7 +320,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 45fac9bd9..40931964d 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 @@ -61,8 +61,7 @@ Rail transport, Roads and Road transport - A set of USER PARAMETERS characterising access rights to VEHICLE POOLING SERVICE. +v1.2.2 - + A set of USER PARAMETERS characterising access rights to VEHICLE POOLING SERVICE. +v1.2.2 @@ -87,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 94ebfb902..cacca1136 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 3d496ac09..25f65ea10 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 @@ -110,7 +110,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 dae661c88..939f40569 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 @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd index fc2703484..00f078d6e 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. 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 f36bbcd57..3dcc7e2f8 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 @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + @@ -166,7 +166,7 @@ Rail transport, Roads and Road transport - + @@ -222,8 +222,7 @@ Rail transport, Roads and Road transport - A set of vehicles assigned to a specific PARKING, PARKING AREAs, PARKING BAYs, p lace or MOBILITY CONSTRAINT ZONE that must be picked up and returned to the same area. - +v1.2.2 + A set of vehicles assigned to a specific PARKING, PARKING AREAs, PARKING BAYs, place or MOBILITY CONSTRAINT ZONE that must be picked up and returned to the same area. +v1.2.2 @@ -242,7 +241,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 e37144a80..a5a12ec87 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 @@ -78,8 +78,7 @@ Rail transport, Roads and Road transport - A place where vehicles/passengers meet to change mode of transportation, for boarding, alighting, pick-up, drop-off, etc. +v1.2.2 - + A place where vehicles/passengers meet to change mode of transportation, for boarding, alighting, pick-up, drop-off, etc. +v1.2.2 @@ -108,7 +107,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -170,7 +169,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -196,8 +195,7 @@ Rail transport, Roads and Road transport - A dedicated part of the PARKING AREA for vehicle sharing or rental which is composed of one or more VEHICLE SHARING PARKING BAYs. +v1.2.2 - + A dedicated part of the PARKING AREA for vehicle sharing or rental which is composed of one or more VEHICLE SHARING PARKING BAYs. +v1.2.2 @@ -236,7 +234,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE SHARING PARKING AREA. @@ -266,8 +264,7 @@ Rail transport, Roads and Road transport - A dedicated space of a PARKING AREA for either vehicles active in a pooling service or vehicles of a pooling service users where vehicles are left for a longer time. +v1.2.2 - + A dedicated space of a PARKING AREA for either vehicles active in a pooling service or vehicles of a pooling service users where vehicles are left for a longer time. +v1.2.2 @@ -306,7 +303,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE POOLING PARKING AREA. @@ -375,7 +372,7 @@ Rail transport, Roads and Road transport - + Identifier of VEHICLE SHARING PARKING BAY. @@ -405,7 +402,7 @@ Rail transport, Roads and Road transport - A dedicated space of a PARKING AREA for either vehicles active in a pooling service or vehicles of a pooling service users where vehicles are left for a longer time. +v1.2.2 + A dedicated space of a PARKING AREA for either vehicles active in a pooling service or vehicles of a pooling service users where vehicles are left for a longer time. +v1.2.2 @@ -444,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 6fd07bb15..90b1b09b0 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. @@ -117,7 +117,7 @@ Rail transport, Roads and Road transport - The allocation of a VEHICLE MEETING POINT to a SITE COMPONENT or ADDRESSABLE PLACE (for vehicle pooling or vehicle sharing purposes). +v1.2.2 + The allocation of a VEHICLE MEETING POINT to a SITE COMPONENT or ADDRESSABLE PLACE (for vehicle pooling or vehicle sharing purposes). +v1.2.2 @@ -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 e13c86f1d..24484a0b8 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 @@ -87,7 +87,7 @@ Rail transport, Roads and Road transport - A POINT where passengers can board or alight from vehicles. +v1.2.2 + A POINT where passengers can board or alight from vehicles. +v1.2.2 @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport - + @@ -144,7 +144,7 @@ Rail transport, Roads and Road transport - A LINK between an ordered pair of STOP POINTs. VEHICLE MEETING LINKs are directional - there will be separate links for each direction of a route. +v1.2.2 + A LINK between an ordered pair of STOP POINTs. VEHICLE MEETING LINKs are directional - there will be separate links for each direction of a route. +v1.2.2 @@ -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 73a933bf7..ee3dbdb17 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 @@ -107,7 +107,7 @@ Rail transport, Roads and Road transport - A spot in the PARKING AREA dedicated to MONITORED VEHICLE SHARING or rental. +v1.2.2 + A spot in the PARKING AREA dedicated to MONITORED VEHICLE SHARING or rental. +v1.2.2 @@ -149,9 +149,9 @@ Rail transport, Roads and Road transport - + - Identifier of MONITORED VEHICLE SHARING PARKING BAY. + Identifier of MONITORED VEHICLE SHARING PARKING BAY. @@ -186,9 +186,7 @@ Rail transport, Roads and Road transport - A categorisation of the availability of the parking spot, such as being temporarily closed, unavailable, available. +v1.2.2 - -. +v1.2.2 + A categorisation of the availability of the parking spot, such as being temporarily closed, unavailable, available. +v1.2.2 @@ -211,7 +209,7 @@ Rail transport, Roads and Road transport - + Identifier of PARKING BAY STATUS. @@ -262,7 +260,7 @@ Rail transport, Roads and Road transport - + Identifier of RENTAL AVAILABILITYS. @@ -346,7 +344,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 7bc05bf1b..4a4edda85 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 @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - Dummy Type to work round SG restrfictions. + Dummy Type to work round SG restrictions. @@ -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. @@ -156,10 +156,7 @@ Rail transport, Roads and Road transport - The allocation of a TAXI SERVICE to a TAXI PARKING or a TAXI STAND. +V1.2.2 - - - + The allocation of a TAXI SERVICE to a TAXI PARKING or a TAXI STAND. +V1.2.2 @@ -183,7 +180,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -242,7 +239,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -303,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 6d76ec839..4ece865f0 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 @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + @@ -236,7 +236,7 @@ Rail transport, Roads and Road transport - + @@ -302,7 +302,7 @@ Rail transport, Roads and Road transport - + Identifier of TAXI SERVICE @@ -364,7 +364,7 @@ Rail transport, Roads and Road transport - + Identifier of GENERAL POOLIMG SERVICE. @@ -426,7 +426,7 @@ Rail transport, Roads and Road transport - + Identifier of CHAUFFEURED VEHICLE SERVICE @@ -481,7 +481,7 @@ Rail transport, Roads and Road transport - + @@ -563,7 +563,7 @@ Rail transport, Roads and Road transport - + @@ -627,7 +627,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 c3a0b40a0..e1fb5b2f0 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 @@ -82,7 +82,7 @@ Rail transport, Roads and Road transport - + Identifier of ONLINE SERVICE. @@ -186,7 +186,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 c3e263d2b..cdae11899 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 57a33344a..254e125ac 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 @@ -99,7 +99,7 @@ Rail transport, Roads and Road transport - + @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/ynotation/netex_thing_version.xsd b/xsd/ynotation/netex_thing_version.xsd index a73bf6a51..7f77e2f4e 100644 --- a/xsd/ynotation/netex_thing_version.xsd +++ b/xsd/ynotation/netex_thing_version.xsd @@ -20,7 +20,7 @@ - + Identifier of THING @@ -146,7 +146,7 @@ - + Identifier of TYPE OF THING @@ -195,7 +195,7 @@ - + Identifier of SOMETHING ELSE From cd4a6f38d57c31396977cfe628d0f45eda251570 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 26 Jul 2023 19:57:52 +0200 Subject: [PATCH 02/33] Typo --- .../part3_fares/netex_usageParameterEligibility_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ecdbeae59..ccf6bbbdf 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport - I + From b0347775c1ccf4480b3bf31c8807412a50638b00 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 26 Jul 2023 20:05:34 +0200 Subject: [PATCH 03/33] Remove required ids from DerivedViews --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_stopPlace_version.xsd | 2 +- .../part1_networkDescription/netex_route_version.xsd | 4 ++-- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 4 ++-- .../part1_tacticalPlanning/netex_timingPattern_version.xsd | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) 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 96c08ca92..54c669f95 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 @@ -502,7 +502,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 ae7573cc5..c11577f40 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 @@ -1450,7 +1450,7 @@ contained within its parent QUAY. - + Identifier of Object of which this is a view. 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 97998b409..32091755e 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -564,7 +564,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. @@ -630,7 +630,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 80ed1f4ad..9d5463652 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -384,7 +384,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. @@ -462,7 +462,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. 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 245db9f26..40bc0a797 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -566,7 +566,7 @@ Rail transport, Roads and Road transport - + Identifier of TIMING LINK of which this is a view. From 6a8e19b69df00c5f6816072720325208dc0bed31 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 26 Jul 2023 20:25:37 +0200 Subject: [PATCH 04/33] VehicleJourneyRunTime has a cardinality of 0:1 --- .../part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0b3d15cf..f31c3ea4c 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + From 4cf88c0cc7dfe094106e2790007dd2f2509ced87 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 27 Jul 2023 12:09:53 +0200 Subject: [PATCH 05/33] Introducing new restrictions, and TODO's --- .../netex_generalFrame_version.xsd | 20 +++++++++ .../netex_entity_entity.xsd | 37 ++++++++++++++++- .../netex_address_version.xsd | 27 +++++++++++- .../netex_modeOfOperation_version.xsd | 22 ++++++++-- .../netex_ifopt_localService_version.xsd | 41 ++++++++++++++++++- .../part1_ifopt/netex_ifopt_site_version.xsd | 35 +++++++++++++++- .../netex_accessRightParameter_version.xsd | 26 ++++++++++-- .../part3_fares/netex_fareProduct_version.xsd | 28 ++++++++++++- .../part3_fares/netex_fareTable_version.xsd | 21 +++++++++- .../netex_salesContract_version.xsd | 7 +--- 10 files changed, 244 insertions(+), 20 deletions(-) diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index 4a1f3604d..a0a5ae298 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -219,6 +219,26 @@ Rail transport, Roads and Road transport An association of an ENTITY in a GENERAL FRAME. + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd index 1f720b738..197fac920 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd @@ -56,10 +56,43 @@ Rail transport, Roads and Road transport Ur Object type for NeTEx. - + ENTITY. Will contain one or more ENTITY IN VERSIONs. + + + + + + + Versions of the ENTITY. + + + + + + Identifier of ENTITY. + + + + + Date ENTITY was first created. + + + + + Date ENTITY or version was last changed. + + + + + Name of Class of the ENTITY. Allows reflection. Fixed for each ENTITY type. + + + + + @@ -71,7 +104,7 @@ Rail transport, Roads and Road transport - Versions of theENTITY. + Versions of the ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd index 8d63575d6..4a1f7e02a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd @@ -122,7 +122,30 @@ Rail transport, Roads and Road transport - + + + + + + + + + + + + + + + + + + + + + + + + @@ -427,7 +450,7 @@ Rail transport, Roads and Road transport - + Identifier of COUNTRY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd index 4be063442..a2edbb343 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -135,8 +135,7 @@ Rail transport, Roads and Road transport - Legacy mode of operation which is provided as a scheduled and/or flexible publicly advertised transport offer. +v1.2.2 - + Legacy mode of operation which is provided as a scheduled and/or flexible publicly advertised transport offer. +v1.2.2 @@ -233,7 +232,24 @@ Rail transport, Roads and Road transport - + + + + + + + + + + + + + + + + + + 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 812c6a23e..a7e50cfce 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 @@ -405,13 +405,40 @@ Rail transport, Roads and Road transport Generic specialisation of LOCAL SERVICE for CUSTOMER SERVICEs (lost properties, meeting point, complaints, etc.). + Type for CUSTOMER SERVICE. - + + + + + @@ -441,6 +468,12 @@ Rail transport, Roads and Road transport + + + + + + @@ -452,7 +485,11 @@ Rail transport, Roads and Road transport Type for a COMPLAINTS SERVICE. - + + + + + 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 56f494e69..41b8e22ab 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 @@ -354,8 +354,41 @@ Rail transport, Roads and Road transport - A physical entrance or exit to/from a SITE. May be a door, barrier, gate or other recognizable point of access. + A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. + 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 09590bcdc..d9f403a59 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -176,8 +176,7 @@ Rail transport, Roads and Road transport - A sequence or set of CONTROLLABLE ELEMENTs to which rules for limitation of access rights and calculation of prices (fare structure) are applied. - + A sequence or set of CONTROLLABLE ELEMENTs to which rules for limitation of access rights and calculation of prices (fare structure) are applied. @@ -189,10 +188,31 @@ 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.). + + + + + + + + + + + + + + + + + + + + + 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 511476738..74b2281a8 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -1008,10 +1008,36 @@ 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. + + + + + + + + + + + + + + + + + + + + + order of element in sequence. + + + + + 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 6708bcf57..a5580a7bc 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -338,10 +338,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. + + + + + + + + + + + + + + + + + + + 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 fab437027..b73013771 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd @@ -452,7 +452,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -602,10 +602,7 @@ Rail transport, Roads and Road transport - A contract with a particular (but possibly anonymous) customer, ruling the consumption of transport services (and joint services). A CUSTOMER ACCOUNT may be designed for a fixed SALES OFFER PACKAGE (e.g. ticket) or to allow successive purchases of SALES OFFER PACKAGEs. - - - + A contract with a particular (but possibly anonymous) customer, ruling the consumption of transport services (and joint services). A CUSTOMER ACCOUNT may be designed for a fixed SALES OFFER PACKAGE (e.g. ticket) or to allow successive purchases of SALES OFFER PACKAGEs. From 8066af4825055c737273aeb5b3ce66f99ec33096 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 27 Jul 2023 12:27:54 +0200 Subject: [PATCH 06/33] Better, but still failing --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 41b8e22ab..b899108a6 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 @@ -381,8 +381,10 @@ Rail transport, Roads and Road transport - - + + + + From d6e36606d9e149ad0ef8d4f75f95d4266d6816ca Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 27 Jul 2023 15:02:10 +0200 Subject: [PATCH 07/33] More improvements, including required order properties --- .../netex_pointAndLink_version.xsd | 20 ++++++++++ .../netex_section_version.xsd | 6 +++ .../netex_spatialFeature_version.xsd | 2 +- .../netex_zone_version.xsd | 28 +++++++++++++- .../netex_entity_support.xsd | 6 +++ .../netex_responsibilitySet_version.xsd | 33 +++++++++++++++- .../netex_typeOfValue_version.xsd | 22 ++++++++++- .../netex_validityCondition_version.xsd | 2 +- .../netex_availabilityCondition_support.xsd | 6 +++ .../netex_availabilityCondition_version.xsd | 30 ++++++++++++++- .../netex_modeOfOperation_version.xsd | 2 +- .../netex_vehicleType_version.xsd | 2 +- .../netex_ifopt_equipmentSigns_version.xsd | 23 +++++++++++ ...netex_ifopt_equipmentTicketing_version.xsd | 38 ++++++++++++++++++- .../netex_ifopt_navigationPath_version.xsd | 12 +++++- .../netex_fareZone_version.xsd | 5 +++ .../netex_journeyPattern_version.xsd | 10 +++++ .../netex_servicePattern_version.xsd | 34 ++++++++++++++++- .../netex_timingPattern_version.xsd | 10 +++++ .../netex_nm_singleJourneyPath_version.xsd | 5 +++ 20 files changed, 282 insertions(+), 14 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index 1badd0a8b..0afa958bf 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -119,6 +119,26 @@ Rail transport, Roads and Road transport A 0-dimensional node of the network used for the spatial description of the network. POINTs may be located by a LOCATION in a given LOCATING SYSTEM. + diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd index bae25dc0f..7565d77c2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd @@ -422,6 +422,12 @@ Rail transport, Roads and Road transport + + + + Order of LINK in sequence. + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd index 06efae784..93b2cf3dc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd @@ -82,7 +82,7 @@ Rail transport, Roads and Road transport - + Abstract SPATIAL FEATURE. diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 6a35e03b8..1c6646c63 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -91,10 +91,36 @@ Rail transport, Roads and Road transport - + A two-dimensional PLACE within the service area of a public transport operator (administrative zone, TARIFF ZONE, ACCESS ZONE, etc.). + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 8016b713f..7a45a76f0 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -80,6 +80,12 @@ Rail transport, Roads and Road transport + + + Type for identifier of a TYPE OF ENTITY. + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd index a9a101a4a..09dc1ef71 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd @@ -228,10 +228,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. + + + + + + + + @@ -239,7 +268,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd index 7b9f37dd1..534b3f78a 100644 --- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd @@ -217,10 +217,30 @@ Rail transport, Roads and Road transport A Type of value used to classify an ENTITY. + - Type for a TYPE OFENTITY. Abstract supertype used to define open classifications of value types. + Type for a TYPE OF ENTITY. Abstract supertype used to define open classifications of value types. diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd index 2a0bd12da..53b04eb09 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd @@ -419,7 +419,7 @@ Rail transport, Roads and Road transport - + Start date of AVAILABILITY CONDITION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd index 6a5b6c897..65055ce2d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd @@ -79,4 +79,10 @@ Rail transport, Roads and Road transport + + + Type for identifier of an SIMPLE AVAILABILITY CONDITION. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd index 62a8ef731..4f7bf5bbc 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd @@ -287,11 +287,37 @@ Rail transport, Roads and Road transport - Simple version of an AVAILABILITY CONDITION used in order to characterise a given VERSION of a VERSION FRAME. Comprises a simple period and DAY TYPE. + Simple version of an AVAILABILITY CONDITION used in order to characterise a given VERSION of a VERSION FRAME. Comprises a simple period and DAY TYPE. - + + + + + + + + + + + + + Start date of AVAILABILITY CONDITION. + + + + + End of AVAILABILITY CONDITION. Date is INCLUSIVE. + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd index a2edbb343..d858f4baa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -194,7 +194,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 8cf487d7f..3c9b0d1fe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -683,7 +683,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 5d5299323..8a8af9bfb 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 @@ -112,6 +112,29 @@ Rail transport, Roads and Road transport Specialisation of PLACE EQUIPMENT for signs (heading signs, etc.). + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd index db22c2f18..248aef586 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd @@ -93,7 +93,24 @@ Rail transport, Roads and Road transport - + + + + + + + + + + + + + + + + + + @@ -239,7 +256,24 @@ 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 a63377c80..741f6fe4b 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 @@ -340,6 +340,11 @@ Rail transport, Roads and Road transport Identifier of ENTITY. + + + Order of LINK in sequence. + + @@ -419,7 +424,7 @@ Rail transport, Roads and Road transport - Point traversed by a NAVIGATION PATH in sequence. May be a PLACE PATH JUNCTION or POINT. + Point traversed by a NAVIGATION PATH in sequence. Maybe a PLACE PATH JUNCTION or POINT. @@ -443,6 +448,11 @@ Rail transport, Roads and Road transport Identifier of ENTITY. + + + Order of POINT in sequence. + + 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 342716aae..03b32fdbc 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd @@ -356,6 +356,11 @@ Rail transport, Roads and Road transport + + + Order of POINT in sequence. + + 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 aeaefe154..5b8db6402 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd @@ -301,6 +301,11 @@ Rail transport, Roads and Road transport + + + Order of POINT in sequence. + + @@ -407,6 +412,11 @@ Rail transport, Roads and Road transport Identifier of ENTITY. + + + Order of LINK in sequence. + + 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 268d59c25..b99a7ad9f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -787,6 +787,11 @@ Rail transport, Roads and Road transport + + + Order of POINT in sequence. + + @@ -905,10 +910,37 @@ Rail transport, Roads and Road transport - + The use of a SERVICE LINK in a specified order. within a JOURNEY PATTERN or SERVICE PATTERN. + + + + + + + + + + + + + + + + + + + + + + Order of LINK in sequence. + + + + + 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 40bc0a797..21bc1270b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -400,6 +400,11 @@ Rail transport, Roads and Road transport + + + Order of POINT in sequence. + + @@ -458,6 +463,11 @@ Rail transport, Roads and Road transport + + + Order of LINK in sequence. + + 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 cdae11899..13919b655 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 @@ -170,6 +170,11 @@ Rail transport, Roads and Road transport Identifier of ENTITY. + + + Order of POINT in sequence. + + From 20e6fd66814fddf5927efad6fb1899222f069851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 27 Jul 2023 16:31:04 +0200 Subject: [PATCH 08/33] test for change of one of the TODO something went massively wrong... --- .../part1_ifopt/netex_ifopt_site_version.xsd | 815 +----------------- 1 file changed, 1 insertion(+), 814 deletions(-) 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 b899108a6..c2688c0c1 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 @@ -1,814 +1 @@ - - - - - - - - - - - - - - - - - main schema - e-service developers - V1.0 Christophe Duquesne - Nicholas Knowles - Europe - First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2010-09-04 - - 2011-02-05Name Space changes - - 2020-10-10New Modes : Add PRESENTATGION To Site ELement - - -

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

-

This sub-schema describes the SITE types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd - [ISO 639-2/B] ENG - Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX - - http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2009-2020 - - -
    -
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
    • -
- - Version 1.0 - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx SITE types. - Standard - - - NeTEx: SITE types. - - - - A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. - - - - - Type for a SITE ELEMENT. - - - - - - - - - - Elements of a SITE ELEMENT. - - - - - - Allowed MODEs to access SITE ELEMENT. - - - - - - Properties for naming element with respect to adjacent features. - - - - - Elements of a SITE ELEMENT. - - - - - - - Naming elements of a SITE ELEMENT. - - - - - Further suffix to name that may be used in some contexts. - - - - - Alternative names. - - - - - - - Detailed properties of a SITE ELEMENT. - - - - - Whether the component is available for public use or is restricted. - - - - - Whether the component is Indoors or outdoors. Default is Indoors. - - - - - Whether the component is within a gated area or freely accessible without a pass or ticket. - - - - - Whether the component is lit or not. Default is well Lit. - - - - - Whether all areas of the component are wheelchair accessible. - - - - - Total number of people that component can contain. - - - - - Presentation defaults for SITE ELEMENT. +V1.2.2 - - - - - Facilities available at SITe. - - - - - - - Properties of a SITE ELEMENT with respect to adjacent features. - - - - - Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. - - - - - Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. - - - - - - - - A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. - - - - - Type for an identified and data managed element making up a STOP PLACE. - - - - - - - - - - - - Elements of a SITE. - - - - - This is a primary Topographic place. - - - - - - - Additional Topographic Places in which SITE is located. - - - - - Type of SITE. - - - - - Whether SITE is at centre of TOPOGRAPHIC PLACE. - - - - - - - - Reference to OPERATOR of SITE - derived details can be included. - - - - - - Group of spatial associations of a SITE. - - - - - LEVELs found within SITe. - - - - - Entrances to and within SITE. - - - - - - - - Elements of a SITE specifying spatial associations. - - - - - Reference to another SITE of which this SITE is deemed to be a subzone. - - - - - Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. - - - - - Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. - - - - - - - - An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. - - - - - A component of a SITE COMPONENT. - - - - - - - - - - - - Elements of a SITE COMPONENT. - - - - - Reference to parent of SITE, if any. - - - - - - - Impediments to navigation from processes or barriers. For example security, check in etc. - - - - - - - - Mode Elements of a SITE COMPONENT. - - - - - Primary MODE of Vehicle transport associated by this component. - - - - - - - - - - Type for a list of ENTRANCEs. - - - - - - - - Entrance to a SITE. - - - - - - - - - A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. - - - - - - Type for SITE ENTRANCe. - - - - - - - - - - - - - Elements of a SITE ENTRANCE. - - - - - Alternative identifier of ENTRANCE shown to Public. - - - - - Label of ENTRANCE. - - - - - Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. - - - - - Whether ENTRANCE is external to STOP PLACE. Default is true. - - - - - Whether ENTRANCE can be used for entry. Default is true. - - - - - Whether ENTRANCE can be used for exit. Default is true. - - - - - Width of ENTRANCE in metres. - - - - - Height of ENTRANCE In metres. - - - - - - - External entrance elements of a SITE ENTRANCE. - - - - - Whether nearest crossing to ENTRANCE has dropped kerb. - - - - - Whether there is a drop off point close by to ENTRANCE. - - - - - - - - Type for a list of VEHICLE ENTRANCEs. - - - - - - - - - - - - - A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifier of VEHICLE ENTRANCE. - - - - - - - - - Type for a VEHICLE ENTRANCE. - - - - - - - - - - - - Elements of a VEHICLE ENTRANCE. - - - - - Whether private vehicles can use this entrance. - - - - - - - - Type for a list of LEVELs. - - - - - - - - Level of a Building or SITE. - - - - - - - - - An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. - - - - - - - - - - - - - - - - - - - - - - - Type for a SITE LEVEL. - - - - - - - - - - - - Elements of a SITE LEVEL. - - - - - Name of LEVEL. - - - - - Short Name of LEVEL. - - - - - Description of LEVEL. - - - - - Public code for LEVEL. - - - - - Whether level is for public use. - - - - - Accessibility values associated with LEVEL. - - - - - Whether all areas of the LEVEL are wheelchair accessible. - - - - - - - - - Type for a list of ACCESS ZONEs. - - - - - - - - ACCESS ZONE of a building or SITE. - - - - - - - - - An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for an ACCESS ZONE. - - - - - - - - - - - - Elements of an ACCESS ZONE. - - - - - Accessibility values associated with ACCESS ZONE. - - - - - Whether all areas of the ACCESS ZONE are wheelchair accessible. - - - - - - - - A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifier of ENTITY. - - - - - - - - - Type for an identified and data managed element making up a STOP PLACE. - - - - - - - - - - - - Elements of a SERVICE SITE. - - - - - - - Dummy Type to get round SG limitatiins - - - - - Dummy Type to get round SG limitatiins - - - - - Dummy Type to get round SG limitatiins - - - - - Dummy Type to get round SG limitatiins - - - + main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file From 2b466efa3b81b37dbd465fe4faac509c6d561baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 27 Jul 2023 17:36:50 +0200 Subject: [PATCH 09/33] Update netex_ifopt_site_version.xsd --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c2688c0c1..f4d2650b6 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 @@ -1 +1 @@ - main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file + main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file From f7997ad2eb194226763820482d800fa319ddf323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 12:32:34 +0200 Subject: [PATCH 10/33] Update netex_ifopt_site_version.xsd --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4d2650b6..220b06460 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 @@ -1 +1 @@ - main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file + main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file From 2301590cab1c431c37348bf342c90df7cf9f7ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 12:34:54 +0200 Subject: [PATCH 11/33] Revert "Update netex_ifopt_site_version.xsd" This reverts commit f7997ad2eb194226763820482d800fa319ddf323. --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 220b06460..f4d2650b6 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 @@ -1 +1 @@ - main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file + main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file From 68338ca4087a748d2e446089720c7651071510c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 12:35:02 +0200 Subject: [PATCH 12/33] Revert "Update netex_ifopt_site_version.xsd" This reverts commit 2b466efa3b81b37dbd465fe4faac509c6d561baf. --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4d2650b6..c2688c0c1 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 @@ -1 +1 @@ - main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file + main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file From a72adc60c8bf06288f292575048ae398d250d5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 12:35:07 +0200 Subject: [PATCH 13/33] Revert "test for change of one of the TODO" This reverts commit 20e6fd66814fddf5927efad6fb1899222f069851. --- .../part1_ifopt/netex_ifopt_site_version.xsd | 815 +++++++++++++++++- 1 file changed, 814 insertions(+), 1 deletion(-) 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 c2688c0c1..b899108a6 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 @@ -1 +1,814 @@ - main schema e-service developers V1.0 Christophe Duquesne Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

This sub-schema describes the SITE types.

 text/xml http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified CEN, Crown Copyright 2009-2020
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), Public transport, Bus services, Coach services, Bus stops and stations, Rail transport, Railway stations and track, Train services, Underground trains, Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. NeTEx SITE types. Standard NeTEx: SITE types. A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. Type for a SITE ELEMENT. Elements of a SITE ELEMENT. Allowed MODEs to access SITE ELEMENT. Properties for naming element with respect to adjacent features. Elements of a SITE ELEMENT. Naming elements of a SITE ELEMENT. Further suffix to name that may be used in some contexts. Alternative names. Detailed properties of a SITE ELEMENT. Whether the component is available for public use or is restricted. Whether the component is Indoors or outdoors. Default is Indoors. Whether the component is within a gated area or freely accessible without a pass or ticket. Whether the component is lit or not. Default is well Lit. Whether all areas of the component are wheelchair accessible. Total number of people that component can contain. Presentation defaults for SITE ELEMENT. +V1.2.2 Facilities available at SITe. Properties of a SITE ELEMENT with respect to adjacent features. Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. Type for an identified and data managed element making up a STOP PLACE. Elements of a SITE. This is a primary Topographic place. Additional Topographic Places in which SITE is located. Type of SITE. Whether SITE is at centre of TOPOGRAPHIC PLACE. Reference to OPERATOR of SITE - derived details can be included. Group of spatial associations of a SITE. LEVELs found within SITe. Entrances to and within SITE. Elements of a SITE specifying spatial associations. Reference to another SITE of which this SITE is deemed to be a subzone. Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. A component of a SITE COMPONENT. Elements of a SITE COMPONENT. Reference to parent of SITE, if any. Impediments to navigation from processes or barriers. For example security, check in etc. Mode Elements of a SITE COMPONENT. Primary MODE of Vehicle transport associated by this component. Type for a list of ENTRANCEs. Entrance to a SITE. A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. Type for SITE ENTRANCe. Elements of a SITE ENTRANCE. Alternative identifier of ENTRANCE shown to Public. Label of ENTRANCE. Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. Whether ENTRANCE is external to STOP PLACE. Default is true. Whether ENTRANCE can be used for entry. Default is true. Whether ENTRANCE can be used for exit. Default is true. Width of ENTRANCE in metres. Height of ENTRANCE In metres. External entrance elements of a SITE ENTRANCE. Whether nearest crossing to ENTRANCE has dropped kerb. Whether there is a drop off point close by to ENTRANCE. Type for a list of VEHICLE ENTRANCEs. A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. Identifier of VEHICLE ENTRANCE. Type for a VEHICLE ENTRANCE. Elements of a VEHICLE ENTRANCE. Whether private vehicles can use this entrance. Type for a list of LEVELs. Level of a Building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. Type for a SITE LEVEL. Elements of a SITE LEVEL. Name of LEVEL. Short Name of LEVEL. Description of LEVEL. Public code for LEVEL. Whether level is for public use. Accessibility values associated with LEVEL. Whether all areas of the LEVEL are wheelchair accessible. Type for a list of ACCESS ZONEs. ACCESS ZONE of a building or SITE. An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. Type for an ACCESS ZONE. Elements of an ACCESS ZONE. Accessibility values associated with ACCESS ZONE. Whether all areas of the ACCESS ZONE are wheelchair accessible. A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). Identifier of ENTITY. Type for an identified and data managed element making up a STOP PLACE. Elements of a SERVICE SITE. Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins Dummy Type to get round SG limitatiins \ No newline at end of file + + + + + + + + + + + + + + + + + main schema + e-service developers + V1.0 Christophe Duquesne + Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2010-09-04 + + 2011-02-05Name Space changes + + 2020-10-10New Modes : Add PRESENTATGION To Site ELement + + +

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

+

This sub-schema describes the SITE types.

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd + + Unclassified + CEN, Crown Copyright 2009-2020 + + +
    +
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
    • +
+ + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx SITE types. + Standard + + + NeTEx: SITE types. + + + + A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. + + + + + Type for a SITE ELEMENT. + + + + + + + + + + Elements of a SITE ELEMENT. + + + + + + Allowed MODEs to access SITE ELEMENT. + + + + + + Properties for naming element with respect to adjacent features. + + + + + Elements of a SITE ELEMENT. + + + + + + + Naming elements of a SITE ELEMENT. + + + + + Further suffix to name that may be used in some contexts. + + + + + Alternative names. + + + + + + + Detailed properties of a SITE ELEMENT. + + + + + Whether the component is available for public use or is restricted. + + + + + Whether the component is Indoors or outdoors. Default is Indoors. + + + + + Whether the component is within a gated area or freely accessible without a pass or ticket. + + + + + Whether the component is lit or not. Default is well Lit. + + + + + Whether all areas of the component are wheelchair accessible. + + + + + Total number of people that component can contain. + + + + + Presentation defaults for SITE ELEMENT. +V1.2.2 + + + + + Facilities available at SITe. + + + + + + + Properties of a SITE ELEMENT with respect to adjacent features. + + + + + Name of a Road that crosses the Road the street near the SITE ELEMENT that can be used to describe its relative location. + + + + + Name of a Landmark near the SITE ELEMENT that can be used to describe its relative location. + + + + + + + + A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. + + + + + Type for an identified and data managed element making up a STOP PLACE. + + + + + + + + + + + + Elements of a SITE. + + + + + This is a primary Topographic place. + + + + + + + Additional Topographic Places in which SITE is located. + + + + + Type of SITE. + + + + + Whether SITE is at centre of TOPOGRAPHIC PLACE. + + + + + + + + Reference to OPERATOR of SITE - derived details can be included. + + + + + + Group of spatial associations of a SITE. + + + + + LEVELs found within SITe. + + + + + Entrances to and within SITE. + + + + + + + + Elements of a SITE specifying spatial associations. + + + + + Reference to another SITE of which this SITE is deemed to be a subzone. + + + + + Any references to another SITE of which this STOP PLACE is deemed to be a nearby but distinct. + + + + + Most specific TOPOGRAPHIC PLACE within which the SITE lies. The TOPOGRAPHIC model can be used to determine what other places this also implies. + + + + + + + + An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. + + + + + A component of a SITE COMPONENT. + + + + + + + + + + + + Elements of a SITE COMPONENT. + + + + + Reference to parent of SITE, if any. + + + + + + + Impediments to navigation from processes or barriers. For example security, check in etc. + + + + + + + + Mode Elements of a SITE COMPONENT. + + + + + Primary MODE of Vehicle transport associated by this component. + + + + + + + + + + Type for a list of ENTRANCEs. + + + + + + + + Entrance to a SITE. + + + + + + + + + A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. + + + + + + Type for SITE ENTRANCe. + + + + + + + + + + + + + Elements of a SITE ENTRANCE. + + + + + Alternative identifier of ENTRANCE shown to Public. + + + + + Label of ENTRANCE. + + + + + Classification of ENTRANCE. Use EQUIPMENT element to describe in further detail. + + + + + Whether ENTRANCE is external to STOP PLACE. Default is true. + + + + + Whether ENTRANCE can be used for entry. Default is true. + + + + + Whether ENTRANCE can be used for exit. Default is true. + + + + + Width of ENTRANCE in metres. + + + + + Height of ENTRANCE In metres. + + + + + + + External entrance elements of a SITE ENTRANCE. + + + + + Whether nearest crossing to ENTRANCE has dropped kerb. + + + + + Whether there is a drop off point close by to ENTRANCE. + + + + + + + + Type for a list of VEHICLE ENTRANCEs. + + + + + + + + + + + + + A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Identifier of VEHICLE ENTRANCE. + + + + + + + + + Type for a VEHICLE ENTRANCE. + + + + + + + + + + + + Elements of a VEHICLE ENTRANCE. + + + + + Whether private vehicles can use this entrance. + + + + + + + + Type for a list of LEVELs. + + + + + + + + Level of a Building or SITE. + + + + + + + + + An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different levels. + + + + + + + + + + + + + + + + + + + + + + + Type for a SITE LEVEL. + + + + + + + + + + + + Elements of a SITE LEVEL. + + + + + Name of LEVEL. + + + + + Short Name of LEVEL. + + + + + Description of LEVEL. + + + + + Public code for LEVEL. + + + + + Whether level is for public use. + + + + + Accessibility values associated with LEVEL. + + + + + Whether all areas of the LEVEL are wheelchair accessible. + + + + + + + + + Type for a list of ACCESS ZONEs. + + + + + + + + ACCESS ZONE of a building or SITE. + + + + + + + + + An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for an ACCESS ZONE. + + + + + + + + + + + + Elements of an ACCESS ZONE. + + + + + Accessibility values associated with ACCESS ZONE. + + + + + Whether all areas of the ACCESS ZONE are wheelchair accessible. + + + + + + + + A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for an identified and data managed element making up a STOP PLACE. + + + + + + + + + + + + Elements of a SERVICE SITE. + + + + + + + Dummy Type to get round SG limitatiins + + + + + Dummy Type to get round SG limitatiins + + + + + Dummy Type to get round SG limitatiins + + + + + Dummy Type to get round SG limitatiins + + + From 4fe6625aba8a01d6bf8ee568e61b50fc0397430b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 12:05:56 +0200 Subject: [PATCH 14/33] Fix id on InterchangeRuleTiming on VDV452 example. --- .../vdv452/timetable/NeTEx VDV Example.xml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml index 8ed9d69ba..a5e1c7472 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -107039,7 +107039,7 @@ INNS_L03>INNS auf L11>Haid 41 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107075,7 +107075,7 @@ INNS_L11>INNS auf L03>BBN 46 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107111,7 +107111,7 @@ INNS_L03>INNS auf L11>Haid 42 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107147,7 +107147,7 @@ INNS_L03>INNS auf L11>Haid 43 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107183,7 +107183,7 @@ INNS_L11>INNS auf L03>BBN 47 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107219,7 +107219,7 @@ INNS_L11>INNS auf L03>BBN 48 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107255,7 +107255,7 @@ MUZ_L03>MUZ auf L11>StG 82 - + P0Y0M0DT0H4M0S P0Y0M0DT0H2M0S @@ -107292,7 +107292,7 @@ MUZ_L11>MUZ auf L03>ALI 86 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107329,7 +107329,7 @@ MUZ_L11>MUZ auf L03>ALI 87 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107366,7 +107366,7 @@ MUZ_L11>MUZ auf L03>ALI 88 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107403,7 +107403,7 @@ MUZ_L03>MUZ auf L14>StG 91 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107440,7 +107440,7 @@ MUZ_L03>MUZ auf L14>StG 92 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107477,7 +107477,7 @@ MUZ_L03>MUZ auf L14>StG 93 - + P0Y0M0DT0H2M30S P0Y0M0DT0H2M0S @@ -107514,7 +107514,7 @@ MUZ_L14>MUZ auf L03>ALI 97 - + P0Y0M0DT0H3M0S P0Y0M0DT0H2M0S @@ -107550,7 +107550,7 @@ MUZ_L14>MUZ auf L03>ALI 98 - + P0Y0M0DT0H3M0S P0Y0M0DT0H2M0S @@ -107588,7 +107588,7 @@ - + P0Y0M0DT0H0M10S P0Y0M0DT0H0M10S From 8abed5ffc2b6cfbf8f8411f863f6969f2fd75492 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 12:18:01 +0200 Subject: [PATCH 15/33] Update FlexibleServiceProperties in NOPTIS example. --- .../NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml index f54b901e5..df83eba78 100644 --- a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml +++ b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml @@ -333,13 +333,12 @@ is relevant for supplying an Integrator with partial data from multiple sources. true true - + public 10:00:00 PT1H - Public note content - + Public note content From 7db58d376aa65af8470d89714341797d27a559c2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 12:23:35 +0200 Subject: [PATCH 16/33] Fix DestinationDisplayVariant example --- .../timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml | 2 +- .../part2_journeyTimes/netex_flexibleService_support.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 907939291..88c19110d 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/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd index d0148457f..0495f150d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd @@ -57,7 +57,7 @@ Rail transport, Roads and Road transport Standard - NeTEx: FLEXIBLE SERVICE identifier types. + NeTEx: FLEXIBLE SERVICE identifier types. From 9b167f1eabc83c0c608a04f24bd62c411b41c4c3 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 12:35:25 +0200 Subject: [PATCH 17/33] Introduce VehicleTypeZoneRestriction id and version attributes --- examples/standards/gbfs/Netex_gbfs_exm1.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml index 04bdb50b5..6b3eed8e0 100644 --- a/examples/standards/gbfs/Netex_gbfs_exm1.xml +++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml @@ -343,23 +343,23 @@ GBFS file: geofencing_zones.json. - + forbiddenZone - + allUsesAllowed - + 10 - + - + From bb90df45777e3fcac737bac44aeb8e64dcc0bfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 12:57:12 +0200 Subject: [PATCH 18/33] Entrance, VehicleEntrance change --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 b899108a6..c5245678f 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 @@ -352,14 +352,14 @@ Rail transport, Roads and Road transport - + A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. - - --> @@ -483,7 +483,7 @@ Rail transport, Roads and Road transport - + A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. From 198c4700c38780c9d37a04036bdfdebee4791830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 28 Jul 2023 15:28:25 +0200 Subject: [PATCH 19/33] adding Entrance_ --- .../part1_ifopt/netex_ifopt_site_version.xsd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 c5245678f..0c6203444 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 @@ -352,7 +352,12 @@ Rail transport, Roads and Road transport - + + + A dummy ENTRANCE. + + + A physical entrance or exit to/from a SITE. Maybe a door, barrier, gate or other recognizable point of access. @@ -483,7 +488,7 @@ Rail transport, Roads and Road transport - + A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. From 0097ce5b20f8853a36cbe48dd0de66f283844c7d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 12:57:38 +0200 Subject: [PATCH 20/33] Fix TopographicProjection required id and version --- ...INE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml | 6 ++-- ...RE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml | 6 ++-- ...K_FARE_Metrorider-pass+others_20170101.xml | 4 +-- .../fxc/uk_fxc_addon_HSP_plusbus.xml | 14 ++++----- ...I-01_UK_DFT_STOP_NPTG-extract_20170101.xml | 6 ++-- .../txc/uk_nptg_extract1_minimal.xml | 6 ++-- .../txc/uk_nptg_localities_extract1.xml | 30 +++++++++---------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml index 71287b8e3..03fb26ae2 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml @@ -1485,7 +1485,7 @@ Bewbush West (loop) - + @@ -1519,7 +1519,7 @@ Bewbush West (loop) - + @@ -1552,7 +1552,7 @@ Bewbush West (loop) - + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml index 8e08a90c5..37094520f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml @@ -1485,7 +1485,7 @@ Bewbush West (loop) - + @@ -1519,7 +1519,7 @@ Bewbush West (loop) - + @@ -1552,7 +1552,7 @@ Bewbush West (loop) - + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index a1f16ab45..147f17b16 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -5614,10 +5614,10 @@ Metrobus (including Fastway services), Southdown PSV, Compass Travel - + - + Three Bridges diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 90eb79d5e..88cb3f86a 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -1430,7 +1430,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + @@ -1442,7 +1442,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + @@ -1455,7 +1455,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + @@ -1481,7 +1481,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + Suffolk @@ -1506,7 +1506,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + Norfolk @@ -1531,7 +1531,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla - + Norfolk @@ -2293,7 +2293,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla Area in which Network Railcards are valid - + diff --git a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml index e546334a5..722c0394c 100644 --- a/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml +++ b/examples/standards/txc/FX-PI-01_UK_DFT_STOP_NPTG-extract_20170101.xml @@ -607,7 +607,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -633,7 +633,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -658,7 +658,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + diff --git a/examples/standards/txc/uk_nptg_extract1_minimal.xml b/examples/standards/txc/uk_nptg_extract1_minimal.xml index 479982e68..bc071c549 100644 --- a/examples/standards/txc/uk_nptg_extract1_minimal.xml +++ b/examples/standards/txc/uk_nptg_extract1_minimal.xml @@ -417,7 +417,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -440,7 +440,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -463,7 +463,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml index 8589f9434..56bdcdf64 100644 --- a/examples/standards/txc/uk_nptg_localities_extract1.xml +++ b/examples/standards/txc/uk_nptg_localities_extract1.xml @@ -613,7 +613,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -639,7 +639,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -664,7 +664,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -741,7 +741,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -1174,7 +1174,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -1450,7 +1450,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -1939,7 +1939,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -2602,7 +2602,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -3604,7 +3604,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -5016,7 +5016,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -6074,7 +6074,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -6744,7 +6744,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -7362,7 +7362,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -7729,7 +7729,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + @@ -8050,7 +8050,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + From 2fd8ceb8c42b55c6ea07d2b8fd2cae82c6930339 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 14:21:23 +0200 Subject: [PATCH 21/33] Add required order attribute to FareTableRow --- ...ARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml | 12 +++++------ ...RE_FirstSheffield-pass-simple_20200310.xml | 4 ++-- ...K_FARE_Metrorider-pass+others_20170101.xml | 20 +++++++++---------- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml index d34a3cbd7..3d20b5ab3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml @@ -3063,7 +3063,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 | - + Bristol Inner @@ -3147,7 +3147,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Bristol @@ -3222,7 +3222,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Bath @@ -3297,7 +3297,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Weston-super-mare @@ -3400,10 +3400,10 @@ Weston £18 £9 £12.60 - + 5 journeys - + 10 journeys diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index 2a54d3dee..d410b70e7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -6935,13 +6935,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Sheffield - + South Yorkshir diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index 147f17b16..9f00f4c43 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -3251,7 +3251,7 @@ ______ ______ ______ _ | - + 5 journeys @@ -3282,7 +3282,7 @@ ______ ______ ______ _ | - + 5 journeys @@ -3313,7 +3313,7 @@ ______ ______ ______ _ | - + 25 journeys @@ -4568,7 +4568,7 @@ Family (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). - + 1 day @@ -5249,38 +5249,38 @@ You must buy 2 tickets at the same time. - + Day - + Day- Only in July and August when bought online - + Week - + Month - + Quarter - + Annual diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml index a75df2009..0360b10da 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml @@ -3384,7 +3384,7 @@ ______ ______ ______ _ | - + 5 journeys @@ -3415,7 +3415,7 @@ ______ ______ ______ _ | - + 5 journeys @@ -3446,7 +3446,7 @@ ______ ______ ______ _ | - + 25 journeys From 7a99a15adc9aa55dece1c878479832157fd9ce5c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 14:52:36 +0200 Subject: [PATCH 22/33] Make sure FareTableColumn has a required order element --- ...ARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml | 32 +++---- ...FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml | 6 +- ...FirstSheffield-pass-by-period_20200310.xml | 48 +++++------ ...E_FirstSheffield-pass-by-user_20200310.xml | 48 +++++------ ...RE_FirstSheffield-pass-simple_20200310.xml | 84 +++++++++---------- ...K_FARE_Metrorider-pass+others_20170101.xml | 68 +++++++-------- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 54 ++++++------ ...RK_FARE_Metrorider-pass_basic_20170101.xml | 26 +++--- ...ETWORK_FARE_Travelmaster-pass_20200315.xml | 46 +++++----- .../part3_fares/netex_fareTable_version.xsd | 5 ++ 10 files changed, 211 insertions(+), 206 deletions(-) diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml index 3d20b5ab3..9e14f09b8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml @@ -1053,7 +1053,7 @@ Over 12 miles (within West of England area) £5.50 - + Adult @@ -1107,7 +1107,7 @@ Over 12 miles (within West of England area) £5.50 - + child @@ -3074,7 +3074,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 | - + Short_Hop - Adult @@ -3094,7 +3094,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 | - + Cash - child @@ -3158,7 +3158,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Adult @@ -3178,7 +3178,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Cash - child @@ -3200,7 +3200,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Student @@ -3233,7 +3233,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Adult @@ -3253,7 +3253,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Cash - child @@ -3275,7 +3275,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Student @@ -3308,7 +3308,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Adult @@ -3328,7 +3328,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Cash - child @@ -3350,7 +3350,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 | - + Single - Student @@ -3414,7 +3414,7 @@ Weston £18 £9 £12.60 - + Multitrip - Adult @@ -3441,7 +3441,7 @@ Weston £18 £9 £12.60 - + Cash - child @@ -3472,7 +3472,7 @@ Weston £18 £9 £12.60 - + Multitrip - Student diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml index 71360a63e..f3a340c30 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml @@ -2347,19 +2347,19 @@ Over 12 miles (within West of England area) £ 6.50 | £ 3.30 | £ 4.50 | First Somerset & Avon Ltd nocn:136361 - + Adult - + child - + Student diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml index ba030f2c7..b1af68ab3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml @@ -5386,7 +5386,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Sheffield @@ -5400,7 +5400,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Cash @@ -5414,7 +5414,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5449,7 +5449,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5483,7 +5483,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -5507,7 +5507,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5529,7 +5529,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + m-ticket @@ -5543,7 +5543,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5594,7 +5594,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5638,7 +5638,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -5652,7 +5652,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5689,7 +5689,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Subscription @@ -5741,7 +5741,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + South Yorkshir @@ -5755,7 +5755,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Cash @@ -5769,7 +5769,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5804,7 +5804,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5838,7 +5838,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Group @@ -5863,7 +5863,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5890,7 +5890,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + m-ticket @@ -5904,7 +5904,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5955,7 +5955,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5999,7 +5999,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -6024,7 +6024,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -6069,7 +6069,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Subscription diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml index 6149fe8be..d6b4c9cd7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml @@ -5341,7 +5341,7 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £572.00 xxxxx xxxxx xxxxx | - + Sheffield @@ -5355,7 +5355,7 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £572.00 xxxxx xxxxx xxxxx | - + Cash @@ -5381,7 +5381,7 @@ Firstweek : 7 day | £14.50 - + Adult @@ -5424,7 +5424,7 @@ Firstweek : 7 day | £8.00 - + Child / Youth @@ -5467,7 +5467,7 @@ First4Week : 28 day | xxxxx - + Family @@ -5504,7 +5504,7 @@ FirstYear: 1 year | xxxxx - + Student @@ -5526,7 +5526,7 @@ FirstYear: 1 year | xxxxx - + m-ticket @@ -5553,7 +5553,7 @@ FirstYear: 1 year | £572.00 - + Adult @@ -5611,7 +5611,7 @@ First4Week : 28 day | £28.00 - + Child / Youth @@ -5665,7 +5665,7 @@ FirstYear: 1 year | xxxxx - + Family @@ -5690,7 +5690,7 @@ First4Week : 28 day | £36.00 - + Student @@ -5735,7 +5735,7 @@ FirstYear: 1 year | xxxxx - + Subscription @@ -5781,7 +5781,7 @@ Term1 : 1 day | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | - + South Yorkshir @@ -5795,7 +5795,7 @@ Term1 : 1 day | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | - + Cash @@ -5822,7 +5822,7 @@ FirstYear: 1 year | xxxxx - + Adult @@ -5866,7 +5866,7 @@ First4Week : 28 day | xxxxx - + Child / Youth @@ -5909,7 +5909,7 @@ First4Week : 28 day | xxxxx - + Group @@ -5946,7 +5946,7 @@ FirstYear: 1 year | xxxxx - + Student @@ -5972,7 +5972,7 @@ FirstYear: 1 year | xxxxx - + m-ticket @@ -5999,7 +5999,7 @@ FirstYear: 1 year | £814.00 - + Adult @@ -6061,7 +6061,7 @@ Term1 : 1 day | xxxxx - + Child / Youth @@ -6114,7 +6114,7 @@ First4Week : 28 day | xxxxx - + Family @@ -6153,7 +6153,7 @@ Term1 : 1 day | £249.00 - + Student @@ -6204,7 +6204,7 @@ FirstUnlimited: 28 day | £74.00 - + Subscription diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index d410b70e7..e3c219650 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -5134,7 +5134,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Sheffield @@ -5151,7 +5151,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Cash @@ -5165,7 +5165,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5198,7 +5198,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5230,7 +5230,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -5254,7 +5254,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5283,7 +5283,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + m-ticket @@ -5297,7 +5297,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5344,7 +5344,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5385,7 +5385,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -5399,7 +5399,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5434,7 +5434,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Subscription @@ -5483,7 +5483,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + South Yorkshir @@ -5500,7 +5500,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Cash @@ -5514,7 +5514,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5547,7 +5547,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5579,7 +5579,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Group @@ -5603,7 +5603,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5632,7 +5632,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + m-ticket @@ -5646,7 +5646,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Adult @@ -5693,7 +5693,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Child / Youth @@ -5734,7 +5734,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Family @@ -5758,7 +5758,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Student @@ -5800,7 +5800,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + Subscription @@ -6921,13 +6921,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ - + p-ticket - + m-ticket @@ -6953,50 +6953,50 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ Sheffield - + Adult - + Child - + Family - + Student - + Adult - + Child - + Family - + Student @@ -7230,50 +7230,50 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ FirstPass - South Yorkshire - + Adult - + Child - + Family - + Student - + Adult - + Child - + Family - + Student diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index 9f00f4c43..209ee57a7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -1854,7 +1854,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Cash @@ -1868,7 +1868,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -1906,7 +1906,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -1936,7 +1936,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -1961,7 +1961,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + m-ticket @@ -1975,7 +1975,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2040,7 +2040,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2098,7 +2098,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2121,7 +2121,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Duo @@ -2146,7 +2146,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + the-key @@ -2160,7 +2160,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2218,7 +2218,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2269,7 +2269,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Student @@ -2407,7 +2407,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Cash @@ -2421,7 +2421,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2486,7 +2486,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2551,7 +2551,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2618,7 +2618,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + m-ticket @@ -2632,7 +2632,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2697,7 +2697,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2762,7 +2762,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2829,7 +2829,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + the-key @@ -2843,7 +2843,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2908,7 +2908,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2973,7 +2973,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Student @@ -3237,10 +3237,10 @@ ______ ______ ______ _ | - + Cash - Adult - + Cash - child @@ -4554,16 +4554,16 @@ Family (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). - + row name - + Adult - + Child - + Family @@ -5229,19 +5229,19 @@ You must buy 2 tickets at the same time. - + Adult - + Child - + Railcard Holder EXTERNAL use dail defintion diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml index 0360b10da..f6937ae3f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml @@ -1987,7 +1987,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Cash @@ -2001,7 +2001,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2039,7 +2039,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2069,7 +2069,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2094,7 +2094,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + m-ticket @@ -2108,7 +2108,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2173,7 +2173,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2231,7 +2231,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2254,7 +2254,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Duo @@ -2279,7 +2279,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + the-key @@ -2293,7 +2293,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2351,7 +2351,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2402,7 +2402,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Student @@ -2540,7 +2540,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Cash @@ -2554,7 +2554,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2619,7 +2619,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2684,7 +2684,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2751,7 +2751,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + m-ticket @@ -2765,7 +2765,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -2830,7 +2830,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -2895,7 +2895,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -2962,7 +2962,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + the-key @@ -2976,7 +2976,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -3041,7 +3041,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -3106,7 +3106,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Student @@ -3370,10 +3370,10 @@ ______ ______ ______ _ | - + Cash - Adult - + Cash - child diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml index 7fe7ccbb0..b5afa361c 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml @@ -919,7 +919,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Cash @@ -933,7 +933,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -971,7 +971,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -1001,7 +1001,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -1029,7 +1029,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + m-ticket @@ -1043,7 +1043,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -1108,7 +1108,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -1166,7 +1166,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Family @@ -1189,7 +1189,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Duo @@ -1217,7 +1217,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + the-key @@ -1231,7 +1231,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Adult @@ -1289,7 +1289,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Child @@ -1340,7 +1340,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ - + Student diff --git a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml index 83d87450c..84f6b9496 100644 --- a/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml +++ b/examples/standards/fxc/FX-PI-01_UK_TMSTR_NETWORK_FARE_Travelmaster-pass_20200315.xml @@ -8480,24 +8480,24 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Usage Period - + On=Board Pricing - + Off-Vehicle pricing - + Where to buy @@ -8515,7 +8515,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Sheffield @@ -8669,7 +8669,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Sheffield CityWide @@ -8822,7 +8822,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Barnsley @@ -8974,7 +8974,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Doncaster bus @@ -9119,7 +9119,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + Rotherham bus @@ -9272,7 +9272,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + South Yorkshire SYConnect All Zones @@ -9425,7 +9425,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ - + South Yorkshire SYConnect PLUS All Zones @@ -9569,7 +9569,7 @@ AllZone: Getabout - + GetABout All Zones @@ -9700,7 +9700,7 @@ AllZone: Getabout - + GetABout PLUS All Zones @@ -9856,17 +9856,17 @@ ______ ______ _____ | ______ ______ ______ | - + Usage Period - + Off-Vehicle pricing - + Where to buy @@ -9884,7 +9884,7 @@ Sheffield: CityBus - + 18-22 Discount Card -Sheffield CityBus @@ -9995,7 +9995,7 @@ Sheffield: CityWide + tram - + Sheffield CityWide @@ -10107,7 +10107,7 @@ Barnsley: BConnect - + Barnsley BConnect @@ -10218,7 +10218,7 @@ Doncaster: DConnect - + Doncaster DConnect @@ -10329,7 +10329,7 @@ Rotherham: RConnect - + Rotherham RConnect @@ -10440,7 +10440,7 @@ AllZone: SyConnect - + AllZones SYConnect @@ -10551,7 +10551,7 @@ AllZone: SyConnect - + AllZones SYConnect plus 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 a5580a7bc..ffcc85d00 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -791,6 +791,11 @@ Rail transport, Roads and Road transport + + + Order in which FARE TABLE COLUMN HEADING is to appear. + + From 6789446de12ea3b1a90e3461b37c37013028146a Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 28 Jul 2023 15:06:46 +0200 Subject: [PATCH 23/33] Introduce version and id attributes for AlternativeNameMake sure FareTableColumn has a required order element --- .../site/Netex_14_Olympic Venues 1.1.xml | 18 ++--- .../era_uic/Netex_Eurostar_stations.xml | 70 +++++++++---------- .../era_uic/Netex_era_uic_complexsite.xml | 26 +++---- ..._era_uic_scheduledstoppointsforaregion.xml | 8 +-- .../Netex_era_uic_simplepark(Disneyland).xml | 4 +- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/functions/site/Netex_14_Olympic Venues 1.1.xml b/examples/functions/site/Netex_14_Olympic Venues 1.1.xml index bced9b180..63ecb7ac9 100644 --- a/examples/functions/site/Netex_14_Olympic Venues 1.1.xml +++ b/examples/functions/site/Netex_14_Olympic Venues 1.1.xml @@ -149,7 +149,7 @@ - + fr translation Parc Olympique @@ -323,7 +323,7 @@ - + fr translation Centre aquatique @@ -348,7 +348,7 @@ - + fr translation Stade olympique @@ -373,7 +373,7 @@ - + fr translation Vélodrome @@ -398,7 +398,7 @@ - + fr translation Pavillon de basketball @@ -423,7 +423,7 @@ - + fr translation Centre de Hockey @@ -448,7 +448,7 @@ - + fr translation Pavillon de water-polo @@ -473,7 +473,7 @@ - + fr translation Pavillon de handball @@ -498,7 +498,7 @@ - + fr translation Piste de BMX diff --git a/examples/standards/era_uic/Netex_Eurostar_stations.xml b/examples/standards/era_uic/Netex_Eurostar_stations.xml index 23d29a9e8..3d92926f9 100644 --- a/examples/standards/era_uic/Netex_Eurostar_stations.xml +++ b/examples/standards/era_uic/Netex_Eurostar_stations.xml @@ -2421,7 +2421,7 @@ WISSEMBOURG FRONTIERE - + alias WISSEMBOURG FRONT @@ -2443,7 +2443,7 @@ LILLE CHR - + alias LILLE CHR @@ -2464,7 +2464,7 @@ LILLE-FLANDRES (B) - + alias LILLE-FLANDRES @@ -2485,7 +2485,7 @@ LILLE FLANDRES - + alias LILLE FLANDRES @@ -2506,7 +2506,7 @@ LILLE EUROPE - + alias LILLE EUROPE @@ -2528,7 +2528,7 @@ CALAIS VILLE - + alias CALAIS VILLE @@ -2549,7 +2549,7 @@ CALAIS FRETHUN - + alias CALAIS FRETHUN @@ -2570,7 +2570,7 @@ MARNE LA VALLEE CHESSY - + alias MARNE LA VAL CHES @@ -2591,7 +2591,7 @@ MARNE LA VALLEE CHESSY SNCF - + alias MARNE @@ -2612,7 +2612,7 @@ BRUXELLES AGGLO/BRUSSEL AGGLO - + alias BRUXELLES @@ -2627,12 +2627,12 @@ BRUXELLES MIDI EUROSTAR - + NL translation BRUSSEL ZUID EUROSTAR - + FR translation BRUXELLES MIDI EUROSTAR @@ -2648,12 +2648,12 @@ BRUXELLES-MIDI - + NL translation BRUSSEL-ZUID - + FR translation BRUXELLES-MIDI @@ -2675,7 +2675,7 @@ PARIS NORD - + alias PARIS NORD @@ -2696,7 +2696,7 @@ GARE DU NORD - + alias GARE DU NORD @@ -2717,7 +2717,7 @@ GARE DU NORD SURFACE - + alias GARE DU NORD SURF @@ -2738,7 +2738,7 @@ PARIS GARE DE LYON - + alias PARIS GARE LYON @@ -2759,7 +2759,7 @@ PARIS BERCY - + alias PARIS BERCY @@ -2780,7 +2780,7 @@ PARIS AUSTERLITZ - + alias PARIS AUSTERLITZ @@ -2801,7 +2801,7 @@ PARIS AUSTERLITZ RER C - + alias PARIS-AUST RERC @@ -2822,7 +2822,7 @@ PARIS GARE DE LYON RER - + alias PARIS LYON RER @@ -2843,7 +2843,7 @@ PARIS ST LAZARE - + alias PARIS ST LAZARE @@ -2864,7 +2864,7 @@ PARIS MONTPARNASSE 1 ET 2 - + alias PARIS MONT 1 ET 2 @@ -2885,7 +2885,7 @@ GARE DE LYON BANLIEUE - + alias GARE DE LYON BANL @@ -2906,7 +2906,7 @@ PARIS MONTPARNASSE 3 VAUGIRARD - + alias PARIS MONT 3 VAUG @@ -2927,7 +2927,7 @@ PARIS EST - + alias PARIS EST @@ -2948,7 +2948,7 @@ ST PANCRAS - + alias ST @@ -2969,7 +2969,7 @@ EBBSFLEET - + alias EBBSFLEET @@ -2990,7 +2990,7 @@ ASHFORD INTERNATIONAL - + alias ASHFORD @@ -3011,7 +3011,7 @@ AVIGNON CENTRE - + alias AVIGNON CENTRE @@ -3032,7 +3032,7 @@ AVIGNON TGV - + alias AVIGNON TGV @@ -3053,7 +3053,7 @@ BOURG ST MAURICE - + alias BOURG ST MAURICE @@ -3074,7 +3074,7 @@ AIME LA PLAGNE - + alias AIME LA PLAGNE @@ -3095,7 +3095,7 @@ MOUTIERS SALINS BRIDES L BAINS - + alias MOUTIERS SALINS B diff --git a/examples/standards/era_uic/Netex_era_uic_complexsite.xml b/examples/standards/era_uic/Netex_era_uic_complexsite.xml index 576511516..6f199779c 100644 --- a/examples/standards/era_uic/Netex_era_uic_complexsite.xml +++ b/examples/standards/era_uic/Netex_era_uic_complexsite.xml @@ -2288,7 +2288,7 @@ This example shows all stations within Paris, the connections between them and t PARIS NORD PARIS NORD - + alias PARIS NORD @@ -2313,7 +2313,7 @@ This example shows all stations within Paris, the connections between them and t GARE DU NORD GARE DU NORD - + alias GARE DU NORD @@ -2338,7 +2338,7 @@ This example shows all stations within Paris, the connections between them and t GARE DU NORD SURFACE GARE DU NORD SURF - + alias GARE DU NORD SURF @@ -2363,7 +2363,7 @@ This example shows all stations within Paris, the connections between them and t PARIS GARE DE LYON PARIS GARE LYON - + alias PARIS GARE LYON @@ -2388,7 +2388,7 @@ This example shows all stations within Paris, the connections between them and t PARIS BERCY PARIS BERCY - + alias PARIS BERCY @@ -2413,7 +2413,7 @@ This example shows all stations within Paris, the connections between them and t PARIS AUSTERLITZ PARIS AUSTERLITZ - + alias PARIS AUSTERLITZ @@ -2438,7 +2438,7 @@ This example shows all stations within Paris, the connections between them and t PARIS AUSTERLITZ RER C PARIS-AUST RERC - + alias PARIS-AUST RERC @@ -2463,7 +2463,7 @@ This example shows all stations within Paris, the connections between them and t PARIS GARE DE LYON RER PARIS LYON RER - + alias PARIS LYON RER @@ -2488,7 +2488,7 @@ This example shows all stations within Paris, the connections between them and t PARIS ST LAZARE PARIS ST LAZARE - + alias PARIS ST LAZARE @@ -2513,7 +2513,7 @@ This example shows all stations within Paris, the connections between them and t PARIS MONTPARNASSE 1 ET 2 PARIS MONT 1 ET 2 - + alias PARIS MONT 1 ET 2 @@ -2538,7 +2538,7 @@ This example shows all stations within Paris, the connections between them and t GARE DE LYON BANLIEUE GARE DE LYON BANL - + alias GARE DE LYON BANL @@ -2563,7 +2563,7 @@ This example shows all stations within Paris, the connections between them and t PARIS MONTPARNASSE 3 VAUGIRARD PARIS MONT 3 VAUG - + alias PARIS MONT 3 VAUG @@ -2588,7 +2588,7 @@ This example shows all stations within Paris, the connections between them and t PARIS EST PARIS EST - + alias PARIS EST diff --git a/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml b/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml index 4c5524e3d..8eccdab05 100644 --- a/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml +++ b/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml @@ -141,7 +141,7 @@ A COMPOSITE FRAME IS used for grouping. LILLE CHR LILLE CHR - + alias LILLE CHR @@ -166,7 +166,7 @@ A COMPOSITE FRAME IS used for grouping. LILLE-FLANDRES (B) LILLE-FLANDRES - + alias LILLE-FLANDRES @@ -191,7 +191,7 @@ A COMPOSITE FRAME IS used for grouping. LILLE FLANDRES LILLE FLANDRES - + alias LILLE FLANDRES @@ -216,7 +216,7 @@ A COMPOSITE FRAME IS used for grouping. LILLE EUROPE LILLE EUROPE - + alias LILLE EUROPE diff --git a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml index d8ad04b55..64d346a3e 100644 --- a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml +++ b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml @@ -87,7 +87,7 @@ A COMPOSITE FRAME IS used for grouping the other frames. MARNE LA VALLEE CHESSY MARNE LA VAL CHES - + alias MARNE LA VAL CHES @@ -110,7 +110,7 @@ A COMPOSITE FRAME IS used for grouping the other frames. MARNE LA VALLEE CHESSY SNCF MARNE - + alias MARNE From 02e93cab71c6e54abc408b9fd8d2fa425a156ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:03:55 +0200 Subject: [PATCH 24/33] SubstitionGroup Entrance_ fixed substitutionGroup TyoeOfEntity_ fixed --- .../netex_organisation_version.xsd | 6 +++--- .../netex_genericFramework/netex_place_version.xsd | 4 ++-- .../netex_pointAndLinkSequence_version.xsd | 2 +- .../netex_pointAndLink_version.xsd | 4 ++-- .../netex_projection_version.xsd | 2 +- .../netex_spatialFeature_version.xsd | 2 +- .../netex_genericFramework/netex_zone_version.xsd | 2 +- .../netex_responsibilitySet_version.xsd | 2 +- .../netex_typeOfValue_version.xsd | 12 ++++++++---- .../netex_versionFrame_version.xsd | 2 +- .../netex_equipment_version.xsd | 2 +- .../netex_facility_version.xsd | 2 +- .../netex_modeOfOperation_version.xsd | 2 +- .../netex_nm_equipmentEnergy_version.xsd | 4 ++-- .../netex_notice_version.xsd | 4 ++-- .../netex_serviceRestrictions_version.xsd | 2 +- .../netex_ifopt_checkConstraint_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_parking_version.xsd | 4 ++-- .../netex_ifopt_pointOfInterest_version.xsd | 4 ++-- .../part1_ifopt/netex_ifopt_site_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_stopPlace_version.xsd | 4 ++-- .../netex_activation_version.xsd | 2 +- .../part1_networkDescription/netex_line_version.xsd | 2 +- .../netex_journeyPattern_version.xsd | 2 +- .../netex_passengerInformationEquipment_version.xsd | 2 +- .../netex_timeDemandType_version.xsd | 2 +- .../netex_flexibleService_version.xsd | 2 +- .../netex_accessRightParameter_version.xsd | 2 +- .../part3_fares/netex_fareProduct_version.xsd | 2 +- .../netex_fareStructureElement_version.xsd | 4 ++-- .../part3_fares/netex_fareStructure_version.xsd | 2 +- .../part3_fares/netex_salesOfferPackage_version.xsd | 2 +- .../netex_typeOfTravelDocument_version.xsd | 2 +- .../netex_retailConsortium_version.xsd | 2 +- .../netex_salesContract_version.xsd | 8 ++++---- .../part5_rc/netex_nm_mobilityService_version.xsd | 2 +- 36 files changed, 56 insertions(+), 52 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 720af83a1..d82f8b6af 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -848,7 +848,7 @@ Rail transport, Roads and Road transport - + Classification of an ORGANISATION. @@ -885,7 +885,7 @@ Rail transport, Roads and Road transport - + Classification of an ORGANISATION PART. @@ -922,7 +922,7 @@ Rail transport, Roads and Road transport - + Classification of an OPERATION. diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 55e9bc995..90ac2e825 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -194,7 +194,7 @@ Rail transport, Roads and Road transport - + Classification of a TRANSFER. @@ -226,7 +226,7 @@ Rail transport, Roads and Road transport - + Classification of a PLACE. diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd index 7946b5719..0f7ae897c 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd @@ -207,7 +207,7 @@ Rail transport, Roads and Road transport - + A classification of LINK SEQUENCEs according to their functional purpose. diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index 0afa958bf..518d26073 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -357,7 +357,7 @@ Rail transport, Roads and Road transport - + A classification of POINTs according to their functional purpose. @@ -394,7 +394,7 @@ Rail transport, Roads and Road transport - + A classification of LINKs according to their functional purpose. diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd index ebee24476..67cfd00c2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd @@ -497,7 +497,7 @@ Rail transport, Roads and Road transport - + Classification of a PROJECTION. diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd index 93b2cf3dc..1e57107b6 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd @@ -230,7 +230,7 @@ Rail transport, Roads and Road transport - + TYPE OF FEATURe. diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 1c6646c63..1aaeda18d 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -272,7 +272,7 @@ Rail transport, Roads and Road transport - + Classification of a ZONe. diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd index 09dc1ef71..08902fcdb 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd @@ -341,7 +341,7 @@ Rail transport, Roads and Road transport - + Classification of a RESPONSIBILITY ROLE diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd index 534b3f78a..404beef1a 100644 --- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd @@ -213,11 +213,16 @@ Rail transport, Roads and Road transport - + + - A Type of value used to classify an ENTITY. + A dummy TypeOfEntity. - diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd index f8f51ebe1..e9c2ee529 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd @@ -268,7 +268,7 @@ Rail transport, Roads and Road transport - + Classification of TYPE OF VERSION FRAME. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd index 72fb1de25..0aba423b9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd @@ -260,7 +260,7 @@ Rail transport, Roads and Road transport - + A classification of a EQUIPMENT according to its functional purpose. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index a3692b140..639acf9da 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -534,7 +534,7 @@ Rail transport, Roads and Road transport - + A classification of FACILITYs expressing their general functionalities and local functional characteristics specific to the operator. Types of FACILITYs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd index d858f4baa..5e80a3b24 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd @@ -557,7 +557,7 @@ Rail transport, Roads and Road transport - + A classification for a MODE OF OPERATION. +v1.2.2 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 9bfd7a4f7..fd65432c6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -267,7 +267,7 @@ points cannot exceed this value. - + A classification of a BATTERY CHEMISTRY +v1.2.2 @@ -304,7 +304,7 @@ points cannot exceed this value. - + A classification of a PLUG +v1.2.2 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd index 98c38e9ed..97878c4e0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport - + A classification of a NOTICE according to its functional purpose. @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + A classification of DELIVERY VARIANT according to its functional purpose. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 1d97fda27..ad7580db3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - + Classification of a Service. 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 707ac193a..a1c800791 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 @@ -433,7 +433,7 @@ screening, ticket control or immigration, that may potentially incur a time pena - + A classification of CONGESTIONs according to their functional purpose. 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 2dfc79143..4172b89c4 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 @@ -382,7 +382,7 @@ Rail transport, Roads and Road transport - + Designated Place within a PARKING for a VEHICLE to enter. @@ -456,7 +456,7 @@ Rail transport, Roads and Road transport - + Designated Passenger ENTRANCE within a PARKING. 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 738514a69..e17b84546 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 @@ -579,7 +579,7 @@ Rail transport, Roads and Road transport - + Specialisation of ENTRANCE of ENTRANCE for a passenger to a POINT OF INTEREST. @@ -633,7 +633,7 @@ Rail transport, Roads and Road transport - + A VEHICLE ENTRANCE to a POINT OF INTEREST. 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 0c6203444..e9265bda3 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 @@ -352,7 +352,7 @@ Rail transport, Roads and Road transport - + A dummy ENTRANCE. 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 c11577f40..b62b423c7 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 @@ -858,7 +858,7 @@ contained within its parent QUAY. - + Passenger Entrance to a STOP PLACE. @@ -929,7 +929,7 @@ contained within its parent QUAY. - + A physical entrance or exit to/from a SITE for a VEHICLE. May be a door, barrier, gate or other recognizable point of access. 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 7ff691a67..fd3fa6e41 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd @@ -473,7 +473,7 @@ Rail transport, Roads and Road transport - + A classification of real-time processes that are activated when vehicles passes an ACTIVATION POINT or an ACTIVATION LINK. 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 eec334cb0..391b790c3 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -1096,7 +1096,7 @@ Rail transport, Roads and Road transport - + A classification of a LINE according to its functional purpose. +v1.1. 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 5b8db6402..319508bc6 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd @@ -463,7 +463,7 @@ Rail transport, Roads and Road transport - + A classification of JOURNEY PATTERNs according to their functional purpose. 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 57d457252..7295a6105 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -408,7 +408,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - + Classification of a PASSENGER INFORMATION EQUIPMENT. 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 f53271631..2655aed9a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport - + Classification of a TIME DEMAND TYPE. 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 1b39bc165..1ea820e60 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd @@ -214,7 +214,7 @@ Rail transport, Roads and Road transport - + A classification of FLEXIBLE SERVICEs according to their functional purpose. 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 d9f403a59..a10f5188d 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -888,7 +888,7 @@ Rail transport, Roads and Road transport - + A classification of ACCESS RIGHT ASSIGNMENTs expressing their general functionalities and local functional characteristics specific to the operator. Types of ACCESS RIGHT ASSIGNMENTs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. 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 74b2281a8..816363964 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -330,7 +330,7 @@ Rail transport, Roads and Road transport - + A classification of FARE PRODUCTs expressing their general functionalities and local functional characteristics specific to the operator. Types of FARE PRODUCTs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. 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 47fd99bd9..49cbe54bb 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd @@ -347,7 +347,7 @@ Rail transport, Roads and Road transport - + A classification of TARIFFs according to their functional purpose. @@ -654,7 +654,7 @@ Rail transport, Roads and Road transport - + A classification of FARE STRUCTURE ELEMENTs expressing their general functionalities . 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 22704de7e..b2ad034b4 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd @@ -225,7 +225,7 @@ Rail transport, Roads and Road transport - + A classification of FARE STRUCTURE FACTORs expressing their general functionalities . 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 f4824d02b..c04af60e2 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd @@ -787,7 +787,7 @@ Rail transport, Roads and Road transport - + A classification of SALES OFFER PACKAGEs expressing their general functionalities and local functional characteristics specific to the operator. Types of SALES OFFER PACKAGEs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. 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 aae7479f9..fcba50d07 100644 --- a/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_typeOfTravelDocument_version.xsd @@ -108,7 +108,7 @@ Rail transport, Roads and Road transport - + A classification of TRAVEL DOCUMENTs expressing their general functionalities and local functional characteristics specific to the operator. Types of TRAVEL DOCUMENTs like e.g. throw-away ticket, throw-away ticket unit, value card, electronic purse allowing access, public transport credit card etc. may be used to define these categories. 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 8018cc5ef..fd67a5aff 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd @@ -288,7 +288,7 @@ Rail transport, Roads and Road transport - + A classification of RETAIL DEVICEs. 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 b73013771..26c4d7a0c 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd @@ -513,7 +513,7 @@ Rail transport, Roads and Road transport - + A classification of FARE CONTRACT. @@ -555,7 +555,7 @@ Rail transport, Roads and Road transport - + A classification of a FARE CONTRACT ENTRY. @@ -725,7 +725,7 @@ Rail transport, Roads and Road transport - + A classification of a CUSTOMER ACCOUNT. @@ -770,7 +770,7 @@ Rail transport, Roads and Road transport - + A classification of a CUSTOMER ACCOUNT. 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 4ece865f0..30475ec3f 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 @@ -609,7 +609,7 @@ Rail transport, Roads and Road transport - + A classification of a MOBILITY SERVICE according to its functional purpose. +v1.2.2 From 30dd071e81f26f96fd0f92af7565dd242fe2b325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:09:51 +0200 Subject: [PATCH 25/33] Fixing Point_ --- .../netex_pointAndLink_version.xsd | 9 ++++++--- .../part1_ifopt/netex_ifopt_path_version.xsd | 2 +- .../netex_activation_version.xsd | 4 ++-- .../netex_networkInfrastructure_version.xsd | 2 +- .../part1_networkDescription/netex_route_version.xsd | 2 +- .../part1_tacticalPlanning/netex_fareZone_version.xsd | 4 ++-- .../netex_servicePattern_version.xsd | 2 +- .../netex_timingPattern_version.xsd | 2 +- .../part5_nd/netex_nm_vehicleMeetingPoint_version.xsd | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index 518d26073..c4d106e63 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -115,11 +115,15 @@ Rail transport, Roads and Road transport - + + + A dummy Point. + + + A 0-dimensional node of the network used for the spatial description of the network. POINTs may be located by a LOCATION in a given LOCATING SYSTEM. - 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 54c669f95..7af807fb1 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 @@ -400,7 +400,7 @@ Rail transport, Roads and Road transport - + A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. 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 fd3fa6e41..f46c340ca 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd @@ -197,7 +197,7 @@ Rail transport, Roads and Road transport - + A POINT where a control process is activated when a vehicle passes it. EQUIPMENT may be needed for the activation. @@ -295,7 +295,7 @@ Rail transport, Roads and Road transport - + A POINT where the traffic flow can be influenced. Examples are: traffic lights (lanterns), barriers. 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 4cface079..5b1a3d713 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd @@ -107,7 +107,7 @@ Rail transport, Roads and ROAD transport - + A supertype including all POINTs of the physical network (e.g. RAILWAY JUNCTION). 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 32091755e..1c0b9b975 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -362,7 +362,7 @@ Rail transport, Roads and Road transport - + A POINT used to define the shape of a ROUTE through the network. 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 03b32fdbc..cc27ad08f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd @@ -151,7 +151,7 @@ Rail transport, Roads and Road transport - + A POINT where passengers can board or alight from vehicles. @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - + Designated BORDER POINT. 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 b99a7ad9f..6bb6f4cc4 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -172,7 +172,7 @@ Rail transport, Roads and Road transport - + A POINT where passengers can board or alight from vehicles. It is open, which hierarchical level such a point has. It can represent a single door (BoardingPosition) or a whole ZONE. The association to the physical model is done with STOP ASSIGNMENTs. 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 21bc1270b..06d998644 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -153,7 +153,7 @@ Rail transport, Roads and Road transport - + A POINT against which the timing information necessary to build schedules may be recorded. 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 24484a0b8..24d10f685 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 @@ -85,7 +85,7 @@ Rail transport, Roads and Road transport - + A POINT where passengers can board or alight from vehicles. +v1.2.2 From bcfe427af3810211b3e0b56ee207d92c61bb99a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:12:52 +0200 Subject: [PATCH 26/33] Fixing Zone_ substitutionGroup --- .../netex_organisation_version.xsd | 2 +- .../netex_genericFramework/netex_place_version.xsd | 2 +- .../netex_genericFramework/netex_zone_version.xsd | 13 ++++++++----- .../part1_ifopt/netex_ifopt_site_version.xsd | 2 +- .../netex_routingConstraint_version.xsd | 2 +- .../netex_servicePattern_version.xsd | 2 +- ...tex_nm_mobilityServiceConstraintZone_version.xsd | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index d82f8b6af..20aad42e4 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -622,7 +622,7 @@ Rail transport, Roads and Road transport - + Dummy supertype for ADMINISTRATIVE ZONE. diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 90ac2e825..9fc75044e 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -77,7 +77,7 @@ Rail transport, Roads and Road transport - + A named Place. A geographic place of any type which may be specified as the origin or destination of a trip. A PLACE may be of dimension 0 (a POINT), 1 (a Road section) or 2 (a ZONE). diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 1aaeda18d..dbdeec877 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -91,11 +91,15 @@ Rail transport, Roads and Road transport - + + + a dummy ZONE. + + + A two-dimensional PLACE within the service area of a public transport operator (administrative zone, TARIFF ZONE, ACCESS ZONE, etc.). - @@ -163,7 +166,7 @@ Rail transport, Roads and Road transport - + A GENERAL ZONE used to define a zonal fare structure in a zone-counting or zone-matrix system. @@ -201,7 +204,7 @@ Rail transport, Roads and Road transport - + Dummy TARIFF ZONE to workaround xML spy Substitution Group limitations 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 e9265bda3..8e0eeb9b2 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 @@ -671,7 +671,7 @@ Rail transport, Roads and Road transport - + An identified storey (ground, first, basement, mezzanine, etc) within an interchange building or SITE on which SITE COMPONENTs reside. A PATH LINK may connect components on different ACCESS ZONEs. 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 2190f1cd5..32c5188ce 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd @@ -265,7 +265,7 @@ Rail transport, Roads and Road transport - + A constraint on the use of a service. The service, on this specific JOURNEY PATTERN (usually a FTS JOURNEY PATTERN) cannot operate when another (regular) service operates. This may occur only on subpart of the JOURNEY PATTERN, or only on one or some specific SCHEDULED STOP POINTs within the pattern. 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 6bb6f4cc4..b4e118d88 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -428,7 +428,7 @@ Rail transport, Roads and Road transport - + A group of STOP POINTs close to each other. 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 3dcc7e2f8..736ad49ce 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 @@ -63,7 +63,7 @@ Rail transport, Roads and Road transport - + ZONE defining a restriction on used of a MOBILITY SERVICE, e.g. no entry, no drop off, etc, etc +v1.2.2 From 2716f678302ef73aabad6e7537a2935d3c4f96c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:19:50 +0200 Subject: [PATCH 27/33] removed ambiguity from GeneralFrameMember --- .../netex_generalFrame_version.xsd | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index a0a5ae298..1ca55d274 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -215,30 +215,25 @@ Rail transport, Roads and Road transport - + + An association of an ENTITY in a GENERAL FRAME. - + From 86c78910c4204a6c49ed408b37ca72587f0cc020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:22:33 +0200 Subject: [PATCH 28/33] corrected SignEquipment substitutionGroup --- .../netex_ifopt_equipmentSigns_version.xsd | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 8a8af9bfb..73ea2324c 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 @@ -108,11 +108,15 @@ Rail transport, Roads and Road transport - + + + A dummy SignEquipment. + + + Specialisation of PLACE EQUIPMENT for signs (heading signs, etc.). - @@ -216,7 +219,7 @@ Rail transport, Roads and Road transport - + Sign with Place name for a PLACE. E.g. 'Waterloo' @@ -272,7 +275,7 @@ Rail transport, Roads and Road transport - + Specialisation of SIGN EQUIPMENT for headings providing information like direction name, line name, etc. @@ -364,7 +367,7 @@ Rail transport, Roads and Road transport - + Specialisation of SIGN EQUIPMENT sor signs which are not HEADING SIGNs nor PLACE SIGNs. From c3ec8477b56a0dba9b0b21168cc011fcda77dd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:25:12 +0200 Subject: [PATCH 29/33] fixed substitutionGroup CustomerService for better id --- .../netex_ifopt_localService_version.xsd | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 a7e50cfce..9bfaad03b 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 @@ -401,11 +401,15 @@ Rail transport, Roads and Road transport - + + + A dummy CustomerService. + + + Generic specialisation of LOCAL SERVICE for CUSTOMER SERVICEs (lost properties, meeting point, complaints, etc.). - @@ -448,7 +451,7 @@ Rail transport, Roads and Road transport - + Specialisation of CUSTOMER SERVICE for COMPLAINTs. @@ -499,7 +502,7 @@ Rail transport, Roads and Road transport - + Specialisation of CUSTOMER SERVICE for left luggage (provides left luggage information like self service locker, locker free, etc.). @@ -593,7 +596,7 @@ Rail transport, Roads and Road transport - + Specialisation of CUSTOMER SERVICE for lost properties. @@ -649,7 +652,7 @@ Rail transport, Roads and Road transport - + Specialisation of CUSTOMER SERVICE for meeting points (provides characteristics like description, label, etc.). From d624884abdefd58b48cd6f63843a57cd42572e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 29 Jul 2023 18:36:11 +0200 Subject: [PATCH 30/33] fixing AccessRightInProduct substitutionGroup --- .../part3_fares/netex_fareProduct_version.xsd | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 816363964..d965efa7a 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -1008,7 +1008,12 @@ Rail transport, Roads and Road transport - + + + A dummy AccessRightInProduct. + + + 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. @@ -1016,16 +1021,16 @@ Rail transport, Roads and Road transport - + - + From 9c6737e51fa22f4ea94d8b645bd4cebe42f3ca4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 3 Aug 2023 12:53:36 +0200 Subject: [PATCH 31/33] Fixing Entrance problem. Typo changed --- .../functions/fares/rail/Netex_era_toc_uk.xml | 26 +++++++++---------- .../part1_ifopt/netex_ifopt_site_version.xsd | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index 273b712c4..9526ee597 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -5198,7 +5198,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 03.00 @@ -5208,7 +5208,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 04.00 @@ -5218,7 +5218,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 05.00 @@ -5258,7 +5258,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 02.00 @@ -5268,7 +5268,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 03.00 @@ -5278,7 +5278,7 @@ Customers should check with Customer Services of individual Train Companies for Prices will be fetched dynamically - + 04.00 @@ -8974,7 +8974,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + @@ -8986,7 +8986,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + @@ -8999,7 +8999,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + @@ -9025,7 +9025,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + Suffolk @@ -9050,7 +9050,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + Norfolk @@ -9075,7 +9075,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g - + Norfolk @@ -10441,7 +10441,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla Area in which Network Railcards are valid - + 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 8e0eeb9b2..05dfe36ec 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 @@ -343,7 +343,7 @@ Rail transport, Roads and Road transport - + Entrance to a SITE. @@ -399,7 +399,7 @@ Rail transport, Roads and Road transport - Type for SITE ENTRANCe. + Type for SITE ENTRANCE. From 0886b7a4fbe19961e154d7aaa65a0fe63e5077cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 3 Aug 2023 13:03:01 +0200 Subject: [PATCH 32/33] changing refs to xxx_ elements --- xsd/NX.xsd | 6 +++--- .../netex_genericFramework/netex_pointAndLink_version.xsd | 2 +- .../netex_genericFramework/netex_section_version.xsd | 4 ++-- .../netex_genericFramework/netex_zone_version.xsd | 2 +- .../part1_networkDescription/netex_lineNetwork_version.xsd | 2 +- xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xsd/NX.xsd b/xsd/NX.xsd index e33cfade0..93f2999df 100644 --- a/xsd/NX.xsd +++ b/xsd/NX.xsd @@ -37,7 +37,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -328,7 +328,7 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index c4d106e63..346e95840 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -355,7 +355,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 7565d77c2..a491d781e 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd @@ -253,7 +253,7 @@ Rail transport, Roads and Road transport Reference to a POINT. - + @@ -289,7 +289,7 @@ Rail transport, Roads and Road transport Reference to a POINT. - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index dbdeec877..c157a3763 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -72,7 +72,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 d2dd4d7fd..877fef3c1 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd @@ -284,7 +284,7 @@ Rail transport, Roads and Road transport Reference to a POINT. - + 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 d965efa7a..7c634215a 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -1003,7 +1003,7 @@ Rail transport, Roads and Road transport - + From a84cde5f7417bfe873198bb0c2f831d75c1ad0e5 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:04:40 +0000 Subject: [PATCH 33/33] Lint and update documentation tables --- ...K_FARE_Metrorider-pass+others_20170101.xml | 2 +- .../netex_generalFrame_version.xsd | 4 +- .../netex_pointAndLink_version.xsd | 18 ++++---- .../netex_responsibilitySet_version.xsd | 43 ++++++++++--------- .../netex_typeOfValue_version.xsd | 3 +- .../netex_validityCondition_version.xsd | 3 +- .../netex_availabilityCondition_version.xsd | 3 +- .../netex_ifopt_equipmentSigns_version.xsd | 26 +++++------ .../netex_ifopt_localService_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_site_version.xsd | 2 +- .../part3_fares/netex_fareProduct_version.xsd | 6 +-- 11 files changed, 57 insertions(+), 55 deletions(-) diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index 209ee57a7..406607f50 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -5617,7 +5617,7 @@ Metrobus (including Fastway services), Southdown PSV, Compass Travel - + Three Bridges diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd index 1ca55d274..e779dbe63 100644 --- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd @@ -215,7 +215,7 @@ Rail transport, Roads and Road transport - + + diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd index 404beef1a..d7e364d55 100644 --- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd @@ -213,7 +213,6 @@ Rail transport, Roads and Road transport - A dummy TypeOfEntity. @@ -222,7 +221,7 @@ Rail transport, Roads and Road transport A Type of value used to classify an ENTITY. - + diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd index 53b04eb09..9c67a3d76 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd @@ -419,7 +419,8 @@ Rail transport, Roads and Road transport - + + Start date of AVAILABILITY CONDITION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd index 4f7bf5bbc..0b387d4e2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd @@ -300,7 +300,8 @@ Rail transport, Roads and Road transport - + + Start date of AVAILABILITY CONDITION. 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 73ea2324c..23e5e2c79 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 @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport A dummy SignEquipment. - + Specialisation of PLACE EQUIPMENT for signs (heading signs, etc.). @@ -120,19 +120,19 @@ Rail transport, Roads and Road transport + - - - - - - - - - - - - + + + + + + + + + + + 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 9bfaad03b..f997110b1 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 @@ -405,7 +405,7 @@ Rail transport, Roads and Road transport A dummy CustomerService. - + Generic specialisation of LOCAL SERVICE for CUSTOMER SERVICEs (lost properties, meeting point, complaints, etc.). 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 05dfe36ec..2e2ea8cd5 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 @@ -364,7 +364,7 @@ Rail transport, Roads and Road transport - + --> - +