Skip to content

Master to next#985

Merged
skinkie merged 58 commits intonextfrom
master_to_next
Feb 13, 2026
Merged

Master to next#985
skinkie merged 58 commits intonextfrom
master_to_next

Conversation

@skinkie
Copy link
Copy Markdown
Contributor

@skinkie skinkie commented Feb 1, 2026

WIP for #982

skinkie and others added 26 commits February 1, 2026 21:04
@skinkie
Fix typo psychosensory (#690)
e666dc5
@skinkie
Change organisation ref abstract (#686)
0c6dd2a 
* Make OrganisationRef abstract

* Organisation is abstract

* Something hidden

* Bring backwards compatibility

* Split because of older xmllint
@skinkie @ue71603 @github-actions
Introduce dataSourceRef checking, so we can see seriously broken exam…
ad70dbe 
…ples and implementations (#454)

* Introduce dataSourceRef checking, so we can see seriously broken examples and implementations.

* to force a rerun

* updated examples

* more example corrections

* Lint and update documentation tables

* remove checking for version in DataSource and DataSourceRef

* Aurige example with id without version for DataSource

* removed comments

* change to the way validation is done.

* fix validation

* Update Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml

* Lint and update documentation tables

---------

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@ue71603 @trurlurl @skinkie
Create FX-PI-01_ParisExample.xml (#640)
999ebb3 
* Create FX-PI-01_ParisExample.xml

* spaces and tabs  fixed

* part 2

@nick-knowles  never mix tabs and spaces that way again, pls.

* part 3

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

---------

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
@juliustens-db @skinkie
Add properties to describe the height of a Lift (including its doors) (…
4c4933c 
…#696)
@skinkie
Fix typo (#722)
75d3cdb
@ue71603 @skinkie
Update neTactileActuators attribute on Escalators and Travelators #66…
67c51c1 
…5tex_ifopt_equipmentAccess_version.xsd (#720)

* Update netex_ifopt_equipmentAccess_version.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
@ue71603 @github-actions @skinkie
Update netex_facility_support.xsd (#724)
4c6b248 
* Update netex_facility_support.xsd

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@skinkie
TypeOfEntity is abstract (#723)
558a29e
@skinkie
Fixes from #721 (#725)
aff54fd 
* Fixes from #721

* then fix the typo in the previous word too
@juliustens-db @skinkie
update branch list and release log for netex 1.3 (#732)
86ad4cb
@skinkie
Propose change, and fix #726 (#727)
a8f0bac
@skinkie @trurlurl
Fix Interchangse (#737)
6823648 
* Fix Interchangse

* Update xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

---------

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
@skinkie
TypeOfNotice referential constraint fixes (#741)
03fb25d 
* TypeOfNotice referential constraint fixes

Fixed #739

* Apply suggestions from code review
@skinkie @trurlurl
Update netex_ifopt_equipmentAccess_version.xsd (#752)
9405b80 
Disambiguating button descriptions.

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
@skinkie
Remove references to non-existent email addresses (#758)
423a182
@ue71603 @skinkie
Delete Full_PublicationDelivery_109_Oslo_morningbus_example.xml (#778)
fdd1d9f
@ue71603 @skinkie
Removing double description in HeadwayJourneyGroupGroup
e396433
@skinkie @trurlurl
Annotation to version attribute (#794) (#797)
fca09cd 
* Annotation to version attribute

* Update xsd/netex_framework/netex_responsibility/netex_version_support.xsd

Improved...

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
@ue71603 @skinkie
UiCOperatingPeriodGroup contains no DaysOfWeek (#820)
7a0fe33 
* Update netex_serviceCalendar_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

---------

Co-authored-by: Stefan de Konink <stefan@konink.de>
@TuThoThai @skinkie
Correct typo in netex_flexibleNetwork_support.xsd (#827)
5b7ec19 
* Correct typos in netex_flexibleNetwork_support.xsd

* Update netex_flexibleNetwork_support.xsd

* Update xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

---------

Co-authored-by: Stefan de Konink <stefan@konink.de>
@skinkie
Fix OppositeDirectionRef in master (#835)
983c1e8
@hfjelstad @skinkie
Added prefix / namespace to references in fields of unique elements (#…
0646902 
…837)

* Update netex_datedVehicleJourney_version.xsd

Updated annotation
Removed UicOperatingPeriod
Added JourneyRef
Added replacedJourneys and DatedServiceJourneyRef
Made OperatingDayRef mandatory

* Update netex_datedVehicleJourney_version.xsd

Changed sequence, mandatory elements first

* added prefix/ namespace

Added prefixes / namespace in xpath references that did not trigger correctly in validators

* Delete netex_datedVehicleJourney_version.xsd

* Create netex_datedVehicleJourney_version.xsd
@Aurige @ue71603 @skinkie
MandatoryEnumeration comment correction (#925)
0722c16 
* MandatoryEnumeration comment correction

MandatoryEnumeration comment correction

* Update xsd/netex_framework/netex_responsibility/netex_entity_support.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

---------

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
Co-authored-by: Stefan de Konink <stefan@konink.de>
@fabiogdb @skinkie
Update netex_ifopt_equipmentWaiting_version.xsd (#955)
630d07c 
set abstract attribute of LuggageLockerEquipment to false
@skinkie @github-actions
Fix VDV examples (#957)
53d4df2 
* Fix VDV examples

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@skinkie skinkie self-assigned this Feb 1, 2026
skinkie and others added 3 commits February 1, 2026 22:58
@skinkie @ue71603 @github-actions
Prioritize TAP TSI validation (#743)
f32acae 
* Prioritize TAP TSI validation

* fixing examples part1

* deprecated invalid examples

* Lint and update documentation tables

---------

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@skinkie @ue71603
Remove all abstract elements from constraint validation (#462)
7e95104 
* Remove all abstract elements from constraint validation

* Make ResposibilityRole not abstract, and revert constraint check removal

* Update NeTEx_publication.xsd

* Update NeTEx_publication_timetable.xsd

---------

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
@skinkie @github-actions @ue71603
Adding unique constraints for the elements that actually exists in ou…
7320d1e 
…r examples (#464)

* Add DatedServiceJourney_UniqueBy_Id_Version

* Lint and update documentation tables

* Add AccessibilityAssessment and AccessibilityLimitation unique constraints

* Lint and update documentation tables

* Add AvailabilityCondition Unique constraint as part of the ValidityCondition constraint

* Put AvailabilityCondition in a new unique constraint because of AvailabilityConditionIdType

* Lint and update documentation tables

* Add DatedVehicleJourney and NormalDatedVehicleJourney constraints

* Add FlexibleRoute, FlexibleQuay, FlexibleLine, FlexibleStopAssignment

* Fix typo

* Fix FlexibleStopAssignment in examples for missing order attribute

* Lint and update documentation tables

* Introduce SitePathLink unique as path of PathLinkIdType

* Introduce unique constraint for ValidityPeriod which uses ValidityConditionIdType

* Introduce unique constraint for ValidDuring which uses AvailabilityConditionIdType

* Introduce unique constraint for ValidyPeriod which uses UsageValidityPeriodIdType, fix ValidBetween

* Fix broken example, due to the assignment within a single unique constraint

* Reintroduce OperatingDay unique constraints

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd Outdated
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd Outdated
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd Outdated
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/NeTEx_publication.xsd
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/NeTEx_publication.xsd
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/NeTEx_publication.xsd
skinkie
skinkie commented Feb 9, 2026
View reviewed changes
Comment thread xsd/NeTEx_publication_timetable.xsd
ue71603
ue71603 requested changes Feb 9, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd Outdated
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
Comment thread xsd/NeTEx_publication.xsd
Comment thread xsd/NeTEx_publication.xsd
Comment thread xsd/NeTEx_publication.xsd
Comment thread xsd/NeTEx_publication_timetable.xsd
Comment thread xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
ue71603 and others added 2 commits February 9, 2026 13:12
@thbar
Copy link
Copy Markdown
Collaborator

thbar commented Feb 11, 2026

@TuThoThai @skinkie @ue71603 do you agree to move this to "Ready for review"? All points in #982 have been checked.

I'm working on a bit of validation regression testing, so having a frozen version (ideally merged into next) would be great.

skinkie
skinkie commented Feb 11, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd Outdated
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Outdated
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Outdated
skinkie
skinkie commented Feb 11, 2026
View reviewed changes
Comment thread xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd Outdated
ue71603
ue71603 reviewed Feb 12, 2026
View reviewed changes
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Outdated
Comment thread xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Outdated
@TuThoThai @ue71603
Apply suggestions from code review
1b41ce6 
Revert to LiftCallEquipment

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
TuThoThai
TuThoThai approved these changes Feb 12, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@TuThoThai TuThoThai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I can see, we should be ok to merge.

@thbar thbar marked this pull request as ready for review February 12, 2026 20:42
@thbar
Copy link
Copy Markdown
Collaborator

thbar commented Feb 12, 2026

@TuThoThai once we have final reviews, I suggest a squash commit, so that it will be slightly easier to finish the changelog.

@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Feb 12, 2026

Ok for me.

@ue71603 ue71603 self-requested a review February 13, 2026 10:34
thbar
thbar approved these changes Feb 13, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@thbar thbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@skinkie skinkie merged commit 9fed8d4 into next Feb 13, 2026
1 check passed
@skinkie skinkie deleted the master_to_next branch February 13, 2026 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Aurige Aurige Aurige left review comments

@thbar thbar thbar approved these changes

@ue71603 ue71603 ue71603 approved these changes

@TuThoThai TuThoThai TuThoThai approved these changes

Assignees

@thbar thbar

@ue71603 ue71603

@TuThoThai TuThoThai

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@skinkie @TuThoThai @ue71603 @thbar @Aurige @juliustens-db @hfjelstad @fabiogdb