From 1b8851fa566f75b6a4772a25c095dca673e3a63b Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 00:57:49 +0100 Subject: [PATCH 01/50] Remove NeTEx facade, imports fix - removed opra_netex_facade.xsd file - fixed NeTEx FW, P1, P2, FareFrame (P3) imports --- xsd/opra_imports/opra_netex_facade.xsd | 113 ------------------------ xsd/opra_imports/opra_netex_imports.xsd | 6 +- 2 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 xsd/opra_imports/opra_netex_facade.xsd 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..4dbd4c5 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -13,13 +13,15 @@ + - + + @@ -65,4 +67,4 @@ Common NeTEx import node for OpRa schema - + \ No newline at end of file From 1ed7be64ad91e7478cbf6c81af9800b45a82638b Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 10:41:44 +0100 Subject: [PATCH 02/50] validation tinkering --- .github/scripts/validate-and-lint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 26c178a..6a8fcb0 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -7,9 +7,10 @@ # 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, usefull only when there is a submodule update (can be commented most of the time) +echo "Synchronising submodules ..." +#git submodule update --init --recursive +git submodule --init --recursive #------------------------------------------------------- From af06401df47182362ca07f3c296a2ebc2e3230dd Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 10:43:51 +0100 Subject: [PATCH 03/50] validation tinkering --- .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 6a8fcb0..3511a9d 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -10,7 +10,7 @@ set -e # Update the submodules, usefull only when there is a submodule update (can be commented most of the time) echo "Synchronising submodules ..." #git submodule update --init --recursive -git submodule --init --recursive +git submodule init --recursive #------------------------------------------------------- From 9133c894df8602e40f018761d2b3d55fc6c29c68 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 10:46:00 +0100 Subject: [PATCH 04/50] validation tinkering --- .github/scripts/validate-and-lint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 3511a9d..aa71397 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -7,10 +7,9 @@ # 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 submodule update (can be commented most of the time) -echo "Synchronising submodules ..." +# Update the submodules, useful only when there is a submodule update (can be commented most of the time) +#echo "Synchronising submodules ..." #git submodule update --init --recursive -git submodule init --recursive #------------------------------------------------------- From c764a19167df7533a0aeacc0f3b135d01cd52af3 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 10:55:05 +0100 Subject: [PATCH 05/50] validation tinkering --- NeTEx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeTEx b/NeTEx index f0f698b..604bba5 160000 --- a/NeTEx +++ b/NeTEx @@ -1 +1 @@ -Subproject commit f0f698bcc5ef29f57642ef4cbf5c8952fba89a41 +Subproject commit 604bba55adabc9462b9c42b2ad4f9e32039e1aac From ad9baa9d24b5998a8e061b4178d778a979d34d9b Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 10 Mar 2026 14:59:23 +0100 Subject: [PATCH 06/50] validation tinkering --- .github/scripts/validate-and-lint.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index aa71397..352c14e 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -8,8 +8,11 @@ set -e # Update the submodules, useful only when there is a submodule update (can be commented most of the time) -#echo "Synchronising submodules ..." -#git submodule update --init --recursive +echo "Synchronising submodules ..." +git submodule deinit -f NeTEx +rm -rf .git/modules/NeTEx +rm -rf NeTEx +git submodule update --init --recursive #------------------------------------------------------- From 38070f134d041c3d148ed7942ede11752122170e Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Tue, 10 Mar 2026 20:57:36 +0100 Subject: [PATCH 07/50] Ignore local .tmp and docs/uml --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29..61dcfeb 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +docs/uml/ +.tmp From 6d17f5761a889e6413fedd4d092d34795b6c1f69 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Wed, 11 Mar 2026 02:27:42 +0100 Subject: [PATCH 08/50] Remove local-only ignore rules from repository --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 61dcfeb..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +0,0 @@ -docs/uml/ -.tmp From 8740a1949e6afa08b2601841725acad1af2167ca Mon Sep 17 00:00:00 2001 From: Tim Rivett Date: Fri, 13 Mar 2026 11:03:02 +0000 Subject: [PATCH 09/50] Spelling check Corrected spelling errors. --- xsd/opra.xsd | 2 +- .../opra_genericFramework/opra_GeneralLogEntry_version.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 9de3cc6..dbf9761 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -251,7 +251,7 @@ - Requests a the current capabilities of the server. Answred with a CapabilitiesResponse. + Requests a the current capabilities of the server. Answered with a CapabilitiesResponse. 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 From f0121dea066237f16fb62bc1fbe021ef39941b83 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 12:20:32 +0100 Subject: [PATCH 10/50] Test for better sync of submodules from https://www.tutorialpedia.org/blog/using-github-actions-to-automatically-update-the-repo-s-submodules/ --- .github/scripts/validate-and-lint.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 352c14e..43c1c1b 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -9,10 +9,21 @@ set -e # Update the submodules, useful only when there is a submodule update (can be commented most of the time) echo "Synchronising submodules ..." -git submodule deinit -f NeTEx -rm -rf .git/modules/NeTEx -rm -rf NeTEx -git submodule update --init --recursive +#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) +git submodule sync --recursive +# Update submodules to latest remote commits and merge +git submodule update --remote --merge --recursive +# Stage changes to submodule references +git add .gitmodules */.gitmodules # Add all .gitmodules files +git add NeTEx +git add SIRI +git add OJP #------------------------------------------------------- From 75e15cd1a9d203147098bf43a841757430257977 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 12:24:31 +0100 Subject: [PATCH 11/50] Step 2 on better sync of submodules --- .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 43c1c1b..9c938c9 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -20,7 +20,7 @@ git submodule sync --recursive # Update submodules to latest remote commits and merge git submodule update --remote --merge --recursive # Stage changes to submodule references -git add .gitmodules */.gitmodules # Add all .gitmodules files +#git add .gitmodules */.gitmodules # Add all .gitmodules files git add NeTEx git add SIRI git add OJP From efb4a3cb318e84456daf489fcb2483de3f1e2827 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 12:56:12 +0100 Subject: [PATCH 12/50] SIRI update --- SIRI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SIRI b/SIRI index 67a93fb..7e35ee2 160000 --- a/SIRI +++ b/SIRI @@ -1 +1 @@ -Subproject commit 67a93fbcc43e6d285f8ac02323732a279ba7a27a +Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 From fdd3f76a8a4c3769ee26a2d4f245b81532b4b7d2 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 13:03:30 +0100 Subject: [PATCH 13/50] Step 3 on better sync of submodules --- .github/scripts/validate-and-lint.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 9c938c9..ce08382 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -16,14 +16,7 @@ echo "Synchronising submodules ..." # Sync submodule remote URLs (in case .gitmodules changed) -git submodule sync --recursive -# Update submodules to latest remote commits and merge -git submodule update --remote --merge --recursive -# Stage changes to submodule references -#git add .gitmodules */.gitmodules # Add all .gitmodules files -git add NeTEx -git add SIRI -git add OJP +git submodule update --init --recursive #------------------------------------------------------- From 292c9e7f92fff4a9e067686e6687dffc5bbf70ce Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 14:26:09 +0100 Subject: [PATCH 14/50] @Aurige Step 3 on fixing sync of submodules --- .github/scripts/validate-and-lint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index ce08382..2f09e2f 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -16,6 +16,11 @@ echo "Synchronising submodules ..." # Sync submodule remote URLs (in case .gitmodules changed) +cd SIRI +git fetch origin +cd .. +#git submodule update --remote SIRI +#git add SIRI git submodule update --init --recursive #------------------------------------------------------- From be16352453c0e15361ef30b6f98b313c0f64a43b Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 14:35:57 +0100 Subject: [PATCH 15/50] Step 5 on fixing sync of submodules --- .github/scripts/validate-and-lint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 2f09e2f..665da84 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -18,9 +18,11 @@ echo "Synchronising submodules ..." # Sync submodule remote URLs (in case .gitmodules changed) cd SIRI git fetch origin +git reset --hard origin/SIRI-for-OpRa +git checkout SIRI-for-OpRa cd .. #git submodule update --remote SIRI -#git add SIRI +git add SIRI git submodule update --init --recursive #------------------------------------------------------- From 5b87f5feee4025b1081ed7b100bff99f8f18826a Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 14:49:52 +0100 Subject: [PATCH 16/50] Step 6 on fixing sync of submodules --- .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 665da84..ecde953 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -23,7 +23,7 @@ git checkout SIRI-for-OpRa cd .. #git submodule update --remote SIRI git add SIRI -git submodule update --init --recursive +git submodule update --init --recursive --remote #------------------------------------------------------- From b1af4cbf93150ab8ed6ce95978ca32c25aab2bc1 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 15:06:31 +0100 Subject: [PATCH 17/50] Step 7 on fixing sync of submodules --- .github/scripts/validate-and-lint.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index ecde953..a8f923d 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -17,13 +17,12 @@ echo "Synchronising submodules ..." # Sync submodule remote URLs (in case .gitmodules changed) cd SIRI -git fetch origin -git reset --hard origin/SIRI-for-OpRa -git checkout SIRI-for-OpRa +git fetch origin SIRI-for-OpRa +git checkout origin/SIRI-for-OpRa cd .. -#git submodule update --remote SIRI git add SIRI -git submodule update --init --recursive --remote +git commit -m "Update SIRI submodule to latest SIRI-for-OpRa commit" +git push #------------------------------------------------------- From 4ecc6d04ab0766d761d0f56bad9f4a1a74363304 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 15:11:15 +0100 Subject: [PATCH 18/50] Step 8 on fixing sync of submodules --- .github/scripts/validate-and-lint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index a8f923d..51408f0 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -21,8 +21,7 @@ git fetch origin SIRI-for-OpRa git checkout origin/SIRI-for-OpRa cd .. git add SIRI -git commit -m "Update SIRI submodule to latest SIRI-for-OpRa commit" -git push + #------------------------------------------------------- From 94e2ab65d0e6dca72fe2a7c9011bc03cf55567d0 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 15:27:57 +0100 Subject: [PATCH 19/50] Step 9 on fixing sync of submodules --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a869717..e2e9e61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,9 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - + with: + submodules: false + - name: Update git submodules run: git submodule update --init --recursive From da0c4e7565ad7295d2cf9764c503ec771306d1c6 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 15:41:29 +0100 Subject: [PATCH 20/50] Remove SIRI submodule to reset it --- .gitmodules | 4 ---- SIRI | 1 - 2 files changed, 5 deletions(-) delete mode 160000 SIRI diff --git a/.gitmodules b/.gitmodules index 5a0ddf8..77df918 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = NeTEx url = https://github.com/NeTEx-CEN/NeTEx branch = v2.0 -[submodule "SIRI"] - path = SIRI - url = https://github.com/Aurige/SIRI - branch = SIRI-for-OpRa [submodule "OJP"] path = OJP url = https://github.com/VDVde/OJP diff --git a/SIRI b/SIRI deleted file mode 160000 index 7e35ee2..0000000 --- a/SIRI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 From 5eb8f5ff5164bb06df85cd51ab8f1d71043cec28 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 15:50:46 +0100 Subject: [PATCH 21/50] Re-add SIRI submodule tracking SIRI-for-OpRa branch --- .gitmodules | 4 ++++ SIRI | 1 + 2 files changed, 5 insertions(+) create mode 160000 SIRI diff --git a/.gitmodules b/.gitmodules index 77df918..3bf2551 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,7 @@ [submodule "OJP"] path = OJP url = https://github.com/VDVde/OJP +[submodule "SIRI"] + path = SIRI + url = https://github.com/Aurige/SIRI + branch = SIRI-for-OpRa diff --git a/SIRI b/SIRI new file mode 160000 index 0000000..7e35ee2 --- /dev/null +++ b/SIRI @@ -0,0 +1 @@ +Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 From e2ef4b901b2c776a54218e457eb5aa275b81a5d0 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 16:11:12 +0100 Subject: [PATCH 22/50] Remove SIRI submodule to reset it --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3bf2551..77df918 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,3 @@ [submodule "OJP"] path = OJP url = https://github.com/VDVde/OJP -[submodule "SIRI"] - path = SIRI - url = https://github.com/Aurige/SIRI - branch = SIRI-for-OpRa From b2cf84a278519f6c88d4a76fffc3e4d55608db45 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 16:12:29 +0100 Subject: [PATCH 23/50] Step 11 on fixing sync of submodules recreation of SIRI Submodule --- .github/scripts/validate-and-lint.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index 51408f0..40161e9 100755 --- a/.github/scripts/validate-and-lint.sh +++ b/.github/scripts/validate-and-lint.sh @@ -9,6 +9,8 @@ set -e # 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 @@ -16,11 +18,11 @@ echo "Synchronising submodules ..." # 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 +#cd SIRI +#git fetch origin SIRI-for-OpRa +#git checkout origin/SIRI-for-OpRa +#cd .. +#git add SIRI #------------------------------------------------------- From ed4804065a287d826efac6ca3a63743da831c613 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 16:18:03 +0100 Subject: [PATCH 24/50] Delete SIRI --- SIRI | 1 - 1 file changed, 1 deletion(-) delete mode 160000 SIRI diff --git a/SIRI b/SIRI deleted file mode 160000 index 7e35ee2..0000000 --- a/SIRI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 From 93adf4e3040b79ed3b25a87785af126e11406ff2 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 16:23:22 +0100 Subject: [PATCH 25/50] Re-add SIRI submodule tracking SIRI-for-OpRa branch --- .gitmodules | 4 ++++ SIRI | 1 + 2 files changed, 5 insertions(+) create mode 160000 SIRI diff --git a/.gitmodules b/.gitmodules index 77df918..3bf2551 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,7 @@ [submodule "OJP"] path = OJP url = https://github.com/VDVde/OJP +[submodule "SIRI"] + path = SIRI + url = https://github.com/Aurige/SIRI + branch = SIRI-for-OpRa diff --git a/SIRI b/SIRI new file mode 160000 index 0000000..7e35ee2 --- /dev/null +++ b/SIRI @@ -0,0 +1 @@ +Subproject commit 7e35ee27419d3ede638cb8714feff96b208715c9 From b0dbf1eb6fcbfdf18e13b2f49e14b4cb7dc6cead Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 16:45:40 +0100 Subject: [PATCH 26/50] other try :-( --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2e9e61..dc177b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: submodules: false - name: Update git submodules - run: git submodule update --init --recursive + run: git submodule update --init --recursive --depth 1 - name: Install xmllint and xsltproc run: | From bfe951aaa8adb787092b2ed8efd99938e3b877ce Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 17:33:52 +0100 Subject: [PATCH 27/50] one more (exclusion des Modules du commit du Yaml) --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc177b8..a69bbc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: submodules: false - name: Update git submodules - run: git submodule update --init --recursive --depth 1 + run: git submodule update --init --recursive - name: Install xmllint and xsltproc run: | @@ -34,4 +34,5 @@ jobs: with: default_author: github_actions message: 'Lint and update documentation tables' + exclude: '.gitmodules SIRI NeTEx OJP' From 7a406a229a2faeaa010c300d52f7be2566fef853 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 17:50:46 +0100 Subject: [PATCH 28/50] add au lieu de exclude --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a69bbc2..14032a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,5 +34,5 @@ jobs: with: default_author: github_actions message: 'Lint and update documentation tables' - exclude: '.gitmodules SIRI NeTEx OJP' + add: 'xsd examples' From 832823ca15788b44f81af43d14b7eb6255c80d9a Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 18:05:32 +0100 Subject: [PATCH 29/50] better exclusion --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14032a7..3be19c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,12 @@ jobs: - name: Validate OpRa XML examples run: ./.github/scripts/validate-examples.sh - + + - name: Détager les submodules + run: | + git reset -- SIRI OJP NeTEx + git checkout -- SIRI OJP NeTEx + - name: Commit changes uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit with: From 258e824e7e55976226c36be10ad22114deb696b4 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 18:20:58 +0100 Subject: [PATCH 30/50] Trying dirty submodules --- .github/workflows/ci.yml | 6 ------ .gitmodules | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3be19c1..8f77b8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,16 +28,10 @@ jobs: - name: Validate OpRa XML examples run: ./.github/scripts/validate-examples.sh - - - name: Détager les submodules - run: | - git reset -- SIRI OJP NeTEx - git checkout -- SIRI OJP NeTEx - name: Commit changes uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit with: default_author: github_actions message: 'Lint and update documentation tables' - add: 'xsd examples' diff --git a/.gitmodules b/.gitmodules index 3bf2551..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 + ignore = dirty From 08430bd99058a61f21bb36cc1880122076ffb3da Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Mon, 16 Mar 2026 18:39:52 +0100 Subject: [PATCH 31/50] harder resync --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f77b8d..e808e9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,10 @@ jobs: 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: | From b75cf6df0384b23e4f0781220b6328932924485a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:44:17 +0000 Subject: [PATCH 32/50] Lint and update documentation tables --- xsd/opra_imports/opra_netex_imports.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/opra_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 4dbd4c5..8746361 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -67,4 +67,4 @@ Common NeTEx import node for OpRa schema - \ No newline at end of file + From 9fae3e20dd3822c94650672e2717af8fdc031511 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 17 Mar 2026 15:32:12 +0100 Subject: [PATCH 33/50] Annotations review --- xsd/opra.xsd | 38 +- xsd/opra_framework/opra_payload_framework.xsd | 52 +- xsd/opra_imports/opra_netex_imports.xsd | 7 +- xsd/opra_request.xsd | 709 ++++++++++-------- 4 files changed, 478 insertions(+), 328 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index dbf9761..77d0f14 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,10 +1,10 @@ - + - - + + @@ -100,7 +100,7 @@ - Opra Service Request. + OpRa Service Request. @@ -110,7 +110,7 @@ - OpRa Functional Service Concrete Requests. + OpRa Functional Service Requests. @@ -119,8 +119,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 +142,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 +250,12 @@ - Requests a the current capabilities of the server. Answered 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 +278,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 +287,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 +304,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 +312,15 @@ + + Reference data availability information block of a Discovery Response. + - + + + Collection of Opra Discovery Deliveries. + + - + \ No newline at end of file diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 176dc83..4e1a155 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -1,4 +1,4 @@ - + @@ -6,8 +6,54 @@ - - + + + + 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_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 8746361..956c3dd 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,4 +1,4 @@ - + @@ -14,12 +14,7 @@ - - - - - diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index ced84df..d2d3fda 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,15 +1,15 @@ - + - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -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,293 +51,396 @@ 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. + + + + + + + + + + + + + Grouping instructions for generating datasets. + + + + + + + + + + + + + + + + + + + + + + + Aggregation function for generating datasets. + + + + + + + + + + Structure to present dataset generation instructions. + + + + + + + + + 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. + + + + + + + + + + + + + Functional Delivery structure, with description. + + + + + + + + + Collection element for OpraFunctionDelivery elements. + + + + + Type for a collection of OpraFunctionDelivery elements. + + + + + + + + Abstract OpRa Subscription Request. + + + + + 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. + + + + + + + + + + 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. + + + + + + + + + + Filtering capabilities of an OpraDiscoveryDelivery. + + + + + + + + + Collection element for OpraDiscoveryDelivery elements. + + + + + Type for a collection of OpraDiscoveryDelivery elements. + + + + + Abstract Discovery Delivery element. + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + Error type text. + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + + \ No newline at end of file From 48c4c81947e9e7ad75a888ab282c7cb199500bf2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 14:36:16 +0000 Subject: [PATCH 34/50] Lint and update documentation tables --- xsd/opra.xsd | 7 +- xsd/opra_framework/opra_payload_framework.xsd | 78 +- xsd/opra_imports/opra_netex_imports.xsd | 2 +- xsd/opra_request.xsd | 808 +++++++++--------- 4 files changed, 447 insertions(+), 448 deletions(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 77d0f14..6fa87d1 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -1,10 +1,9 @@ - + - - + @@ -323,4 +322,4 @@ - \ No newline at end of file + diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index 4e1a155..bfa7b58 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -1,4 +1,4 @@ - + @@ -6,37 +6,37 @@ - - - - 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 - + + + + 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 - - + +
    +
  • Created for Opra
    • +
