Skip to content
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

Jump to bottom

Remove recursion in AffectedLine <> AffectedStopPoint/Place elements #104

Open
wants to merge 5 commits into
base: integration
Choose a base branch
from
Open

Remove recursion in AffectedLine <> AffectedStopPoint/Place elements #104

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
de75828
deprecating not used affected structures
prirey Nov 11, 2022
cda0bd3
deprecating not used affected structures
prirey Nov 23, 2022
f04e582
deprecating not used affected structures
prirey Nov 23, 2022
2b507d0
fixed error
ue71603 Jun 21, 2023
ce4f7e9
Lint and update documentation tables
github-actions[bot] Jun 21, 2023
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
10 changes: 2 additions & 8 deletions examples/siri_exm_SM/exs_stopMonitoring_response.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@
(C) Copyright 2005-2012 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<ServiceDelivery>
<!--=======HEADER================================================== -->
<!--=======HEADER================================================== -->
<ResponseTimestamp>2004-12-17T09:30:46-05:00</ResponseTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
<Status>true</Status>
<ErrorCondition>
<CapabilityNotSupportedError>
<ErrorText>Test</ErrorText>
</CapabilityNotSupportedError>
<Description>Test</Description>
</ErrorCondition>
<MoreData>false</MoreData>
<!--=======PAYLOAD=============================================== -->
<!--=======PAYLOAD============================================== -->
<StopMonitoringDelivery version="2.0">
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<SubscriberRef>NADER</SubscriberRef>
Expand Down
2 changes: 1 addition & 1 deletion xsd/siri_model/siri_situation.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ Note: this means that ReasonName is NOT a complete message, but only a (few) wor
<xsd:choice>
<xsd:element name="AllOperators" type="EmptyType">
<xsd:annotation>
<xsd:documentation>All OPERATORs.</xsd:documentation>
<xsd:documentation>All OPERATORs. DEPRECATED since SIRI 2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AffectedOperator" type="AffectedOperatorStructure" maxOccurs="unbounded">
Expand Down
211 changes: 122 additions & 89 deletions xsd/siri_model/siri_situationAffects.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ Rail transport, Roads and road transport
<xsd:documentation>SIRI-SX Situation Scope.</xsd:documentation>
</xsd:annotation>
<!-- ======================================================================= -->
<xsd:complexType name="AffectedStopPointStructure">
<xsd:complexType name="AffectedStopPointWithoutLineStructure">
<xsd:annotation>
<xsd:documentation>Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
<xsd:documentation>Base Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="StopPointRef" minOccurs="0"/>
Expand Down Expand Up @@ -195,19 +195,30 @@ Rail transport, Roads and road transport
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="Lines" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Used to restrict stop points to some lines</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AffectedStopPointStructure">
<xsd:annotation>
<xsd:documentation>Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="AffectedStopPointWithoutLineStructure">
<xsd:sequence>
<xsd:element name="Lines" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Used to restrict stop points to some lines.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedLine" type="AffectedLineWithoutStopStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="AffectedModesStructure">
<xsd:annotation>
<xsd:documentation>Type for TRANSPORT MODEs affecetd by a SITUATION.</xsd:documentation>
Expand Down Expand Up @@ -539,7 +550,7 @@ Rail transport, Roads and road transport
<xsd:sequence>
<xsd:element name="AffectedOperator" type="AffectedOperatorStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Operators of LINEs affected by incident. Overrides any value specified for (i) General Context.</xsd:documentation>
<xsd:documentation>Operators of LINEs affected by incident. Overrides any value specified for (i) General Context. DEPRECATED since SIRI 2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NetworkRef" type="NetworkRefStructure" minOccurs="0">
Expand All @@ -561,7 +572,7 @@ Rail transport, Roads and road transport
<xsd:choice>
<xsd:element name="AllLines" type="EmptyType">
<xsd:annotation>
<xsd:documentation>All LINEs in the network are affected.</xsd:documentation>
<xsd:documentation>All LINEs in the network are affected. DEPRECATED since SIRI 2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="SelectedRoutes" type="AffectedRouteStructure" maxOccurs="unbounded">
Expand All @@ -585,9 +596,9 @@ Rail transport, Roads and road transport
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AffectedLineStructure">
<xsd:complexType name="AffectedLineWithoutStopStructure">
<xsd:annotation>
<xsd:documentation>Information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context. </xsd:documentation>
<xsd:documentation>Base information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context. </xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="AffectedOperator" type="AffectedOperatorStructure" minOccurs="0" maxOccurs="unbounded">
Expand All @@ -596,68 +607,79 @@ Rail transport, Roads and road transport
</xsd:annotation>
</xsd:element>
<xsd:group ref="LineGroup"/>
<xsd:element name="Origins" type="AffectedStopPointStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified origins</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Destinations" type="AffectedStopPointStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified DESTINATIONs</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Direction" type="DirectionStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>DIRECTIONs affected.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Routes" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified ROUTEs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedRoute" type="AffectedRouteStructure" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Route affected by Situation.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="Sections" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified LINE SECTIONs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedSection" type="AffectedSectionStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="StopPoints" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified SCHEDULED STOP POINTs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedStopPoint" type="AffectedStopPointStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="StopPlaces" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified STOP PLACEs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedStopPlace" type="AffectedStopPlaceStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AffectedLineStructure">
<xsd:annotation>
<xsd:documentation>Information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context. </xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="AffectedLineWithoutStopStructure">
<xsd:sequence>
<xsd:element name="Origins" type="AffectedStopPointWithoutLineStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified origins</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Destinations" type="AffectedStopPointWithoutLineStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified DESTINATIONs</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Direction" type="DirectionStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>DIRECTIONs affected.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Routes" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified ROUTEs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedRoute" type="AffectedRouteStructure" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Route affected by Situation.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="Sections" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified LINE SECTIONs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedSection" type="AffectedSectionStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="StopPoints" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified SCHEDULED STOP POINTs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedStopPoint" type="AffectedStopPointWithoutLineStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="StopPlaces" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Restricts the affected scope to the specified STOP PLACEs</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedStopPlace" type="AffectedStopPlaceWithoutLineStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="AffectedSectionStructure">
<xsd:annotation>
<xsd:documentation>Type for information about the SECTIONs affected by a SITUATION.</xsd:documentation>
Expand Down Expand Up @@ -780,7 +802,7 @@ Rail transport, Roads and road transport
</xsd:annotation>
</xsd:element>
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="AffectedStopPoint" type="AffectedStopPointStructure">
<xsd:element name="AffectedStopPoint" type="AffectedStopPointWithoutLineStructure">
<xsd:annotation>
<xsd:documentation>Stop Point of the ROUTE</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -1181,6 +1203,28 @@ Rail transport, Roads and road transport
<xsd:annotation>
<xsd:documentation>Type for information about the STOP PLACEs affected by an SITUATION.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="AffectedStopPlaceWithoutLineStructure">
<xsd:sequence>
<xsd:element name="Lines" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Used to restrict STOP PLACEs to some lines.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="AffectedStopPlaceWithoutLineStructure">
<xsd:annotation>
<xsd:documentation>Base Type for information about the STOP PLACEs affected by an SITUATION.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="AffectedStopPlaceElementStructure">
<xsd:sequence>
Expand Down Expand Up @@ -1237,17 +1281,6 @@ Rail transport, Roads and road transport
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="Lines" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Used to restrict STOP PLACEs to some lines</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element ref="Extensions" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
Expand Down
2 changes: 1 addition & 1 deletion xsd/siri_situationExchange_service.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ Rail transport, Roads and road transport
<xsd:sequence>
<xsd:element name="OperatorRef" type="OperatorRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Referance to an OPERATOR. If unspecified, all OPERATOR.s.</xsd:documentation>
<xsd:documentation>Reference to an OPERATOR. If unspecified, all OPERATOR.s.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OperationalUnitRef" type="OperationalUnitRefStructure" minOccurs="0" maxOccurs="unbounded">
Expand Down