From 4b91df73370be0c24718722e13b9e34c0b822a6e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Sep 2024 12:16:27 +0200 Subject: [PATCH] Introduce OrderedVersionedChildStructure This would fix #769 Make it easier to validate obvious errors in implementations missing version and order attributes where applicable. --- .../netex_alternativeName_version.xsd | 9 +--- .../netex_grouping_version.xsd | 7 +-- .../netex_pointAndLinkSequence_version.xsd | 14 +---- .../netex_pointAndLink_version.xsd | 9 +--- .../netex_alternativeText_version.xsd | 7 +-- .../netex_relationship_support.xsd | 2 +- .../netex_responsibility_version.xsd | 21 +++++++- .../netex_version_support.xsd | 2 +- .../netex_securityList_version.xsd | 7 +-- .../netex_trainElement_version.xsd | 9 +--- .../netex_ifopt_stopPlace_version.xsd | 14 +---- .../netex_networkRestriction_support.xsd | 5 -- ..._passengerInformationEquipment_support.xsd | 10 ---- ..._passengerInformationEquipment_version.xsd | 2 +- .../part2_journeyTimes/netex_call_version.xsd | 28 +++------- .../netex_coupledJourney_version.xsd | 11 ++-- .../netex_interchangeRule_version.xsd | 7 +-- .../netex_fareStructure_support.xsd | 1 - .../netex_fareStructure_version.xsd | 7 +-- .../part3_fares/netex_fareTable_version.xsd | 53 +++++++------------ 20 files changed, 67 insertions(+), 158 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd index 2d82a4542..a7cbfaaa5 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. @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport Type for ALTERNATIVE NAME. - + @@ -192,11 +192,6 @@ Rail transport, Roads and Road transport - - - Order of name. - - diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd index 34d47f9fc..1f3e53613 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd @@ -264,15 +264,10 @@ Rail transport, Roads and Road transport Type for a GROUP OF ENTITY MEMBERs. Subclass this for specific member types. - + - - - Order of member within parent group. - - diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd index a330ec26b..c8e823620 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd @@ -135,15 +135,10 @@ Rail transport, Roads and Road transport Type for a POINT IN LINK SEQUENCE i.e. a Node of a graph. - + - - - Order of POINT within parent. - - @@ -176,15 +171,10 @@ Rail transport, Roads and Road transport Type for a LINK IN LINK SEQUENCE. I.e. an Edge of a graph. - + - - - Order of LINK in sequence. - - diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd index eaddb4f5d..c3c0fef52 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd @@ -296,17 +296,10 @@ Rail transport, Roads and Road transport Type for a POINT ON LINK. - + - - - - Order of step in sequence - - - diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd index 3f4f70395..791b21615 100644 --- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport Type for ALTERNATIVE TEXT - + @@ -137,11 +137,6 @@ 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 0ba8c2cd8..b12a6795e 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_responsibility/netex_responsibility_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd index 02171161b..ed61bb5bb 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport - A child ENTIITY whose RESPONSIBILITY SET must be the same as its containing parent object, and which cannot exist independently of its parent. + A child ENTITY whose RESPONSIBILITY SET must be the same as its containing parent object, and which cannot exist independently of its parent. @@ -125,6 +125,25 @@ Rail transport, Roads and Road transport + + + A ordered child ENTITY whose RESPONSIBILITY SET must be the same as its containing parent object, and which cannot exist independently of its parent. + + + + + Type for VERSIONED CHILD. + + + + + + Order of element. + + + + + Abstract derived view of a MANAGED OBJECT for general purpose use. diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd index 69c906706..0098c5942 100644 --- a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd @@ -224,7 +224,7 @@ Rail transport, Roads and Road transport Date reference was last changed. - + Version number of referenced entity. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd index 9343963cf..63f1bacf3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd @@ -227,15 +227,10 @@ Rail transport, Roads and Road transport Type for SECURITY LISTING. - + - - - order within list - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index ce200a825..4e6ad87f9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -496,19 +496,12 @@ Rail transport, Roads and Road transport Type for a TRAIN IN COMPOUND TRAIN. - + Elements for a TRAIN IN COMPOUND TRAIN. - - - - Order of TRAIN IN COMPOUND TRAIN within TRAIN. - - - 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 6a92bb715..77cba7001 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 @@ -1282,15 +1282,10 @@ contained within its parent QUAY. Type for a VEHICLE QUAY ALIGNMENT. - + - - - Order of element. - - @@ -1352,15 +1347,10 @@ contained within its parent QUAY. Type for a VEHICLE POSTION ALIGNMENT. - + - - - 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 3a739fc6c..af2629e46 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd @@ -82,11 +82,6 @@ Rail transport, Roads and ROAD transport Identifier of referenced entity. - - - Relative order of ASSIGNMENT. - - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd index c9957f5d3..fdf2b1890 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd @@ -74,16 +74,6 @@ Rail transport, Roads and Road transport - - - Version number of referenced entity. - - - - - Relative oOrder of ASSIGNMENT. - - Identifier of DISPLAY 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 7b86e295a..e7903859c 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -358,7 +358,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - Order in which to show ASSIGNMENT, + Order in which to show DISPLAY ASSIGNMENT. 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 d3936d097..b37c2f9ea 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd @@ -119,19 +119,13 @@ Rail transport, Roads and Road transport Data type for CALL. - + - + - - - Order of Call within Journey. - - @@ -304,19 +298,13 @@ Rail transport, Roads and Road transport Data type for DEAD RUN CALL. - + - + - - - Order of DEAD RUN CALL within Journey. - - 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 68a011d34..48d7a3b78 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -159,9 +159,10 @@ Rail transport, Roads and Road transport + - Order of JOURNEY PART within JOURNEY. + Order of JOURNEY PART within JOURNEY. @@ -294,7 +295,7 @@ of the corresponding VEHICLE TYPE. true for forward. Type for JOURNEY PART POSITION. - + @@ -302,11 +303,6 @@ of the corresponding VEHICLE TYPE. true for forward. - - - Order of JOURNEY PART POistion within JOURNEY PART. - - @@ -445,6 +441,7 @@ of the corresponding VEHICLE TYPE. true for forward. + Order of JOURNEY PART COUPLE. +v1.1 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 d72d539eb..3748aa04f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd @@ -316,15 +316,10 @@ Rail transport, Roads and Road transport Type for INTERCHANGE RULE PARAMETER. - + - - - Order in which to apply filter - - 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 b3de53230..fb88ec93d 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,6 @@ 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 dc2a31e9a..3ea018749 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd @@ -91,15 +91,10 @@ Rail transport, Roads and Road transport Type for FARE ELEMENT IN SEQUENCE. - + - - - 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 cb717a0c3..47980a0c3 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -167,10 +167,10 @@ 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. + A grouping of prices that may be associated with a DISTANCE MATRIX ELEMENT, FARE STRUCTURE ELEMENT or other PRICEABLE OBJECT. @@ -326,7 +326,7 @@ Rail transport, Roads and Road transport - Type for use of fare table. + Type for use of fare table. @@ -340,7 +340,7 @@ 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. + 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. @@ -390,17 +390,17 @@ Rail transport, Roads and Road transport - PRice Elements for a STANDARD FARE TABLE PRICE GROUP.Group. + Price Elements for a STANDARD FARE TABLE PRICE GROUP. - Price for a first class single fare. + Price for a first class single fare. - Price for a second class single fare. + Price for a second class single fare. @@ -426,7 +426,7 @@ Rail transport, Roads and Road transport - An individual combination of features in a FARE TABLE, used to associate a FARE PRICE. An optimisation of CELL that can be used in a Faretable without a cell id. SHould have a unique identity through its other attributes. + An individual combination of features in a FARE TABLE, used to associate a FARE PRICE. An optimisation of CELL that can be used in a Faretable without a cell id. SHould have a unique identity through its other attributes. @@ -459,7 +459,7 @@ Rail transport, Roads and Road transport Type for a CELL. - + @@ -467,11 +467,6 @@ Rail transport, Roads and Road transport - - - Order in which cell is to appear. - - @@ -495,7 +490,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. @@ -518,7 +513,7 @@ Rail transport, Roads and Road transport Type for a CELL. - + @@ -526,11 +521,6 @@ Rail transport, Roads and Road transport - - - Order in which cell is to appear. - - @@ -658,7 +648,7 @@ Rail transport, Roads and Road transport - Whether fare is for s a direct i.e. no changes required point to point fare or indirect routing. + Whether fare is for s a direct i.e. no changes required point to point fare or indirect routing. @@ -735,7 +725,7 @@ Rail transport, Roads and Road transport - + Type for a list of FARE FARE TABLE COLUMN HEADINGs. @@ -745,7 +735,7 @@ Rail transport, Roads and Road transport - A Column heading for a FARE TABLE, + A Column heading for a FARE TABLE. @@ -754,7 +744,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. @@ -781,7 +771,7 @@ Rail transport, Roads and Road transport Type for a FARE TABLE COLUMN HEADING. - + @@ -789,11 +779,6 @@ Rail transport, Roads and Road transport - - - Order in which FARE TABLE COLUMN HEADING is to appear. - - @@ -845,7 +830,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. @@ -861,7 +846,7 @@ Rail transport, Roads and Road transport - Order in which FARE TABLE ROW is to appear. + Order in which FARE TABLE ROW is to appear. @@ -883,7 +868,7 @@ Rail transport, Roads and Road transport - Order in which FARE TABLE ROW is to appear. + Order in which FARE TABLE ROW is to appear.