Skip to content

Commit 5567799

Browse files
TuThoThaiTuThoThai
authored
Merge branch 'v2.0' into v2_remove_unique
2 parents 03272eb + cc8dbf9 commit 5567799

25 files changed

Lines changed: 56 additions & 39 deletions

‎README.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,23 @@ For new features, the decision between targetting v2.1-wip or v3.0-wip will be m
112112

113113
_Upcoming: templates for Pull Request_
114114

115+
### The use of AI in this repo 🤖
116+
117+
In this repository, the use of AI should follow these guidelines. The guiding principle is that any contributor is ultimately reponsible for their work on NeTEx and they should be the last reviewer of any AI-guided work before submitting it for peer-review; in other words, only contributors can be authors or co-authors of any change made to NeTEx.
118+
119+
AI **can** be used for:
120+
- Generation of code for contributors to work on the XSD by themselves,
121+
- Analysis of any change proposed to the XSD before it is edited / commented / approved,
122+
- Improvements to the general language in the documentation (i.e, anything in `<xsd:annotation>` and `<xsd:documentation>`) or to check for typos in any work.
123+
124+
AI **cannot** be used for:
125+
- Committing a change in a Pull Request, i.e. the AI agent cannot be an author or co-author of any commit,
126+
- Authoring a change, i.e. the AI agent cannot be an author or co-author of any Pull Request,
127+
- Automated code review as a stand alone action, i.e. the result of a review must be proof-read by a contributor,
128+
- Produce documentation from scratch (i.e, anything in `<xsd:annotation>` and `<xsd:documentation>` should be proof-read by a contributor if it was suggested by AI).
129+
130+
In case you have a GitHub Pro account, please disable the feature `Automated Copilot code review` before contributing here.
131+
115132
----
116133

117134
## Changelog 📰

‎xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Rail transport, Roads and Road transport
148148
<xsd:documentation>Further description or other comment for EQUIPMENT.</xsd:documentation>
149149
</xsd:annotation>
150150
</xsd:element>
151-
<xsd:element name="Note" type="MultilingualString" default="false." minOccurs="0">
151+
<xsd:element name="Note" type="MultilingualString" minOccurs="0">
152152
<xsd:annotation>
153153
<xsd:documentation>Further description or other comment for internal use by OPERATOR.</xsd:documentation>
154154
</xsd:annotation>

‎xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Rail transport, Roads and Road transport
111111
</xsd:annotation>
112112
<xsd:restriction base="TrainIdType"/>
113113
</xsd:simpleType>
114-
<xsd:element name="UnpoweredTrainRef" type="UnpoweredTrainRefStructure" substitutionGroup="TrainRef" default="false">
114+
<xsd:element name="UnpoweredTrainRef" type="UnpoweredTrainRefStructure" substitutionGroup="TrainRef">
115115
<xsd:annotation>
116116
<xsd:documentation>Reference to a UNPOWERED TRAIN. v2.0</xsd:documentation>
117117
</xsd:annotation>

‎xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Rail transport, Roads and Road transport
135135
</xsd:annotation>
136136
<xsd:sequence>
137137
<xsd:element ref="PointOnRouteRef" minOccurs="0"/>
138-
<xsd:element name="Instruction" type="MultilingualString" default="false" minOccurs="0">
138+
<xsd:element name="Instruction" type="MultilingualString" minOccurs="0">
139139
<xsd:annotation>
140140
<xsd:documentation>Directions for following path step.</xsd:documentation>
141141
</xsd:annotation>
@@ -165,7 +165,7 @@ Rail transport, Roads and Road transport
165165
<xsd:documentation>Transition for instruction.</xsd:documentation>
166166
</xsd:annotation>
167167
</xsd:element>
168-
<xsd:element name="RoadName" type="MultilingualString" default="false" minOccurs="0">
168+
<xsd:element name="RoadName" type="MultilingualString" minOccurs="0">
169169
<xsd:annotation>
170170
<xsd:documentation>Directions for following path step.</xsd:documentation>
171171
</xsd:annotation>

