diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 26c178a..40161e9 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -7,9 +7,23 @@ # The -e flag causes the script to exit as soon as one command returns a non-zero exit code set -e -# Update the submodules, usefull only when there is a submodul update (can be commented most of the time) -echo "Syncronising submodules ..." -git submodule update --init --recursive +# Update the submodules, useful only when there is a submodule update (can be commented most of the time) +echo "Synchronising submodules ..." +# ==> Check .github/worlflow/ci.yml + +#git submodule deinit -f NeTEx +#rm -rf .git/modules/NeTEx +#rm -rf NeTEx +#git submodule update --init --recursive + + +# Sync submodule remote URLs (in case .gitmodules changed) +#cd SIRI +#git fetch origin SIRI-for-OpRa +#git checkout origin/SIRI-for-OpRa +#cd .. +#git add SIRI + #------------------------------------------------------- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a869717..e808e9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,14 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - + with: + submodules: false + - name: Update git submodules - run: git submodule update --init --recursive + run: | + git fetch --prune + git submodule sync --recursive + git submodule update --init --recursive --force - name: Install xmllint and xsltproc run: | @@ -26,7 +31,7 @@ jobs: - name: Validate OpRa XML examples run: ./.github/scripts/validate-examples.sh - + - name: Commit changes uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit with: diff --git a/.gitmodules b/.gitmodules index 5a0ddf8..50f3c71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,13 @@ path = NeTEx url = https://github.com/NeTEx-CEN/NeTEx branch = v2.0 + ignore = dirty +[submodule "OJP"] + path = OJP + url = https://github.com/VDVde/OJP + ignore = dirty [submodule "SIRI"] path = SIRI url = https://github.com/Aurige/SIRI branch = SIRI-for-OpRa -[submodule "OJP"] - path = OJP - url = https://github.com/VDVde/OJP + ignore = dirty diff --git a/NeTEx b/NeTEx index f0f698b..604bba5 160000 --- a/NeTEx +++ b/NeTEx @@ -1 +1 @@ -Subproject commit f0f698bcc5ef29f57642ef4cbf5c8952fba89a41 +Subproject commit 604bba55adabc9462b9c42b2ad4f9e32039e1aac diff --git a/OpRa.spp b/OpRa.spp index 9e56d14..274be45 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -769,6 +769,7 @@ + @@ -779,10 +780,10 @@ - + - + @@ -793,8 +794,8 @@ + - @@ -808,7 +809,7 @@ - + @@ -817,7 +818,7 @@ - + diff --git a/README.md b/README.md index ac1d541..254bbc4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # OpRa # OpRa (Operational Raw Data) XML schema -**(C) 2024-2024 OpRa, CEN** +**(C) 2024-2026 OpRa, CEN** ## Schemas for: @@ -17,7 +17,7 @@ - OpRa (Operational Raw Data) complements the Transmodel series (NeTEx for static data, SIRI for dynamic data, OJP for trip description and journey planning) with an additional XML schema to provide a standardized format for exchanging historical data. -### Folder structure 📁 +### Folder structure The individual XML files are organized hierarchically in folders, following the same structure as the uses case identified in the OpRa Technical Report. The architecture is: @@ -29,7 +29,7 @@ The individual XML files are organized hierarchically in folders, following the - You can refer to the Transmodel UML Conceptual models for a detailed UML view of the schema packages. - These models are available in electronic format. -## Getting started 🚀 +## Getting started ### Main root schemas @@ -64,7 +64,7 @@ The schema is systematically divided into small modular files. Generally, for ea - **OpRa_xxxx_version.xsd**: Contains the element definitions. ---- -## Branches 🌿 +## Branches | Branch Name | Description | Link | | ----------- | ------------------------------------------------------- | ----------------------------------------------- | @@ -77,7 +77,7 @@ The schema is systematically divided into small modular files. Generally, for ea | -------------- | ------------- | ---------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------- | | 1.0 | Month 2024 | Initial productive version | [Code](https://github.com/OpRa-CEN/OpRa/releases/tag/v1.0) | [Release Notes](https://github.com/OpRa-CEN/OpRa/blob/v1.0/README.md) | -## Full Version History 📚 +## Full Version History The comprehensive versions history is available in [change_log.md](https://github.com/ITxPT/NeTEx/blob/NeTEx/change_log.md) diff --git a/SIRI b/SIRI index 67a93fb..7e35ee2 160000 --- a/SIRI +++ b/SIRI @@ -1 +1 @@ -Subproject commit 67a93fbcc43e6d285f8ac02323732a279ba7a27a +Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 diff --git a/examples/PlannedFleetDimensions.xml b/examples/PlannedFleetDimensions.xml new file mode 100644 index 0000000..cc22c1a --- /dev/null +++ b/examples/PlannedFleetDimensions.xml @@ -0,0 +1,29 @@ + + + + 2025-12-17T09:30:47Z + OpraExamples + + + 2025-12-17T09:30:47Z + PlannedFleetDimensions example on the sample network, grouped by vehicle modes. + + + + + trolleyBus + 2 + 1 + + + bus + 1 + 1 + + + + + + + + diff --git a/examples/PlannedServiceDimensions.xml b/examples/PlannedServiceDimensions.xml index d9163b1..1c56deb 100644 --- a/examples/PlannedServiceDimensions.xml +++ b/examples/PlannedServiceDimensions.xml @@ -6,37 +6,44 @@ 2025-12-17T09:30:47Z - Planned service dimensions example on the sample network. + PlannedServiceDimensions example on the sample network, grouped by journey patterns. - Raw + + SiKilometresAndMetres + - - - 18 - 1 - 2 - 96 - 1260 - 1176 - 0 - 0 + + 6 + 25 + 6000 + 150 - - - - - 9 - 1 - 1 - 24 - 315 - 294 - 0 - 0 + + + 6 + 25 + 6200 + 155 + + + + + 6 + 10 + 5700 + 57 + + + + + 6 + 10 + 5800 + 58 diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 9de3cc6..62d7c77 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -3,8 +3,7 @@ - - + @@ -100,7 +99,7 @@ - Opra Service Request. + OpRa Service Request. @@ -110,7 +109,7 @@ - OpRa Functional Service Concrete Requests. + OpRa Functional Service Requests. @@ -119,8 +118,7 @@ - - Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse. + Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse. @@ -143,7 +141,7 @@ - OpRa Functional Service Subscription types. For a given SubscriptionRequest, must all be of the same service type. + OpRa Subscription types. For a given SubscriptionRequest, must all be of the same service type. @@ -251,12 +249,12 @@ - Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. + Requests a the current capabilities of the server. Answered with a CapabilitiesResponse. Reserved for future use. - Type for Requests for capabilities of the current system. + Type for Requests for capabilities of the current system. Reserved for future use. @@ -279,7 +277,7 @@ - Defines the capabilities of an individual OpRa service request functions. + Defines the capabilities of an individual OpRa service request functions. Reserved for future use. @@ -288,12 +286,12 @@ - Responses with the capabilities of an implementation. + Responses with the capabilities of an implementation. Reserved for future use. - Type for the capabilities of an implementation. + Type for the capabilities of an implementation. Reserved for future use. @@ -305,7 +303,7 @@ - Defines the capabilities of an individual OpRa service delivery functions. + Defines the capabilities of an individual OpRa service delivery functions. Reserved for future use. @@ -313,8 +311,15 @@ + + Reference data availability information block of a Discovery Response. + - + + + Collection of Opra Discovery Deliveries. + + diff --git a/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd similarity index 73% rename from xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd rename to xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd index 73858a9..bc90b28 100644 --- a/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd @@ -1,6 +1,6 @@ - + @@ -21,7 +21,7 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/opra/1.0/xsd/opra_frames/opra_actualServiceFrame_version.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_frames/opra_actualFrame_version.xsd [ISO 639-2/B] ENG Unclassified @@ -46,38 +46,38 @@ Rail transport, Roads and Road transport Standard - OpRa ACTUAL SERVICE FRAME, containing data for concluded actual service. + OpRa ACTUAL FRAME, containing data for concluded actual service. - + - Type for identifier of an ActualServiceFrame. + Type for identifier of an ActualFrame. - + - Reference element to an ActualServiceFrame. + Reference element to an ActualFrame. - + - Type for a reference element to an ActualServiceFrame. + Type for a reference element to an ActualFrame. - + - + The container element for the actual service within the VALIDITY CONDITIONs. - + @@ -89,29 +89,29 @@ Rail transport, Roads and Road transport - + - + - + - Type for an ActualServiceFrame. + Type for an ActualFrame. - + - + - Elements for an ActualServiceFrame. + Elements for an ActualFrame. @@ -120,7 +120,7 @@ Rail transport, Roads and Road transport - ActualServiceFrame content group. + ActualFrame content group. diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index c515f2c..409b32e 100644 --- a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd @@ -123,6 +123,13 @@ Elements for an OpRa CONTEXTUAL INDICATOR FRAME. + + + + + + + @@ -136,4 +143,16 @@ + + + + + + + + + + + + diff --git a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index 27653d1..4d25148 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -18,6 +18,7 @@ + @@ -167,7 +168,13 @@ Rail transport, Roads and Road transport Elements for a OpRa INDICATOR FRAME. - + + + + + + + @@ -182,15 +189,24 @@ Rail transport, Roads and Road transport - - - - - - - + + + Default scope specification for contained indicators. + + + + + + + + + + + Default capacity method and capacity values for indicators utilizing vehicle capacities. + + diff --git a/xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd similarity index 73% rename from xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd rename to xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd index 52b779b..fb23e56 100644 --- a/xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd @@ -1,6 +1,6 @@ - + @@ -22,7 +22,7 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd [ISO 639-2/B] ENG Unclassified @@ -43,42 +43,42 @@ CEN TC278 WG3 SG10. - Opra Planned Service Frame + Opra Planned Frame Standard - OpRa PLANNED SERVICE FRAME. + OpRa PlannedFrame, containing/referring data for planned service. - + - Type for identifier of an OpRa PLANNED SERVICE FRAME. + Type for identifier of a PlannedFrame. - + - Reference element to an OpRa PLANNED SERVICE FRAME. + Reference element to an OpRa PlannedFrame. - + - Type for a reference to an OpRa PLANNED SERVICE FRAME. + Type for a reference to an OpRa PlannedFrame. - + - + The planned service within the frame VALIDITY CONDITIONs. - + @@ -90,34 +90,34 @@ - + - + - + - Type for an OpRa PLANNED SERVICE FRAME. + Type for a PlannedFrame. - + - + - Elements for an OpRa PLANNED SERVICE FRAME. + Elements for a PlannedFrame. - An optional link to a previously published NeTEx feed content. + An optional link to a previously published NeTEx feed content location. @@ -126,7 +126,7 @@ - OpRa related elements in the PLANNED SERVICE FRAME. + OpRa related elements in the PlannedFrame. diff --git a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd index 5829a3c..faeef88 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd @@ -186,7 +186,7 @@ Rail transport, Roads and Road transport - Elements for a generic conrete LOG ENTRY + Elements for a generic concrete LOG ENTRY diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index 93e4aa5..b863e38 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 @@ - + @@ -104,7 +104,7 @@ Rail transport, Roads and Road transport - Context definition, indicator value and unit of measure for a CONTEXTUAL INDICATOR. + Context definition and indicator value for a CONTEXTUAL INDICATOR. diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 176dc83..9e4d804 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -2,19 +2,65 @@ - - + + - + + + + 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_payload_framework.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 Generic Payload definition. + Type for the possible data objects within an OpRa payload. - - + + diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index e4857f1..c090941 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -1,6 +1,6 @@ - + @@ -72,14 +72,24 @@ Rail transport, Roads and Road transport Representation of an interval bounded by DURATION values. + + + Signals if the start duration is in the negative domain. + + - + Signals if the start value is included in the interval (longer-than or longer-or-equal-than) + + + Signals if the end duration is in the negative domain. + + - + Signals if the end is included in the interval (shorter-than or shorter-or-equal-than) 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..f96a5d2 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -13,13 +13,10 @@ - - - - - - + + + diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index 638fe6b..9303513 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -1,10 +1,10 @@ - + - + - + @@ -68,7 +68,7 @@ Rail transport, Roads and Road transport 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. @@ -106,7 +106,7 @@ Rail transport, Roads and Road transport - + @@ -193,7 +193,7 @@ Rail transport, Roads and Road transport - + @@ -222,14 +222,15 @@ Rail transport, Roads and Road transport 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. diff --git a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index ec87a47..81c6fda 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,10 +1,10 @@ - + - + - + @@ -61,6 +61,11 @@ Rail transport, Roads and Road transport Representation of a specific DELAY. + + + Signals if the time value represents being early instead of being late. + + The actual delay of the DATED VEHICLE JOURNEY. @@ -124,7 +129,7 @@ Rail transport, Roads and Road transport - + @@ -205,7 +210,7 @@ Rail transport, Roads and Road transport - + @@ -235,6 +240,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 b724943..0f3e664 100644 --- a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -1,10 +1,10 @@ - + - + - + @@ -88,7 +88,7 @@ Rail transport, Roads and Road transport - + @@ -152,6 +152,9 @@ Rail transport, Roads and Road transport Dynamic (may change in each state) elements for an AggregatedOnboardDeviceBasedPassengerCount (as a LOG ENTRY) + + + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 24190ec..ae41a16 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -49,18 +49,18 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG10. - Opra Operation Raw Data Exchange + OpRa Service Dimensions indicators. Standard - OpRa PlannedServiceDimensions + OpRa Planned and Actual Service Dimensions - Reference element of an PLANNED SERVICE DIMENSIONS. + Reference element of PLANNED SERVICE DIMENSIONS. @@ -80,7 +80,7 @@ Rail transport, Roads and Road transport - + @@ -123,7 +123,7 @@ Rail transport, Roads and Road transport - + @@ -168,6 +168,16 @@ Rail transport, Roads and Road transport + + + Total length of ROUTEs within the scope. + + + + + Total length of ROUTE LINKs comprising the network within the scope. + + The total length of VEHICLE JOURNEYs (including DEAD RUNs) within the scope. TRAIN ELEMENTs shall be considered on per-element level. diff --git a/xsd/OpRa_publication.xsd b/xsd/opra_publication.xsd similarity index 100% rename from xsd/OpRa_publication.xsd rename to xsd/opra_publication.xsd diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index ced84df..93764f7 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,6 +1,6 @@ - + @@ -26,13 +26,13 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/Opra/1.0/xsd/Opra_request.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_request.xsd [ISO 639-2/B] ENG Unclassified
    -
  • Created for Opra
    • +
  • Created for OpRa
