SIRI v2.0q

SIRI v2.0q as published, but with consistent line separators (LF) and
formatting of xsd, xml and wsdl by xmllint

SIRI_XML-2.0q_changes.txt

@@ -0,0 +1,57 @@
+Changes made against SIRI 2.0p for SIRI 2.0q by VDV-Ums
+2018-11-13 - D. Rubli, K. Grimme
+
+ifopt\ifopt_stop-v0.3.xsd
+- Enum "ferrytPort" in StopPlaceTypeEnumeration changed to "ferryPort"
+
+siri_model\siri_reference-v2.0.xsd
+- "PublishedLineName" inside "PublishedLineGroup" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+- "DestinationName" inside "PublishedLineGroup" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+
+siri_model\siri_situationActions-v2.0.xsd:
+- ActionsStructure.ActionsGroup.PublishToTvAction changed to unbounded
+- ActionsStructure.ActionsGroup.NotifyBySmsAction changed to unbounded
+- PublishToDisplayAction added to ActionsGroup
+- ActionsStructure.ActionsGroup.PublishToTvAction.Ceefax and Teletext: annotation switched
+
+siri_model\siri_situationAffects-v2.0.xsd
+- Wrapped "AffectedInterchanges" node around AffectedInterchange in AffectedCallStructure
+- "PublishedLineName" inside "LineGroup" and "AffectedVehicleJourneyStructure" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+- "Route" inside "AffectedVehicleJourneyStructure" is now optional since all of its content are optional
+
+siri_model\siri_situationReasons-v2.0.xsd:
+- MiscellaneousReasonEnumeration TPEC-code of "altercation" changed from pti19_1_Alias_6 to pti19_1_Alias_7 because TPEC-code pti19_1_Alias_6 was wrongly doubled in use for "emergencyServicesCall" and "altercation"
+- MiscellaneousReasonEnumeration TPEC-code of "illVehicleOccupants" changed from pti19_1_Alias_7 to pti19_1_Alias_8
+- MiscellaneousReasonEnumeration TPEC-code of "undefinedProblem" changed from pti19_27 to pti19_255
+- MiscellaneousSubReasonEnumeration TPEC-code value "assault" added according to recommendation document and Datex2  
+- EquipmentReasonEnumeration TPEC-code pti21_6_Alias_2 "defectiveTrain" added according to recommendation document
+- EquipmentReasonEnumeration TPEC-code pti21_8_Alias_10 "leveCrossingFailure" changed to "levelCrossingFailure" according to recommendation document
+- EquipmentReasonEnumeration TPEC-code pti21_8_Alias_11 "trafficManagementSystemFailure" added according to recommendation document
+- EquipmentReasonEnumeration TPEC-code pti21_12_Alias_1 value changed from "oveheadWireFailure" to "overheadWireFailure" according to recommendation document
+- EquipmentSubReasonEnumeration TPEC-code value "defectiveTrain" added according to recommendation document
+- EquipmentSubReasonEnumeration TPEC-code value "leveCrossingFailure" changed to "levelCrossingFailure" according to recommendation document
+- EquipmentSubReasonEnumeration TPEC-code value "trafficManagementSystemFailure" added according to recommendation document
+- EquipmentSubReasonEnumeration TPEC-code value "oveheadWireFailure" changed to "overheadWireFailure" according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_13_Alias_1 "flashFloods" added according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_19_Alias_1 "mudslide" added according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_19_Alias_2 "rockfalls" added according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_19_Alias_3 "subsidence" added according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_19_Alias_4 "earthquakeDamage" added according to recommendation document
+- EnvironmentReasonEnumeration TPEC-code pti22_3_Alias_3 "avalanches" added according to TPEG document
+- EnvironmentReasonEnumeration TPEC-code pti22_13_Alias_1 "flashFloods" added according to recommendation document
+- EnvironmentSubReasonEnumeration TPEC-code value "lighteningStrike" changed to "lightningStrike" according to recommendation document
+- EnvironmentSubReasonEnumeration TPEC-code value "mudslip" changed to "mudslide" according to recommendation document and Datex2
+
+siri_model\siri_situationServiceTypes-v1.0.xsd:
+- ReportTypeEnumeration TPEC-code "2_27_1_Alias_2" changed to "27_1_Alias_2" according to recommendation document
+- ReportTypeEnumeration TPEC-code "2_27_1_Alias_3" changed to "27_1_Alias_3" according to recommendation document
+
+siri_model\siri_situation-v2.0.xsd:
+- RelatedToEnumeration Enum value "correctionTo" added according to recommendation document
+- WorkflowStatusEnumeration Enum value "pendingApproval" added according to recommendation document
+- AudienceEnumeration Enum value "authorities" added according to recommendation document
+- AudienceEnumeration Enum value "transportOperators" added according to recommendation document
+- Severity changed from mandatory to optional as mentioned in XSD annotation and recommendation
+
+xsd\siri_situationExchange_service.xsd:
+- SituationExchangeServiceCapabilitiesStructure.TopicFiltering "FilterByKeword" changed to "FilterByKeyword" according to recommendation document

