Skip to content

Commit 7e95104

Browse files
skinkieue71603
andcommitted
Remove all abstract elements from constraint validation (#462)
* Remove all abstract elements from constraint validation * Make ResposibilityRole not abstract, and revert constraint check removal * Update NeTEx_publication.xsd * Update NeTEx_publication_timetable.xsd --------- Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
1 parent f32acae commit 7e95104

File tree

2 files changed

+1
-41
lines changed

2 files changed

+1
-41
lines changed

xsd/NeTEx_publication.xsd

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8217,7 +8217,7 @@
82178217
</xsd:unique>
82188218
<!-- =====Journey Key ========================== -->
82198219
<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
8220-
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:DatedVehicleJourneyRef | .//netex:NormalDatedVehicleJourneyRef |.//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
8220+
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:DatedVehicleJourneyRef | .//netex:NormalDatedVehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
82218221
<xsd:field xpath="@ref"/>
82228222
<xsd:field xpath="@version"/>
82238223
</xsd:keyref>
@@ -8458,15 +8458,6 @@
84588458
<xsd:field xpath="@version"/>
84598459
</xsd:key>
84608460
<!-- =====JourneyFrequencyGroup============================== -->
8461-
<!-- =====JourneyFrequencyGroup unique========================== -->
8462-
<xsd:unique name="JourneyFrequencyGroup_UniqueBy_Id_Version">
8463-
<xsd:annotation>
8464-
<xsd:documentation>Every [JourneyFrequencyGroup Id + Version] must be unique within document.</xsd:documentation>
8465-
</xsd:annotation>
8466-
<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
8467-
<xsd:field xpath="@id"/>
8468-
<xsd:field xpath="@version"/>
8469-
</xsd:unique>
84708461
<!-- =====JourneyFrequencyGroup Key ========================== -->
84718462
<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
84728463
<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>
@@ -9591,17 +9582,6 @@
95919582
<xsd:field xpath="@id"/>
95929583
<xsd:field xpath="@version"/>
95939584
</xsd:unique>
9594-
<!-- =====FareElementInSequence Key ========================== -->
9595-
<xsd:keyref name="FareElementInSequence_KeyRef" refer="netex:FareElementInSequence_AnyVersionedKey_ordered">
9596-
<xsd:selector xpath=".//netex:FareElementInSequenceRef"/>
9597-
<xsd:field xpath="@ref"/>
9598-
<xsd:field xpath="@version"/>
9599-
</xsd:keyref>
9600-
<xsd:key name="FareElementInSequence_AnyVersionedKey_ordered">
9601-
<xsd:selector xpath=".//netex:FareElementInSequence"/>
9602-
<xsd:field xpath="@id"/>
9603-
<xsd:field xpath="@version"/>
9604-
</xsd:key>
96059585
<!-- =====TypeOfFareStructureElement============================== -->
96069586
<!-- =====TypeOfFareStructureElement unique========================== -->
96079587
<xsd:unique name="TypeOfFareStructureElement_UniqueBy_Id_Version">

xsd/NeTEx_publication_timetable.xsd

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,17 +1710,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
17101710
<xsd:field xpath="@id"/>
17111711
<xsd:field xpath="@version"/>
17121712
</xsd:key>
1713-
<!-- =====AccessEquipment============================ -->
1714-
<xsd:keyref name="AccessEquipment_AnyKeyRef" refer="netex:AccessEquipment_AnyVersionedKey">
1715-
<xsd:selector xpath=".//netex:AccessEquipmentRef"/>
1716-
<xsd:field xpath="@ref"/>
1717-
<xsd:field xpath="@version"/>
1718-
</xsd:keyref>
1719-
<xsd:key name="AccessEquipment_AnyVersionedKey">
1720-
<xsd:selector xpath=".//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:LiftCallEquipment | .//netex:RampEquipment | .//netex:StaircaseEquipment | .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:RoughSurface | .//netex:PlaceLighting"/>
1721-
<xsd:field xpath="@id"/>
1722-
<xsd:field xpath="@version"/>
1723-
</xsd:key>
17241713
<!-- =====EntranceEquipment============================== -->
17251714
<!-- =====EntranceEquipment unique========================== -->
17261715
<xsd:unique name="EntranceEquipment_UniqueBy_Id_Version">
@@ -5781,15 +5770,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
57815770
<xsd:field xpath="@version"/>
57825771
</xsd:key>
57835772
<!-- =====JourneyFrequencyGroup============================== -->
5784-
<!-- =====JourneyFrequencyGroup unique========================== -->
5785-
<xsd:unique name="JourneyFrequencyGroup_UniqueBy_Id_Version">
5786-
<xsd:annotation>
5787-
<xsd:documentation>Every [JourneyFrequencyGroup Id + Version] must be unique within document.</xsd:documentation>
5788-
</xsd:annotation>
5789-
<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
5790-
<xsd:field xpath="@id"/>
5791-
<xsd:field xpath="@version"/>
5792-
</xsd:unique>
57935773
<!-- =====JourneyFrequencyGroup Key ========================== -->
57945774
<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
57955775
<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>

0 commit comments

Comments
 (0)