Make ResposibilityRole not abstract, and revert constraint check removal

NeTEx-CEN · May 1, 2024 · 4393cb2 · 4393cb2
1 parent a33818e
commit 4393cb2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -317,6 +317,27 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====ResponsibilityRole============================== -->
+		<!-- =====ResponsibilityRole unique========================== -->
+		<xsd:unique name="ResponsibilityRole_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [ResponsibilityRole Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:ResponsibilityRole"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====ResponsibilityRole Key ========================== -->
+		<xsd:keyref name="ResponsibilityRole_AnyKeyRef" refer="netex:ResponsibilityRole_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:ResponsibilityRoleRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="ResponsibilityRole_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:ResponsibilityRole"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====ResponsibilitySet============================== -->
 		<!-- =====ResponsibilitySet unique========================== -->
 		<xsd:unique name="ResponsibilitySet_UniqueBy_Id_Version">

diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
@@ -230,6 +230,27 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====ResponsibilityRole============================== -->
+		<!-- =====ResponsibilityRole unique========================== -->
+		<xsd:unique name="ResponsibilityRole_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [ResponsibilityRole Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:ResponsibilityRole"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====ResponsibilityRole Key ========================== -->
+		<xsd:keyref name="ResponsibilityRole_AnyKeyRef" refer="netex:ResponsibilityRole_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:ResponsibilityRoleRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="ResponsibilityRole_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:ResponsibilityRole"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====ResponsibilitySet============================== -->
 		<!-- =====ResponsibilitySet unique========================== -->
 		<xsd:unique name="ResponsibilitySet_UniqueBy_Id_Version">

diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
@@ -177,7 +177,7 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="ResponsibilityRole" abstract="true" substitutionGroup="DataManagedObject">
+	<xsd:element name="ResponsibilityRole" substitutionGroup="DataManagedObject">
 		<xsd:annotation>
 			<xsd:documentation>A particular role an ORGANISATION or an ORGANISATION PART is playing.  +v1.1</xsd:documentation>
 		</xsd:annotation>