TypeOfNotice referential constraint fixes (#741)

* TypeOfNotice referential constraint fixes Fixed #739 * Apply suggestions from code review
NeTEx-CEN · Jun 10, 2024 · b836e2b · b836e2b
1 parent a241e1b
commit b836e2b
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
@@ -5999,6 +5999,27 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====TypeOfNotice============================== -->
+		<!-- =====TypeOfNotice unique========================== -->
+		<xsd:unique name="TypeOfNotice_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [TypeOfNotice Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:TypeOfNotice"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====TypeOfNotice Key ========================== -->
+		<xsd:keyref name="TypeOfNotice_KeyRef" refer="netex:TypeOfNotice_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfNoticeRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="TypeOfNotice_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfNotice"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====NoticeAssignment============================== -->
 		<!-- =====NoticeAssignment unique========================== -->
 		<xsd:unique name="NoticeAssignment_UniqueBy_Id_Version_Order">

diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
@@ -4620,6 +4620,27 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====TypeOfNotice============================== -->
+		<!-- =====TypeOfNotice unique========================== -->
+		<xsd:unique name="TypeOfNotice_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [TypeOfNotice Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:TypeOfNotice"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====TypeOfNotice Key ========================== -->
+		<xsd:keyref name="TypeOfNotice_KeyRef" refer="netex:TypeOfNotice_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfNoticeRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="TypeOfNotice_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfNotice"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====NoticeAssignment============================== -->
 		<!-- =====NoticeAssignment unique========================== -->
 		<xsd:unique name="NoticeAssignment_UniqueBy_Id_Version_Order">

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
@@ -151,7 +151,7 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:element name="TypeOfNoticeRef" type="TypeOfNoticeRefStructure" substitutionGroup="TypeOfEntityRef">
 		<xsd:annotation>
-			<xsd:documentation>Reference to a TYPE OF NOTICe.</xsd:documentation>
+			<xsd:documentation>Reference to a TYPE OF NOTICE.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:complexType name="TypeOfNoticeRefStructure">