partial rollback

Author: ue71603

xsd/NeTEx_publication.xsd

@@ -389,23 +389,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====KeyValuePair unique============================== -->
-		<xsd:unique name="KeyValuePair">
-			<xsd:annotation>
-				<xsd:documentation>Every Key Value Pair must be unique.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:KeyValue"/>
-			<xsd:field xpath="netex:Key"/>
-			<xsd:field xpath="netex:Value"/>
-		</xsd:unique>
-		<!-- =====PrivateCodeType unique============================== -->
-		<xsd:unique name="PrivateCodeType">
-			<xsd:annotation>
-				<xsd:documentation>Every PrivateCode type must be unique.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PrivateCode"/>
-			<xsd:field xpath="@type"/>
-		</xsd:unique>
 		<!-- =====ResponsibilityRole============================== -->
 		<!-- =====ResponsibilityRole unique========================== -->
 		<xsd:unique name="ResponsibilityRole_UniqueBy_Id_Version">
@@ -619,10 +602,10 @@
 		</xsd:key>
 		<!-- =====TypeOfValue unique========================== -->
 		<xsd:unique name="TypeOfValue_Unique">
-			<xsd:selector xpath=".//values/TypeOfValue"/>
+			<xsd:selector xpath="values/TypeOfValue"/>
 			<xsd:field xpath="@id"/>
 		</xsd:unique>
-		<!-- =====TypeOfValue Key========================== -->		
+		<!-- =====TypeOfValue Key========================== -->
 		<xsd:key name="TypeOfValue_Key">
 			<xsd:selector xpath=".//values/TypeOfValue"/>
 			<xsd:field xpath="@id"/>

xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd

@@ -179,6 +179,16 @@ Rail transport, Roads and Road transport
 		<xsd:annotation>
 			<xsd:documentation>A list of alternative Key values for an element.</xsd:documentation>
 		</xsd:annotation>
+		<!--  1.02 correction  ======================================= -->
+		<xsd:unique name="KeyValuePair">
+			<xsd:annotation>
+				<xsd:documentation>Every Key Value Pair must be unique.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:KeyValue"/>
+			<xsd:field xpath="netex:Key"/>
+			<xsd:field xpath="netex:Value"/>
+		</xsd:unique>
+		<!--	END correction  =======================================  -->
 	</xsd:element>
 	<xsd:complexType name="KeyListStructure">
 		<xsd:annotation>
@@ -219,6 +229,13 @@ Rail transport, Roads and Road transport
 		<xsd:annotation>
 			<xsd:documentation>A list of private codes that uniquely identifiy the element. May be used for inter-operating with other (legacy) systems. +v2.0</xsd:documentation>
 		</xsd:annotation>
+		<xsd:unique name="PrivateCodeType">
+			<xsd:annotation>
+				<xsd:documentation>Every PrivateCode type must be unique.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:PrivateCode"/>
+			<xsd:field xpath="@type"/>
+		</xsd:unique>
 	</xsd:element>
 	<xsd:complexType name="PrivateCodesStructure">
 		<xsd:annotation>

xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd

@@ -176,6 +176,14 @@ Rail transport, Roads and Road transport
 				</xsd:restriction>
 			</xsd:complexContent>
 		</xsd:complexType>
+		<xsd:unique name="TypeOfValue_Unique">
+			<xsd:selector xpath="values/TypeOfValue"/>
+			<xsd:field xpath="@id"/>
+		</xsd:unique>
+		<xsd:key name="TypeOfValue_Key">
+			<xsd:selector xpath="values/TypeOfValue"/>
+			<xsd:field xpath="@id"/>
+		</xsd:key>
 	</xsd:element>
 	<xsd:complexType name="ValueSet_VersionStructure">
 		<xsd:annotation>