From 6ea5dc7ad752d2ec1f9d381392a6f706ddf46ee0 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Sat, 1 Nov 2025 18:53:34 +0100 Subject: [PATCH 01/43] introducing AbstractLoggableObject/AbstractLogEntry and AbstractIndicator/AbstractIndicatorLogEntry patterns - added abstract LO/LE - added abstract Indicator/Indicator Log Entries - raw data have been refactored to inherit from Abstract Indicator / Indicator Log Entry --- .../CancelledAndLateDatedVehicleJourneys.xml | 22 +- examples/ExpectedPassengerCount.xml | 4 +- examples/TicketingBasedPassengerCount.xml | 8 +- .../opra_frames/opra_rawDataFrame_version.xsd | 260 +++---- .../opra_GeneralLogEntry_version.xsd | 678 +++++++++--------- ...a_cancelledDatedVehicleJourney_version.xsd | 411 +++++------ .../opra_expectedPassengerCount_version.xsd | 9 +- .../opra_externalPassengerCount_version.xsd | 9 +- .../opra_lateDatedVehicleJourney_version.xsd | 13 +- ...boardDeviceBasedPassengerCount_version.xsd | 17 +- ...a_ticketingBasedPassengerCount_version.xsd | 21 +- .../opra_validationEntry_version.xsd | 9 +- 12 files changed, 741 insertions(+), 720 deletions(-) diff --git a/examples/CancelledAndLateDatedVehicleJourneys.xml b/examples/CancelledAndLateDatedVehicleJourneys.xml index 1194e43..0392985 100644 --- a/examples/CancelledAndLateDatedVehicleJourneys.xml +++ b/examples/CancelledAndLateDatedVehicleJourneys.xml @@ -13,7 +13,7 @@ 2025-03-18T23:59:59 Cleansed - + @@ -24,15 +24,6 @@ false - - - - - 2 - 0.0270 - - - @@ -58,8 +49,13 @@ PT10M - - + + + + + 2 + 0.0270 + @@ -88,7 +84,7 @@ - + diff --git a/examples/ExpectedPassengerCount.xml b/examples/ExpectedPassengerCount.xml index 09c8e76..87485b2 100644 --- a/examples/ExpectedPassengerCount.xml +++ b/examples/ExpectedPassengerCount.xml @@ -10,7 +10,7 @@ Raw - + @@ -86,7 +86,7 @@ 820 820 - + diff --git a/examples/TicketingBasedPassengerCount.xml b/examples/TicketingBasedPassengerCount.xml index 921bb52..e5a4b0f 100644 --- a/examples/TicketingBasedPassengerCount.xml +++ b/examples/TicketingBasedPassengerCount.xml @@ -10,7 +10,7 @@ Cleansed - + @@ -60,8 +60,8 @@ PassengerCheckOut - - + + PassengerCheckIn @@ -85,7 +85,7 @@ - + diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 0fd3408..4522a5e 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -1,22 +1,22 @@ - + - - - - + - - - - - - - - - + + + + + + main schema e-service developers @@ -58,114 +58,124 @@ Rail transport, Roads and Road transport Standard - OpRa RAW DATA FRAME types. - - - - - Type for identifier of a OpRa RAW DATA FRAME. - - - - - - Reference element to an OpRa RAW DATA FRAME. - - - - - Type for a reference to an OpRa RAW DATA FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa RAW DATA FRAME. - - - - - - - - - - Raw data collections within the RAW DATA FRAME. - - - - - General LOG ENTRies in frame. - - - - - - - - - - - - - - - + OpRa RAW DATA FRAME types. + + + + + Type for identifier of a OpRa RAW DATA FRAME. + + + + + + Reference element to an OpRa RAW DATA FRAME. + + + + + Type for a reference to an OpRa RAW DATA FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa RAW DATA FRAME. + + + + + + + + + + Raw data collections within the RAW DATA FRAME. + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd index c1b552e..c9ebfae 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd @@ -1,17 +1,15 @@ - + - - - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -53,325 +51,335 @@ Rail transport, Roads and Road transport Standard - OpRa generic concrete LOG ENTRY and LOGGABLE OBJECT - - - - - Identifier of a LOGGABLE OBJECT. - - - - - - Reference element to a LOGGABLE OBJECT. - - - - - Type for a reference to a LOGGABLE OBJECT. - - - - - - Identifier of referenced entity. - - - - - - - - - Identifier of a concrete generic LOG ENTRY. - - - - - - Reference element to a GeneralLogEntry. - - - - - Type for a reference to a GeneralLogEntry. - - - - - - Identifier of referenced entity. - - - - - - - - - Identifier of a LOG ENTRY VALUE. - - - - - - Reference element to a LOG ENTRY Value. - - - - - Type for a reference to a LOG ENTRY Value. - - - - - - Identifier of referenced entity. - - - - - - - - - Dummy Supertype for LOGGABLE OBJECT. - - - - - A collection of one or more LOGGABLE OBJECTs - - - - - An entity for which LOG ENTRies may be made. - - - - - - - An entity for which LOG ENTRies may be made. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT. - - - - - - - Elements for a generic conrete LOG ENTRY - - - - - - - - - Elements for a TYPE OF TRACE. - - - - - Description of LOGGABLE OBJECT - - - - - LOG ENTRIES attached to the LOGGABLE OBJECT - - - - - - - - Dummy Supertype for LOG ENTRY. - - - - - A time-stamped record of an event or change of state. - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a concrete generic LOG ENTRY - - - - - - - - Elements for a generic concrete LOG ENTRY. - - - - - - - - - Elements for a general LOG ENTRY. - - - - - Values picked up from the ENTITY as input for the LOGGABLE OBJECT. - - - - - - - A collection of generic LOG ENTRies. - - - - - A time-stamped record of an event or change of state. - - - - - - - Type for containment in frame of GeneralLogEntries. - - - - - - - - - - - - - A collection of one or more logged VALUEs. - - - - - Record of the values to be captured by a LOG ENTRY. - - - - - - - A time-stamped record of an event or change of state - new values/state. - - - - - Type for a logged VALUE. - - - - Elements for a logged VALUE. - - - - - Identifier of logged VALUE. - - - - - - Type for a logged unique VALUE. - - - - - Name of VALUE captured by the LOG ENTRY. - - - - - VALUE captured by the LOG ENTRY. - - - - - - - Elements for a logged VALUE. - - - - - - - - - Context (related event, control action and consequences) for a logged VALUE. - - - - - Type of the CONTROL ACTION associated with the LOG ENTRY (cf Transmodel) - - - - - Type of the Consequence associated with the LOG ENTRY (cf SIRI SX) - - - - - Type of the triggering EVENT associated with the LOG ENTRY (cf Transmodel) - - - - - + OpRa generic concrete LOG ENTRY and LOGGABLE OBJECT + + + + + Identifier of a LOGGABLE OBJECT. + + + + + + Reference element to a LOGGABLE OBJECT. + + + + + Type for a reference to a LOGGABLE OBJECT. + + + + + + Identifier of referenced entity. + + + + + + + + + Identifier of a concrete generic LOG ENTRY. + + + + + + Reference element to a GeneralLogEntry. + + + + + Type for a reference to a GeneralLogEntry. + + + + + + Identifier of referenced entity. + + + + + + + + + Identifier of a LOG ENTRY VALUE. + + + + + + Reference element to a LOG ENTRY Value. + + + + + Type for a reference to a LOG ENTRY Value. + + + + + + Identifier of referenced entity. + + + + + + + + + + + + + + Dummy Supertype for LOGGABLE OBJECT. + + + + + A collection of one or more LOGGABLE OBJECTs + + + + + An entity for which LOG ENTRies may be made. + + + + + + + An entity for which LOG ENTRies may be made. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT. + + + + + + + Elements for a generic conrete LOG ENTRY + + + + + + + + + Elements for a TYPE OF TRACE. + + + + + Description of LOGGABLE OBJECT + + + + + LOG ENTRIES attached to the LOGGABLE OBJECT + + + + + + + + + + + + + Dummy Supertype for LOG ENTRY. + + + + + A time-stamped record of an event or change of state. + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a concrete generic LOG ENTRY + + + + + + + + Elements for a generic concrete LOG ENTRY. + + + + + + + + + Elements for a general LOG ENTRY. + + + + + Values picked up from the ENTITY as input for the LOGGABLE OBJECT. + + + + + + + A collection of generic LOG ENTRies. + + + + + A time-stamped record of an event or change of state. + + + + + + + Type for containment in frame of GeneralLogEntries. + + + + + + + + + + + + + A collection of one or more logged VALUEs. + + + + + Record of the values to be captured by a LOG ENTRY. + + + + + + + A time-stamped record of an event or change of state - new values/state. + + + + + Type for a logged VALUE. + + + + Elements for a logged VALUE. + + + + + Identifier of logged VALUE. + + + + + + Type for a logged unique VALUE. + + + + + Name of VALUE captured by the LOG ENTRY. + + + + + VALUE captured by the LOG ENTRY. + + + + + + + Elements for a logged VALUE. + + + + + + + + + Context (related event, control action and consequences) for a logged VALUE. + + + + + Type of the CONTROL ACTION associated with the LOG ENTRY (cf Transmodel) + + + + + Type of the Consequence associated with the LOG ENTRY (cf SIRI SX) + + + + + Type of the triggering EVENT associated with the LOG ENTRY (cf Transmodel) + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd index f7feb96..c3529ed 100644 --- a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd @@ -1,19 +1,20 @@ - + - - - - - - - - - - + + + + + + + + + - - + + main schema e-service developers @@ -55,195 +56,195 @@ Rail transport, Roads and Road transport Standard - OpRa CancelledDatedVehicleJourney - - - - Dynamic (may change between states) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) - - - - - Reference to a SITUATION providing further information about the CANCELLED DATED VEHICLE JOURNEY. - - - - - A loose reference (not defined in the data exchange) to the CONTROL ACTION that cancelled the journey. - - - - - - - Identifier type for CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - Reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - Type of reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - Implementation of a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording CANCELLED DATED VEHICLE JOURNEY information. - - - - - - - - - - - - Elements for the CANCELLED DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. - - - - - - - - - - - A collection of one or more CancelledDatedVehicleJourneys. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - - - - - - Reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - Type for a reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - Collection of references to CANCELLED DATED VEHICLE JOURNEY ENTRIes. - - - - - A reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Elements for a CancelledDatedVehicleJourneyEntry. - - - - - - - The collection of EVENTs that led to the cancellation. - - - - - Whether a replacement journey was created is an addition to the planning data sent. Default is 'false': i.e. not an additional journey. - - - - - - - A collection of one or more CancelledDatedVehicleJourneyEntry instances. - - - - - Represents cancellation of a journey. - - - - - + OpRa CancelledDatedVehicleJourney + + + + Dynamic (may change between states) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) + + + + + Reference to a SITUATION providing further information about the CANCELLED DATED VEHICLE JOURNEY. + + + + + A loose reference (not defined in the data exchange) to the CONTROL ACTION that cancelled the journey. + + + + + + + Identifier type for CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + Reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + Type of reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + Implementation of a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording CANCELLED DATED VEHICLE JOURNEY information. + + + + + + + + + + + + Elements for the CANCELLED DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. + + + + + + + + + + + A collection of one or more CancelledDatedVehicleJourneys. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + + + + + + Reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + Type for a reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + Collection of references to CANCELLED DATED VEHICLE JOURNEY ENTRIes. + + + + + A reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Elements for a CancelledDatedVehicleJourneyEntry. + + + + + + + The collection of EVENTs that led to the cancellation. + + + + + Whether a replacement journey was created is an addition to the planning data sent. Default is 'false': i.e. not an additional journey. + + + + + + + A collection of one or more CancelledDatedVehicleJourneyEntry instances. + + + + + Represents cancellation of a journey. + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd b/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd index f928a78..b57def9 100644 --- a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ - + + @@ -81,7 +82,7 @@ Rail transport, Roads and Road transport - + Implementation of LOGGABLE OBJECT designed for recording EXPECTED PASSENGER COUNT information. @@ -113,7 +114,7 @@ Rail transport, Roads and Road transport Type for a LOGGABLE OBJECT designed for recording EXPECTED PASSENGER COUNT information. - + diff --git a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd b/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd index 8f36463..0e2f124 100644 --- a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ - + + @@ -70,7 +71,7 @@ Rail transport, Roads and Road transport - + Implementation of LOGGABLE OBJECT designed for recording EXTERNAL PASSENGER COUNT information. @@ -102,7 +103,7 @@ Rail transport, Roads and Road transport Type for a LOGGABLE OBJECT designed for recording External PASSENGER COUNT information. - + diff --git a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd index ba3d58b..b6b618f 100644 --- a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ - + + - + Implementation of a LATE DATED VEHICLE JOURNEY COUNT. @@ -144,7 +145,7 @@ Rail transport, Roads and Road transport Type for a LOGGABLE OBJECT designed for recording LATE DATED VEHICLE JOURNEY information. - + @@ -199,7 +200,7 @@ Rail transport, Roads and Road transport - + @@ -224,7 +225,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd index 1d380ac..c3afcbc 100644 --- a/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ - + + @@ -78,7 +79,7 @@ Rail transport, Roads and Road transport - + Implementation of LOGGABLE OBJECT designed for recording ONBOARD DEVICE BASED PASSENGER COUNT information. @@ -106,7 +107,7 @@ Rail transport, Roads and Road transport Type for a LOGGABLE OBJECT designed for recording ONBOARD DEVICE BASED PASSENGER COUNT information. - + @@ -132,22 +133,22 @@ Rail transport, Roads and Road transport - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + LOGGABLE OBJECT designed for recording ONBOARD DEVICE BASED PASSENGER COUNT information. - + - + - Dynamic (may change in each state) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) + Dynamic (may change in each state) elements for an AggregatedOnboardDeviceBasedPassengerCount (as a LOG ENTRY) diff --git a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd b/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd index e5364ed..f7358b9 100644 --- a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ - + + @@ -74,7 +75,7 @@ Rail transport, Roads and Road transport - + Implementation of LOGGABLE OBJECT designed for recording TICKETING BASED PASSENGER COUNT information. @@ -105,7 +106,7 @@ Rail transport, Roads and Road transport Type for a LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - + @@ -114,7 +115,7 @@ Rail transport, Roads and Road transport - Static (same in each state) elements for a CancelledDatedVehicleJourney (as a LOGGABLE OBJECT) + Static (same in each state) elements for a TicketingBasedPassengerCount (as a LOGGABLE OBJECT) @@ -127,27 +128,27 @@ Rail transport, Roads and Road transport - A collection of one or more CancelledDatedVehicleJourneys. + A collection of one or more TicketingBasedPassengerCounts. - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + LOGGABLE OBJECT designed for recording TICKETING BASED PASSENGER COUNT information. - + - + - Dynamic (may change in each state) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) + Dynamic (may change in each state) elements for an AggregatedTicketingBasedPassengerCount (as a LOG ENTRY) diff --git a/xsd/opra_rawdata/opra_validationEntry_version.xsd b/xsd/opra_rawdata/opra_validationEntry_version.xsd index 8dcb554..207ed0b 100644 --- a/xsd/opra_rawdata/opra_validationEntry_version.xsd +++ b/xsd/opra_rawdata/opra_validationEntry_version.xsd @@ -1,11 +1,12 @@ - + - + + @@ -72,10 +73,10 @@ Rail transport, Roads and Road transport - + - + From 8b213a04bd691521925646a478960939e97d04e4 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Sat, 1 Nov 2025 18:57:22 +0100 Subject: [PATCH 02/43] example fix --- examples/ResponseLateDatedVehicleJourneys.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/ResponseLateDatedVehicleJourneys.xml b/examples/ResponseLateDatedVehicleJourneys.xml index da6f013..e4eab85 100644 --- a/examples/ResponseLateDatedVehicleJourneys.xml +++ b/examples/ResponseLateDatedVehicleJourneys.xml @@ -12,7 +12,7 @@ 2025-03-18T23:59:59 Cleansed - + @@ -38,8 +38,8 @@ PT10M - - + + @@ -71,7 +71,7 @@ - + From 60679caa4987c8798e7c734692fa874cd2259e38 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Nov 2025 18:00:06 +0000 Subject: [PATCH 03/43] Lint and update documentation tables --- .../opra_frames/opra_rawDataFrame_version.xsd | 270 +++---- .../opra_GeneralLogEntry_version.xsd | 686 +++++++++--------- ...a_cancelledDatedVehicleJourney_version.xsd | 412 +++++------ .../opra_expectedPassengerCount_version.xsd | 6 +- .../opra_externalPassengerCount_version.xsd | 6 +- .../opra_lateDatedVehicleJourney_version.xsd | 6 +- ...boardDeviceBasedPassengerCount_version.xsd | 6 +- ...a_ticketingBasedPassengerCount_version.xsd | 6 +- .../opra_validationEntry_version.xsd | 6 +- 9 files changed, 702 insertions(+), 702 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 4522a5e..79214a2 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -1,22 +1,22 @@ - + - - - - + - - - - - - - - - + + + + + + main schema e-service developers @@ -58,124 +58,124 @@ Rail transport, Roads and Road transport Standard - OpRa RAW DATA FRAME types. - - - - - Type for identifier of a OpRa RAW DATA FRAME. - - - - - - Reference element to an OpRa RAW DATA FRAME. - - - - - Type for a reference to an OpRa RAW DATA FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa RAW DATA FRAME. - - - - - - - - - - Raw data collections within the RAW DATA FRAME. - - - - - - - - \ No newline at end of file + OpRa RAW DATA FRAME types. + + + + + Type for identifier of a OpRa RAW DATA FRAME. + + + + + + Reference element to an OpRa RAW DATA FRAME. + + + + + Type for a reference to an OpRa RAW DATA FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa RAW DATA FRAME. + + + + + + + + + + Raw data collections within the RAW DATA FRAME. + + + + + + + + diff --git a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd index c9ebfae..ee5023d 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd @@ -1,15 +1,15 @@ - + - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -51,335 +51,335 @@ Rail transport, Roads and Road transport Standard - OpRa generic concrete LOG ENTRY and LOGGABLE OBJECT - - - - - Identifier of a LOGGABLE OBJECT. - - - - - - Reference element to a LOGGABLE OBJECT. - - - - - Type for a reference to a LOGGABLE OBJECT. - - - - - - Identifier of referenced entity. - - - - - - - - - Identifier of a concrete generic LOG ENTRY. - - - - - - Reference element to a GeneralLogEntry. - - - - - Type for a reference to a GeneralLogEntry. - - - - - - Identifier of referenced entity. - - - - - - - - - Identifier of a LOG ENTRY VALUE. - - - - - - Reference element to a LOG ENTRY Value. - - - - - Type for a reference to a LOG ENTRY Value. - - - - - - Identifier of referenced entity. - - - - - - - - - - - - - - Dummy Supertype for LOGGABLE OBJECT. - - - - - A collection of one or more LOGGABLE OBJECTs - - - - - An entity for which LOG ENTRies may be made. - - - - - - - An entity for which LOG ENTRies may be made. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT. - - - - - - - Elements for a generic conrete LOG ENTRY - - - - - - - - - Elements for a TYPE OF TRACE. - - - - - Description of LOGGABLE OBJECT - - - - - LOG ENTRIES attached to the LOGGABLE OBJECT - - - - - - - - - - - - - Dummy Supertype for LOG ENTRY. - - - - - A time-stamped record of an event or change of state. - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a concrete generic LOG ENTRY - - - - - - - - Elements for a generic concrete LOG ENTRY. - - - - - - - - - Elements for a general LOG ENTRY. - - - - - Values picked up from the ENTITY as input for the LOGGABLE OBJECT. - - - - - - - A collection of generic LOG ENTRies. - - - - - A time-stamped record of an event or change of state. - - - - - - - Type for containment in frame of GeneralLogEntries. - - - - - - - - - - - - - A collection of one or more logged VALUEs. - - - - - Record of the values to be captured by a LOG ENTRY. - - - - - - - A time-stamped record of an event or change of state - new values/state. - - - - - Type for a logged VALUE. - - - - Elements for a logged VALUE. - - - - - Identifier of logged VALUE. - - - - - - Type for a logged unique VALUE. - - - - - Name of VALUE captured by the LOG ENTRY. - - - - - VALUE captured by the LOG ENTRY. - - - - - - - Elements for a logged VALUE. - - - - - - - - - Context (related event, control action and consequences) for a logged VALUE. - - - - - Type of the CONTROL ACTION associated with the LOG ENTRY (cf Transmodel) - - - - - Type of the Consequence associated with the LOG ENTRY (cf SIRI SX) - - - - - Type of the triggering EVENT associated with the LOG ENTRY (cf Transmodel) - - - - - \ No newline at end of file + OpRa generic concrete LOG ENTRY and LOGGABLE OBJECT + + + + + Identifier of a LOGGABLE OBJECT. + + + + + + Reference element to a LOGGABLE OBJECT. + + + + + Type for a reference to a LOGGABLE OBJECT. + + + + + + Identifier of referenced entity. + + + + + + + + + Identifier of a concrete generic LOG ENTRY. + + + + + + Reference element to a GeneralLogEntry. + + + + + Type for a reference to a GeneralLogEntry. + + + + + + Identifier of referenced entity. + + + + + + + + + Identifier of a LOG ENTRY VALUE. + + + + + + Reference element to a LOG ENTRY Value. + + + + + Type for a reference to a LOG ENTRY Value. + + + + + + Identifier of referenced entity. + + + + + + + + + + + + + + Dummy Supertype for LOGGABLE OBJECT. + + + + + A collection of one or more LOGGABLE OBJECTs + + + + + An entity for which LOG ENTRies may be made. + + + + + + + An entity for which LOG ENTRies may be made. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT. + + + + + + + Elements for a generic conrete LOG ENTRY + + + + + + + + + Elements for a TYPE OF TRACE. + + + + + Description of LOGGABLE OBJECT + + + + + LOG ENTRIES attached to the LOGGABLE OBJECT + + + + + + + + + + + + + Dummy Supertype for LOG ENTRY. + + + + + A time-stamped record of an event or change of state. + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a concrete generic LOG ENTRY + + + + + + + + Elements for a generic concrete LOG ENTRY. + + + + + + + + + Elements for a general LOG ENTRY. + + + + + Values picked up from the ENTITY as input for the LOGGABLE OBJECT. + + + + + + + A collection of generic LOG ENTRies. + + + + + A time-stamped record of an event or change of state. + + + + + + + Type for containment in frame of GeneralLogEntries. + + + + + + + + + + + + + A collection of one or more logged VALUEs. + + + + + Record of the values to be captured by a LOG ENTRY. + + + + + + + A time-stamped record of an event or change of state - new values/state. + + + + + Type for a logged VALUE. + + + + Elements for a logged VALUE. + + + + + Identifier of logged VALUE. + + + + + + Type for a logged unique VALUE. + + + + + Name of VALUE captured by the LOG ENTRY. + + + + + VALUE captured by the LOG ENTRY. + + + + + + + Elements for a logged VALUE. + + + + + + + + + Context (related event, control action and consequences) for a logged VALUE. + + + + + Type of the CONTROL ACTION associated with the LOG ENTRY (cf Transmodel) + + + + + Type of the Consequence associated with the LOG ENTRY (cf SIRI SX) + + + + + Type of the triggering EVENT associated with the LOG ENTRY (cf Transmodel) + + + + + diff --git a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd index c3529ed..143741f 100644 --- a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd @@ -1,20 +1,20 @@ - + - - - - - - - - - - - + + + + + + + + + - - + + main schema e-service developers @@ -56,195 +56,195 @@ Rail transport, Roads and Road transport Standard - OpRa CancelledDatedVehicleJourney - - - - Dynamic (may change between states) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) - - - - - Reference to a SITUATION providing further information about the CANCELLED DATED VEHICLE JOURNEY. - - - - - A loose reference (not defined in the data exchange) to the CONTROL ACTION that cancelled the journey. - - - - - - - Identifier type for CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - Reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - Type of reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - Implementation of a CANCELLED DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording CANCELLED DATED VEHICLE JOURNEY information. - - - - - - - - - - - - Elements for the CANCELLED DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. - - - - - - - - - - - A collection of one or more CancelledDatedVehicleJourneys. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - - - - - - Reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - Type for a reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - Collection of references to CANCELLED DATED VEHICLE JOURNEY ENTRIes. - - - - - A reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Elements for a CancelledDatedVehicleJourneyEntry. - - - - - - - The collection of EVENTs that led to the cancellation. - - - - - Whether a replacement journey was created is an addition to the planning data sent. Default is 'false': i.e. not an additional journey. - - - - - - - A collection of one or more CancelledDatedVehicleJourneyEntry instances. - - - - - Represents cancellation of a journey. - - - - - \ No newline at end of file + OpRa CancelledDatedVehicleJourney + + + + Dynamic (may change between states) elements for a CancelledDatedVehicleJourney (as a LOG ENTRY) + + + + + Reference to a SITUATION providing further information about the CANCELLED DATED VEHICLE JOURNEY. + + + + + A loose reference (not defined in the data exchange) to the CONTROL ACTION that cancelled the journey. + + + + + + + Identifier type for CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + Reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + Type of reference to a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + Implementation of a CANCELLED DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording CANCELLED DATED VEHICLE JOURNEY information. + + + + + + + + + + + + Elements for the CANCELLED DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. + + + + + + + + + + + A collection of one or more CancelledDatedVehicleJourneys. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + + + + + + Reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + Type for a reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + Collection of references to CANCELLED DATED VEHICLE JOURNEY ENTRIes. + + + + + A reference to a CANCELLED DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Elements for a CancelledDatedVehicleJourneyEntry. + + + + + + + The collection of EVENTs that led to the cancellation. + + + + + Whether a replacement journey was created is an addition to the planning data sent. Default is 'false': i.e. not an additional journey. + + + + + + + A collection of one or more CancelledDatedVehicleJourneyEntry instances. + + + + + Represents cancellation of a journey. + + + + + diff --git a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd b/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd index b57def9..704f6fa 100644 --- a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,8 +6,8 @@ - - + + diff --git a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd b/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd index 0e2f124..6a281fc 100644 --- a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,8 +6,8 @@ - - + + diff --git a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd index b6b618f..3d86eec 100644 --- a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,8 +6,8 @@ - - + + @@ -6,8 +6,8 @@ - - + + diff --git a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd b/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd index f7358b9..abc47a0 100644 --- a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd +++ b/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd @@ -1,4 +1,4 @@ - + @@ -6,8 +6,8 @@ - - + + diff --git a/xsd/opra_rawdata/opra_validationEntry_version.xsd b/xsd/opra_rawdata/opra_validationEntry_version.xsd index 207ed0b..7fbcd14 100644 --- a/xsd/opra_rawdata/opra_validationEntry_version.xsd +++ b/xsd/opra_rawdata/opra_validationEntry_version.xsd @@ -1,12 +1,12 @@ - + - - + + From fa9678f1aefd5c859829ccd1a99d5b9b4ad07a50 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Thu, 4 Dec 2025 02:37:57 +0100 Subject: [PATCH 04/43] initiating capacity related indicators - added planned and actual capacity indicators - added raw data frame defaults capability - added capacity specification methods --- OpRa.spp | 1 + examples/PlannedCapacity.xml | 55 +++++ .../opra_frames/opra_rawDataFrame_version.xsd | 42 +++- xsd/opra_imports/opra_netex_imports.xsd | 7 +- xsd/opra_rawdata/opra_capacity_version.xsd | 189 ++++++++++++++++++ 5 files changed, 289 insertions(+), 5 deletions(-) create mode 100644 examples/PlannedCapacity.xml create mode 100644 xsd/opra_rawdata/opra_capacity_version.xsd diff --git a/OpRa.spp b/OpRa.spp index ca7f576..a78e64d 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -764,6 +764,7 @@ + diff --git a/examples/PlannedCapacity.xml b/examples/PlannedCapacity.xml new file mode 100644 index 0000000..4df26c6 --- /dev/null +++ b/examples/PlannedCapacity.xml @@ -0,0 +1,55 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Expected passenger count example on the sample network. + + + + + nominalPerVehicleType + + + + 70 + 1 + + + + 125 + 1 + + + + + Raw + + + + + 3500 + 50 + + + + + 1750 + 25 + + + + + 1750 + 25 + + + + + + + + diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 4522a5e..e196df5 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -1,6 +1,7 @@ - + - + + @@ -163,6 +165,7 @@ Rail transport, Roads and Road transport Elements for a OpRa RAW DATA FRAME. + @@ -178,4 +181,39 @@ Rail transport, Roads and Road transport + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 4025d66..47dc3b9 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,4 +1,4 @@ - + @@ -7,8 +7,9 @@ - - + + + diff --git a/xsd/opra_rawdata/opra_capacity_version.xsd b/xsd/opra_rawdata/opra_capacity_version.xsd new file mode 100644 index 0000000..1e51000 --- /dev/null +++ b/xsd/opra_rawdata/opra_capacity_version.xsd @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_DatedJourneyInformationRecording_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + From 95d5c3ced4f3a3838c82a2cb027227dd1c1770bc Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Dec 2025 01:41:35 +0000 Subject: [PATCH 05/43] Lint and update documentation tables --- .../opra_frames/opra_rawDataFrame_version.xsd | 338 +++++++++--------- xsd/opra_imports/opra_netex_imports.xsd | 8 +- xsd/opra_rawdata/opra_capacity_version.xsd | 120 +++---- 3 files changed, 233 insertions(+), 233 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 47506d0..47eb74c 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -1,10 +1,10 @@ - + - - - - - + @@ -12,13 +12,13 @@ - - - - - - - + + + + + + + main schema e-service developers @@ -60,160 +60,160 @@ Rail transport, Roads and Road transport Standard - OpRa RAW DATA FRAME types. - - - - - Type for identifier of a OpRa RAW DATA FRAME. - - - - - - Reference element to an OpRa RAW DATA FRAME. - - - - - Type for a reference to an OpRa RAW DATA FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa RAW DATA FRAME. - - - - - - - - - - - Raw data collections within the RAW DATA FRAME. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + OpRa RAW DATA FRAME types. + + + + + Type for identifier of a OpRa RAW DATA FRAME. + + + + + + Reference element to an OpRa RAW DATA FRAME. + + + + + Type for a reference to an OpRa RAW DATA FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa RAW DATA FRAME. + + + + + + + + + + + Raw data collections within the RAW DATA FRAME. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 47dc3b9..82b36b0 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,4 +1,4 @@ - + @@ -7,9 +7,9 @@ - - - + + + diff --git a/xsd/opra_rawdata/opra_capacity_version.xsd b/xsd/opra_rawdata/opra_capacity_version.xsd index 1e51000..025ba68 100644 --- a/xsd/opra_rawdata/opra_capacity_version.xsd +++ b/xsd/opra_rawdata/opra_capacity_version.xsd @@ -1,13 +1,13 @@ - + - + - - + + @@ -97,50 +97,50 @@ Rail transport, Roads and Road transport - - - - - - - Reference element of an ACTUAL CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. @@ -174,16 +174,16 @@ Rail transport, Roads and Road transport - - - A collection of one or more ActualCapacity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + From d9e8ae58fd58e5ce666975b4f68d52fd8857fb06 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 9 Dec 2025 01:58:07 +0100 Subject: [PATCH 06/43] Added Service Dimensions & Intensity - service dimensions: number of stops, lines, routes, journeys - service intensity: capacities over distances --- OpRa.spp | 3 + .../opra_frames/opra_rawDataFrame_version.xsd | 2 + .../opra_durationDistribution_support.xsd | 143 +++++------ xsd/opra_rawdata/opra_capacity_version.xsd | 196 ++++++++-------- .../opra_serviceDimensions_version.xsd | 197 ++++++++++++++++ .../opra_serviceIntensity_version.xsd | 222 ++++++++++++++++++ 6 files changed, 594 insertions(+), 169 deletions(-) create mode 100644 xsd/opra_rawdata/opra_serviceDimensions_version.xsd create mode 100644 xsd/opra_rawdata/opra_serviceIntensity_version.xsd diff --git a/OpRa.spp b/OpRa.spp index a78e64d..6ac4902 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -803,10 +803,13 @@ + + + diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 47506d0..d43fde5 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -16,6 +16,8 @@ + + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index 137f23a..406e1f9 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -1,16 +1,16 @@ - + - - - + - - - - - - + + + + + + main schema e-service developers @@ -52,64 +52,65 @@ Rail transport, Roads and Road transport Standard - OpRa: Elements for exchanging DURATION INTERVAL occurrences and distribution. - - - - - Element for basic occurrence statistics of a DURATION INTERVAL. - - - - - Type of a DURATION INTERVAL. - - - - - - - - - Representation of an interval bounded by DURATION values. - - - - - - Signals if the start value is included in the interval (longer-than or longer-or-equal-than) - - - - - - Signals if the end is included in the interval (shorter-than or shorter-or-equal-than) - - - - - - - Type of a collection of DURATION INTERVALs. - - - - - Data for a DURATION INTERVAL. - - - - - - - Representation of a domain split up to DURATION INTERVALS. - - - - - Collection of non-overlapping DURATION INTERVALs. - - - - - + OpRa: Elements for exchanging DURATION INTERVAL occurrences and distribution. + + + + + Element for basic occurrence statistics of a DURATION INTERVAL. + + + + + Type of a DURATION INTERVAL. + + + + + + + + + Representation of an interval bounded by DURATION values. + + + + + + Signals if the start value is included in the interval (longer-than or longer-or-equal-than) + + + + + + Signals if the end is included in the interval (shorter-than or shorter-or-equal-than) + + + + + + + Type of a collection of DURATION INTERVALs. + + + + + Data for a DURATION INTERVAL. + + + + + + + Representation of a domain split up to DURATION INTERVALS. + + + + + Collection of non-overlapping DURATION INTERVALs. + + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_capacity_version.xsd b/xsd/opra_rawdata/opra_capacity_version.xsd index 1e51000..71541d7 100644 --- a/xsd/opra_rawdata/opra_capacity_version.xsd +++ b/xsd/opra_rawdata/opra_capacity_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,53 +53,53 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedCapacity - - - - - - - Reference element of an PLANNED CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + - + @@ -109,7 +109,7 @@ Rail transport, Roads and Road transport - + @@ -123,57 +123,57 @@ Rail transport, Roads and Road transport - + - + - + - + - + - - Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) - - - - - - - - - - A collection of one or more PlannedCapacity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + A collection of one or more ActualCapacity elements. @@ -186,4 +186,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_serviceDimensions_version.xsd b/xsd/opra_rawdata/opra_serviceDimensions_version.xsd new file mode 100644 index 0000000..8aba594 --- /dev/null +++ b/xsd/opra_rawdata/opra_serviceDimensions_version.xsd @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_serviceDimensions_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_serviceIntensity_version.xsd b/xsd/opra_rawdata/opra_serviceIntensity_version.xsd new file mode 100644 index 0000000..f88b254 --- /dev/null +++ b/xsd/opra_rawdata/opra_serviceIntensity_version.xsd @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_serviceIntensity_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + \ No newline at end of file From f91ea2e8fe68c5c745a4067a7eb0b06d991ebd47 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 01:03:00 +0000 Subject: [PATCH 07/43] Lint and update documentation tables --- .../opra_frames/opra_rawDataFrame_version.xsd | 18 +- .../opra_durationDistribution_support.xsd | 144 +++---- xsd/opra_rawdata/opra_capacity_version.xsd | 1 - .../opra_serviceDimensions_version.xsd | 310 +++++++-------- .../opra_serviceIntensity_version.xsd | 360 +++++++++--------- 5 files changed, 416 insertions(+), 417 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd index 4e36daa..58dddae 100644 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd @@ -12,15 +12,15 @@ - - - - - - - - - + + + + + + + + + main schema e-service developers diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index 406e1f9..ae8f50f 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -1,16 +1,16 @@ - + - - - + - - - - - - + + + + + + main schema e-service developers @@ -52,65 +52,65 @@ Rail transport, Roads and Road transport Standard - OpRa: Elements for exchanging DURATION INTERVAL occurrences and distribution. - - - - - Element for basic occurrence statistics of a DURATION INTERVAL. - - - - - Type of a DURATION INTERVAL. - - - - - - - - - Representation of an interval bounded by DURATION values. - - - - - - Signals if the start value is included in the interval (longer-than or longer-or-equal-than) - - - - - - Signals if the end is included in the interval (shorter-than or shorter-or-equal-than) - - - - - - - Type of a collection of DURATION INTERVALs. - - - - - Data for a DURATION INTERVAL. - - - - - - - Representation of a domain split up to DURATION INTERVALS. - - - - - Collection of non-overlapping DURATION INTERVALs. - - - - - - \ No newline at end of file + OpRa: Elements for exchanging DURATION INTERVAL occurrences and distribution. + + + + + Element for basic occurrence statistics of a DURATION INTERVAL. + + + + + Type of a DURATION INTERVAL. + + + + + + + + + Representation of an interval bounded by DURATION values. + + + + + + Signals if the start value is included in the interval (longer-than or longer-or-equal-than) + + + + + + Signals if the end is included in the interval (shorter-than or shorter-or-equal-than) + + + + + + + Type of a collection of DURATION INTERVALs. + + + + + Data for a DURATION INTERVAL. + + + + + + + Representation of a domain split up to DURATION INTERVALS. + + + + + Collection of non-overlapping DURATION INTERVALs. + + + + + + diff --git a/xsd/opra_rawdata/opra_capacity_version.xsd b/xsd/opra_rawdata/opra_capacity_version.xsd index 014be2a..6cad1b2 100644 --- a/xsd/opra_rawdata/opra_capacity_version.xsd +++ b/xsd/opra_rawdata/opra_capacity_version.xsd @@ -187,4 +187,3 @@ Rail transport, Roads and Road transport - diff --git a/xsd/opra_rawdata/opra_serviceDimensions_version.xsd b/xsd/opra_rawdata/opra_serviceDimensions_version.xsd index 8aba594..b3f950b 100644 --- a/xsd/opra_rawdata/opra_serviceDimensions_version.xsd +++ b/xsd/opra_rawdata/opra_serviceDimensions_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,145 +53,145 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - \ No newline at end of file + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + diff --git a/xsd/opra_rawdata/opra_serviceIntensity_version.xsd b/xsd/opra_rawdata/opra_serviceIntensity_version.xsd index f88b254..92c480c 100644 --- a/xsd/opra_rawdata/opra_serviceIntensity_version.xsd +++ b/xsd/opra_rawdata/opra_serviceIntensity_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,170 +53,170 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceIntensity - - - - - - - Reference element of an PLANNED SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - A collection of one or more ActualServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - \ No newline at end of file + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + From 0cff2e1f131247df199dc113ce6a124bd0719dad Mon Sep 17 00:00:00 2001 From: gnitsch Date: Mon, 15 Dec 2025 01:35:23 +0100 Subject: [PATCH 08/43] Raw Data -> Indicator and KPI -> ContextualIndicator refactor - renamed folders - renamed XSD files - refactored XSD and XML files --- OpRa.spp | 31 ++- .../CancelledAndLateDatedVehicleJourneys.xml | 4 +- examples/ExpectedPassengerCount.xml | 4 +- examples/PlannedCapacity.xml | 8 +- examples/RequestLateDatedVehicleJourneys.xml | 4 +- examples/ResponseLateDatedVehicleJourneys.xml | 4 +- examples/TicketingBasedPassengerCount.xml | 4 +- examples/placeholder.xml | 4 +- .../opra_contextualIndicatorFrame_version.xsd | 161 +++++++++++++ .../opra_indicatorFrame_version.xsd | 196 ++++++++++++++++ .../opra_frames/opra_kpiFrame_version.xsd | 161 ------------- .../opra_frames/opra_rawDataFrame_version.xsd | 221 ------------------ xsd/opra_framework/opra_payload_framework.xsd | 8 +- ...a_cancelledDatedVehicleJourney_version.xsd | 2 +- xsd/opra_indicators/opra_capacity_version.xsd | 215 +++++++++++++++++ .../opra_expectedPassengerCount_version.xsd | 2 +- .../opra_externalPassengerCount_version.xsd | 2 +- .../opra_lateDatedVehicleJourney_version.xsd | 2 +- ...boardDeviceBasedPassengerCount_version.xsd | 2 +- .../opra_serviceDimensions_version.xsd | 197 ++++++++++++++++ .../opra_serviceIntensity_version.xsd | 2 +- ...a_ticketingBasedPassengerCount_version.xsd | 2 +- .../opra_validationEntry_version.xsd | 2 +- xsd/opra_rawdata/opra_capacity_version.xsd | 189 --------------- .../opra_serviceDimensions_version.xsd | 197 ---------------- 25 files changed, 811 insertions(+), 813 deletions(-) create mode 100644 xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd create mode 100644 xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd delete mode 100644 xsd/opra_framework/opra_frames/opra_kpiFrame_version.xsd delete mode 100644 xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd rename xsd/{opra_rawdata => opra_indicators}/opra_cancelledDatedVehicleJourney_version.xsd (99%) create mode 100644 xsd/opra_indicators/opra_capacity_version.xsd rename xsd/{opra_rawdata => opra_indicators}/opra_expectedPassengerCount_version.xsd (99%) rename xsd/{opra_rawdata => opra_indicators}/opra_externalPassengerCount_version.xsd (99%) rename xsd/{opra_rawdata => opra_indicators}/opra_lateDatedVehicleJourney_version.xsd (99%) rename xsd/{opra_rawdata => opra_indicators}/opra_onboardDeviceBasedPassengerCount_version.xsd (99%) create mode 100644 xsd/opra_indicators/opra_serviceDimensions_version.xsd rename xsd/{opra_rawdata => opra_indicators}/opra_serviceIntensity_version.xsd (99%) rename xsd/{opra_rawdata => opra_indicators}/opra_ticketingBasedPassengerCount_version.xsd (99%) rename xsd/{opra_rawdata => opra_indicators}/opra_validationEntry_version.xsd (99%) delete mode 100644 xsd/opra_rawdata/opra_capacity_version.xsd delete mode 100644 xsd/opra_rawdata/opra_serviceDimensions_version.xsd diff --git a/OpRa.spp b/OpRa.spp index 6ac4902..cd3fe53 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -771,9 +771,6 @@ - - - @@ -798,21 +795,9 @@ - + - - - - - - - - - - - - @@ -830,8 +815,20 @@ + + + + + + + + + + + + - + diff --git a/examples/CancelledAndLateDatedVehicleJourneys.xml b/examples/CancelledAndLateDatedVehicleJourneys.xml index 0392985..6022794 100644 --- a/examples/CancelledAndLateDatedVehicleJourneys.xml +++ b/examples/CancelledAndLateDatedVehicleJourneys.xml @@ -7,7 +7,7 @@ 2025-03-22T00:05:00Z Cancelled and Late dated vehicle journey examples on the sample network. - + 2025-03-16T00:00:00 2025-03-18T23:59:59 @@ -85,7 +85,7 @@ - + diff --git a/examples/ExpectedPassengerCount.xml b/examples/ExpectedPassengerCount.xml index 87485b2..2d2d37e 100644 --- a/examples/ExpectedPassengerCount.xml +++ b/examples/ExpectedPassengerCount.xml @@ -8,7 +8,7 @@ 2001-12-17T09:30:47Z Expected passenger count example on the sample network. - + Raw @@ -87,7 +87,7 @@ 820 - + diff --git a/examples/PlannedCapacity.xml b/examples/PlannedCapacity.xml index 4df26c6..e44aed3 100644 --- a/examples/PlannedCapacity.xml +++ b/examples/PlannedCapacity.xml @@ -8,8 +8,8 @@ 2001-12-17T09:30:47Z Expected passenger count example on the sample network. - - + + nominalPerVehicleType @@ -25,7 +25,7 @@ - + Raw @@ -47,7 +47,7 @@ 25 - + diff --git a/examples/RequestLateDatedVehicleJourneys.xml b/examples/RequestLateDatedVehicleJourneys.xml index 045e46e..98eb130 100644 --- a/examples/RequestLateDatedVehicleJourneys.xml +++ b/examples/RequestLateDatedVehicleJourneys.xml @@ -15,12 +15,12 @@ - + 2025-03-16T00:00:00 2025-03-18T23:59:59 - + diff --git a/examples/ResponseLateDatedVehicleJourneys.xml b/examples/ResponseLateDatedVehicleJourneys.xml index e4eab85..e8ac849 100644 --- a/examples/ResponseLateDatedVehicleJourneys.xml +++ b/examples/ResponseLateDatedVehicleJourneys.xml @@ -6,7 +6,7 @@ 2025-03-22T00:06:00Z - + 2025-03-16T00:00:00 2025-03-18T23:59:59 @@ -72,7 +72,7 @@ - + diff --git a/examples/TicketingBasedPassengerCount.xml b/examples/TicketingBasedPassengerCount.xml index e5a4b0f..644f176 100644 --- a/examples/TicketingBasedPassengerCount.xml +++ b/examples/TicketingBasedPassengerCount.xml @@ -8,7 +8,7 @@ 2001-12-17T09:30:47Z Ticketing based passenger count examples on the sample network. - + Cleansed @@ -86,7 +86,7 @@ - + diff --git a/examples/placeholder.xml b/examples/placeholder.xml index e9aefe7..231d71f 100644 --- a/examples/placeholder.xml +++ b/examples/placeholder.xml @@ -8,10 +8,10 @@ 2025-04-22T12:00:01Z Example Publication Delivery - + Raw - + diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd new file mode 100644 index 0000000..f4fc692 --- /dev/null +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -0,0 +1,161 @@ + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + +

OpRa - Operational Raw Data. This subschema defines CONTEXTUAL INDICATOR FRAME types.

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_kpiFrame.xsd + [ISO 639-2/B] ENG + CEN TC278 WG3 SG10 + + + +
    +
  • Derived from Transmodel, NeTEx, SIRI standards.
    • +
+ + Version 1.0 Draft for approval + + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and road transport + + CEN TC278 WG3 SG10 + + Operational Raw Data Exchange - Contextual Indicator FRAME types. + Standard + + + CONTEXTUAL INDICATOR FRAME types for OpRa. + + + + + Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + + + + + + + Contextual information for the CONTEXTUAL INDICATORs within the frame. + + + + + An identifier that is recognizable by producer and consumer systems (eg. set by an agreement) + + + + + A version identifier within the domain of the context identifier. + + + + + A key/value list recognizable within the context domain. Might contain aggregation details. + + + + + + + Elements for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + Indicators in a CONTEXTUAL INDICATOR FRAME. + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd new file mode 100644 index 0000000..5e8d7a0 --- /dev/null +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data - Indicator Frames

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Indicator Frames + Standard + + + OpRa INDICATOR FRAME types. + + + + + Type for identifier of a OpRa INDICATOR FRAME. + + + + + + Reference element to an OpRa INDICATOR FRAME. + + + + + Type for a reference to an OpRa INDICATOR FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa INDICATOR FRAME. + + + + + + + + + + + Raw data collections within the INDICATOR FRAME. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_frames/opra_kpiFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_kpiFrame_version.xsd deleted file mode 100644 index e31db4a..0000000 --- a/xsd/opra_framework/opra_frames/opra_kpiFrame_version.xsd +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - -

