1.0rc

.github/scripts/validate-and-lint.sh

@@ -7,9 +7,23 @@
 # The -e flag causes the script to exit as soon as one command returns a non-zero exit code
 set -e
 
-# Update the submodules, usefull only when there is a submodul update (can be commented most of the time)
-echo "Syncronising submodules ..."
-git submodule update --init --recursive
+# Update the submodules, useful only when there is a submodule update (can be commented most of the time)
+echo "Synchronising submodules ..."
+# ==> Check .github/worlflow/ci.yml
+
+#git submodule deinit -f NeTEx
+#rm -rf .git/modules/NeTEx
+#rm -rf NeTEx
+#git submodule update --init --recursive
+
+
+# Sync submodule remote URLs (in case .gitmodules changed)  
+#cd SIRI
+#git fetch origin SIRI-for-OpRa
+#git checkout origin/SIRI-for-OpRa
+#cd ..
+#git add SIRI
+
 
 #-------------------------------------------------------
 

.github/workflows/ci.yml

@@ -12,9 +12,14 @@ jobs:
 
       - name: Check out repository code
         uses: actions/checkout@v4
-
+        with:
+            submodules: false
+
       - name: Update git submodules
-        run: git submodule update --init --recursive
+        run: |
+          git fetch --prune
+          git submodule sync --recursive
+          git submodule update --init --recursive --force
 
       - name: Install xmllint and xsltproc
         run: |
@@ -26,7 +31,7 @@ jobs:
 
       - name: Validate OpRa XML examples
         run: ./.github/scripts/validate-examples.sh
-
+    
       - name: Commit changes
         uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit
         with:

.gitmodules

@@ -2,10 +2,13 @@
 	path = NeTEx
 	url = https://github.com/NeTEx-CEN/NeTEx
 	branch = v2.0
+	ignore = dirty
+[submodule "OJP"]
+	path = OJP
+	url = https://github.com/VDVde/OJP
+	ignore = dirty
 [submodule "SIRI"]
 	path = SIRI
 	url = https://github.com/Aurige/SIRI
 	branch = SIRI-for-OpRa
-[submodule "OJP"]
-	path = OJP
-	url = https://github.com/VDVde/OJP
+	ignore = dirty

OpRa.spp

@@ -769,6 +769,7 @@
 		<File FilePath="examples\ExpectedServiceIntensity.xml" HomeFolder="Yes"/>
 		<File FilePath="examples\Placeholder.xml" HomeFolder="Yes"/>
 		<File FilePath="examples\PlannedCapacity.xml" HomeFolder="Yes"/>
+		<File FilePath="examples\PlannedFleetDimensions.xml" HomeFolder="Yes"/>
 		<File FilePath="examples\PlannedServiceDimensions.xml" HomeFolder="Yes"/>
 		<File FilePath="examples\PlannedServiceIntensity.xml" HomeFolder="Yes"/>
 		<File FilePath="examples\RequestAllPassengerCounts.xml" HomeFolder="Yes"/>
@@ -779,10 +780,10 @@
 	<Folder FolderName="OpRa">
 		<Folder FolderName="OpRa_framework">
 			<Folder FolderName="OpRa_frames">
-				<File FilePath="xsd\opra_framework\opra_frames\opra_actualServiceFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\opra_framework\opra_frames\opra_actualFrame_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_frames\opra_contextualIndicatorFrame_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_frames\opra_indicatorFrame_version.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\opra_framework\opra_frames\opra_plannedServiceFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\opra_framework\opra_frames\opra_plannedFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="OpRa_genericFramework">
 				<File FilePath="xsd\opra_framework\opra_genericFramework\opra_GeneralLogEntry_version.xsd" HomeFolder="Yes"/>
@@ -793,8 +794,8 @@
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_delayClassification_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_durationDistribution_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_eventReference_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_filtering_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_passengerTravelControl_support.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_ptScope_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_statistics_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_vehicleOccupancy_version.xsd" HomeFolder="Yes"/>
 			</Folder>
@@ -808,7 +809,7 @@
 		<Folder FolderName="opra_service" ExtStr="xsd">
 			<File FilePath="xsd\opra_service\opra_all_services.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_payload_delivery.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\opra_service\opra_service_actualService.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\opra_service\opra_service_actualFrame.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_cancelledDatedVehicleJourneys.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_capacity.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_contextualIndicators.xsd" HomeFolder="Yes"/>
