Skip to content

Commit 382e1fc

Browse files
TuThoThaiTuThoThai
authored
Merge pull request #962 from NeTEx-CEN/ref_extension_to_restriction
Improving the NameOfClass checks to follow hierarchy in objects being referenced
2 parents a73bfc2 + 6341ea4 commit 382e1fc

File tree

231 files changed

+15866
-425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+15866
-425
lines changed

‎examples/functions/simpleNetwork/Netex_uk_underground_1.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ A COMPOSITE FRAME Is used to group the above frames as a cohernet version.
114114
<ValueSet version="any" id="napt:Stop_types">
115115
<Name>UK NaPTAN Stop Types</Name>
116116
<values>
117-
<TypeOfPoint version="any" id="napt:Type_of_point@TMU">
118-
<Name>Tram or Metro stop</Name>
117+
<TypeOfPoint version="any" id="napt:Type_of_point@TMU" nameOfClassifiedEntityClass="ScheduledStopPoint">
118+
<Name>Tram or Metro stop</Name>
119119
</TypeOfPoint>
120-
<TypeOfPoint version="any" id="napt:Type_of_point@RSE">
120+
<TypeOfPoint version="any" id="napt:Type_of_point@RSE" nameOfClassifiedEntityClass="ScheduledStopPoint">
121121
<Name>Rail Station Entrance</Name>
122122
</TypeOfPoint>
123123
</values>

‎examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,26 +455,26 @@ The Calendar is shown coded as
455455
<TimingLink version="any" id="mybus:SSP_001+SSP_001_t1">
456456
<Name>After Alpha t1</Name>
457457
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_001"/>
458-
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
458+
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
459459
</TimingLink>
460460
<TimingLink version="any" id="mybus:SSP_001_t1+SSP_001_t2">
461461
<Name>After Alpha t1 to After Alpha t2</Name>
462-
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
463-
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
462+
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
463+
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
464464
</TimingLink>
465465
<TimingLink version="any" id="mybus:SSP_001_t2+SSP_002">
466466
<Name>After Alpha t2 to Bravo</Name>
467-
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t2"/>
467+
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t2"/>
468468
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
469469
</TimingLink>
470470
<TimingLink version="any" id="mybus:SSP_002+SSP_002_t3">
471471
<Name>Bravo to After Bravo t1</Name>
472472
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
473-
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
473+
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
474474
</TimingLink>
475475
<TimingLink version="any" id="mybus:SSP_002_t3+SSP_077">
476476
<Name>After Bravo t1 to Charley</Name>
477-
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
477+
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
478478
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_077"/>
479479
</TimingLink>
480480
</timingLinks>

‎examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3809,7 +3809,7 @@ Q.4. Public holiday - Services do not run on a christams day -
38093809
</TransferDuration>
38103810
<BothWays>true</BothWays>
38113811
<From>
3812-
<PointRef nameOfRefClass="StopPlace" ref="frnapt:STP_08_fr_MarneLV"/>
3812+
<PlaceRef nameOfRefClass="StopPlace" ref="frnapt:STP_08_fr_MarneLV"/>
38133813
</From>
38143814
<To>
38153815
<PlaceRef nameOfRefClass="PointOfInterest" ref="eos:POI_fr_01_Disneyland"/>

‎examples/functions/validityCondition/NeTEx_trigger-01.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Description>Use when Icy</Description>
3232
<ConditionedObjectRef nameOfRefClass="TimetableFrame" ref="abc:Tf01"/>
3333
<WithConditionRef version="any" ref="hde:VC_ntwkf003_002_winter"/>
34-
<RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
34+
<RuleObjectRef ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
3535
<AttributeName>roadCondition</AttributeName>
3636
<ComparisonOperator>EQ</ComparisonOperator>
3737
<AttributeValue>icy</AttributeValue>

‎examples/functions/variant/Netex_VariantExample_Step_05.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ This is variant on the multistep SImple Network Version example on versioning.
116116
<validityConditions>
117117
<ValidityRuleParameter version="any" created="2010-05-18T10:30:47.0Z" modification="new" responsibilitySetRef="mybus:ResponsibilitySet:RS_10" id="mybus:ValidityRuleParameter:VC_ntwkf003_002_icy">
118118
<Description>Use when Icy</Description>
119-
<RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
119+
<RuleObjectRef ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
120120
<AttributeName>roadCondition</AttributeName>
121121
<ComparisonOperator>EQ</ComparisonOperator>
122122
<AttributeValue>icy</AttributeValue>

0 commit comments

Comments
 (0)