Skip to content

Commit

Permalink
Merge branch 'integration' into issues#89
Browse files Browse the repository at this point in the history
  • Loading branch information
@haeckerbaer
haeckerbaer authored Oct 25, 2022
2 parents 3eca287 + 3434834 commit a26cfda
Show file tree
Hide file tree
Showing 39 changed files with 802 additions and 797 deletions.
6 changes: 3 additions & 3 deletions xsd/datex2/DATEXIISchemaWithDefinitions.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8286,7 +8286,7 @@
</xs:enumeration>
<xs:enumeration value="microwavedMonitoringStation">
<xs:annotation>
<xs:documentation>Value was added in SIRI 2.1 to ensure compatibility with VDV736 / UmS profile (v1.0) of CEN SIRI SX. See also 'microwaveMonitoringStation'</xs:documentation>
<xs:documentation>See also 'microwaveMonitoringStation'</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="mobileTelephoneCaller">
Expand All @@ -8301,7 +8301,7 @@
</xs:enumeration>
<xs:enumeration value="nonPoliceEmergencyServicesPatrol">
<xs:annotation>
<xs:documentation>Value was added in SIRI 2.1 to ensure compatibility with VDV736 / UmS profile (v1.0) of CEN SIRI SX. See also 'nonPoliceEmergencyServicePatrol'</xs:documentation>
<xs:documentation>See also 'nonPoliceEmergencyServicePatrol'</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="otherInformation">
Expand Down Expand Up @@ -8336,7 +8336,7 @@
</xs:enumeration>
<xs:enumeration value="registeredMobileObserver">
<xs:annotation>
<xs:documentation>Value was added in SIRI 2.1 to ensure compatibility with VDV736 / UmS profile (v1.0) of CEN SIRI SX. See also 'registeredMotoristObserver'</xs:documentation>
<xs:documentation>See also 'registeredMotoristObserver'</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="roadAuthorities">
Expand Down
2 changes: 1 addition & 1 deletion xsd/siri.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ mailto:[email protected]</Creator>
Correct delegation elements-->
</Date>
<Date><Modified>2014-03-31</Modified>
<!--+SIRI v2.0 Comments
<!--(since SIRI 2.0) Comments
- Add terminate subscription notification-->
</Date>
<Description>
Expand Down
12 changes: 6 additions & 6 deletions xsd/siri/siri_common_services.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
-- Revise for substitution groups and move down to siri subdirectory
</Date>
<Date><Modified>2012-03-23</Modified>
+SIRI v2.0
(since SIRI 2.0)
- Add DataReady to Check Status
- Add DistanceUnits and VelocityUnits to ServiceRequestContext
- [FR] Add Extensions tag to Terminate SubscriptionRequest
</Date>
<Date><Modified>2014-03-31</Modified>
+SIRI v2.0 Comments
(since SIRI 2.0) Comments
- Add terminate subscription notification
</Date>
<Date><Modified>2014-06-23</Modified>
+SIRI v2.0 Comments
(since SIRI 2.0) Comments
- Revise terminate subscription erroc condition to be consistent with other services
</Date>
<Description>
Expand Down Expand Up @@ -345,12 +345,12 @@ Rail transport, Roads and road transport
</xsd:choice>
<xsd:element name="DistanceUnits" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Units for Distance Type. Default is metres. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Units for Distance Type. Default is metres. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VelocityUnits" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Units for Distance Type. Default is metres per second. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Units for Distance Type. Default is metres per second. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -395,7 +395,7 @@ Rail transport, Roads and road transport
<xsd:group ref="RequestorEndpointGroup"/>
<xsd:group ref="DelegatorEndpointGroup">
<xsd:annotation>
<xsd:documentation>If request has been proxied by an intermediate aggregating system , tracking information relating to the original requestor. This allows the aggregation to be stateless. +SIRI 2.0</xsd:documentation>
<xsd:documentation>If request has been proxied by an intermediate aggregating system , tracking information relating to the original requestor. This allows the aggregation to be stateless. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:group>
<xsd:group ref="TerminateSubscriptionTopicGroup"/>
Expand Down
60 changes: 30 additions & 30 deletions xsd/siri/siri_request_errorConditions.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
Add new error conditions
UnknownParticipant Recipient for a message to be distributed is unknown. +SIRI v2.0
UnknownEndpoint Endpoint to which a message is to be distributed is unknown. +SIRI v2.0
EndpointDeniedAccess Distribution message could not be delivered because not authorised.. +SIRI v2.0
EndpointNotAvailable Recipient of a message to be distributed is not available. +SIRI v2.0
UnapprovedKey User authorisation Key is not enabled. +SIRI v2.0
UnknownParticipant Recipient for a message to be distributed is unknown. (since SIRI 2.0)
UnknownEndpoint Endpoint to which a message is to be distributed is unknown. (since SIRI 2.0)
EndpointDeniedAccess Distribution message could not be delivered because not authorised.. (since SIRI 2.0)
EndpointNotAvailable Recipient of a message to be distributed is not available. (since SIRI 2.0)
UnapprovedKey User authorisation Key is not enabled. (since SIRI 2.0)
InvalidDataReferences Request contains references to identifiers that are not known. +SIRI v2.0
ParametersIgnored Request contained parameters that were not supported by the producer. A response has been provided but some parameters have been ignored. +SIRI v2.0
UnknownExtensions Request contained extensions that were not supported bu the producer. A response has been provided but some or all extensions have been ignored.. +SIRI v2.0 -->
InvalidDataReferences Request contains references to identifiers that are not known. (since SIRI 2.0)
ParametersIgnored Request contained parameters that were not supported by the producer. A response has been provided but some parameters have been ignored. (since SIRI 2.0)
UnknownExtensions Request contained extensions that were not supported bu the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0) -->
</Date>
<Date>
<Modified>2012-03-23</Modified>
Expand Down Expand Up @@ -204,16 +204,16 @@ Rail transport, Roads and road transport
<xsd:group ref="ApplicationErrorGroup"/>
</xsd:choice>
</xsd:group>
<!-- === DISTRIBUTION (+SIRI v2.0)================================================== -->
<!-- === DISTRIBUTION ((since SIRI 2.0))================================================== -->
<xsd:group name="DistributionErrorGroup">
<xsd:annotation>
<xsd:documentation>Errors that may arise in the execution of a delegated distribution request. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Errors that may arise in the execution of a delegated distribution request. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:choice>
<xsd:element ref="UnapprovedKeyAccessError"/>
<xsd:element ref="UnknownParticipantError">
<xsd:annotation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. I.e. delegatior is found, but +SIRI v2.0</xsd:documentation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. I.e. delegatior is found, but (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="UnknownEndpointError"/>
Expand All @@ -224,12 +224,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Unapproved Key Access ============================================= -->
<xsd:element name="UnapprovedKeyAccessError" type="UnapprovedKeyAccessStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error:Recipient of a message to be distributed is not available. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Error:Recipient of a message to be distributed is not available. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="UnapprovedKeyAccessStructure">
<xsd:annotation>
<xsd:documentation>Type for Error: UnapprovedKey +SIRI v2.0</xsd:documentation>
<xsd:documentation>Type for Error: UnapprovedKey (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -246,12 +246,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Capability Not Supported============================================== -->
<xsd:element name="UnknownParticipantError" type="UnknownParticipantErrorStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="UnknownParticipantErrorStructure">
<xsd:annotation>
<xsd:documentation>Type for Error: Unknown Participant. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Type for Error: Unknown Participant. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -268,12 +268,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Unknown Endpoint ============================================ -->
<xsd:element name="UnknownEndpointError" type="UnknownEndpointErrorStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Error: Recipient for a message to be distributed is unknown. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="UnknownEndpointErrorStructure">
<xsd:annotation>
<xsd:documentation>Type for Error: Unknown Endpoint +SIRI v2.0</xsd:documentation>
<xsd:documentation>Type for Error: Unknown Endpoint (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -290,12 +290,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Endpoint Denied Access ============================================= -->
<xsd:element name="EndpointDeniedAccessError" type="EndpointDeniedAccessStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error:Endpoint to which a message is to be distributed did not allow access by the cloient. +SIRI v2.0</xsd:documentation>
<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>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="EndpointDeniedAccessStructure">
<xsd:annotation>
<xsd:documentation>Type for Error: EndpointDeniedAccess +SIRI v2.0</xsd:documentation>
<xsd:documentation>Type for Error: EndpointDeniedAccess (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -312,12 +312,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Endpoint Not Available============================================= -->
<xsd:element name="EndpointNotAvailableAccessError" type="EndpointNotAvailableAccessStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error:Recipient of a message to be distributed is not available. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Error:Recipient of a message to be distributed is not available. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="EndpointNotAvailableAccessStructure">
<xsd:annotation>
<xsd:documentation>Type for Error: EndpointNotAvailable +SIRI v2.0</xsd:documentation>
<xsd:documentation>Type for Error: EndpointNotAvailable (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -344,14 +344,14 @@ Rail transport, Roads and road transport
<xsd:element ref="InvalidDataReferencesError"/>
<xsd:element ref="BeyondDataHorizon">
<xsd:annotation>
<xsd:documentation>Error: Data period or subscription period is outside of period covered by service. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Error: Data period or subscription period is outside of period covered by service. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="NoInfoForTopicError"/>
<xsd:element ref="ParametersIgnoredError"/>
<xsd:element ref="UnknownExtensionsError">
<xsd:annotation>
<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. +SIRI v2.0.</xsd:documentation>
<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>
</xsd:annotation>
</xsd:element>
<xsd:element ref="AllowedResourceUsageExceededError"/>
Expand All @@ -373,7 +373,7 @@ Rail transport, Roads and road transport
<xsd:sequence>
<xsd:element name="ExpectedRestartTime" type="xsd:dateTime" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Expected time fro reavailability of servcie. +SIRI v2.0</xsd:documentation>
<xsd:documentation>Expected time fro reavailability of servcie. (since SIRI 2.0)</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -448,12 +448,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Invalid Data References ======================================= -->
<xsd:element name="InvalidDataReferencesError" type="InvalidDataReferencesErrorStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error: Request contains references to identifiers that are not known. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Error: Request contains references to identifiers that are not known. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="InvalidDataReferencesErrorStructure">
<xsd:annotation>
<xsd:documentation>Type for InvalidDataReferencesError:. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Type for InvalidDataReferencesError:. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -470,12 +470,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Invalid Data References ======================================= -->
<xsd:element name="ParametersIgnoredError" type="ParametersIgnoredErrorStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<xsd:documentation>Error: Request contained parameters that were not supported by the producer. A response has been provided but some parameters have been ignored. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Error: Request contained parameters that were not supported by the producer. A response has been provided but some parameters have been ignored. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="ParametersIgnoredErrorStructure">
<xsd:annotation>
<xsd:documentation>Type for Parameters Ignored Error:. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Type for Parameters Ignored Error:. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand All @@ -492,12 +492,12 @@ Rail transport, Roads and road transport
<!-- ===Error: Unknown Extensions======================================= -->
<xsd:element name="UnknownExtensionsError" type="UnknownExtensionsErrorStructure" substitutionGroup="ErrorCode">
<xsd:annotation>
<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.. +SIRI v2.0.</xsd:documentation>
<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>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="UnknownExtensionsErrorStructure">
<xsd:annotation>
<xsd:documentation>Type for Unknown Extensions Error:. +SIRI v2.0.</xsd:documentation>
<xsd:documentation>Type for Unknown Extensions Error:. (since SIRI 2.0).</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ErrorCodeStructure">
Expand Down
6 changes: 3 additions & 3 deletions xsd/siri/siri_request_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,17 @@ Where multiple values are returned The first element returned will be used as th
</xsd:element>
<xsd:element name="IncludeInterchanges" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation>Whether SERVICE JOURNEY INTERCHANGE data is to be transmitted or not. Default is 'true'. +SIRI v2.1</xsd:documentation>
<xsd:documentation>Whether SERVICE JOURNEY INTERCHANGE data is to be transmitted or not. Default is 'true'. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IncludeJourneyRelations" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation>Whether JOURNEY RELATION data is to be transmitted or not. Default is 'true'. +SIRI v2.1</xsd:documentation>
<xsd:documentation>Whether JOURNEY RELATION data is to be transmitted or not. Default is 'true'. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IncludeTrainFormations" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation>Whether TRAIN (ELEMENT), COMPOUND TRAIN and TRAIN STOP ASSIGNMENT data is to be transmitted or not. Default is 'true'. +SIRI v2.1</xsd:documentation>
<xsd:documentation>Whether TRAIN (ELEMENT), COMPOUND TRAIN and TRAIN STOP ASSIGNMENT data is to be transmitted or not. Default is 'true'. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<!-- ======================================================================= -->
Expand Down
Loading

0 comments on commit a26cfda

Please sign in to comment.