@@ -817,7 +818,7 @@
 			<File FilePath="xsd\opra_service\opra_service_fleetDimensions.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_lateDatedVehicleJourneys.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_onboardDeviceBasedPassengerCounts.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\opra_service\opra_service_plannedService.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\opra_service\opra_service_plannedFrame.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_serviceDimensions.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_serviceIntensity.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\opra_service\opra_service_ticketingBasedPassengerCounts.xsd" HomeFolder="Yes"/>

README.md

@@ -3,7 +3,7 @@
 # OpRa 
 
 # OpRa (Operational Raw Data) XML schema
-**(C) 2024-2024 OpRa, CEN**
+**(C) 2024-2026 OpRa, CEN**
 
 ## Schemas for:
 
@@ -17,7 +17,7 @@
 - OpRa (Operational Raw Data) complements the Transmodel series (NeTEx for static data, SIRI for dynamic data, OJP for trip description and journey planning) with an additional XML schema to provide a standardized format for exchanging historical data.
 
 
-### Folder structure 📁
+### Folder structure
 
 The individual XML files are organized hierarchically in folders, following the same structure as the uses case identified in the OpRa Technical Report. The architecture is: 
 
@@ -29,7 +29,7 @@ The individual XML files are organized hierarchically in folders, following the
 - You can refer to the Transmodel UML Conceptual models for a detailed UML view of the schema packages.
 - These models are available in electronic format.
 
-## Getting started 🚀
+## Getting started
 
 ### Main root schemas
 
@@ -64,7 +64,7 @@ The schema is systematically divided into small modular files. Generally, for ea
 - **OpRa_xxxx_version.xsd**: Contains the element definitions.
 
 ----
-## Branches  🌿
+## Branches
 
 | Branch Name | Description                                             | Link                                            |
 | ----------- | ------------------------------------------------------- | ----------------------------------------------- |
