Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -455,26 +455,26 @@ The Calendar is shown coded as
<TimingLink version="any" id="mybus:SSP_001+SSP_001_t1">
<Name>After Alpha t1</Name>
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_001"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_001_t1+SSP_001_t2">
<Name>After Alpha t1 to After Alpha t2</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_001_t2+SSP_002">
<Name>After Alpha t2 to Bravo</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t2"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t2"/>
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_002+SSP_002_t3">
<Name>Bravo to After Bravo t1</Name>
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_002_t3+SSP_077">
<Name>After Bravo t1 to Charley</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_077"/>
</TimingLink>
</timingLinks>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3802,6 +3802,7 @@ Q.4. Public holiday - Services do not run on a christams day -
</To>
</Connection>
<!-- ==== ACCESS LINKs === -->
<!-- INVALID!
<Access version="any" id="frnapt:Access:STP_08_fr_MarneLV">
<Description>Marne to Disneyland</Description>
<TransferDuration>
Expand All @@ -3815,6 +3816,7 @@ Q.4. Public holiday - Services do not run on a christams day -
<PlaceRef nameOfRefClass="PointOfInterest" ref="eos:POI_fr_01_Disneyland"/>
</To>
</Access>
-->
<!-- ==== DEFAULT TRANSFER TIMES=== -->
<DefaultConnection version="any" id="eos:DT_SC01_001">
<Description>Allow 30 Minutes to catch Eurostar</Description>
Expand Down
3 changes: 2 additions & 1 deletion examples/functions/validityCondition/NeTEx_trigger-01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<Description>Use when Icy</Description>
<ConditionedObjectRef nameOfRefClass="TimetableFrame" ref="abc:Tf01"/>
<WithConditionRef version="any" ref="hde:VC_ntwkf003_002_winter"/>
<RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
<!-- There is no Weather class -->
<!-- <RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef> -->
<AttributeName>roadCondition</AttributeName>
<ComparisonOperator>EQ</ComparisonOperator>
<AttributeValue>icy</AttributeValue>
Expand Down
3 changes: 2 additions & 1 deletion examples/functions/variant/Netex_VariantExample_Step_05.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ This is variant on the multistep SImple Network Version example on versioning.
<validityConditions>
<ValidityRuleParameter version="any" created="2010-05-18T10:30:47.0Z" modification="new" responsibilitySetRef="mybus:ResponsibilitySet:RS_10" id="mybus:ValidityRuleParameter:VC_ntwkf003_002_icy">
<Description>Use when Icy</Description>
<RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef>
<!-- There is no Weather class -->
<!-- <RuleObjectRef nameOfRefClass="Weather" ref="Myobj:Cur001">EXTERNAL</RuleObjectRef> -->
<AttributeName>roadCondition</AttributeName>
<ComparisonOperator>EQ</ComparisonOperator>
<AttributeValue>icy</AttributeValue>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3307,7 +3307,7 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -3446,7 +3446,7 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2111,7 +2111,7 @@ We group the elements in separate frames
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -2250,7 +2250,7 @@ We group the elements in separate frames
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7942,7 +7942,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -8081,7 +8081,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8031,7 +8031,7 @@ FirstUnlimited: 28 day | £74.00
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -8170,7 +8170,7 @@ FirstUnlimited: 28 day | £74.00
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8707,7 +8707,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -8846,7 +8846,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7643,7 +7643,7 @@ This Shows sample Purchases
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -7782,7 +7782,7 @@ This Shows sample Purchases
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4911,7 +4911,7 @@ This Shows sample Purchases
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -5050,7 +5050,7 @@ This Shows sample Purchases
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -2546,7 +2546,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12513,7 +12513,7 @@ AllZone: SyConnect
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -12652,7 +12652,7 @@ AllZone: SyConnect
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
4 changes: 2 additions & 2 deletions examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5392,7 +5392,7 @@ West Midlands Railway
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -5531,7 +5531,7 @@ West Midlands Railway
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
4 changes: 2 additions & 2 deletions examples/standards/fxc/uk_fxc_common_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -1982,7 +1982,7 @@
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ v1.1 Revised to use Tarifff
<DefaultCodespaceRef ref="gtfs"/>
</FrameDefaults>
<typesOfValue>
<ValueSet version="gtfs:1.5" id="gtfs:Charging_Moments" classOfValues="ChargingMomenr">
<ValueSet version="gtfs:1.5" id="gtfs:Charging_Moments" classOfValues="ChargingMoment">
<Name>GTFS Built in Charging Methods: FareAttribute@payment_method</Name>
<values>
<!--- ====Charging method========= -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ So the NeTEx File will probably be something like 50% bigger with the same level
<includes>
<TypeOfFrame version="01" id="Neptune:TypeOfFrame:TimeTableFrame">
<Name>Neptune Profile:ServiceCalendar Frame </Name>
<FrameClassRef nameOfClass="TimeTableFrame"/>
<FrameClassRef nameOfClass="TimetableFrame"/>
<classes>
<ClassInFrameRef classRefType="members" nameOfClass="TimeTableFrame"/>
<ClassInFrameRef classRefType="members" nameOfClass="TimetableFrame"/>
<ClassInFrameRef classRefType="members" nameOfClass="ServiceJourney"/>
<ClassInFrameRef classRefType="members" nameOfClass="JourneyPart"/>
</classes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9658,7 +9658,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -9797,7 +9797,7 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -1064,7 +1064,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8687,7 +8687,7 @@ TXC NETEX
<values>
<TypeOfFrame version="nptg:v2.1" id="nptg:UK_NPTG_profile_payload">
<Name>NPTG Locations and Tariff Zones Frame</Name>
<FrameClassRef nameOfClass="SiteeFrame"/>
<FrameClassRef nameOfClass="SiteFrame"/>
<classes>
<ClassInFrame nameOfClass="TopographicPlace">
<!-- TopographicPlace maps to a NPTG Locality
Expand Down Expand Up @@ -8826,7 +8826,7 @@ TXC NETEX
</ClassRelationshipInFrame>
<ClassRelationshipInFrame name="alternativeDescriptors">
<!-- NB Only coccasionally actually populated in current data set -->
<RelationshipRef nameOfClass="TopographicPlaceDescriptior"/>
<RelationshipRef nameOfClass="TopographicPlaceDescriptor"/>
<!-- NptgLocality.alternativeDeiscriptors.Descriptor -->
<Mandatory>optional</Mandatory>
<Containment>byVersionedReference</Containment>
Expand Down
Loading
Loading