xsd/ReadMe.txt

@@ -20,16 +20,15 @@ This ReadMe describes Changes to the SIRI schema up to  v2.0 version 2.0   since
 ========================
 Changes to  SIRI schema v2.0   since v1.4
 
- 2015.05.20 Bug fix (from SG7 feedback) SIRI 2.0o Draft2
-	* siri_situationExchange_service.xsd FilterByKeword corrected to FilterByKeyword
-	* siri_estimatedVehicleJourney-v2.0.xsd coorections of typo in comments and documentation
-
- 2015.05.13 Bug fix (from SG7 feedback) SIRI 2.0o Draft2
+ 2015.05.13 Bug fix (from french feedback) SIRI 2.0p
+	* replacement of "NotifyExtension" (appearing 10 times) with "SiriExtension" in siri_wsConsumer.wsdl in order to ensure compatibility with the Document version
+
+ 2015.05.13 Bug fix (from SG7 feedback) SIRI 2.0o
  	* update annotation in siri.xsd and and siri_all_functionalService.xsd (to add <Requires> siri__facilityMonitoring_service.xsd ...)
 	* siri.xsd: move of a SituationExchangeDelivery, renamed IncludedSituationExchangeDelivery, before other complemented service deliveries.
 	* siri_situationExchange_service.xsd: addition of IncludedSituationExchangeDelivery element
 
- 2015.05.11 Bug fix (from SG7 skype meeting on May 11th 2015) SIRI 2.0o Draft1
+ 2015.05.11 Bug fix (from SG7 skype meeting on May 11th 2015) SIRI 2.0o
  	* Allow multiple tags within an extension (reapply lost chnage from 2012.06.18 SIRI 2.0d) - siri_utility-v1.1.xsd
 	* siri_estimatedVehicleJourney-v2.0.xsd : in EstimatedTimetableAlterationGroup, addition of FramedVehicleJourneyRef as an alternative to DatedVehicleJourneyRef (choice) and deprecation of DatedVehicleJourneyRef and EstimatedVehicleJourneyCode
 	* siri_datedVehicleJourney-v2.0.xsd : DatedVehicleJourneyCode is now optional

xsd/ifopt/ifopt_stop-v0.3.xsd

@@ -19,6 +19,9 @@
     <Date><Modified>2012-03-12</Modified>
 					Change IdentifertYpe to normalizedString
 				</Date>
+    <Date><Modified>2018-11-13</Modified>
+          [vdv] Enum "ferrytPort" in StopPlaceTypeEnumeration changed to "ferryPort"
+				</Date>
     <Description>
      <p>Fixed Objects in Public Transport. This subschema defines STOP PLACE base types.</p>
     </Description>
@@ -251,7 +254,7 @@ Rail transport, Roads and road transport
    <xsd:enumeration value="coachStation"/>
    <xsd:enumeration value="busStation"/>
    <xsd:enumeration value="harbourPort"/>
-   <xsd:enumeration value="ferrytPort"/>
+   <xsd:enumeration value="ferryPort"/>
    <xsd:enumeration value="ferryStop"/>
    <xsd:enumeration value="onStreetBus"/>
    <xsd:enumeration value="onStreetTram"/>

xsd/siri_model/siri_estimatedVehicleJourney-v2.0.xsd

