Skip to content

Backport v2.1-wip to v2.1-wip-efip #1071

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

Merged
TuThoThai merged 28 commits into from
Sep 3, 2026
Merged

Backport v2.1-wip to v2.1-wip-efip #1071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ca2c4c9
Merge pull request #1045 from TransmodelEcosystem/v2.0
TuThoThai Jul 16, 2026
17b9a89
Broader usage direction type 2 (#1021)
ue71603 Jul 16, 2026
194ddc6
New property to indicate an interchange within the same vehicle (#1027)
duexw Jul 16, 2026
2cead31
Add StopPointInServiceJourneyPatternRef to JourneyWaitTime for stops …
ue71603 Jul 16, 2026
ddfbf11
allow new restriction for JourneyPart (#1026)
ue71603 Jul 16, 2026
f76423f
Add correctly spelt Exchangeable* components, deprecate misspelt Exch…
atibaut Jul 9, 2026
b752133
Fix typo in ExchangeableUntilDuration documentation (or -> of)
atibaut Jul 9, 2026
371492e
Wrap ExchangeableTo/ExchangableTo in xsd:choice to prevent both spell…
atibaut Jul 9, 2026
d04d2cb
fix: wrap IsExchangeable/IsExchangable in xsd:choice in fareCondition…
atibaut Jul 9, 2026
4f6a16c
Rename misspelt enumeration type outright instead of deprecating (typ…
atibaut Jul 9, 2026
797fb04
Annotate misspelt NameOfClass enumeration values as DEPRECATED
atibaut Jul 9, 2026
1ec57b2
documentation improvement
TuThoThai Jul 19, 2026
c5712e7
Lint and update documentation tables
github-actions[bot] Jul 19, 2026
8337ab1
improves documentation
TuThoThai Jul 19, 2026
2330b9b
improves documentation
TuThoThai Jul 19, 2026
6fdce3b
improves documentation
TuThoThai Jul 19, 2026
e773c5b
fix XSD
TuThoThai Jul 19, 2026
cc8dbf9
Addition of AI guidelines in the readme (#1050)
TuThoThai Jul 20, 2026
c726559
Merge pull request #1051 from TransmodelEcosystem/v2.0
TuThoThai Jul 20, 2026
73b337e
Merge pull request #1020 from TransmodelEcosystem/CheckConstraint_add…
ue71603 Jul 20, 2026
7d12e8b
Merge branch 'v2.1-wip' into fix/exchangeable-spelling
atibaut Jul 22, 2026
0a48d43
Merge pull request #1041 from TransmodelEcosystem/fix/exchangeable-sp…
atibaut Jul 22, 2026
c54937a
Fixed typo in nta examples in years (+ CI fix for forks) (#1052)
Micovec Jul 29, 2026
482a533
Typo fixed (#1058)
ue71603 Aug 11, 2026
c6bdabc
Update netex_nm_equipmentEnergy_support.xsd
ue71603 Aug 12, 2026
12d8cc8
Merge pull request #1061 from TransmodelEcosystem/v2.0
TuThoThai Aug 13, 2026
aebfe7e
Merge pull request #1060 from TransmodelEcosystem/add_coal
TuThoThai Sep 3, 2026
130225c
Merge pull request #1064 from TransmodelEcosystem/bugfix_uri_in_examples
Micovec Sep 3, 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
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: CI

on: push
on:
push:
pull_request:

permissions:
contents: write
Expand All @@ -26,7 +28,11 @@ jobs:
- name: Validate NeTEx XML examples
run: ./.github/scripts/validate-examples.sh

# Only on push: a pull_request run from a fork gets a read-only token
# and cannot commit back. Target branches are still normalized by the
# push-triggered run that follows the merge.
- name: Commit changes
if: github.event_name == 'push'
uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit
with:
default_author: github_actions
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,5 @@ fabric.properties
# Editor-based Rest Client
.idea/httpRequests

.idea/.name
/.idea
1 change: 1 addition & 0 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,7 @@
<File FilePath="examples\functions\timetable\NeTEx_50_JourneyFrequencyGroup.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\timetable\Netex_51.1_Occupancy.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\timetable\Netex_52_planned_delay.xml" HomeFolder="Yes"/>
<File FilePath="examples\functions\timetable\NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="calendar">
<File FilePath="examples\functions\calendar\NeTEx_Calendar_se_PA1.xml" HomeFolder="Yes"/>
Expand Down
17 changes: 17 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,23 @@ For new features, the decision between targetting v2.1-wip or v3.0-wip will be m

_Upcoming: templates for Pull Request_

### The use of AI in this repo 🤖

In this repository, the use of AI should follow these guidelines. The guiding principle is that any contributor is ultimately reponsible for their work on NeTEx and they should be the last reviewer of any AI-guided work before submitting it for peer-review; in other words, only contributors can be authors or co-authors of any change made to NeTEx.

AI **can** be used for:
- Generation of code for contributors to work on the XSD by themselves,
- Analysis of any change proposed to the XSD before it is edited / commented / approved,
- Improvements to the general language in the documentation (i.e, anything in `<xsd:annotation>` and `<xsd:documentation>`) or to check for typos in any work.

AI **cannot** be used for:
- Committing a change in a Pull Request, i.e. the AI agent cannot be an author or co-author of any commit,
- Authoring a change, i.e. the AI agent cannot be an author or co-author of any Pull Request,
- Automated code review as a stand alone action, i.e. the result of a review must be proof-read by a contributor,
- Produce documentation from scratch (i.e, anything in `<xsd:annotation>` and `<xsd:documentation>` should be proof-read by a contributor if it was suggested by AI).

In case you have a GitHub Pro account, please disable the feature `Automated Copilot code review` before contributing here.

----

## Changelog 📰
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ The Calendar is shown coded as
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
</Codespace>
<Codespace id="myfares">
<Xmlns>myfares</Xmlns>
<XmlnsUrl>http://www.myfares,com/fares</XmlnsUrl>
<XmlnsUrl>http://www.myfares.com/fares</XmlnsUrl>
<Description>Fare data</Description>
</Codespace>
</codespaces>
Expand Down
Loading
Loading