OpRa - Operational Raw Data. This subschema defines KPI FRAME types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_kpiFrame.xsd - [ISO 639-2/B] ENG - CEN TC278 WG3 SG10 - - - -
    -
  • Derived from Transmodel, NeTEx, SIRI standards.
    • -
- - Version 1.0 Draft for approval - - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, - Rail transport, Roads and road transport - - CEN TC278 WG3 SG10 - - Operational Raw Data Exchange - Key Performance Indicator (KPI) FRAME types. - Standard - - - KPI FRAME types for OpRa. - - - - - Type for identifier of an OpRa KPI FRAME. - - - - - - Reference element to an OpRa KPI FRAME. - - - - - Type for a reference to an OpRa KPI FRAME. - - - - - - - - - - - A coherent set of KPIs to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for an OpRa KPI FRAME. - - - - - - - - - - - - - - - - - Contextual information for the KPIs within the KPI frame. - - - - - An identifier that is recognizable by producer and consumer systems (eg. set by an agreement) - - - - - A version identifier within the domain of the context identifier. - - - - - A key/value list recognizable within the context domain. Might contain aggregation details. - - - - - - - Elements for an OpRa KPI FRAME. - - - - - - - - - KPI's in a KPI FRAME. - - - - - - - diff --git a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd deleted file mode 100644 index 58dddae..0000000 --- a/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data - Raw Data Frames

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_rawDataFrame_version.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operational Raw Data Frames - Standard - - - OpRa RAW DATA FRAME types. - - - - - Type for identifier of a OpRa RAW DATA FRAME. - - - - - - Reference element to an OpRa RAW DATA FRAME. - - - - - Type for a reference to an OpRa RAW DATA FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa data to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa RAW DATA FRAME. - - - - - - - - - - - Raw data collections within the RAW DATA FRAME. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 8db8812..1d97252 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -8,8 +8,8 @@ - - + + @@ -19,8 +19,8 @@ - - + + diff --git a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd rename to xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index 143741f..85fada7 100644 --- a/xsd/opra_rawdata/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd new file mode 100644 index 0000000..3812948 --- /dev/null +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_DatedJourneyInformationRecording_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) + + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd rename to xsd/opra_indicators/opra_expectedPassengerCount_version.xsd index 704f6fa..5b5ef30 100644 --- a/xsd/opra_rawdata/opra_expectedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_externalPassengerCount_version.xsd rename to xsd/opra_indicators/opra_externalPassengerCount_version.xsd index 6a281fc..7b013d1 100644 --- a/xsd/opra_rawdata/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd rename to xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index 3d86eec..39e2280 100644 --- a/xsd/opra_rawdata/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd rename to xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd index f8dccd3..1b98635 100644 --- a/xsd/opra_rawdata/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd new file mode 100644 index 0000000..6bd8743 --- /dev/null +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_serviceDimensions_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + \ No newline at end of file diff --git a/xsd/opra_rawdata/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_serviceIntensity_version.xsd rename to xsd/opra_indicators/opra_serviceIntensity_version.xsd index 92c480c..c09ed31 100644 --- a/xsd/opra_rawdata/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd rename to xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd index abc47a0..5e5c8dc 100644 --- a/xsd/opra_rawdata/opra_ticketingBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd @@ -6,7 +6,7 @@ - + diff --git a/xsd/opra_rawdata/opra_validationEntry_version.xsd b/xsd/opra_indicators/opra_validationEntry_version.xsd similarity index 99% rename from xsd/opra_rawdata/opra_validationEntry_version.xsd rename to xsd/opra_indicators/opra_validationEntry_version.xsd index 7fbcd14..6bb998e 100644 --- a/xsd/opra_rawdata/opra_validationEntry_version.xsd +++ b/xsd/opra_indicators/opra_validationEntry_version.xsd @@ -5,7 +5,7 @@ - + diff --git a/xsd/opra_rawdata/opra_capacity_version.xsd b/xsd/opra_rawdata/opra_capacity_version.xsd deleted file mode 100644 index 6cad1b2..0000000 --- a/xsd/opra_rawdata/opra_capacity_version.xsd +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_DatedJourneyInformationRecording_version.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operation Raw Data Exchange - Standard - - - OpRa PlannedCapacity - - - - - - - Reference element of an PLANNED CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) - - - - - - - - - - A collection of one or more PlannedCapacity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - A collection of one or more ActualCapacity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - diff --git a/xsd/opra_rawdata/opra_serviceDimensions_version.xsd b/xsd/opra_rawdata/opra_serviceDimensions_version.xsd deleted file mode 100644 index b3f950b..0000000 --- a/xsd/opra_rawdata/opra_serviceDimensions_version.xsd +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_serviceDimensions_version.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operation Raw Data Exchange - Standard - - - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - From 209ce93d056a89ae7a0c6905b7efc9730b665dec Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 00:36:53 +0000 Subject: [PATCH 09/43] Lint and update documentation tables --- .../opra_contextualIndicatorFrame_version.xsd | 240 ++++++------ .../opra_indicatorFrame_version.xsd | 300 +++++++-------- xsd/opra_indicators/opra_capacity_version.xsd | 346 +++++++++--------- .../opra_serviceDimensions_version.xsd | 310 ++++++++-------- 4 files changed, 598 insertions(+), 598 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index f4fc692..4eac93e 100644 --- a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + main schema e-service developers @@ -47,115 +47,115 @@ Standard - CONTEXTUAL INDICATOR FRAME types for OpRa. - - - - - Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - - - - - - - Contextual information for the CONTEXTUAL INDICATORs within the frame. - - - - - An identifier that is recognizable by producer and consumer systems (eg. set by an agreement) - - - - - A version identifier within the domain of the context identifier. - - - - - A key/value list recognizable within the context domain. Might contain aggregation details. - - - - - - - Elements for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - Indicators in a CONTEXTUAL INDICATOR FRAME. - - - - - - - \ No newline at end of file + CONTEXTUAL INDICATOR FRAME types for OpRa. + + + + + Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + + + + + + + Contextual information for the CONTEXTUAL INDICATORs within the frame. + + + + + An identifier that is recognizable by producer and consumer systems (eg. set by an agreement) + + + + + A version identifier within the domain of the context identifier. + + + + + A key/value list recognizable within the context domain. Might contain aggregation details. + + + + + + + Elements for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + Indicators in a CONTEXTUAL INDICATOR FRAME. + + + + + + + diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index 5e8d7a0..662398a 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -1,26 +1,26 @@ - + - - - - - + - - - - - - - - - - - - + + + + + + + + + main schema e-service developers @@ -62,135 +62,135 @@ Rail transport, Roads and Road transport Standard - OpRa INDICATOR FRAME types. - - - - - Type for identifier of a OpRa INDICATOR FRAME. - - - - - - Reference element to an OpRa INDICATOR FRAME. - - - - - Type for a reference to an OpRa INDICATOR FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa INDICATOR FRAME. - - - - - - - - - - - Raw data collections within the INDICATOR FRAME. - - - - - - - - - - - - - - - - - - \ No newline at end of file + OpRa INDICATOR FRAME types. + + + + + Type for identifier of a OpRa INDICATOR FRAME. + + + + + + Reference element to an OpRa INDICATOR FRAME. + + + + + Type for a reference to an OpRa INDICATOR FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa INDICATOR FRAME. + + + + + + + + + + + Raw data collections within the INDICATOR FRAME. + + + + + + + + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd index 3812948..be374e3 100644 --- a/xsd/opra_indicators/opra_capacity_version.xsd +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,163 +53,163 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedCapacity - - - - - - - Reference element of an PLANNED CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) - - - - - - - - - - - A collection of one or more PlannedCapacity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - A collection of one or more ActualCapacity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) + + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 6bd8743..68aff5e 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,145 +53,145 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - \ No newline at end of file + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + From e61fc50f05d8e453187ed3b900d1580f6e7388a0 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 7 Jan 2026 01:38:52 +0100 Subject: [PATCH 10/43] service additions and additional request instructions + Service Requests PLANNED & ACTUAL CAPACITY, SERVICE DIMENSIONS and SERVICE INTENSITY + GroupBy and AggregateFunction elements for OpraFunctionalRequest elements + minor typing unification for collection elements for service layer. + adjusted examples to reflect changes & additions --- .../CancelledAndLateDatedVehicleJourneys.xml | 8 +- examples/ExpectedPassengerCount.xml | 4 +- examples/PlannedCapacity.xml | 4 +- examples/RequestAllPassengerCounts.xml | 26 +- examples/RequestLateDatedVehicleJourneys.xml | 9 +- examples/ResponseLateDatedVehicleJourneys.xml | 4 +- examples/TicketingBasedPassengerCount.xml | 4 +- examples/placeholder.xml | 4 +- xsd/opra.xsd | 552 +++++++++--------- xsd/opra_request.xsd | 549 ++++++++--------- xsd/opra_service/opra_all_services.xsd | 11 +- xsd/opra_service/opra_service_capacity.xsd | 136 +++++ .../opra_service_serviceDimensions.xsd | 136 +++++ .../opra_service_serviceIntensity.xsd | 136 +++++ 14 files changed, 1009 insertions(+), 574 deletions(-) create mode 100644 xsd/opra_service/opra_service_capacity.xsd create mode 100644 xsd/opra_service/opra_service_serviceDimensions.xsd create mode 100644 xsd/opra_service/opra_service_serviceIntensity.xsd diff --git a/examples/CancelledAndLateDatedVehicleJourneys.xml b/examples/CancelledAndLateDatedVehicleJourneys.xml index 6022794..648f328 100644 --- a/examples/CancelledAndLateDatedVehicleJourneys.xml +++ b/examples/CancelledAndLateDatedVehicleJourneys.xml @@ -2,8 +2,8 @@ 2025-03-22T00:05:00Z - - + + 2025-03-22T00:05:00Z Cancelled and Late dated vehicle journey examples on the sample network. @@ -87,7 +87,7 @@ - - + + diff --git a/examples/ExpectedPassengerCount.xml b/examples/ExpectedPassengerCount.xml index 2d2d37e..6363d0e 100644 --- a/examples/ExpectedPassengerCount.xml +++ b/examples/ExpectedPassengerCount.xml @@ -3,7 +3,7 @@ 2001-12-17T09:30:47Z OpraExamples - + 2001-12-17T09:30:47Z Expected passenger count example on the sample network. @@ -90,6 +90,6 @@ - + diff --git a/examples/PlannedCapacity.xml b/examples/PlannedCapacity.xml index e44aed3..decdd65 100644 --- a/examples/PlannedCapacity.xml +++ b/examples/PlannedCapacity.xml @@ -3,7 +3,7 @@ 2001-12-17T09:30:47Z OpraExamples - + 2001-12-17T09:30:47Z Expected passenger count example on the sample network. @@ -50,6 +50,6 @@ - + diff --git a/examples/RequestAllPassengerCounts.xml b/examples/RequestAllPassengerCounts.xml index d14b9a3..d62d4d4 100644 --- a/examples/RequestAllPassengerCounts.xml +++ b/examples/RequestAllPassengerCounts.xml @@ -3,27 +3,21 @@ 2025-03-22T00:00:00Z NMTOKEN - + 2025-03-22T00:00:00Z - Request ticketing based passenger counts for Line 10 on the sample network. - + Request (by default: daily) average ticketing based passenger counts for all lines, each vehicle journey and scheduled stop point on the sample network. + + groupByVehicleJourney + groupByScheduledStopPoint - - 2025-03-22T00:00:00Z - Request ticketing based passenger counts for Line 20 on the sample network. - - - - 2025-03-22T00:00:00Z - Request onboard device based passenger counts for Line 10 on the sample network. - - 2025-03-22T00:00:00Z - Request onboard device based passenger counts for Line 20 on the sample network. - + Request (by default: daily) onboard device based passenger counts all lines, each vehicle journey and scheduled stop point on the sample network. + + groupByVehicleJourney + groupByScheduledStopPoint - + diff --git a/examples/RequestLateDatedVehicleJourneys.xml b/examples/RequestLateDatedVehicleJourneys.xml index 98eb130..ff4b1b0 100644 --- a/examples/RequestLateDatedVehicleJourneys.xml +++ b/examples/RequestLateDatedVehicleJourneys.xml @@ -3,7 +3,7 @@ 2025-03-22T00:00:00Z NMTOKEN - + 2025-03-22T00:00:00Z Request delays for the T1-T3a direction in the sample network. @@ -11,8 +11,9 @@ 2025-03-22T00:00:00Z - Request delays for the T3a-T1 direction in the sample network. - + Request delays for the sample network grouped by journey patterns. + + groupByJourneyPattern @@ -22,6 +23,6 @@ - + diff --git a/examples/ResponseLateDatedVehicleJourneys.xml b/examples/ResponseLateDatedVehicleJourneys.xml index e8ac849..626caa0 100644 --- a/examples/ResponseLateDatedVehicleJourneys.xml +++ b/examples/ResponseLateDatedVehicleJourneys.xml @@ -2,7 +2,7 @@ 2025-03-22T00:05:00Z - + 2025-03-22T00:06:00Z @@ -75,6 +75,6 @@ - + diff --git a/examples/TicketingBasedPassengerCount.xml b/examples/TicketingBasedPassengerCount.xml index 644f176..9d35038 100644 --- a/examples/TicketingBasedPassengerCount.xml +++ b/examples/TicketingBasedPassengerCount.xml @@ -3,7 +3,7 @@ 2001-12-17T09:30:47Z OpraExamples - + 2001-12-17T09:30:47Z Ticketing based passenger count examples on the sample network. @@ -89,6 +89,6 @@ - + diff --git a/examples/placeholder.xml b/examples/placeholder.xml index 231d71f..686310b 100644 --- a/examples/placeholder.xml +++ b/examples/placeholder.xml @@ -3,7 +3,7 @@ 2025-04-22T12:00:00Z ExampleParticipant - + 2025-04-22T12:00:01Z Example Publication Delivery @@ -14,6 +14,6 @@ - + diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 2043f61..43a41d8 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,18 +1,18 @@ - + - - - - - + + + - - - - + + main schema e-service developers @@ -56,271 +56,271 @@ Standard - Opra ROOT ELEMENT SCHEMA. Subclasses SIRI Root Schema Elements. - - - - - Operational Raw Data Root Element. - - - - - - - - - - - - - OpRa all Requests. - - - - - - - - - - - - Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest) - - - - - - - - - - Requests for service provision. - - - - - - - - - - Opra Service Request. - - - - - - - - - - OpRa Functional Service Concrete Requests. - - - - - - - - - + Opra ROOT ELEMENT SCHEMA. Subclasses SIRI Root Schema Elements. + + + + + Operational Raw Data Root Element. + + + + + + + + + + + + + OpRa all Requests. + + + + + + + + + + + + Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest) + + + + + + + + + + Requests for service provision. + + + + + + + + + + Opra Service Request. + + + + + + + + + + OpRa Functional Service Concrete Requests. + + + + + + + + + Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse. - - - - - - - - - - Type for OpRa Subscription Request. - - - - - - - - - - - - OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type. - - - - - - - - - Opra Service Responses. - - - - - - - - - - - Responses to requests other than deliveries and status information. - - - - - - - - - - - Responses that deliver payload content. - - - - - - - - - - - Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request. - - - - - - - - - - Type for Opra Service Delivery. - - - - - - - - - Default gml coordinate format for any location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points. - - - - - - - - Elements for OpRa Service Delivery. - - - - - - Whether there is a further delivery message with more current updates that follows this one. Default is 'false'. - - - - - - - - - Requests for reference data for use in OpRa Functional Service requests. - - - - - - - - - Responses with reference data for use in OpRa Functional Service requests. - - - - - Responses with the capabilities of an implementation. Answers a CapabilityRequest. - - - - - - - - - - Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. - - - - - Type for Requests for capabilities of the current system. - - - - - - - Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data. - - - - - - If request has been proxied by an intermediate aggregating system, tracking information relating to the original requestor. This allows the aggregation to be stateless. - - - - - - - - - - Defines the capabilities of an individual OpRa service request functions. - - - - - - - - - Responses with the capabilities of an implementation. - - - - - Type for the capabilities of an implementation. - - - - - - - - - - - - Defines the capabilities of an individual OpRa service delivery functions. - - - - - - - - - - - - + + + + + + + + + + Type for OpRa Subscription Request. + + + + + + + + + + + + OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type. + + + + + + + + + Opra Service Responses. + + + + + + + + + + + Responses to requests other than deliveries and status information. + + + + + + + + + + + Responses that deliver payload content. + + + + + + + + + + + Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request. + + + + + + + + + + Type for Opra Service Delivery. + + + + + + + + + Default gml coordinate format for any location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points. + + + + + + + + Elements for OpRa Service Delivery. + + + + + + Whether there is a further delivery message with more current updates that follows this one. Default is 'false'. + + + + + + + + + Requests for reference data for use in OpRa Functional Service requests. + + + + + + + + + Responses with reference data for use in OpRa Functional Service requests. + + + + + Responses with the capabilities of an implementation. Answers a CapabilityRequest. + + + + + + + + + + Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. + + + + + Type for Requests for capabilities of the current system. + + + + + + + Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data. + + + + + + If request has been proxied by an intermediate aggregating system, tracking information relating to the original requestor. This allows the aggregation to be stateless. + + + + + + + + + + Defines the capabilities of an individual OpRa service request functions. + + + + + + + + + Responses with the capabilities of an implementation. + + + + + Type for the capabilities of an implementation. + + + + + + + + + + + + Defines the capabilities of an individual OpRa service delivery functions. + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 063cafe..f97af12 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,18 +1,18 @@ - + - - - - - - - + + + + + - - - - + + + + main schema e-service developers @@ -54,251 +54,280 @@ Standard - Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA - - - - - Generic context for all request messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - - - - Generic context for all response messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - OpRa generic problem for the whole delivery. - - - - - - ========================================== Request definitions ========================================== - - - - Main collection element for an OpRa (bulk) request. - - - - - Type for a collection of OpraFunctionalRequest elements. - - - - - - - - - - - - Basic request structure common for all OpRa functional service requests. - - - - - - - - - - Generic abstract OpRa request element. Substitute this element with topic-specific request elements. - - - - - Type for the generic abstract OpRa request. - - - - - - - - - - - - - Generic scope and preparedness state structures to be used in OpraFunctionalRequests. - - - - - - Collection of FRAMEs to form context(s) within a request. - - - - - Requested preparedness level for the delivered elements. - - - - - - - - Type for a collection of OpraRequests. - - - - - - - - Abstract delivery element, responding for OpraRequest elements. - - - - - Type for the abstract OpRa delivery element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element for Opra related errors. - - - - - Type for Opra Errors. - - - - - - - - ProblemDetailGroup - - - - - - - - - - Detailed description of the problem. - - - - - Explanation of the problem. - - - - - Additional log data. - - - - - + Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA + + + + + Generic context for all request messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + + + + Generic context for all response messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + OpRa generic problem for the whole delivery. + + + + + + ========================================== Request definitions ========================================== + + + + Main collection element for an OpRa (bulk) request. + + + + + Type for a collection of OpraFunctionalRequest elements. + + + + + + + + + + + + Basic request structure common for all OpRa functional service requests. + + + + + + + + + + Generic abstract OpRa request element. Substitute this element with topic-specific request elements. + + + + + Type for the generic abstract OpRa request. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generic scope and preparedness state structures to be used in OpraFunctionalRequests. + + + + + + Collection of FRAMEs to form context(s) within a request. + + + + + Requested preparedness level for the delivered elements. + + + + + + + + + Type for a collection of OpraRequests. + + + + + + + + Abstract delivery element, responding for OpraRequest elements. + + + + + Type for the abstract OpRa delivery element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + + \ No newline at end of file diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd index 2fe066e..3a20b8e 100644 --- a/xsd/opra_service/opra_all_services.xsd +++ b/xsd/opra_service/opra_all_services.xsd @@ -1,17 +1,20 @@ - + - + + + + - - + + main schema diff --git a/xsd/opra_service/opra_service_capacity.xsd b/xsd/opra_service/opra_service_capacity.xsd new file mode 100644 index 0000000..11ea706 --- /dev/null +++ b/xsd/opra_service/opra_service_capacity.xsd @@ -0,0 +1,136 @@ + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_capacity.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Raw Data Exchange + Standard + + + OpRa PLANNED / ACTUAL CAPACITY Request / Discovery schema. + + + + A request element to get PLANNED CAPACITIes. + + + + + A request element to get ACTUAL CAPACITIes. + + + + + Type for the request element to get CAPACITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for CAPACITIes. + + + + + + A discovery request element to get PLANNED CAPACITIes. + + + + + A discovery request element to get ACTUAL CAPACITIes. + + + + + Type for the discovery request element to get CAPACITIes. + + + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for CAPACITIes. + + + + + + A discovery delivery element to get PLANNED CAPACITIes. + + + + + A discovery delivery element to get ACTUAL CAPACITIes. + + + + + Type for the discovery delivery element to get CAPACITIes. + + + + + + + + + + Specific data content of a discovery delivery for CAPACITIes. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + diff --git a/xsd/opra_service/opra_service_serviceDimensions.xsd b/xsd/opra_service/opra_service_serviceDimensions.xsd new file mode 100644 index 0000000..d7773bc --- /dev/null +++ b/xsd/opra_service/opra_service_serviceDimensions.xsd @@ -0,0 +1,136 @@ + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_serviceDimensions.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Raw Data Exchange + Standard + + + OpRa PLANNED / ACTUAL SERVICE DIMENSIONS Request / Discovery schema. + + + + A request element to get PLANNED SERVICE DIMENSIONS. + + + + + A request element to get ACTUAL SERVICE DIMENSIONS. + + + + + Type for the request element to get SERVICE DIMENSIONS. + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for SERVICE DIMENSIONS. + + + + + + A discovery request element to get PLANNED SERVICE DIMENSIONS. + + + + + A discovery request element to get ACTUAL SERVICE DIMENSIONS. + + + + + Type for the discovery request element to get SERVICE DIMENSIONS. + + + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for SERVICE DIMENSIONS. + + + + + + A discovery delivery element to get PLANNED SERVICE DIMENSIONS. + + + + + A discovery delivery element to get ACTUAL SERVICE DIMENSIONS. + + + + + Type for the discovery delivery element to get SERVICE DIMENSIONS. + + + + + + + + + + Specific data content of a discovery delivery for SERVICE DIMENSIONS. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + diff --git a/xsd/opra_service/opra_service_serviceIntensity.xsd b/xsd/opra_service/opra_service_serviceIntensity.xsd new file mode 100644 index 0000000..6785c35 --- /dev/null +++ b/xsd/opra_service/opra_service_serviceIntensity.xsd @@ -0,0 +1,136 @@ + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_serviceIntensity.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Raw Data Exchange + Standard + + + OpRa PLANNED / ACTUAL SERVICE INTENSITY Request / Discovery schema. + + + + A request element to get PLANNED SERVICE INTENSITIes. + + + + + A request element to get ACTUAL SERVICE INTENSITIes. + + + + + Type for the request element to get SERVICE INTENSITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for SERVICE INTENSITIes. + + + + + + A discovery request element to get PLANNED SERVICE INTENSITIes. + + + + + A discovery request element to get ACTUAL SERVICE INTENSITIes. + + + + + Type for the discovery request element to get SERVICE INTENSITIes. + + + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for SERVICE INTENSITIes. + + + + + + A discovery delivery element to get PLANNED SERVICE INTENSITIes. + + + + + A discovery delivery element to get ACTUAL SERVICE INTENSITIes. + + + + + Type for the discovery delivery element to get SERVICE INTENSITIes. + + + + + + + + + + Specific data content of a discovery delivery for SERVICE INTENSITIes. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + From d8a950e5d6d1827a5bfff15e41d6eb385a1d30b0 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 00:40:46 +0000 Subject: [PATCH 11/43] Lint and update documentation tables --- xsd/opra.xsd | 552 ++++++++--------- xsd/opra_request.xsd | 578 +++++++++--------- xsd/opra_service/opra_all_services.xsd | 14 +- xsd/opra_service/opra_service_capacity.xsd | 38 +- .../opra_service_serviceDimensions.xsd | 38 +- .../opra_service_serviceIntensity.xsd | 58 +- 6 files changed, 639 insertions(+), 639 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 43a41d8..6799420 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,18 +1,18 @@ - + - - - - - + + + - - - - + + main schema e-service developers @@ -56,271 +56,271 @@ Standard - Opra ROOT ELEMENT SCHEMA. Subclasses SIRI Root Schema Elements. - - - - - Operational Raw Data Root Element. - - - - - - - - - - - - - OpRa all Requests. - - - - - - - - - - - - Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest) - - - - - - - - - - Requests for service provision. - - - - - - - - - - Opra Service Request. - - - - - - - - - - OpRa Functional Service Concrete Requests. - - - - - - - - - + Opra ROOT ELEMENT SCHEMA. Subclasses SIRI Root Schema Elements. + + + + + Operational Raw Data Root Element. + + + + + + + + + + + + + OpRa all Requests. + + + + + + + + + + + + Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest) + + + + + + + + + + Requests for service provision. + + + + + + + + + + Opra Service Request. + + + + + + + + + + OpRa Functional Service Concrete Requests. + + + + + + + + + Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse. - - - - - - - - - - Type for OpRa Subscription Request. - - - - - - - - - - - - OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type. - - - - - - - - - Opra Service Responses. - - - - - - - - - - - Responses to requests other than deliveries and status information. - - - - - - - - - - - Responses that deliver payload content. - - - - - - - - - - - Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request. - - - - - - - - - - Type for Opra Service Delivery. - - - - - - - - - Default gml coordinate format for any location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points. - - - - - - - - Elements for OpRa Service Delivery. - - - - - - Whether there is a further delivery message with more current updates that follows this one. Default is 'false'. - - - - - - - - - Requests for reference data for use in OpRa Functional Service requests. - - - - - - - - - Responses with reference data for use in OpRa Functional Service requests. - - - - - Responses with the capabilities of an implementation. Answers a CapabilityRequest. - - - - - - - - - - Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. - - - - - Type for Requests for capabilities of the current system. - - - - - - - Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data. - - - - - - If request has been proxied by an intermediate aggregating system, tracking information relating to the original requestor. This allows the aggregation to be stateless. - - - - - - - - - - Defines the capabilities of an individual OpRa service request functions. - - - - - - - - - Responses with the capabilities of an implementation. - - - - - Type for the capabilities of an implementation. - - - - - - - - - - - - Defines the capabilities of an individual OpRa service delivery functions. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + Type for OpRa Subscription Request. + + + + + + + + + + + + OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type. + + + + + + + + + Opra Service Responses. + + + + + + + + + + + Responses to requests other than deliveries and status information. + + + + + + + + + + + Responses that deliver payload content. + + + + + + + + + + + Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request. + + + + + + + + + + Type for Opra Service Delivery. + + + + + + + + + Default gml coordinate format for any location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points. + + + + + + + + Elements for OpRa Service Delivery. + + + + + + Whether there is a further delivery message with more current updates that follows this one. Default is 'false'. + + + + + + + + + Requests for reference data for use in OpRa Functional Service requests. + + + + + + + + + Responses with reference data for use in OpRa Functional Service requests. + + + + + Responses with the capabilities of an implementation. Answers a CapabilityRequest. + + + + + + + + + + Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. + + + + + Type for Requests for capabilities of the current system. + + + + + + + Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data. + + + + + + If request has been proxied by an intermediate aggregating system, tracking information relating to the original requestor. This allows the aggregation to be stateless. + + + + + + + + + + Defines the capabilities of an individual OpRa service request functions. + + + + + + + + + Responses with the capabilities of an implementation. + + + + + Type for the capabilities of an implementation. + + + + + + + + + + + + Defines the capabilities of an individual OpRa service delivery functions. + + + + + + + + + + + + diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index f97af12..22503cb 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,18 +1,18 @@ - + - - - - - - - + + + + + - - - - + + + + main schema e-service developers @@ -54,280 +54,280 @@ Standard - Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA - - - - - Generic context for all request messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - - - - Generic context for all response messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - OpRa generic problem for the whole delivery. - - - - - - ========================================== Request definitions ========================================== - - - - Main collection element for an OpRa (bulk) request. - - - - - Type for a collection of OpraFunctionalRequest elements. - - - - - - - - - - - - Basic request structure common for all OpRa functional service requests. - - - - - - - - - - Generic abstract OpRa request element. Substitute this element with topic-specific request elements. - - - - - Type for the generic abstract OpRa request. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Generic scope and preparedness state structures to be used in OpraFunctionalRequests. - - - - - - Collection of FRAMEs to form context(s) within a request. - - - - - Requested preparedness level for the delivered elements. - - - - - - - - - Type for a collection of OpraRequests. - - - - - - - - Abstract delivery element, responding for OpraRequest elements. - - - - - Type for the abstract OpRa delivery element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element for Opra related errors. - - - - - Type for Opra Errors. - - - - - - - - ProblemDetailGroup - - - - - - - - - - Detailed description of the problem. - - - - - Explanation of the problem. - - - - - Additional log data. - - - - - \ No newline at end of file + Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA + + + + + Generic context for all request messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + + + + Generic context for all response messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + OpRa generic problem for the whole delivery. + + + + + + ========================================== Request definitions ========================================== + + + + Main collection element for an OpRa (bulk) request. + + + + + Type for a collection of OpraFunctionalRequest elements. + + + + + + + + + + + + Basic request structure common for all OpRa functional service requests. + + + + + + + + + + Generic abstract OpRa request element. Substitute this element with topic-specific request elements. + + + + + Type for the generic abstract OpRa request. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generic scope and preparedness state structures to be used in OpraFunctionalRequests. + + + + + + Collection of FRAMEs to form context(s) within a request. + + + + + Requested preparedness level for the delivered elements. + + + + + + + + + Type for a collection of OpraRequests. + + + + + + + + Abstract delivery element, responding for OpraRequest elements. + + + + + Type for the abstract OpRa delivery element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + + diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd index 3a20b8e..cc2619b 100644 --- a/xsd/opra_service/opra_all_services.xsd +++ b/xsd/opra_service/opra_all_services.xsd @@ -1,20 +1,20 @@ - + - - - - + + + + - - + + main schema diff --git a/xsd/opra_service/opra_service_capacity.xsd b/xsd/opra_service/opra_service_capacity.xsd index 11ea706..0d1cca0 100644 --- a/xsd/opra_service/opra_service_capacity.xsd +++ b/xsd/opra_service/opra_service_capacity.xsd @@ -1,4 +1,4 @@ - + @@ -56,12 +56,12 @@ A request element to get PLANNED CAPACITIes. - - - A request element to get ACTUAL CAPACITIes. - - - + + + A request element to get ACTUAL CAPACITIes. + + + Type for the request element to get CAPACITIes. @@ -80,12 +80,12 @@ A discovery request element to get PLANNED CAPACITIes. - - - A discovery request element to get ACTUAL CAPACITIes. - - - + + + A discovery request element to get ACTUAL CAPACITIes. + + + Type for the discovery request element to get CAPACITIes. @@ -106,12 +106,12 @@ A discovery delivery element to get PLANNED CAPACITIes. - - - A discovery delivery element to get ACTUAL CAPACITIes. - - - + + + A discovery delivery element to get ACTUAL CAPACITIes. + + + Type for the discovery delivery element to get CAPACITIes. diff --git a/xsd/opra_service/opra_service_serviceDimensions.xsd b/xsd/opra_service/opra_service_serviceDimensions.xsd index d7773bc..4868cb0 100644 --- a/xsd/opra_service/opra_service_serviceDimensions.xsd +++ b/xsd/opra_service/opra_service_serviceDimensions.xsd @@ -1,4 +1,4 @@ - + @@ -56,12 +56,12 @@ A request element to get PLANNED SERVICE DIMENSIONS. - - - A request element to get ACTUAL SERVICE DIMENSIONS. - - - + + + A request element to get ACTUAL SERVICE DIMENSIONS. + + + Type for the request element to get SERVICE DIMENSIONS. @@ -80,12 +80,12 @@ A discovery request element to get PLANNED SERVICE DIMENSIONS. - - - A discovery request element to get ACTUAL SERVICE DIMENSIONS. - - - + + + A discovery request element to get ACTUAL SERVICE DIMENSIONS. + + + Type for the discovery request element to get SERVICE DIMENSIONS. @@ -106,12 +106,12 @@ A discovery delivery element to get PLANNED SERVICE DIMENSIONS. - - - A discovery delivery element to get ACTUAL SERVICE DIMENSIONS. - - - + + + A discovery delivery element to get ACTUAL SERVICE DIMENSIONS. + + + Type for the discovery delivery element to get SERVICE DIMENSIONS. diff --git a/xsd/opra_service/opra_service_serviceIntensity.xsd b/xsd/opra_service/opra_service_serviceIntensity.xsd index 6785c35..1971daa 100644 --- a/xsd/opra_service/opra_service_serviceIntensity.xsd +++ b/xsd/opra_service/opra_service_serviceIntensity.xsd @@ -1,4 +1,4 @@ - + @@ -56,12 +56,12 @@ A request element to get PLANNED SERVICE INTENSITIes. - - - A request element to get ACTUAL SERVICE INTENSITIes. - - - + + + A request element to get ACTUAL SERVICE INTENSITIes. + + + Type for the request element to get SERVICE INTENSITIes. @@ -75,17 +75,17 @@ - - - A discovery request element to get PLANNED SERVICE INTENSITIes. - - - - - A discovery request element to get ACTUAL SERVICE INTENSITIes. - - - + + + A discovery request element to get PLANNED SERVICE INTENSITIes. + + + + + A discovery request element to get ACTUAL SERVICE INTENSITIes. + + + Type for the discovery request element to get SERVICE INTENSITIes. @@ -101,17 +101,17 @@ - - - A discovery delivery element to get PLANNED SERVICE INTENSITIes. - - - - - A discovery delivery element to get ACTUAL SERVICE INTENSITIes. - - - + + + A discovery delivery element to get PLANNED SERVICE INTENSITIes. + + + + + A discovery delivery element to get ACTUAL SERVICE INTENSITIes. + + + Type for the discovery delivery element to get SERVICE INTENSITIes. From b0837ccb8b2143d3c6af2d12a9c5ecd78f6d2429 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 21 Jan 2026 01:08:08 +0100 Subject: [PATCH 12/43] CALENDAR AWARE PT SCOPE modification Replaced the abstract TransportOrganisationRef with the instantiable OperatorRef and AuthorityRef elements --- .../opra_ptScope_support.xsd | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index 154cea0..0cb5c02 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -1,8 +1,8 @@ - + - + @@ -63,9 +63,14 @@ Rail transport, Roads and Road transport PT SCOPE structure. - + - Organisation scope (optional). + Authority organisation scope (optional). + + + + + Operator organisation scope (optional). @@ -85,4 +90,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From 8bcb4aa0c53b639f6746d8d32302864a61cb9092 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jan 2026 00:09:57 +0000 Subject: [PATCH 13/43] Lint and update documentation tables --- .../opra_reusableComponents/opra_ptScope_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index 0cb5c02..16765c7 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -90,4 +90,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From ca369180adaaedb421734f0cbe913dc4e7c6b84a Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 3 Feb 2026 13:58:49 +0100 Subject: [PATCH 14/43] Additional indicators, content, scope - added FLEET DIMENSIONS - added FleetScopeGroup - extended SERVICE DIMENSIONS - extended SERVICE INTENSITY --- OpRa.spp | 5 + .../opra_ptScope_support.xsd | 20 +- xsd/opra_imports/opra_netex_imports.xsd | 6 +- .../opra_fleetDimensions_version.xsd | 213 +++++++++++ .../opra_serviceDimensions_version.xsd | 330 ++++++++++-------- .../opra_serviceIntensity_version.xsd | 17 +- xsd/opra_service/opra_all_services.xsd | 6 +- .../opra_service_fleetDimensions.xsd | 143 ++++++++ 8 files changed, 572 insertions(+), 168 deletions(-) create mode 100644 xsd/opra_indicators/opra_fleetDimensions_version.xsd create mode 100644 xsd/opra_service/opra_service_fleetDimensions.xsd diff --git a/OpRa.spp b/OpRa.spp index cd3fe53..e7d9e4e 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -808,11 +808,15 @@ + + + + @@ -820,6 +824,7 @@ + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index 0cb5c02..dbeddc5 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -1,6 +1,7 @@ - + + - + @@ -90,4 +91,19 @@ Rail transport, Roads and Road transport + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 82b36b0..d238e05 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,6 +1,7 @@ + - + @@ -15,6 +16,7 @@ + @@ -68,4 +70,4 @@ Common NeTEx import node for OpRa schema - + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_fleetDimensions_version.xsd b/xsd/opra_indicators/opra_fleetDimensions_version.xsd new file mode 100644 index 0000000..9cd2ef9 --- /dev/null +++ b/xsd/opra_indicators/opra_fleetDimensions_version.xsd @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + main schema + e-fleet developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_fleetDimensions_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus fleets, Coach fleets, Bus stops and stations, +Rail transport, Railway stations and track, Train fleets, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa PlannedFleetDimensions + + + + + + + Reference element of an PLANNED FLEET DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED FLEET DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL FLEET DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL FLEET DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording FLEET DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedFleetDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + Number of total vehicles within the scope, including unavailable. + + + + + Number of vehicles required to conduct the service within the scope. + + + + + Number of additional assigned reserve vehicles to conduct the service within the scope. + + + + + Number of vehicles available for operation. + + + + + + + A collection of one or more PlannedFleetDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED FLEET DIMENSIONS information. + + + + + + + A collection of one or more ActualFleetDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL FLEET DIMENSIONS information. + + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 68aff5e..90b4518 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,145 +53,165 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index c09ed31..fea9e09 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,10 +1,11 @@ - + + - + - + - + @@ -80,7 +81,7 @@ Rail transport, Roads and Road transport - + @@ -123,7 +124,7 @@ Rail transport, Roads and Road transport - + @@ -158,6 +159,7 @@ Rail transport, Roads and Road transport + @@ -166,6 +168,7 @@ Rail transport, Roads and Road transport + @@ -219,4 +222,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd index cc2619b..a94edab 100644 --- a/xsd/opra_service/opra_all_services.xsd +++ b/xsd/opra_service/opra_all_services.xsd @@ -1,11 +1,13 @@ + - + + @@ -59,4 +61,4 @@ Common OpRa services include node for OpRa schema - + \ No newline at end of file diff --git a/xsd/opra_service/opra_service_fleetDimensions.xsd b/xsd/opra_service/opra_service_fleetDimensions.xsd new file mode 100644 index 0000000..38a076b --- /dev/null +++ b/xsd/opra_service/opra_service_fleetDimensions.xsd @@ -0,0 +1,143 @@ + + + + + + + + + + + + + main schema + e-fleet developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_fleet/opra_fleet_fleetDimensions.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus fleets, Coach fleets, Bus stops and stations, + Rail transport, Railway stations and track, Train fleets, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Raw Data Exchange + Standard + + + OpRa PLANNED / ACTUAL FLEET DIMENSIONS Request / Discovery schema. + + + + A request element to get PLANNED FLEET DIMENSIONS. + + + + + A request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the request element to get FLEET DIMENSIONS. + + + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for FLEET DIMENSIONS. + + + + + + + + A discovery request element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery request element to get FLEET DIMENSIONS. + + + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for FLEET DIMENSIONS. + + + + + + + + A discovery delivery element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery delivery element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery delivery element to get FLEET DIMENSIONS. + + + + + + + + + + Specific data content of a discovery delivery for FLEET DIMENSIONS. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + \ No newline at end of file From 8ea8607e1478c23277fdc35243dcf86e9eda617c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Feb 2026 13:01:11 +0000 Subject: [PATCH 15/43] Lint and update documentation tables --- .../opra_ptScope_support.xsd | 3 +- xsd/opra_imports/opra_netex_imports.xsd | 3 +- .../opra_fleetDimensions_version.xsd | 5 +- .../opra_serviceDimensions_version.xsd | 350 +++++++++--------- .../opra_serviceIntensity_version.xsd | 5 +- xsd/opra_service/opra_all_services.xsd | 3 +- .../opra_service_fleetDimensions.xsd | 3 +- 7 files changed, 183 insertions(+), 189 deletions(-) diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index 4e73233..0a5e61a 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -1,5 +1,4 @@ - - + diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index d238e05..7b35b7e 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,5 +1,4 @@ - @@ -70,4 +69,4 @@ Common NeTEx import node for OpRa schema - \ No newline at end of file + diff --git a/xsd/opra_indicators/opra_fleetDimensions_version.xsd b/xsd/opra_indicators/opra_fleetDimensions_version.xsd index 9cd2ef9..18e1ec2 100644 --- a/xsd/opra_indicators/opra_fleetDimensions_version.xsd +++ b/xsd/opra_indicators/opra_fleetDimensions_version.xsd @@ -1,5 +1,4 @@ - - + @@ -210,4 +209,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 90b4518..15f7974 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,165 +53,165 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. - - - - - The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-element level. - - - - - The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-train level. - - - - - The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-train level. - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - \ No newline at end of file + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index fea9e09..35af67b 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,5 +1,4 @@ - - + @@ -222,4 +221,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd index a94edab..1865998 100644 --- a/xsd/opra_service/opra_all_services.xsd +++ b/xsd/opra_service/opra_all_services.xsd @@ -1,5 +1,4 @@ - @@ -61,4 +60,4 @@ Common OpRa services include node for OpRa schema - \ No newline at end of file + diff --git a/xsd/opra_service/opra_service_fleetDimensions.xsd b/xsd/opra_service/opra_service_fleetDimensions.xsd index 38a076b..59238aa 100644 --- a/xsd/opra_service/opra_service_fleetDimensions.xsd +++ b/xsd/opra_service/opra_service_fleetDimensions.xsd @@ -1,5 +1,4 @@ - @@ -140,4 +139,4 @@ - \ No newline at end of file + From 9bf34f1922bbfffcb9e53339843453eabd6f8ac4 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 4 Feb 2026 02:57:19 +0100 Subject: [PATCH 16/43] Oxygen project file created. Delayed and cancelled journey example extended with events. --- OpRa.xpr | 103 +++++++++++++++++ .../DelayedAndCancelledJourneysWithEvents.xml | 109 ++++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 OpRa.xpr create mode 100644 examples/DelayedAndCancelledJourneysWithEvents.xml diff --git a/OpRa.xpr b/OpRa.xpr new file mode 100644 index 0000000..0df8ddf --- /dev/null +++ b/OpRa.xpr @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/DelayedAndCancelledJourneysWithEvents.xml b/examples/DelayedAndCancelledJourneysWithEvents.xml new file mode 100644 index 0000000..080bf1d --- /dev/null +++ b/examples/DelayedAndCancelledJourneysWithEvents.xml @@ -0,0 +1,109 @@ + + + + 2025-03-22T00:05:00Z + + + 2025-03-22T00:05:00Z + Extended example of delayed and cancelled journeys with triggers and operational events. + + + + 2025-03-16T00:00:00 + 2025-03-18T23:59:59 + + Cleansed + + + + + + PT5M + + + LateReturnVehicleEvent + eid315 + Late arrival bus V110 + + + + + + + + PT8M + + + Incident + eid319 + Traffic incident at intersection B02 + + + + + + + + + JourneyCancellation + + + ServiceCancellationEvent + eid312 + + + false + + + + + + JourneyCreation + + + ReportDamageToVehicleEvent + eid730 + vehicle tire damage + + + true + + + + + + + + + + PT10M + false + 72 + 0.9730 + + + + PT10M + true + PT20M + false + 2 + 0.0270 + + + + + + + 3 + 0.0405 + + + + + + + + From e493dcdb007fbb614b526640a3886a05ff4f1684 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 4 Feb 2026 03:18:53 +0100 Subject: [PATCH 17/43] Update examples/DelayedAndCancelledJourneysWithEvents.xml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- examples/DelayedAndCancelledJourneysWithEvents.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/DelayedAndCancelledJourneysWithEvents.xml b/examples/DelayedAndCancelledJourneysWithEvents.xml index 080bf1d..62f9c55 100644 --- a/examples/DelayedAndCancelledJourneysWithEvents.xml +++ b/examples/DelayedAndCancelledJourneysWithEvents.xml @@ -60,7 +60,7 @@ - JourneyCreation + JourneyCancellation ReportDamageToVehicleEvent From 7588b168caf85447bc19819c3747a19bc0c0610f Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 4 Feb 2026 03:19:26 +0100 Subject: [PATCH 18/43] Update examples/DelayedAndCancelledJourneysWithEvents.xml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- examples/DelayedAndCancelledJourneysWithEvents.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/DelayedAndCancelledJourneysWithEvents.xml b/examples/DelayedAndCancelledJourneysWithEvents.xml index 62f9c55..bb85ec5 100644 --- a/examples/DelayedAndCancelledJourneysWithEvents.xml +++ b/examples/DelayedAndCancelledJourneysWithEvents.xml @@ -46,7 +46,6 @@ - JourneyCancellation From 39263aca9d2a8a6dee9355f3da4e75ffe073ad6c Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 4 Feb 2026 03:19:52 +0100 Subject: [PATCH 19/43] Update OpRa.xpr Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- OpRa.xpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpRa.xpr b/OpRa.xpr index 0df8ddf..c1258c7 100644 --- a/OpRa.xpr +++ b/OpRa.xpr @@ -27,7 +27,7 @@ - + From f118b1d3bc858382a515045cf60efa8f22aad8e2 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 4 Feb 2026 03:20:13 +0100 Subject: [PATCH 20/43] Update OpRa.xpr Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- OpRa.xpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpRa.xpr b/OpRa.xpr index c1258c7..d336599 100644 --- a/OpRa.xpr +++ b/OpRa.xpr @@ -25,7 +25,7 @@ - + From c37dfb182803a1e09ef84d50abc4c9058fa5568c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 22:09:09 +0000 Subject: [PATCH 21/43] Lint and update documentation tables --- examples/DelayedAndCancelledJourneysWithEvents.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/DelayedAndCancelledJourneysWithEvents.xml b/examples/DelayedAndCancelledJourneysWithEvents.xml index bb85ec5..4f9efe9 100644 --- a/examples/DelayedAndCancelledJourneysWithEvents.xml +++ b/examples/DelayedAndCancelledJourneysWithEvents.xml @@ -1,7 +1,5 @@ - + 2025-03-22T00:05:00Z From 7ca5fcabb33d2599b738bb7e07a07e7dadbb1d86 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 11 Feb 2026 00:27:14 +0100 Subject: [PATCH 22/43] Release Candidate functional content for 1.0 - added VehicleMode to PT SCOPE - added FleetScopeGroup filtering capability to every indicator - added CONTEXTUAL INDICATOR frame, indicators, service layer elements (Request, Discovery, Discovery Delivery) --- OpRa.spp | 1 + .../opra_contextualIndicatorFrame_version.xsd | 218 ++++----- .../opra_GeneralKpi_version.xsd | 101 ---- ...pra_GenericContextualIndicator_version.xsd | 125 +++++ .../opra_ptScope_support.xsd | 136 +++--- ...a_cancelledDatedVehicleJourney_version.xsd | 1 + xsd/opra_indicators/opra_capacity_version.xsd | 1 + .../opra_expectedPassengerCount_version.xsd | 1 + .../opra_externalPassengerCount_version.xsd | 1 + .../opra_lateDatedVehicleJourney_version.xsd | 1 + ...boardDeviceBasedPassengerCount_version.xsd | 1 + .../opra_serviceDimensions_version.xsd | 349 ++++++------- .../opra_serviceIntensity_version.xsd | 458 +++++++++++------- ...a_ticketingBasedPassengerCount_version.xsd | 1 + .../opra_validationEntry_version.xsd | 1 + xsd/opra_request.xsd | 40 +- xsd/opra_service/opra_all_services.xsd | 1 + .../opra_service_contextualIndicators.xsd | 127 +++++ xsd/opra_service/opra_service_kpis.xsd | 75 --- 19 files changed, 908 insertions(+), 731 deletions(-) delete mode 100644 xsd/opra_framework/opra_genericFramework/opra_GeneralKpi_version.xsd create mode 100644 xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd create mode 100644 xsd/opra_service/opra_service_contextualIndicators.xsd delete mode 100644 xsd/opra_service/opra_service_kpis.xsd diff --git a/OpRa.spp b/OpRa.spp index e7d9e4e..2ffff4c 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -809,6 +809,7 @@ + diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index 4eac93e..ef39743 100644 --- a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + main schema e-service developers @@ -47,115 +47,93 @@ Standard - CONTEXTUAL INDICATOR FRAME types for OpRa. - - - - - Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - - - - - - - Contextual information for the CONTEXTUAL INDICATORs within the frame. - - - - - An identifier that is recognizable by producer and consumer systems (eg. set by an agreement) - - - - - A version identifier within the domain of the context identifier. - - - - - A key/value list recognizable within the context domain. Might contain aggregation details. - - - - - - - Elements for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - Indicators in a CONTEXTUAL INDICATOR FRAME. - - - - - - - + CONTEXTUAL INDICATOR FRAME types for OpRa. + + + + + Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + + + + + + + Elements for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + Indicators in a CONTEXTUAL INDICATOR FRAME. + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_genericFramework/opra_GeneralKpi_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GeneralKpi_version.xsd deleted file mode 100644 index e2d834c..0000000 --- a/xsd/opra_framework/opra_genericFramework/opra_GeneralKpi_version.xsd +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_genericFramework/opra_generalKpi_version.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operation Raw Data Exchange - Standard - - - OpRa generic presentation of KEY PERFORMANCE INDICATORs - - - - - Dummy Supertype for a KEY PERFORMANCE INDICATOR. - - - - - - - - - - - - A collection of one or more KEY PERFORMANCE INDICATORs - - - - - A key performance INDICATOR. - - - - - - - Context definition, indicator value and unit of measure for a key performance INDICATOR. - - - - - A recognizable identifier of the KPI within the context domain. - - - - - A list of key/value pairs recognizable within the context domain. - - - - - - - diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd new file mode 100644 index 0000000..c1d8645 --- /dev/null +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -0,0 +1,125 @@ + + + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_genericFramework/opra_genericContextualIndicator_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa generic presentation of CONTEXTUAL INDICATORs + + + + Contextual information for the CONTEXTUAL INDICATORs within the frame. + + + + + An identifier that is recognizable by producer and consumer systems (eg. set by a regulation or an agreement) + + + + + A version identifier within the domain of the context identifier. + + + + + A key/value list recognizable within the context domain. Might contain aggregation details. + + + + + + + + + + + + + + Dummy Supertype for a CONTEXTUAL INDICATOR. + + + + + + + + + + + + Context definition, indicator value and unit of measure for a CONTEXTUAL INDICATOR. + + + + + A recognizable identifier of the CONTEXTUAL INDICATOR within the context domain. + + + + + + + + + + A collection of one or more CONTEXTUAL INDICATORs + + + + + A CONTEXTUAL INDICATOR in the collection. + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index 4e73233..74918b2 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -1,13 +1,12 @@ - - + - - - - - - - + + + + + + + main schema e-service developers @@ -49,61 +48,64 @@ Rail transport, Roads and Road transport Standard - OpRa: PT SCOPE related definitions. - - - - - Identifier of a PT SCOPE. - - - - - - - PT SCOPE structure. - - - - - Authority organisation scope (optional). - - - - - Operator organisation scope (optional). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + OpRa: PT SCOPE related definitions. + + + + + Identifier of a PT SCOPE. + + + + + + + PT SCOPE structure. + + + + + Authority organisation scope (optional). + + + + + Operator organisation scope (optional). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index 85fada7..301d322 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -138,6 +138,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd index be374e3..9c823a2 100644 --- a/xsd/opra_indicators/opra_capacity_version.xsd +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -158,6 +158,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd index 5b5ef30..1a86284 100644 --- a/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd @@ -127,6 +127,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd index 7b013d1..fe71773 100644 --- a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd @@ -116,6 +116,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index 39e2280..764a6e4 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -158,6 +158,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd index 1b98635..1d8d504 100644 --- a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -120,6 +120,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 90b4518..709f031 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,17 +1,18 @@ - + + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,165 +54,165 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceDimensions - - - - - - - Reference element of an PLANNED SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE DIMENSIONS. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. - - - - - The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-element level. - - - - - The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-train level. - - - - - The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-train level. - - - - - - - A collection of one or more PlannedServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. - - - - - - - A collection of one or more ActualServiceDimensions elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. - - - - + OpRa PlannedServiceDimensions + + + + + + + Reference element of an PLANNED SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE DIMENSIONS. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE DIMENSIONS information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-element level. + + + + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + The total length of SERVICE JOURNEYs (DEAD RUNs not included) within the scope. TRAIN ELEMENTs shall be considered on per-train level. + + + + + + + A collection of one or more PlannedServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE DIMENSIONS information. + + + + + + + A collection of one or more ActualServiceDimensions elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE DIMENSIONS information. + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index fea9e09..3fa87ce 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,18 +1,17 @@ - - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -54,172 +53,267 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceIntensity - - - - - - - Reference element of an PLANNED SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A collection of one or more PlannedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - A collection of one or more ActualServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an EXPECTED SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mean passenger (and other transported unit) count per total journey distance [capita/m] + + + + + + + + + + Total loaded transport performance [passenger-meter] within the scope. + + + + + + + + + + Average loaded transport performance [passenger-meter/vehicle] within the scope. + + + + + + + + + + + Shared structure for capacity-related values over different distance types. + + + + + + + + + Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + A collection of one or more ExpectedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd index 5e5c8dc..6a18272 100644 --- a/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd @@ -119,6 +119,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_indicators/opra_validationEntry_version.xsd b/xsd/opra_indicators/opra_validationEntry_version.xsd index 6bb998e..56cdf22 100644 --- a/xsd/opra_indicators/opra_validationEntry_version.xsd +++ b/xsd/opra_indicators/opra_validationEntry_version.xsd @@ -87,6 +87,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 22503cb..7dfd36d 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,10 +1,10 @@ - + - + - + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_contextualIndicators.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operational Raw Data Exchange + Standard + + + OpRa CONTEXTUAL INDICATORs Request schema + + + + A request element to get KPIs. + + + + + Type for the request element to get KPIs. + + + + + + + + + + References that extend filtering capabilities of requests for KPIs. + + + + + + + + + + + + + + + + + A request element to get KPIs. + + + + + Type for the request element to get KPIs. + + + + + + + + + + A request element to get CONTEXTUAL INDICATORs. + + + + + Type for the request element to get CONTEXTUAL INDICATORs. + + + + + + + + + + Specific data content of a discovery delivery for CONTEXTUAL INDICATORs. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + \ No newline at end of file diff --git a/xsd/opra_service/opra_service_kpis.xsd b/xsd/opra_service/opra_service_kpis.xsd deleted file mode 100644 index 349888f..0000000 --- a/xsd/opra_service/opra_service_kpis.xsd +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_payload_delivery.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, - Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operational Raw Data Exchange - Standard - - - OpRa KEY PERFORMANCE INDICATORs Request schema - - - - A request element to get KPIs. - - - - - Type for the request element to get KPIs. - - - - - - - - - - References that extend filtering capabilities of requests for KPIs. - - - - - - From a50ac235bce997a9ddaa922cae14f146cfe508ad Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 11 Feb 2026 02:03:06 +0100 Subject: [PATCH 23/43] validation fix --- xsd/opra_request.xsd | 605 +++++++++--------- xsd/opra_service/opra_service_capacity.xsd | 186 +++--- .../opra_service_fleetDimensions.xsd | 194 +++--- 3 files changed, 487 insertions(+), 498 deletions(-) diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 7dfd36d..1f2ad16 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,18 +1,18 @@ - + - - - - - - - + + + + + - - - - + + + + main schema e-service developers @@ -54,296 +54,293 @@ Standard - Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA - - - - - Generic context for all request messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - - - - Generic context for all response messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - OpRa generic problem for the whole delivery. - - - - - - ========================================== Request definitions ========================================== - - - - Main collection element for an OpRa (bulk) request. - - - - - Type for a collection of OpraFunctionalRequest elements. - - - - - - - - - - - - Basic request structure common for all OpRa functional service requests. - - - - - - - - - - Generic abstract OpRa request element. Substitute this element with topic-specific request elements. - - - - - Type for the generic abstract OpRa request. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Generic scope and preparedness state structures to be used in OpraFunctionalRequests. - - - - - - Collection of FRAMEs to form context(s) within a request. - - - - - Requested preparedness level for the delivered elements. - - - - - - - - - - Type for a collection of OpraRequests. - - - - - - - - Abstract delivery element, responding for OpraRequest elements. - - - - - Type for the abstract OpRa delivery element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element for Opra related errors. - - - - - Type for Opra Errors. - - - - - - - - ProblemDetailGroup - - - - - - - - - - Detailed description of the problem. - - - - - Explanation of the problem. - - - - - Additional log data. - - - - + Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA + + + + + Generic context for all request messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + + + + Generic context for all response messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + OpRa generic problem for the whole delivery. + + + + + + ========================================== Request definitions ========================================== + + + + Main collection element for an OpRa (bulk) request. + + + + + Type for a collection of OpraFunctionalRequest elements. + + + + + + + + + + + + Basic request structure common for all OpRa functional service requests. + + + + + + + + + + Generic abstract OpRa request element. Substitute this element with topic-specific request elements. + + + + + Type for the generic abstract OpRa request. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generic scope and preparedness state structures to be used in OpraFunctionalRequests. + + + + + + Collection of FRAMEs to form context(s) within a request. + + + + + Requested preparedness level for the delivered elements. + + + + + + + + + + Type for a collection of OpraRequests. + + + + + + + + Abstract delivery element, responding for OpraRequest elements. + + + + + Type for the abstract OpRa delivery element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + \ No newline at end of file diff --git a/xsd/opra_service/opra_service_capacity.xsd b/xsd/opra_service/opra_service_capacity.xsd index 0d1cca0..3c43306 100644 --- a/xsd/opra_service/opra_service_capacity.xsd +++ b/xsd/opra_service/opra_service_capacity.xsd @@ -1,13 +1,13 @@ - + - - - - - - - - + + + + + + + + main schema e-service developers @@ -49,88 +49,86 @@ Standard - OpRa PLANNED / ACTUAL CAPACITY Request / Discovery schema. - - - - A request element to get PLANNED CAPACITIes. - - - - - A request element to get ACTUAL CAPACITIes. - - - - - Type for the request element to get CAPACITIes. - - - - - - - - Currently empty placeholder for extending filtering capabilites of requests for CAPACITIes. - - - - - - A discovery request element to get PLANNED CAPACITIes. - - - - - A discovery request element to get ACTUAL CAPACITIes. - - - - - Type for the discovery request element to get CAPACITIes. - - - - - - - - - - Currently empty placeholder for extending filtering capabilities of discovery requests for CAPACITIes. - - - - - - A discovery delivery element to get PLANNED CAPACITIes. - - - - - A discovery delivery element to get ACTUAL CAPACITIes. - - - - - Type for the discovery delivery element to get CAPACITIes. - - - - - - - - - - Specific data content of a discovery delivery for CAPACITIes. - - - - - Collection of OPERATING DAYS that have data within the discovery request's scope. - - - - - + OpRa PLANNED / ACTUAL CAPACITY Request / Discovery schema. + + + + A request element to get PLANNED CAPACITIes. + + + + + A request element to get ACTUAL CAPACITIes. + + + + + Type for the request element to get CAPACITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for CAPACITIes. + + + + + + A discovery request element to get PLANNED CAPACITIes. + + + + + A discovery request element to get ACTUAL CAPACITIes. + + + + + Type for the discovery request element to get CAPACITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for CAPACITIes. + + + + + + A discovery delivery element to get PLANNED CAPACITIes. + + + + + A discovery delivery element to get ACTUAL CAPACITIes. + + + + + Type for the discovery delivery element to get CAPACITIes. + + + + + + + + + + Specific data content of a discovery delivery for CAPACITIes. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + \ No newline at end of file diff --git a/xsd/opra_service/opra_service_fleetDimensions.xsd b/xsd/opra_service/opra_service_fleetDimensions.xsd index 59238aa..7033f7f 100644 --- a/xsd/opra_service/opra_service_fleetDimensions.xsd +++ b/xsd/opra_service/opra_service_fleetDimensions.xsd @@ -1,13 +1,13 @@ - + - - - - - - - - + + + + + + + + main schema e-fleet developers @@ -49,94 +49,88 @@ Standard - OpRa PLANNED / ACTUAL FLEET DIMENSIONS Request / Discovery schema. - - - - A request element to get PLANNED FLEET DIMENSIONS. - - - - - A request element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the request element to get FLEET DIMENSIONS. - - - - - - - - - - Currently empty placeholder for extending filtering capabilites of requests for FLEET DIMENSIONS. - - - - - - - - A discovery request element to get PLANNED FLEET DIMENSIONS. - - - - - A discovery request element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the discovery request element to get FLEET DIMENSIONS. - - - - - - - - - - Currently empty placeholder for extending filtering capabilities of discovery requests for FLEET DIMENSIONS. - - - - - - - - A discovery delivery element to get PLANNED FLEET DIMENSIONS. - - - - - A discovery delivery element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the discovery delivery element to get FLEET DIMENSIONS. - - - - - - - - - - Specific data content of a discovery delivery for FLEET DIMENSIONS. - - - - - Collection of OPERATING DAYS that have data within the discovery request's scope. - - - - - + OpRa PLANNED / ACTUAL FLEET DIMENSIONS Request / Discovery schema. + + + + A request element to get PLANNED FLEET DIMENSIONS. + + + + + A request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the request element to get FLEET DIMENSIONS. + + + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for FLEET DIMENSIONS. + + + + + + A discovery request element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery request element to get FLEET DIMENSIONS. + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for FLEET DIMENSIONS. + + + + + + A discovery delivery element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery delivery element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery delivery element to get FLEET DIMENSIONS. + + + + + + + + + + Specific data content of a discovery delivery for FLEET DIMENSIONS. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + \ No newline at end of file From 1f961e1b0b94d9c623f84a72d2ea232c476c32bf Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 11 Feb 2026 02:12:43 +0100 Subject: [PATCH 24/43] Trying Validation fix - to fix GitHub-side validation failure --- xsd/opra.xsd | 15 +- ...pra_GenericContextualIndicator_version.xsd | 162 +++-- xsd/opra_request.xsd | 604 +++++++++--------- .../opra_service_contextualIndicators.xsd | 169 ++--- 4 files changed, 471 insertions(+), 479 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 6799420..94420d2 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,16 +1,11 @@ + - + - + - - @@ -222,7 +217,7 @@ - + Whether there is a further delivery message with more current updates that follows this one. Default is 'false'. @@ -323,4 +318,4 @@ - + \ No newline at end of file diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index c1d8645..7df3eaf 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -1,16 +1,14 @@ - + + - - - - - - - - - + + + + + + + + main schema e-service developers @@ -52,74 +50,74 @@ Rail transport, Roads and Road transport Standard - OpRa generic presentation of CONTEXTUAL INDICATORs - - - - Contextual information for the CONTEXTUAL INDICATORs within the frame. - - - - - An identifier that is recognizable by producer and consumer systems (eg. set by a regulation or an agreement) - - - - - A version identifier within the domain of the context identifier. - - - - - A key/value list recognizable within the context domain. Might contain aggregation details. - - - - - - - - - - - - - - Dummy Supertype for a CONTEXTUAL INDICATOR. - - - - - - - - - - - - Context definition, indicator value and unit of measure for a CONTEXTUAL INDICATOR. - - - - - A recognizable identifier of the CONTEXTUAL INDICATOR within the context domain. - - - - - - - - - - A collection of one or more CONTEXTUAL INDICATORs - - - - - A CONTEXTUAL INDICATOR in the collection. - - - - + OpRa generic presentation of CONTEXTUAL INDICATORs + + + + Contextual information for the CONTEXTUAL INDICATORs within the frame. + + + + + An identifier that is recognizable by producer and consumer systems (eg. set by a regulation or an agreement) + + + + + A version identifier within the domain of the context identifier. + + + + + A key/value list recognizable within the context domain. Might contain aggregation details. + + + + + + + + + + + + + + Dummy Supertype for a CONTEXTUAL INDICATOR. + + + + + + + + + + + + Context definition, indicator value and unit of measure for a CONTEXTUAL INDICATOR. + + + + + A recognizable identifier of the CONTEXTUAL INDICATOR within the context domain. + + + + + + + + + + A collection of one or more CONTEXTUAL INDICATORs + + + + + A CONTEXTUAL INDICATOR in the collection. + + + + \ No newline at end of file diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 1f2ad16..c443283 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,18 +1,16 @@ - + + - - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -54,293 +52,293 @@ Standard - Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA - - - - - Generic context for all request messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - - - - Generic context for all response messages. - - - - - Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. - - - - - OpRa generic problem for the whole delivery. - - - - - - ========================================== Request definitions ========================================== - - - - Main collection element for an OpRa (bulk) request. - - - - - Type for a collection of OpraFunctionalRequest elements. - - - - - - - - - - - - Basic request structure common for all OpRa functional service requests. - - - - - - - - - - Generic abstract OpRa request element. Substitute this element with topic-specific request elements. - - - - - Type for the generic abstract OpRa request. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Generic scope and preparedness state structures to be used in OpraFunctionalRequests. - - - - - - Collection of FRAMEs to form context(s) within a request. - - - - - Requested preparedness level for the delivered elements. - - - - - - - - - - Type for a collection of OpraRequests. - - - - - - - - Abstract delivery element, responding for OpraRequest elements. - - - - - Type for the abstract OpRa delivery element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element for Opra related errors. - - - - - Type for Opra Errors. - - - - - - - - ProblemDetailGroup - - - - - - - - - - Detailed description of the problem. - - - - - Explanation of the problem. - - - - - Additional log data. - - - - + Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA + + + + + Generic context for all request messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + + + + Generic context for all response messages. + + + + + Identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems. + + + + + OpRa generic problem for the whole delivery. + + + + + + ========================================== Request definitions ========================================== + + + + Main collection element for an OpRa (bulk) request. + + + + + Type for a collection of OpraFunctionalRequest elements. + + + + + + + + + + + + Basic request structure common for all OpRa functional service requests. + + + + + + + + + + Generic abstract OpRa request element. Substitute this element with topic-specific request elements. + + + + + Type for the generic abstract OpRa request. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generic scope and preparedness state structures to be used in OpraFunctionalRequests. + + + + + + Collection of FRAMEs to form context(s) within a request. + + + + + Requested preparedness level for the delivered elements. + + + + + + + + + + Type for a collection of OpraRequests. + + + + + + + + Abstract delivery element, responding for OpraRequest elements. + + + + + Type for the abstract OpRa delivery element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + \ No newline at end of file diff --git a/xsd/opra_service/opra_service_contextualIndicators.xsd b/xsd/opra_service/opra_service_contextualIndicators.xsd index fdacd91..2a0e51d 100644 --- a/xsd/opra_service/opra_service_contextualIndicators.xsd +++ b/xsd/opra_service/opra_service_contextualIndicators.xsd @@ -1,12 +1,13 @@ - + + - - - - - - - + + + + + + + main schema e-service developers @@ -48,80 +49,80 @@ Standard - OpRa CONTEXTUAL INDICATORs Request schema - - - - A request element to get KPIs. - - - - - Type for the request element to get KPIs. - - - - - - - - - - References that extend filtering capabilities of requests for KPIs. - - - - - - - - - - - - - - - - - A request element to get KPIs. - - - - - Type for the request element to get KPIs. - - - - - - - - - - A request element to get CONTEXTUAL INDICATORs. - - - - - Type for the request element to get CONTEXTUAL INDICATORs. - - - - - - - - - - Specific data content of a discovery delivery for CONTEXTUAL INDICATORs. - - - - - Collection of OPERATING DAYS that have data within the discovery request's scope. - - - - + OpRa CONTEXTUAL INDICATORs Request schema + + + + A request element to get KPIs. + + + + + Type for the request element to get KPIs. + + + + + + + + + + References that extend filtering capabilities of requests for KPIs. + + + + + + + + + + + + + + + + + A request element to get KPIs. + + + + + Type for the request element to get KPIs. + + + + + + + + + + A request element to get CONTEXTUAL INDICATORs. + + + + + Type for the request element to get CONTEXTUAL INDICATORs. + + + + + + + + + + Specific data content of a discovery delivery for CONTEXTUAL INDICATORs. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + \ No newline at end of file From f9bc2f8a43e0a04a646fbbbe5dcc5306c4ec8c26 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Feb 2026 01:14:17 +0000 Subject: [PATCH 25/43] Lint and update documentation tables --- xsd/opra.xsd | 3 +- .../opra_contextualIndicatorFrame_version.xsd | 196 +++---- ...pra_GenericContextualIndicator_version.xsd | 5 +- .../opra_ptScope_support.xsd | 138 ++--- .../opra_serviceIntensity_version.xsd | 550 +++++++++--------- xsd/opra_request.xsd | 5 +- xsd/opra_service/opra_service_capacity.xsd | 184 +++--- .../opra_service_contextualIndicators.xsd | 5 +- .../opra_service_fleetDimensions.xsd | 188 +++--- 9 files changed, 635 insertions(+), 639 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 94420d2..9de3cc6 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,5 +1,4 @@ - @@ -318,4 +317,4 @@ - \ No newline at end of file + diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index ef39743..7fc7d08 100644 --- a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + main schema e-service developers @@ -47,93 +47,93 @@ Standard - CONTEXTUAL INDICATOR FRAME types for OpRa. - - - - - Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - - - - - - - - - Elements for an OpRa CONTEXTUAL INDICATOR FRAME. - - - - - - - - - Indicators in a CONTEXTUAL INDICATOR FRAME. - - - - - - - \ No newline at end of file + CONTEXTUAL INDICATOR FRAME types for OpRa. + + + + + Type for identifier of an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + Reference element to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + Type for a reference to an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + A coherent set of CONTEXTUAL INDICATORs to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + + + + + + + + + Elements for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + + + Indicators in a CONTEXTUAL INDICATOR FRAME. + + + + + + + diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index 7df3eaf..b8ee710 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -1,5 +1,4 @@ - - + @@ -120,4 +119,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd index e011a1e..3974524 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + main schema e-service developers @@ -48,64 +48,64 @@ Rail transport, Roads and Road transport Standard - OpRa: PT SCOPE related definitions. - - - - - Identifier of a PT SCOPE. - - - - - - - PT SCOPE structure. - - - - - Authority organisation scope (optional). - - - - - Operator organisation scope (optional). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + OpRa: PT SCOPE related definitions. + + + + + Identifier of a PT SCOPE. + + + + + + + PT SCOPE structure. + + + + + Authority organisation scope (optional). + + + + + Operator organisation scope (optional). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index 4d4f67c..cd2677e 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,17 +1,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,267 +53,267 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceIntensity - - - - - - - Reference element of an PLANNED SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an EXPECTED SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mean passenger (and other transported unit) count per total journey distance [capita/m] - - - - - - - - - - Total loaded transport performance [passenger-meter] within the scope. - - - - - - - - - - Average loaded transport performance [passenger-meter/vehicle] within the scope. - - - - - - - - - - - Shared structure for capacity-related values over different distance types. - - - - - - - - - Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. - - - - - A collection of one or more PlannedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - A collection of one or more ActualServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - A collection of one or more ExpectedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an EXPECTED SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mean passenger (and other transported unit) count per total journey distance [capita/m] + + + + + + + + + + Total loaded transport performance [passenger-meter] within the scope. + + + + + + + + + + Average loaded transport performance [passenger-meter/vehicle] within the scope. + + + + + + + + + + + Shared structure for capacity-related values over different distance types. + + + + + + + + + Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + A collection of one or more ExpectedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index c443283..1dac4e0 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,5 +1,4 @@ - - + @@ -341,4 +340,4 @@ - \ No newline at end of file + diff --git a/xsd/opra_service/opra_service_capacity.xsd b/xsd/opra_service/opra_service_capacity.xsd index 3c43306..b7b9aae 100644 --- a/xsd/opra_service/opra_service_capacity.xsd +++ b/xsd/opra_service/opra_service_capacity.xsd @@ -1,13 +1,13 @@ - + - - - - - - - - + + + + + + + + main schema e-service developers @@ -49,86 +49,86 @@ Standard - OpRa PLANNED / ACTUAL CAPACITY Request / Discovery schema. - - - - A request element to get PLANNED CAPACITIes. - - - - - A request element to get ACTUAL CAPACITIes. - - - - - Type for the request element to get CAPACITIes. - - - - - - - - Currently empty placeholder for extending filtering capabilites of requests for CAPACITIes. - - - - - - A discovery request element to get PLANNED CAPACITIes. - - - - - A discovery request element to get ACTUAL CAPACITIes. - - - - - Type for the discovery request element to get CAPACITIes. - - - - - - - - Currently empty placeholder for extending filtering capabilities of discovery requests for CAPACITIes. - - - - - - A discovery delivery element to get PLANNED CAPACITIes. - - - - - A discovery delivery element to get ACTUAL CAPACITIes. - - - - - Type for the discovery delivery element to get CAPACITIes. - - - - - - - - - - Specific data content of a discovery delivery for CAPACITIes. - - - - - Collection of OPERATING DAYS that have data within the discovery request's scope. - - - - - \ No newline at end of file + OpRa PLANNED / ACTUAL CAPACITY Request / Discovery schema. + + + + A request element to get PLANNED CAPACITIes. + + + + + A request element to get ACTUAL CAPACITIes. + + + + + Type for the request element to get CAPACITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for CAPACITIes. + + + + + + A discovery request element to get PLANNED CAPACITIes. + + + + + A discovery request element to get ACTUAL CAPACITIes. + + + + + Type for the discovery request element to get CAPACITIes. + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for CAPACITIes. + + + + + + A discovery delivery element to get PLANNED CAPACITIes. + + + + + A discovery delivery element to get ACTUAL CAPACITIes. + + + + + Type for the discovery delivery element to get CAPACITIes. + + + + + + + + + + Specific data content of a discovery delivery for CAPACITIes. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + diff --git a/xsd/opra_service/opra_service_contextualIndicators.xsd b/xsd/opra_service/opra_service_contextualIndicators.xsd index 2a0e51d..3eb48bb 100644 --- a/xsd/opra_service/opra_service_contextualIndicators.xsd +++ b/xsd/opra_service/opra_service_contextualIndicators.xsd @@ -1,5 +1,4 @@ - - + @@ -125,4 +124,4 @@ - \ No newline at end of file + diff --git a/xsd/opra_service/opra_service_fleetDimensions.xsd b/xsd/opra_service/opra_service_fleetDimensions.xsd index 7033f7f..04d2beb 100644 --- a/xsd/opra_service/opra_service_fleetDimensions.xsd +++ b/xsd/opra_service/opra_service_fleetDimensions.xsd @@ -1,13 +1,13 @@ - + - - - - - - - - + + + + + + + + main schema e-fleet developers @@ -49,88 +49,88 @@ Standard - OpRa PLANNED / ACTUAL FLEET DIMENSIONS Request / Discovery schema. - - - - A request element to get PLANNED FLEET DIMENSIONS. - - - - - A request element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the request element to get FLEET DIMENSIONS. - - - - - - - - - - Currently empty placeholder for extending filtering capabilites of requests for FLEET DIMENSIONS. - - - - - - A discovery request element to get PLANNED FLEET DIMENSIONS. - - - - - A discovery request element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the discovery request element to get FLEET DIMENSIONS. - - - - - - - - Currently empty placeholder for extending filtering capabilities of discovery requests for FLEET DIMENSIONS. - - - - - - A discovery delivery element to get PLANNED FLEET DIMENSIONS. - - - - - A discovery delivery element to get ACTUAL FLEET DIMENSIONS. - - - - - Type for the discovery delivery element to get FLEET DIMENSIONS. - - - - - - - - - - Specific data content of a discovery delivery for FLEET DIMENSIONS. - - - - - Collection of OPERATING DAYS that have data within the discovery request's scope. - - - - - \ No newline at end of file + OpRa PLANNED / ACTUAL FLEET DIMENSIONS Request / Discovery schema. + + + + A request element to get PLANNED FLEET DIMENSIONS. + + + + + A request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the request element to get FLEET DIMENSIONS. + + + + + + + + + + Currently empty placeholder for extending filtering capabilites of requests for FLEET DIMENSIONS. + + + + + + A discovery request element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery request element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery request element to get FLEET DIMENSIONS. + + + + + + + + Currently empty placeholder for extending filtering capabilities of discovery requests for FLEET DIMENSIONS. + + + + + + A discovery delivery element to get PLANNED FLEET DIMENSIONS. + + + + + A discovery delivery element to get ACTUAL FLEET DIMENSIONS. + + + + + Type for the discovery delivery element to get FLEET DIMENSIONS. + + + + + + + + + + Specific data content of a discovery delivery for FLEET DIMENSIONS. + + + + + Collection of OPERATING DAYS that have data within the discovery request's scope. + + + + + From 8dd61ac62fa44ae802a99a621b944c072153e02b Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 18 Feb 2026 02:34:36 +0100 Subject: [PATCH 26/43] ptScope XSD renamed ptScope_support.xsd renamed to filtering_support.xsd. some annotations added. --- OpRa.spp | 8 +++--- ...pra_GenericContextualIndicator_version.xsd | 14 ++++++++-- ...support.xsd => opra_filtering_support.xsd} | 2 +- ...a_cancelledDatedVehicleJourney_version.xsd | 2 +- xsd/opra_indicators/opra_capacity_version.xsd | 2 +- .../opra_externalPassengerCount_version.xsd | 2 +- .../opra_fleetDimensions_version.xsd | 26 +++++++++++++++---- .../opra_lateDatedVehicleJourney_version.xsd | 2 +- ...boardDeviceBasedPassengerCount_version.xsd | 2 +- .../opra_serviceDimensions_version.xsd | 2 +- .../opra_serviceIntensity_version.xsd | 2 +- .../opra_validationEntry_version.xsd | 2 +- 12 files changed, 45 insertions(+), 21 deletions(-) rename xsd/opra_framework/opra_reusableComponents/{opra_ptScope_support.xsd => opra_filtering_support.xsd} (96%) diff --git a/OpRa.spp b/OpRa.spp index 2ffff4c..b7ec1af 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -776,13 +776,13 @@ - + - + @@ -795,9 +795,7 @@ - - - + diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index 7df3eaf..26f3ce9 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -6,7 +6,7 @@ - + @@ -74,8 +74,15 @@ Rail transport, Roads and Road transport - + + + Representation of a generic CONTEXTUAL INDICATOR. + + + + Type definition for a generic CONTEXTUAL INDICATOR that implements the abstract CI without additions. + @@ -87,6 +94,9 @@ Rail transport, Roads and Road transport + + Type definition for an abstract CONTEXTUAL INDICATOR. + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd similarity index 96% rename from xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd rename to xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd index e011a1e..7e18aeb 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_ptScope_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd @@ -1,6 +1,6 @@ - + diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index 301d322..fe43504 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -8,7 +8,7 @@ - + - + diff --git a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd index fe71773..9361d1f 100644 --- a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd @@ -8,7 +8,7 @@ - + diff --git a/xsd/opra_indicators/opra_fleetDimensions_version.xsd b/xsd/opra_indicators/opra_fleetDimensions_version.xsd index 18e1ec2..0c44acf 100644 --- a/xsd/opra_indicators/opra_fleetDimensions_version.xsd +++ b/xsd/opra_indicators/opra_fleetDimensions_version.xsd @@ -1,4 +1,5 @@ + @@ -8,7 +9,7 @@ - + @@ -55,14 +56,20 @@ Rail transport, Roads and Road transport OpRa PlannedFleetDimensions + + Identifier of a PLANNED FLEET DIMENSIONS indicator. + - Reference element of an PLANNED FLEET DIMENSIONS. + Reference element of a PLANNED FLEET DIMENSIONS indicator. + + Type for a reference to a PLANNED FLEET DIMENSIONS indicator. + @@ -98,14 +105,20 @@ Rail transport, Roads and Road transport + + Identifier of an ACTUAL FLEET DIMENSIONS indicator. + - Reference element of an ACTUAL FLEET DIMENSIONS. + Reference element of an ACTUAL FLEET DIMENSIONS indicator. + + Type for a reference to an ACTIAL FLEET DIMENSIONS indicator. + @@ -153,7 +166,7 @@ Rail transport, Roads and Road transport - Static (same in each state) elements for an PlannedFleetDimensions (as a LOGGABLE OBJECT) + Static elements for a PlannedFleetDimensions (as a LOGGABLE OBJECT) @@ -162,6 +175,9 @@ Rail transport, Roads and Road transport + + Fleet-related indicator fields. + @@ -209,4 +225,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index 764a6e4..a80b7c0 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -8,7 +8,7 @@ - + - + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 18198d8..e7c3079 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -8,7 +8,7 @@ - + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index 4d4f67c..9692562 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -8,7 +8,7 @@ - + diff --git a/xsd/opra_indicators/opra_validationEntry_version.xsd b/xsd/opra_indicators/opra_validationEntry_version.xsd index 56cdf22..44149e7 100644 --- a/xsd/opra_indicators/opra_validationEntry_version.xsd +++ b/xsd/opra_indicators/opra_validationEntry_version.xsd @@ -6,7 +6,7 @@ - + From 14edd6a75fe45bfd10bc888e547a19e9854fe784 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Feb 2026 01:37:17 +0000 Subject: [PATCH 27/43] Lint and update documentation tables --- .../opra_filtering_support.xsd | 14 +++++------ .../opra_fleetDimensions_version.xsd | 3 +-- .../opra_serviceIntensity_version.xsd | 24 +++++++++---------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd index 6093162..e918e00 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + main schema e-service developers diff --git a/xsd/opra_indicators/opra_fleetDimensions_version.xsd b/xsd/opra_indicators/opra_fleetDimensions_version.xsd index 0c44acf..e841505 100644 --- a/xsd/opra_indicators/opra_fleetDimensions_version.xsd +++ b/xsd/opra_indicators/opra_fleetDimensions_version.xsd @@ -1,5 +1,4 @@ - @@ -225,4 +224,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index c1e2c83..8bf0c0c 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,17 +1,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers From a7d7390d139ed72972b70dafe1661caca4a84456 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Thu, 26 Feb 2026 21:51:44 +0100 Subject: [PATCH 28/43] New examples added. Oxygen project file updated. --- OpRa.xpr | 2 + examples/ActualServiceDimensions.xml | 47 +++++ examples/ExpectedServiceIntensity.xml | 185 ++++++++++++++++++ examples/PlannedServiceDimensions.xml | 47 +++++ examples/PlannedServiceIntensity.xml | 185 ++++++++++++++++++ .../opra_serviceDimensions_version.xsd | 2 +- 6 files changed, 467 insertions(+), 1 deletion(-) create mode 100644 examples/ActualServiceDimensions.xml create mode 100644 examples/ExpectedServiceIntensity.xml create mode 100644 examples/PlannedServiceDimensions.xml create mode 100644 examples/PlannedServiceIntensity.xml diff --git a/OpRa.xpr b/OpRa.xpr index d336599..bcc2cb9 100644 --- a/OpRa.xpr +++ b/OpRa.xpr @@ -10,6 +10,8 @@ + + diff --git a/examples/ActualServiceDimensions.xml b/examples/ActualServiceDimensions.xml new file mode 100644 index 0000000..8fbf438 --- /dev/null +++ b/examples/ActualServiceDimensions.xml @@ -0,0 +1,47 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Actual service dimensions example on the sample network. + + + Raw + + + + + + 17 + 1 + 2 + 89 + 1148 + 1097 + 0 + 0 + + + + + + + 9 + 1 + 1 + 21 + 276 + 258 + 0 + 0 + + + + + + + + diff --git a/examples/ExpectedServiceIntensity.xml b/examples/ExpectedServiceIntensity.xml new file mode 100644 index 0000000..a6b5d6d --- /dev/null +++ b/examples/ExpectedServiceIntensity.xml @@ -0,0 +1,185 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Expected service intensity example including all indicator elements and one-to-many relation in indicators. + + + Raw + + + + Expected service intensity for line-level operation later today. + + + + + bus + + + + + + + + + + + + selfPropelled + + standardClass + 760 + 410 + 335 + 8 + 6 + 6 + 1224 + + + standardClass + 400 + 220 + 170 + 4 + 3 + 3 + 612 + + + standardClass + 69 + 38 + 29 + 1 + 1 + 1 + 15 + + + standardClass + 50 + 33 + 16 + 1 + 1 + 1 + 15 + + + standardClass + 61200 + 40392 + 19584 + 1224 + 1224 + 1224 + 1224 + + + standardClass + 600 + 396 + 192 + 12 + 12 + 12 + 12 + 102 + + 8.55 + + + Expected service intensity for opposite direction during same period. + + + + + bus + + + + + + + + + + + + selfPropelled + + standardClass + 730 + 395 + 320 + 8 + 6 + 6 + 1170 + + + standardClass + 385 + 212 + 163 + 4 + 3 + 3 + 585 + + + standardClass + 67 + 36 + 29 + 1 + 1 + 1 + 15 + + + standardClass + 47 + 31 + 15 + 1 + 1 + 1 + 15 + + + standardClass + 54990 + 36270 + 17550 + 1170 + 1170 + 1170 + 1170 + + + standardClass + 589 + 389 + 188 + 12 + 12 + 12 + 12 + 98 + + 8.32 + + + + + + + + diff --git a/examples/PlannedServiceDimensions.xml b/examples/PlannedServiceDimensions.xml new file mode 100644 index 0000000..73711a2 --- /dev/null +++ b/examples/PlannedServiceDimensions.xml @@ -0,0 +1,47 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Planned service dimensions example on the sample network. + + + Raw + + + + + + 18 + 1 + 2 + 96 + 1260 + 1176 + 0 + 0 + + + + + + + 9 + 1 + 1 + 24 + 315 + 294 + 0 + 0 + + + + + + + + diff --git a/examples/PlannedServiceIntensity.xml b/examples/PlannedServiceIntensity.xml new file mode 100644 index 0000000..073ea23 --- /dev/null +++ b/examples/PlannedServiceIntensity.xml @@ -0,0 +1,185 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Planned service intensity example including all indicator elements and one-to-many relation in indicators. + + + Raw + + + + Planned service intensity for line-level weekday operation. + + + + + bus + + + + + + + + + + + + selfPropelled + + standardClass + 780 + 420 + 340 + 8 + 6 + 6 + 1260 + + + standardClass + 420 + 230 + 180 + 4 + 3 + 3 + 630 + + + standardClass + 70 + 38 + 30 + 1 + 1 + 1 + 15 + + + standardClass + 48 + 32 + 15 + 1 + 1 + 1 + 15 + + + standardClass + 57120 + 38080 + 17850 + 840 + 840 + 840 + 1260 + + + standardClass + 595 + 396 + 186 + 8 + 8 + 8 + 13 + 96 + + 8.75 + + + Planned service intensity for opposite direction in same timeband. + + + + + bus + + + + + + + + + + + + selfPropelled + + standardClass + 720 + 390 + 315 + 8 + 6 + 6 + 1188 + + + standardClass + 390 + 215 + 165 + 4 + 3 + 3 + 594 + + + standardClass + 68 + 37 + 29 + 1 + 1 + 1 + 15 + + + standardClass + 44 + 29 + 14 + 1 + 1 + 1 + 15 + + + standardClass + 52272 + 34506 + 16632 + 756 + 756 + 756 + 1188 + + + standardClass + 592 + 391 + 188 + 8 + 8 + 8 + 13 + 89 + + 8.40 + + + + + + + + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 18198d8..6a8a88f 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -154,7 +154,7 @@ Rail transport, Roads and Road transport - Static (same in each state) elements for an PlannedServiceDimensions (as a LOGGABLE OBJECT) + Static (same in each state) elements for a PlannedServiceDimensions and ActualServiceDimensions (as a LOGGABLE OBJECT) From 899ae323c05af50f83da883bec698012244d98d4 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Fri, 27 Feb 2026 11:14:07 +0100 Subject: [PATCH 29/43] capacity-related tweaks - see also: SystemOfUnits settings for distance unit. - enhanced Capacity specification elements - added capacity specification capability to SERVICE INTENSITY and descendant indicators. - CAPACITY and SERVICE INTENSITY annotations --- examples/PlannedCapacity.xml | 8 +- .../opra_indicatorFrame_version.xsd | 300 ++++----- xsd/opra_indicators/opra_capacity_version.xsd | 364 +++++------ .../opra_serviceIntensity_version.xsd | 573 +++++++++--------- 4 files changed, 640 insertions(+), 605 deletions(-) diff --git a/examples/PlannedCapacity.xml b/examples/PlannedCapacity.xml index decdd65..5d50638 100644 --- a/examples/PlannedCapacity.xml +++ b/examples/PlannedCapacity.xml @@ -10,9 +10,9 @@ - + nominalPerVehicleType - + 70 @@ -23,8 +23,8 @@ 125 1 - - + + Raw diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index 662398a..ab2415d 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -1,26 +1,26 @@ - + - - - - - + - - - - - - - - - - - - + + + + + + + + + main schema e-service developers @@ -62,135 +62,135 @@ Rail transport, Roads and Road transport Standard - OpRa INDICATOR FRAME types. - - - - - Type for identifier of a OpRa INDICATOR FRAME. - - - - - - Reference element to an OpRa INDICATOR FRAME. - - - - - Type for a reference to an OpRa INDICATOR FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa INDICATOR FRAME. - - - - - - - - - - - Raw data collections within the INDICATOR FRAME. - - - - - - - - - - - - - - - - - - + OpRa INDICATOR FRAME types. + + + + + Type for identifier of a OpRa INDICATOR FRAME. + + + + + + Reference element to an OpRa INDICATOR FRAME. + + + + + Type for a reference to an OpRa INDICATOR FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa INDICATOR FRAME. + + + + + + + + + + + Raw data collections within the INDICATOR FRAME. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd index 13cbd94..33e79de 100644 --- a/xsd/opra_indicators/opra_capacity_version.xsd +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,164 +53,180 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedCapacity - - - - - - - Reference element of an PLANNED CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedCapacity (as a LOGGABLE OBJECT) - - - - - - - - - - - - A collection of one or more PlannedCapacity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - A collection of one or more ActualCapacity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Common representation for an abstract OFFERED CAPACITY indicator. + + + + + + + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + Element providing capability to specify methods and capacity values for VEHICLE TYPEs. + + + + + + + + + + + Enumerates methods of specifying capacity for a VEHICLE TYPE. + + + + + + + + + Element to represent capacity values for a VEHICLE TYPE. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index 8bf0c0c..4257612 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,17 +1,18 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + main schema e-service developers @@ -53,267 +54,285 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceIntensity - - - - - - - Reference element of an PLANNED SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an EXPECTED SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. - - - - - - - - - - - - Static (same in each state) elements for an PlannedServiceIntensity (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mean passenger (and other transported unit) count per total journey distance [capita/m] - - - - - - - - - - Total loaded transport performance [passenger-meter] within the scope. - - - - - - - - - - Average loaded transport performance [passenger-meter/vehicle] within the scope. - - - - - - - - - - - Shared structure for capacity-related values over different distance types. - - - - - - - - - Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. - - - - - A collection of one or more PlannedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - A collection of one or more ActualServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - A collection of one or more ExpectedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - - + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an EXPECTED SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Representation of an abstract SERVICE INTENSITY. + + + + + + + + + + + Representation of capacity specification affecting indicator values. + + + + + + + + + + + + + + + + + + + Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of a NETWORK. + + + + + + + + + + Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of all ROUTEs considered. + + + + + + + + + + Average passenger (and other transported unit) capacity values provided per VEHICLE JOURNEY distance unit (see DefaultSystemOfUnits for the FRAME) + + + + + + + + + + Mean passenger (and other transported unit) count per total journey distance unit [capita/m] or [capita/km] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + Total loaded transport performance within the scope, measured in [passenger-meter] or [passenger-km] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + Average loaded transport performance measured in [passenger-meter/vehicle] or [passenger-km/vehicle] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + + Shared structure for capacity-related values over different distance types. + + + + + + + + + Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + A collection of one or more ExpectedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + \ No newline at end of file From 5eb6d262afe28a8b71740a2aedeb9eea232ed212 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 Feb 2026 10:15:42 +0000 Subject: [PATCH 30/43] Lint and update documentation tables --- .../opra_indicatorFrame_version.xsd | 300 ++++----- xsd/opra_indicators/opra_capacity_version.xsd | 380 +++++------ .../opra_serviceIntensity_version.xsd | 592 +++++++++--------- 3 files changed, 636 insertions(+), 636 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index ab2415d..c37eb03 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -1,26 +1,26 @@ - + - - - - - + - - - - - - - - - - - - + + + + + + + + + main schema e-service developers @@ -62,135 +62,135 @@ Rail transport, Roads and Road transport Standard - OpRa INDICATOR FRAME types. - - - - - Type for identifier of a OpRa INDICATOR FRAME. - - - - - - Reference element to an OpRa INDICATOR FRAME. - - - - - Type for a reference to an OpRa INDICATOR FRAME. - - - - - - - - - - Preparedness level to state reliability by the data producer. - - - - - - Preparedness level enumeration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a OpRa VERSION FRAME. - - - - - - - - - - - - Elements for a OpRa INDICATOR FRAME. - - - - - - - - - - - Raw data collections within the INDICATOR FRAME. - - - - - - - - - - - - - - - - - - \ No newline at end of file + OpRa INDICATOR FRAME types. + + + + + Type for identifier of a OpRa INDICATOR FRAME. + + + + + + Reference element to an OpRa INDICATOR FRAME. + + + + + Type for a reference to an OpRa INDICATOR FRAME. + + + + + + + + + + Preparedness level to state reliability by the data producer. + + + + + + Preparedness level enumeration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A coherent set of OpRa indicators to which the same frame VALIDITY CONDITIONs have been assigned. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a OpRa VERSION FRAME. + + + + + + + + + + + + Elements for a OpRa INDICATOR FRAME. + + + + + + + + + + + Raw data collections within the INDICATOR FRAME. + + + + + + + + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd index 33e79de..1389ce2 100644 --- a/xsd/opra_indicators/opra_capacity_version.xsd +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + main schema e-service developers @@ -53,180 +53,180 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedCapacity - - - - - - - Reference element of an PLANNED CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL CAPACITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - - - - - - Common representation for an abstract OFFERED CAPACITY indicator. - - - - - - - - - - - - - - - - A collection of one or more PlannedCapacity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. - - - - - - - A collection of one or more ActualCapacity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. - - - - - - - Element providing capability to specify methods and capacity values for VEHICLE TYPEs. - - - - - - - - - - - Enumerates methods of specifying capacity for a VEHICLE TYPE. - - - - - - - - - Element to represent capacity values for a VEHICLE TYPE. - - - - - - - - - - - - - - - \ No newline at end of file + OpRa PlannedCapacity + + + + + + + Reference element of an PLANNED CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL CAPACITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + + + + + + Common representation for an abstract OFFERED CAPACITY indicator. + + + + + + + + + + + + + + + + A collection of one or more PlannedCapacity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED CAPACITY information. + + + + + + + A collection of one or more ActualCapacity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL CAPACITY information. + + + + + + + Element providing capability to specify methods and capacity values for VEHICLE TYPEs. + + + + + + + + + + + Enumerates methods of specifying capacity for a VEHICLE TYPE. + + + + + + + + + Element to represent capacity values for a VEHICLE TYPE. + + + + + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index 4257612..ce94296 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + main schema e-service developers @@ -54,285 +54,285 @@ Rail transport, Roads and Road transport Standard - OpRa PlannedServiceIntensity - - - - - - - Reference element of an PLANNED SERVICE INTENSITY. - - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an ACTUAL SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference element of an EXPECTED SERVICE INTENSITY. - - - - - - - - - - - - Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. - - - - - - - - - - - - Representation of an abstract SERVICE INTENSITY. - - - - - - - - - - - Representation of capacity specification affecting indicator values. - - - - - - - - - - - - - - - - - - - Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of a NETWORK. - - - - - - - - - - Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of all ROUTEs considered. - - - - - - - - - - Average passenger (and other transported unit) capacity values provided per VEHICLE JOURNEY distance unit (see DefaultSystemOfUnits for the FRAME) - - - - - - - - - - Mean passenger (and other transported unit) count per total journey distance unit [capita/m] or [capita/km] depending on DefaultSystemOfUnits for the FRAME. - - - - - - - - - - Total loaded transport performance within the scope, measured in [passenger-meter] or [passenger-km] depending on DefaultSystemOfUnits for the FRAME. - - - - - - - - - - Average loaded transport performance measured in [passenger-meter/vehicle] or [passenger-km/vehicle] depending on DefaultSystemOfUnits for the FRAME. - - - - - - - - - - - Shared structure for capacity-related values over different distance types. - - - - - - - - - Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. - - - - - A collection of one or more PlannedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. - - - - - - - A collection of one or more ActualServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. - - - - - - - A collection of one or more ExpectedServiceIntensity elements. - - - - - LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. - - - - - \ No newline at end of file + OpRa PlannedServiceIntensity + + + + + + + Reference element of an PLANNED SERVICE INTENSITY. + + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an ACTUAL SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference element of an EXPECTED SERVICE INTENSITY. + + + + + + + + + + + + Implementation of LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording SERVICE INTENSITY information. + + + + + + + + + + + + Representation of an abstract SERVICE INTENSITY. + + + + + + + + + + + Representation of capacity specification affecting indicator values. + + + + + + + + + + + + + + + + + + + Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of a NETWORK. + + + + + + + + + + Average passenger (and other transported unit) capacity values provided for a distance unit (see DefaultSystemOfUnits for the FRAME) of all ROUTEs considered. + + + + + + + + + + Average passenger (and other transported unit) capacity values provided per VEHICLE JOURNEY distance unit (see DefaultSystemOfUnits for the FRAME) + + + + + + + + + + Mean passenger (and other transported unit) count per total journey distance unit [capita/m] or [capita/km] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + Total loaded transport performance within the scope, measured in [passenger-meter] or [passenger-km] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + Average loaded transport performance measured in [passenger-meter/vehicle] or [passenger-km/vehicle] depending on DefaultSystemOfUnits for the FRAME. + + + + + + + + + + + Shared structure for capacity-related values over different distance types. + + + + + + + + + Speed value calculated from difference between arrival and departure time at terminals and ROUTE length, including stop waiting times. + + + + + A collection of one or more PlannedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording PLANNED SERVICE INTENSITY information. + + + + + + + A collection of one or more ActualServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording ACTUAL SERVICE INTENSITY information. + + + + + + + A collection of one or more ExpectedServiceIntensity elements. + + + + + LOGGABLE OBJECT designed for recording EXPECTED SERVICE INTENSITY information. + + + + + From f7790b7b501b430465cf744c78395102c889340b Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 27 Feb 2026 14:41:04 +0100 Subject: [PATCH 31/43] changes to xsd --- docs/uml/opra_frames_overview.svg | 235 ++++++++++++++++++ docs/uml/opra_indicatorFrame_version.svg | 219 ++++++++++++++++ examples/PlannedServiceFrame.xml | 18 ++ .../PlannedServiceFrameWithNetexPayload.xml | 20 ++ 4 files changed, 492 insertions(+) create mode 100644 docs/uml/opra_frames_overview.svg create mode 100644 docs/uml/opra_indicatorFrame_version.svg create mode 100644 examples/PlannedServiceFrame.xml create mode 100644 examples/PlannedServiceFrameWithNetexPayload.xml diff --git a/docs/uml/opra_frames_overview.svg b/docs/uml/opra_frames_overview.svg new file mode 100644 index 0000000..c92f818 --- /dev/null +++ b/docs/uml/opra_frames_overview.svg @@ -0,0 +1,235 @@ + + + UML class diagram for OpRa frame schemas + Overview of all frames in xsd/opra_framework/opra_frames with inheritance and composition. + + + + + + + + + + + + + + + + + UML Class Diagram — OpRa Frames (xsd/opra_framework/opra_frames) + Includes: common, composite, planned service, actual service, indicator, contextual indicator + + + + + + «netex element» abstract + netex:VersionFrame + External base element + + + + + + «netex complexType» + netex:VersionFrame_VersionStructure + External base structure + + + + + + «netex complexType» + netex:Common_VersionFrameStructure + External frame structure base + + + + + + + «xsd:element» abstract + CommonFrame + substitutionGroup = netex:VersionFrame + + + + + + «xsd:complexType» abstract + Common_VersionFrameStructure + extends netex:VersionFrame_VersionStructure + + + + + + + «xsd:element» concrete + CompositeFrame + id : netex:CompositeFrameIdType [0..1] + substitutionGroup = netex:VersionFrame + restriction base = netex:Composite_VersionFrameStructure + contains CompositeVersionFrameGroup [1] + + + + + + «xsd:complexType» + Composite_VersionFrameStructure + extends Common_VersionFrameStructure + + frames : netex:frames_RelStructure [0..1] + + + + + + + «xsd:element» concrete + PlannedServiceFrame + id : PlannedServiceFrameIdType [0..1] + substitutionGroup = netex:CommonFrame + restriction base = OpRa_PlannedService_VersionFrameStructure + contains PlannedServiceFrameGroup [1] + NetexUrl [0..1], NetexPayload [0..1] + + + + + + «xsd:complexType» + OpRa_PlannedService_VersionFrameStructure + extends netex:Common_VersionFrameStructure + + PlannedServiceFrameGroup [1] + + + + + + + «xsd:element» concrete + ActualServiceFrame + id : ActualServiceFrameIdType [0..1] + substitutionGroup = netex:CommonFrame + restriction base = ActualService_VersionFrameStructure + NetexPayload : netex:dataObjects_RelStructure [1] + + + + + + «xsd:complexType» + ActualService_VersionFrameStructure + extends netex:Common_VersionFrameStructure + + ActualServiceFrameGroup [1] + + + + + + + «xsd:element» concrete + IndicatorFrame + id : IndicatorFrameIdType [0..1] + substitutionGroup = netex:CommonFrame + restriction base = IndicatorVersionFrameStructure + PreparednessLevel [0..1] + indicatorLogEntries [0..1], indicators [0..1] + + + + + + «xsd:complexType» + IndicatorVersionFrameStructure + extends netex:Common_VersionFrameStructure + + IndicatorFrameGroup [1] + + + + + + + «xsd:element» concrete + ContextualIndicatorFrame + id : ContextualIndicatorFrameIdType [0..1] + substitutionGroup = netex:CommonFrame + restriction base = ContextualIndicatorFrameStructure + contains IndicatorContextGroup [1] and indicators:CtxIndicators_RelStructure [1] + + + + + + «xsd:complexType» + ContextualIndicatorFrameStructure + extends netex:Common_VersionFrameStructure + + IndicatorContextGroup [1] + ContextualIndicatorFrameGroup [1] + + + + + generalization + + + + + + + + + + + + + + + + + + + frames [0..1] + + + NetexUrl [0..1], NetexPayload [0..1] + + + NetexPayload [1] + + + Preparedness + indicators/logEntries + + + IndicatorContext + indicators [1] + + + + + Legend (UML Notation) + + Generalization (inheritance / specialization) + + Directed association / type usage + + Composition (whole-part ownership) + Multiplicities are shown in attributes/labels as [0..1], [1], [1..*]. + + diff --git a/docs/uml/opra_indicatorFrame_version.svg b/docs/uml/opra_indicatorFrame_version.svg new file mode 100644 index 0000000..e220e3f --- /dev/null +++ b/docs/uml/opra_indicatorFrame_version.svg @@ -0,0 +1,219 @@ + + + UML model for opra_indicatorFrame_version.xsd + Class-style UML diagram showing key elements and types for IndicatorFrame schema. + + + + + + + + + + + + + + UML model: opra_indicatorFrame_version.xsd + Namespace: https://transmodel-cen.eu/opra/1.0 + + + + + + «netex element/type» + CommonFrame + abstract head element + + + + + + «netex complexType» + Common_VersionFrameStructure + base for OpRa frame structures + + + + + + + «xsd:element» concrete + IndicatorFrame + id : IndicatorFrameIdType [0..1] + substitutionGroup = netex:CommonFrame + content is restriction of IndicatorVersionFrameStructure + + netex:EntityInVersionGroup [0..1] + + netex:DataManagedObjectGroup [1] + + netex:VersionFrameGroup [1] + IndicatorFrameGroup [1] + + + + + + «xsd:complexType» + IndicatorVersionFrameStructure + extends netex:Common_VersionFrameStructure + + IndicatorFrameGroup [1] + abstract = false + + + + + + «xsd:group» + IndicatorFrameGroup + + IndicatorFrameDefaults : IndicatorFrameDefaultsStructure [0..1] + + PreparednessLevel : PreparednessEnumeration [0..1] + + IndicatorInFrameGroup [1] + + + + + + «xsd:group» + IndicatorInFrameGroup + + indicatorLogEntries : AbstractIndicatorLogEntries_RelStructure [0..1] + + indicators : AbstractIndicators_RelStructure [0..1] + + + + + + + «xsd:complexType» + IndicatorFrameDefaultsStructure + + IndicatorFrameDefaultsGroup [1] + (contains DefaultCapacityContext [0..1]) + + + + + + + «xsd:simpleType» enum + PreparednessEnumeration + Raw + Cleansed + Processed + base = xsd:NMTOKEN + + + + + + + «xsd:complexType» + AbstractIndicators_RelStructure + + AbstractIndicator [1..*] + relation container for indicators + + + + + + «xsd:element» abstract + AbstractIndicator + type = Indicator_VersionStructure + substitutionGroup = AbstractLoggableObject + + + + + + «xsd:complexType» + Indicator_VersionStructure + extends LoggableObject_VersionStructure + + + + + + + «xsd:complexType» + AbstractIndicatorLogEntries_RelStructure + + AbstractIndicatorLogEntry [1..*] + relation container for log entries + + + + + + «xsd:element» abstract + AbstractIndicatorLogEntry + type = IndicatorLogEntry_VersionStructure + substitutionGroup = AbstractLogEntry + + + + + + «xsd:complexType» + IndicatorLogEntry_VersionStructure + extends netex:LogEntry_VersionStructure + + + + + + substitutes + + + + type/restriction + + + + extends + + + + + + + + + + PreparednessLevel type + + + + + + + + + + + + + + + + + + Legend + + Generalization / substitution + + Association / composition / type + Multiplicity uses UML style: + [0..1], [1], [1..*] + + diff --git a/examples/PlannedServiceFrame.xml b/examples/PlannedServiceFrame.xml new file mode 100644 index 0000000..ace0a3b --- /dev/null +++ b/examples/PlannedServiceFrame.xml @@ -0,0 +1,18 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Planned service frame example with a reference to published NeTEx data. + + + https://example.org/netex/publication/2026-02-27 + + + + + + diff --git a/examples/PlannedServiceFrameWithNetexPayload.xml b/examples/PlannedServiceFrameWithNetexPayload.xml new file mode 100644 index 0000000..f9330b9 --- /dev/null +++ b/examples/PlannedServiceFrameWithNetexPayload.xml @@ -0,0 +1,20 @@ + + + + 2001-12-17T09:30:47Z + OpraExamples + + + 2001-12-17T09:30:47Z + Planned service frame example with embedded NeTEx payload. + + + + + + + + + + + From 6fe4df73b8ff8e8f31c44153e25646ccb9f3bc9c Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Sat, 28 Feb 2026 23:39:10 +0100 Subject: [PATCH 32/43] feat(examples): refresh 2025 example set and sync project files normalize example dates/timestamps to year 2025 add new contextual indicator example with operator-focused weekend/network KPI story rebalance planned service intensity assumptions and monthly calculations (10 lines, 30-min headway) include all XML examples in Oxygen and XMLSpy project files align example naming/casing in project entries --- OpRa.spp | 8 +- OpRa.xpr | 4 + examples/ActualServiceDimensions.xml | 6 +- examples/ContextualIndicatorFrame.xml | 57 ++++++ examples/ExpectedPassengerCount.xml | 4 +- examples/ExpectedServiceIntensity.xml | 12 +- examples/PlannedCapacity.xml | 4 +- examples/PlannedServiceDimensions.xml | 4 +- examples/PlannedServiceFrame.xml | 18 -- .../PlannedServiceFrameWithNetexPayload.xml | 20 -- examples/PlannedServiceIntensity.xml | 171 ++---------------- examples/TicketingBasedPassengerCount.xml | 4 +- 12 files changed, 103 insertions(+), 209 deletions(-) create mode 100644 examples/ContextualIndicatorFrame.xml delete mode 100644 examples/PlannedServiceFrame.xml delete mode 100644 examples/PlannedServiceFrameWithNetexPayload.xml diff --git a/OpRa.spp b/OpRa.spp index b7ec1af..4fae5de 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -761,10 +761,16 @@ + + + - + + + + diff --git a/OpRa.xpr b/OpRa.xpr index bcc2cb9..f7baaf4 100644 --- a/OpRa.xpr +++ b/OpRa.xpr @@ -6,9 +6,13 @@ + + + + diff --git a/examples/ActualServiceDimensions.xml b/examples/ActualServiceDimensions.xml index 8fbf438..81ca40d 100644 --- a/examples/ActualServiceDimensions.xml +++ b/examples/ActualServiceDimensions.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Actual service dimensions example on the sample network. @@ -14,7 +14,7 @@ - + 17 1 2 diff --git a/examples/ContextualIndicatorFrame.xml b/examples/ContextualIndicatorFrame.xml new file mode 100644 index 0000000..db2f5d2 --- /dev/null +++ b/examples/ContextualIndicatorFrame.xml @@ -0,0 +1,57 @@ + + + + 2025-02-27T10:15:00Z + OpraExamples + + + 2025-02-27T10:15:00Z + Operator operational statistics at network level for a weekday: one bus KPI and one rail KPI. + + + OPERATOR_NETWORK_STATISTICS + 2025.1 + + + KPI_OWNER + Test:Operator:OpraTransit + + + AGGREGATION_LEVEL + NETWORK_BY_MODE + + + REPORTING_WINDOW + DAY_TYPE + + + VALUE_SCALE + FRACTION_0_1 + + + + + BusNetworkOnTimeDepartureRate + + + + bus + + 0.91 + + + RailNetworkOnTimeDepartureRate + + + + rail + + 0.93 + + + + + + + + \ No newline at end of file diff --git a/examples/ExpectedPassengerCount.xml b/examples/ExpectedPassengerCount.xml index 6363d0e..7886362 100644 --- a/examples/ExpectedPassengerCount.xml +++ b/examples/ExpectedPassengerCount.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Expected passenger count example on the sample network. diff --git a/examples/ExpectedServiceIntensity.xml b/examples/ExpectedServiceIntensity.xml index a6b5d6d..fcb0b9c 100644 --- a/examples/ExpectedServiceIntensity.xml +++ b/examples/ExpectedServiceIntensity.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Expected service intensity example including all indicator elements and one-to-many relation in indicators. @@ -23,9 +23,9 @@ - + - + @@ -105,9 +105,9 @@ - + - + diff --git a/examples/PlannedCapacity.xml b/examples/PlannedCapacity.xml index 5d50638..f54cc3a 100644 --- a/examples/PlannedCapacity.xml +++ b/examples/PlannedCapacity.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Expected passenger count example on the sample network. diff --git a/examples/PlannedServiceDimensions.xml b/examples/PlannedServiceDimensions.xml index 73711a2..d9163b1 100644 --- a/examples/PlannedServiceDimensions.xml +++ b/examples/PlannedServiceDimensions.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Planned service dimensions example on the sample network. diff --git a/examples/PlannedServiceFrame.xml b/examples/PlannedServiceFrame.xml deleted file mode 100644 index ace0a3b..0000000 --- a/examples/PlannedServiceFrame.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - 2001-12-17T09:30:47Z - OpraExamples - - - 2001-12-17T09:30:47Z - Planned service frame example with a reference to published NeTEx data. - - - https://example.org/netex/publication/2026-02-27 - - - - - - diff --git a/examples/PlannedServiceFrameWithNetexPayload.xml b/examples/PlannedServiceFrameWithNetexPayload.xml deleted file mode 100644 index f9330b9..0000000 --- a/examples/PlannedServiceFrameWithNetexPayload.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 2001-12-17T09:30:47Z - OpraExamples - - - 2001-12-17T09:30:47Z - Planned service frame example with embedded NeTEx payload. - - - - - - - - - - - diff --git a/examples/PlannedServiceIntensity.xml b/examples/PlannedServiceIntensity.xml index 073ea23..12c7aec 100644 --- a/examples/PlannedServiceIntensity.xml +++ b/examples/PlannedServiceIntensity.xml @@ -1,180 +1,45 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z - Planned service intensity example including all indicator elements and one-to-many relation in indicators. + 2025-12-17T09:30:47Z + Planned service intensity for one authority and one network, buses only, aggregated for weekend operation in a city of about 150000 citizens and 10 bus lines. Raw - - Planned service intensity for line-level weekday operation. + Weekend planned service intensity for the full bus network for standard fare class over one month, assuming 10 lines with a 30-minute frequency per direction from 06:00 to 22:00 and typical urban bus-priority operations. - bus - - - - - - - - - - - - selfPropelled + + standardClass - 780 - 420 - 340 - 8 - 6 - 6 - 1260 - - - standardClass - 420 - 230 - 180 - 4 - 3 - 3 - 630 - - - standardClass - 70 - 38 - 30 - 1 - 1 - 1 - 15 - - - standardClass - 48 - 32 - 15 + 64 + 35 + 27 1 1 1 - 15 - - - standardClass - 57120 - 38080 - 17850 - 840 - 840 - 840 - 1260 - - - standardClass - 595 - 396 - 186 - 8 - 8 - 8 - 13 - 96 - - 8.75 - - - Planned service intensity for opposite direction in same timeband. - - - - - bus - - - - - - - - - - - - selfPropelled - - standardClass - 720 - 390 - 315 - 8 - 6 - 6 - 1188 + 71680 - - standardClass - 390 - 215 - 165 - 4 - 3 - 3 - 594 - - - standardClass - 68 - 37 - 29 - 1 - 1 - 1 - 15 - - - standardClass - 44 - 29 - 14 - 1 - 1 - 1 - 15 - standardClass - 52272 - 34506 - 16632 - 756 - 756 - 756 - 1188 + 327680 + 179200 + 138240 + 5120 + 5120 + 5120 + 71680 - - standardClass - 592 - 391 - 188 - 8 - 8 - 8 - 13 - 89 - - 8.40 + 13.5 diff --git a/examples/TicketingBasedPassengerCount.xml b/examples/TicketingBasedPassengerCount.xml index 9d35038..01f4335 100644 --- a/examples/TicketingBasedPassengerCount.xml +++ b/examples/TicketingBasedPassengerCount.xml @@ -1,11 +1,11 @@ - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z OpraExamples - 2001-12-17T09:30:47Z + 2025-12-17T09:30:47Z Ticketing based passenger count examples on the sample network. From aabaf06dc9e8a91efecdfc9fa52895ad61a08780 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 Feb 2026 22:48:31 +0000 Subject: [PATCH 33/43] Lint and update documentation tables --- examples/ContextualIndicatorFrame.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ContextualIndicatorFrame.xml b/examples/ContextualIndicatorFrame.xml index db2f5d2..f716c9a 100644 --- a/examples/ContextualIndicatorFrame.xml +++ b/examples/ContextualIndicatorFrame.xml @@ -54,4 +54,4 @@ - \ No newline at end of file + From ca280fd677f61636243369ad785f4d9e787d2a70 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 3 Mar 2026 09:46:35 +0100 Subject: [PATCH 34/43] Validation script update for submodule Validation script update for submodule (initially done for NeTEx v2.0) --- .github/scripts/validate-and-lint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index efa9595..10b181b 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -7,6 +7,12 @@ # 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 + +#------------------------------------------------------- + echo "Validating XML file structure and linting XSD and XML files ..." PARSING_ERROR=0 From 1124ab09b929ac5693b644da7ef0aaa2b7283f71 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 3 Mar 2026 09:52:28 +0100 Subject: [PATCH 35/43] bug in script correction --- .github/scripts/validate-and-lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 10b181b..cc2bdb2 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -9,7 +9,7 @@ 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 +git submodule update --init -–recursive #------------------------------------------------------- From c3043a72b5d4ce9b27ae0cc270648dd48fac4792 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 3 Mar 2026 09:59:40 +0100 Subject: [PATCH 36/43] Dash issue ! --- .github/scripts/validate-and-lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index cc2bdb2..26c178a 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -9,7 +9,7 @@ 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 +git submodule update --init --recursive #------------------------------------------------------- From fa8908dac27bfee6c3c7f2cbff27c08a5f31a3f0 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Tue, 3 Mar 2026 10:13:02 +0100 Subject: [PATCH 37/43] Update NeTEx submodule Update NeTEx submodule to v2.0 --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 20e2056..5a0ddf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "NeTEx"] path = NeTEx url = https://github.com/NeTEx-CEN/NeTEx + branch = v2.0 [submodule "SIRI"] path = SIRI url = https://github.com/Aurige/SIRI From dbde8fc2a57103865097cf212039147864edfe94 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Mon, 9 Mar 2026 01:19:20 +0100 Subject: [PATCH 38/43] TypeOfDelay implementation & NeTEx facade removal - removal of opra_netex_facade - removal of Opra-level COMMON FRAME and COMPOSITE FRAME implementations (fallback to NeTEx implementation) - added TypeOfDelay implementation --- NeTEx | 2 +- OJP | 2 +- OpRa.spp | 6 +- xsd/OpRa_publication.xsd | 12 -- .../opra_actualServiceFrame_version.xsd | 2 +- .../opra_frames/opra_commonFrame_version.xsd | 61 -------- .../opra_compositeFrame_version.xsd | 143 ------------------ .../opra_contextualIndicatorFrame_version.xsd | 2 +- .../opra_indicatorFrame_version.xsd | 2 +- .../opra_plannedServiceFrame_version.xsd | 2 +- .../opra_GeneralLogEntry_version.xsd | 2 +- ...pra_GenericContextualIndicator_version.xsd | 2 +- xsd/opra_framework/opra_payload_framework.xsd | 82 +++++----- .../opra_controlActionReference_support.xsd | 2 +- .../opra_delayClassification_version.xsd | 107 +++++++++++++ .../opra_durationDistribution_support.xsd | 4 +- .../opra_eventReference_support.xsd | 2 +- .../opra_filtering_support.xsd | 2 +- .../opra_statistics_support.xsd | 2 +- .../opra_vehicleOccupancy_version.xsd | 2 +- xsd/opra_imports/opra_netex_imports.xsd | 6 +- ...a_cancelledDatedVehicleJourney_version.xsd | 2 +- xsd/opra_indicators/opra_capacity_version.xsd | 2 +- .../opra_expectedPassengerCount_version.xsd | 2 +- .../opra_externalPassengerCount_version.xsd | 2 +- .../opra_fleetDimensions_version.xsd | 4 +- .../opra_lateDatedVehicleJourney_version.xsd | 12 +- ...boardDeviceBasedPassengerCount_version.xsd | 2 +- .../opra_serviceDimensions_version.xsd | 2 +- .../opra_serviceIntensity_version.xsd | 2 +- ...a_ticketingBasedPassengerCount_version.xsd | 2 +- .../opra_validationEntry_version.xsd | 2 +- xsd/opra_request.xsd | 4 +- ..._service_cancelledDatedVehicleJourneys.xsd | 2 +- xsd/opra_service/opra_service_capacity.xsd | 2 +- .../opra_service_expectedPassengerCounts.xsd | 2 +- .../opra_service_externalPassengerCounts.xsd | 2 +- .../opra_service_fleetDimensions.xsd | 2 +- .../opra_service_lateDatedVehicleJourneys.xsd | 2 +- ...vice_onboardDeviceBasedPassengerCounts.xsd | 2 +- .../opra_service_serviceDimensions.xsd | 2 +- .../opra_service_serviceIntensity.xsd | 2 +- ..._service_ticketingBasedPassengerCounts.xsd | 2 +- 43 files changed, 191 insertions(+), 314 deletions(-) delete mode 100644 xsd/opra_framework/opra_frames/opra_commonFrame_version.xsd delete mode 100644 xsd/opra_framework/opra_frames/opra_compositeFrame_version.xsd create mode 100644 xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd diff --git a/NeTEx b/NeTEx index 74b4cd9..f0f698b 160000 --- a/NeTEx +++ b/NeTEx @@ -1 +1 @@ -Subproject commit 74b4cd9dbd84ecd4bc566d8b54dcd7699bfb2c49 +Subproject commit f0f698bcc5ef29f57642ef4cbf5c8952fba89a41 diff --git a/OJP b/OJP index c12313a..482625c 160000 --- a/OJP +++ b/OJP @@ -1 +1 @@ -Subproject commit c12313a3220ef8639c753d0a8873ccf988214fff +Subproject commit 482625caef9b099943d2c837dfa6aab5795d3606 diff --git a/OpRa.spp b/OpRa.spp index 4fae5de..9e56d14 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -780,11 +780,9 @@ - - + - @@ -792,6 +790,7 @@ + @@ -801,7 +800,6 @@ - diff --git a/xsd/OpRa_publication.xsd b/xsd/OpRa_publication.xsd index 8c83f8c..01db3fc 100644 --- a/xsd/OpRa_publication.xsd +++ b/xsd/OpRa_publication.xsd @@ -1,19 +1,7 @@ - - - - - diff --git a/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd index aa3dff2..73858a9 100644 --- a/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd @@ -1,7 +1,7 @@ - + diff --git a/xsd/opra_framework/opra_frames/opra_commonFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_commonFrame_version.xsd deleted file mode 100644 index c1c5e06..0000000 --- a/xsd/opra_framework/opra_frames/opra_commonFrame_version.xsd +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - -

OpRa - Operational Raw Data. This subschema defines COMMON FRAME types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_commonFrame.xsd - [ISO 639-2/B] ENG - CEN TC278 WG3 SG10 - - - -
    -
  • Derived from Transmodel, NeTEx, SIRI standards.
    • -
- - Version 1.0 Draft for approval - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and road transport - - CEN TC278 WG3 SG10 - - Operational Raw Data Exchange - COMMON FRAME types. - Standard - - - COMMON FRAME types for OpRa. - - - - - Abstract supertype for explicit VERSION FRAMEs. - - - - - Type for a COMMON FRAME. - - - - - - diff --git a/xsd/opra_framework/opra_frames/opra_compositeFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_compositeFrame_version.xsd deleted file mode 100644 index e4111e3..0000000 --- a/xsd/opra_framework/opra_frames/opra_compositeFrame_version.xsd +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - -

OpRa - Operational Raw Data. This subschema defines COMPOSITE FRAME types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_compositeFrame.xsd - [ISO 639-2/B] ENG - CEN TC278 WG3 SG10 - - - -
    -
  • Derived from Transmodel, NeTEx, SIRI standards.
    • -
- - Version 1.0 Draft for approval - - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, - Rail transport, Roads and road transport - - CEN TC278 WG3 SG10 - - Operational Raw Data Exchange - COMPOSITE FRAME types. - Standard - - - COMPOSITE FRAME types for OpRa. - - - - - Type for identifier of a COMPOSITE FRAME. - - - - - - Reference to a COMPOSITE FRAME. - - - - - Type for a reference to a COMPOSITE FRAME. - - - - - - Identifier of a COMPOSITE FRAME. - - - - - - - - - Type for a collection of FRAMEs. - - - - - - - - - - - - A container VERSION FRAME that groups a set of content VERSION FRAMEs to which the same VALIDITY CONDITIONs have been assigned. - - - - - - - - - - - - - - - - - - - - - identifier of Frame. - - - - - - - - - Type for a COMPOSITE FRAME. - - - - - - - - - - - - Elements of a COMPOSITE FRAME. - - - - - Content frames in COMPOSITE FRAME. - - - - - - diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index 7fc7d08..c515f2c 100644 --- a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -1,7 +1,7 @@ - + diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index c37eb03..27653d1 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -2,7 +2,7 @@ - + - + diff --git a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd index ee5023d..5829a3c 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index b3c7995..93e4aa5 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 1d97252..2e6a365 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -1,43 +1,39 @@ - - - - - - - - - - - - - - Type for the possible data objects within an OpRa payload. - - - - - - - - - - - - OpRa payload elements. - - - - - OpRa Entities in the data exchange. - - - - - - - - - - + + + + + + + + + + + + Type for the possible data objects within an OpRa payload. + + + + + + + + + + + + OpRa payload elements. + + + + + OpRa Entities in the data exchange. + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_reusableComponents/opra_controlActionReference_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_controlActionReference_support.xsd index 8d388b7..767fd83 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_controlActionReference_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_controlActionReference_support.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd b/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd new file mode 100644 index 0000000..f5ea9a3 --- /dev/null +++ b/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd @@ -0,0 +1,107 @@ + + + + + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team + + 2024-11-29 + + +

OpRa - Operational Raw Data

+ + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd + [ISO 639-2/B] ENG + Unclassified + + +
    +
  • Created for OpRa
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, + Rail transport, Roads and Road transport + + CEN TC278 WG3 SG10. + + Opra Operation Raw Data Exchange + Standard + + + OpRa DELAY Classification + + + + + + + + + + + + + + + + Element for a TYPE OF DELAY classifying DELAYs, e.g. for implementing regulations that differentiate between DELAYs. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Representation of a TYPE OF DELAY, defining a duration range. + + + + + + + + + + + \ No newline at end of file diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index ae8f50f..e4857f1 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -2,9 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_eventReference_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_eventReference_support.xsd index 839f30d..296f66e 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_eventReference_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_eventReference_support.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd index e918e00..937f4c2 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd index b1b7917..97ebd91 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_vehicleOccupancy_version.xsd b/xsd/opra_framework/opra_reusableComponents/opra_vehicleOccupancy_version.xsd index ac594ec..86909ef 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_vehicleOccupancy_version.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_vehicleOccupancy_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 7b35b7e..79c9ec7 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -20,10 +20,6 @@ - - @@ -42,7 +38,7 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/opra/1.0/xsd/opra_imports/opra_netex_facade.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_imports/opra_netex_imports.xsd [ISO 639-2/B] ENG Unclassified diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index fe43504..638fe6b 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_capacity_version.xsd b/xsd/opra_indicators/opra_capacity_version.xsd index 1389ce2..2520cc3 100644 --- a/xsd/opra_indicators/opra_capacity_version.xsd +++ b/xsd/opra_indicators/opra_capacity_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd index 1a86284..eed0419 100644 --- a/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_expectedPassengerCount_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd index 9361d1f..f562694 100644 --- a/xsd/opra_indicators/opra_externalPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_externalPassengerCount_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_fleetDimensions_version.xsd b/xsd/opra_indicators/opra_fleetDimensions_version.xsd index e841505..57f9deb 100644 --- a/xsd/opra_indicators/opra_fleetDimensions_version.xsd +++ b/xsd/opra_indicators/opra_fleetDimensions_version.xsd @@ -2,9 +2,9 @@ - + - + diff --git a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index a80b7c0..ca560a9 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,18 +1,16 @@ - + - + - - + + @@ -92,7 +90,7 @@ Rail transport, Roads and Road transport - + Classification of the DELAY (eg. within a regulatory context) diff --git a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd index 19cdbc8..b724943 100644 --- a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 8f43f23..24190ec 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_serviceIntensity_version.xsd b/xsd/opra_indicators/opra_serviceIntensity_version.xsd index ce94296..dc564ff 100644 --- a/xsd/opra_indicators/opra_serviceIntensity_version.xsd +++ b/xsd/opra_indicators/opra_serviceIntensity_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd index 6a18272..2c12291 100644 --- a/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd @@ -4,7 +4,7 @@ - + diff --git a/xsd/opra_indicators/opra_validationEntry_version.xsd b/xsd/opra_indicators/opra_validationEntry_version.xsd index 44149e7..990f843 100644 --- a/xsd/opra_indicators/opra_validationEntry_version.xsd +++ b/xsd/opra_indicators/opra_validationEntry_version.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 1dac4e0..ced84df 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -2,9 +2,9 @@ - + - + diff --git a/xsd/opra_service/opra_service_cancelledDatedVehicleJourneys.xsd b/xsd/opra_service/opra_service_cancelledDatedVehicleJourneys.xsd index 504679f..7f02512 100644 --- a/xsd/opra_service/opra_service_cancelledDatedVehicleJourneys.xsd +++ b/xsd/opra_service/opra_service_cancelledDatedVehicleJourneys.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_capacity.xsd b/xsd/opra_service/opra_service_capacity.xsd index b7b9aae..23af902 100644 --- a/xsd/opra_service/opra_service_capacity.xsd +++ b/xsd/opra_service/opra_service_capacity.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_expectedPassengerCounts.xsd b/xsd/opra_service/opra_service_expectedPassengerCounts.xsd index d6cdf31..036345f 100644 --- a/xsd/opra_service/opra_service_expectedPassengerCounts.xsd +++ b/xsd/opra_service/opra_service_expectedPassengerCounts.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_externalPassengerCounts.xsd b/xsd/opra_service/opra_service_externalPassengerCounts.xsd index 82ada71..7d18147 100644 --- a/xsd/opra_service/opra_service_externalPassengerCounts.xsd +++ b/xsd/opra_service/opra_service_externalPassengerCounts.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_fleetDimensions.xsd b/xsd/opra_service/opra_service_fleetDimensions.xsd index 04d2beb..adbe4a9 100644 --- a/xsd/opra_service/opra_service_fleetDimensions.xsd +++ b/xsd/opra_service/opra_service_fleetDimensions.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_lateDatedVehicleJourneys.xsd b/xsd/opra_service/opra_service_lateDatedVehicleJourneys.xsd index 69afd6b..e75ee99 100644 --- a/xsd/opra_service/opra_service_lateDatedVehicleJourneys.xsd +++ b/xsd/opra_service/opra_service_lateDatedVehicleJourneys.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_onboardDeviceBasedPassengerCounts.xsd b/xsd/opra_service/opra_service_onboardDeviceBasedPassengerCounts.xsd index a2cd4b1..385097e 100644 --- a/xsd/opra_service/opra_service_onboardDeviceBasedPassengerCounts.xsd +++ b/xsd/opra_service/opra_service_onboardDeviceBasedPassengerCounts.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_serviceDimensions.xsd b/xsd/opra_service/opra_service_serviceDimensions.xsd index 4868cb0..810253e 100644 --- a/xsd/opra_service/opra_service_serviceDimensions.xsd +++ b/xsd/opra_service/opra_service_serviceDimensions.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_serviceIntensity.xsd b/xsd/opra_service/opra_service_serviceIntensity.xsd index 1971daa..ccd0fc1 100644 --- a/xsd/opra_service/opra_service_serviceIntensity.xsd +++ b/xsd/opra_service/opra_service_serviceIntensity.xsd @@ -2,7 +2,7 @@ - + diff --git a/xsd/opra_service/opra_service_ticketingBasedPassengerCounts.xsd b/xsd/opra_service/opra_service_ticketingBasedPassengerCounts.xsd index a537fad..88ca0d8 100644 --- a/xsd/opra_service/opra_service_ticketingBasedPassengerCounts.xsd +++ b/xsd/opra_service/opra_service_ticketingBasedPassengerCounts.xsd @@ -2,7 +2,7 @@ - + From 61fac8512d18ab59db2198f99f2cc895923258a2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 00:22:10 +0000 Subject: [PATCH 39/43] Lint and update documentation tables --- xsd/opra_framework/opra_payload_framework.xsd | 76 +++++----- .../opra_delayClassification_version.xsd | 130 +++++++++--------- .../opra_lateDatedVehicleJourney_version.xsd | 6 +- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 2e6a365..176dc83 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -1,39 +1,39 @@ - + - - - - - - - - - - Type for the possible data objects within an OpRa payload. - - - - - - - - - - - - OpRa payload elements. - - - - - OpRa Entities in the data exchange. - - - - - - - - - - \ No newline at end of file + + + + + + + + + + Type for the possible data objects within an OpRa payload. + + + + + + + + + + + + OpRa payload elements. + + + + + OpRa Entities in the data exchange. + + + + + + + + + + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd b/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd index f5ea9a3..6131098 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_delayClassification_version.xsd @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + main schema e-service developers @@ -48,60 +48,60 @@ Standard - OpRa DELAY Classification - - - - - - - - - - - - - - - - Element for a TYPE OF DELAY classifying DELAYs, e.g. for implementing regulations that differentiate between DELAYs. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Representation of a TYPE OF DELAY, defining a duration range. - - - - - - - - - - - \ No newline at end of file + OpRa DELAY Classification + + + + + + + + + + + + + + + + Element for a TYPE OF DELAY classifying DELAYs, e.g. for implementing regulations that differentiate between DELAYs. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Representation of a TYPE OF DELAY, defining a duration range. + + + + + + + + + + + diff --git a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index ca560a9..ec87a47 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,4 +1,4 @@ - + @@ -9,8 +9,8 @@ - - + + From 4562a2f3fb5c929458fa4877782c73e31d56ffa7 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Mon, 9 Mar 2026 11:24:00 +0100 Subject: [PATCH 40/43] New examples. typo in the xsd. --- .gitignore | 2 + OpRa.xpr | 6 ++- examples/CancelledDatedVehicleJourneys.xml | 43 +++++++++++++++++ examples/PlannedCapacityIndicator.xml | 46 +++++++++++++++++++ examples/PlannedFleetDimensions.xml | 12 +++++ .../opra_statistics_support.xsd | 8 ++-- 6 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 examples/CancelledDatedVehicleJourneys.xml create mode 100644 examples/PlannedCapacityIndicator.xml create mode 100644 examples/PlannedFleetDimensions.xml diff --git a/.gitignore b/.gitignore index e69de29..7f5645f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +.tmp +docs diff --git a/OpRa.xpr b/OpRa.xpr index f7baaf4..b5a5037 100644 --- a/OpRa.xpr +++ b/OpRa.xpr @@ -14,6 +14,7 @@ + @@ -36,15 +37,15 @@ - + + - @@ -61,6 +62,7 @@ + diff --git a/examples/CancelledDatedVehicleJourneys.xml b/examples/CancelledDatedVehicleJourneys.xml new file mode 100644 index 0000000..64bc22a --- /dev/null +++ b/examples/CancelledDatedVehicleJourneys.xml @@ -0,0 +1,43 @@ + + + + 2025-03-22T00:05:00Z + + + 2025-03-22T00:05:00Z + Cancelled dated vehicle journey examples on the sample network. + + + + 2025-03-16T00:00:00 + 2025-03-18T23:59:59 + + Cleansed + + + + + true + + + + + false + + + + + + + 2 + 0.0270 + + 74 + + + + + + + + diff --git a/examples/PlannedCapacityIndicator.xml b/examples/PlannedCapacityIndicator.xml new file mode 100644 index 0000000..79c1564 --- /dev/null +++ b/examples/PlannedCapacityIndicator.xml @@ -0,0 +1,46 @@ + + + + 2026-03-04T08:30:00Z + OpraExamples + + + 2026-03-04T08:30:00Z + Planned capacity indicator example for one line and operating day. + + + + + nominalPerVehicleType + + + + 70 + 1 + + + + + Raw + + + Planned total and wheelchair capacity for Line 10 on one operating day. + + + 3500 + 50 + + + Planned capacity for one journey pattern segment of Line 10. + + + 1750 + 25 + + + + + + + + diff --git a/examples/PlannedFleetDimensions.xml b/examples/PlannedFleetDimensions.xml new file mode 100644 index 0000000..dd4685a --- /dev/null +++ b/examples/PlannedFleetDimensions.xml @@ -0,0 +1,12 @@ + + + Planned fleet dimensions for Line 10 for one operating day. + + + + selfPropelled + 24 + 20 + 2 + 22 + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd index b1b7917..bbde485 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd @@ -53,22 +53,22 @@ - Representation of occurrence-related statistics. + Representation of occurrence-related statistics as a numerator and denominator pair within a scoped population (for example cancelled journeys out of all monitored journeys, or journeys in a delay interval out of all monitored journeys). - Absolute number of occurrences of a statistical group. + Numerator: absolute number of observations that satisfy the condition represented by the enclosing indicator (e.g. cancelled journeys, or journeys within a specific delay interval). - Relative occurrence of a statistical group within a domain. + Relative proportion of NumberOfOccurrences within TotalNumberOfOccurrences for the same scope. - Total number of occurrences of a statistical group. + Denominator: total number of observations in scope against which NumberOfOccurrences is evaluated (e.g. all monitored journeys in the same scope, not only the subset that satisfies the condition). From c4ecc3d956378f71272103b5e098c9f3310c0659 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Mon, 9 Mar 2026 11:26:12 +0100 Subject: [PATCH 41/43] no message --- NeTEx | 2 +- OJP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NeTEx b/NeTEx index f0f698b..8cc4259 160000 --- a/NeTEx +++ b/NeTEx @@ -1 +1 @@ -Subproject commit f0f698bcc5ef29f57642ef4cbf5c8952fba89a41 +Subproject commit 8cc42590acd7de24aa508bccb7c5fc757569c51b diff --git a/OJP b/OJP index 482625c..c12313a 160000 --- a/OJP +++ b/OJP @@ -1 +1 @@ -Subproject commit 482625caef9b099943d2c837dfa6aab5795d3606 +Subproject commit c12313a3220ef8639c753d0a8873ccf988214fff From d159e9604241061516689460207f928854b1261f Mon Sep 17 00:00:00 2001 From: gnitsch Date: Mon, 9 Mar 2026 14:07:01 +0100 Subject: [PATCH 42/43] NeTEx frame inclusion fix - switched to part1 & part2 netex_all_frames_part* links --- examples/PlannedServiceFrame.xml | 21 +++++ xsd/opra_imports/opra_netex_facade.xsd | 113 ------------------------ xsd/opra_imports/opra_netex_imports.xsd | 5 +- 3 files changed, 24 insertions(+), 115 deletions(-) create mode 100644 examples/PlannedServiceFrame.xml delete mode 100644 xsd/opra_imports/opra_netex_facade.xsd diff --git a/examples/PlannedServiceFrame.xml b/examples/PlannedServiceFrame.xml new file mode 100644 index 0000000..4339e0e --- /dev/null +++ b/examples/PlannedServiceFrame.xml @@ -0,0 +1,21 @@ + + + + 2025-12-17T09:30:47Z + OpraExamples + + + 2025-12-17T09:30:47Z + Planned service frame example on the sample network. + + + + + + + + + + + + diff --git a/xsd/opra_imports/opra_netex_facade.xsd b/xsd/opra_imports/opra_netex_facade.xsd deleted file mode 100644 index c6f0409..0000000 --- a/xsd/opra_imports/opra_netex_facade.xsd +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG10 - OpRa - Editor CEN Opra Project Team - - 2024-11-29 - - -

OpRa - Operational Raw Data

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {https://transmodel-cen.eu/opra/1.0/xsd/opra_imports/opra_netex_facade.xsd - [ISO 639-2/B] ENG - Unclassified - - -
    -
  • Created for OpRa
    • -
- - Initial Version - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, - Rail transport, Roads and Road transport - - CEN TC278 WG3 SG10. - - Opra Operation Raw Data Exchange - Standard - - - OpRa NeTEx facade - provides future NeTEx types and definitions - TO BE REMOVED WHEN NETEX/OPRA ARE SYNCHRONIZED. - - - - - - - - - - - Identifier of referenced PASSENGER SPACE. - - - - - - - - - - - - - - - Identifier of referenced PASSENGER ENTRANCE. - - - - - - - - - - - - - - - Identifier of referenced ENTRANCE SENSOR. - - - - - - - - - - - - - - - Identifier of referenced TYPE OF DELAY. - - - - - - diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 79c9ec7..1d5e308 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -13,10 +13,11 @@ + - + @@ -65,4 +66,4 @@ Common NeTEx import node for OpRa schema - + \ No newline at end of file From 9c1572b3a050155d532c5e27a6ba71dd5e252bc9 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Mon, 9 Mar 2026 16:26:06 +0100 Subject: [PATCH 43/43] FareFrame inclusion - added support to NeTEx FareFrame through inclusion. --- xsd/opra_imports/opra_netex_imports.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 1d5e308..4dbd4c5 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -21,6 +21,7 @@ +