Skip to content

Retype all order elements to xsd:positiveInteger and fix the associated examples #477

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

Closed
skinkie wants to merge 25 commits into from
Closed

Retype all order elements to xsd:positiveInteger and fix the associated examples #477

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 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
b3b647c
Fix TopographicProjection required id and version
skinkie Jul 28, 2023
efd996b
Add required order attribute to FareTableRow
skinkie Jul 28, 2023
32f6518
Make sure FareTableColumn has a required order element
skinkie Jul 28, 2023
20c04a6
Introduce version and id attributes for AlternativeNameMake sure Fare…
skinkie Jul 28, 2023
8211ea2
Retype all order elements to xsd:positiveInteger and fix the associat…
skinkie Jul 28, 2023
23fee0c
Lint and update documentation tables
github-actions[bot] Jul 28, 2023
b1d265e
two more nonNegative orders replaced
ue71603 Aug 8, 2023
4af0bdb
Merge branch 'master' into fix_order_positive_integer
skinkie Sep 27, 2023
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
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
70 changes: 35 additions & 35 deletions examples/standards/era_uic/Netex_Eurostar_stations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,7 +2421,7 @@
<StopPlace created="2011-06-01T18:14:19.653+02:00" version="1" status="active" id="008721390">
<Name>WISSEMBOURG FRONTIERE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008721390">
<NameType>alias</NameType>
<Name>WISSEMBOURG FRONT</Name>
</AlternativeName>
Expand All @@ -2443,7 +2443,7 @@
</validityConditions>
<Name>LILLE CHR</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008710930">
<NameType>alias</NameType>
<Name>LILLE CHR</Name>
</AlternativeName>
Expand All @@ -2464,7 +2464,7 @@
</validityConditions>
<Name>LILLE-FLANDRES (B)</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008885720">
<NameType>alias</NameType>
<Name>LILLE-FLANDRES</Name>
</AlternativeName>
Expand All @@ -2485,7 +2485,7 @@
</validityConditions>
<Name>LILLE FLANDRES</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008728600">
<NameType>alias</NameType>
<Name>LILLE FLANDRES</Name>
</AlternativeName>
Expand All @@ -2506,7 +2506,7 @@
</validityConditions>
<Name>LILLE EUROPE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008722326">
<NameType>alias</NameType>
<Name>LILLE EUROPE</Name>
</AlternativeName>
Expand All @@ -2528,7 +2528,7 @@
</validityConditions>
<Name>CALAIS VILLE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008731726">
<NameType>alias</NameType>
<Name>CALAIS VILLE</Name>
</AlternativeName>
Expand All @@ -2549,7 +2549,7 @@
</validityConditions>
<Name>CALAIS FRETHUN</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008728107">
<NameType>alias</NameType>
<Name>CALAIS FRETHUN</Name>
</AlternativeName>
Expand All @@ -2570,7 +2570,7 @@
</validityConditions>
<Name>MARNE LA VALLEE CHESSY</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008711184">
<NameType>alias</NameType>
<Name>MARNE LA VAL CHES</Name>
</AlternativeName>
Expand All @@ -2591,7 +2591,7 @@
</validityConditions>
<Name>MARNE LA VALLEE CHESSY SNCF</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008738264">
<NameType>alias</NameType>
<Name>MARNE</Name>
</AlternativeName>
Expand All @@ -2612,7 +2612,7 @@
</validityConditions>
<Name>BRUXELLES AGGLO/BRUSSEL AGGLO</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008813086">
<NameType>alias</NameType>
<Name>BRUXELLES</Name>
</AlternativeName>
Expand All @@ -2627,12 +2627,12 @@
<StopPlace created="2011-06-01T18:14:19.653+02:00" version="1" status="active" id="008814002">
<Name>BRUXELLES MIDI EUROSTAR</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008814002-NL">
<Lang>NL</Lang>
<NameType>translation</NameType>
<Name lang="NL">BRUSSEL ZUID EUROSTAR </Name>
</AlternativeName>
<AlternativeName>
<AlternativeName version="1" id="008814002-FR">
<Lang>FR</Lang>
<NameType>translation</NameType>
<Name lang="FR">BRUXELLES MIDI EUROSTAR </Name>
Expand All @@ -2648,12 +2648,12 @@
<StopPlace created="2011-06-01T18:14:19.653+02:00" version="1" status="active" id="008814001">
<Name>BRUXELLES-MIDI</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008814001-NL">
<Lang>NL</Lang>
<NameType>translation</NameType>
<Name lang="NL">BRUSSEL-ZUID </Name>
</AlternativeName>
<AlternativeName>
<AlternativeName version="1" id="008814001-FR">
<Lang>FR</Lang>
<NameType>translation</NameType>
<Name lang="FR">BRUXELLES-MIDI </Name>
Expand All @@ -2675,7 +2675,7 @@
</validityConditions>
<Name>PARIS NORD</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008727100">
<NameType>alias</NameType>
<Name>PARIS NORD</Name>
</AlternativeName>
Expand All @@ -2696,7 +2696,7 @@
</validityConditions>
<Name>GARE DU NORD</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008727102">
<NameType>alias</NameType>
<Name>GARE DU NORD</Name>
</AlternativeName>
Expand All @@ -2717,7 +2717,7 @@
</validityConditions>
<Name>GARE DU NORD SURFACE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008727103">
<NameType>alias</NameType>
<Name>GARE DU NORD SURF</Name>
</AlternativeName>
Expand All @@ -2738,7 +2738,7 @@
</validityConditions>
<Name>PARIS GARE DE LYON</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008768600">
<NameType>alias</NameType>
<Name>PARIS GARE LYON</Name>
</AlternativeName>
Expand All @@ -2759,7 +2759,7 @@
</validityConditions>
<Name>PARIS BERCY</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008768666">
<NameType>alias</NameType>
<Name>PARIS BERCY</Name>
</AlternativeName>
Expand All @@ -2780,7 +2780,7 @@
</validityConditions>
<Name>PARIS AUSTERLITZ</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008754700">
<NameType>alias</NameType>
<Name>PARIS AUSTERLITZ</Name>
</AlternativeName>
Expand All @@ -2801,7 +2801,7 @@
</validityConditions>
<Name>PARIS AUSTERLITZ RER C</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008754702">
<NameType>alias</NameType>
<Name>PARIS-AUST RERC</Name>
</AlternativeName>
Expand All @@ -2822,7 +2822,7 @@
</validityConditions>
<Name>PARIS GARE DE LYON RER</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008775858">
<NameType>alias</NameType>
<Name>PARIS LYON RER</Name>
</AlternativeName>
Expand All @@ -2843,7 +2843,7 @@
</validityConditions>
<Name>PARIS ST LAZARE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008738400">
<NameType>alias</NameType>
<Name>PARIS ST LAZARE</Name>
</AlternativeName>
Expand All @@ -2864,7 +2864,7 @@
</validityConditions>
<Name>PARIS MONTPARNASSE 1 ET 2</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008739100">
<NameType>alias</NameType>
<Name>PARIS MONT 1 ET 2</Name>
</AlternativeName>
Expand All @@ -2885,7 +2885,7 @@
</validityConditions>
<Name>GARE DE LYON BANLIEUE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008768603">
<NameType>alias</NameType>
<Name>GARE DE LYON BANL</Name>
</AlternativeName>
Expand All @@ -2906,7 +2906,7 @@
</validityConditions>
<Name>PARIS MONTPARNASSE 3 VAUGIRARD</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008739110">
<NameType>alias</NameType>
<Name>PARIS MONT 3 VAUG</Name>
</AlternativeName>
Expand All @@ -2927,7 +2927,7 @@
</validityConditions>
<Name>PARIS EST</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008711300">
<NameType>alias</NameType>
<Name>PARIS EST</Name>
</AlternativeName>
Expand All @@ -2948,7 +2948,7 @@
</validityConditions>
<Name>ST PANCRAS</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="007015400">
<NameType>alias</NameType>
<Name>ST</Name>
</AlternativeName>
Expand All @@ -2969,7 +2969,7 @@
</validityConditions>
<Name>EBBSFLEET</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="007015440">
<NameType>alias</NameType>
<Name>EBBSFLEET</Name>
</AlternativeName>
Expand All @@ -2990,7 +2990,7 @@
</validityConditions>
<Name>ASHFORD INTERNATIONAL</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="007054660">
<NameType>alias</NameType>
<Name>ASHFORD</Name>
</AlternativeName>
Expand All @@ -3011,7 +3011,7 @@
</validityConditions>
<Name>AVIGNON CENTRE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008776500">
<NameType>alias</NameType>
<Name>AVIGNON CENTRE</Name>
</AlternativeName>
Expand All @@ -3032,7 +3032,7 @@
</validityConditions>
<Name>AVIGNON TGV</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008731896">
<NameType>alias</NameType>
<Name>AVIGNON TGV</Name>
</AlternativeName>
Expand All @@ -3053,7 +3053,7 @@
</validityConditions>
<Name>BOURG ST MAURICE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008774179">
<NameType>alias</NameType>
<Name>BOURG ST MAURICE</Name>
</AlternativeName>
Expand All @@ -3074,7 +3074,7 @@
</validityConditions>
<Name>AIME LA PLAGNE</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008774176">
<NameType>alias</NameType>
<Name>AIME LA PLAGNE</Name>
</AlternativeName>
Expand All @@ -3095,7 +3095,7 @@
</validityConditions>
<Name>MOUTIERS SALINS BRIDES L BAINS</Name>
<alternativeNames>
<AlternativeName>
<AlternativeName version="1" id="008774172">
<NameType>alias</NameType>
<Name>MOUTIERS SALINS B</Name>
</AlternativeName>
Expand Down
Loading