@@ -77,7 +77,7 @@ The schema is systematically divided into small modular files. Generally, for ea
 | -------------- | ------------- | ---------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------- |
 | 1.0            | Month 2024    | Initial productive version | [Code](https://github.com/OpRa-CEN/OpRa/releases/tag/v1.0) | [Release Notes](https://github.com/OpRa-CEN/OpRa/blob/v1.0/README.md) |
 
-## Full Version History 📚
+## Full Version History
 The comprehensive versions history is available in [change_log.md](https://github.com/ITxPT/NeTEx/blob/NeTEx/change_log.md)
 
 

examples/PlannedFleetDimensions.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Opra xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://transmodel-cen.eu/opra/1.0 ../xsd/opra.xsd">
+	<ServiceDelivery>
+		<siri:ResponseTimestamp>2025-12-17T09:30:47Z</siri:ResponseTimestamp>
+		<siri:ProducerRef>OpraExamples</siri:ProducerRef>
+		<opraFunctionalDeliveries>
+			<OpraPayloadDelivery>
+				<siri:ResponseTimestamp>2025-12-17T09:30:47Z</siri:ResponseTimestamp>
+				<Description>PlannedFleetDimensions example on the sample network, grouped by vehicle modes.</Description>
+				<dataObjects>
+					<IndicatorFrame>
+						<indicators>
+							<PlannedFleetDimensions>
+								<netex:VehicleMode>trolleyBus</netex:VehicleMode>
+								<NumberOfVehiclesRequired>2</NumberOfVehiclesRequired>
+								<NumberOfVehiclesInReserve>1</NumberOfVehiclesInReserve>
+							</PlannedFleetDimensions>
+							<PlannedFleetDimensions>
+								<netex:VehicleMode>bus</netex:VehicleMode>
+								<NumberOfVehiclesRequired>1</NumberOfVehiclesRequired>
+								<NumberOfVehiclesInReserve>1</NumberOfVehiclesInReserve>
+							</PlannedFleetDimensions>
+						</indicators>
+					</IndicatorFrame>
+				</dataObjects>
+			</OpraPayloadDelivery>
+		</opraFunctionalDeliveries>
+	</ServiceDelivery>
+</Opra>

examples/PlannedServiceDimensions.xml

@@ -6,37 +6,44 @@
 		<opraFunctionalDeliveries>
 			<OpraPayloadDelivery>
 				<siri:ResponseTimestamp>2025-12-17T09:30:47Z</siri:ResponseTimestamp>
-				<Description>Planned service dimensions example on the sample network.</Description>
+				<Description>PlannedServiceDimensions example on the sample network, grouped by journey patterns.</Description>
 				<dataObjects>
 					<IndicatorFrame>
-						<PreparednessLevel>Raw</PreparednessLevel>
+						<netex:FrameDefaults>
+							<netex:DefaultSystemOfUnits>SiKilometresAndMetres</netex:DefaultSystemOfUnits>
+						</netex:FrameDefaults>
 						<indicators>
-							<!-- Planned dimensions for line 10 on weekdays -->
 							<PlannedServiceDimensions>
 								<netex:LineRef ref="Test:Line:10"/>
-								<netex:DayTypeRef ref="Test:DayType:Weekdays"/>
-								<NumberOfStopPoints>18</NumberOfStopPoints>
-								<NumberOfLines>1</NumberOfLines>
-								<NumberOfRoutes>2</NumberOfRoutes>
-								<NumberOfJourneys>96</NumberOfJourneys>
-								<TotalVehicleJourneyDistance>1260</TotalVehicleJourneyDistance>
-								<TotalServiceJourneyDistance>1176</TotalServiceJourneyDistance>
-								<TotalTrainVehicleJourneyDistance>0</TotalTrainVehicleJourneyDistance>
-								<TotalTrainServiceJourneyDistance>0</TotalTrainServiceJourneyDistance>
+								<netex:JourneyPatternRef ref="Test:JP:10:T1-T3a"/>
+								<NumberOfStopPoints>6</NumberOfStopPoints>
+								<NumberOfJourneys>25</NumberOfJourneys>
+								<TotalLengthOfRoutes>6000</TotalLengthOfRoutes>
+								<TotalServiceJourneyDistance>150</TotalServiceJourneyDistance>
 							</PlannedServiceDimensions>
-							<!-- Planned dimensions for a peak timeband within a journey pattern -->
 							<PlannedServiceDimensions>
-								<netex:JourneyPatternRef ref="Test:JP:10:T1-T3a"/>
-								<netex:TimebandRef ref="Test:TimeBand:6-9"/>
-								<netex:VehicleTypeRef ref="Test:VT:bus:regular"/>
-								<NumberOfStopPoints>9</NumberOfStopPoints>
-								<NumberOfLines>1</NumberOfLines>
-								<NumberOfRoutes>1</NumberOfRoutes>
-								<NumberOfJourneys>24</NumberOfJourneys>
-								<TotalVehicleJourneyDistance>315</TotalVehicleJourneyDistance>
-								<TotalServiceJourneyDistance>294</TotalServiceJourneyDistance>
-								<TotalTrainVehicleJourneyDistance>0</TotalTrainVehicleJourneyDistance>
-								<TotalTrainServiceJourneyDistance>0</TotalTrainServiceJourneyDistance>
+								<netex:LineRef ref="Test:Line:10"/>
+								<netex:JourneyPatternRef ref="Test:JP:10:T3a-T1"/>
+								<NumberOfStopPoints>6</NumberOfStopPoints>
+								<NumberOfJourneys>25</NumberOfJourneys>
+								<TotalLengthOfRoutes>6200</TotalLengthOfRoutes>
+								<TotalServiceJourneyDistance>155</TotalServiceJourneyDistance>
+							</PlannedServiceDimensions>
+							<PlannedServiceDimensions>
+								<netex:LineRef ref="Test:Line:20"/>
+								<netex:JourneyPatternRef ref="Test:JP:20:T2-T3b"/>
+								<NumberOfStopPoints>6</NumberOfStopPoints>
+								<NumberOfJourneys>10</NumberOfJourneys>
+								<TotalLengthOfRoutes>5700</TotalLengthOfRoutes>
+								<TotalServiceJourneyDistance>57</TotalServiceJourneyDistance>
+							</PlannedServiceDimensions>
+							<PlannedServiceDimensions>
+								<netex:LineRef ref="Test:Line:20"/>
+								<netex:JourneyPatternRef ref="Test:JP:20:T3b-T2"/>
+								<NumberOfStopPoints>6</NumberOfStopPoints>
+								<NumberOfJourneys>10</NumberOfJourneys>
+								<TotalLengthOfRoutes>5800</TotalLengthOfRoutes>
+								<TotalServiceJourneyDistance>58</TotalServiceJourneyDistance>
 							</PlannedServiceDimensions>
 						</indicators>
 					</IndicatorFrame>

xsd/opra.xsd

@@ -3,8 +3,7 @@
 <xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="opra">
 	<!-- ===SIRI system IDs for  request =========================================================== -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="opra_imports/opra_siri_imports.xsd"/>
-	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="OpRa_publication.xsd"/>
+	<xsd:include schemaLocation="opra_publication.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata>
@@ -100,7 +99,7 @@
 	</xsd:group>
 	<xsd:complexType name="ServiceRequestStructure">
 		<xsd:annotation>
-			<xsd:documentation>Opra Service Request.</xsd:documentation>
+			<xsd:documentation>OpRa Service Request.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="siri:ContextualisedRequestStructure">
@@ -110,7 +109,7 @@
 	</xsd:complexType>
 	<xsd:group name="OpraServiceRequestGroup">
 		<xsd:annotation>
-			<xsd:documentation>OpRa Functional Service Concrete Requests.</xsd:documentation>
+			<xsd:documentation>OpRa Functional Service Requests.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:element ref="opraFunctionalRequests"/>
@@ -119,8 +118,7 @@
 	<!--===GS: Subscription Request ==================================================================== -->
 	<xsd:element name="SubscriptionRequest">
 		<xsd:annotation>
-			<xsd:documentation>
-                Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.
+			<xsd:documentation>Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.
             </xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
@@ -143,7 +141,7 @@
 	</xsd:complexType>
 	<xsd:group name="OpraSubscriptionRequestGroup">
 		<xsd:annotation>
-			<xsd:documentation>OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type.</xsd:documentation>
+			<xsd:documentation>OpRa Subscription types. For a given SubscriptionRequest, must all be of the same service type.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:choice>
 			<xsd:element ref="opraSubscriptionRequests" maxOccurs="unbounded"/>
@@ -251,12 +249,12 @@
 	<!-- ===GS: Capabilities Request==================================================================== -->
 	<xsd:element name="CapabilitiesRequest" type="CapabilitiesRequestStructure">
 		<xsd:annotation>
-			<xsd:documentation>Requests a the current capabilities of the server. Answred with a CapabilitiesResponse.</xsd:documentation>
+			<xsd:documentation>Requests a the current capabilities of the server. Answered with a CapabilitiesResponse. Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:complexType name="CapabilitiesRequestStructure">
 		<xsd:annotation>
-			<xsd:documentation>Type for Requests for capabilities of the current system.</xsd:documentation>
+			<xsd:documentation>Type for Requests for capabilities of the current system.  Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="siri:AuthenticatedRequestStructure">
@@ -279,7 +277,7 @@
 	</xsd:complexType>
 	<xsd:group name="ServiceCapabilitiesRequestGroup">
 		<xsd:annotation>
-			<xsd:documentation>Defines the capabilities of an individual OpRa service request functions.</xsd:documentation>
+			<xsd:documentation>Defines the capabilities of an individual OpRa service request functions.  Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:element ref="opraServiceCapabilitiesRequests"/>
@@ -288,12 +286,12 @@
 	<!-- ===GS: Capabilities Delivery==================================================================== -->
 	<xsd:element name="CapabilitiesResponse" type="CapabilitiesResponseStructure">
 		<xsd:annotation>
-			<xsd:documentation>Responses with the capabilities of an implementation.</xsd:documentation>
+			<xsd:documentation>Responses with the capabilities of an implementation.  Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:complexType name="CapabilitiesResponseStructure">
 		<xsd:annotation>
-			<xsd:documentation>Type for the capabilities of an implementation.</xsd:documentation>
+			<xsd:documentation>Type for the capabilities of an implementation.  Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="siri:ProducerResponseStructure">
@@ -305,16 +303,23 @@
 	</xsd:complexType>
 	<xsd:group name="OpraServiceCapabilitiesResponseGroup">
 		<xsd:annotation>
-			<xsd:documentation>Defines the capabilities of an individual OpRa service delivery functions.</xsd:documentation>
+			<xsd:documentation>Defines the capabilities of an individual OpRa service delivery functions.  Reserved for future use.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:element ref="opraServiceCapabilitiesResponses" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->
 	<xsd:group name="OpraDiscoveryDeliveryGroup">
+		<xsd:annotation>
+			<xsd:documentation>Reference data availability information block of a Discovery Response.</xsd:documentation>
+		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element ref="opraDiscoveryDeliveries"/>
+			<xsd:element ref="opraDiscoveryDeliveries">
+				<xsd:annotation>
+					<xsd:documentation>Collection of Opra Discovery Deliveries.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 </xsd:schema>