Skip to content

Commit b8565ec

Browse files
haeckerbaerhaeckerbaer
authored
Merge pull request #10 from haeckerbaer/CR005
CR005: add new model JourneyRelations
2 parents 90cc8fd + 1e3e4de commit b8565ec

5 files changed

Lines changed: 194 additions & 3 deletions

‎xsd/siri_model/siri_datedVehicleJourney-v2.0.xsd‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ Rail transport, Roads and road transport
129129
</xsd:sequence>
130130
</xsd:complexType>
131131
</xsd:element>
132+
<xsd:element name="JourneyRelations" type="JourneyRelationsStructure" minOccurs="0">
133+
<xsd:annotation>
134+
<xsd:documentation>Relations of the journey with other journeys, e.g., in case a joining/splitting takes place or the journey substitutes for another one etc.</xsd:documentation>
135+
</xsd:annotation>
136+
</xsd:element>
132137
<xsd:element ref="Extensions" minOccurs="0"/>
133138
</xsd:sequence>
134139
</xsd:complexType>

‎xsd/siri_model/siri_estimatedVehicleJourney-v2.0.xsd‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@ the original journey and the nature of the difference.</xsd:documentation>
320320
</xsd:annotation>
321321
</xsd:element>
322322
</xsd:sequence>
323+
<xsd:element name="JourneyRelations" type="JourneyRelationsStructure" minOccurs="0">
324+
<xsd:annotation>
325+
<xsd:documentation>Relations of the journey with other journeys, e.g., in case a joining/splitting takes place or the journey substitutes for another one etc.</xsd:documentation>
326+
</xsd:annotation>
327+
</xsd:element>
323328
<xsd:element ref="Extensions" minOccurs="0"/>
324329
</xsd:sequence>
325330
</xsd:complexType>

‎xsd/siri_model/siri_journey-v2.0.xsd‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,5 +897,88 @@ Rail transport, Roads and road transport
897897
<xsd:documentation>For frequency based services, observed interval between vehicles at stop.</xsd:documentation>
898898
</xsd:annotation>
899899
</xsd:element>
900+
<!-- =====JourneyRelation================================================== -->
901+
<xsd:complexType name="JourneyRelationsStructure">
902+
<xsd:annotation>
903+
<xsd:documentation>Provides information about relations to other journeys. +SIRI v2.1</xsd:documentation>
904+
</xsd:annotation>
905+
<xsd:sequence>
906+
<xsd:element name="JourneyRelation" type="JourneyRelationStructure" maxOccurs="unbounded"/>
907+
</xsd:sequence>
908+
</xsd:complexType>
909+
<xsd:complexType name="JourneyRelationStructure">
910+
<xsd:sequence>
911+
<xsd:element name="JourneyRelationType" type="JourneyRelationTypeEnumeration">
912+
<xsd:annotation>
913+
<xsd:documentation>Specifies the type of the relation, e.g., joining, splitting, replacement etc. +SIRI v2.1</xsd:documentation>
914+
</xsd:annotation>
915+
</xsd:element>
916+
<xsd:group ref="JourneyRelationInfoGroup"/>
917+
<xsd:element ref="RelatedJourney" maxOccurs="unbounded"/>
918+
</xsd:sequence>
919+
</xsd:complexType>
920+
<xsd:group name="JourneyRelationInfoGroup">
921+
<xsd:annotation>
922+
<xsd:documentation>Specifies which CALL or JOURNEY PART of the JOURNEY has a JOURNEY RELATION. +SIRI v2.1</xsd:documentation>
923+
</xsd:annotation>
924+
<xsd:sequence>
925+
<xsd:choice>
926+
<xsd:element name="CallInfo" type="RelatedCallStructure">
927+
<xsd:annotation>
928+
<xsd:documentation>Information about the stop at which the JOURNEY is related to another JOURNEY. +SIRI v2.1</xsd:documentation>
929+
</xsd:annotation>
930+
</xsd:element>
931+
<xsd:element name="JourneyParts">
932+
<xsd:annotation>
933+
<xsd:documentation>Information about the JOURNEY PARTs for which the JOURNEY has a JOURNEY RELATION. +SIRI v2.1</xsd:documentation>
934+
</xsd:annotation>
935+
<xsd:complexType>
936+
<xsd:sequence>
937+
<xsd:element name="JourneyPartInfo" type="RelatedJourneyPartStructure" maxOccurs="unbounded">
938+
<xsd:annotation>
939+
<xsd:documentation>Information about related parts of JOURNEY. +SIRI v2.1</xsd:documentation>
940+
</xsd:annotation>
941+
</xsd:element>
942+
</xsd:sequence>
943+
</xsd:complexType>
944+
</xsd:element>
945+
</xsd:choice>
946+
</xsd:sequence>
947+
</xsd:group>
948+
<xsd:complexType name="RelatedCallStructure">
949+
<xsd:annotation>
950+
<xsd:documentation>The JOURNEY RELATION refers to this CALL. +SIRI v2.1</xsd:documentation>
951+
</xsd:annotation>
952+
<xsd:complexContent>
953+
<xsd:extension base="AbstractCallStructure">
954+
<xsd:sequence>
955+
<xsd:element ref="AimedDepartureTime" minOccurs="0"/>
956+
<xsd:element ref="AimedArrivalTime" minOccurs="0"/>
957+
</xsd:sequence>
958+
</xsd:extension>
959+
</xsd:complexContent>
960+
</xsd:complexType>
961+
<xsd:complexType name="RelatedJourneyPartStructure">
962+
<xsd:annotation>
963+
<xsd:documentation>The JOURNEY RELATION refers to this JOURNEY PART. +SIRI v2.1</xsd:documentation>
964+
</xsd:annotation>
965+
<xsd:complexContent>
966+
<xsd:extension base="JourneyPartInfoStructure"/>
967+
</xsd:complexContent>
968+
</xsd:complexType>
969+
<xsd:element name="RelatedJourney" type="RelatedJourneyStructure">
970+
<xsd:annotation>
971+
<xsd:documentation>Refers to the JOURNEY to which the current JOURNEY is related. +SIRI v2.1</xsd:documentation>
972+
</xsd:annotation>
973+
</xsd:element>
974+
<xsd:complexType name="RelatedJourneyStructure">
975+
<xsd:complexContent>
976+
<xsd:extension base="ConnectingJourneyRefStructure">
977+
<xsd:sequence>
978+
<xsd:group ref="JourneyRelationInfoGroup" minOccurs="0"/>
979+
</xsd:sequence>
980+
</xsd:extension>
981+
</xsd:complexContent>
982+
</xsd:complexType>
900983
<!-- ====================================================================== -->
901984
</xsd:schema>

