Adding OperatingDayView to DatedVehcileJourney

NeTEx-CEN · Nov 30, 2024 · 556e98a · 556e98a
1 parent 315f33c
commit 556e98a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 8 deletions.
diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml
@@ -378,6 +378,9 @@ This is part 1 of a multistep example on versioning
 						</SpecialService>
 						<DatedServiceJourney version="001" id="bar:foo4">
 							<Name>JOURNEY</Name>
+							<OperatingDayView>
+								<CalendarDate>2024-11-30</CalendarDate>
+							</OperatingDayView>
 						</DatedServiceJourney>
 						<DeadRun version="001" id="bar:foo5">
 							<Name>JOURNEY</Name>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
@@ -305,6 +305,29 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
+	<!-- ======================================================================= -->
+	<xsd:element name="OperatingDayView" substitutionGroup="DerivedView">
+		<xsd:annotation>
+			<xsd:documentation>Simplified view of OPERATING DAY. All data will be derived through the relationship.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="OperatingDay_DerivedViewStructure"/>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="OperatingDay_DerivedViewStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for an OPERATING DAY VIEW.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="DerivedViewStructure">
+				<xsd:sequence>
+					<xsd:group ref="OperatingDayGroup"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
 	<xsd:group name="OperatingDayGroup">
 		<xsd:annotation>
 			<xsd:documentation>Elements for an OPERATING DAY.</xsd:documentation>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
@@ -198,11 +198,18 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>DATED VEHICLE JOURNEYs for which current VEHICLE JOURNEY is an alteration (i.e. change, replacement, supplement). +v2.0</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OperatingDayRef" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>EXPECTED TO BE MANDATORY - left with minOccurs="0" only to avoid breaking compatibility with old rail datasets</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
+			<xsd:choice minOccurs="0">
+				<xsd:element ref="OperatorRef">
+					<xsd:annotation>
+						<xsd:documentation>EXPECTED TO BE MANDATORY - left with minOccurs="0" only to avoid breaking compatibility with old rail datasets and also in the case when OperatorView is used. +v2.0</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element ref="OperatorView">
+					<xsd:annotation>
+						<xsd:documentation>Used in some cases, when no OperatorRef is used. At least the OPERATING DAY must be provided as date. +v2.0</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
 			<xsd:element ref="UicOperatingPeriod" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>** DEPRECATED ** not to be used - left available only to avoid breaking compatibility with old rail datasets -v2.0</xsd:documentation>
@@ -396,4 +403,4 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
 		</xsd:complexContent>
 	</xsd:complexType>
 	<!-- ======================================================================= -->
-</xsd:schema>
+</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
@@ -184,8 +184,8 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:choice minOccurs="0">
-				<xsd:element ref="OperatorRef"/>
-				<xsd:element ref="OperatorView"/>
+				<xsd:element ref="OperatingDayRef"/>
+				<xsd:element ref="OperatingDayView"/>
 			</xsd:choice>
 			<xsd:choice minOccurs="0">
 				<xsd:annotation>