‎xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Rail transport, Roads and Road transport
170170
<xsd:documentation>NeTEx ACCESS RIGHT ASSIGNMENT types.</xsd:documentation>
171171
</xsd:annotation>
172172
<!-- ======================================================================= -->
173-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
173+
<!-- ===ENTITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
174174
<xsd:complexType name="accessRightParameterAssignmentsInFrame_RelStructure">
175175
<xsd:annotation>
176176
<xsd:documentation>The assignment of a fare collection parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.).</xsd:documentation>
@@ -184,7 +184,7 @@ Rail transport, Roads and Road transport
184184
</xsd:complexContent>
185185
</xsd:complexType>
186186
<!-- ======================================================================= -->
187-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
187+
<!-- ===ENTITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
188188
<xsd:complexType name="validityParameterAssignmentsInFrame_RelStructure">
189189
<xsd:annotation>
190190
<xsd:documentation>The assignment of a fare collection parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.).</xsd:documentation>
@@ -294,7 +294,7 @@ Rail transport, Roads and Road transport
294294
<xsd:element ref="TypeOfAccessRightAssignmentRef" minOccurs="0"/>
295295
<xsd:element name="ChargingBasis" type="ChargingBasisEnumeration" default="any" minOccurs="0">
296296
<xsd:annotation>
297-
<xsd:documentation>Whether ACCESS RIGHT ASSIGNMENT is chargable or not.</xsd:documentation>
297+
<xsd:documentation>Whether ACCESS RIGHT ASSIGNMENT is chargeable or not.</xsd:documentation>
298298
</xsd:annotation>
299299
</xsd:element>
300300
</xsd:sequence>
@@ -947,7 +947,7 @@ Rail transport, Roads and Road transport
947947
<xsd:sequence>
948948
<xsd:group ref="GenericParameterAssignmentIncludesGroup">
949949
<xsd:annotation>
950-
<xsd:documentation>Elements for compound GENERIC PARAMETER ASSIGNMENT. May only be compounded with parameters fo the same type.</xsd:documentation>
950+
<xsd:documentation>Elements for compound GENERIC PARAMETER ASSIGNMENT. May only be compounded with parameters of the same type.</xsd:documentation>
951951
</xsd:annotation>
952952
</xsd:group>
953953
</xsd:sequence>

‎xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Rail transport, Roads and Road transport
5858
<Type>Standard</Type>
5959
</Metadata>
6060
</xsd:appinfo>
61-
<xsd:documentation>NeTEx: PRICING PARAMATER SET types.</xsd:documentation>
61+
<xsd:documentation>NeTEx: PRICING PARAMETER SET types.</xsd:documentation>
6262
</xsd:annotation>
63-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
63+
<!-- ===ENTITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
6464
<xsd:group name="CalculationParametersInFrameGroup">
6565
<xsd:annotation>
6666
<xsd:documentation>Elements for calculating fares.</xsd:documentation>
@@ -766,7 +766,7 @@ Rail transport, Roads and Road transport
766766
</xsd:group>
767767
<xsd:element name="LimitingRuleInContext" substitutionGroup="PricingRule_Dummy">
768768
<xsd:annotation>
769-
<xsd:documentation>OPTIMISED version whcih can be be used only in line assues ID of comtainign context -no id checking. A price for which a discount can be offered.</xsd:documentation>
769+
<xsd:documentation>OPTIMISED version which can be used only in line; assumes ID of containing context - no ID checking. A price for which a discount can be offered.</xsd:documentation>
770770
</xsd:annotation>
771771
<xsd:complexType>
772772
<xsd:complexContent>