@@ -107,7 +107,7 @@ Rail transport, Roads and road transport
      <xsd:element name="DatedVehicleJourneyRef" type="DatedVehicleJourneyRefStructure">
       <xsd:annotation>
        <xsd:documentation>Reference to a dated VEHICLE JOURNEY. This will be 'framed' ie be with the data context of the ESTIMATED Timetable. 
-DEPRECATED from SIRI 2.0</xsd:documentation>
+DEPRECATED from SRI 2.0</xsd:documentation>
       </xsd:annotation>
      </xsd:element>
     </xsd:choice>
@@ -119,7 +119,7 @@ DEPRECATED from SIRI 2.0</xsd:documentation>
     <xsd:element name="EstimatedVehicleJourneyCode" type="EstimatedVehicleJourneyCodeType">
      <xsd:annotation>
       <xsd:documentation>If this is the first message about an extra unplanned VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'. 
-DEPRECATED from SIRI 2.0</xsd:documentation>
+DEPRECATED from SRI 2.0</xsd:documentation>
      </xsd:annotation>
     </xsd:element>
    </xsd:choice>
@@ -296,7 +296,7 @@ the original journey and the nature of the difference.</xsd:documentation>
    <xsd:sequence>
     <xsd:element name="RecordedCalls" minOccurs="0">
      <xsd:annotation>
-      <xsd:documentation>Observed call times for that art of teh journey that has already been completed.  (+ SIRI 2..0)</xsd:documentation>
+      <xsd:documentation>Observed call tmes for that art of teh journey that has already been completed.  (+ SIRI 2..0)</xsd:documentation>
      </xsd:annotation>
      <xsd:complexType>
       <xsd:sequence>
@@ -306,7 +306,7 @@ the original journey and the nature of the difference.</xsd:documentation>
     </xsd:element>
     <xsd:element name="EstimatedCalls" minOccurs="0">
      <xsd:annotation>
-      <xsd:documentation>Estimated call times for journey</xsd:documentation>
+      <xsd:documentation>Estimated call tmes for journey</xsd:documentation>
      </xsd:annotation>
      <xsd:complexType>
       <xsd:sequence>

xsd/siri_model/siri_reference-v2.0.xsd

@@ -43,6 +43,10 @@
     <Date><Modified>2013-02-11</Modified>
 					Correction: PlaceName unbounded to allow multiple languages
 				</Date>
+    <Date><Modified>2018-11-08</Modified>
+          [vdv] "PublishedLineName" inside "PublishedLineGroup" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+          [vdv] "DestinationName" inside "PublishedLineGroup" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+				</Date>
     <Description>
      <p>SIRI is a European CEN standard for the exchange of real-time information .</p>
      <p>This package defines common basic domain model identifier elements that are used in one or more SIRI fucntional service.</p>
@@ -488,8 +492,8 @@ Values for these elements can be specified on an annual schedule and will be inh
    <xsd:documentation>Elements describing the LINEand DESTINATION of a journey. Values for these elements can be specified on an annual schedule and will be inherited, unless overriden, onto the production timetable and then onto the individul dated VEHICLE JOURNEYs of the timetable. Each real-time journey takes its values from the dated VEHICLE JOURNEY that it follows. The absence of a value on an entity at a given level indicates that the value should be inherited (i) from any recent preceding update message for the same entity, or if there is no previous override, (ii) from its immediate parent entity.</xsd:documentation>
   </xsd:annotation>
   <xsd:sequence>
-   <xsd:element ref="PublishedLineName" minOccurs="0"/>
-   <xsd:element name="DestinationName" type="NaturalLanguageStringStructure" minOccurs="0">
+   <xsd:element ref="PublishedLineName" minOccurs="0" maxOccurs="unbounded"/>
+   <xsd:element name="DestinationName" type="NaturalLanguageStringStructure" minOccurs="0" maxOccurs="unbounded">
     <xsd:annotation>
      <xsd:documentation>Description of the destination stop (vehicle signage), if different from the that in  timetable - the DESTINATION DISPLAY. Can be overwritten section by section by the entry in an individual CALL.</xsd:documentation>
     </xsd:annotation>

xsd/siri_model/siri_situation-v2.0.xsd

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Aurige) -->
 <xsd:schema xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:acsb="http://www.ifopt.org.uk/acsb" xmlns:D2LogicalModel="http://datex2.eu/schema/2_0RC1/2_0" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="siri_situation">
  <!-- ======================================================================= -->
  <!--Needed to work around import limitation in JAXB - all namespaces. -->
