From f896b597867d7cfafb3a01e5d05a02a77f3f34c2 Mon Sep 17 00:00:00 2001
From: Stefan de Konink <stefan@konink.de>
Date: Tue, 4 Jun 2024 14:26:27 +0200
Subject: [PATCH 1/2] TypeOfNotice referential constraint fixes

Fixed #739
---
 xsd/NeTEx_publication.xsd                     | 21 +++++++++++++++++++
 xsd/NeTEx_publication_timetable.xsd           | 21 +++++++++++++++++++
 .../netex_notice_support.xsd                  |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 4a747b56b..7bde8775e 100644
--- 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 [Notice 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
index 2fe9cc4a0..d6ffb810d 100644
--- 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 [Notice 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
index 9938d4fdf..63c0948d8 100644
--- 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">

From a33b8d52609d299bb638d0798467be8d0397fcaa Mon Sep 17 00:00:00 2001
From: Stefan de Konink <stefan@konink.de>
Date: Wed, 5 Jun 2024 12:24:03 +0200
Subject: [PATCH 2/2] Apply suggestions from code review

---
 xsd/NeTEx_publication.xsd           | 2 +-
 xsd/NeTEx_publication_timetable.xsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 7bde8775e..0277686c0 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -6003,7 +6003,7 @@
 		<!-- =====TypeOfNotice unique========================== -->
 		<xsd:unique name="TypeOfNotice_UniqueBy_Id_Version">
 			<xsd:annotation>
-				<xsd:documentation>Every [Notice Id + Version] must be unique within document.</xsd:documentation>
+				<xsd:documentation>Every [TypeOfNotice Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
 			<xsd:selector xpath=".//netex:TypeOfNotice"/>
 			<xsd:field xpath="@id"/>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index d6ffb810d..80b6fa107 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -4624,7 +4624,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		<!-- =====TypeOfNotice unique========================== -->
 		<xsd:unique name="TypeOfNotice_UniqueBy_Id_Version">
 			<xsd:annotation>
-				<xsd:documentation>Every [Notice Id + Version] must be unique within document.</xsd:documentation>
+				<xsd:documentation>Every [TypeOfNotice Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
 			<xsd:selector xpath=".//netex:TypeOfNotice"/>
 			<xsd:field xpath="@id"/>