From 2ce83f2cf346439285ebba6a08551884a10fd1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 7 Feb 2024 11:28:35 +0100 Subject: [PATCH 1/2] change all order to positiveInteger, add info about what to do what to do if order makes no sense (order="1" for all elements) --- .../network/FlexibleLine863-with-connection.xml | 12 ++++++------ examples/standards/txc/uk_nap_extract1_minimal.xml | 8 ++++---- .../netex_alternativeName_version.xsd | 4 ++-- .../netex_assignment_version.xsd | 4 ++-- .../netex_pointAndLink_support.xsd | 2 +- .../netex_alternativeText_version.xsd | 2 +- .../netex_relationship_support.xsd | 2 +- .../netex_noticeAssignment_version.xsd | 2 +- .../netex_notice_version.xsd | 2 +- .../netex_securityList_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_stopPlace_version.xsd | 4 ++-- .../netex_networkRestriction_support.xsd | 2 +- .../netex_routeInstruction_version.xsd | 2 +- .../netex_passengerInformationEquipment_support.xsd | 2 +- .../netex_passengerInformationEquipment_version.xsd | 2 +- .../netex_stopAssignment_version.xsd | 2 +- .../netex_coupledJourney_version.xsd | 4 ++-- .../part3_fares/netex_farePrice_version.xsd | 2 +- .../part3_fares/netex_fareSeries_support.xsd | 2 +- .../part3_fares/netex_fareSeries_version.xsd | 4 ++-- .../part3_fares/netex_fareStructure_support.xsd | 2 +- .../part3_fares/netex_fareStructure_version.xsd | 2 +- .../part3_fares/netex_fareTable_version.xsd | 10 +++++----- .../part3_fares/netex_salesOfferPackage_version.xsd | 2 +- .../netex_customerPurchasePackage_version.xsd | 2 +- 25 files changed, 42 insertions(+), 42 deletions(-) diff --git a/examples/standards/norway/network/FlexibleLine863-with-connection.xml b/examples/standards/norway/network/FlexibleLine863-with-connection.xml index 97fff6cff..a5ccacdcc 100644 --- a/examples/standards/norway/network/FlexibleLine863-with-connection.xml +++ b/examples/standards/norway/network/FlexibleLine863-with-connection.xml @@ -359,17 +359,17 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml - + - + - + @@ -444,16 +444,16 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml - + - + - + diff --git a/examples/standards/txc/uk_nap_extract1_minimal.xml b/examples/standards/txc/uk_nap_extract1_minimal.xml index eae283626..3fd3a9a02 100644 --- a/examples/standards/txc/uk_nap_extract1_minimal.xml +++ b/examples/standards/txc/uk_nap_extract1_minimal.xml @@ -158,7 +158,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + Netherley Road timingPoint @@ -193,7 +193,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + White Deer Park Nursing Home notTimingPoint @@ -235,7 +235,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + Aberdare Rail Station @@ -324,7 +324,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + Aberdour Rail Station diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd index 0acaf4344..f3e9a734d 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport Name of source of the data. - + Order of name. @@ -192,7 +192,7 @@ Rail transport, Roads and Road transport - + Order of name. diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd index 4d5409a13..afca57d37 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd @@ -72,9 +72,9 @@ Rail transport, Roads and Road transport - + - Order in which to show an ASSIGNMENT. + Order in which to show an ASSIGNMENT. In some rare cases order makes no sense. The convention should be that order="1" is set then for all elements. diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd index 7cfddd0c3..a14f84e87 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport - + Order of point on link. diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd index 6dda91759..1c7e42997 100644 --- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport Name of language for which this is to be used. - + Order of name. diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd index ad99a144a..5b52a052e 100644 --- a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd @@ -126,7 +126,7 @@ Rail transport, Roads and Road transport - + Order of element. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd index 56f12a329..8ae039956 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd @@ -277,7 +277,7 @@ Rail transport, Roads and Road transport - + Order of Assignment. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd index b4939c303..168639008 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd @@ -221,7 +221,7 @@ Rail transport, Roads and Road transport - + Presentation Order of variant. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd index 6fe17ebe1..720d3a02a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd @@ -231,7 +231,7 @@ Rail transport, Roads and Road transport - + order within list 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 cb26aff42..101aecef4 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 @@ -1256,7 +1256,7 @@ contained within its parent QUAY. - + Order of element. @@ -1326,7 +1326,7 @@ contained within its parent QUAY. - + Order of attribute diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd index 8bb657ea7..b3935eb84 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd @@ -82,7 +82,7 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. - + Relative order of ASSIGNMENT. 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 a5783b63c..3874a8163 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + Relative order diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd index 2e789ef0c..c9c61ed5b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd @@ -79,7 +79,7 @@ Rail transport, Roads and Road transport Version number of referenced entity. - + Relative oOrder of ASSIGNMENT. 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 183b1aa3c..9a562a723 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -350,7 +350,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. Reference to RESPONSIBILITY SET for managing the object. If absent, then responsibility is same as for containing context of this object. - + Order in which to show ASSIGNMENT, 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..4758f5ea4 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -414,7 +414,7 @@ Rail transport, Roads and Road transport - + Order of Assignment. 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..3af20d8a1 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport - + Order of JOURNEY PART within JOURNEY. @@ -302,7 +302,7 @@ of the corresponding VEHICLE TYPE. true for forward. - + Order of JOURNEY PART POistion within JOURNEY PART. 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..9af52d835 100644 --- a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd @@ -397,7 +397,7 @@ The RULE STEP RESULT Adjustment Amount is the difference beteen the original i Identifier of PriceRuleStepResult - + Order of step. diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd index 0a6da909a..6d3c43fa9 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport - + order of constraint. 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..edf3efe65 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd @@ -123,7 +123,7 @@ Rail transport, Roads and Road transport - + relative number of series for same OD pair (TAP Route number) @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + relative number of series for same OD pair (TAP Route number) diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd index ee58df08e..cfd78822f 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd @@ -96,7 +96,7 @@ Rail transport, Roads and Road transport Identifier of a FARE ELEMENT IN SEQUENCE. - + 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..70237cb83 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd @@ -95,7 +95,7 @@ Rail transport, Roads and Road transport - + 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 c500d70ca..31ece9bdf 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -467,7 +467,7 @@ Rail transport, Roads and Road transport - + Order in which cell is to appear. @@ -526,7 +526,7 @@ Rail transport, Roads and Road transport - + Order in which cell is to appear. @@ -789,7 +789,7 @@ Rail transport, Roads and Road transport - + Order in which FARE TABLE COLUMN HEADING is to appear. @@ -859,7 +859,7 @@ Rail transport, Roads and Road transport - + Order in which FARE TABLE ROW is to appear. @@ -881,7 +881,7 @@ Rail transport, Roads and Road transport - + Order in which FARE TABLE ROW is to appear. 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..0b22f4c94 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd @@ -316,7 +316,7 @@ Rail transport, Roads and Road transport - + Relative order of element. 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..4f602cf85 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -647,7 +647,7 @@ Rail transport, Roads and Road transport - + Relative order of element. From 75567266b00180653a3ecb0df1f96748bf49a6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 7 Feb 2024 11:32:34 +0100 Subject: [PATCH 2/2] fix validation problem --- examples/standards/txc/uk_nap_naptan_stops_extract1.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml index 37ff741f3..7de47746c 100644 --- a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml +++ b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml @@ -213,7 +213,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + Netherley Road @@ -259,7 +259,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - + @@ -314,7 +314,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ - +