Skip to content

Commit 7320d1e

Browse files
skinkiegithub-actions[bot]ue71603
committed
Adding unique constraints for the elements that actually exists in our examples (#464)
* Add DatedServiceJourney_UniqueBy_Id_Version * Lint and update documentation tables * Add AccessibilityAssessment and AccessibilityLimitation unique constraints * Lint and update documentation tables * Add AvailabilityCondition Unique constraint as part of the ValidityCondition constraint * Put AvailabilityCondition in a new unique constraint because of AvailabilityConditionIdType * Lint and update documentation tables * Add DatedVehicleJourney and NormalDatedVehicleJourney constraints * Add FlexibleRoute, FlexibleQuay, FlexibleLine, FlexibleStopAssignment * Fix typo * Fix FlexibleStopAssignment in examples for missing order attribute * Lint and update documentation tables * Introduce SitePathLink unique as path of PathLinkIdType * Introduce unique constraint for ValidityPeriod which uses ValidityConditionIdType * Introduce unique constraint for ValidDuring which uses AvailabilityConditionIdType * Introduce unique constraint for ValidyPeriod which uses UsageValidityPeriodIdType, fix ValidBetween * Fix broken example, due to the assignment within a single unique constraint * Reintroduce OperatingDay unique constraints --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
1 parent 7e95104 commit 7320d1e

File tree

2 files changed

+45
-3
lines changed

2 files changed

+45
-3
lines changed

‎xsd/NeTEx_publication.xsd‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5372,6 +5372,48 @@
53725372
<xsd:field xpath="@id"/>
53735373
<xsd:field xpath="@version"/>
53745374
</xsd:key>
5375+
<!-- =====FlexibleRoute============================== -->
5376+
<!-- =====FlexibleRoute unique========================== -->
5377+
<xsd:unique name="FlexibleRoute_UniqueBy_Id_Version">
5378+
<xsd:annotation>
5379+
<xsd:documentation>Every [FlexibleRoute Id + Version] must be unique within document.</xsd:documentation>
5380+
</xsd:annotation>
5381+
<xsd:selector xpath=".//netex:FlexibleRoute"/>
5382+
<xsd:field xpath="@id"/>
5383+
<xsd:field xpath="@version"/>
5384+
</xsd:unique>
5385+
<!-- =====FlexibleRoute Key ========================== -->
5386+
<xsd:keyref name="FlexibleRoute_KeyRef" refer="netex:FlexibleRoute_AnyVersionedKey">
5387+
<xsd:selector xpath=".//netex:FlexibleRouteRef"/>
5388+
<xsd:field xpath="@ref"/>
5389+
<xsd:field xpath="@version"/>
5390+
</xsd:keyref>
5391+
<xsd:key name="FlexibleRoute_AnyVersionedKey">
5392+
<xsd:selector xpath=".//netex:FlexibleRoute"/>
5393+
<xsd:field xpath="@id"/>
5394+
<xsd:field xpath="@version"/>
5395+
</xsd:key>
5396+
<!-- =====FlexibleQuay============================== -->
5397+
<!-- =====FlexibleQuay unique========================== -->
5398+
<xsd:unique name="FlexibleQuay_UniqueBy_Id_Version">
5399+
<xsd:annotation>
5400+
<xsd:documentation>Every [FlexibleQuay Id + Version] must be unique within document.</xsd:documentation>
5401+
</xsd:annotation>
5402+
<xsd:selector xpath=".//netex:FlexibleQuay"/>
5403+
<xsd:field xpath="@id"/>
5404+
<xsd:field xpath="@version"/>
5405+
</xsd:unique>
5406+
<!-- =====FlexibleQuay Key ========================== -->
5407+
<xsd:keyref name="FlexibleQuay_KeyRef" refer="netex:FlexibleQuay_AnyVersionedKey">
5408+
<xsd:selector xpath=".//netex:FlexibleQuayRef"/>
5409+
<xsd:field xpath="@ref"/>
5410+
<xsd:field xpath="@version"/>
5411+
</xsd:keyref>
5412+
<xsd:key name="FlexibleQuay_AnyVersionedKey">
5413+
<xsd:selector xpath=".//netex:FlexibleQuay"/>
5414+
<xsd:field xpath="@id"/>
5415+
<xsd:field xpath="@version"/>
5416+
</xsd:key>
53755417
<!-- =====FlexibleStopPlace============================== -->
53765418
<!-- =====FlexibleStopPlace unique========================== -->
53775419
<xsd:unique name="FlexibleStopPlace_UniqueBy_Id_Version">
@@ -8222,7 +8264,7 @@
82228264
<xsd:field xpath="@version"/>
82238265
</xsd:keyref>
82248266
<xsd:key name="Journey_AnyVersionedKey">
8225-
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
8267+
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
82268268
<xsd:field xpath="@id"/>
82278269
<xsd:field xpath="@version"/>
82288270
</xsd:key>
@@ -10870,7 +10912,7 @@
1087010912
<xsd:annotation>
1087110913
<xsd:documentation>Every [UsageValidityPeriod Id + Version] must be unique within document.</xsd:documentation>
1087210914
</xsd:annotation>
10873-
<xsd:selector xpath=".//netex:UsageValidityPeriod"/>
10915+
<xsd:selector xpath=".//netex:UsageValidityPeriod | .//netex:ValidityPeriod"/>
1087410916
<xsd:field xpath="@id"/>
1087510917
<xsd:field xpath="@version"/>
1087610918
</xsd:unique>

‎xsd/NeTEx_publication_timetable.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3726,7 +3726,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
37263726
<xsd:annotation>
37273727
<xsd:documentation>Every [SitePathLink Id + Version] must be unique within document.</xsd:documentation>
37283728
</xsd:annotation>
3729-
<xsd:selector xpath=".//netex:PathLink | .//netex:SitePathLink "/>
3729+
<xsd:selector xpath=".//netex:PathLink | .//netex:SitePathLink"/>
37303730
<xsd:field xpath="@id"/>
37313731
<xsd:field xpath="@version"/>
37323732
</xsd:unique>

0 commit comments

Comments
 (0)