Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Required IdType fixes #471

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Required IdType fixes #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4ec8571
More required IdType fixes
skinkie Jul 26, 2023
cd4a6f3
Typo
skinkie Jul 26, 2023
b034777
Remove required ids from DerivedViews
skinkie Jul 26, 2023
6a8e19b
VehicleJourneyRunTime has a cardinality of 0:1
skinkie Jul 26, 2023
4cf88c0
Introducing new restrictions, and TODO's
skinkie Jul 27, 2023
8066af4
Better, but still failing
skinkie Jul 27, 2023
d6e3660
More improvements, including required order properties
skinkie Jul 27, 2023
20e6fd6
test for change of one of the TODO
ue71603 Jul 27, 2023
2b466ef
Update netex_ifopt_site_version.xsd
ue71603 Jul 27, 2023
f7997ad
Update netex_ifopt_site_version.xsd
ue71603 Jul 28, 2023
2301590
Revert "Update netex_ifopt_site_version.xsd"
ue71603 Jul 28, 2023
68338ca
Revert "Update netex_ifopt_site_version.xsd"
ue71603 Jul 28, 2023
a72adc6
Revert "test for change of one of the TODO"
ue71603 Jul 28, 2023
4fe6625
Fix id on InterchangeRuleTiming on VDV452 example.
skinkie Jul 28, 2023
8abed5f
Update FlexibleServiceProperties in NOPTIS example.
skinkie Jul 28, 2023
7db58d3
Fix DestinationDisplayVariant example
skinkie Jul 28, 2023
9b167f1
Introduce VehicleTypeZoneRestriction id and version attributes
skinkie Jul 28, 2023
bb90df4
Entrance, VehicleEntrance change
ue71603 Jul 28, 2023
b0cfdbd
Merge branch 'fix_attribute_id_use_required' of https://github.com/Ne…
ue71603 Jul 28, 2023
198c470
adding Entrance_
ue71603 Jul 28, 2023
0097ce5
Fix TopographicProjection required id and version
skinkie Jul 28, 2023
2fd8ceb
Add required order attribute to FareTableRow
skinkie Jul 28, 2023
7a99a15
Make sure FareTableColumn has a required order element
skinkie Jul 28, 2023
6789446
Introduce version and id attributes for AlternativeNameMake sure Fare…
skinkie Jul 28, 2023
02e93ca
SubstitionGroup Entrance_ fixed substitutionGroup TyoeOfEntity_ fixed
ue71603 Jul 29, 2023
30dd071
Fixing Point_
ue71603 Jul 29, 2023
bcfe427
Fixing Zone_ substitutionGroup
ue71603 Jul 29, 2023
2716f67
removed ambiguity from GeneralFrameMember
ue71603 Jul 29, 2023
86c7891
corrected SignEquipment substitutionGroup
ue71603 Jul 29, 2023
c3ec847
fixed substitutionGroup CustomerService for better id
ue71603 Jul 29, 2023
d624884
fixing AccessRightInProduct substitutionGroup
ue71603 Jul 29, 2023
9c6737e
Fixing Entrance problem. Typo changed
ue71603 Aug 3, 2023
0886b7a
changing refs to xxx_ elements
ue71603 Aug 3, 2023
a84cde5
Lint and update documentation tables
github-actions[bot] Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions examples/functions/fares/rail/Netex_era_toc_uk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5198,7 +5198,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@first@adult@Q1" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="1">
<MinimumPrice>03.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand All @@ -5208,7 +5208,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@first@adult@Q2" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="2">
<MinimumPrice>04.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand All @@ -5218,7 +5218,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@first@adult@Q3" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="6">
<MinimumPrice>05.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand Down Expand Up @@ -5258,7 +5258,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@second@adult@Q1" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="3">
<MinimumPrice>02.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand All @@ -5268,7 +5268,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@second@adult@Q2" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="4">
<MinimumPrice>03.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand All @@ -5278,7 +5278,7 @@ Customers should check with Customer Services of individual Train Companies for
<SalesOfferPackagePrice id="atc:ATOC@Products@Trip@Prices@advance@single@second@adult@Q3" version="01">
<Name>Prices will be fetched dynamically</Name>
<PricingServiceRef ref="atc:dynamic_pricing_service" version="01"/>
<LimitingRuleInContext>
<LimitingRuleInContext id="5">
<MinimumPrice>04.00</MinimumPrice>
</LimitingRuleInContext>
</SalesOfferPackagePrice>
Expand Down Expand Up @@ -8974,7 +8974,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
<TypeOfZoneRef ref="nptg:PlusBus_region" version="any"/>
</types>
<projections>
<TopographicProjection>
<TopographicProjection id="1">
<CountryRef ref="uk" refPrincipality="GB-UKM"/>
</TopographicProjection>
</projections>
Expand All @@ -8986,7 +8986,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
<TypeOfZoneRef ref="nptg:PlusBus_region" version="any"/>
</types>
<projections>
<TopographicProjection>
<TopographicProjection id="2">
<CountryRef ref="uk" refPrincipality="GB-ENG"/>
</TopographicProjection>
</projections>
Expand All @@ -8999,7 +8999,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
<TypeOfZoneRef ref="nptg:PlusBus_region" version="any"/>
</types>
<projections>
<TopographicProjection>
<TopographicProjection id="3">
<CountryRef ref="uk" refPrincipality="GB-ENG"/>
</TopographicProjection>
</projections>
Expand All @@ -9025,7 +9025,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
</gml:exterior>
</gml:Polygon>
<projections>
<TopographicProjection>
<TopographicProjection id="6">
<CountryRef ref="uk" refPrincipality="GB-SFK">Suffolk</CountryRef>
</TopographicProjection>
</projections>
Expand All @@ -9050,7 +9050,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
</gml:exterior>
</gml:Polygon>
<projections>
<TopographicProjection>
<TopographicProjection id="5">
<CountryRef ref="uk" refPrincipality="GB-NFK">Norfolk</CountryRef>
</TopographicProjection>
</projections>
Expand All @@ -9075,7 +9075,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
</gml:exterior>
</gml:Polygon>
<projections>
<TopographicProjection>
<TopographicProjection id="7">
<CountryRef ref="uk" refPrincipality="GB-NFK">Norfolk</CountryRef>
</TopographicProjection>
</projections>
Expand Down Expand Up @@ -10441,7 +10441,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla
<FareZone version="01" id="atc:FareZone:ATOC@Network_railcard_area">
<Name lang="en">Area in which Network Railcards are valid</Name>
<projections>
<TopographicProjection>
<TopographicProjection id="8">
<CountryRef ref="uk" refPrincipality="GB-UKM"/>
</TopographicProjection>
</projections>
Expand Down
18 changes: 9 additions & 9 deletions examples/functions/site/Netex_14_Olympic Venues 1.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Park"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100OPK">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name lang="fr">Parc Olympique</Name>
Expand Down Expand Up @@ -323,7 +323,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100AQC">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Centre aquatique</Name>
Expand All @@ -348,7 +348,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100STA">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Stade olympique</Name>
Expand All @@ -373,7 +373,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100VEL">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Vélodrome</Name>
Expand All @@ -398,7 +398,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100BBA">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Pavillon de basketball</Name>
Expand All @@ -423,7 +423,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100HOC">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Centre de Hockey</Name>
Expand All @@ -448,7 +448,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100AWP">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Pavillon de water-polo</Name>
Expand All @@ -473,7 +473,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100HBA">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Pavillon de handball</Name>
Expand All @@ -498,7 +498,7 @@
<TypeOfPlaceRef versionRef="EXTERNAL" ref="napt:type_of_place@Venue"/>
</placeTypes>
<alternativeNames>
<AlternativeName>
<AlternativeName version="any" id="8100BMX">
<Lang>fr</Lang>
<NameType>translation</NameType>
<Name>Piste de BMX</Name>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The Calendar is shown coded as
<ShortName>Bravo Rd</ShortName>
<PublicCode>BRAV</PublicCode>
<variants>
<DestinationDisplayVariant>
<DestinationDisplayVariant version="any" id="mybus:Bravo:tts">
<DestinationDisplayVariantMediaType>textToSpeech</DestinationDisplayVariantMediaType>
<Name>Bravo</Name>
<vias>
Expand Down