Skip to content

Adding some more elements to PassingTime #1019

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

Closed
ue71603 wants to merge 5 commits into from
Closed

Adding some more elements to PassingTime #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
181c92a
Fix faulty descriptions
skinkie Mar 2, 2026
f0f698b
Buggy SIRI import fix (#1001)
Aurige Mar 5, 2026
604bba5
Edit changelog and readme (#997)
TuThoThai Mar 7, 2026
de021e8
Update readme - typo (#1010)
TuThoThai Mar 23, 2026
9b8ab96
Adding some more elements to PassingTime
ue71603 May 6, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ fabric.properties
# Editor-based Rest Client
.idea/httpRequests

/.idea
809 changes: 26 additions & 783 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ This repository contains the XML Schemas (XSD) for:
In each branch, we have:
- The folder `xsd` in which all the XML schemas can be found,
- The folder `examples` in which all examples can be found,
- At the root folder, `Siri.spp` which is the project for XMLSpy and `Siri.xpr` for Oxygen.
- At the root folder, `NeTEx.spp` which is the project for XMLSpy and `NeTEx.xpr` for Oxygen.

The `xsd` folder is sub-divided as follow:
- `gml` for all geometry-related elements,
- `netex_framlework` for all shared components and frames,
- `netex_framework` for all shared components and frames,
- one sub-folder per NeTEx Part (from 1 to 5),
- other complementary sub-folders.
At the root of the `xsd` folder, the file `NeTEx_publication.xsd` should be used as the main one for production and validation purposes. It includes references to all the other XSD.
Expand Down Expand Up @@ -114,7 +114,7 @@ _Upcoming: templates for Pull Request_

----

## Change log 📰
## Changelog 📰

### Releases
| Release Number | Release Date | Description | Link |
Expand All @@ -131,4 +131,4 @@ _Upcoming: templates for Pull Request_
- For any development work, it is recommended to use the latest 3-digit version of NeTEx XML Schema.

### Comprehensive version history
The comprehensive versions history is available in [change_log.md](https://github.com/NeTEx-CEN/NeTEx/blob/v2.0/change_log.md)
The comprehensive versions history is available in [CHANGELOG.md](https://github.com/NeTEx-CEN/NeTEx/blob/v2.0/CHANGELOG.md)
2,274 changes: 0 additions & 2,274 deletions change_log.md
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,10 @@ The Calendar is shown coded as
<TimetabledPassingTime version="any" id="mybus:tpt_24o_01_SSP_002">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_02"/>
<DepartureTime>14:30:00.0Z</DepartureTime>
<!-- Test of a check constraint V2.1-->
<CheckConstraint id="mybus:cc:1" version="any">
<Congestion>noWaiting</Congestion>
</CheckConstraint>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="hde:tpt_24o_01_SSP_002_t3">
<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_05"/>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="FreeRecharging" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>whether shelter is enclosed.</xsd:documentation>
<xsd:documentation>Whether the charging can be used without a fee.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ReservationRequired" type="xsd:boolean" minOccurs="0">
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Cage" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether shelter is enclosed.</xsd:documentation>
<xsd:documentation>Whether the parking space is fenced off.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Covered" type="CoveredEnumeration" minOccurs="0">
Expand Down Expand Up @@ -184,17 +184,17 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="RemoteControl" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>whether shelter is enclosed.</xsd:documentation>
<xsd:documentation>Whether the release mechanism is operated off site.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LocalControl" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether reservation is required.</xsd:documentation>
<xsd:documentation>Whether the release mechanism is operated on site.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LockingMechanism" type="LockingMechanismEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of locking mechnaism.</xsd:documentation>
<xsd:documentation>Type of locking mechanism.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
10 changes: 9 additions & 1 deletion xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_passingTimes_version">
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd"/>
<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd"/>
<!-- ======================================================================= -->
<!-- ==CLOSELY COUPLED ===================================================== -->
<xsd:annotation>
Expand Down Expand Up @@ -204,6 +206,12 @@ Rail transport, Roads and Road transport
<xsd:documentation>Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="QuayAssignmentGroup">
</xsd:group>
<xsd:element ref="AccessibilityAssessment" minOccurs="0">
</xsd:element>
<xsd:element ref="CheckConstraint" minOccurs="0">
</xsd:element>
<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OCCUPANCYs associated with this journey. +v2.0</xsd:documentation>
Expand All @@ -212,4 +220,4 @@ Rail transport, Roads and Road transport
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
</xsd:schema>
</xsd:schema>
5 changes: 2 additions & 3 deletions xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../../siri/siri_base-v2.0.xsd"/>
<xsd:group name="OccupancyScopeFilterGroup">
<xsd:annotation>
<xsd:documentation>The intersection of supplied elements describes the extent that the Occupancy values applies to. (since SIRI 2.1)
Expand All @@ -20,7 +19,7 @@ Only vehicle-centric filter (measurement in a part or at an entrance of a TRAIN)
<xsd:documentation>Fare class in VEHICLE for which occupancy or capacities are specified.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PassengerCategory" type="siri:NaturalLanguageStringStructure" minOccurs="0">
<xsd:element name="PassengerCategory" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Adult, child, wheelchair etc.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -90,7 +89,7 @@ More accurate data can be provided by the individual occupancies or capacities b
<xsd:documentation>Used to specify that a travel group has booked a section of the vehicle for a part of the journey, and if so under what name. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="NameOfGroup" type="siri:NaturalLanguageStringStructure">
<xsd:element name="NameOfGroup" type="MultilingualString">
<xsd:annotation>
<xsd:documentation>Name for which the travel group has made the reservation.</xsd:documentation>
</xsd:annotation>
Expand Down
Loading