TypeOfFlexibleService should have identity constraints (#442)

* TypeOfFlexibleService should have identity constraints Fix #441 * Fix a broken example * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
NeTEx-CEN · Jun 1, 2023 · ba3baf4 · ba3baf4
1 parent 8404109
commit ba3baf4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
@@ -144,6 +144,18 @@ The Calendar is shown coded as
 				<DefaultCodespaceRef ref="mybus"/>
 			</FrameDefaults>
 			<frames>
+				<ResourceFrame version="1" id="mybus:svf_24">
+					<Name>ValueSet for TypeOfFlexibleService</Name>
+					<typesOfValue>
+						<ValueSet id="myvalueset" version="any" nameOfClass="TypeOfFlexibleService">
+							<values>
+								<TypeOfFlexibleService id="myfs" version="any">
+									<Name>My Flexible Service</Name>
+								</TypeOfFlexibleService>
+							</values>
+						</ValueSet>
+					</typesOfValue>
+				</ResourceFrame>
 				<SiteFrame version="1" id="mybus:svf_24">
 					<Name>Stops for Winter timetable for Flexible Route 12 </Name>
 					<flexibleStopPlaces>

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -7047,6 +7047,27 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====TypeOfFlexibleService============================== -->
+		<!-- =====TypeOfFlexibleService unique========================== -->
+		<xsd:unique name="TypeOfFlexibleService_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [TypeOfFlexibleService Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:TypeOfFlexibleService"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====TypeOfService Key ========================== -->
+		<xsd:keyref name="TypeOfFlexibleService_AnyKeyRef" refer="netex:TypeOfFlexibleService_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfFlexibleServiceRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="TypeOfFlexibleService_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TypeOfFlexibleService"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====TypeOfProductCategory============================== -->
 		<!-- =====TypeOfProductCategory unique========================== -->
 		<xsd:unique name="TypeOfProductCategory_UniqueBy_Id_Version">