Skip to content

harmonize type of VehicleMode in services pt, et, vm, st, sm #207

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
haeckerbaer wants to merge 3 commits into
base: v2.3-wip
Choose a base branch
from
Open

harmonize type of VehicleMode in services pt, et, vm, st, sm #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ba80dc
harmonize type of VehicleMode in services pt, et, , vm, st, sm
haeckerbaer Mar 24, 2026
c1f74ef
Merge branch 'v2.3-wip' into et_cr_vehiclemodes
haeckerbaer Jun 23, 2026
fb4dc9e
Lint and update documentation tables
github-actions[bot] Jun 23, 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
28 changes: 14 additions & 14 deletions docs/generated/contab/siri.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60644,7 +60644,7 @@ <h3>7.33. The complex type <code>siri:MonitoredFeederArrivalCancellationStructur
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -65630,7 +65630,7 @@ <h3>8.24. The complex type <code>siri:TimetabledFeederArrivalCancellationStructu
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -109463,7 +109463,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -117782,7 +117782,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -130805,7 +130805,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -169990,7 +169990,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -174414,7 +174414,7 @@ <h3>26.1. Simple type definitions</h3>
</p>
</td>
<td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock anno-text">MODEs of transport applicable to timetabled public transport.</p>
<p class="tableblock anno-text">DEPRECATED since SIRI 2.3 (replaced by VehicleModesOfTransportEnumeration in siri_modes.xsd) - MODEs of transport applicable to timetabled public transport.</p>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -175250,7 +175250,7 @@ <h3>26.45. The group <code>siri:JourneyPatternInfoGroup</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -219874,7 +219874,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -226285,7 +226285,7 @@ <h3>41.14. The complex type <code>siri:DatedTimetableVersionFrameStructure</code
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -240342,7 +240342,7 @@ <h3>43.30. The complex type <code>siri:MonitoredStopVisitCancellationStructure</
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -249529,7 +249529,7 @@ <h3>44.21. The complex type <code>siri:TimetabledStopVisitCancellationStructure<
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -255484,7 +255484,7 @@ <h3>50.18. The complex type <code>siri:VehicleActivityCancellationStructure</cod
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -258630,7 +258630,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
<a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
</em>
</p>
</td>
Expand Down
5 changes: 3 additions & 2 deletions xsd/siri_model/siri_reference.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Rail transport, Roads and road transport
<xsd:include schemaLocation="siri_operator_support.xsd"/>
<xsd:include schemaLocation="siri_time.xsd"/>
<xsd:include schemaLocation="siri_situationIdentity.xsd"/>
<xsd:include schemaLocation="siri_modes.xsd"/>
<!-- ========= VERSION =========================================== -->
<xsd:element name="VersionRef" type="VersionCodeType">
<xsd:annotation>
Expand Down Expand Up @@ -340,7 +341,7 @@ Rail transport, Roads and road transport
<!--==== Mode Enumerations =================================================================== -->
<xsd:simpleType name="VehicleModesEnumeration">
<xsd:annotation>
<xsd:documentation>MODEs of transport applicable to timetabled public transport.</xsd:documentation>
<xsd:documentation>DEPRECATED since SIRI 2.3 (replaced by VehicleModesOfTransportEnumeration in siri_modes.xsd) - MODEs of transport applicable to timetabled public transport.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="air"/>
Expand Down Expand Up @@ -446,7 +447,7 @@ Values for these elements can be specified on an annual schedule and will be inh
<xsd:documentation>Name of Joruney Pattern</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VehicleMode" type="VehicleModesEnumeration" minOccurs="0" maxOccurs="unbounded">
<xsd:element name="VehicleMode" type="VehicleModesOfTransportEnumeration" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A means of transportation such as bus, rail, etc.</xsd:documentation>
</xsd:annotation>
Expand Down
Loading