Skip to content

RC preparations #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnitsch wants to merge 57 commits into
base: main
Choose a base branch
from
Open

RC preparations #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
6ea5dc7
introducing AbstractLoggableObject/AbstractLogEntry and AbstractIndic…
gnitsch Nov 1, 2025
8b213a0
example fix
gnitsch Nov 1, 2025
60679ca
Lint and update documentation tables
github-actions[bot] Nov 1, 2025
fa9678f
initiating capacity related indicators
gnitsch Dec 4, 2025
b7a2cd0
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Dec 4, 2025
95d5c3c
Lint and update documentation tables
github-actions[bot] Dec 4, 2025
d9e8ae5
Added Service Dimensions & Intensity
gnitsch Dec 9, 2025
8aa1a2d
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Dec 9, 2025
f91ea2e
Lint and update documentation tables
github-actions[bot] Dec 9, 2025
0cff2e1
Raw Data -> Indicator and KPI -> ContextualIndicator refactor
gnitsch Dec 15, 2025
209ce93
Lint and update documentation tables
github-actions[bot] Dec 15, 2025
e61fc50
service additions and additional request instructions
gnitsch Jan 7, 2026
2b2c152
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Jan 7, 2026
d8a950e
Lint and update documentation tables
github-actions[bot] Jan 7, 2026
b0837cc
CALENDAR AWARE PT SCOPE modification
gnitsch Jan 21, 2026
739fd82
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Jan 21, 2026
8bcb4aa
Lint and update documentation tables
github-actions[bot] Jan 21, 2026
ca36918
Additional indicators, content, scope
gnitsch Feb 3, 2026
6c5620b
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Feb 3, 2026
8ea8607
Lint and update documentation tables
github-actions[bot] Feb 3, 2026
9bf34f1
Oxygen project file created.
atibaut Feb 4, 2026
e493dcd
Update examples/DelayedAndCancelledJourneysWithEvents.xml
atibaut Feb 4, 2026
7588b16
Update examples/DelayedAndCancelledJourneysWithEvents.xml
atibaut Feb 4, 2026
39263ac
Update OpRa.xpr
atibaut Feb 4, 2026
f118b1d
Update OpRa.xpr
atibaut Feb 4, 2026
95102c3
Merge pull request #13 from atibaut/priority_1_dev
atibaut Feb 4, 2026
c37dfb1
Lint and update documentation tables
github-actions[bot] Feb 4, 2026
7ca5fca
Release Candidate functional content for 1.0
gnitsch Feb 10, 2026
4f3d793
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Feb 10, 2026
a50ac23
validation fix
gnitsch Feb 11, 2026
1f961e1
Trying Validation fix
gnitsch Feb 11, 2026
f9bc2f8
Lint and update documentation tables
github-actions[bot] Feb 11, 2026
8dd61ac
ptScope XSD renamed
gnitsch Feb 18, 2026
cb8933c
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Feb 18, 2026
14edd6a
Lint and update documentation tables
github-actions[bot] Feb 18, 2026
a7d7390
New examples added. Oxygen project file updated.
atibaut Feb 26, 2026
60b956f
Merge branch 'priority_1_dev' of https://github.com/atibaut/OpRa into…
atibaut Feb 26, 2026
899ae32
capacity-related tweaks
gnitsch Feb 27, 2026
5eb6d26
Lint and update documentation tables
github-actions[bot] Feb 27, 2026
7219a31
Merge branch 'OpRa-CEN:priority_1_dev' into priority_1_dev
atibaut Feb 27, 2026
f7790b7
changes to xsd
atibaut Feb 27, 2026
6fe4df7
feat(examples): refresh 2025 example set and sync project files
atibaut Feb 28, 2026
17bcfb8
Merge pull request #15 from atibaut/priority_1_dev
atibaut Feb 28, 2026
aabaf06
Lint and update documentation tables
github-actions[bot] Feb 28, 2026
ca280fd
Validation script update for submodule
Aurige Mar 3, 2026
1124ab0
bug in script correction
Aurige Mar 3, 2026
c3043a7
Dash issue !
Aurige Mar 3, 2026
fa8908d
Update NeTEx submodule
Aurige Mar 3, 2026
dbde8fc
TypeOfDelay implementation & NeTEx facade removal
gnitsch Mar 9, 2026
61fac85
Lint and update documentation tables
github-actions[bot] Mar 9, 2026
4562a2f
New examples.
atibaut Mar 9, 2026
91a0851
Merge branch 'priority_1_dev' of https://github.com/atibaut/OpRa into…
atibaut Mar 9, 2026
c4ecc3d
no message
atibaut Mar 9, 2026
9c77fff
Merge pull request #16 from atibaut/priority_1_dev
atibaut Mar 9, 2026
d159e96
NeTEx frame inclusion fix
gnitsch Mar 9, 2026
b773e17
Merge branch 'priority_1_dev' of https://github.com/OpRa-CEN/OpRa int…
gnitsch Mar 9, 2026
9c1572b
FareFrame inclusion
gnitsch Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/scripts/validate-and-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
set -e