@@ -202,6 +203,7 @@ Rail transport, Roads and road transport
   <xsd:restriction base="xsd:NMTOKEN">
    <xsd:enumeration value="cause"/>
    <xsd:enumeration value="effect"/>
+   <xsd:enumeration value="correctionTo"/>
    <xsd:enumeration value="update"/>
    <xsd:enumeration value="supercedes"/>
    <xsd:enumeration value="supercededBy"/>
@@ -602,6 +604,7 @@ Rail transport, Roads and road transport
   </xsd:annotation>
   <xsd:restriction base="xsd:NMTOKEN">
    <xsd:enumeration value="draft"/>
+   <xsd:enumeration value="pendingApproval"/>
    <xsd:enumeration value="approvedDraft"/>
    <xsd:enumeration value="open"/>
    <xsd:enumeration value="published"/>
@@ -759,7 +762,9 @@ Rail transport, Roads and road transport
    <xsd:enumeration value="staff"/>
    <xsd:enumeration value="stationStaff"/>
    <xsd:enumeration value="management"/>
+   <xsd:enumeration value="authorities"/>
    <xsd:enumeration value="infoServices"/>
+   <xsd:enumeration value="transportOperators"/>
   </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="NatureEnumeration">
@@ -1120,7 +1125,7 @@ Rail transport, Roads and road transport
     </xsd:annotation>
    </xsd:element>
    <xsd:element ref="Condition" minOccurs="0" maxOccurs="unbounded"/>
-   <xsd:element name="Severity" type="SeverityEnumeration">
+   <xsd:element name="Severity" type="SeverityEnumeration" minOccurs="0">
     <xsd:annotation>
      <xsd:documentation>Severity of disruption if different from that of SITUATION. TPEG pti26</xsd:documentation>
     </xsd:annotation>
@@ -1249,7 +1254,7 @@ Rail transport, Roads and road transport
  <!--==Delay =========================================== -->
  <xsd:simpleType name="DelayBandEnumeration">
   <xsd:annotation>
-   <xsd:documentation>Type for allwoed values of Dela band. Based on Datex2</xsd:documentation>
+   <xsd:documentation>Type for allwoed values of DelayBand. Based on Datex2</xsd:documentation>
   </xsd:annotation>
   <xsd:restriction base="xsd:normalizedString">
    <xsd:enumeration value="delayTwoMinutes"/>

xsd/siri_model/siri_situationActions-v2.0.xsd

@@ -22,6 +22,12 @@
     <Date><Modified>2013-05-01</Modified>
          [de] Add SocialNetworks to PublishToWeb action
 				</Date>
+    <Date><Modified>2018-11-13</Modified>
+          [vdv] ActionsStructure.ActionsGroup.PublishToTvAction changed to unbounded
+          [vdv] ActionsStructure.ActionsGroup.NotifyBySmsAction changed to unbounded
+          [vdv] PublishToDisplayAction added to ActionsGroup
+          [vdv] ActionsStructure.ActionsGroup.PublishToTvAction.Ceefax and Teletext: annotation switched
+				</Date>
     <Description>
      <p>SIRI-SX is an XML schema for the exchange of structured SITUATIONs. This subschema describes publishing actions </p>
     </Description>
@@ -188,11 +194,12 @@ Rail transport, Roads and road transport
   <xsd:sequence>
    <xsd:element ref="PublishToWebAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="PublishToMobileAction" minOccurs="0" maxOccurs="unbounded"/>
-   <xsd:element ref="PublishToTvAction" minOccurs="0"/>
+   <xsd:element ref="PublishToTvAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="PublishToAlertsAction" minOccurs="0" maxOccurs="unbounded"/>
+   <xsd:element ref="PublishToDisplayAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="ManualAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="NotifyByEmailAction" minOccurs="0" maxOccurs="unbounded"/>
-   <xsd:element ref="NotifyBySmsAction" minOccurs="0"/>
+   <xsd:element ref="NotifyBySmsAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="NotifyByPagerAction" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element ref="NotifyUserAction" minOccurs="0" maxOccurs="unbounded"/>
   </xsd:sequence>