‎xsd/siri_model/siri_journey_support-v2.0.xsd‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,16 @@ Rail transport, Roads and road transport
192192
<xsd:documentation>LINE Reference.</xsd:documentation>
193193
</xsd:annotation>
194194
</xsd:element>
195+
<xsd:element name="TrainNumberRef" type="TrainNumberRefStructure" minOccurs="0">
196+
<xsd:annotation>
197+
<xsd:documentation>TRAIN NUMBER Reference.</xsd:documentation>
198+
</xsd:annotation>
199+
</xsd:element>
200+
<xsd:element name="OperatorRef" type="OperatorRefStructure" minOccurs="0">
201+
<xsd:annotation>
202+
<xsd:documentation>OPERATOR Reference.</xsd:documentation>
203+
</xsd:annotation>
204+
</xsd:element>
195205
<xsd:element name="ParticipantRef" type="ParticipantRefStructure" minOccurs="0"/>
196206
</xsd:sequence>
197207
</xsd:complexType>
@@ -573,4 +583,64 @@ Corresponds to NeTEX TYPE OF SERVICe.</xsd:documentation>
573583
<xsd:enumeration value="unspecified"/>
574584
</xsd:restriction>
575585
</xsd:simpleType>
586+
<!-- =====JourneyRelation============================================================ -->
587+
<xsd:simpleType name="JourneyRelationTypeEnumeration">
588+
<xsd:annotation>
589+
<xsd:documentation>Allowed types of relation between JOURNEYs.</xsd:documentation>
590+
</xsd:annotation>
591+
<xsd:restriction base="xsd:NMTOKEN">
592+
<xsd:enumeration value="ContinuationOfJourney">
593+
<xsd:annotation>
594+
<xsd:documentation>The journey is a continuation of the specified RelatedJourney at the stop point given in CallInfo.
595+
Passengers don't need to change vehicles. The new journey is not communicated as an interchange.</xsd:documentation>
596+
</xsd:annotation>
597+
</xsd:enumeration>
598+
<xsd:enumeration value="ContinuedByJourney">
599+
<xsd:annotation>
600+
<xsd:documentation>The journey is continued by the specified RelatedJourney at the stop point given in CallInfo.
601+
Passengers don't need to change vehicles. The new journey is not communicated as an interchange.</xsd:documentation>
602+
</xsd:annotation>
603+
</xsd:enumeration>
604+
<xsd:enumeration value="SplitsIntoJourneys">
605+
<xsd:annotation>
606+
<xsd:documentation>The journey splits into multiple RelatedJourneys at the stop point given in CallInfo.</xsd:documentation>
607+
</xsd:annotation>
608+
</xsd:enumeration>
609+
<xsd:enumeration value="ContinuationOfSplitJourney">
610+
<xsd:annotation>
611+
<xsd:documentation>The journey is a continuation of a single RelatedJourney splitting into multiple journeys at the stop point given in CallInfo.</xsd:documentation>
612+
</xsd:annotation>
613+
</xsd:enumeration>
614+
<xsd:enumeration value="JoiningOfJourneys">
615+
<xsd:annotation>
616+
<xsd:documentation>The journey is the continuation of multiple RelatedJourneys joining together at the stop point given in CallInfo.</xsd:documentation>
617+
</xsd:annotation>
618+
</xsd:enumeration>
619+
<xsd:enumeration value="ContinuedByJoinedJourney">
620+
<xsd:annotation>
621+
<xsd:documentation>The journey is continued by a single RelatedJourney after joining other journeys at the stop point given in CallInfo.</xsd:documentation>
622+
</xsd:annotation>
623+
</xsd:enumeration>
624+
<xsd:enumeration value="ReplacementOfJourney">
625+
<xsd:annotation>
626+
<xsd:documentation>The journey replaces one or more partially or fully cancelled RelatedJourneys during the JourneyPart defined or referenced in JourneyPartInfo.</xsd:documentation>
627+
</xsd:annotation>
628+
</xsd:enumeration>
629+
<xsd:enumeration value="ReplacedByJourney">
630+
<xsd:annotation>
631+
<xsd:documentation>The partially or fully cancelled journey is replaced by one or more RelatedJourneys during the JourneyPart defined or referenced in JourneyPartInfo.</xsd:documentation>
632+
</xsd:annotation>
633+
</xsd:enumeration>
634+
<xsd:enumeration value="SupportOfJourney">
635+
<xsd:annotation>
636+
<xsd:documentation>The journey partially or fully supports one or more RelatedJourneys during the JourneyPart defined or referenced in JourneyPartInfo.</xsd:documentation>
637+
</xsd:annotation>
638+
</xsd:enumeration>
639+
<xsd:enumeration value="SupportedByJourney">
640+
<xsd:annotation>
641+
<xsd:documentation>The journey is partially or fully supported by one or more RelatedJourneys during the JourneyPart defined or referenced in JourneyPartInfo.</xsd:documentation>
642+
</xsd:annotation>
643+
</xsd:enumeration>
644+
</xsd:restriction>
645+
</xsd:simpleType>
576646
</xsd:schema>

