Skip to content

Adding unique constraints for the elements that actually exists in our examples #464

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

Merged
skinkie merged 19 commits into from
Apr 17, 2024
Merged

Adding unique constraints for the elements that actually exists in our examples #464

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6331085
Add DatedServiceJourney_UniqueBy_Id_Version
skinkie Jul 11, 2023
69a0247
Lint and update documentation tables
github-actions[bot] Jul 11, 2023
e0394e8
Add AccessibilityAssessment and AccessibilityLimitation unique constr…
skinkie Jul 11, 2023
34957c0
Lint and update documentation tables
github-actions[bot] Jul 11, 2023
7f33df4
Add AvailabilityCondition Unique constraint as part of the ValidityCo…
skinkie Jul 11, 2023
37eeab8
Put AvailabilityCondition in a new unique constraint because of Avail…
skinkie Jul 11, 2023
052e8d8
Lint and update documentation tables
github-actions[bot] Jul 11, 2023
0472ac7
Add DatedVehicleJourney and NormalDatedVehicleJourney constraints
skinkie Jul 11, 2023
5307ff0
Add FlexibleRoute, FlexibleQuay, FlexibleLine, FlexibleStopAssignment
skinkie Jul 11, 2023
78bd1be
Fix typo
skinkie Jul 11, 2023
4ddc79e
Fix FlexibleStopAssignment in examples for missing order attribute
skinkie Jul 11, 2023
490a395
Lint and update documentation tables
github-actions[bot] Jul 11, 2023
dfffa31
Introduce SitePathLink unique as path of PathLinkIdType
skinkie Jul 11, 2023
60a5d0c
Introduce unique constraint for ValidityPeriod which uses ValidityCon…
skinkie Jul 11, 2023
7a67523
Introduce unique constraint for ValidDuring which uses AvailabilityCo…
skinkie Jul 11, 2023
b83e5aa
Introduce unique constraint for ValidyPeriod which uses UsageValidity…
skinkie Jul 11, 2023
fd30d52
Fix broken example, due to the assignment within a single unique cons…
skinkie Jul 11, 2023
c69c90b
Reintroduce OperatingDay unique constraints
skinkie Jul 11, 2023
d86de7f
Merge branch 'master' into fix_unique_constraints
ue71603 Apr 17, 2024
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
27 changes: 26 additions & 1 deletion xsd/NeTEx_publication.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3157,6 +3157,14 @@ Correct COnstraints for PointOnRoute
</xsd:key>
<!-- =====ACCESSIBILITY Constraints========================= -->
<!-- =====AccessibilityAssessment============================ -->
<xsd:unique name="AccessibilityAssessment_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccessibilityAssessment Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccessibilityAssessment"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:keyref name="AccessibilityAssessment_AnyKeyRef" refer="netex:AccessibilityAssessment_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccessibilityAssessmentRef"/>
<xsd:field xpath="@ref"/>
Expand All @@ -3167,6 +3175,15 @@ Correct COnstraints for PointOnRoute
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====AccessibilityLimitation============================ -->
<xsd:unique name="AccessibilityLimitation_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccessibilityLimitation Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccessibilityLimitation"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<!-- =====SERVICE CALENDAR Constraints========================= -->
<!-- =====DayType============================== -->
<!-- =====DayType unique========================== -->
Expand Down Expand Up @@ -6912,7 +6929,15 @@ Correct COnstraints for PointOnRoute
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:unique name="TemplateVehicleourney_UniqueBy_Id_Version">
<xsd:unique name="DatedServiceJourney_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [DatedServiceJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:DatedServiceJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:unique name="TemplateVehicleJourney_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [TemplateVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
Expand Down
29 changes: 27 additions & 2 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2593,6 +2593,14 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
</xsd:key>
<!-- =====ACCESSIBILITY Constraints========================= -->
<!-- =====AccessibilityAssessment============================ -->
<xsd:unique name="AccessibilityAssessment_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccessibilityAssessment Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccessibilityAssessment"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:keyref name="AccessibilityAssessment_AnyKeyRef" refer="netex:AccessibilityAssessment_AnyVersionedKey">
<xsd:selector xpath=".//netex:AccessibilityAssessmentRef"/>
<xsd:field xpath="@ref"/>
Expand All @@ -2603,6 +2611,15 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====AccessibilityLimitation============================ -->
<xsd:unique name="AccessibilityLimitation_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [AccessibilityLimitation Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:AccessibilityLimitation"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<!-- =====SERVICE CALENDAR Constraints========================= -->
<!-- =====DayType============================== -->
<!-- =====DayType unique========================== -->
Expand Down Expand Up @@ -5585,7 +5602,15 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:unique name="TemplateVehicleourney_UniqueBy_Id_Version">
<xsd:unique name="DatedServiceJourney_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [DatedServiceJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:DatedServiceJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<xsd:unique name="TemplateVehicleJourney_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [TemplateVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
Expand All @@ -5608,7 +5633,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="Journey_AnyVersionedKey">
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney| .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
Expand Down