Skip to content

Commit

Permalink
change all order to positiveInteger, (#657)
Browse files Browse the repository at this point in the history
* change all order to positiveInteger,

add info about what to do what to do if order makes no sense (order="1" for all elements)

* fix validation problem
  • Loading branch information
ue71603 authored Mar 7, 2024
1 parent ff044de commit 183bd72
Show file tree
Hide file tree
Showing 26 changed files with 46 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -359,17 +359,17 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST-NORD"/>
<FlexibleStopPlaceRef version="any" ref="NHR:FlexibleStopPlace:ID-HANABORG-NORD"/>
</FlexibleStopAssignment>
<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-HANABORG">
<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-HANABORG">
<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST"/>
<StopPlaceRef version="any" ref="NHR:StopPlace:ID-HANABORG_ST"/>
<QuayRef version="any" ref="NHR:Quay:ID-HANABORG_ST-QUAY"/>
</PassengerStopAssignment>
<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-LORENSKOG">
<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-LORENSKOG">
<ScheduledStopPointRef ref="RUT:ScheduledStopPoint:ID-LORENSKOG"/>
<StopPlaceRef version="any" ref="NHR:StopPlace:ID-LORENSKOGSENTRUM"/>
<QuayRef version="any" ref="NHR:Quay:ID-LORENSKOGSENTRUM-QUAY"/>
</PassengerStopAssignment>
<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-TRIADEN">
<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-TRIADEN">
<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-TRIADEN"/>
<StopPlaceRef version="any" ref="NHR:StopPlace:ID-TRIADEN-ENTRANCE"/>
<QuayRef version="any" ref="NHR:Quay:ID-TRIADEN-ENTRANCE-QUAY"/>
Expand Down Expand Up @@ -444,16 +444,16 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
</Notice>
</notices>
<noticeAssignments>
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863" order="0">
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863" order="1">
<NoticeRef ref="RUT:Notice:863"/>
<NoticedObjectRef version="any" ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-fraLorenskog"/>
<!--NoticedObjectRef ref="RUT:FlexibleLine:863"/-->
</NoticeAssignment>
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-TilLorenskog" order="0">
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-TilLorenskog" order="1">
<NoticeRef ref="RUT:Notice:863-Henting"/>
<NoticedObjectRef ref="RUT:Route:863-TilLorenskog"/>
</NoticeAssignment>
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-FraLorenskog" order="0">
<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-FraLorenskog" order="1">
<NoticeRef ref="RUT:Notice:863-Levering"/>
<NoticedObjectRef ref="RUT:Route:863-FraLorenskog"/>
</NoticeAssignment>
Expand Down
8 changes: 4 additions & 4 deletions examples/standards/txc/uk_nap_extract1_minimal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</stopAreas>
<!-- ======= NaPTAn Stop Data ====== -->
<stopAssignments>
<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966" order="0">
<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966" order="1">
<ScheduledStopPoint version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966">
<Name>Netherley Road</Name>
<TimingPointStatus>timingPoint</TimingPointStatus>
Expand Down Expand Up @@ -193,7 +193,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</quays>
</StopPlace>
</PassengerStopAssignment>
<PassengerStopAssignment version="any" responsibilitySetRef="nptgAdminArea:086" id="naptStop:2400100348" order="0">
<PassengerStopAssignment version="any" responsibilitySetRef="nptgAdminArea:086" id="naptStop:2400100348" order="1">
<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:086" created="2008-03-10T15:20:00" changed="2008-12-09T15:29:00" modification="revise" version="1" status="active" id="naptStop:2400100348">
<Name>White Deer Park Nursing Home</Name>
<TimingPointStatus>notTimingPoint</TimingPointStatus>
Expand Down Expand Up @@ -235,7 +235,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</StopPlace>
</PassengerStopAssignment>
<!-- ==== -->
<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDARE" order="0">
<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDARE" order="1">
<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:110" created="2006-09-08T14:30:00" changed="2007-09-26T13:00:00" modification="revise" version="1" status="active" id="naptStop:9100ABDARE">
<Name>Aberdare Rail Station</Name>
<stopAreas>
Expand Down Expand Up @@ -324,7 +324,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</quays>
</StopPlace>
</PassengerStopAssignment>
<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDO" order="0">
<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDO" order="1">
<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:110" created="2006-09-08T14:30:00" changed="2007-09-26T13:00:00" modification="revise" version="1" status="active" id="naptStop:9100ABDO">
<Name>Aberdour Rail Station</Name>
<stopAreas>
Expand Down
8 changes: 4 additions & 4 deletions examples/standards/txc/uk_nap_naptan_stops_extract1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</stopAreas>
<!-- ======= NaPTAn Stop Data ====== -->
<stopAssignments>
<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966" order="0">
<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966" order="1">
<ScheduledStopPoint version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966">
<!-- NaPTAN StopPoint.AdministrativeAreaRef>060 -->
<Name>Netherley Road</Name>
Expand Down Expand Up @@ -259,7 +259,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</quays>
</StopPlace>
</PassengerStopAssignment>
<PassengerStopAssignment version="any" responsibilitySetRef="nptgUkAdministrativeArea:086" id="naptStop:2400100348" order="0">
<PassengerStopAssignment version="any" responsibilitySetRef="nptgUkAdministrativeArea:086" id="naptStop:2400100348" order="1">
<ScheduledStopPoint responsibilitySetRef="nptgUkAdministrativeArea:086" created="2008-03-10T15:20:00" changed="2008-12-09T15:29:00" modification="revise" version="1" status="active" id="naptStop:2400100348">
<!-- NAPT_</AtcoCode> -->
<!-- NAPT_ <AdministrativeAreaRef> -->
Expand Down Expand Up @@ -314,7 +314,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</StopPlace>
</PassengerStopAssignment>
<!-- ==== -->
<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDARE" order="0">
<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDARE" order="1">
<!--
<StopPoint CreationDateTime="2006-09-08T14:30:00" ModificationDateTime="2007-09-26T13:00:00" Modification="revise" RevisionNumber="1" Status="active">
<AtcoCode>9100ABDARE</AtcoCode>
Expand Down Expand Up @@ -456,7 +456,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</quays>
</StopPlace>
</PassengerStopAssignment>
<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDO" order="0">
<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDO" order="1">
<!--
<StopPoint CreationDateTime="2006-09-08T14:30:00" ModificationDateTime="2007-09-26T13:00:00" Modification="revise" RevisionNumber="1" Status="active">
<AtcoCode>9100ABDO</AtcoCode>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Name of source of the data.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of name.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -192,7 +192,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of name.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="AssignmentGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order in which to show an ASSIGNMENT.</xsd:documentation>
<xsd:documentation>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.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="PointRefStructure">
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of point on link.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Name of language for which this is to be used. </xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of name.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="VersionOfObjectRefStructure">
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of element.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ Rail transport, Roads and Road transport
<xsd:group ref="NoticeAssignmentPropertiesGroup"/>
<xsd:group ref="NoticePropertiesGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of Assignment.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="DeliveryVariantGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Presentation Order of variant.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="SecurityListingGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>order within list</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ contained within its parent QUAY.</xsd:documentation>
<xsd:sequence>
<xsd:group ref="VehicleQuayAlignmentGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:nonNegativeInteger">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of element.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -1326,7 +1326,7 @@ contained within its parent QUAY.</xsd:documentation>
<xsd:sequence>
<xsd:group ref="VehiclePositionAlignmentGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:nonNegativeInteger">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of attribute</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Rail transport, Roads and ROAD transport
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer" use="optional">
<xsd:attribute name="order" type="xsd:positiveInteger" use="optional">
<xsd:annotation>
<xsd:documentation>Relative order of ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="RouteInstructionGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Relative order</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Version number of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer" use="optional" default="1">
<xsd:attribute name="order" type="xsd:positiveInteger" use="optional" default="1">
<xsd:annotation>
<xsd:documentation>Relative oOrder of ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point.</xsd:documentation>
<xsd:documentation>Reference to RESPONSIBILITY SET for managing the object. If absent, then responsibility is same as for containing context of this object.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order in which to show ASSIGNMENT,</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Label" type="xsd:normalizedString" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of Assignment.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="JourneyPartGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of JOURNEY PART within JOURNEY.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -302,7 +302,7 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
</xsd:annotation>
</xsd:group>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>Order of JOURNEY PART POistion within JOURNEY PART.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ The RULE STEP RESULT Adjustment Amount is the difference beteen the original i
<xsd:documentation>Identifier of PriceRuleStepResult</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer" use="optional">
<xsd:attribute name="order" type="xsd:positiveInteger" use="optional">
<xsd:annotation>
<xsd:documentation>Order of step.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="PriceableObjectRefStructure">
<xsd:attribute name="order" type="xsd:integer" use="optional">
<xsd:attribute name="order" type="xsd:positiveInteger" use="optional">
<xsd:annotation>
<xsd:documentation>order of constraint.</xsd:documentation>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="SeriesConstraintIdType"/>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>relative number of series for same OD pair (TAP Route number)</xsd:documentation>
</xsd:annotation>
Expand All @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="SeriesConstraintGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>relative number of series for same OD pair (TAP Route number)</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Identifier of a FARE ELEMENT IN SEQUENCE.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:integer"/>
<xsd:attribute name="order" type="xsd:positiveInteger"/>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:group ref="FareElementInSequenceGroup"/>
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:attribute name="order" type="xsd:positiveInteger">
<xsd:annotation>
<xsd:documentation>order of element in sequence.</xsd:documentation>
</xsd:annotation>
Expand Down
Loading

0 comments on commit 183bd72

Please sign in to comment.