Initial Version @@ -51,7 +51,7 @@ Standard - Opra abstract REQUEST/DELIVERY/SUBSCRIPTION/STATUS/DISCOVERY SCHEMA + Opra abstract Request/Delivery/Subscription/Status/Discovery schema. @@ -114,7 +114,7 @@ - + Generic abstract OpRa request element. Substitute this element with topic-specific request elements. @@ -133,6 +133,9 @@ + + Grouping instructions for generating datasets. + @@ -153,6 +156,9 @@ + + Aggregation function for generating datasets. + @@ -160,9 +166,12 @@ + + Structure to present dataset generation instructions. + - + @@ -194,7 +203,7 @@ - + Abstract delivery element, responding for OpraRequest elements. @@ -213,31 +222,62 @@ + + Functional Delivery structure, with description. + - + + + Collection element for OpraFunctionDelivery elements. + + + + Type for a collection of OpraFunctionDelivery elements. + - + + + General OpRa Subscription Request that subscribes to PublicationDelivery responses. + + + + Type for an OpraSubscriptionRequest. + - + + + Collection element for OpraSubscriptionRequest elements. + + + + Type for a collection of OpraSubscriptionRequest elements. + - + + + Abstract OpRa Discovery Request element. + + + + Type for an OpraDiscoveryRequest element. + @@ -245,43 +285,88 @@ + + Filtering capabilities for an OpraDiscoveryRequest. + - + + + Collection element for OpraDiscoveryRequest elements. + + + + Type for a collection of OpraDiscoveryRequest elements. + - + + + Reserved for future use. + + + + Reserved for future use. + - + + + Reserved for future use. + + + + Reserved for future use. + - + + + Reserved for future use. + + + + Reserved for future use. + - + + + Reserved for future use. + + + + Reserved for future use. + - + + + Abstract element to return Discovery results. Specialisations shall include the reference data structures. + + + + Type for the abstract OpraDiscoveryDelivery element. + @@ -289,15 +374,29 @@ + + Filtering capabilities of an OpraDiscoveryDelivery. + - + + + Collection element for OpraDiscoveryDelivery elements. + + + + Type for a collection of OpraDiscoveryDelivery elements. + - + + + Abstract Discovery Delivery element. + + @@ -313,7 +412,7 @@ - + ProblemDetailGroup @@ -322,7 +421,11 @@ - + + + Error type text. + + Detailed description of the problem. diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd index 346639d..c1124e7 100644 --- a/xsd/opra_service/opra_all_services.xsd +++ b/xsd/opra_service/opra_all_services.xsd @@ -3,8 +3,8 @@ - - + + diff --git a/xsd/opra_service/opra_service_actualService.xsd b/xsd/opra_service/opra_service_actualFrame.xsd similarity index 76% rename from xsd/opra_service/opra_service_actualService.xsd rename to xsd/opra_service/opra_service_actualFrame.xsd index a0c0269..7f09abf 100644 --- a/xsd/opra_service/opra_service_actualService.xsd +++ b/xsd/opra_service/opra_service_actualFrame.xsd @@ -1,11 +1,8 @@ - + - - + @@ -25,7 +22,7 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_actualService.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_actualFrame.xsd [ISO 639-2/B] ENG Unclassified @@ -50,31 +47,31 @@ Standard - OpRa ACTUAL SERVICE Request / Discovery + OpRa ACTUAL FRAME Request / Discovery - + - A request element to get ACTUAL SERVICE FRAMEs. + A request element to get ACTUAL FRAMEs. - + - Type for the request element to get ACTUAL SERVICE FRAMEs. + Type for the request element to get ACTUAL FRAMEs. - + - + - References that extend filtering capabilites of requests for ACTUAL SERVICE FRAMEs. + References that extend filtering capabilites of requests for ACTUAL FRAMEs. - Signals if only the differences between the PLANNED SERVICE and the ACTUAL SERVICE is requested within the frame of the request. + Signals if only the differences between the PLANNED FRAME and the ACTUAL FRAME is requested within the frame of the request. diff --git a/xsd/opra_service/opra_service_contextualIndicators.xsd b/xsd/opra_service/opra_service_contextualIndicators.xsd index 3eb48bb..fcd37fc 100644 --- a/xsd/opra_service/opra_service_contextualIndicators.xsd +++ b/xsd/opra_service/opra_service_contextualIndicators.xsd @@ -52,12 +52,12 @@ - A request element to get KPIs. + A request element to get CONTEXTUAL INDICATORs. - Type for the request element to get KPIs. + Type for the request element to get CONTEXTUAL INDICATORs. @@ -67,7 +67,7 @@ - References that extend filtering capabilities of requests for KPIs. + References that extend filtering capabilities of requests for CONTEXTUAL INDICATORs. @@ -84,12 +84,12 @@ - A request element to get KPIs. + A request element to get CONTEXTUAL INDICATORs. - Type for the request element to get KPIs. + Type for the request element to get CONTEXTUAL INDICATORs. diff --git a/xsd/opra_service/opra_service_plannedService.xsd b/xsd/opra_service/opra_service_plannedFrame.xsd similarity index 84% rename from xsd/opra_service/opra_service_plannedService.xsd rename to xsd/opra_service/opra_service_plannedFrame.xsd index 922d728..fa0e32f 100644 --- a/xsd/opra_service/opra_service_plannedService.xsd +++ b/xsd/opra_service/opra_service_plannedFrame.xsd @@ -1,6 +1,6 @@ - + @@ -22,7 +22,7 @@ http://www.w3.org/2001/XMLSchema XML schema, W3C Recommendation 2001 - {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_plannedService.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_plannedFrame.xsd [ISO 639-2/B] ENG Unclassified @@ -47,26 +47,26 @@ Standard - OpRa PLANNED SERVICE Request schema. + OpRa PLANNED FRAME Request schema. - + - A request element to get PLANNED SERVICE FRAMEs. + A request element to get PLANNED FRAMEs. - + - Type for the request element to get PLANNED SERVICE FRAMEs. + Type for the request element to get PLANNED FRAMEs. - + - + - References that extend filtering capabilities of requests for PLANNED SERVICE FRAMEs. + References that extend filtering capabilities of requests for PLANNED FRAMEs.