# Update the submodules, usefull only when there is a submodul update (can be commented most of the time)
echo "Syncronising submodules ..."
git submodule update --init --recursive

#-------------------------------------------------------

echo "Validating XML file structure and linting XSD and XML files ..."

PARSING_ERROR=0
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.tmp
docs
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "NeTEx"]
path = NeTEx
url = https://github.com/NeTEx-CEN/NeTEx
branch = v2.0
[submodule "SIRI"]
path = SIRI
url = https://github.com/Aurige/SIRI
Expand Down
2 changes: 1 addition & 1 deletion NeTEx
Open in desktop
Submodule NeTEx updated from 74b4cd to 8cc425
53 changes: 31 additions & 22 deletions OpRa.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,33 +761,36 @@
</Folder>
</Folder>
<Folder FolderName="Examples">
<File FilePath="examples\ActualServiceDimensions.xml" HomeFolder="Yes"/>
<File FilePath="examples\CancelledAndLateDatedVehicleJourneys.xml" HomeFolder="Yes"/>
<File FilePath="examples\ContextualIndicatorFrame.xml" HomeFolder="Yes"/>
<File FilePath="examples\DelayedAndCancelledJourneysWithEvents.xml" HomeFolder="Yes"/>
<File FilePath="examples\ExpectedPassengerCount.xml" HomeFolder="Yes"/>
<File FilePath="examples\placeholder.xml" HomeFolder="Yes"/>
<File FilePath="examples\ExpectedServiceIntensity.xml" HomeFolder="Yes"/>
<File FilePath="examples\Placeholder.xml" HomeFolder="Yes"/>
<File FilePath="examples\PlannedCapacity.xml" HomeFolder="Yes"/>
<File FilePath="examples\PlannedServiceDimensions.xml" HomeFolder="Yes"/>
<File FilePath="examples\PlannedServiceIntensity.xml" HomeFolder="Yes"/>
<File FilePath="examples\RequestAllPassengerCounts.xml" HomeFolder="Yes"/>
<File FilePath="examples\RequestLateDatedVehicleJourneys.xml" HomeFolder="Yes"/>
<File FilePath="examples\ResponseLateDatedVehicleJourneys.xml" HomeFolder="Yes"/>
<File FilePath="examples\TicketingBasedPassengerCount.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="OpRa">
<Folder FolderName="OpRa_top_level_Schema">
<File FilePath="xsd\OpRa_publication.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="OpRa_framework">
<Folder FolderName="OpRa_frames">
<File FilePath="xsd\opra_framework\opra_frames\opra_actualServiceFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_commonFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_compositeFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_kpiFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_contextualIndicatorFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_indicatorFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_plannedServiceFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_frames\opra_rawDataFrame_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="OpRa_genericFramework">
<File FilePath="xsd\opra_framework\opra_genericFramework\opra_GeneralKpi_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_genericFramework\opra_GeneralLogEntry_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_genericFramework\opra_GenericContextualIndicator_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="opra_reusableComponents" ExtStr="csd">
<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_controlActionReference_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_delayClassification_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_durationDistribution_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_eventReference_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_framework\opra_reusableComponents\opra_passengerTravelControl_support.xsd" HomeFolder="Yes"/>
Expand All @@ -797,18 +800,6 @@
</Folder>
<File FilePath="xsd\opra_framework\opra_payload_framework.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="OpRa_kpi">
<File FilePath="xsd\opra_kpi\opra_NumberOfJourneyCancellations_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="OpRa_rawdata">
<File FilePath="xsd\opra_rawdata\opra_cancelledDatedVehicleJourney_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_expectedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_externalPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_lateDatedVehicleJourney_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_onboardDeviceBasedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_ticketingBasedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_rawdata\opra_validationEntry_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="opra_imports">
<File FilePath="xsd\opra_imports\opra_netex_facade.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_imports\opra_netex_imports.xsd" HomeFolder="Yes"/>
Expand All @@ -819,15 +810,33 @@
<File FilePath="xsd\opra_service\opra_payload_delivery.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_actualService.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_cancelledDatedVehicleJourneys.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_capacity.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_contextualIndicators.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_expectedPassengerCounts.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_externalPassengerCounts.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_fleetDimensions.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_lateDatedVehicleJourneys.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_onboardDeviceBasedPassengerCounts.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_plannedService.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_serviceDimensions.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_serviceIntensity.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_service\opra_service_ticketingBasedPassengerCounts.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="opra_indicators">
<File FilePath="xsd\opra_indicators\opra_cancelledDatedVehicleJourney_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_capacity_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_expectedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_externalPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_fleetDimensions_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_lateDatedVehicleJourney_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_onboardDeviceBasedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_serviceDimensions_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_serviceIntensity_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_ticketingBasedPassengerCount_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_indicators\opra_validationEntry_version.xsd" HomeFolder="Yes"/>
</Folder>
<File FilePath="xsd\opra.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\OpRa_publication.xsd"/>
<File FilePath="xsd\OpRa_publication.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\opra_request.xsd" HomeFolder="Yes"/>
</Folder>
<File FilePath="README.md" HomeFolder="Yes"/>
Expand Down
111 changes: 111 additions & 0 deletions OpRa.xpr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<meta>
<filters directoryPatterns="" filePatterns="" positiveFilePatterns="" showHiddenFiles="false"/>
<options/>
</meta>
<projectTree name="OpRa.xpr">
<folder name="Examples">
<file name="examples/ActualServiceDimensions.xml"/>
<file name="examples/CancelledAndLateDatedVehicleJourneys.xml"/>
<file name="examples/ContextualIndicatorFrame.xml"/>
<file name="examples/DelayedAndCancelledJourneysWithEvents.xml"/>
<file name="examples/ExpectedPassengerCount.xml"/>
<file name="examples/ExpectedServiceIntensity.xml"/>
<file name="examples/Placeholder.xml"/>
<file name="examples/PlannedCapacity.xml"/>
<file name="examples/PlannedFleetDimensions.xml"/>
<file name="examples/PlannedServiceDimensions.xml"/>
<file name="examples/PlannedServiceIntensity.xml"/>
<file name="examples/RequestAllPassengerCounts.xml"/>
<file name="examples/RequestLateDatedVehicleJourneys.xml"/>
<file name="examples/ResponseLateDatedVehicleJourneys.xml"/>
<file name="examples/TicketingBasedPassengerCount.xml"/>
</folder>
<folder name="OpRa Core Schemas">
<file name="xsd/opra.xsd"/>
<file name="xsd/OpRa_publication.xsd"/>
<file name="xsd/opra_request.xsd"/>
</folder>
<folder name="OpRa Framework">
<folder name="Frames">
<file name="xsd/opra_framework/opra_frames/opra_actualServiceFrame_version.xsd"/>
<file name="xsd/opra_framework/opra_frames/opra_commonFrame_version.xsd"/>
<file name="xsd/opra_framework/opra_frames/opra_compositeFrame_version.xsd"/>
<file name="xsd/opra_framework/opra_frames/opra_contextualIndicatorFrame_version.xsd"/>
<file name="xsd/opra_framework/opra_frames/opra_plannedServiceFrame_version.xsd"/>
<file name="xsd/opra_framework/opra_frames/opra_indicatorFrame_version.xsd"/>
</folder>
<folder name="Generic Framework">
<file name="xsd/opra_framework/opra_genericFramework/opra_GenericContextualIndicator_version.xsd"/>
<file name="xsd/opra_framework/opra_genericFramework/opra_GeneralLogEntry_version.xsd"/>
</folder>
<folder name="Reusable Components">
<file name="xsd/opra_framework/opra_reusableComponents/opra_controlActionReference_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_durationDistribution_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_eventReference_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_filtering_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_passengerTravelControl_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_statistics_support.xsd"/>
<file name="xsd/opra_framework/opra_reusableComponents/opra_vehicleOccupancy_version.xsd"/>
</folder>
<file name="xsd/opra_framework/opra_payload_framework.xsd"/>
</folder>
<folder name="OpRa Imports">
<file name="xsd/opra_imports/opra_netex_facade.xsd"/>
<file name="xsd/opra_imports/opra_netex_imports.xsd"/>
<file name="xsd/opra_imports/opra_siri_imports.xsd"/>
</folder>
<folder name="OpRa Service">
<file name="xsd/opra_service/opra_all_services.xsd"/>
<file name="xsd/opra_service/opra_payload_delivery.xsd"/>
<file name="xsd/opra_service/opra_service_actualService.xsd"/>
<file name="xsd/opra_service/opra_service_cancelledDatedVehicleJourneys.xsd"/>
<file name="xsd/opra_service/opra_service_capacity.xsd"/>
<file name="xsd/opra_service/opra_service_contextualIndicators.xsd"/>
<file name="xsd/opra_service/opra_service_expectedPassengerCounts.xsd"/>
<file name="xsd/opra_service/opra_service_externalPassengerCounts.xsd"/>
<file name="xsd/opra_service/opra_service_fleetDimensions.xsd"/>
<file name="xsd/opra_service/opra_service_lateDatedVehicleJourneys.xsd"/>
<file name="xsd/opra_service/opra_service_onboardDeviceBasedPassengerCounts.xsd"/>
<file name="xsd/opra_service/opra_service_plannedService.xsd"/>
<file name="xsd/opra_service/opra_service_serviceDimensions.xsd"/>
<file name="xsd/opra_service/opra_service_serviceIntensity.xsd"/>
<file name="xsd/opra_service/opra_service_ticketingBasedPassengerCounts.xsd"/>
</folder>
<folder name="OpRa Indicators">
<file name="xsd/opra_indicators/opra_cancelledDatedVehicleJourney_version.xsd"/>
<file name="xsd/opra_indicators/opra_capacity_version.xsd"/>
<file name="xsd/opra_indicators/opra_expectedPassengerCount_version.xsd"/>
<file name="xsd/opra_indicators/opra_externalPassengerCount_version.xsd"/>
<file name="xsd/opra_indicators/opra_fleetDimensions_version.xsd"/>
<file name="xsd/opra_indicators/opra_lateDatedVehicleJourney_version.xsd"/>
<file name="xsd/opra_indicators/opra_onboardDeviceBasedPassengerCount_version.xsd"/>
<file name="xsd/opra_indicators/opra_serviceDimensions_version.xsd"/>
<file name="xsd/opra_indicators/opra_serviceIntensity_version.xsd"/>
<file name="xsd/opra_indicators/opra_ticketingBasedPassengerCount_version.xsd"/>
<file name="xsd/opra_indicators/opra_validationEntry_version.xsd"/>
</folder>
<folder name="NeTEx Schemas">
<folder name="Top Level">
<file name="NeTEx/xsd/ifopt.xsd"/>
<file name="NeTEx/xsd/NeTEx_publication.xsd"/>
<file name="NeTEx/xsd/NeTEx_publication-NoConstraint.xsd"/>
<file name="NeTEx/xsd/NeTEx_publication_timetable.xsd"/>
<file name="NeTEx/xsd/NeTEx_siri.xsd"/>
<file name="NeTEx/xsd/NeTEx_siri_SG.xsd"/>
<file name="NeTEx/xsd/NX.xsd"/>
</folder>
</folder>
<folder name="SIRI Schemas">
<file name="SIRI/xsd/siri.xsd"/>
<file name="SIRI/xsd/siriSg.xsd"/>
</folder>
<folder name="OJP Schemas">
<file name="OJP/OJP.xsd"/>
</folder>
<folder name="Documentation">
<file name="README.md"/>
</folder>
</projectTree>
</project>
Loading
Loading