‎xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Rail transport, Roads and Road transport
7373
</xsd:appinfo>
7474
<xsd:documentation>NeTEx DISTANCE MATRIX ELEMENT types.</xsd:documentation>
7575
</xsd:annotation>
76-
<!-- === ENTIITY IN VERSION IN FRAME= === ================================================== -->
76+
<!-- === ENTITY IN VERSION IN FRAME= === ================================================== -->
7777
<xsd:group name="DistanceMatrixElementsInFrameGroup">
7878
<xsd:annotation>
7979
<xsd:documentation>DISTANCE MATRIX ELEMENTs in FRAME.</xsd:documentation>

‎xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Rail transport, Roads and Road transport
8383
</xsd:appinfo>
8484
<xsd:documentation>NeTEx: FARE PRICE types.</xsd:documentation>
8585
</xsd:annotation>
86-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
86+
<!-- ===ENTITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
8787
<xsd:complexType name="farePricesInFrame_RelStructure">
8888
<xsd:annotation>
8989
<xsd:documentation>Type for containment in frame of FARE Prices.</xsd:documentation>
@@ -364,7 +364,7 @@ Rail transport, Roads and Road transport
364364
<xsd:documentation>Record of amount deducted by a price rule calculation, e.g. an additional tax step. If PRICING RULES are chained there may be multiple steps to record.
365365
The source of the input price can be indicated by a FARE PRICE REF of some sort.
366366
The RULE STEP RESULT Amount is the resulting net price after the pricing rule has been applied to the input amount.
367-
The RULE STEP RESULT Adjustment Amount is the difference beteen the original input price and the RULE STEP RESULT Amount (so it is possible to derive the input price amount by adding the the Adjustment to the Net Amount. A similar computation can be done for any units.</xsd:documentation>
367+
The RULE STEP RESULT Adjustment Amount is the difference between the original input price and the RULE STEP RESULT Amount (so it is possible to derive the input price amount by adding the Adjustment to the Net Amount. A similar computation can be done for any units.</xsd:documentation>
368368
</xsd:annotation>
369369
</xsd:element>
370370
</xsd:sequence>

‎xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ Rail transport, Roads and Road transport
8282
</xsd:appinfo>
8383
<xsd:documentation>NeTEx: FARE PRODUCT types.</xsd:documentation>
8484
</xsd:annotation>
85-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
86-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
85+
<!-- ===ENTITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
86+
<!-- ===ENTITY IN VERSION IN FRAME====Used in FARE FRAME)=================================================== -->
8787
<xsd:group name="FareProductsInFrameGroup">
8888
<xsd:annotation>
8989
<xsd:documentation>Fare Product Elements contained in a FARE FRAME.</xsd:documentation>
@@ -435,7 +435,7 @@ Rail transport, Roads and Road transport
435435
</xsd:element>
436436
<xsd:group ref="OtherProductGroup" minOccurs="0">
437437
<xsd:annotation>
438-
<xsd:documentation>Other products to which SALE DISCONT applies to</xsd:documentation>
438+
<xsd:documentation>Other products to which SALE DISCOUNT RIGHT applies</xsd:documentation>
439439
</xsd:annotation>
440440
</xsd:group>
441441
</xsd:sequence>
@@ -856,7 +856,7 @@ Rail transport, Roads and Road transport
856856
<xsd:element ref="PriceUnitRef" minOccurs="0"/>
857857
<xsd:element name="Amount" type="xsd:decimal" minOccurs="0">
858858
<xsd:annotation>
859-
<xsd:documentation>Number of units. If only ine. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range</xsd:documentation>
859+
<xsd:documentation>Number of units. If only one. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range</xsd:documentation>
860860
</xsd:annotation>
861861
</xsd:element>
862862
</xsd:sequence>

‎xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<xsd:documentation>NetEx SERIES CONSTRAINT types.</xsd:documentation>
6767
</xsd:annotation>
6868
<!-- ======================================================================= -->
69-
<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
69+
<!-- ===ENTITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
7070
<xsd:group name="FareSeriesInFrameGroup">
7171
<xsd:annotation>
7272
<xsd:documentation>Additional descriptive properties of a FARE FRAME.</xsd:documentation>

0 commit comments

Comments
 (0)