+ + Initial Version + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, Air transport, Airports, Ports and maritime transport, Ferries (marine), @@ -45,15 +45,15 @@ 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. - - + 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_imports/opra_netex_imports.xsd b/xsd/opra_imports/opra_netex_imports.xsd index 956c3dd..f96a5d2 100644 --- a/xsd/opra_imports/opra_netex_imports.xsd +++ b/xsd/opra_imports/opra_netex_imports.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index d2d3fda..398047e 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -1,15 +1,15 @@ - + - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -51,396 +51,396 @@ 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. - - - - - - - - - - - - - Grouping instructions for generating datasets. - - - - - - - - - - - - - - - - - - - - - - - Aggregation function for generating datasets. - - - - - - - - - - Structure to present dataset generation instructions. - - - - - - - - - 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. - - - - - - - - - - - - - Functional Delivery structure, with description. - - - - - - - - - Collection element for OpraFunctionDelivery elements. - - - - - Type for a collection of OpraFunctionDelivery elements. - - - - - - - - Abstract OpRa Subscription Request. - - - - - 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. - - - - - - - - - - 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. - - - - - - - - - - Filtering capabilities of an OpraDiscoveryDelivery. - - - - - - - - - Collection element for OpraDiscoveryDelivery elements. - - - - - Type for a collection of OpraDiscoveryDelivery elements. - - - - - Abstract Discovery Delivery element. - - - - - - - Element for Opra related errors. - - - - - Type for Opra Errors. - - - - - - - - ProblemDetailGroup - - - - - - - - - Error type text. - - - - - 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. + + + + + + + + + + + + + Grouping instructions for generating datasets. + + + + + + + + + + + + + + + + + + + + + + + Aggregation function for generating datasets. + + + + + + + + + + Structure to present dataset generation instructions. + + + + + + + + + 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. + + + + + + + + + + + + + Functional Delivery structure, with description. + + + + + + + + + Collection element for OpraFunctionDelivery elements. + + + + + Type for a collection of OpraFunctionDelivery elements. + + + + + + + + Abstract OpRa Subscription Request. + + + + + 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. + + + + + + + + + + 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. + + + + + + + + + + Filtering capabilities of an OpraDiscoveryDelivery. + + + + + + + + + Collection element for OpraDiscoveryDelivery elements. + + + + + Type for a collection of OpraDiscoveryDelivery elements. + + + + + Abstract Discovery Delivery element. + + + + + + + Element for Opra related errors. + + + + + Type for Opra Errors. + + + + + + + + ProblemDetailGroup + + + + + + + + + Error type text. + + + + + Detailed description of the problem. + + + + + Explanation of the problem. + + + + + Additional log data. + + + + + From 4f4470eafe82e8ee6ffd22a7533afeba5cfe8ed2 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Mon, 30 Mar 2026 00:58:24 +0200 Subject: [PATCH 35/50] PlannedFrame and ActualFrame refactor Renamed: - PlannedServiceFrame -> PlannedFrame - ActualServiceFrame -> ActualFrame to prevent semantical mix-up with NeTEx ServiceFrame --- ...rsion.xsd => opra_actualFrame_version.xsd} | 40 +- ...sion.xsd => opra_plannedFrame_version.xsd} | 44 +- xsd/opra_framework/opra_payload_framework.xsd | 8 +- .../opra_serviceDimensions_version.xsd | 426 +++++++++--------- .../opra_service_actualService.xsd | 9 +- .../opra_service_plannedService.xsd | 6 +- 6 files changed, 270 insertions(+), 263 deletions(-) rename xsd/opra_framework/opra_frames/{opra_actualServiceFrame_version.xsd => opra_actualFrame_version.xsd} (74%) rename xsd/opra_framework/opra_frames/{opra_plannedServiceFrame_version.xsd => opra_plannedFrame_version.xsd} (74%) diff --git a/xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd similarity index 74% rename from xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd rename to xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd index 73858a9..4982cb4 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. - + - 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_plannedServiceFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd similarity index 74% rename from xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd rename to xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd index 52b779b..b83d282 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 PLANNED FRAME, containing/referring data for planned service. - + - Type for identifier of an OpRa PLANNED SERVICE FRAME. + Type for identifier of an OpRa PLANNED FRAME. - + - Reference element to an OpRa PLANNED SERVICE FRAME. + Reference element to an OpRa PLANNED FRAME. - + - Type for a reference to an OpRa PLANNED SERVICE FRAME. + Type for a reference to an OpRa PLANNED FRAME. - + - + The planned service within the frame VALIDITY CONDITIONs. - + @@ -90,34 +90,34 @@ - + - + - + Type for an OpRa PLANNED SERVICE FRAME. - + - + - Elements for an OpRa PLANNED SERVICE FRAME. + Elements for an OpRa PLANNED FRAME. - 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 PLANNED FRAME. diff --git a/xsd/opra_framework/opra_payload_framework.xsd b/xsd/opra_framework/opra_payload_framework.xsd index bfa7b58..9e4d804 100644 --- a/xsd/opra_framework/opra_payload_framework.xsd +++ b/xsd/opra_framework/opra_payload_framework.xsd @@ -2,8 +2,8 @@ - - + + @@ -59,8 +59,8 @@ - - + + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 24190ec..268b4f2 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - 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 + + + + + + + + + + + + + + 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, + +
    +
  • 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, @@ -47,171 +47,181 @@ 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 a PlannedServiceDimensions and ActualServiceDimensions (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. - - - - - + CEN TC278 WG3 SG10. + + OpRa Service Dimensions indicators. + Standard + + + OpRa Planned and Actual Service Dimensions + + + + + + + Reference element of 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 a PlannedServiceDimensions and ActualServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + 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. + + + + + 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_service/opra_service_actualService.xsd b/xsd/opra_service/opra_service_actualService.xsd index a0c0269..18a1503 100644 --- a/xsd/opra_service/opra_service_actualService.xsd +++ b/xsd/opra_service/opra_service_actualService.xsd @@ -2,9 +2,6 @@ - @@ -54,12 +51,12 @@ - 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. @@ -69,7 +66,7 @@ - References that extend filtering capabilites of requests for ACTUAL SERVICE FRAMEs. + References that extend filtering capabilites of requests for ACTUAL FRAMEs. diff --git a/xsd/opra_service/opra_service_plannedService.xsd b/xsd/opra_service/opra_service_plannedService.xsd index 922d728..6e4cb64 100644 --- a/xsd/opra_service/opra_service_plannedService.xsd +++ b/xsd/opra_service/opra_service_plannedService.xsd @@ -51,12 +51,12 @@ - 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. @@ -66,7 +66,7 @@ - References that extend filtering capabilities of requests for PLANNED SERVICE FRAMEs. + References that extend filtering capabilities of requests for PLANNED FRAMEs. From 3734861c5b1592bd6e92b91edc3a44a0831bb1af Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 12:13:24 +0000 Subject: [PATCH 36/50] Lint and update documentation tables --- .../opra_frames/opra_actualFrame_version.xsd | 2 +- .../opra_frames/opra_plannedFrame_version.xsd | 2 +- .../opra_serviceDimensions_version.xsd | 436 +++++++++--------- 3 files changed, 220 insertions(+), 220 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd index 4982cb4..77786c0 100644 --- a/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd index b83d282..a90410c 100644 --- a/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/opra_indicators/opra_serviceDimensions_version.xsd b/xsd/opra_indicators/opra_serviceDimensions_version.xsd index 268b4f2..ae41a16 100644 --- a/xsd/opra_indicators/opra_serviceDimensions_version.xsd +++ b/xsd/opra_indicators/opra_serviceDimensions_version.xsd @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - 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 + + + + + + + + + + + + + + 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, + +
    +
  • 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, @@ -47,181 +47,181 @@ 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 Service Dimensions indicators. - Standard - - - OpRa Planned and Actual Service Dimensions - - - - - - - Reference element of 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 a PlannedServiceDimensions and ActualServiceDimensions (as a LOGGABLE OBJECT) - - - - - - - - - - - - - - - - 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. - - - - - 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 + CEN TC278 WG3 SG10. + + OpRa Service Dimensions indicators. + Standard + + + OpRa Planned and Actual Service Dimensions + + + + + + + Reference element of 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 a PlannedServiceDimensions and ActualServiceDimensions (as a LOGGABLE OBJECT) + + + + + + + + + + + + + + + + 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. + + + + + 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. + + + + + From 86eaeba401ddc853d34796a383a5c92ae3ccd1c8 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 1 Apr 2026 02:29:26 +0200 Subject: [PATCH 37/50] Planned and Actual Frame Services Adjusted service element names (removal of "Service") Renamed files --- xsd/opra_service/opra_all_services.xsd | 4 ++-- ...ervice.xsd => opra_service_actualFrame.xsd} | 18 +++++++++--------- ...rvice.xsd => opra_service_plannedFrame.xsd} | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) rename xsd/opra_service/{opra_service_actualService.xsd => opra_service_actualFrame.xsd} (82%) rename xsd/opra_service/{opra_service_plannedService.xsd => opra_service_plannedFrame.xsd} (89%) 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 82% rename from xsd/opra_service/opra_service_actualService.xsd rename to xsd/opra_service/opra_service_actualFrame.xsd index 18a1503..7f09abf 100644 --- a/xsd/opra_service/opra_service_actualService.xsd +++ b/xsd/opra_service/opra_service_actualFrame.xsd @@ -1,8 +1,8 @@ - + - + @@ -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_actualService.xsd + {https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_actualFrame.xsd [ISO 639-2/B] ENG Unclassified @@ -47,31 +47,31 @@ Standard - OpRa ACTUAL SERVICE Request / Discovery + OpRa ACTUAL FRAME Request / Discovery - + A request element to get ACTUAL FRAMEs. - + Type for the request element to get ACTUAL 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_plannedService.xsd b/xsd/opra_service/opra_service_plannedFrame.xsd similarity index 89% rename from xsd/opra_service/opra_service_plannedService.xsd rename to xsd/opra_service/opra_service_plannedFrame.xsd index 6e4cb64..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,24 +47,24 @@ Standard - OpRa PLANNED SERVICE Request schema. + OpRa PLANNED FRAME Request schema. - + A request element to get PLANNED FRAMEs. - + Type for the request element to get PLANNED FRAMEs. - + - + References that extend filtering capabilities of requests for PLANNED FRAMEs. From 70f2bc80a270f5c4916e35ac5efbc9dc7f3876e9 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 7 Apr 2026 14:38:40 +0200 Subject: [PATCH 38/50] Negative Durations for Delays and Duratiion Distribution - IsEarly for LateDatedVehicleJourneyEntry - IsNegative for DurationDistributionGroup - some annotation fixes --- .../opra_frames/opra_actualFrame_version.xsd | 2 +- .../opra_frames/opra_plannedFrame_version.xsd | 14 +- .../opra_durationDistribution_support.xsd | 154 ++++--- .../opra_lateDatedVehicleJourney_version.xsd | 429 +++++++++--------- 4 files changed, 307 insertions(+), 292 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd index 77786c0..bc90b28 100644 --- a/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_actualFrame_version.xsd @@ -51,7 +51,7 @@ Rail transport, Roads and Road transport - Type for identifier of an ActualServiceFrame. + Type for identifier of an ActualFrame. diff --git a/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd index a90410c..fb23e56 100644 --- a/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_plannedFrame_version.xsd @@ -47,23 +47,23 @@ Standard - OpRa PLANNED FRAME, containing/referring data for planned service. + OpRa PlannedFrame, containing/referring data for planned service. - Type for identifier of an OpRa PLANNED FRAME. + Type for identifier of a PlannedFrame. - Reference element to an OpRa PLANNED FRAME. + Reference element to an OpRa PlannedFrame. - Type for a reference to an OpRa PLANNED FRAME. + Type for a reference to an OpRa PlannedFrame. @@ -100,7 +100,7 @@ - Type for an OpRa PLANNED SERVICE FRAME. + Type for a PlannedFrame. @@ -112,7 +112,7 @@ - Elements for an OpRa PLANNED FRAME. + Elements for a PlannedFrame. @@ -126,7 +126,7 @@ - OpRa related elements in the PLANNED FRAME. + OpRa related elements in the PlannedFrame. diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index e4857f1..796571f 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -1,14 +1,14 @@ - + - - - - - - - - - + + + + + + + + + main schema e-service developers @@ -50,65 +50,75 @@ 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 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) + + + + + + + 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_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index ec87a47..0da7480 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + main schema e-service developers @@ -54,201 +54,206 @@ Rail transport, Roads and Road transport Standard - OpRa LateDatedVehicleJourney - - - - Representation of a specific DELAY. - - - - - The actual delay of the DATED VEHICLE JOURNEY. - - - - - Optional information about what triggered the DELAY. - - - - - - Reference to an OPERATIONAL EVENT that caused the DELAY. - - - - - Reference to a DELAY THRESHOLD REACHED EVENT that registered the DELAY. - - - - - - - - - - - - - Classification of the DELAY (eg. within a regulatory context) - - - - - - - Identifier type for LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - Reference to a LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - Implementation of a LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording LATE DATED VEHICLE JOURNEY information. - - - - - - - - - - - - Elements for the LATE DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. - - - - - - - - - - - A collection of one or more LateDatedVehicleJourneys. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - - - - - - - Reference type for a LATE DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - Collection of references to LATE DATED VEHICLE JOURNEY ENTRIes. - - - - - A reference to a LATE DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Elements for a LOG ENTRY related to a LateDatedVehicleJourneyEntry. - - - - - - - - - - A collection of one or more LateDatedVehicleJourneyEntry instances. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - + OpRa LateDatedVehicleJourney + + + + 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. + + + + + Optional information about what triggered the DELAY. + + + + + + Reference to an OPERATIONAL EVENT that caused the DELAY. + + + + + Reference to a DELAY THRESHOLD REACHED EVENT that registered the DELAY. + + + + + + + + + + + + + Classification of the DELAY (eg. within a regulatory context) + + + + + + + Identifier type for LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + Reference to a LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + Implementation of a LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording LATE DATED VEHICLE JOURNEY information. + + + + + + + + + + + + Elements for the LATE DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. + + + + + + + + + + + A collection of one or more LateDatedVehicleJourneys. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + + + + + + + Reference type for a LATE DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + Collection of references to LATE DATED VEHICLE JOURNEY ENTRIes. + + + + + A reference to a LATE DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Elements for a LOG ENTRY related to a LateDatedVehicleJourneyEntry. + + + + + + + + + + A collection of one or more LateDatedVehicleJourneyEntry instances. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + \ No newline at end of file From b49fb3155e4b8ee1712926fa68582ee9f872f042 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2026 12:42:53 +0000 Subject: [PATCH 39/50] Lint and update documentation tables --- .../opra_durationDistribution_support.xsd | 164 +++---- .../opra_lateDatedVehicleJourney_version.xsd | 434 +++++++++--------- 2 files changed, 299 insertions(+), 299 deletions(-) diff --git a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd index 796571f..c090941 100644 --- a/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd +++ b/xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd @@ -1,14 +1,14 @@ - + - - - - - - - - - + + + + + + + + + main schema e-service developers @@ -50,75 +50,75 @@ 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 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) - - - - - - - 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 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) + + + + + + + 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_indicators/opra_lateDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd index 0da7480..7dd8b54 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + main schema e-service developers @@ -54,206 +54,206 @@ Rail transport, Roads and Road transport Standard - OpRa LateDatedVehicleJourney - - - - 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. - - - - - Optional information about what triggered the DELAY. - - - - - - Reference to an OPERATIONAL EVENT that caused the DELAY. - - - - - Reference to a DELAY THRESHOLD REACHED EVENT that registered the DELAY. - - - - - - - - - - - - - Classification of the DELAY (eg. within a regulatory context) - - - - - - - Identifier type for LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - Reference to a LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - Implementation of a LATE DATED VEHICLE JOURNEY COUNT. - - - - - - - - - - - - - - - - - - - - - - - Type for a LOGGABLE OBJECT designed for recording LATE DATED VEHICLE JOURNEY information. - - - - - - - - - - - - Elements for the LATE DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. - - - - - - - - - - - A collection of one or more LateDatedVehicleJourneys. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - - - - - - - Reference type for a LATE DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - Collection of references to LATE DATED VEHICLE JOURNEY ENTRIes. - - - - - A reference to a LATE DATED VEHICLE JOURNEY ENTRY. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Elements for a LOG ENTRY related to a LateDatedVehicleJourneyEntry. - - - - - - - - - - A collection of one or more LateDatedVehicleJourneyEntry instances. - - - - - LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. - - - - - \ No newline at end of file + OpRa LateDatedVehicleJourney + + + + 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. + + + + + Optional information about what triggered the DELAY. + + + + + + Reference to an OPERATIONAL EVENT that caused the DELAY. + + + + + Reference to a DELAY THRESHOLD REACHED EVENT that registered the DELAY. + + + + + + + + + + + + + Classification of the DELAY (eg. within a regulatory context) + + + + + + + Identifier type for LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + Reference to a LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + Implementation of a LATE DATED VEHICLE JOURNEY COUNT. + + + + + + + + + + + + + + + + + + + + + + + Type for a LOGGABLE OBJECT designed for recording LATE DATED VEHICLE JOURNEY information. + + + + + + + + + + + + Elements for the LATE DATED VEHICLE JOURNEY COUNT defined by generic PT SCOPE context and additional specific context. + + + + + + + + + + + A collection of one or more LateDatedVehicleJourneys. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + + + + + + + Reference type for a LATE DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + Collection of references to LATE DATED VEHICLE JOURNEY ENTRIes. + + + + + A reference to a LATE DATED VEHICLE JOURNEY ENTRY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Elements for a LOG ENTRY related to a LateDatedVehicleJourneyEntry. + + + + + + + + + + A collection of one or more LateDatedVehicleJourneyEntry instances. + + + + + LOGGABLE OBJECT designed for recording DATED VEHICLE JOURNEY information. + + + + + From 1a0c46be973b82fddf97336ffda7937ccd194b96 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Tue, 14 Apr 2026 00:23:55 +0200 Subject: [PATCH 40/50] IndicatorFrame fix - include opra_fleetDimensions_version.xsd --- OpRa.spp | 7 ++- examples/PlannedFleetDimensions.xml | 29 ++++++++++ examples/PlannedServiceDimensions.xml | 55 +++++++++++-------- .../opra_indicatorFrame_version.xsd | 1 + 4 files changed, 65 insertions(+), 27 deletions(-) create mode 100644 examples/PlannedFleetDimensions.xml diff --git a/OpRa.spp b/OpRa.spp index 9e56d14..1da03b9 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -769,6 +769,7 @@ + @@ -779,10 +780,10 @@ - + - + @@ -793,8 +794,8 @@ + - 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_framework/opra_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index 27653d1..e591c73 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 @@ + From 853db1c1861d784bccca29e3647eb94d4f5d7661 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 15 Apr 2026 15:43:09 +0200 Subject: [PATCH 41/50] scope alignment - added missing FleetScope capabilities --- OpRa.spp | 4 ++-- ...a_cancelledDatedVehicleJourney_version.xsd | 20 ++++++++++--------- .../opra_lateDatedVehicleJourney_version.xsd | 14 +++++++------ ...boardDeviceBasedPassengerCount_version.xsd | 14 ++++++++----- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/OpRa.spp b/OpRa.spp index 1da03b9..274be45 100644 --- a/OpRa.spp +++ b/OpRa.spp @@ -809,7 +809,7 @@ - + @@ -818,7 +818,7 @@ - + diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index 638fe6b..a6fd684 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -1,10 +1,11 @@ + - + - + - + @@ -68,7 +69,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 +107,7 @@ Rail transport, Roads and Road transport - + @@ -193,7 +194,7 @@ Rail transport, Roads and Road transport - + @@ -222,14 +223,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. @@ -248,4 +250,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 7dd8b54..8f4cb78 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,10 +1,11 @@ + - + - + - + @@ -129,7 +130,7 @@ Rail transport, Roads and Road transport - + @@ -210,7 +211,7 @@ Rail transport, Roads and Road transport - + @@ -240,6 +241,7 @@ Rail transport, Roads and Road transport + @@ -256,4 +258,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd index b724943..8607d27 100644 --- a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -1,10 +1,11 @@ + - + - + - + @@ -88,7 +89,7 @@ Rail transport, Roads and Road transport - + @@ -152,6 +153,9 @@ Rail transport, Roads and Road transport Dynamic (may change in each state) elements for an AggregatedOnboardDeviceBasedPassengerCount (as a LOG ENTRY) + + + @@ -161,4 +165,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From de8345d1eb3d238481e127dec78c425eb75e57f7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2026 13:47:36 +0000 Subject: [PATCH 42/50] Lint and update documentation tables --- .../opra_cancelledDatedVehicleJourney_version.xsd | 3 +-- xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd | 3 +-- .../opra_onboardDeviceBasedPassengerCount_version.xsd | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd index a6fd684..9303513 100644 --- a/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd @@ -1,5 +1,4 @@ - @@ -250,4 +249,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 8f4cb78..81c6fda 100644 --- a/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd +++ b/xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd @@ -1,5 +1,4 @@ - @@ -258,4 +257,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd index 8607d27..0f3e664 100644 --- a/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd +++ b/xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd @@ -1,5 +1,4 @@ - @@ -165,4 +164,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 7b1ad3112c83a940fa8ca11bfeaa572f8f640941 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Wed, 15 Apr 2026 16:13:10 +0200 Subject: [PATCH 43/50] annotation fixes --- .../opra_GenericContextualIndicator_version.xsd | 7 ++++--- .../opra_service_contextualIndicators.xsd | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index 93e4aa5..7061d03 100644 --- a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd +++ b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd @@ -1,8 +1,9 @@ + - + @@ -104,7 +105,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. @@ -129,4 +130,4 @@ Rail transport, Roads and Road transport - + \ 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 3eb48bb..5214a2a 100644 --- a/xsd/opra_service/opra_service_contextualIndicators.xsd +++ b/xsd/opra_service/opra_service_contextualIndicators.xsd @@ -1,4 +1,5 @@ + @@ -52,12 +53,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 +68,7 @@ - References that extend filtering capabilities of requests for KPIs. + References that extend filtering capabilities of requests for CONTEXTUAL INDICATORs. @@ -84,12 +85,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. @@ -124,4 +125,4 @@ - + \ No newline at end of file From b1b2e34c6a8f064a8c7a1c89359a125e67259b79 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2026 14:18:01 +0000 Subject: [PATCH 44/50] Lint and update documentation tables --- .../opra_GenericContextualIndicator_version.xsd | 3 +-- xsd/opra_service/opra_service_contextualIndicators.xsd | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd b/xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd index 7061d03..b863e38 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 @@ - @@ -130,4 +129,4 @@ Rail transport, Roads and Road transport - \ 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 5214a2a..fcd37fc 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 + From 14f55a430389c47a7cae9a197f558b3eb75de737 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Thu, 16 Apr 2026 22:46:30 +0200 Subject: [PATCH 45/50] added Scopes to FrameDefaults - IndicatorFrame - ContextualIndicatorFrame --- .../opra_contextualIndicatorFrame_version.xsd | 215 ++++++------ .../opra_indicatorFrame_version.xsd | 317 +++++++++--------- 2 files changed, 283 insertions(+), 249 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index c515f2c..2de9612 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,112 @@ 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. - - - - - - - + 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_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index e591c73..6b18fa6 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -1,27 +1,27 @@ - + - - - - - + - - - - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -63,135 +63,150 @@ 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. + + + + + + + + + + + Default scope specification for contained indicators. + + + + + + + + + + + Default capacity method and capacity values for indicators utilizing vehicle capacities. + + + + + \ No newline at end of file From d4655cdd20efca8c02e0e456f01788d09848ce65 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:51:04 +0000 Subject: [PATCH 46/50] Lint and update documentation tables --- .../opra_contextualIndicatorFrame_version.xsd | 234 ++++++------ .../opra_indicatorFrame_version.xsd | 332 +++++++++--------- 2 files changed, 283 insertions(+), 283 deletions(-) diff --git a/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd index 2de9612..409b32e 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,112 +47,112 @@ 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_frames/opra_indicatorFrame_version.xsd b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd index 6b18fa6..4d25148 100644 --- a/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd +++ b/xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd @@ -1,27 +1,27 @@ - + - - - - - + - - - - - - - - - - - - - + + + + + + + + + + main schema e-service developers @@ -63,150 +63,150 @@ 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. - - - - - - - - - - - Default scope specification for contained indicators. - - - - - - - - - - - Default capacity method and capacity values for indicators utilizing vehicle capacities. - - - - - \ 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. + + + + + + + + + + + Default scope specification for contained indicators. + + + + + + + + + + + Default capacity method and capacity values for indicators utilizing vehicle capacities. + + + + + From 13ae68dbe7dafa329fb681b128841e19be5b041c Mon Sep 17 00:00:00 2001 From: Tim Rivett <56296031+tim-rivett@users.noreply.github.com> Date: Fri, 24 Apr 2026 15:38:18 +0100 Subject: [PATCH 47/50] Rename OpRa_publication.xsd to opra_publication.xsd to keep in same format as other file names --- xsd/{OpRa_publication.xsd => opra_publication.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename xsd/{OpRa_publication.xsd => opra_publication.xsd} (100%) 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 From 611dcbad8cdb4e5cf846543ba473dacf4a27f6f7 Mon Sep 17 00:00:00 2001 From: Tim Rivett <56296031+tim-rivett@users.noreply.github.com> Date: Fri, 24 Apr 2026 15:51:24 +0100 Subject: [PATCH 48/50] Update opra.xsd reflect change of file name from OpRa_publication.xsd to opra_publication.xsd --- xsd/opra.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/opra.xsd b/xsd/opra.xsd index 6fa87d1..62d7c77 100644 --- a/xsd/opra.xsd +++ b/xsd/opra.xsd @@ -3,7 +3,7 @@ - + From 9321efa575337c7dd6e0f383fcbcef44cbe64d65 Mon Sep 17 00:00:00 2001 From: Tim Rivett Date: Tue, 5 May 2026 14:15:34 +0100 Subject: [PATCH 49/50] Update README.md incorrect characters in text --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) From 2ea2359823c661dbc552c28f5ad8e8d99ba43fd2 Mon Sep 17 00:00:00 2001 From: gnitsch Date: Fri, 8 May 2026 16:00:25 +0200 Subject: [PATCH 50/50] make OpraSubscriptionRequest instantiable - removed "abstract = true" setting - OpraSubscriptionRequest initiates receiving PublicationDelivery feeds --- xsd/opra_request.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd index 398047e..93764f7 100644 --- a/xsd/opra_request.xsd +++ b/xsd/opra_request.xsd @@ -243,9 +243,9 @@ - + - Abstract OpRa Subscription Request. + General OpRa Subscription Request that subscribes to PublicationDelivery responses.