Skip to content

Commit 8ec0134

Browse files
haeckerbaerTuThoThaiskinkieleonardehrenfriedue71603
authored
merge documentation updates from master (#180)
* Typo corrections on siri_request_errorConditions.xsd (#158) * Typo corrections on siri_request_errorConditions.xsd Addresses issue #125 * Apply suggestions from code review --------- Co-authored-by: Stefan de Konink <stefan@konink.de> * Add example for DataSource in ET (#160) * aligning SIRI with what was intended for OPERATING DAY (#134) * aligning SIRI with what was intended * Update xsd/siri_model/siri_journey_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Lint and update documentation tables --------- Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: haeckerbaer <54021300+haeckerbaer@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * Fix typos in documentation siri_situation.xsd (#147) * Fix typos in documentation siri_situation.xsd Fix typos & addition of one annotation missing * add missing tags to new annotation it seems that author added a new annotation in previous commit but forgot proper tags. * correct typo --------- Co-authored-by: haeckerbaer <54021300+haeckerbaer@users.noreply.github.com> Co-authored-by: Tim Rivett <56296031+tim-rivett@users.noreply.github.com> * remove blank in FareClassEnumerationList (#174) --------- Co-authored-by: Tu-Tho Thai <info@tutho.com> Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: Leonard Ehrenfried <mail@leonard.io> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim Rivett <56296031+tim-rivett@users.noreply.github.com>
1 parent a473dcd commit 8ec0134

File tree

4 files changed

+56
-46
lines changed

4 files changed

+56
-46
lines changed

‎examples/siri_exm_ET/ext_estimatedTimetable_response.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<JourneyNote>Not o bank holidays</JourneyNote>
3434
<Monitored>true</Monitored>
3535
<PredictionInaccurate>false</PredictionInaccurate>
36+
<DataSource>RMS</DataSource>
3637
<Occupancy>full</Occupancy>
3738
<EstimatedCalls>
3839
<!-- CALL 1-->

‎xsd/siri/siri_request_errorConditions.xsd‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Rail transport, Roads and road transport
125125
<!-- ======================================================================= -->
126126
<xsd:element name="ErrorConditionElement" type="ErrorConditionElementStructure" abstract="false">
127127
<xsd:annotation>
128-
<xsd:documentation>Element fror an erroc condition (for use in WSDL.)</xsd:documentation>
128+
<xsd:documentation>Element fror an error condition (for use in WSDL.)</xsd:documentation>
129129
</xsd:annotation>
130130
</xsd:element>
131131
<xsd:complexType name="ErrorConditionElementStructure">
@@ -155,7 +155,7 @@ Rail transport, Roads and road transport
155155
<!-- =======Error conditions========================================================== -->
156156
<xsd:element name="ErrorCode" type="ErrorCodeStructure" abstract="true">
157157
<xsd:annotation>
158-
<xsd:documentation>Subsititutable type for a SIRI Error code.</xsd:documentation>
158+
<xsd:documentation>Substitutable type for a SIRI Error code.</xsd:documentation>
159159
</xsd:annotation>
160160
</xsd:element>
161161
<xsd:complexType name="ErrorCodeStructure">
@@ -165,7 +165,7 @@ Rail transport, Roads and road transport
165165
<xsd:sequence>
166166
<xsd:element name="ErrorText" type="xsd:string" minOccurs="0">
167167
<xsd:annotation>
168-
<xsd:documentation>Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</xsd:documentation>
168+
<xsd:documentation>Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</xsd:documentation>
169169
</xsd:annotation>
170170
</xsd:element>
171171
</xsd:sequence>
@@ -178,7 +178,7 @@ Rail transport, Roads and road transport
178178
<!-- ======================================================================= -->
179179
<xsd:element name="ServiceDeliveryErrorConditionElement" type="ServiceDeliveryErrorConditionStructure" abstract="false">
180180
<xsd:annotation>
181-
<xsd:documentation>Element fror an erroc condition for use in WSDL.</xsd:documentation>
181+
<xsd:documentation>Element from an error condition for use in WSDL.</xsd:documentation>
182182
</xsd:annotation>
183183
</xsd:element>
184184
<xsd:complexType name="ServiceDeliveryErrorConditionStructure">
@@ -214,7 +214,7 @@ Rail transport, Roads and road transport
214214
<xsd:element ref="UnapprovedKeyAccessError"/>
215215
<xsd:element ref="UnknownParticipantError">
216216
<xsd:annotation>
217-
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. I.e. delegatior is found, but (since SIRI 2.0)</xsd:documentation>
217+
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. (since SIRI 2.0)</xsd:documentation>
218218
</xsd:annotation>
219219
</xsd:element>
220220
<xsd:element ref="UnknownEndpointError"/>
@@ -259,7 +259,7 @@ Rail transport, Roads and road transport
259259
<xsd:sequence>
260260
<xsd:element name="ParticipantRef" type="ParticipantRefStructure" minOccurs="0">
261261
<xsd:annotation>
262-
<xsd:documentation>Reference to Participant who is unknown. + SIRI v2.0</xsd:documentation>
262+
<xsd:documentation>Reference to Participant who is unknown. (since SIRI v2.0)</xsd:documentation>
263263
</xsd:annotation>
264264
</xsd:element>
265265
</xsd:sequence>
@@ -281,7 +281,7 @@ Rail transport, Roads and road transport
281281
<xsd:sequence>
282282
<xsd:element name="Endpoint" type="EndpointAddress" minOccurs="0">
283283
<xsd:annotation>
284-
<xsd:documentation>Endpoint that is noit known. + SIRI v2.0</xsd:documentation>
284+
<xsd:documentation>Endpoint that is not known. (since SIRI v2.0)</xsd:documentation>
285285
</xsd:annotation>
286286
</xsd:element>
287287
</xsd:sequence>
@@ -291,7 +291,7 @@ Rail transport, Roads and road transport
291291
<!-- ===Error: Endpoint Denied Access ============================================= -->
292292
<xsd:element name="EndpointDeniedAccessError" type="EndpointDeniedAccessStructure" substitutionGroup="ErrorCode">
293293
<xsd:annotation>
294-
<xsd:documentation>Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</xsd:documentation>
294+
<xsd:documentation>Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</xsd:documentation>
295295
</xsd:annotation>
296296
</xsd:element>
297297
<xsd:complexType name="EndpointDeniedAccessStructure">
@@ -303,7 +303,7 @@ Rail transport, Roads and road transport
303303
<xsd:sequence>
304304
<xsd:element name="Endpoint" type="EndpointAddress" minOccurs="0">
305305
<xsd:annotation>
306-
<xsd:documentation>Endpoint that was denied access + SIRI v2.0</xsd:documentation>
306+
<xsd:documentation>Endpoint that was denied access (since SIRI v2.0)</xsd:documentation>
307307
</xsd:annotation>
308308
</xsd:element>
309309
</xsd:sequence>
@@ -325,7 +325,7 @@ Rail transport, Roads and road transport
325325
<xsd:sequence>
326326
<xsd:element name="Endpoint" type="EndpointAddress" minOccurs="0">
327327
<xsd:annotation>
328-
<xsd:documentation>Endpoint that is noit available. + SIRI v2.0</xsd:documentation>
328+
<xsd:documentation>Endpoint that is not available. (since SIRI v2.0)</xsd:documentation>
329329
</xsd:annotation>
330330
</xsd:element>
331331
</xsd:sequence>
@@ -374,7 +374,7 @@ Rail transport, Roads and road transport
374374
<xsd:sequence>
375375
<xsd:element name="ExpectedRestartTime" type="xsd:dateTime" minOccurs="0">
376376
<xsd:annotation>
377-
<xsd:documentation>Expected time fro reavailability of servcie. (since SIRI 2.0)</xsd:documentation>
377+
<xsd:documentation>Expected time fro reavailability of service. (since SIRI 2.0)</xsd:documentation>
378378
</xsd:annotation>
379379
</xsd:element>
380380
</xsd:sequence>
@@ -396,7 +396,7 @@ Rail transport, Roads and road transport
396396
<xsd:sequence>
397397
<xsd:element name="CapabilityRef" type="CapabilityCodeType" minOccurs="0">
398398
<xsd:annotation>
399-
<xsd:documentation>Id of capabiliuty that is noit supported.</xsd:documentation>
399+
<xsd:documentation>Id of capability that is not supported.</xsd:documentation>
400400
</xsd:annotation>
401401
</xsd:element>
402402
</xsd:sequence>
@@ -493,12 +493,12 @@ Rail transport, Roads and road transport
493493
<!-- ===Error: Unknown Extensions======================================= -->
494494
<xsd:element name="UnknownExtensionsError" type="UnknownExtensionsErrorStructure" substitutionGroup="ErrorCode">
495495
<xsd:annotation>
496-
<xsd:documentation>Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</xsd:documentation>
496+
<xsd:documentation>Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</xsd:documentation>
497497
</xsd:annotation>
498498
</xsd:element>
499499
<xsd:complexType name="UnknownExtensionsErrorStructure">
500500
<xsd:annotation>
501-
<xsd:documentation>Type for Unknown Extensions Error:. (since SIRI 2.0).</xsd:documentation>
501+
<xsd:documentation>Type for Unknown Extensions Error. (since SIRI 2.0).</xsd:documentation>
502502
</xsd:annotation>
503503
<xsd:complexContent>
504504
<xsd:extension base="ErrorCodeStructure">
@@ -520,7 +520,7 @@ Rail transport, Roads and road transport
520520
</xsd:element>
521521
<xsd:complexType name="AllowedResourceUsageExceededErrorStructure">
522522
<xsd:annotation>
523-
<xsd:documentation>Type for error. AllowedResourceUsageExceeded.</xsd:documentation>
523+
<xsd:documentation>Type for error: Allowed Resource Usage Exceeded.</xsd:documentation>
524524
</xsd:annotation>
525525
<xsd:complexContent>
526526
<xsd:extension base="ErrorCodeStructure"/>
@@ -543,7 +543,7 @@ Rail transport, Roads and road transport
543543
<xsd:sequence>
544544
<xsd:element name="SubscriberRef" type="ParticipantRefStructure" minOccurs="0">
545545
<xsd:annotation>
546-
<xsd:documentation>Id of capabiliuty that is noit supported. + SIRI v2.0</xsd:documentation>
546+
<xsd:documentation>Id of capabiliuty that is noit supported. (since SIRI v2.0)</xsd:documentation>
547547
</xsd:annotation>
548548
</xsd:element>
549549
</xsd:sequence>
@@ -566,7 +566,7 @@ Rail transport, Roads and road transport
566566
<xsd:sequence>
567567
<xsd:element name="SubscriptionCode" type="SubscriptionQualifierStructure" minOccurs="0">
568568
<xsd:annotation>
569-
<xsd:documentation>Ubscription code that could not be found. + SIRI v2.0</xsd:documentation>
569+
<xsd:documentation>Subscription code that could not be found. (since SIRI v2.0)</xsd:documentation>
570570
</xsd:annotation>
571571
</xsd:element>
572572
</xsd:sequence>
@@ -581,7 +581,7 @@ Rail transport, Roads and road transport
581581
</xsd:element>
582582
<xsd:complexType name="OtherErrorStructure">
583583
<xsd:annotation>
584-
<xsd:documentation>Type for error.</xsd:documentation>
584+
<xsd:documentation>Type for error: Other.</xsd:documentation>
585585
</xsd:annotation>
586586
<xsd:complexContent>
587587
<xsd:extension base="ErrorCodeStructure"/>

‎xsd/siri_model/siri_journey_support.xsd‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Public transport, Bus services, Coach services, Bus stops and stations,
7878
Rail transport, Railway stations and track, Train services, Underground trains,
7979
Business and industry, Transport, Air transport, Ports and maritime transport, Public transport,
8080
Rail transport, Roads and road transport
81-
</Category>
81+
</Category>
8282
<Project>CEN TC278 WG3 SG7</Project>
8383
</Subject>
8484
<Title>SIRI XML schema. Service Interface for Real-time Information relating to Public Transport Operations. Subschema of identifers common journey elements</Title>
@@ -262,7 +262,7 @@ Rail transport, Roads and road transport
262262
</xsd:complexType>
263263
<xsd:element name="InterchangeRef" type="InterchangeRefStructure">
264264
<xsd:annotation>
265-
<xsd:documentation> Reference to a SERVICE JOURNEY INTERCHANGE.</xsd:documentation>
265+
<xsd:documentation>Reference to a SERVICE JOURNEY INTERCHANGE.</xsd:documentation>
266266
</xsd:annotation>
267267
</xsd:element>
268268
<!-- ======================================================================= -->
@@ -273,7 +273,7 @@ Rail transport, Roads and road transport
273273
<xsd:sequence>
274274
<xsd:element name="DataFrameRef" type="DataFrameRefStructure">
275275
<xsd:annotation>
276-
<xsd:documentation>identifier of data frame within particpant service. Used to ensure that the Reference to a DATED VEGICLE JOURNEY is unique with the data horizon of the service. Often the OperationalDayType is used for this purpose.</xsd:documentation>
276+
<xsd:documentation>Identifier of data frame within participant service. Used to ensure that the Reference to a DATED VEHICLE JOURNEY is unique with the data horizon of the service. Often the OPERATING DAY is used for this purpose.</xsd:documentation>
277277
</xsd:annotation>
278278
</xsd:element>
279279
<xsd:element name="DatedVehicleJourneyRef" type="DatedVehicleJourneyCodeType">
@@ -492,7 +492,7 @@ Has the following uses:
492492
- Either the smallest part of a formation, a TRAIN COMPONENT, is referenced or the TRAIN itself. The former is ideally used in a FORMATION ASSIGNMENT, i.e. QUAY (sector) assignment, to provide the highest level of detail for passenger orientation.
493493
- If the formation consists of multiple coupled TRAINs, a reference to the COMPOUND TRAIN is also possible. This might be used in a FORMATION CONDITION to signal a change of the train composition.
494494
- In case alighting/boarding data from an automatic passenger counting system is available, the respective vehicle entrances may be referenced.
495-
</xsd:documentation>
495+
</xsd:documentation>
496496
</xsd:annotation>
497497
<xsd:sequence>
498498
<xsd:element ref="CompoundTrainRef" minOccurs="0"/>
@@ -955,6 +955,11 @@ The first class carriage of a TRAIN might, for example, be assigned to sector "A
955955
</xsd:annotation>
956956
</xsd:enumeration>
957957
<xsd:enumeration value="secondClass ">
958+
<xsd:annotation>
959+
<xsd:documentation>pti23_7. -v.2.1</xsd:documentation>
960+
</xsd:annotation>
961+
</xsd:enumeration>
962+
<xsd:enumeration value="secondClass">
958963
<xsd:annotation>
959964
<xsd:documentation>pti23_7</xsd:documentation>
960965
</xsd:annotation>

0 commit comments

Comments
 (0)