@@ -325,12 +332,12 @@ Rail transport, Roads and road transport
     <xsd:sequence>
      <xsd:element name="Ceefax" type="xsd:boolean" default="true" minOccurs="0">
       <xsd:annotation>
-       <xsd:documentation>Publish to Teltext. Default is 'true'.</xsd:documentation>
+       <xsd:documentation>Publish to Ceefax. Default is 'true'.</xsd:documentation>
       </xsd:annotation>
      </xsd:element>
      <xsd:element name="Teletext" type="xsd:boolean" default="true" minOccurs="0">
       <xsd:annotation>
-       <xsd:documentation>Publish to Ceefax. Default is 'true'.</xsd:documentation>
+       <xsd:documentation>Publish to Teletext. Default is 'true'.</xsd:documentation>
       </xsd:annotation>
      </xsd:element>
     </xsd:sequence>

xsd/siri_model/siri_situationAffects-v2.0.xsd

@@ -47,6 +47,11 @@
         * [de] Add IncludeOnly-IfInPublicationWindow to situation request temporal filter   siri_situationExchange_service.xsd.  
         * [doc/fx] Correct   capability Matrix  siri_situationExchange_service.xsd.
 				</Date>
+    <Date><Modified>2018-11-08</Modified>
+          [vdv] Wrapped "AffectedInterchanges" node around AffectedInterchange in AffectedCallStructure
+          [vdv] "PublishedLineName" inside "LineGroup" and "AffectedVehicleJourneyStructure" changed to "unbounded" to allow multiple definitions for different languages due to the xml:lang-Attribute
+          [vdv] "Route" inside "AffectedVehicleJourneyStructure" is now optional since all of its content are optional
+				</Date>
     <Description>
      <p>SIRI-SX is an XML schema for the exchange of structured incidents </p>
     </Description>
@@ -446,7 +451,7 @@ Rail transport, Roads and road transport
   </xsd:annotation>
   <xsd:sequence>
    <xsd:element ref="LineRef"/>
-   <xsd:element ref="PublishedLineName" minOccurs="0"/>
+   <xsd:element ref="PublishedLineName" minOccurs="0" maxOccurs="unbounded"/>
   </xsd:sequence>
  </xsd:group>
  <!-- ======================================================================= -->
@@ -720,7 +725,7 @@ Rail transport, Roads and road transport
      <xsd:documentation>Reference to the LINE of the journey  affected by an SITUATION.</xsd:documentation>
     </xsd:annotation>
    </xsd:element>
-   <xsd:element ref="PublishedLineName" minOccurs="0"/>
+   <xsd:element ref="PublishedLineName" minOccurs="0" maxOccurs="unbounded"/>
    <xsd:element name="DirectionRef" type="DirectionRefStructure" minOccurs="0">
     <xsd:annotation>
      <xsd:documentation>DIRECTION of LINE in which journey runs.</xsd:documentation>
@@ -769,7 +774,7 @@ Rail transport, Roads and road transport
      <xsd:documentation>Destination SCHEDULED STOP POINTs  to which the LINE runs. [equivalent to pti15 2 destination route_description_type]</xsd:documentation>
     </xsd:annotation>
    </xsd:element>
-   <xsd:element name="Route" type="AffectedRouteStructure" maxOccurs="unbounded">
+   <xsd:element name="Route" type="AffectedRouteStructure" minOccurs="0" maxOccurs="unbounded">
     <xsd:annotation>
      <xsd:documentation>ROUTE affected by the SITUATION.</xsd:documentation>
     </xsd:annotation>
@@ -928,7 +933,13 @@ Rail transport, Roads and road transport
      <xsd:group ref="AffectedStopArrivalGroup"/>
      <xsd:group ref="AffectedStopDepartureGroup"/>
      <xsd:group ref="HeadwayIntervalGroup"/>
-     <xsd:element name="AffectedInterchange" type="AffectedInterchangeStructure" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="AffectedInterchanges" minOccurs="0">
+      <xsd:complexType>
+       <xsd:sequence>
+        <xsd:element name="AffectedInterchange" type="AffectedInterchangeStructure" minOccurs="0" maxOccurs="unbounded"/>
+       </xsd:sequence>
+      </xsd:complexType>
+     </xsd:element>
     </xsd:sequence>
    </xsd:extension>
   </xsd:complexContent>