‎xsd/siri_model/siri_monitoredVehicleJourney-v2.0.xsd‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ For SIRI-VM this is the most recent stop visited by the VEHICLE.</xsd:documentat
304304
<!-- ==== LINE ROUTE and destination elements======================================================== -->
305305
<xsd:complexType name="JourneyPartInfoStructure">
306306
<xsd:annotation>
307-
<xsd:documentation>Type for a refernces to JOURNEY PARTs. +SIRI v2.0 </xsd:documentation>
307+
<xsd:documentation>Type for a reference to JOURNEY PART. +SIRI v2.0 </xsd:documentation>
308308
</xsd:annotation>
309309
<xsd:sequence>
310-
<xsd:element name="JourneyPartRef" type="xsd:normalizedString">
310+
<xsd:element name="JourneyPartRef" type="xsd:normalizedString" minOccurs="0">
311311
<xsd:annotation>
312-
<xsd:documentation>Refrence to a JOURNEY part. +SIRI v2.0 </xsd:documentation>
312+
<xsd:documentation>Reference to a JOURNEY part. +SIRI v2.0 </xsd:documentation>
313313
</xsd:annotation>
314314
</xsd:element>
315315
<xsd:element name="TrainNumberRef" type="TrainNumberRefStructure" minOccurs="0">
@@ -322,8 +322,36 @@ For SIRI-VM this is the most recent stop visited by the VEHICLE.</xsd:documentat
322322
<xsd:documentation>Operator of JOURNEY PART. +SIRI v2.0 </xsd:documentation>
323323
</xsd:annotation>
324324
</xsd:element>
325+
<xsd:group ref="JourneyPartViewGroup" minOccurs="0"/>
325326
</xsd:sequence>
326327
</xsd:complexType>
328+
<xsd:group name="JourneyPartViewGroup">
329+
<xsd:annotation>
330+
<xsd:documentation>JourneyPart information instead of or in addition to the JourneyPartRef. +SIRI v2.1</xsd:documentation>
331+
</xsd:annotation>
332+
<xsd:sequence>
333+
<xsd:element name="FromStopPointRef" type="StopPointRefStructure">
334+
<xsd:annotation>
335+
<xsd:documentation>Reference to the SCHEDULED STOP POINT at which the related JOURNEY PART begins.</xsd:documentation>
336+
</xsd:annotation>
337+
</xsd:element>
338+
<xsd:element name="ToStopPointRef" type="StopPointRefStructure">
339+
<xsd:annotation>
340+
<xsd:documentation>Reference to the SCHEDULED STOP POINT at which the related JOURNEY PART ends.</xsd:documentation>
341+
</xsd:annotation>
342+
</xsd:element>
343+
<xsd:element name="StartTime" type="xsd:dateTime" minOccurs="0">
344+
<xsd:annotation>
345+
<xsd:documentation>Time at which the related JOURNEY PART begins.</xsd:documentation>
346+
</xsd:annotation>
347+
</xsd:element>
348+
<xsd:element name="EndTime" type="xsd:dateTime" minOccurs="0">
349+
<xsd:annotation>
350+
<xsd:documentation>Time at which the related JOURNEY PART ends.</xsd:documentation>
351+
</xsd:annotation>
352+
</xsd:element>
353+
</xsd:sequence>
354+
</xsd:group>
327355
<!-- ======================================================================= -->
328356
<xsd:complexType name="TrainBlockPartStructure">
329357
<xsd:annotation>

0 commit comments

Comments
 (0)