diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db0dc3c9..118e14ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,13 @@ name: CI on: - # Triggers the workflow on push or pull request events but only for the "master" branch push: - branches: [ "master", "main", "integration" ] + branches: [ "v[0-9]*" ] pull_request: - branches: [ "master", "main", "integration" ] + # NB: this is a glob filter, not a regex - `*` matches any chars (except `/`), + # Hence it should match `v2.2`, `v2.3-wip`, etc. + # See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet + branches: [ "v[0-9]*" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html index 4ca18ca2..d1e20447 100644 --- a/docs/generated/contab/acsb.html +++ b/docs/generated/contab/acsb.html @@ -248,11 +248,7 @@

1.3. The complex type acsb:AccessibilityAssessmentStructure

-<<<<<<< HEAD - +local-type: typedef-25.1 -======= - +local-type: typedef-47.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-15.1

@@ -276,11 +272,7 @@

1.3. The complex type acsb:AccessibilityAssessmentStructure

-<<<<<<< HEAD - +local-type: typedef-25.2 -======= - +local-type: typedef-47.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-15.2

@@ -305,11 +297,7 @@

1.3. The complex type acsb:AccessibilityAssessmentStructure

-<<<<<<< HEAD - +local-type: typedef-8.1 -======= - +local-type: typedef-39.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-59.1

@@ -556,11 +544,7 @@

1.4. The complex type acsb:AccessibilityLimitationStructure

-<<<<<<< HEAD - +local-type: typedef-8.1 -======= - +local-type: typedef-39.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-59.1

@@ -605,13 +589,8 @@

1.5. The complex type acsb:LimitationRefStructure -<<<<<<< HEAD -
-

1.6. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1) -======= -
-

1.6. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-47.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

1.6. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)

@@ -631,11 +610,7 @@

1.6. The complex type complexType[acsb:AccessibilityAssessmentStructur
  /Limitations #complexType
-<<<<<<< HEAD -   (typedef-25.1) -======= -   (typedef-47.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-15.1)

@@ -677,13 +652,8 @@

1.6. The complex type complexType[acsb:AccessibilityAssessmentStructur

-<<<<<<< HEAD -
-

1.7. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2) -======= -
-

1.7. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-47.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

1.7. The complex type complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)

@@ -703,11 +673,7 @@

1.7. The complex type complexType[acsb:AccessibilityAssessmentStructur
  /Suitabilities #complexType
-<<<<<<< HEAD -   (typedef-25.2) -======= -   (typedef-47.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-15.2)

@@ -749,13 +715,8 @@

1.7. The complex type complexType[acsb:AccessibilityAssessmentStructur

-<<<<<<< HEAD -
-

1.8. The complex type element[ifopt:Extensions]#complexType (typedef-8.1) -======= -
-

1.8. The complex type element[ifopt:Extensions]#complexType (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

1.8. The complex type element[ifopt:Extensions]#complexType (typedef-59.1)

@@ -775,11 +736,7 @@

1.8. The complex type element[ifopt:Extensions]#complexType (typedef-3
  #complexType
-<<<<<<< HEAD -   (typedef-8.1) -======= -   (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-59.1)

@@ -795,13 +752,8 @@

1.8. The complex type element[ifopt:Extensions]#complexType (typedef-3

-<<<<<<< HEAD -
-

1.9. The complex type element[ifopt:Extensions]#complexType (typedef-8.1) -======= -
-

1.9. The complex type element[ifopt:Extensions]#complexType (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

1.9. The complex type element[ifopt:Extensions]#complexType (typedef-59.1)

@@ -821,11 +773,7 @@

1.9. The complex type element[ifopt:Extensions]#complexType (typedef-3
  #complexType
-<<<<<<< HEAD -   (typedef-8.1) -======= -   (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-59.1)

@@ -2237,11 +2173,7 @@

3.10. The complex type acsb:UserNeedStructure

diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html index eb150cba..63eef8fc 100644 --- a/docs/generated/contab/datex2.html +++ b/docs/generated/contab/datex2.html @@ -107112,11 +107112,7 @@

2.204. The complex type orc:Itinerary

@@ -111024,11 +111020,7 @@

2.219. The complex type orc:MeasurementSiteRecord

@@ -111873,11 +111865,7 @@

2.224. The complex type orc:MultilingualString

@@ -127585,11 +127573,7 @@

2.266. The complex type orc:SiteMeasurements

@@ -145458,13 +145442,8 @@

2.326. The complex type orc:WinterDrivingManagement

@@ -1724,20 +1672,12 @@

3.1. Simple type definitions

-<<<<<<< HEAD -

-======= -

->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

group[acsb:UserNeedGroup]
  /MedicalNeed #simpleType
-<<<<<<< HEAD -   (typedef-27.1) -======= -   (typedef-48.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-14.1)

@@ -1904,11 +1844,7 @@

3.7. The group acsb:UserNeedGroup

-<<<<<<< HEAD - local-type: typedef-27.1 -======= - local-type: typedef-48.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-14.1

-<<<<<<< HEAD - local-type: typedef-27.1 -======= - local-type: typedef-48.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-14.1

-<<<<<<< HEAD - +local-type: typedef-23.1 -======= - +local-type: typedef-49.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-70.1

-<<<<<<< HEAD - +local-type: typedef-23.2 -======= - +local-type: typedef-49.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-70.2

-<<<<<<< HEAD - +local-type: typedef-23.3 -======= - +local-type: typedef-49.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-70.3

-<<<<<<< HEAD - +local-type: typedef-23.4 -======= - +local-type: typedef-49.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-70.4

-<<<<<<< HEAD -
-

2.327. The complex type complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-23.1) -======= -
-

2.327. The complex type complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-49.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

2.327. The complex type complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)

@@ -145484,11 +145463,7 @@

2.327. The complex type complexType[Itinerary]/locationContainedInItin
  /locationContainedInItinerary #complexType
-<<<<<<< HEAD -   (typedef-23.1) -======= -   (typedef-49.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-70.1)

@@ -145613,13 +145588,8 @@

2.327. The complex type complexType[Itinerary]/locationContainedInItin

-<<<<<<< HEAD -
-

2.328. The complex type complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-23.2) -======= -
-

2.328. The complex type complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-49.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

2.328. The complex type complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)

@@ -145639,11 +145609,7 @@

2.328. The complex type complexType[MeasurementSiteRecord]/measurement
  /measurementSpecificCharacteristics #complexType
-<<<<<<< HEAD -   (typedef-23.2) -======= -   (typedef-49.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-70.2)

@@ -145873,13 +145839,8 @@

2.328. The complex type complexType[MeasurementSiteRecord]/measurement

-<<<<<<< HEAD -
-

2.329. The complex type complexType[MultilingualString]/values#complexType (typedef-23.3) -======= -
-

2.329. The complex type complexType[MultilingualString]/values#complexType (typedef-49.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

2.329. The complex type complexType[MultilingualString]/values#complexType (typedef-70.3)

@@ -145899,11 +145860,7 @@

2.329. The complex type complexType[MultilingualString]/values#complex
  /values #complexType
-<<<<<<< HEAD -   (typedef-23.3) -======= -   (typedef-49.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-70.3)

@@ -145945,13 +145902,8 @@

2.329. The complex type complexType[MultilingualString]/values#complex

-<<<<<<< HEAD -
-

2.330. The complex type complexType[SiteMeasurements]/measuredValue#complexType (typedef-23.4) -======= -
-

2.330. The complex type complexType[SiteMeasurements]/measuredValue#complexType (typedef-49.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

2.330. The complex type complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)

@@ -145971,11 +145923,7 @@

2.330. The complex type complexType[SiteMeasurements]/measuredValue#co
  /measuredValue #complexType
-<<<<<<< HEAD -   (typedef-23.4) -======= -   (typedef-49.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-70.4)

@@ -8216,11 +8212,7 @@

4.13. The complex type ifopt:LocalServiceStructure

@@ -8245,11 +8237,7 @@

4.13. The complex type ifopt:LocalServiceStructure

@@ -8574,11 +8562,7 @@

4.14. The complex type ifopt:PlaceEquipmentStructure

@@ -8590,13 +8574,8 @@

4.14. The complex type ifopt:PlaceEquipmentStructure

diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html index eddf63aa..597e1770 100644 --- a/docs/generated/contab/ifopt.html +++ b/docs/generated/contab/ifopt.html @@ -7206,11 +7206,7 @@

4.8. The group ifopt:LocalServiceGroup

-<<<<<<< HEAD - +local-type: typedef-9.1 -======= - +local-type: typedef-38.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-54.1

-<<<<<<< HEAD - +local-type: typedef-9.1 -======= - +local-type: typedef-38.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-54.1

-<<<<<<< HEAD - +local-type: typedef-8.1 -======= - +local-type: typedef-39.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-59.1

-<<<<<<< HEAD - +local-type: typedef-8.1 -======= - +local-type: typedef-39.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-59.1

-<<<<<<< HEAD -
-

4.15. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1) -======= -
-

4.15. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-38.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

4.15. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)

@@ -8616,11 +8595,7 @@

4.15. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#comp
  /FeatureRefs #complexType
-<<<<<<< HEAD -   (typedef-9.1) -======= -   (typedef-38.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-54.1)

@@ -8658,13 +8633,8 @@

4.15. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#comp

-<<<<<<< HEAD -
-

4.16. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1) -======= -
-

4.16. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-38.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

4.16. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)

@@ -8684,11 +8654,7 @@

4.16. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#comp
  /FeatureRefs #complexType
-<<<<<<< HEAD -   (typedef-9.1) -======= -   (typedef-38.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-54.1)

@@ -8726,13 +8692,8 @@

4.16. The complex type group[ifopt:LocalServiceGroup]/FeatureRefs#comp

-<<<<<<< HEAD -
-

4.17. The complex type element[ifopt:Extensions]#complexType (typedef-8.1) -======= -
-

4.17. The complex type element[ifopt:Extensions]#complexType (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

4.17. The complex type element[ifopt:Extensions]#complexType (typedef-59.1)

@@ -8752,11 +8713,7 @@

4.17. The complex type element[ifopt:Extensions]#complexType (typedef-
  #complexType
-<<<<<<< HEAD -   (typedef-8.1) -======= -   (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-59.1)

@@ -8772,13 +8729,8 @@

4.17. The complex type element[ifopt:Extensions]#complexType (typedef-

-<<<<<<< HEAD -
-

4.18. The complex type element[ifopt:Extensions]#complexType (typedef-8.1) -======= -
-

4.18. The complex type element[ifopt:Extensions]#complexType (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

4.18. The complex type element[ifopt:Extensions]#complexType (typedef-59.1)

@@ -8798,11 +8750,7 @@

4.18. The complex type element[ifopt:Extensions]#complexType (typedef-
  #complexType
-<<<<<<< HEAD -   (typedef-8.1) -======= -   (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-59.1)

@@ -9624,11 +9568,7 @@

5.14. The complex type ifopt:LinkProjectionStructure

@@ -9657,11 +9597,7 @@

5.14. The complex type ifopt:LinkProjectionStructure

@@ -9723,11 +9659,7 @@

5.15. The complex type ifopt:PointProjectionStructure

@@ -9976,11 +9908,7 @@

5.16. The complex type ifopt:ZoneProjectionStructure

@@ -10013,11 +9941,7 @@

5.16. The complex type ifopt:ZoneProjectionStructure

@@ -10029,13 +9953,8 @@

5.16. The complex type ifopt:ZoneProjectionStructure

@@ -9443,11 +9391,7 @@

5.11. The complex type ifopt:AbstractProjection

-<<<<<<< HEAD - +local-type: typedef-14.1 -======= - +local-type: typedef-42.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.1

-<<<<<<< HEAD - +local-type: typedef-14.1 -======= - +local-type: typedef-42.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.1

-<<<<<<< HEAD - +local-type: typedef-14.2 -======= - +local-type: typedef-42.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.2

-<<<<<<< HEAD - +local-type: typedef-14.1 -======= - +local-type: typedef-42.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.1

-<<<<<<< HEAD - +local-type: typedef-14.1 -======= - +local-type: typedef-42.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.1

-<<<<<<< HEAD - +local-type: typedef-14.3 -======= - +local-type: typedef-42.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-55.3

-<<<<<<< HEAD -
-

5.17. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1) -======= -
-

5.17. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.17. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)

@@ -10055,11 +9974,7 @@

5.17. The complex type complexType[ifopt:AbstractProjection]/Features#
  /Features #complexType
-<<<<<<< HEAD -   (typedef-14.1) -======= -   (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.1)

@@ -10101,13 +10016,8 @@

5.17. The complex type complexType[ifopt:AbstractProjection]/Features#

-<<<<<<< HEAD -
-

5.18. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1) -======= -
-

5.18. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.18. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)

@@ -10127,11 +10037,7 @@

5.18. The complex type complexType[ifopt:AbstractProjection]/Features#
  /Features #complexType
-<<<<<<< HEAD -   (typedef-14.1) -======= -   (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.1)

@@ -10173,13 +10079,8 @@

5.18. The complex type complexType[ifopt:AbstractProjection]/Features#

-<<<<<<< HEAD -
-

5.19. The complex type complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-14.2) -======= -
-

5.19. The complex type complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-42.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.19. The complex type complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)

@@ -10199,11 +10100,7 @@

5.19. The complex type complexType[ifopt:LinkProjectionStructure]/Line
  /Line #complexType
-<<<<<<< HEAD -   (typedef-14.2) -======= -   (typedef-42.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.2)

@@ -10246,13 +10143,8 @@

5.19. The complex type complexType[ifopt:LinkProjectionStructure]/Line

-<<<<<<< HEAD -
-

5.20. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1) -======= -
-

5.20. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.20. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)

@@ -10272,11 +10164,7 @@

5.20. The complex type complexType[ifopt:AbstractProjection]/Features#
  /Features #complexType
-<<<<<<< HEAD -   (typedef-14.1) -======= -   (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.1)

@@ -10318,13 +10206,8 @@

5.20. The complex type complexType[ifopt:AbstractProjection]/Features#

-<<<<<<< HEAD -
-

5.21. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1) -======= -
-

5.21. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.21. The complex type complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)

@@ -10344,11 +10227,7 @@

5.21. The complex type complexType[ifopt:AbstractProjection]/Features#
  /Features #complexType
-<<<<<<< HEAD -   (typedef-14.1) -======= -   (typedef-42.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.1)

@@ -10390,13 +10269,8 @@

5.21. The complex type complexType[ifopt:AbstractProjection]/Features#

-<<<<<<< HEAD -
-

5.22. The complex type complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-14.3) -======= -
-

5.22. The complex type complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-42.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

5.22. The complex type complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)

@@ -10416,11 +10290,7 @@

5.22. The complex type complexType[ifopt:ZoneProjectionStructure]/Boun
  /Boundary #complexType
-<<<<<<< HEAD -   (typedef-14.3) -======= -   (typedef-42.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-55.3)

@@ -13295,13 +13161,8 @@

10.4. The complex type ifopt:ValidityConditionStructure

@@ -13279,11 +13149,7 @@

10.4. The complex type ifopt:ValidityConditionStructure

-<<<<<<< HEAD - +local-type: typedef-17.1 -======= - +local-type: typedef-41.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-57.1

-<<<<<<< HEAD -
-

10.5. The complex type complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-17.1) -======= -
-

10.5. The complex type complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-41.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

10.5. The complex type complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)

@@ -13321,11 +13182,7 @@

10.5. The complex type complexType[ifopt:ValidityConditionStructure]/T
  /Timebands #complexType
-<<<<<<< HEAD -   (typedef-17.1) -======= -   (typedef-41.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-57.1)

@@ -13559,13 +13416,8 @@

11.6. The complex type ifopt:InfoLinkStructure

-<<<<<<< HEAD -
-

11.7. The complex type element[ifopt:Extensions]#complexType (typedef-8.1) -======= -
-

11.7. The complex type element[ifopt:Extensions]#complexType (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
+

11.7. The complex type element[ifopt:Extensions]#complexType (typedef-59.1)

@@ -13585,11 +13437,7 @@

11.7. The complex type element[ifopt:Extensions]#complexType (typedef-
  #complexType
-<<<<<<< HEAD -   (typedef-8.1) -======= -   (typedef-39.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-59.1)

@@ -6020,11 +5944,7 @@

1.5. The toplevel element siri:Siri

@@ -6055,11 +5975,7 @@

1.5. The toplevel element siri:Siri

@@ -6445,11 +6361,7 @@

1.5. The toplevel element siri:Siri

@@ -7045,11 +6957,7 @@

1.7. The group siri:DeliveryResponseGroup

@@ -7155,11 +7063,7 @@

1.8. The group siri:RequestGroup

@@ -7190,11 +7094,7 @@

1.8. The group siri:RequestGroup

@@ -7443,11 +7343,7 @@

1.8. The group siri:RequestGroup

@@ -7509,11 +7405,7 @@

1.8. The group siri:RequestGroup

@@ -7844,11 +7736,7 @@

1.9. The group siri:ResponseGroup

@@ -8288,11 +8176,7 @@

1.10. The group siri:ServiceDeliveryBodyGroup

@@ -8301,17 +8185,11 @@

1.10. The group siri:ServiceDeliveryBodyGroup

-<<<<<<< HEAD - @@ -8332,7 +8210,6 @@

1.10. The group siri:ServiceDeliveryBodyGroup

@@ -8793,11 +8670,7 @@

1.11. The group siri:ServiceRequestGroup

@@ -8828,11 +8701,7 @@

1.11. The group siri:ServiceRequestGroup

@@ -9104,11 +8973,7 @@

1.13. The group siri:SiriDiscoveryRequestGroup

@@ -9170,11 +9035,7 @@

1.13. The group siri:SiriDiscoveryRequestGroup

@@ -9711,11 +9572,7 @@

1.15. The group siri:SiriServiceCapabilitiesRequestGroup

@@ -11029,11 +10886,7 @@

1.19. The group siri:SiriSubscriptionRequestGroup

@@ -11580,11 +11433,7 @@

1.20. The complex type siri:CapabilitiesRequestStructure

@@ -12343,11 +12192,7 @@

1.22. The complex type siri:ServiceDeliveryBodyStructure

@@ -12356,17 +12201,11 @@

1.22. The complex type siri:ServiceDeliveryBodyStructure

-<<<<<<< HEAD - @@ -12387,7 +12226,6 @@

1.22. The complex type siri:ServiceDeliveryBodyStructure

@@ -13056,11 +12894,7 @@

1.23. The complex type siri:ServiceDeliveryStructure

@@ -13069,17 +12903,11 @@

1.23. The complex type siri:ServiceDeliveryStructure

-<<<<<<< HEAD - @@ -13100,7 +12928,6 @@

1.23. The complex type siri:ServiceDeliveryStructure

@@ -14583,11 +14410,7 @@

1.26. The complex type siri:SiriSubscriptionRequestStructure

@@ -15206,11 +15029,7 @@

1.27. The complex type siri:SubscriptionRequestStructure

@@ -15501,13 +15320,8 @@

1.27. The complex type siri:SubscriptionRequestStructure

diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html index 5082b6a7..371b7077 100644 --- a/docs/generated/contab/siri.html +++ b/docs/generated/contab/siri.html @@ -2898,43 +2898,51 @@

OJP - Open API for distributed Journey Planning (SIRI)

  • - 20.113 The complexType siri:SimpleContactStructure + 20.113 The complexType siri:ServiceLinkViewsStructure
  • - 20.114 The complexType siri:StopAssignmentStructure + 20.114 The complexType siri:ServiceLinkViewStructure
  • - 20.115 The complexType siri:TrainComponentStructure + 20.115 The complexType siri:SimpleContactStructure
  • - 20.116 The complexType siri:TrainElementStructure + 20.116 The complexType siri:StopAssignmentStructure
  • - 20.117 The complexType siri:TrainInCompoundTrainStructure + 20.117 The complexType siri:TrainComponentStructure
  • - 20.118 The complexType siri:TrainStructure + 20.118 The complexType siri:TrainElementStructure
  • - 20.119 The complexType siri:VehicleInFormationStatusStructure + 20.119 The complexType siri:TrainInCompoundTrainStructure
  • - 20.120 The complexType siri:VehicleOccupancyStructure + 20.120 The complexType siri:TrainStructure
  • - 20.121 The complexType siri:VehicleOrientationRelativeToQuay + 20.121 The complexType siri:VehicleInFormationStatusStructure
  • - 20.122 The complexType siri:ViaNameStructure + 20.122 The complexType siri:VehicleOccupancyStructure + +
    • +
  • + 20.123 The complexType siri:VehicleOrientationRelativeToQuay + +
    • +
  • + 20.124 The complexType siri:ViaNameStructure
    • @@ -3984,85 +3992,6 @@

    OJP - Open API for distributed Journey Planning (SIRI)

  • -<<<<<<< HEAD - 28.13 The complexType siri:AffectedModesStructure - -
    • -
  • - 28.14 The complexType siri:AffectedNetworkStructure - -
    • -
  • - 28.15 The complexType siri:AffectedOperatorStructure - -
    • -
  • - 28.16 The complexType siri:AffectedPathLinkStructure - -
    • -
  • - 28.17 The complexType siri:AffectedPlaceStructure - -
    • -
  • - 28.18 The complexType siri:AffectedRouteStructure - -
    • -
  • - 28.19 The complexType siri:AffectedSectionStructure - -
    • -
  • - 28.20 The complexType siri:AffectedStopPlaceComponentStructure - -
    • -
  • - 28.21 The complexType siri:AffectedStopPlaceElementStructure - -
    • -
  • - 28.22 The complexType siri:AffectedStopPlaceStructure - -
    • -
  • - 28.23 The complexType siri:AffectedStopPointStructure - -
    • -
  • - 28.24 The complexType siri:AffectedVehicleJourneyStructure - -
    • -
  • - 28.25 The complexType siri:AffectedVehicleStructure - -
    • -
  • - 28.26 The complexType siri:CasualtiesStructure - -
    • -
  • - 28.27 The complexType siri:NetworkRefStructure - -
    • -
  • - 28.28 The complexType siri:NetworkStructure - -
    • -
  • - 28.29 The complexType siri:OffsetStructure - -
    • -
  • - 28.30 The complexType siri:OperationalUnitRefStructure - -
    • -
  • - 28.31 The complexType siri:SectionRefStructure - -
    • -
  • - 28.32 The complexType siri:ZoneRefStructure -======= 29.13 The complexType siri:AffectedLineWithoutStopStructure
    • @@ -4152,7 +4081,6 @@

    OJP - Open API for distributed Journey Planning (SIRI)

  • 29.35 The complexType siri:ZoneRefStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    • @@ -5607,11 +5535,7 @@

    1.3. The toplevel element siri:ServiceDelivery

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-33.2 -======= - +local-type: typedef-58.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-3.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-77.3 -======= - +local-type: typedef-86.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.3

    -<<<<<<< HEAD - +local-type: typedef-72.1 -======= - +local-type: typedef-74.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.1

    -<<<<<<< HEAD - +local-type: typedef-72.2 -======= - +local-type: typedef-74.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:ServiceDeliveryBodyGroup

    -<<<<<<< HEAD -======= siri:ContainsAllDataForNewInitialState

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:MoreData

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-77.3 -======= - +local-type: typedef-86.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.3

    -<<<<<<< HEAD - +local-type: typedef-72.1 -======= - +local-type: typedef-74.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.1

    -<<<<<<< HEAD - +local-type: typedef-72.2 -======= - +local-type: typedef-74.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.2

    -<<<<<<< HEAD - +local-type: typedef-79.3 -======= - +local-type: typedef-72.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.3

    -<<<<<<< HEAD - +local-type: typedef-79.2 -======= - +local-type: typedef-72.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.2

    -<<<<<<< HEAD - +local-type: typedef-79.3 -======= - +local-type: typedef-72.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.3

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:ServiceDeliveryBodyGroup

    -<<<<<<< HEAD -======= siri:ContainsAllDataForNewInitialState

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:MoreData

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:ServiceDeliveryBodyGroup

    -<<<<<<< HEAD -======= siri:ContainsAllDataForNewInitialState

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:MoreData

    -<<<<<<< HEAD - +local-type: typedef-79.2 -======= - +local-type: typedef-72.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.2

    -<<<<<<< HEAD - +local-type: typedef-79.2 -======= - +local-type: typedef-72.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.2

    -<<<<<<< HEAD -
    -

    1.28. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    1.28. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.28. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -15527,11 +15341,7 @@

    1.28. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -15840,13 +15646,8 @@

    1.28. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -15775,11 +15585,7 @@

    1.28. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    1.29. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.29. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.29. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -15866,11 +15667,7 @@

    1.29. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -15981,13 +15778,8 @@

    1.29. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.30. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    1.30. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.30. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -16007,11 +15799,7 @@

    1.30. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -16245,13 +16033,8 @@

    1.30. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    1.31. The complex type element[siri:Siri]#complexType (typedef-77.1) -======= -
    -

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.31. The complex type element[siri:Siri]#complexType (typedef-78.1)

    @@ -16271,11 +16054,7 @@

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1)   #complexType
    -<<<<<<< HEAD -   (typedef-77.1) -======= -   (typedef-86.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.1)

    @@ -16390,11 +16165,7 @@

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1)

    @@ -16780,11 +16551,7 @@

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1)

    @@ -16966,13 +16733,8 @@

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1) -<<<<<<< HEAD -
    -

    1.32. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    1.32. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.32. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -16355,11 +16134,7 @@

    1.31. The complex type element[siri:Siri]#complexType (typedef-86.1)

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-33.2 -======= - +local-type: typedef-58.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-3.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    @@ -16992,11 +16754,7 @@

    1.32. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -17230,13 +16988,8 @@

    1.32. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    1.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-33.2) -======= -
    -

    1.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-3.2)

    @@ -17256,11 +17009,7 @@

    1.33. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-33.2) -======= -   (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-3.2)

    @@ -17568,13 +17317,8 @@

    1.33. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    1.34. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    1.34. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.34. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -17594,11 +17338,7 @@

    1.34. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -17907,13 +17643,8 @@

    1.34. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -17842,11 +17582,7 @@

    1.34. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    1.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -17933,11 +17664,7 @@

    1.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -18048,13 +17775,8 @@

    1.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.36. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    1.36. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.36. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -18074,11 +17796,7 @@

    1.36. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -18386,13 +18104,8 @@

    1.36. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    1.37. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    1.37. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.37. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -18412,11 +18125,7 @@

    1.37. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -18725,13 +18430,8 @@

    1.37. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -18660,11 +18369,7 @@

    1.37. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    1.38. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.38. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.38. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -18751,11 +18451,7 @@

    1.38. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -18866,13 +18562,8 @@

    1.38. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.39. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    1.39. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.39. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -18892,11 +18583,7 @@

    1.39. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -19130,13 +18817,8 @@

    1.39. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    1.40. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    1.40. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.40. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -19156,11 +18838,7 @@

    1.40. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -19468,13 +19146,8 @@

    1.40. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    1.41. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    1.41. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.41. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -19494,11 +19167,7 @@

    1.41. The complex type element[siri:StopPointsRequest]#complexType (ty
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -19888,13 +19557,8 @@

    1.41. The complex type element[siri:StopPointsRequest]#complexType (ty

    -<<<<<<< HEAD -
    -

    1.42. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    1.42. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.42. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -19914,11 +19578,7 @@

    1.42. The complex type element[siri:ServiceFeaturesRequest]#complexTyp
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -20136,13 +19796,8 @@

    1.42. The complex type element[siri:ServiceFeaturesRequest]#complexTyp

    -<<<<<<< HEAD -
    -

    1.43. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    1.43. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.43. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -20162,11 +19817,7 @@

    1.43. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -20475,13 +20122,8 @@

    1.43. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -20410,11 +20061,7 @@

    1.43. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    1.44. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.44. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.44. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -20501,11 +20143,7 @@

    1.44. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -20616,13 +20254,8 @@

    1.44. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.45. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.45. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.45. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -20642,11 +20275,7 @@

    1.45. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -20757,13 +20386,8 @@

    1.45. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.46. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    1.46. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.46. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -20783,11 +20407,7 @@

    1.46. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -21021,13 +20641,8 @@

    1.46. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    1.47. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    1.47. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.47. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -21047,11 +20662,7 @@

    1.47. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -21359,13 +20970,8 @@

    1.47. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    1.48. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    1.48. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.48. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -21385,11 +20991,7 @@

    1.48. The complex type element[siri:StopPointsRequest]#complexType (ty
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -21779,13 +21381,8 @@

    1.48. The complex type element[siri:StopPointsRequest]#complexType (ty

    -<<<<<<< HEAD -
    -

    1.49. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    1.49. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.49. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -21805,11 +21402,7 @@

    1.49. The complex type element[siri:ServiceFeaturesRequest]#complexTyp
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -22027,13 +21620,8 @@

    1.49. The complex type element[siri:ServiceFeaturesRequest]#complexTyp

    -<<<<<<< HEAD -
    -

    1.50. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3) -======= -
    -

    1.50. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.50. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)

    @@ -22053,11 +21641,7 @@

    1.50. The complex type element[siri:ProductionTimetableCapabilitiesReq
      #complexType
    -<<<<<<< HEAD -   (typedef-79.3) -======= -   (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.3)

    @@ -22207,13 +21791,8 @@

    1.50. The complex type element[siri:ProductionTimetableCapabilitiesReq

    -<<<<<<< HEAD -
    -

    1.51. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2) -======= -
    -

    1.51. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.51. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)

    @@ -22233,11 +21812,7 @@

    1.51. The complex type element[siri:ProductionTimetableSubscriptionReq
      #complexType
    -<<<<<<< HEAD -   (typedef-79.2) -======= -   (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.2)

    @@ -22434,13 +22009,8 @@

    1.51. The complex type element[siri:ProductionTimetableSubscriptionReq

    -<<<<<<< HEAD -
    -

    1.52. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3) -======= -
    -

    1.52. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.52. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)

    @@ -22460,11 +22030,7 @@

    1.52. The complex type element[siri:ProductionTimetableCapabilitiesReq
      #complexType
    -<<<<<<< HEAD -   (typedef-79.3) -======= -   (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.3)

    @@ -22614,13 +22180,8 @@

    1.52. The complex type element[siri:ProductionTimetableCapabilitiesReq

    -<<<<<<< HEAD -
    -

    1.53. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.53. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.53. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -22640,11 +22201,7 @@

    1.53. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -22755,13 +22312,8 @@

    1.53. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.54. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    1.54. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.54. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -22781,11 +22333,7 @@

    1.54. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -22896,13 +22444,8 @@

    1.54. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    1.55. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2) -======= -
    -

    1.55. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.55. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)

    @@ -22922,11 +22465,7 @@

    1.55. The complex type element[siri:ProductionTimetableSubscriptionReq
      #complexType
    -<<<<<<< HEAD -   (typedef-79.2) -======= -   (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.2)

    @@ -23123,13 +22662,8 @@

    1.55. The complex type element[siri:ProductionTimetableSubscriptionReq

    -<<<<<<< HEAD -
    -

    1.56. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2) -======= -
    -

    1.56. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    1.56. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)

    @@ -23149,11 +22683,7 @@

    1.56. The complex type element[siri:ProductionTimetableSubscriptionReq
      #complexType
    -<<<<<<< HEAD -   (typedef-79.2) -======= -   (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.2)

    @@ -24446,11 +23972,7 @@

    2.6. The group siri:DeliveryResponseGroup

    @@ -24758,11 +24280,7 @@

    2.9. The group siri:RequestGroup

    @@ -24793,11 +24311,7 @@

    2.9. The group siri:RequestGroup

    @@ -25214,11 +24728,7 @@

    2.10. The group siri:ResponseGroup

    @@ -25433,11 +24943,7 @@

    2.11. The group siri:ServiceDeliveryBodyGroup

    @@ -25556,11 +25062,7 @@

    2.12. The group siri:ServiceRequestGroup

    @@ -25591,11 +25093,7 @@

    2.12. The group siri:ServiceRequestGroup

    @@ -26355,11 +25853,7 @@

    2.16. The complex type siri:ServiceDeliveryBodyStructure

    @@ -26368,17 +25862,11 @@

    2.16. The complex type siri:ServiceDeliveryBodyStructure

    -<<<<<<< HEAD - @@ -26399,7 +25887,6 @@

    2.16. The complex type siri:ServiceDeliveryBodyStructure

    @@ -27068,11 +26555,7 @@

    2.17. The complex type siri:ServiceDeliveryStructure

    @@ -27081,17 +26564,11 @@

    2.17. The complex type siri:ServiceDeliveryStructure

    -<<<<<<< HEAD - @@ -27112,7 +26589,6 @@

    2.17. The complex type siri:ServiceDeliveryStructure

    @@ -27861,11 +27337,7 @@

    2.19. The complex type siri:SiriSchema

    @@ -27896,11 +27368,7 @@

    2.19. The complex type siri:SiriSchema

    @@ -28149,11 +27617,7 @@

    2.19. The complex type siri:SiriSchema

    @@ -28215,11 +27679,7 @@

    2.19. The complex type siri:SiriSchema

    @@ -28519,11 +27979,7 @@

    2.19. The complex type siri:SiriSchema

    @@ -29260,13 +28716,8 @@

    2.20. The complex type siri:SubscriptionRequestStructure

    @@ -23682,11 +23212,7 @@

    2.3. The toplevel element siri:ServiceDelivery

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-77.3 -======= - +local-type: typedef-86.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.3

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-77.3 -======= - +local-type: typedef-86.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.3

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:ServiceDeliveryBodyGroup

    -<<<<<<< HEAD -======= siri:ContainsAllDataForNewInitialState

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:MoreData

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:ServiceDeliveryBodyGroup

    -<<<<<<< HEAD -======= siri:ContainsAllDataForNewInitialState

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:MoreData

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-77.3 -======= - +local-type: typedef-86.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.3

    -<<<<<<< HEAD - +local-type: typedef-72.1 -======= - +local-type: typedef-74.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.1

    -<<<<<<< HEAD - +local-type: typedef-72.2 -======= - +local-type: typedef-74.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD -
    -

    2.21. The complex type element[siri:ServiceDelivery]#complexType (typedef-33.3) -======= -
    -

    2.21. The complex type element[siri:ServiceDelivery]#complexType (typedef-58.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.21. The complex type element[siri:ServiceDelivery]#complexType (typedef-3.3)

    @@ -29286,11 +28737,7 @@

    2.21. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-33.3) -======= -   (typedef-58.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-3.3)

    @@ -29599,13 +29042,8 @@

    2.21. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -29534,11 +28981,7 @@

    2.21. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    2.22. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.22. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.22. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -29625,11 +29063,7 @@

    2.22. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -29740,13 +29174,8 @@

    2.22. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.23. The complex type element[siri:ServiceRequest]#complexType (typedef-33.1) -======= -
    -

    2.23. The complex type element[siri:ServiceRequest]#complexType (typedef-58.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.23. The complex type element[siri:ServiceRequest]#complexType (typedef-3.1)

    @@ -29766,11 +29195,7 @@

    2.23. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-33.1) -======= -   (typedef-58.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-3.1)

    @@ -30038,13 +29463,8 @@

    2.23. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    2.24. The complex type element[siri:SubscriptionRequest]#complexType (typedef-33.2) -======= -
    -

    2.24. The complex type element[siri:SubscriptionRequest]#complexType (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.24. The complex type element[siri:SubscriptionRequest]#complexType (typedef-3.2)

    @@ -30064,11 +29484,7 @@

    2.24. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-33.2) -======= -   (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-3.2)

    @@ -30376,13 +29792,8 @@

    2.24. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    2.25. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    2.25. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.25. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -30402,11 +29813,7 @@

    2.25. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -30715,13 +30118,8 @@

    2.25. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -30650,11 +30057,7 @@

    2.25. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    2.26. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.26. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.26. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -30741,11 +30139,7 @@

    2.26. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -30856,13 +30250,8 @@

    2.26. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.27. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    2.27. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.27. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -30882,11 +30271,7 @@

    2.27. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -31120,13 +30505,8 @@

    2.27. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    2.28. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    2.28. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.28. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -31146,11 +30526,7 @@

    2.28. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -31458,13 +30834,8 @@

    2.28. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    2.29. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    2.29. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.29. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -31484,11 +30855,7 @@

    2.29. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -31797,13 +31160,8 @@

    2.29. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -31732,11 +31099,7 @@

    2.29. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    2.30. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.30. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.30. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -31823,11 +31181,7 @@

    2.30. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -31938,13 +31292,8 @@

    2.30. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.31. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.31. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.31. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -31964,11 +31313,7 @@

    2.31. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -32079,13 +31424,8 @@

    2.31. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.32. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    2.32. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.32. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -32105,11 +31445,7 @@

    2.32. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -32343,13 +31679,8 @@

    2.32. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    2.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    2.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.33. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -32369,11 +31700,7 @@

    2.33. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -32681,13 +32008,8 @@

    2.33. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    2.34. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.34. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.34. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -32707,11 +32029,7 @@

    2.34. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -32822,13 +32140,8 @@

    2.34. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -32848,11 +32161,7 @@

    2.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -32963,13 +32272,8 @@

    2.35. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    2.36. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    2.36. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.36. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -32989,11 +32293,7 @@

    2.36. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -33227,13 +32527,8 @@

    2.36. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    2.37. The complex type element[siri:SubscriptionRequest]#complexType (typedef-77.3) -======= -
    -

    2.37. The complex type element[siri:SubscriptionRequest]#complexType (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.37. The complex type element[siri:SubscriptionRequest]#complexType (typedef-78.3)

    @@ -33253,11 +32548,7 @@

    2.37. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-77.3) -======= -   (typedef-86.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.3)

    @@ -33565,13 +32856,8 @@

    2.37. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    2.38. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    2.38. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.38. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -33591,11 +32877,7 @@

    2.38. The complex type element[siri:StopPointsRequest]#complexType (ty
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -33985,13 +33267,8 @@

    2.38. The complex type element[siri:StopPointsRequest]#complexType (ty

    -<<<<<<< HEAD -
    -

    2.39. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    2.39. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.39. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -34011,11 +33288,7 @@

    2.39. The complex type element[siri:ServiceFeaturesRequest]#complexTyp
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -34233,13 +33506,8 @@

    2.39. The complex type element[siri:ServiceFeaturesRequest]#complexTyp

    -<<<<<<< HEAD -
    -

    2.40. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    2.40. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.40. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -34259,11 +33527,7 @@

    2.40. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -34572,13 +33832,8 @@

    2.40. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -34507,11 +33771,7 @@

    2.40. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    2.41. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    2.41. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    2.41. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -34598,11 +33853,7 @@

    2.41. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -35561,11 +34808,7 @@

    3.18. The group siri:DataReceivedPayloadGroup

    @@ -37805,11 +37048,7 @@

    3.37. The complex type siri:CheckStatusResponseBodyStructure

    @@ -38147,11 +37386,7 @@

    3.38. The complex type siri:CheckStatusResponseStructure

    @@ -39066,11 +38301,7 @@

    3.42. The complex type siri:DataReadyResponseStructure

    @@ -39277,11 +38508,7 @@

    3.43. The complex type siri:DataReceivedResponseStructure

    @@ -39919,11 +39146,7 @@

    3.46. The complex type siri:HeartbeatNotificationStructure

    @@ -42400,11 +41623,7 @@

    3.55. The complex type siri:TerminationResponseStatusStructure

    @@ -42416,13 +41635,8 @@

    3.55. The complex type siri:TerminationResponseStatusStructure

    @@ -35291,11 +34542,7 @@

    3.16. The group siri:CheckStatusPayloadGroup

    -<<<<<<< HEAD - +local-type: typedef-29.4 -======= - +local-type: typedef-56.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.4

    -<<<<<<< HEAD - +local-type: typedef-29.3 -======= - +local-type: typedef-56.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.3

    -<<<<<<< HEAD - +local-type: typedef-29.4 -======= - +local-type: typedef-56.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.4

    -<<<<<<< HEAD - +local-type: typedef-29.4 -======= - +local-type: typedef-56.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.4

    -<<<<<<< HEAD - +local-type: typedef-29.2 -======= - +local-type: typedef-56.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.2

    -<<<<<<< HEAD - +local-type: typedef-29.3 -======= - +local-type: typedef-56.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.3

    -<<<<<<< HEAD - +local-type: typedef-29.4 -======= - +local-type: typedef-56.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.4

    -<<<<<<< HEAD - +local-type: typedef-29.1 -======= - +local-type: typedef-56.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-2.1

    -<<<<<<< HEAD -
    -

    3.56. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4) -======= -
    -

    3.56. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.56. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)

    @@ -42442,11 +41656,7 @@

    3.56. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.4) -======= -   (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.4)

    @@ -42557,13 +41767,8 @@

    3.56. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit

    -<<<<<<< HEAD -
    -

    3.57. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-29.3) -======= -
    -

    3.57. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-56.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.57. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)

    @@ -42583,11 +41788,7 @@

    3.57. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondi
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.3) -======= -   (typedef-56.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.3)

    @@ -42698,13 +41899,8 @@

    3.57. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondi

    -<<<<<<< HEAD -
    -

    3.58. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4) -======= -
    -

    3.58. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.58. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)

    @@ -42724,11 +41920,7 @@

    3.58. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.4) -======= -   (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.4)

    @@ -42839,13 +42031,8 @@

    3.58. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit

    -<<<<<<< HEAD -
    -

    3.59. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4) -======= -
    -

    3.59. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.59. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)

    @@ -42865,11 +42052,7 @@

    3.59. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.4) -======= -   (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.4)

    @@ -42980,13 +42163,8 @@

    3.59. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit

    -<<<<<<< HEAD -
    -

    3.60. The complex type complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-29.2) -======= -
    -

    3.60. The complex type complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-56.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.60. The complex type complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)

    @@ -43006,11 +42184,7 @@

    3.60. The complex type complexType[siri:DataReadyResponseStructure]/Er
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.2) -======= -   (typedef-56.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.2)

    @@ -43121,13 +42295,8 @@

    3.60. The complex type complexType[siri:DataReadyResponseStructure]/Er

    -<<<<<<< HEAD -
    -

    3.61. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-29.3) -======= -
    -

    3.61. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-56.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.61. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)

    @@ -43147,11 +42316,7 @@

    3.61. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondi
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.3) -======= -   (typedef-56.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.3)

    @@ -43262,13 +42427,8 @@

    3.61. The complex type group[siri:DataReceivedPayloadGroup]/ErrorCondi

    -<<<<<<< HEAD -
    -

    3.62. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4) -======= -
    -

    3.62. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.62. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)

    @@ -43288,11 +42448,7 @@

    3.62. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.4) -======= -   (typedef-56.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.4)

    @@ -43403,13 +42559,8 @@

    3.62. The complex type group[siri:CheckStatusPayloadGroup]/ErrorCondit

    -<<<<<<< HEAD -
    -

    3.63. The complex type complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-29.1) -======= -
    -

    3.63. The complex type complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-56.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    3.63. The complex type complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)

    @@ -43429,11 +42580,7 @@

    3.63. The complex type complexType[siri:TerminationResponseStatusStruc
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-29.1) -======= -   (typedef-56.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-2.1)

    @@ -43844,11 +42987,7 @@

    4.7. The toplevel element siri:ErrorCode

    @@ -43916,11 +43055,7 @@

    4.9. The toplevel element siri:ErrorConditionElement

    @@ -44086,11 +43221,7 @@

    4.14. The toplevel element siri:ServiceDeliveryErrorConditionElement

    @@ -44222,11 +43353,7 @@

    4.18. The toplevel element siri:UnknownExtensionsError (↔ siri:ErrorCode)

     @@ -44612,11 +43739,7 @@

    4.22. The group siri:ApplicationErrorGroup

    @@ -44841,11 +43964,7 @@

    4.23. The group siri:DistributionErrorGroup

    @@ -45044,11 +44163,7 @@

    4.24. The group siri:ServiceRequestErrorGroup

    @@ -45335,11 +44450,7 @@

    4.24. The group siri:ServiceRequestErrorGroup

    @@ -45565,11 +44676,7 @@

    4.26. The complex type siri:AccessNotAllowedErrorStructure

    @@ -45657,11 +44764,7 @@

    4.27. The complex type siri:AllowedResourceUsageExceededErrorStructure

    @@ -45749,11 +44852,7 @@

    4.28. The complex type siri:BeyondDataHorizonErrorStructure

    @@ -45841,11 +44940,7 @@

    4.29. The complex type siri:CapabilityNotSupportedErrorStructure

    @@ -45875,11 +44970,7 @@

    4.29. The complex type siri:CapabilityNotSupportedErrorStructure

    @@ -45967,11 +45058,7 @@

    4.30. The complex type siri:EndpointDeniedAccessStructure

    @@ -46001,11 +45088,7 @@

    4.30. The complex type siri:EndpointDeniedAccessStructure

    @@ -46093,11 +45176,7 @@

    4.31. The complex type siri:EndpointNotAvailableAccessStructure

    @@ -46127,11 +45206,7 @@

    4.31. The complex type siri:EndpointNotAvailableAccessStructure

    @@ -46212,11 +45287,7 @@

    4.32. The complex type siri:ErrorCodeStructure

    @@ -46389,11 +45460,7 @@

    4.33. The complex type siri:ErrorConditionElementStructure

    @@ -46680,11 +45747,7 @@

    4.33. The complex type siri:ErrorConditionElementStructure

    @@ -47096,11 +46159,7 @@

    4.34. The complex type siri:ErrorConditionStructure

    @@ -47307,11 +46366,7 @@

    4.36. The complex type siri:InvalidDataReferencesErrorStructure

    @@ -47427,11 +46482,7 @@

    4.37. The complex type siri:NoInfoForTopicErrorStructure

    @@ -47519,11 +46570,7 @@

    4.38. The complex type siri:OtherErrorStructure

    @@ -47611,11 +46658,7 @@

    4.39. The complex type siri:ParametersIgnoredErrorStructure

    @@ -47816,11 +46859,7 @@

    4.40. The complex type siri:ServiceDeliveryErrorConditionStructure

    @@ -48107,11 +47146,7 @@

    4.40. The complex type siri:ServiceDeliveryErrorConditionStructure

    @@ -48285,11 +47320,7 @@

    4.41. The complex type siri:ServiceNotAvailableErrorStructure

    @@ -48317,11 +47348,7 @@

    4.41. The complex type siri:ServiceNotAvailableErrorStructure

    @@ -48409,11 +47436,7 @@

    4.42. The complex type siri:UnapprovedKeyAccessStructure

    @@ -48529,11 +47552,7 @@

    4.43. The complex type siri:UnknownEndpointErrorStructure

    @@ -48563,11 +47582,7 @@

    4.43. The complex type siri:UnknownEndpointErrorStructure

    @@ -48655,11 +47670,7 @@

    4.44. The complex type siri:UnknownExtensionsErrorStructure

    @@ -48775,11 +47786,7 @@

    4.45. The complex type siri:UnknownParticipantErrorStructure

    @@ -48808,11 +47815,7 @@

    4.45. The complex type siri:UnknownParticipantErrorStructure

    @@ -48900,11 +47903,7 @@

    4.46. The complex type siri:UnknownSubscriberErrorStructure

    @@ -48933,11 +47932,7 @@

    4.46. The complex type siri:UnknownSubscriberErrorStructure

    @@ -49025,11 +48020,7 @@

    4.47. The complex type siri:UnknownSubscriptionErrorStructure

    @@ -49058,11 +48049,7 @@

    4.47. The complex type siri:UnknownSubscriptionErrorStructure

    @@ -50241,7 +49228,7 @@

    6.15. The group siri:AuthenticatedRequestGroup

    @@ -51460,11 +50447,7 @@

    6.29. The group siri:ServiceDeliveryRequestStatusGroup

    @@ -54196,11 +53179,7 @@

    6.50. The complex type siri:CapabilityGeneralInteractionStructure

    @@ -54228,11 +53207,7 @@

    6.50. The complex type siri:CapabilityGeneralInteractionStructure

    @@ -56378,13 +55353,8 @@

    6.63. The complex type siri:TransportDescriptionStructure

    @@ -43773,11 +42920,7 @@

    4.5. The toplevel element siri:EndpointDeniedAccessError (↔ siri:ErrorCode)

    		 -<<<<<<< HEAD -

    Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)

    -=======

    Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Subsititutable type for a SIRI Error code.

    -=======

    Substitutable type for a SIRI Error code.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Element fror an erroc condition (for use in WSDL.)

    -=======

    Element fror an error condition (for use in WSDL.)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Element fror an erroc condition for use in WSDL.

    -=======

    Element from an error condition for use in WSDL.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)

    -=======

    Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)

    -=======

    Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Id of capabiliuty that is noit supported.

    -=======

    Id of capability that is not supported.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Endpoint that was denied access + SIRI v2.0

    -=======

    Endpoint that was denied access (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Endpoint that is noit available. + SIRI v2.0

    -=======

    Endpoint that is not available. (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)

    -=======

    Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)

    -=======

    Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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).

    -=======

    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).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Expected time fro reavailability of servcie. (since SIRI 2.0)

    -=======

    Expected time fro reavailability of service. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Endpoint that is noit known. + SIRI v2.0

    -=======

    Endpoint that is not known. (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Reference to Participant who is unknown. + SIRI v2.0

    -=======

    Reference to Participant who is unknown. (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Id of capabiliuty that is noit supported. + SIRI v2.0

    -=======

    Id of capabiliuty that is noit supported. (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Ubscription code that could not be found. + SIRI v2.0

    -=======

    Subscription code that could not be found. (since SIRI v2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Elemenst for authecticiation. (since SIRI 2.0)

    +

    Elements for authentication. (since SIRI 2.0)

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD - +local-type: typedef-34.2 -======= - +local-type: typedef-59.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.2

    -<<<<<<< HEAD - +local-type: typedef-34.3 -======= - +local-type: typedef-59.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.3

    -<<<<<<< HEAD -
    -

    6.64. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    6.64. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    6.64. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -56404,11 +55374,7 @@

    6.64. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    @@ -56519,13 +55485,8 @@

    6.64. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E

    -<<<<<<< HEAD -
    -

    6.65. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-34.2) -======= -
    -

    6.65. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-59.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    6.65. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)

    @@ -56545,11 +55506,7 @@

    6.65. The complex type complexType[siri:CapabilityGeneralInteractionSt
      /Interaction #complexType
    -<<<<<<< HEAD -   (typedef-34.2) -======= -   (typedef-59.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.2)

    @@ -56617,13 +55574,8 @@

    6.65. The complex type complexType[siri:CapabilityGeneralInteractionSt

    -<<<<<<< HEAD -
    -

    6.66. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-34.3) -======= -
    -

    6.66. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-59.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    6.66. The complex type complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)

    @@ -56643,11 +55595,7 @@

    6.66. The complex type complexType[siri:CapabilityGeneralInteractionSt
      /Delivery #complexType
    -<<<<<<< HEAD -   (typedef-34.3) -======= -   (typedef-59.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.3)

    @@ -60690,11 +59634,7 @@

    7.30. The complex type siri:ConnectionMonitoringServiceCapabilitiesStr

    @@ -60718,11 +59658,7 @@

    7.30. The complex type siri:ConnectionMonitoringServiceCapabilitiesStr

    @@ -62655,11 +61591,7 @@

    7.35. The complex type siri:StoppingPositionChangedDepartureStructure<

    @@ -63002,13 +61934,8 @@

    7.36. The complex type siri:WaitProlongedDepartureStructure

    @@ -59004,11 +57952,7 @@

    7.24. The complex type siri:ConnectionMonitoringCapabilitiesResponseSt

    -<<<<<<< HEAD - +local-type: typedef-74.3 -======= - +local-type: typedef-82.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-83.3

    -<<<<<<< HEAD - +local-type: typedef-74.1 -======= - +local-type: typedef-82.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-83.1

    -<<<<<<< HEAD - +local-type: typedef-74.2 -======= - +local-type: typedef-82.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-83.2

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    7.37. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-74.3) -======= -
    -

    7.37. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-82.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    7.37. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)

    @@ -63028,11 +61955,7 @@

    7.37. The complex type element[siri:ConnectionMonitoringPermissions]#c
      #complexType
    -<<<<<<< HEAD -   (typedef-74.3) -======= -   (typedef-82.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-83.3)

    @@ -63070,13 +61993,8 @@

    7.37. The complex type element[siri:ConnectionMonitoringPermissions]#c

    -<<<<<<< HEAD -
    -

    7.38. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-74.3) -======= -
    -

    7.38. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-82.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    7.38. The complex type element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)

    @@ -63096,11 +62014,7 @@

    7.38. The complex type element[siri:ConnectionMonitoringPermissions]#c
      #complexType
    -<<<<<<< HEAD -   (typedef-74.3) -======= -   (typedef-82.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-83.3)

    @@ -63138,13 +62052,8 @@

    7.38. The complex type element[siri:ConnectionMonitoringPermissions]#c

    -<<<<<<< HEAD -
    -

    7.39. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.1) -======= -
    -

    7.39. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    7.39. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)

    @@ -63164,11 +62073,7 @@

    7.39. The complex type complexType[siri:ConnectionMonitoringServiceCap
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-74.1) -======= -   (typedef-82.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-83.1)

    @@ -63277,13 +62182,8 @@

    7.39. The complex type complexType[siri:ConnectionMonitoringServiceCap

    -<<<<<<< HEAD -
    -

    7.40. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.2) -======= -
    -

    7.40. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    7.40. The complex type complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)

    @@ -63303,11 +62203,7 @@

    7.40. The complex type complexType[siri:ConnectionMonitoringServiceCap
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-74.2) -======= -   (typedef-82.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-83.2)

    @@ -66060,11 +64952,7 @@

    8.22. The complex type siri:ConnectionTimetableServiceCapabilitiesStru

    @@ -66088,11 +64976,7 @@

    8.22. The complex type siri:ConnectionTimetableServiceCapabilitiesStru

    @@ -67308,13 +66192,8 @@

    8.25. The complex type siri:TimetabledFeederArrivalStructure

    @@ -64933,11 +63829,7 @@

    8.17. The complex type siri:ConnectionTimetableCapabilitiesResponseStr

    -<<<<<<< HEAD - +local-type: typedef-85.1 -======= - +local-type: typedef-78.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-74.1

    -<<<<<<< HEAD - +local-type: typedef-85.2 -======= - +local-type: typedef-78.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-74.2

    -<<<<<<< HEAD - +local-type: typedef-85.3 -======= - +local-type: typedef-78.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-74.3

    -<<<<<<< HEAD -
    -

    8.26. The complex type complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-85.1) -======= -
    -

    8.26. The complex type complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-78.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    8.26. The complex type complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)

    @@ -67334,11 +66213,7 @@

    8.26. The complex type complexType[siri:ConnectionTimetableCapabilitie
      /ConnectionTimetablePermissions #complexType
    -<<<<<<< HEAD -   (typedef-85.1) -======= -   (typedef-78.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-74.1)

    @@ -67412,13 +66287,8 @@

    8.26. The complex type complexType[siri:ConnectionTimetableCapabilitie

    -<<<<<<< HEAD -
    -

    8.27. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.2) -======= -
    -

    8.27. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    8.27. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)

    @@ -67438,11 +66308,7 @@

    8.27. The complex type complexType[siri:ConnectionTimetableServiceCapa
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-85.2) -======= -   (typedef-78.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-74.2)

    @@ -67512,13 +66378,8 @@

    8.27. The complex type complexType[siri:ConnectionTimetableServiceCapa

    -<<<<<<< HEAD -
    -

    8.28. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.3) -======= -
    -

    8.28. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    8.28. The complex type complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)

    @@ -67538,11 +66399,7 @@

    8.28. The complex type complexType[siri:ConnectionTimetableServiceCapa
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-85.3) -======= -   (typedef-78.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-74.3)

    @@ -69014,11 +67867,7 @@

    9.22. The group siri:ControlActionPayloadGroup

    @@ -69039,11 +67888,7 @@

    9.22. The group siri:ControlActionPayloadGroup

    @@ -69064,11 +67909,7 @@

    9.22. The group siri:ControlActionPayloadGroup

    @@ -69089,11 +67930,7 @@

    9.22. The group siri:ControlActionPayloadGroup

    @@ -69459,11 +68296,7 @@

    9.25. The group siri:ControlActionTopicGroup

    @@ -70939,11 +69772,7 @@

    9.35. The group siri:PartialJourneyScope

    @@ -70973,11 +69802,7 @@

    9.35. The group siri:PartialJourneyScope

    @@ -71106,11 +69931,7 @@

    9.36. The group siri:PartOfJourneyPatternScope

    @@ -71140,11 +69961,7 @@

    9.36. The group siri:PartOfJourneyPatternScope

    @@ -72975,11 +71792,7 @@

    9.44. The complex type siri:CallCancellationActionStructure

    @@ -73009,11 +71822,7 @@

    9.44. The complex type siri:CallCancellationActionStructure

    @@ -73745,11 +72554,7 @@

    9.49. The complex type siri:ControlActionCapabilitiesResponseStructure

    @@ -74448,11 +73253,7 @@

    9.52. The complex type siri:ControlActionDeliveryStructure

    @@ -74473,11 +73274,7 @@

    9.52. The complex type siri:ControlActionDeliveryStructure

    @@ -74498,11 +73295,7 @@

    9.52. The complex type siri:ControlActionDeliveryStructure

    @@ -74523,11 +73316,7 @@

    9.52. The complex type siri:ControlActionDeliveryStructure

    @@ -74548,11 +73337,7 @@

    9.52. The complex type siri:ControlActionDeliveryStructure

    @@ -74798,11 +73583,7 @@

    9.53. The complex type siri:ControlActionFilterStructure

    @@ -75477,11 +74258,7 @@

    9.56. The complex type siri:ControlActionRequestStructure

    @@ -75745,11 +74522,7 @@

    9.57. The complex type siri:ControlActionServiceCapabilitiesStructure<

    @@ -75773,11 +74546,7 @@

    9.57. The complex type siri:ControlActionServiceCapabilitiesStructure<

    @@ -75849,11 +74618,7 @@

    9.57. The complex type siri:ControlActionServiceCapabilitiesStructure<

    @@ -75987,11 +74752,7 @@

    9.58. The complex type siri:ControlActionServicePermissionStructure

    @@ -76025,11 +74786,7 @@

    9.58. The complex type siri:ControlActionServicePermissionStructure

    @@ -76058,11 +74815,7 @@

    9.58. The complex type siri:ControlActionServicePermissionStructure

    @@ -76810,11 +75563,7 @@

    9.59. The complex type siri:ControlActionStructure

    @@ -77657,11 +76406,7 @@

    9.63. The complex type siri:DriverMessageStructure

    @@ -77777,7 +76522,7 @@

    9.63. The complex type siri:DriverMessageStructure

    @@ -77790,11 +76535,7 @@

    9.63. The complex type siri:DriverMessageStructure

    @@ -78972,11 +77713,21 @@

    9.69. The complex type siri:JourneyPatternModification

    Identification of the DATED VEHICLE JOURNEY to cancel

     + + + - + @@ -79000,6 +77751,39 @@

    9.69. The complex type siri:JourneyPatternModification

    List of modified points

     + + + + + + + +
    @@ -68989,11 +67846,7 @@

    9.22. The group siri:ControlActionPayloadGroup

    -<<<<<<< HEAD - +local-type: typedef-78.2 -======= - +local-type: typedef-85.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.2

    -<<<<<<< HEAD - +local-type: typedef-78.3 -======= - +local-type: typedef-85.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.3

    -<<<<<<< HEAD - +local-type: typedef-78.7 -======= - +local-type: typedef-85.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.7

    -<<<<<<< HEAD - +local-type: typedef-78.9 -======= - +local-type: typedef-85.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.9

    -<<<<<<< HEAD - +local-type: typedef-78.10 -======= - +local-type: typedef-85.10 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.10

    -<<<<<<< HEAD - +local-type: typedef-78.1 -======= - +local-type: typedef-85.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.1

    -<<<<<<< HEAD - +local-type: typedef-78.18 -======= - +local-type: typedef-85.18 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.18

    -<<<<<<< HEAD - +local-type: typedef-78.19 -======= - +local-type: typedef-85.19 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.19

    -<<<<<<< HEAD - +local-type: typedef-78.18 -======= - +local-type: typedef-85.18 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.18

    -<<<<<<< HEAD - +local-type: typedef-78.19 -======= - +local-type: typedef-85.19 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.19

    -<<<<<<< HEAD - +local-type: typedef-78.18 -======= - +local-type: typedef-85.18 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.18

    -<<<<<<< HEAD - +local-type: typedef-78.19 -======= - +local-type: typedef-85.19 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.19

    -<<<<<<< HEAD - +local-type: typedef-78.14 -======= - +local-type: typedef-85.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.14

    -<<<<<<< HEAD - +local-type: typedef-78.2 -======= - +local-type: typedef-85.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.2

    -<<<<<<< HEAD - +local-type: typedef-78.3 -======= - +local-type: typedef-85.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.3

    -<<<<<<< HEAD - +local-type: typedef-78.7 -======= - +local-type: typedef-85.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.7

    -<<<<<<< HEAD - +local-type: typedef-78.9 -======= - +local-type: typedef-85.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.9

    -<<<<<<< HEAD - +local-type: typedef-78.10 -======= - +local-type: typedef-85.10 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.10

    -<<<<<<< HEAD - +local-type: typedef-78.1 -======= - +local-type: typedef-85.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.1

    -<<<<<<< HEAD - +local-type: typedef-78.1 -======= - +local-type: typedef-85.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.1

    -<<<<<<< HEAD - +local-type: typedef-78.11 -======= - +local-type: typedef-85.11 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.11

    -<<<<<<< HEAD - +local-type: typedef-78.12 -======= - +local-type: typedef-85.12 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.12

    -<<<<<<< HEAD - +local-type: typedef-78.13 -======= - +local-type: typedef-85.13 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.13

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    -<<<<<<< HEAD - +local-type: typedef-78.15 -======= - +local-type: typedef-85.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.15

    -<<<<<<< HEAD - +local-type: typedef-78.16 -======= - +local-type: typedef-85.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.16

    - siri:DiverScope + siri:DriverScope

    -<<<<<<< HEAD - +local-type: typedef-78.17 -======= - +local-type: typedef-85.17 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.17

    +

    The element contains one of the following elements (a-b)

    +
    + +

    + a +

    +

    siri:ChangedPoints @@ -78986,7 +77737,7 @@

    9.69. The complex type siri:JourneyPatternModification

    - 1:1 + -1:1

    + + +

    + b +

    +     		+

    + + siri:UpdatedServiceLinks + +

    +     		+

    + + -1:1 + +

    +     		+

    + +siri:ServiceLinkViewsStructure + +

    +     		+

    List of SERVICE LINKs having updated shapes in that journey. This is only to provide updated the shapes of the journey (as gml:linestring), not to provide additional SERVICE LINK (provided through the sequence of CALLS)

    +
    @@ -81133,13 +79917,8 @@

    9.82. The complex type siri:VehicleWorkAssignment

    -<<<<<<< HEAD -
    -

    9.83. The complex type element[siri:ControlActionPermissions]#complexType (typedef-78.14) -======= -
    -

    9.83. The complex type element[siri:ControlActionPermissions]#complexType (typedef-85.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.83. The complex type element[siri:ControlActionPermissions]#complexType (typedef-72.14)

    @@ -81159,11 +79938,7 @@

    9.83. The complex type element[siri:ControlActionPermissions]#complexT
      #complexType
    -<<<<<<< HEAD -   (typedef-78.14) -======= -   (typedef-85.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.14)

    @@ -81237,13 +80012,8 @@

    9.83. The complex type element[siri:ControlActionPermissions]#complexT

    -<<<<<<< HEAD -
    -

    9.84. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2) -======= -
    -

    9.84. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-85.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.84. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)

    @@ -81263,11 +80033,7 @@

    9.84. The complex type group[siri:ControlActionPayloadGroup]/controlAc
      /controlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.2) -======= -   (typedef-85.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.2)

    @@ -81309,13 +80075,8 @@

    9.84. The complex type group[siri:ControlActionPayloadGroup]/controlAc

    -<<<<<<< HEAD -
    -

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3) -======= -
    -

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-85.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)

    @@ -81335,11 +80096,7 @@

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC
      /groupsOfControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.3) -======= -   (typedef-85.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.3)

    @@ -81385,13 +80138,8 @@

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    @@ -81369,11 +80126,7 @@

    9.85. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    -<<<<<<< HEAD - +local-type: typedef-78.4 -======= - +local-type: typedef-85.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.4

    -<<<<<<< HEAD -
    -

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4) -======= -
    -

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-85.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)

    @@ -81411,11 +80159,7 @@

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC
      /groupsOfControlActions/GroupOfControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.4) -======= -   (typedef-85.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.4)

    @@ -81613,11 +80353,7 @@

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    @@ -81629,13 +80365,8 @@

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    @@ -81585,11 +80329,7 @@

    9.86. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    -<<<<<<< HEAD - +local-type: typedef-78.5 -======= - +local-type: typedef-85.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.5

    -<<<<<<< HEAD - +local-type: typedef-78.6 -======= - +local-type: typedef-85.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.6

    -<<<<<<< HEAD -
    -

    9.87. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5) -======= -
    -

    9.87. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-85.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.87. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)

    @@ -81655,11 +80386,7 @@

    9.87. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC
      /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.5) -======= -   (typedef-85.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.5)

    @@ -81701,13 +80428,8 @@

    9.87. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    -<<<<<<< HEAD -
    -

    9.88. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6) -======= -
    -

    9.88. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-85.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.88. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)

    @@ -81727,11 +80449,7 @@

    9.88. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC
      /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.6) -======= -   (typedef-85.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.6)

    @@ -81773,13 +80491,8 @@

    9.88. The complex type group[siri:ControlActionPayloadGroup]/groupsOfC

    -<<<<<<< HEAD -
    -

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7) -======= -
    -

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-85.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)

    @@ -81799,11 +80512,7 @@

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedCo
      /revokedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.7) -======= -   (typedef-85.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.7)

    @@ -81849,13 +80554,8 @@

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedCo

    @@ -81833,11 +80542,7 @@

    9.89. The complex type group[siri:ControlActionPayloadGroup]/revokedCo

    -<<<<<<< HEAD - +local-type: typedef-78.8 -======= - +local-type: typedef-85.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.8

    -<<<<<<< HEAD -
    -

    9.90. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8) -======= -
    -

    9.90. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-85.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.90. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)

    @@ -81875,11 +80575,7 @@

    9.90. The complex type group[siri:ControlActionPayloadGroup]/revokedCo
      /revokedControlActions/RevokedControlAction #complexType
    -<<<<<<< HEAD -   (typedef-78.8) -======= -   (typedef-85.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.8)

    @@ -82012,13 +80708,8 @@

    9.90. The complex type group[siri:ControlActionPayloadGroup]/revokedCo

    -<<<<<<< HEAD -
    -

    9.91. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9) -======= -
    -

    9.91. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-85.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.91. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)

    @@ -82038,11 +80729,7 @@

    9.91. The complex type group[siri:ControlActionPayloadGroup]/driverMes
      /driverMessages #complexType
    -<<<<<<< HEAD -   (typedef-78.9) -======= -   (typedef-85.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.9)

    @@ -82084,13 +80771,8 @@

    9.91. The complex type group[siri:ControlActionPayloadGroup]/driverMes

    -<<<<<<< HEAD -
    -

    9.92. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10) -======= -
    -

    9.92. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-85.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.92. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)

    @@ -82110,11 +80792,7 @@

    9.92. The complex type group[siri:ControlActionPayloadGroup]/vehicleDe
      /vehicleDetectings #complexType
    -<<<<<<< HEAD -   (typedef-78.10) -======= -   (typedef-85.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.10)

    @@ -82156,13 +80834,8 @@

    9.92. The complex type group[siri:ControlActionPayloadGroup]/vehicleDe

    -<<<<<<< HEAD -
    -

    9.93. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1) -======= -
    -

    9.93. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.93. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)

    @@ -82182,11 +80855,7 @@

    9.93. The complex type group[siri:ControlActionTopicGroup]/Lines#compl
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-78.1) -======= -   (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.1)

    @@ -82228,13 +80897,8 @@

    9.93. The complex type group[siri:ControlActionTopicGroup]/Lines#compl

    -<<<<<<< HEAD -
    -

    9.94. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18) -======= -
    -

    9.94. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.94. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)

    @@ -82254,11 +80918,7 @@

    9.94. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC
      /SelectedCalls #complexType
    -<<<<<<< HEAD -   (typedef-78.18) -======= -   (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.18)

    @@ -82300,13 +80960,8 @@

    9.94. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC

    -<<<<<<< HEAD -
    -

    9.95. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19) -======= -
    -

    9.95. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.95. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)

    @@ -82326,11 +80981,7 @@

    9.95. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw
      /CallsBetweenPoints #complexType
    -<<<<<<< HEAD -   (typedef-78.19) -======= -   (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.19)

    @@ -82400,13 +81051,8 @@

    9.95. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw

    -<<<<<<< HEAD -
    -

    9.96. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18) -======= -
    -

    9.96. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.96. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)

    @@ -82426,11 +81072,7 @@

    9.96. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC
      /SelectedCalls #complexType
    -<<<<<<< HEAD -   (typedef-78.18) -======= -   (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.18)

    @@ -82472,13 +81114,8 @@

    9.96. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC

    -<<<<<<< HEAD -
    -

    9.97. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19) -======= -
    -

    9.97. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.97. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)

    @@ -82498,11 +81135,7 @@

    9.97. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw
      /CallsBetweenPoints #complexType
    -<<<<<<< HEAD -   (typedef-78.19) -======= -   (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.19)

    @@ -82572,13 +81205,8 @@

    9.97. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw

    -<<<<<<< HEAD -
    -

    9.98. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18) -======= -
    -

    9.98. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.98. The complex type group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)

    @@ -82598,11 +81226,7 @@

    9.98. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC
      /SelectedCalls #complexType
    -<<<<<<< HEAD -   (typedef-78.18) -======= -   (typedef-85.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.18)

    @@ -82644,13 +81268,8 @@

    9.98. The complex type group[siri:PartOfJourneyPatternScope]/SelectedC

    -<<<<<<< HEAD -
    -

    9.99. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19) -======= -
    -

    9.99. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.99. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)

    @@ -82670,11 +81289,7 @@

    9.99. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw
      /CallsBetweenPoints #complexType
    -<<<<<<< HEAD -   (typedef-78.19) -======= -   (typedef-85.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.19)

    @@ -82744,13 +81359,8 @@

    9.99. The complex type group[siri:PartOfJourneyPatternScope]/CallsBetw

    -<<<<<<< HEAD -
    -

    9.100. The complex type element[siri:ControlActionPermissions]#complexType (typedef-78.14) -======= -
    -

    9.100. The complex type element[siri:ControlActionPermissions]#complexType (typedef-85.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.100. The complex type element[siri:ControlActionPermissions]#complexType (typedef-72.14)

    @@ -82770,11 +81380,7 @@

    9.100. The complex type element[siri:ControlActionPermissions]#complex
      #complexType
    -<<<<<<< HEAD -   (typedef-78.14) -======= -   (typedef-85.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.14)

    @@ -82848,13 +81454,8 @@

    9.100. The complex type element[siri:ControlActionPermissions]#complex

    -<<<<<<< HEAD -
    -

    9.101. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2) -======= -
    -

    9.101. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-85.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.101. The complex type group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)

    @@ -82874,11 +81475,7 @@

    9.101. The complex type group[siri:ControlActionPayloadGroup]/controlA
      /controlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.2) -======= -   (typedef-85.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.2)

    @@ -82920,13 +81517,8 @@

    9.101. The complex type group[siri:ControlActionPayloadGroup]/controlA

    -<<<<<<< HEAD -
    -

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3) -======= -
    -

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-85.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)

    @@ -82946,11 +81538,7 @@

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOf
      /groupsOfControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.3) -======= -   (typedef-85.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.3)

    @@ -82996,13 +81580,8 @@

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    @@ -82980,11 +81568,7 @@

    9.102. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    -<<<<<<< HEAD - +local-type: typedef-78.4 -======= - +local-type: typedef-85.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.4

    -<<<<<<< HEAD -
    -

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4) -======= -
    -

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-85.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)

    @@ -83022,11 +81601,7 @@

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOf
      /groupsOfControlActions/GroupOfControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.4) -======= -   (typedef-85.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.4)

    @@ -83224,11 +81795,7 @@

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    @@ -83240,13 +81807,8 @@

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    @@ -83196,11 +81771,7 @@

    9.103. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    -<<<<<<< HEAD - +local-type: typedef-78.5 -======= - +local-type: typedef-85.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.5

    -<<<<<<< HEAD - +local-type: typedef-78.6 -======= - +local-type: typedef-85.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.6

    -<<<<<<< HEAD -
    -

    9.104. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5) -======= -
    -

    9.104. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-85.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.104. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)

    @@ -83266,11 +81828,7 @@

    9.104. The complex type group[siri:ControlActionPayloadGroup]/groupsOf
      /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.5) -======= -   (typedef-85.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.5)

    @@ -83312,13 +81870,8 @@

    9.104. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    -<<<<<<< HEAD -
    -

    9.105. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6) -======= -
    -

    9.105. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-85.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.105. The complex type group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)

    @@ -83338,11 +81891,7 @@

    9.105. The complex type group[siri:ControlActionPayloadGroup]/groupsOf
      /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.6) -======= -   (typedef-85.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.6)

    @@ -83384,13 +81933,8 @@

    9.105. The complex type group[siri:ControlActionPayloadGroup]/groupsOf

    -<<<<<<< HEAD -
    -

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7) -======= -
    -

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-85.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)

    @@ -83410,11 +81954,7 @@

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedC
      /revokedControlActions #complexType
    -<<<<<<< HEAD -   (typedef-78.7) -======= -   (typedef-85.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.7)

    @@ -83460,13 +81996,8 @@

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedC

    @@ -83444,11 +81984,7 @@

    9.106. The complex type group[siri:ControlActionPayloadGroup]/revokedC

    -<<<<<<< HEAD - +local-type: typedef-78.8 -======= - +local-type: typedef-85.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-72.8

    -<<<<<<< HEAD -
    -

    9.107. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8) -======= -
    -

    9.107. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-85.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.107. The complex type group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)

    @@ -83486,11 +82017,7 @@

    9.107. The complex type group[siri:ControlActionPayloadGroup]/revokedC
      /revokedControlActions/RevokedControlAction #complexType
    -<<<<<<< HEAD -   (typedef-78.8) -======= -   (typedef-85.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.8)

    @@ -83623,13 +82150,8 @@

    9.107. The complex type group[siri:ControlActionPayloadGroup]/revokedC

    -<<<<<<< HEAD -
    -

    9.108. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9) -======= -
    -

    9.108. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-85.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.108. The complex type group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)

    @@ -83649,11 +82171,7 @@

    9.108. The complex type group[siri:ControlActionPayloadGroup]/driverMe
      /driverMessages #complexType
    -<<<<<<< HEAD -   (typedef-78.9) -======= -   (typedef-85.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.9)

    @@ -83695,13 +82213,8 @@

    9.108. The complex type group[siri:ControlActionPayloadGroup]/driverMe

    -<<<<<<< HEAD -
    -

    9.109. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10) -======= -
    -

    9.109. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-85.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.109. The complex type group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)

    @@ -83721,11 +82234,7 @@

    9.109. The complex type group[siri:ControlActionPayloadGroup]/vehicleD
      /vehicleDetectings #complexType
    -<<<<<<< HEAD -   (typedef-78.10) -======= -   (typedef-85.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.10)

    @@ -83767,13 +82276,8 @@

    9.109. The complex type group[siri:ControlActionPayloadGroup]/vehicleD

    -<<<<<<< HEAD -
    -

    9.110. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1) -======= -
    -

    9.110. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.110. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)

    @@ -83793,11 +82297,7 @@

    9.110. The complex type group[siri:ControlActionTopicGroup]/Lines#comp
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-78.1) -======= -   (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.1)

    @@ -83839,13 +82339,8 @@

    9.110. The complex type group[siri:ControlActionTopicGroup]/Lines#comp

    -<<<<<<< HEAD -
    -

    9.111. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1) -======= -
    -

    9.111. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.111. The complex type group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)

    @@ -83865,11 +82360,7 @@

    9.111. The complex type group[siri:ControlActionTopicGroup]/Lines#comp
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-78.1) -======= -   (typedef-85.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.1)

    @@ -83911,13 +82402,8 @@

    9.111. The complex type group[siri:ControlActionTopicGroup]/Lines#comp

    -<<<<<<< HEAD -
    -

    9.112. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.11) -======= -
    -

    9.112. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.112. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)

    @@ -83937,11 +82423,7 @@

    9.112. The complex type complexType[siri:ControlActionServiceCapabilit
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-78.11) -======= -   (typedef-85.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.11)

    @@ -84073,13 +82555,8 @@

    9.112. The complex type complexType[siri:ControlActionServiceCapabilit

    -<<<<<<< HEAD -
    -

    9.113. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.12) -======= -
    -

    9.113. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.113. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)

    @@ -84099,11 +82576,7 @@

    9.113. The complex type complexType[siri:ControlActionServiceCapabilit
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-78.12) -======= -   (typedef-85.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.12)

    @@ -84321,13 +82794,8 @@

    9.113. The complex type complexType[siri:ControlActionServiceCapabilit

    -<<<<<<< HEAD -
    -

    9.114. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-78.13) -======= -
    -

    9.114. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-85.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.114. The complex type complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)

    @@ -84347,11 +82815,7 @@

    9.114. The complex type complexType[siri:ControlActionServiceCapabilit
      /ResponseFeatures #complexType
    -<<<<<<< HEAD -   (typedef-78.13) -======= -   (typedef-85.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.13)

    @@ -84388,13 +82852,8 @@

    9.114. The complex type complexType[siri:ControlActionServiceCapabilit

    -<<<<<<< HEAD -
    -

    9.115. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    9.115. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.115. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -84414,11 +82873,7 @@

    9.115. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -84486,13 +82941,8 @@

    9.115. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    9.116. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    9.116. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.116. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -84512,11 +82962,7 @@

    9.116. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -84601,13 +83047,8 @@

    9.116. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    9.117. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    9.117. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.117. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -84627,11 +83068,7 @@

    9.117. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -84716,13 +83153,8 @@

    9.117. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    9.118. The complex type complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-78.15) -======= -
    -

    9.118. The complex type complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-85.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.118. The complex type complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)

    @@ -84742,11 +83174,7 @@

    9.118. The complex type complexType[siri:ControlActionStructure]/Situa
      /SituationDescription #complexType
    -<<<<<<< HEAD -   (typedef-78.15) -======= -   (typedef-85.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.15)

    @@ -84901,11 +83325,7 @@

    9.118. The complex type complexType[siri:ControlActionStructure]/Situa

    @@ -84926,11 +83346,7 @@

    9.118. The complex type complexType[siri:ControlActionStructure]/Situa

    @@ -84942,13 +83358,8 @@

    9.118. The complex type complexType[siri:ControlActionStructure]/Situa

    @@ -84797,11 +83225,7 @@

    9.118. The complex type complexType[siri:ControlActionStructure]/Situa

    		-<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    -<<<<<<< HEAD -
    -

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -84968,11 +83379,7 @@

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -85018,13 +83421,8 @@

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -85002,11 +83409,7 @@

    9.119. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    9.120. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    9.120. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.120. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -85044,11 +83442,7 @@

    9.120. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -85163,13 +83557,8 @@

    9.120. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    9.121. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    9.121. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.121. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -85189,11 +83578,7 @@

    9.121. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -85235,13 +83620,8 @@

    9.121. The complex type group[siri:DescriptionGroup]/InfoLinks#complex

    -<<<<<<< HEAD -
    -

    9.122. The complex type complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-78.16) -======= -
    -

    9.122. The complex type complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-85.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.122. The complex type complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)

    @@ -85261,11 +83641,7 @@

    9.122. The complex type complexType[siri:DriverMessageStructure]/Messa
      /MessageContents #complexType
    -<<<<<<< HEAD -   (typedef-78.16) -======= -   (typedef-85.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.16)

    @@ -85307,13 +83683,8 @@

    9.122. The complex type complexType[siri:DriverMessageStructure]/Messa

    -<<<<<<< HEAD -
    -

    9.123. The complex type complexType[siri:DriverMessageStructure]/DiverScope#complexType (typedef-78.17) -======= -
    -

    9.123. The complex type complexType[siri:DriverMessageStructure]/DiverScope#complexType (typedef-85.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    9.123. The complex type complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)

    @@ -85331,13 +83702,9 @@

    9.123. The complex type complexType[siri:DriverMessageStructure]/Diver

    complexType[siri:DriverMessageStructure]
    -   /DiverScope #complexType +   /DriverScope #complexType
    -<<<<<<< HEAD -   (typedef-78.17) -======= -   (typedef-85.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-72.17)

    @@ -87896,11 +86259,7 @@

    10.29. The group siri:SiriDiscoveryIndexGroup

    @@ -88668,11 +87027,7 @@

    10.31. The group siri:SiriReferenceDiscoveryRequestGroup

    @@ -88734,11 +87089,7 @@

    10.31. The group siri:SiriReferenceDiscoveryRequestGroup

    @@ -93758,13 +92109,8 @@

    10.50. The complex type siri:VehicleFeaturesRequestStructure

    @@ -87830,11 +86197,7 @@

    10.29. The group siri:SiriDiscoveryIndexGroup

    -<<<<<<< HEAD - +local-type: typedef-72.1 -======= - +local-type: typedef-74.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.1

    -<<<<<<< HEAD - +local-type: typedef-72.2 -======= - +local-type: typedef-74.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.2

    -<<<<<<< HEAD - +local-type: typedef-72.1 -======= - +local-type: typedef-74.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.1

    -<<<<<<< HEAD - +local-type: typedef-72.2 -======= - +local-type: typedef-74.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-86.2

    -<<<<<<< HEAD -
    -

    10.51. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    10.51. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.51. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -93784,11 +92130,7 @@

    10.51. The complex type element[siri:ServiceFeaturesRequest]#complexTy
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -94006,13 +92348,8 @@

    10.51. The complex type element[siri:ServiceFeaturesRequest]#complexTy

    -<<<<<<< HEAD -
    -

    10.52. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    10.52. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.52. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -94032,11 +92369,7 @@

    10.52. The complex type element[siri:StopPointsRequest]#complexType (t
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -94426,13 +92759,8 @@

    10.52. The complex type element[siri:StopPointsRequest]#complexType (t

    -<<<<<<< HEAD -
    -

    10.53. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    10.53. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.53. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -94452,11 +92780,7 @@

    10.53. The complex type element[siri:StopPointsRequest]#complexType (t
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -94846,13 +93170,8 @@

    10.53. The complex type element[siri:StopPointsRequest]#complexType (t

    -<<<<<<< HEAD -
    -

    10.54. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    10.54. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.54. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -94872,11 +93191,7 @@

    10.54. The complex type element[siri:ServiceFeaturesRequest]#complexTy
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -95094,13 +93409,8 @@

    10.54. The complex type element[siri:ServiceFeaturesRequest]#complexTy

    -<<<<<<< HEAD -
    -

    10.55. The complex type element[siri:StopPointsRequest]#complexType (typedef-72.1) -======= -
    -

    10.55. The complex type element[siri:StopPointsRequest]#complexType (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.55. The complex type element[siri:StopPointsRequest]#complexType (typedef-86.1)

    @@ -95120,11 +93430,7 @@

    10.55. The complex type element[siri:StopPointsRequest]#complexType (t
      #complexType
    -<<<<<<< HEAD -   (typedef-72.1) -======= -   (typedef-74.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.1)

    @@ -95514,13 +93820,8 @@

    10.55. The complex type element[siri:StopPointsRequest]#complexType (t

    -<<<<<<< HEAD -
    -

    10.56. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2) -======= -
    -

    10.56. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    10.56. The complex type element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)

    @@ -95540,11 +93841,7 @@

    10.56. The complex type element[siri:ServiceFeaturesRequest]#complexTy
      #complexType
    -<<<<<<< HEAD -   (typedef-72.2) -======= -   (typedef-74.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-86.2)

    @@ -97094,11 +95387,7 @@

    11.15. The complex type siri:EstimatedTimetableCapabilitiesResponseStr

    @@ -98012,11 +96301,7 @@

    11.19. The complex type siri:EstimatedTimetableRequestStructure

    @@ -98349,11 +96634,7 @@

    11.20. The complex type siri:EstimatedTimetableServiceCapabilitiesStru

    @@ -98377,11 +96658,7 @@

    11.20. The complex type siri:EstimatedTimetableServiceCapabilitiesStru

    @@ -98897,13 +97174,8 @@

    11.22. The complex type siri:EstimatedVersionFrameStructure

    @@ -96597,11 +94894,7 @@

    11.13. The group siri:EstimatedTimetableTopicGroup

    -<<<<<<< HEAD - +local-type: typedef-86.1 -======= - +local-type: typedef-79.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-76.1

    -<<<<<<< HEAD - +local-type: typedef-86.4 -======= - +local-type: typedef-79.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-76.4

    -<<<<<<< HEAD - +local-type: typedef-86.1 -======= - +local-type: typedef-79.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-76.1

    -<<<<<<< HEAD - +local-type: typedef-86.2 -======= - +local-type: typedef-79.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-76.2

    -<<<<<<< HEAD - +local-type: typedef-86.3 -======= - +local-type: typedef-79.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-76.3

    -<<<<<<< HEAD -
    -

    11.23. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-86.4) -======= -
    -

    11.23. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.23. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)

    @@ -98923,11 +97195,7 @@

    11.23. The complex type element[siri:EstimatedTimetablePermissions]#co
      #complexType
    -<<<<<<< HEAD -   (typedef-86.4) -======= -   (typedef-79.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.4)

    @@ -99001,13 +97269,8 @@

    11.23. The complex type element[siri:EstimatedTimetablePermissions]#co

    -<<<<<<< HEAD -
    -

    11.24. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-86.1) -======= -
    -

    11.24. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.24. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)

    @@ -99027,11 +97290,7 @@

    11.24. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-86.1) -======= -   (typedef-79.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.1)

    @@ -99073,13 +97332,8 @@

    11.24. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines

    -<<<<<<< HEAD -
    -

    11.25. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-86.4) -======= -
    -

    11.25. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.25. The complex type element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)

    @@ -99099,11 +97353,7 @@

    11.25. The complex type element[siri:EstimatedTimetablePermissions]#co
      #complexType
    -<<<<<<< HEAD -   (typedef-86.4) -======= -   (typedef-79.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.4)

    @@ -99177,13 +97427,8 @@

    11.25. The complex type element[siri:EstimatedTimetablePermissions]#co

    -<<<<<<< HEAD -
    -

    11.26. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-86.1) -======= -
    -

    11.26. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.26. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)

    @@ -99203,11 +97448,7 @@

    11.26. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-86.1) -======= -   (typedef-79.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.1)

    @@ -99249,13 +97490,8 @@

    11.26. The complex type group[siri:EstimatedTimetableTopicGroup]/Lines

    -<<<<<<< HEAD -
    -

    11.27. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.2) -======= -
    -

    11.27. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.27. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.2)

    @@ -99275,11 +97511,7 @@

    11.27. The complex type complexType[siri:EstimatedTimetableServiceCapa
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-86.2) -======= -   (typedef-79.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.2)

    @@ -99469,13 +97701,8 @@

    11.27. The complex type complexType[siri:EstimatedTimetableServiceCapa

    -<<<<<<< HEAD -
    -

    11.28. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.3) -======= -
    -

    11.28. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    11.28. The complex type complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-76.3)

    @@ -99495,11 +97722,7 @@

    11.28. The complex type complexType[siri:EstimatedTimetableServiceCapa
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-86.3) -======= -   (typedef-79.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-76.3)

    @@ -102611,11 +100830,7 @@

    12.21. The complex type siri:FacilityMonitoringServiceCapabilitiesStru

    @@ -102639,11 +100854,7 @@

    12.21. The complex type siri:FacilityMonitoringServiceCapabilitiesStru

    @@ -102691,11 +100902,7 @@

    12.21. The complex type siri:FacilityMonitoringServiceCapabilitiesStru

    @@ -102719,11 +100926,7 @@

    12.21. The complex type siri:FacilityMonitoringServiceCapabilitiesStru

    @@ -102882,11 +101085,7 @@

    12.22. The complex type siri:FacilityMonitoringServicePermissionStruct

    @@ -102920,11 +101119,7 @@

    12.22. The complex type siri:FacilityMonitoringServicePermissionStruct

    @@ -102953,11 +101148,7 @@

    12.22. The complex type siri:FacilityMonitoringServicePermissionStruct

    @@ -103213,13 +101404,8 @@

    12.23. The complex type siri:FacilityMonitoringSubscriptionStructure -<<<<<<< HEAD -
    -

    12.24. The complex type element[siri:FacilityMonitoringPermissions]#complexType (typedef-75.5) -=======

    12.24. The complex type element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -101410,11 +99633,7 @@

    12.17. The complex type siri:FacilityMonitoringCapabilitiesResponseStr

    -<<<<<<< HEAD - +local-type: typedef-75.5 -======= +local-type: typedef-73.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-75.1 -======= +local-type: typedef-73.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-75.2 -======= +local-type: typedef-73.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-75.3 -======= +local-type: typedef-73.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-75.4 -======= +local-type: typedef-73.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    @@ -103239,11 +101425,7 @@

    12.24. The complex type element[siri:FacilityMonitoringPermissions]#co
      #complexType
    -<<<<<<< HEAD -   (typedef-75.5) -=======   (typedef-73.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103317,13 +101499,8 @@

    12.24. The complex type element[siri:FacilityMonitoringPermissions]#co

    -<<<<<<< HEAD -
    -

    12.25. The complex type element[siri:FacilityMonitoringPermissions]#complexType (typedef-75.5) -=======

    12.25. The complex type element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103343,11 +101520,7 @@

    12.25. The complex type element[siri:FacilityMonitoringPermissions]#co
      #complexType
    -<<<<<<< HEAD -   (typedef-75.5) -=======   (typedef-73.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103421,13 +101594,8 @@

    12.25. The complex type element[siri:FacilityMonitoringPermissions]#co

    -<<<<<<< HEAD -
    -

    12.26. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1) -=======

    12.26. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103447,11 +101615,7 @@

    12.26. The complex type complexType[siri:FacilityMonitoringServiceCapa
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-75.1) -=======   (typedef-73.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103716,13 +101880,8 @@

    12.26. The complex type complexType[siri:FacilityMonitoringServiceCapa

    -<<<<<<< HEAD -
    -

    12.27. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.2) -=======

    12.27. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103742,11 +101901,7 @@

    12.27. The complex type complexType[siri:FacilityMonitoringServiceCapa
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-75.2) -=======   (typedef-73.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103918,13 +102073,8 @@

    12.27. The complex type complexType[siri:FacilityMonitoringServiceCapa

    -<<<<<<< HEAD -
    -

    12.28. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.3) -=======

    12.28. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -103944,11 +102094,7 @@

    12.28. The complex type complexType[siri:FacilityMonitoringServiceCapa
      /AccessControl #complexType
    -<<<<<<< HEAD -   (typedef-75.3) -=======   (typedef-73.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -104049,13 +102195,8 @@

    12.28. The complex type complexType[siri:FacilityMonitoringServiceCapa

    -<<<<<<< HEAD -
    -

    12.29. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.4) -=======

    12.29. The complex type complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -104075,11 +102216,7 @@

    12.29. The complex type complexType[siri:FacilityMonitoringServiceCapa
      /ResponseFeatures #complexType
    -<<<<<<< HEAD -   (typedef-75.4) -=======   (typedef-73.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -104139,13 +102276,8 @@

    12.29. The complex type complexType[siri:FacilityMonitoringServiceCapa

    -<<<<<<< HEAD -
    -

    12.30. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    12.30. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    12.30. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -104165,11 +102297,7 @@

    12.30. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -104237,13 +102365,8 @@

    12.30. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    12.31. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    12.31. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    12.31. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -104263,11 +102386,7 @@

    12.31. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -104352,13 +102471,8 @@

    12.31. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    12.32. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    12.32. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    12.32. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -104378,11 +102492,7 @@

    12.32. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -106508,11 +104614,7 @@

    13.22. The complex type siri:GeneralMessageServiceCapabilitiesStructur

    @@ -106694,11 +104796,7 @@

    13.23. The complex type siri:GeneralMessageServicePermissionStructure<

    @@ -106731,11 +104829,7 @@

    13.23. The complex type siri:GeneralMessageServicePermissionStructure<

    @@ -107561,13 +105655,8 @@

    13.28. The complex type siri:InfoMessageStructure

    @@ -105561,11 +103671,7 @@

    13.17. The complex type siri:GeneralMessageCapabilitiesResponseStructu

    -<<<<<<< HEAD - +local-type: typedef-73.2 -======= - +local-type: typedef-83.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-84.2

    -<<<<<<< HEAD - +local-type: typedef-73.1 -======= - +local-type: typedef-83.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-84.1

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-73.3 -======= - +local-type: typedef-83.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-84.3

    -<<<<<<< HEAD -
    -

    12.29. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-73.2) -======= -
    -

    13.29. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-83.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    13.29. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)

    @@ -107587,11 +105676,7 @@

    13.29. The complex type element[siri:GeneralMessagePermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-73.2) -======= -   (typedef-83.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-84.2)

    @@ -107665,13 +105750,8 @@

    13.29. The complex type element[siri:GeneralMessagePermissions]#comple

    -<<<<<<< HEAD -
    -

    12.30. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-73.2) -======= -
    -

    13.30. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-83.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    13.30. The complex type element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)

    @@ -107691,11 +105771,7 @@

    13.30. The complex type element[siri:GeneralMessagePermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-73.2) -======= -   (typedef-83.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-84.2)

    @@ -107769,13 +105845,8 @@

    13.30. The complex type element[siri:GeneralMessagePermissions]#comple

    -<<<<<<< HEAD -
    -

    12.31. The complex type complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1) -======= -
    -

    13.31. The complex type complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    13.31. The complex type complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)

    @@ -107795,11 +105866,7 @@

    13.31. The complex type complexType[siri:GeneralMessageServiceCapabili
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-73.1) -======= -   (typedef-83.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-84.1)

    @@ -107865,13 +105932,8 @@

    13.31. The complex type complexType[siri:GeneralMessageServiceCapabili

    -<<<<<<< HEAD -
    -

    13.32. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    13.32. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    13.32. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -107891,11 +105953,7 @@

    13.32. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -107963,13 +106021,8 @@

    13.32. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    12.33. The complex type complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-73.3) -======= -
    -

    13.33. The complex type complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-83.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    13.33. The complex type complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)

    @@ -107989,11 +106042,7 @@

    13.33. The complex type complexType[siri:GeneralMessageServicePermissi
      /InfoChannelPermissions #complexType
    -<<<<<<< HEAD -   (typedef-73.3) -======= -   (typedef-83.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-84.3)

    @@ -111627,11 +109672,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -111652,11 +109693,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -111677,11 +109714,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -111766,11 +109799,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -111791,11 +109820,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112040,11 +110065,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112227,11 +110248,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112252,11 +110269,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112280,11 +110293,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112305,11 +110314,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112330,11 +110335,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -112362,11 +110363,7 @@

    14.30. The complex type siri:DatedVehicleJourneyStructure

    @@ -113081,11 +111078,7 @@

    14.32. The complex type siri:RemovedDatedVehicleJourneyStructure

    @@ -115120,13 +113113,8 @@

    14.36. The complex type siri:ToServiceJourneyInterchangeStructure -<<<<<<< HEAD -
    -

    14.37. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.6) -======= -
    -

    14.37. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    14.37. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)

    @@ -108878,11 +106927,7 @@

    14.20. The group siri:DatedServiceInfoGroup

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-57.6 -======= - +local-type: typedef-14.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.6

    -<<<<<<< HEAD - +local-type: typedef-57.7 -======= - +local-type: typedef-14.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.7

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-61.1 -======= - +local-type: typedef-10.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-21.1

    -<<<<<<< HEAD - +local-type: typedef-61.2 -======= - +local-type: typedef-10.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-21.2

    @@ -115146,11 +113134,7 @@

    14.37. The complex type group[siri:DatedTrainOperationalInfoGroup]/Tra
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.6) -======= -   (typedef-14.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.6)

    @@ -115192,13 +113176,8 @@

    14.37. The complex type group[siri:DatedTrainOperationalInfoGroup]/Tra

    -<<<<<<< HEAD -
    -

    14.38. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.7) -======= -
    -

    14.38. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    14.38. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)

    @@ -115218,11 +113197,7 @@

    14.38. The complex type group[siri:DatedTrainOperationalInfoGroup]/Jou
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.7) -======= -   (typedef-14.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.7)

    @@ -115264,13 +113239,8 @@

    14.38. The complex type group[siri:DatedTrainOperationalInfoGroup]/Jou

    -<<<<<<< HEAD -
    -

    14.39. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    14.39. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115290,11 +113260,7 @@

    14.39. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115381,13 +113347,8 @@

    14.39. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    14.40. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    14.40. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115407,11 +113368,7 @@

    14.40. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115498,13 +113455,8 @@

    14.40. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    14.41. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    14.41. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115524,11 +113476,7 @@

    14.41. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -115615,13 +113563,8 @@

    14.41. The complex type group[siri:JourneyFormationGroup]/CompoundTrai

    -<<<<<<< HEAD -
    -

    14.42. The complex type complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-61.1) -======= -
    -

    14.42. The complex type complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-10.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    14.42. The complex type complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)

    @@ -115641,11 +113584,7 @@

    14.42. The complex type complexType[siri:DatedVehicleJourneyStructure]
      /DatedCalls #complexType
    -<<<<<<< HEAD -   (typedef-61.1) -======= -   (typedef-10.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-21.1)

    @@ -115688,13 +113627,8 @@

    14.42. The complex type complexType[siri:DatedVehicleJourneyStructure]

    -<<<<<<< HEAD -
    -

    14.43. The complex type complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-61.2) -======= -
    -

    14.43. The complex type complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-10.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    14.43. The complex type complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)

    @@ -115714,11 +113648,7 @@

    14.43. The complex type complexType[siri:RemovedDatedVehicleJourneyStr
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-61.2) -======= -   (typedef-10.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-21.2)

    @@ -116216,7 +114146,7 @@

    15.9. The group siri:EstimatedTimetableAlterationGroup

    @@ -119678,7 +117608,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -119735,7 +117665,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120061,11 +117991,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120086,11 +118012,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120111,11 +118033,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120200,11 +118118,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120225,11 +118139,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -120893,11 +118803,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121201,11 +119107,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121226,11 +119128,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121254,11 +119152,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121279,11 +119173,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121304,11 +119194,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121332,11 +119218,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -121360,11 +119242,7 @@

    15.13. The complex type siri:EstimatedVehicleJourneyStructure

    @@ -122746,13 +120624,8 @@

    15.15. The complex type siri:WillWaitStructure

    @@ -116159,7 +114089,7 @@

    15.9. The group siri:EstimatedTimetableAlterationGroup

    		-

    Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable. DEPRECATED from SIRI 2.0

    +

    Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable.
    -

    If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'. DEPRECATED from SIRI 2.0

    +

    If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'.
    -

    Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable. DEPRECATED from SIRI 2.0

    +

    Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable.
    -

    If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'. DEPRECATED from SIRI 2.0

    +

    If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'.

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)

    -=======

    Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-57.4 -======= - +local-type: typedef-14.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.4

    -<<<<<<< HEAD - +local-type: typedef-57.5 -======= - +local-type: typedef-14.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.5

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-66.1 -======= - +local-type: typedef-30.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-36.1

    -<<<<<<< HEAD - +local-type: typedef-66.2 -======= - +local-type: typedef-30.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-36.2

    -<<<<<<< HEAD -
    -

    15.16. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4) -======= -
    -

    15.16. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    15.16. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)

    @@ -122772,11 +120645,7 @@

    15.16. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.4) -======= -   (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.4)

    @@ -122818,13 +120687,8 @@

    15.16. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum

    -<<<<<<< HEAD -
    -

    15.17. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5) -======= -
    -

    15.17. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    15.17. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)

    @@ -122844,11 +120708,7 @@

    15.17. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.5) -======= -   (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.5)

    @@ -122890,13 +120750,8 @@

    15.17. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    15.18. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    15.18. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -122916,11 +120771,7 @@

    15.18. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -123007,13 +120858,8 @@

    15.18. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    15.19. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    15.19. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -123033,11 +120879,7 @@

    15.19. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -123124,13 +120966,8 @@

    15.19. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    15.20. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    15.20. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -123150,11 +120987,7 @@

    15.20. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -123241,13 +121074,8 @@

    15.20. The complex type group[siri:JourneyFormationGroup]/CompoundTrai

    -<<<<<<< HEAD -
    -

    15.21. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-66.1) -======= -
    -

    15.21. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-30.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    15.21. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)

    @@ -123267,11 +121095,7 @@

    15.21. The complex type complexType[siri:EstimatedVehicleJourneyStruct
      /RecordedCalls #complexType
    -<<<<<<< HEAD -   (typedef-66.1) -======= -   (typedef-30.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-36.1)

    @@ -123314,13 +121138,8 @@

    15.21. The complex type complexType[siri:EstimatedVehicleJourneyStruct

    -<<<<<<< HEAD -
    -

    15.22. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-66.2) -======= -
    -

    15.22. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-30.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    15.22. The complex type complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)

    @@ -123340,11 +121159,7 @@

    15.22. The complex type complexType[siri:EstimatedVehicleJourneyStruct
      /EstimatedCalls #complexType
    -<<<<<<< HEAD -   (typedef-66.2) -======= -   (typedef-30.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-36.2)

    -<<<<<<< HEAD -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    @@ -124110,11 +121925,7 @@

    16.1. Simple type definitions

    -<<<<<<< HEAD -

    tactilePatformEdges

    -=======

    tactilePlatformEdges

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -

    @@ -124168,8 +121979,6 @@

    16.1. Simple type definitions

    -

    tactilePatformEdges

    @@ -124178,7 +121987,6 @@

    16.1. Simple type definitions

    deprecated (SIRI 2.1) - use 'tactilePlatformEdges' instead
    @@ -127975,7 +125783,7 @@

    17.1. Simple type definitions

    -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a Faclility.

    @@ -128513,11 +126321,7 @@

    17.15. The group siri:FacilityAccessibilityGroup

    -<<<<<<< HEAD - +local-type: typedef-59.2 -======= - +local-type: typedef-9.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.2

    @@ -128538,11 +126342,7 @@

    17.15. The group siri:FacilityAccessibilityGroup

    -<<<<<<< HEAD - +local-type: typedef-59.3 -======= - +local-type: typedef-9.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.3

    @@ -129239,11 +127039,7 @@

    17.19. The complex type siri:EquipmentAvailabilityStructure

    -<<<<<<< HEAD - +local-type: typedef-59.6 -======= - +local-type: typedef-9.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.6

    @@ -129527,11 +127323,7 @@

    17.21. The complex type siri:FacilityConditionStructure

    -<<<<<<< HEAD - +local-type: typedef-59.5 -======= - +local-type: typedef-9.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.5

    @@ -130065,8 +127857,6 @@

    17.22. The complex type siri:FacilityLocationStructure -<<<<<<< HEAD -======= @@ -130091,7 +127881,6 @@

    17.22. The complex type siri:FacilityLocationStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:BasicServiceInfoGroup @@ -130469,11 +128258,7 @@

    17.25. The complex type siri:FacilityStructure

    -<<<<<<< HEAD - +local-type: typedef-59.1 -======= - +local-type: typedef-9.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.1

    @@ -130593,11 +128378,7 @@

    17.25. The complex type siri:FacilityStructure

    -<<<<<<< HEAD - +local-type: typedef-59.2 -======= - +local-type: typedef-9.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.2

    @@ -130618,11 +128399,7 @@

    17.25. The complex type siri:FacilityStructure

    -<<<<<<< HEAD - +local-type: typedef-59.3 -======= - +local-type: typedef-9.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.3

    @@ -131033,11 +128810,7 @@

    17.27. The complex type siri:MonitoredCountingStructure

    -<<<<<<< HEAD - +local-type: typedef-59.4 -======= - +local-type: typedef-9.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.4

    @@ -131544,13 +129317,8 @@

    17.31. The complex type siri:TypeOfVehicleFuelStructure

    -<<<<<<< HEAD -
    -

    17.32. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-59.2) -======= -
    -

    17.32. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-9.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.32. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)

    @@ -131570,11 +129338,7 @@

    17.32. The complex type group[siri:FacilityAccessibilityGroup]/Limitat
      /Limitations #complexType
    -<<<<<<< HEAD -   (typedef-59.2) -======= -   (typedef-9.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.2)

    @@ -131730,13 +129494,8 @@

    17.32. The complex type group[siri:FacilityAccessibilityGroup]/Limitat

    -<<<<<<< HEAD -
    -

    17.33. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-59.3) -======= -
    -

    17.33. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-9.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.33. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)

    @@ -131756,11 +129515,7 @@

    17.33. The complex type group[siri:FacilityAccessibilityGroup]/Suitabi
      /Suitabilities #complexType
    -<<<<<<< HEAD -   (typedef-59.3) -======= -   (typedef-9.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.3)

    @@ -131802,13 +129557,8 @@

    17.33. The complex type group[siri:FacilityAccessibilityGroup]/Suitabi

    -<<<<<<< HEAD -
    -

    17.34. The complex type complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-59.6) -======= -
    -

    17.34. The complex type complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-9.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.34. The complex type complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)

    @@ -131828,11 +129578,7 @@

    17.34. The complex type complexType[siri:EquipmentAvailabilityStructur
      /EquipmentFeatures #complexType
    -<<<<<<< HEAD -   (typedef-59.6) -======= -   (typedef-9.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.6)

    @@ -131874,13 +129620,8 @@

    17.34. The complex type complexType[siri:EquipmentAvailabilityStructur

    -<<<<<<< HEAD -
    -

    17.35. The complex type complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-59.5) -======= -
    -

    17.35. The complex type complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-9.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.35. The complex type complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)

    @@ -131900,11 +129641,7 @@

    17.35. The complex type complexType[siri:FacilityConditionStructure]/M
      /MonitoredCounting #complexType
    -<<<<<<< HEAD -   (typedef-59.5) -======= -   (typedef-9.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.5)

    @@ -132201,13 +129934,8 @@

    17.35. The complex type complexType[siri:FacilityConditionStructure]/M

    @@ -132160,11 +129897,7 @@

    17.35. The complex type complexType[siri:FacilityConditionStructure]/M

    -<<<<<<< HEAD - +local-type: typedef-59.4 -======= - +local-type: typedef-9.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-22.4

    -<<<<<<< HEAD -
    -

    17.36. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-59.4) -======= -
    -

    17.36. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-9.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.36. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)

    @@ -132227,11 +129955,7 @@

    17.36. The complex type complexType[siri:MonitoredCountingStructure]/C
      /CountedItemsIdList #complexType
    -<<<<<<< HEAD -   (typedef-59.4) -======= -   (typedef-9.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.4)

    @@ -132274,13 +129998,8 @@

    17.36. The complex type complexType[siri:MonitoredCountingStructure]/C

    -<<<<<<< HEAD -
    -

    17.37. The complex type complexType[siri:FacilityStructure]/Features#complexType (typedef-59.1) -======= -
    -

    17.37. The complex type complexType[siri:FacilityStructure]/Features#complexType (typedef-9.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.37. The complex type complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)

    @@ -132300,11 +130019,7 @@

    17.37. The complex type complexType[siri:FacilityStructure]/Features#c
      /Features #complexType
    -<<<<<<< HEAD -   (typedef-59.1) -======= -   (typedef-9.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.1)

    @@ -132346,13 +130061,8 @@

    17.37. The complex type complexType[siri:FacilityStructure]/Features#c

    -<<<<<<< HEAD -
    -

    17.38. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-59.2) -======= -
    -

    17.38. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-9.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.38. The complex type group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)

    @@ -132372,11 +130082,7 @@

    17.38. The complex type group[siri:FacilityAccessibilityGroup]/Limitat
      /Limitations #complexType
    -<<<<<<< HEAD -   (typedef-59.2) -======= -   (typedef-9.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.2)

    @@ -132532,13 +130238,8 @@

    17.38. The complex type group[siri:FacilityAccessibilityGroup]/Limitat

    -<<<<<<< HEAD -
    -

    17.39. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-59.3) -======= -
    -

    17.39. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-9.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.39. The complex type group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)

    @@ -132558,11 +130259,7 @@

    17.39. The complex type group[siri:FacilityAccessibilityGroup]/Suitabi
      /Suitabilities #complexType
    -<<<<<<< HEAD -   (typedef-59.3) -======= -   (typedef-9.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.3)

    @@ -132604,13 +130301,8 @@

    17.39. The complex type group[siri:FacilityAccessibilityGroup]/Suitabi

    -<<<<<<< HEAD -
    -

    17.40. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-59.4) -======= -
    -

    17.40. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-9.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    17.40. The complex type complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)

    @@ -132630,11 +130322,7 @@

    17.40. The complex type complexType[siri:MonitoredCountingStructure]/C
      /CountedItemsIdList #complexType
    -<<<<<<< HEAD -   (typedef-59.4) -======= -   (typedef-9.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-22.4)

    @@ -133442,11 +131126,7 @@

    19.1. The complex type siri:InterchangeJourneyStructure

    @@ -133467,11 +131147,7 @@

    19.1. The complex type siri:InterchangeJourneyStructure

    @@ -133556,11 +131232,7 @@

    19.1. The complex type siri:InterchangeJourneyStructure

    @@ -133581,11 +131253,7 @@

    19.1. The complex type siri:InterchangeJourneyStructure

    @@ -134122,20 +131790,12 @@

    20.1. Simple type definitions

     @@ -137497,11 +135153,7 @@

    20.63. The group siri:JourneyEndNamesGroup

    @@ -137522,11 +135174,7 @@

    20.63. The group siri:JourneyEndNamesGroup

    @@ -137611,11 +135259,7 @@

    20.63. The group siri:JourneyEndNamesGroup

    @@ -137636,11 +135280,7 @@

    20.63. The group siri:JourneyEndNamesGroup

    @@ -137812,11 +135452,7 @@

    20.65. The group siri:JourneyFormationGroup

    @@ -137837,11 +135473,7 @@

    20.65. The group siri:JourneyFormationGroup

    @@ -137862,11 +135494,7 @@

    20.65. The group siri:JourneyFormationGroup

    @@ -138084,11 +135712,7 @@

    20.67. The group siri:JourneyRelationInfoGroup

    @@ -141666,11 +139290,7 @@

    20.83. The group siri:TrainGroup

    @@ -141859,11 +139479,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -141884,11 +139500,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -141909,11 +139521,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -141998,11 +139606,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -142023,11 +139627,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -142071,11 +139671,7 @@

    20.84. The group siri:TrainInCompoundTrainGroup

    @@ -142683,11 +140279,7 @@

    20.89. The group siri:VehicleJourneyInfoGroup

    @@ -142708,11 +140300,7 @@

    20.89. The group siri:VehicleJourneyInfoGroup

    @@ -142733,11 +140321,7 @@

    20.89. The group siri:VehicleJourneyInfoGroup

    @@ -142822,11 +140406,7 @@

    20.89. The group siri:VehicleJourneyInfoGroup

    @@ -142847,11 +140427,7 @@

    20.89. The group siri:VehicleJourneyInfoGroup

    @@ -143248,11 +140824,7 @@

    20.90. The group siri:VehicleTypeGroup

    @@ -143430,11 +141002,7 @@

    20.90. The group siri:VehicleTypeGroup

    @@ -143571,11 +141139,7 @@

    20.91. The group siri:VehicleTypePropertiesGroup

    @@ -144225,11 +141789,7 @@

    20.94. The complex type siri:CompoundTrainStructure

    @@ -144407,11 +141967,7 @@

    20.94. The complex type siri:CompoundTrainStructure

    @@ -144435,11 +141991,7 @@

    20.94. The complex type siri:CompoundTrainStructure

    @@ -145600,11 +143152,7 @@

    20.102. The complex type siri:JourneyRelationStructure

    @@ -148623,11 +146171,7 @@

    20.113. The complex type siri:RelatedJourneyStructure

    @@ -148639,8 +146183,208 @@

    20.113. The complex type siri:RelatedJourneyStructure

    @@ -133417,11 +131105,7 @@

    19.1. The complex type siri:InterchangeJourneyStructure

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    attribute[lang]
      #simpleType
    -<<<<<<< HEAD -   (typedef-24.1) -======= -   (typedef-1.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-71.1)

    		@@ -137472,11 +135132,7 @@

    20.63. The group siri:JourneyEndNamesGroup

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.1 -======= +local-type: typedef-18.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.5 -======= +local-type: typedef-18.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.7 -======= +local-type: typedef-18.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.9 -======= +local-type: typedef-18.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.8 -======= +local-type: typedef-18.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.9 -======= +local-type: typedef-18.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.9 -======= +local-type: typedef-18.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.8 -======= +local-type: typedef-18.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.6 -======= +local-type: typedef-18.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.1 -======= +local-type: typedef-18.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.1 -======= +local-type: typedef-18.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    +
    +

    20.114. The complex type siri:ServiceLinkViewsStructure +

    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    +

    + siri:ServiceLinkViewsStructure +

    +     		+

    +

    		+

    Provides information about updated SERVICE LINKs

    +
    + + +

    + + siri:ServiceLinkView + +

    +     		+

    + + 1:* + +

    +     		+

    + +siri:ServiceLinkViewStructure + +

    +     		+

    +

    +
    +
    +
    +

    20.115. The complex type siri:ServiceLinkViewStructure +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    + siri:ServiceLinkViewStructure +

    +     		+

    +

    		+

    Simplified description of an update of a SERVICE LINK, in order to provide an updated schematic shape (not ROUTE POINTs) in case of rerouting. Only updated ServiceLink are expected to be provided here, the scheduled one being provided by a NeTEx feed. The SERVICE JOURNEY itself is knonw from hte context

    +
    + + +

    + + siri:FromStopPointRef + +

    +     		+

    + + 1:1 + +

    +     		+

    + >siri:StopPointRefStructure + +

    +     		+

    Reference to the SCHEDULED STOP POINT at which the related SERVICE LINK begins.

    +
    + + +

    + + siri:ToStopPointRef + +

    +     		+

    + + 1:1 + +

    +     		+

    + >siri:StopPointRefStructure + +

    +     		+

    Reference to the SCHEDULED STOP POINT at which the related SERVICE LINK ends.

    +
    + + +

    + siri:Distance +

    +     		+

    + 0:1 +

    +     		+

    + + siri:LengthType + +

    +     		+

    Length of LINK.

    +
    + + +

    + + →‍gml:LineString + + +

    +     		+

    + + 1:1 + +

    +     		+

    + +gml:LineStringType + +

    +     		+

    A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.

    +
    +
    +
    -

    20.114. The complex type siri:SimpleContactStructure +

    20.116. The complex type siri:SimpleContactStructure

    @@ -148719,7 +146463,7 @@

    20.114. The complex type siri:SimpleContactStructure
    -

    20.115. The complex type siri:StopAssignmentStructure +

    20.117. The complex type siri:StopAssignmentStructure

    @@ -149296,7 +147040,7 @@

    20.115. The complex type siri:StopAssignmentStructure
    -

    20.116. The complex type siri:TrainComponentStructure +

    20.118. The complex type siri:TrainComponentStructure

    @@ -149511,7 +147255,7 @@

    20.116. The complex type siri:TrainComponentStructure
    -

    20.117. The complex type siri:TrainElementStructure +

    20.119. The complex type siri:TrainElementStructure

    @@ -149818,11 +147562,7 @@

    20.117. The complex type siri:TrainElementStructure

    @@ -150000,11 +147740,7 @@

    20.117. The complex type siri:TrainElementStructure

    @@ -150017,7 +147753,7 @@

    20.117. The complex type siri:TrainElementStructure
    -

    20.118. The complex type siri:TrainInCompoundTrainStructure +

    20.120. The complex type siri:TrainInCompoundTrainStructure

    -<<<<<<< HEAD - +local-type: typedef-50.9 -======= +local-type: typedef-18.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.8 -======= +local-type: typedef-18.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -150245,11 +147981,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150270,11 +148002,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150295,11 +148023,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150384,11 +148108,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150409,11 +148129,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150457,11 +148173,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure

    @@ -150474,7 +148186,7 @@

    20.118. The complex type siri:TrainInCompoundTrainStructure
    -

    20.119. The complex type siri:TrainStructure +

    20.121. The complex type siri:TrainStructure

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.7 -======= +local-type: typedef-18.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -150709,11 +148421,7 @@

    20.119. The complex type siri:TrainStructure

    @@ -150891,11 +148599,7 @@

    20.119. The complex type siri:TrainStructure

    @@ -150961,11 +148665,7 @@

    20.119. The complex type siri:TrainStructure

    @@ -150978,7 +148678,7 @@

    20.119. The complex type siri:TrainStructure
    -

    20.120. The complex type siri:VehicleInFormationStatusStructure +

    20.122. The complex type siri:VehicleInFormationStatusStructure

    -<<<<<<< HEAD - +local-type: typedef-50.9 -======= +local-type: typedef-18.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.8 -======= +local-type: typedef-18.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.5 -======= +local-type: typedef-18.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -151105,7 +148805,7 @@

    20.120. The complex type siri:VehicleInFormationStatusStructure
    -

    20.121. The complex type siri:VehicleOccupancyStructure +

    20.123. The complex type siri:VehicleOccupancyStructure

    @@ -151615,7 +149315,7 @@

    20.121. The complex type siri:VehicleOccupancyStructure
    -

    20.122. The complex type siri:VehicleOrientationRelativeToQuay +

    20.124. The complex type siri:VehicleOrientationRelativeToQuay

    @@ -151682,7 +149382,7 @@

    20.122. The complex type siri:VehicleOrientationRelativeToQuay
    -

    20.123. The complex type siri:ViaNameStructure +

    20.125. The complex type siri:ViaNameStructure

    @@ -151819,13 +149519,8 @@

    20.123. The complex type siri:ViaNameStructure

    -<<<<<<< HEAD -
    -

    20.124. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======
    -

    20.124. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.126. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)

    @@ -151845,11 +149540,7 @@

    20.124. The complex type group[siri:JourneyFormationGroup]/TrainElemen
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -151936,13 +149627,8 @@

    20.124. The complex type group[siri:JourneyFormationGroup]/TrainElemen

    -<<<<<<< HEAD -
    -

    20.125. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======
    -

    20.125. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.127. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)

    @@ -151962,11 +149648,7 @@

    20.125. The complex type group[siri:JourneyFormationGroup]/Trains#comp
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152053,13 +149735,8 @@

    20.125. The complex type group[siri:JourneyFormationGroup]/Trains#comp

    -<<<<<<< HEAD -
    -

    20.126. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======
    -

    20.126. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.128. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)

    @@ -152079,11 +149756,7 @@

    20.126. The complex type group[siri:JourneyFormationGroup]/CompoundTra
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152170,13 +149843,8 @@

    20.126. The complex type group[siri:JourneyFormationGroup]/CompoundTra

    -<<<<<<< HEAD -
    -

    20.127. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1) -=======
    -

    20.127. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.129. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)

    @@ -152196,11 +149864,7 @@

    20.127. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-50.1) -=======   (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152242,13 +149906,8 @@

    20.127. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    20.128. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-50.5) -=======
    -

    20.128. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.130. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)

    @@ -152268,11 +149927,7 @@

    20.128. The complex type group[siri:TrainGroup]/TrainComponents#comple
      /TrainComponents #complexType
    -<<<<<<< HEAD -   (typedef-50.5) -=======   (typedef-18.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152359,13 +150014,8 @@

    20.128. The complex type group[siri:TrainGroup]/TrainComponents#comple

    -<<<<<<< HEAD -
    -

    20.129. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-50.7) -=======
    -

    20.129. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.131. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)

    @@ -152385,11 +150035,7 @@

    20.129. The complex type group[siri:TrainInCompoundTrainGroup]/Passage
      /Passages #complexType
    -<<<<<<< HEAD -   (typedef-50.7) -=======   (typedef-18.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152431,13 +150077,8 @@

    20.129. The complex type group[siri:TrainInCompoundTrainGroup]/Passage

    -<<<<<<< HEAD -
    -

    20.130. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9) -=======
    -

    20.130. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.132. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)

    @@ -152457,11 +150098,7 @@

    20.130. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu
      /MaximumPassengerCapacities #complexType
    -<<<<<<< HEAD -   (typedef-50.9) -=======   (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152503,13 +150140,8 @@

    20.130. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu

    -<<<<<<< HEAD -
    -

    20.131. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8) -=======
    -

    20.131. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.133. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)

    @@ -152529,11 +150161,7 @@

    20.131. The complex type group[siri:VehicleTypeGroup]/Facilities#compl
      /Facilities #complexType
    -<<<<<<< HEAD -   (typedef-50.8) -=======   (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152653,13 +150281,8 @@

    20.131. The complex type group[siri:VehicleTypeGroup]/Facilities#compl

    -<<<<<<< HEAD -
    -

    20.132. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9) -=======
    -

    20.132. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.134. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)

    @@ -152679,11 +150302,7 @@

    20.132. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu
      /MaximumPassengerCapacities #complexType
    -<<<<<<< HEAD -   (typedef-50.9) -=======   (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152725,13 +150344,8 @@

    20.132. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu

    -<<<<<<< HEAD -
    -

    20.133. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9) -=======
    -

    20.133. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.135. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)

    @@ -152751,11 +150365,7 @@

    20.133. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu
      /MaximumPassengerCapacities #complexType
    -<<<<<<< HEAD -   (typedef-50.9) -=======   (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152797,13 +150407,8 @@

    20.133. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu

    -<<<<<<< HEAD -
    -

    20.134. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8) -=======
    -

    20.134. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.136. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)

    @@ -152823,11 +150428,7 @@

    20.134. The complex type group[siri:VehicleTypeGroup]/Facilities#compl
      /Facilities #complexType
    -<<<<<<< HEAD -   (typedef-50.8) -=======   (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -152947,13 +150548,8 @@

    20.134. The complex type group[siri:VehicleTypeGroup]/Facilities#compl

    -<<<<<<< HEAD -
    -

    20.135. The complex type complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-50.6) -=======
    -

    20.135. The complex type complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.137. The complex type complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)

    @@ -152973,11 +150569,7 @@

    20.135. The complex type complexType[siri:CompoundTrainStructure]/Trai
      /TrainsInCompoundTrain #complexType
    -<<<<<<< HEAD -   (typedef-50.6) -=======   (typedef-18.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153064,13 +150656,8 @@

    20.135. The complex type complexType[siri:CompoundTrainStructure]/Trai

    -<<<<<<< HEAD -
    -

    20.136. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1) -=======
    -

    20.136. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.138. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)

    @@ -153090,11 +150677,7 @@

    20.136. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-50.1) -=======   (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153136,13 +150719,8 @@

    20.136. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    20.137. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1) -=======
    -

    20.137. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.139. The complex type group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)

    @@ -153162,11 +150740,7 @@

    20.137. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-50.1) -=======   (typedef-18.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153208,13 +150782,8 @@

    20.137. The complex type group[siri:JourneyRelationInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    20.138. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9) -=======
    -

    20.138. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.140. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)

    @@ -153234,11 +150803,7 @@

    20.138. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu
      /MaximumPassengerCapacities #complexType
    -<<<<<<< HEAD -   (typedef-50.9) -=======   (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153280,13 +150845,8 @@

    20.138. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu

    -<<<<<<< HEAD -
    -

    20.139. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8) -=======
    -

    20.139. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.141. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)

    @@ -153306,11 +150866,7 @@

    20.139. The complex type group[siri:VehicleTypeGroup]/Facilities#compl
      /Facilities #complexType
    -<<<<<<< HEAD -   (typedef-50.8) -=======   (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153430,13 +150986,8 @@

    20.139. The complex type group[siri:VehicleTypeGroup]/Facilities#compl

    -<<<<<<< HEAD -
    -

    20.140. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-50.7) -=======
    -

    20.140. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.142. The complex type group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)

    @@ -153456,11 +151007,7 @@

    20.140. The complex type group[siri:TrainInCompoundTrainGroup]/Passage
      /Passages #complexType
    -<<<<<<< HEAD -   (typedef-50.7) -=======   (typedef-18.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153502,13 +151049,8 @@

    20.140. The complex type group[siri:TrainInCompoundTrainGroup]/Passage

    -<<<<<<< HEAD -
    -

    20.141. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9) -=======
    -

    20.141. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.143. The complex type group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)

    @@ -153528,11 +151070,7 @@

    20.141. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu
      /MaximumPassengerCapacities #complexType
    -<<<<<<< HEAD -   (typedef-50.9) -=======   (typedef-18.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153574,13 +151112,8 @@

    20.141. The complex type group[siri:VehicleTypePropertiesGroup]/Maximu

    -<<<<<<< HEAD -
    -

    20.142. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8) -=======
    -

    20.142. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.144. The complex type group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)

    @@ -153600,11 +151133,7 @@

    20.142. The complex type group[siri:VehicleTypeGroup]/Facilities#compl
      /Facilities #complexType
    -<<<<<<< HEAD -   (typedef-50.8) -=======   (typedef-18.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -153724,13 +151253,8 @@

    20.142. The complex type group[siri:VehicleTypeGroup]/Facilities#compl

    -<<<<<<< HEAD -
    -

    20.143. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-50.5) -=======
    -

    20.143. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    20.145. The complex type group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)

    @@ -153750,11 +151274,7 @@

    20.143. The complex type group[siri:TrainGroup]/TrainComponents#comple
      /TrainComponents #complexType
    -<<<<<<< HEAD -   (typedef-50.5) -=======   (typedef-18.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    + + + +
    @@ -153898,6 +151418,14 @@

    21.1. Simple type definitions

    -
    +

    journeyRelationRestricted

    +     		+

    Restricts alighting so that it is only permitted when the passenger is interchanging to a journey explicitly referenced in a JourneyRelation.

    +
    @@ -153969,6 +151497,14 @@

    21.1. Simple type definitions

    -

    + + +

    journeyRelationRestricted

    + + +

    Restricts boarding or alighting so that it is only permitted when the passenger is interchanging from/to a journey explicitly referenced in a JourneyRelation.

    + + @@ -154123,7 +151659,7 @@

    21.1. Simple type definitions

    -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a Dated VEHICLE JOURNEY.

    @@ -154173,6 +151709,14 @@

    21.1. Simple type definitions

    -

    + + +

    journeyRelationRestricted

    + + +

    Restricts boarding so that it is only permitted when the passenger is interchanging from a journey explicitly referenced in a JourneyRelation.

    + + @@ -154201,7 +151745,7 @@

    21.1. Simple type definitions

    -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a Realtime VEHICLE JOURNEY. Used for adhoc journeys.

    @@ -154248,8 +151792,6 @@

    21.1. Simple type definitions

    secondClass

    -<<<<<<< HEAD -=======

    pti23_7. -v.2.1

    @@ -154258,7 +151800,6 @@

    21.1. Simple type definitions

    secondClass

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    pti23_7

    @@ -154371,8 +151912,6 @@

    21.1. Simple type definitions

    secondClass

    -<<<<<<< HEAD -=======

    pti23_7. -v.2.1

    @@ -154381,7 +151920,6 @@

    21.1. Simple type definitions

    secondClass

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    pti23_7

    @@ -155438,7 +152976,7 @@

    21.1. Simple type definitions

    -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a VEHICLE JOURNEY.

    @@ -157261,11 +154799,7 @@

    21.64. The complex type siri:FramedVehicleJourneyRefStructure

    -<<<<<<< HEAD -

    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.

    -=======

    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.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 @@ -158897,11 +156431,7 @@

    22.25. The complex type siri:ConnectionServicePermissionStructure

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    @@ -158935,11 +156465,7 @@

    22.25. The complex type siri:ConnectionServicePermissionStructure

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    @@ -158968,11 +156494,7 @@

    22.25. The complex type siri:ConnectionServicePermissionStructure

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    @@ -159001,11 +156523,7 @@

    22.25. The complex type siri:ConnectionServicePermissionStructure

    -<<<<<<< HEAD - +local-type: typedef-56.3 -======= - +local-type: typedef-8.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.3

    @@ -159557,13 +157075,8 @@

    22.30. The complex type siri:StopMonitorPermissionStructure

    -<<<<<<< HEAD -
    -

    22.31. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-56.3) -======= -
    -

    22.31. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-8.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.31. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)

    @@ -159583,11 +157096,7 @@

    22.31. The complex type element[siri:ConnectionLinkPermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-56.3) -======= -   (typedef-8.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.3)

    @@ -159672,13 +157181,8 @@

    22.31. The complex type element[siri:ConnectionLinkPermissions]#comple

    -<<<<<<< HEAD -
    -

    22.32. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    22.32. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.32. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -159698,11 +157202,7 @@

    22.32. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -159787,13 +157287,8 @@

    22.32. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    22.33. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    22.33. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.33. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -159813,11 +157308,7 @@

    22.33. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -159902,13 +157393,8 @@

    22.33. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    22.34. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    22.34. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.34. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -159928,11 +157414,7 @@

    22.34. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -160000,13 +157482,8 @@

    22.34. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    22.35. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    22.35. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.35. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -160026,11 +157503,7 @@

    22.35. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -160115,13 +157588,8 @@

    22.35. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    22.36. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    22.36. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.36. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -160141,11 +157609,7 @@

    22.36. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -160230,13 +157694,8 @@

    22.36. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    22.37. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-56.3) -======= -
    -

    22.37. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-8.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    22.37. The complex type element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)

    @@ -160256,11 +157715,7 @@

    22.37. The complex type element[siri:ConnectionLinkPermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-56.3) -======= -   (typedef-8.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.3)

    @@ -166498,11 +163949,7 @@

    24.3. The group siri:DatedTrainOperationalInfoGroup

    @@ -166526,11 +163973,7 @@

    24.3. The group siri:DatedTrainOperationalInfoGroup

    @@ -166551,11 +163994,7 @@

    24.3. The group siri:DatedTrainOperationalInfoGroup

    @@ -166576,11 +164015,7 @@

    24.3. The group siri:DatedTrainOperationalInfoGroup

    @@ -167022,11 +164457,7 @@

    24.5. The group siri:JourneyProgressGroup

    @@ -168989,11 +166420,7 @@

    24.10. The group siri:ProgressDataGroup

    @@ -169311,11 +166738,7 @@

    24.12. The group siri:ServicePointsGroup

    @@ -169336,11 +166759,7 @@

    24.12. The group siri:ServicePointsGroup

    @@ -169361,11 +166780,7 @@

    24.12. The group siri:ServicePointsGroup

    @@ -170470,11 +167885,7 @@

    24.15. The group siri:TrainOperationalInfoGroup

    @@ -170495,11 +167906,7 @@

    24.15. The group siri:TrainOperationalInfoGroup

    @@ -170523,11 +167930,7 @@

    24.15. The group siri:TrainOperationalInfoGroup

    @@ -170548,11 +167951,7 @@

    24.15. The group siri:TrainOperationalInfoGroup

    @@ -170573,11 +167972,7 @@

    24.15. The group siri:TrainOperationalInfoGroup

    @@ -172895,11 +170290,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -172920,11 +170311,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -172945,11 +170332,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173034,11 +170417,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173059,11 +170438,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173636,11 +171011,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173944,11 +171315,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173969,11 +171336,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -173997,11 +171360,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -174022,11 +171381,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -174047,11 +171402,7 @@

    24.19. The complex type siri:MonitoredVehicleJourneyStructure

    @@ -174713,13 +172064,8 @@

    24.22. The complex type siri:TrainBlockPartStructure

    @@ -166473,11 +163928,7 @@

    24.3. The group siri:DatedTrainOperationalInfoGroup

    -<<<<<<< HEAD - +local-type: typedef-57.6 -======= - +local-type: typedef-14.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.6

    -<<<<<<< HEAD - +local-type: typedef-57.7 -======= - +local-type: typedef-14.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.7

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)

    -=======

    Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)

    -=======

    Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-57.1 -======= - +local-type: typedef-14.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.1

    -<<<<<<< HEAD - +local-type: typedef-57.2 -======= - +local-type: typedef-14.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.2

    -<<<<<<< HEAD - +local-type: typedef-57.3 -======= - +local-type: typedef-14.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.3

    -<<<<<<< HEAD - +local-type: typedef-57.4 -======= - +local-type: typedef-14.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.4

    -<<<<<<< HEAD - +local-type: typedef-57.5 -======= - +local-type: typedef-14.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.5

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)

    -=======

    Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-57.4 -======= - +local-type: typedef-14.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.4

    -<<<<<<< HEAD - +local-type: typedef-57.5 -======= - +local-type: typedef-14.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.5

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    24.23. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.6) -======= -
    -

    24.23. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.23. The complex type group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)

    @@ -174739,11 +172085,7 @@

    24.23. The complex type group[siri:DatedTrainOperationalInfoGroup]/Tra
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.6) -======= -   (typedef-14.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.6)

    @@ -174785,13 +172127,8 @@

    24.23. The complex type group[siri:DatedTrainOperationalInfoGroup]/Tra

    -<<<<<<< HEAD -
    -

    24.24. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.7) -======= -
    -

    24.24. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.24. The complex type group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)

    @@ -174811,11 +172148,7 @@

    24.24. The complex type group[siri:DatedTrainOperationalInfoGroup]/Jou
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.7) -======= -   (typedef-14.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.7)

    @@ -174857,13 +172190,8 @@

    24.24. The complex type group[siri:DatedTrainOperationalInfoGroup]/Jou

    -<<<<<<< HEAD -
    -

    24.25. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    24.25. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -174883,11 +172211,7 @@

    24.25. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -174974,13 +172298,8 @@

    24.25. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    24.26. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    24.26. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175000,11 +172319,7 @@

    24.26. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175091,13 +172406,8 @@

    24.26. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    24.27. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    24.27. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175117,11 +172427,7 @@

    24.27. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175208,13 +172514,8 @@

    24.27. The complex type group[siri:JourneyFormationGroup]/CompoundTrai

    -<<<<<<< HEAD -
    -

    24.28. The complex type group[siri:ServicePointsGroup]/Origin#complexType (typedef-57.1) -======= -
    -

    24.28. The complex type group[siri:ServicePointsGroup]/Origin#complexType (typedef-14.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.28. The complex type group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)

    @@ -175234,11 +172535,7 @@

    24.28. The complex type group[siri:ServicePointsGroup]/Origin#complexT
      /Origin #complexType
    -<<<<<<< HEAD -   (typedef-57.1) -======= -   (typedef-14.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.1)

    @@ -175302,13 +172599,8 @@

    24.28. The complex type group[siri:ServicePointsGroup]/Origin#complexT

    -<<<<<<< HEAD -
    -

    24.29. The complex type group[siri:ServicePointsGroup]/Via#complexType (typedef-57.2) -======= -
    -

    24.29. The complex type group[siri:ServicePointsGroup]/Via#complexType (typedef-14.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.29. The complex type group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)

    @@ -175328,11 +172620,7 @@

    24.29. The complex type group[siri:ServicePointsGroup]/Via#complexType
      /Via #complexType
    -<<<<<<< HEAD -   (typedef-57.2) -======= -   (typedef-14.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.2)

    @@ -175419,13 +172707,8 @@

    24.29. The complex type group[siri:ServicePointsGroup]/Via#complexType

    -<<<<<<< HEAD -
    -

    24.30. The complex type group[siri:ServicePointsGroup]/Destination#complexType (typedef-57.3) -======= -
    -

    24.30. The complex type group[siri:ServicePointsGroup]/Destination#complexType (typedef-14.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.30. The complex type group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)

    @@ -175445,11 +172728,7 @@

    24.30. The complex type group[siri:ServicePointsGroup]/Destination#com
      /Destination #complexType
    -<<<<<<< HEAD -   (typedef-57.3) -======= -   (typedef-14.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.3)

    @@ -175513,13 +172792,8 @@

    24.30. The complex type group[siri:ServicePointsGroup]/Destination#com

    -<<<<<<< HEAD -
    -

    24.31. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4) -======= -
    -

    24.31. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.31. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)

    @@ -175539,11 +172813,7 @@

    24.31. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.4) -======= -   (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.4)

    @@ -175585,13 +172855,8 @@

    24.31. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum

    -<<<<<<< HEAD -
    -

    24.32. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5) -======= -
    -

    24.32. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.32. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)

    @@ -175611,11 +172876,7 @@

    24.32. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.5) -======= -   (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.5)

    @@ -175657,13 +172918,8 @@

    24.32. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    24.33. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    24.33. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175683,11 +172939,7 @@

    24.33. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175774,13 +173026,8 @@

    24.33. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    24.34. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    24.34. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175800,11 +173047,7 @@

    24.34. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175891,13 +173134,8 @@

    24.34. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    24.35. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    24.35. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -175917,11 +173155,7 @@

    24.35. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176008,13 +173242,8 @@

    24.35. The complex type group[siri:JourneyFormationGroup]/CompoundTrai

    -<<<<<<< HEAD -
    -

    24.36. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4) -======= -
    -

    24.36. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.36. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)

    @@ -176034,11 +173263,7 @@

    24.36. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.4) -======= -   (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.4)

    @@ -176080,13 +173305,8 @@

    24.36. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum

    -<<<<<<< HEAD -
    -

    24.37. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5) -======= -
    -

    24.37. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    24.37. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)

    @@ -176106,11 +173326,7 @@

    24.37. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.5) -======= -   (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.5)

    @@ -176152,13 +173368,8 @@

    24.37. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    24.38. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    24.38. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176178,11 +173389,7 @@

    24.38. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176269,13 +173476,8 @@

    24.38. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    24.39. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    24.39. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176295,11 +173497,7 @@

    24.39. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176386,13 +173584,8 @@

    24.39. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    24.40. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    24.40. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -176412,11 +173605,7 @@

    24.40. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -180596,11 +177782,7 @@

    27.1. Simple type definitions

    xs:NMTOKEN: (empty restriction)

     @@ -181133,20 +178315,12 @@

    27.1. Simple type definitions

     @@ -181493,11 +178647,7 @@

    27.15. The toplevel element siri:RoadSituationElement

    @@ -182050,11 +179200,7 @@

    27.16. The group siri:ClassifierGroup

    @@ -182102,11 +179248,7 @@

    27.16. The group siri:ClassifierGroup

    @@ -182126,7 +179268,7 @@

    27.16. The group siri:ClassifierGroup

    @@ -182142,11 +179284,7 @@

    27.16. The group siri:ClassifierGroup

    @@ -182311,11 +179449,7 @@

    27.18. The group siri:Datex2ManagementGroup

    @@ -182381,11 +179515,7 @@

    27.18. The group siri:Datex2ManagementGroup

    @@ -182539,11 +179669,7 @@

    27.20. The group siri:Datex2RoadGroup

    @@ -182824,11 +179950,7 @@

    27.22. The group siri:DescriptionGroup

    @@ -182928,11 +180050,7 @@

    27.22. The group siri:DescriptionGroup

    @@ -182953,11 +180071,7 @@

    27.22. The group siri:DescriptionGroup

    @@ -183110,11 +180224,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183229,11 +180339,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183277,20 +180383,12 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183833,11 +180931,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183885,11 +180979,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183909,7 +180999,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183925,11 +181015,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -183978,11 +181064,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -184082,11 +181164,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -184107,11 +181185,7 @@

    27.24. The group siri:PtSituationBodyGroup

    @@ -184797,11 +181871,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -184916,11 +181986,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -184964,20 +182030,12 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185520,11 +182578,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185572,11 +182626,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185596,7 +182646,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185612,11 +182662,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185665,11 +182711,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185769,11 +182811,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -185794,11 +182832,7 @@

    27.27. The group siri:RoadSituationBodyGroup

    @@ -186161,11 +183195,7 @@

    27.30. The group siri:StatusGroup

    @@ -186280,11 +183310,7 @@

    27.30. The group siri:StatusGroup

    @@ -186359,20 +183385,12 @@

    27.31. The group siri:TemporalGroup

    @@ -186698,11 +183716,7 @@

    27.34. The complex type siri:AffectedRoadStructure

    @@ -186726,11 +183740,7 @@

    27.34. The complex type siri:AffectedRoadStructure

    @@ -186875,20 +183885,12 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -186907,11 +183909,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -186935,11 +183933,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -186963,11 +183957,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -186991,11 +183981,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -187019,11 +184005,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -187047,11 +184029,7 @@

    27.35. The complex type siri:AffectsScopeStructure

    @@ -187524,11 +184502,7 @@

    27.40. The complex type siri:EasementsStructure

    @@ -187575,11 +184549,7 @@

    27.40. The complex type siri:EasementsStructure

    @@ -187866,11 +184836,7 @@

    27.43. The complex type siri:OptionalTrafficElementStructure

    @@ -187921,11 +184887,7 @@

    27.43. The complex type siri:OptionalTrafficElementStructure

    @@ -187991,11 +184953,7 @@

    27.43. The complex type siri:OptionalTrafficElementStructure

    @@ -188619,11 +185577,7 @@

    27.46. The complex type siri:PtConsequenceStructure

    @@ -188724,11 +185678,7 @@

    27.46. The complex type siri:PtConsequenceStructure

    @@ -188779,6 +185729,30 @@

    27.46. The complex type siri:PtConsequenceStructure

    Description of fare exceptions allowed because of disruption.

     + + + + + + + @@ -189219,11 +186189,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189267,20 +186233,12 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189823,11 +186781,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189875,11 +186829,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189899,7 +186849,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189915,11 +186865,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -189968,11 +186914,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -190072,11 +187014,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -190097,11 +187035,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    @@ -190823,11 +187757,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -190942,11 +187872,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -190990,20 +187916,12 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191546,11 +188464,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191598,11 +188512,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191622,7 +188532,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191638,11 +188548,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191691,11 +188597,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191795,11 +188697,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -191820,11 +188718,7 @@

    27.50. The complex type siri:RoadSituationElementStructure

    @@ -192485,11 +189379,7 @@

    27.52. The complex type siri:SituationSourceStructure

    @@ -192613,13 +189503,8 @@

    27.52. The complex type siri:SituationSourceStructure

    @@ -176525,7 +173714,7 @@

    25.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of an OPERATOR Code.

    @@ -176540,7 +173729,7 @@

    25.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of an OrganisationCode.

    @@ -176873,7 +174062,7 @@

    26.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a DESTINATION.

    @@ -176978,7 +174167,7 @@

    26.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a LINE

    @@ -177195,7 +174384,7 @@

    26.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Type for identifier of a SCHEDULED STOP POINT.

    @@ -177286,8 +174475,6 @@

    26.1. Simple type definitions

    -<<<<<<< HEAD -=======

    taxi

    		 @@ -177296,7 +174483,6 @@

    26.1. Simple type definitions

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    tram

    		 @@ -179286,11 +176472,11 @@

    26.64. The complex type siri:JourneyPlaceRefStructure

    - xs:NMTOKEN + siri:IdType

    		-

    -

    +

    Id type for document references.
    -<<<<<<< HEAD -

    Type for Publication status.

    -=======

    DEPRECATED - Type for Publication status. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    group[siri:ClassifierGroup]
      /ScopeType #simpleType
    -<<<<<<< HEAD -   (typedef-60.3) -======= -   (typedef-16.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.3)

    		@@ -181327,20 +178501,12 @@

    27.1. Simple type definitions

    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    group[siri:StatusGroup]
      /Verification #simpleType
    -<<<<<<< HEAD -   (typedef-60.1) -======= -   (typedef-16.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.1)

    		@@ -181401,20 +178567,12 @@

    27.1. Simple type definitions

    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    attribute[lang]
      #simpleType
    -<<<<<<< HEAD -   (typedef-24.1) -======= -   (typedef-1.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-71.1)

    		@@ -181455,11 +178613,7 @@

    27.14. The toplevel element siri:PtSituationElement

    		-<<<<<<< HEAD -

    Type for individual IPT ncident.

    -=======

    Type for individual PT Incident.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Type for individual IPT ncident.

    -=======

    Type for individual PT incident.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - local-type: typedef-60.3 -======= - local-type: typedef-16.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.3

    		-<<<<<<< HEAD -

    Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.

    -=======

    Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Arbitrary application specific classifiers.

    +

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.

    -<<<<<<< HEAD - +local-type: typedef-60.4 -======= - +local-type: typedef-16.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.4

    		-<<<<<<< HEAD -

    The date/time that the SITUATIONRecord object (the first version of the record) was created by the original supplier.

    -=======

    The date/time that the SITUATION Record object (the first version of the record) was created by the original supplier.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    The date/time that this current version of the SITUATIONRecord was written into the database of the supplier which is involved in the data exchange.

    -=======

    The date/time that this current version of the SITUATION Record was written into the database of the supplier which is involved in the data exchange.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Datex2 Trrffic element road.

    -=======

    Datex2 Traffic element road.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    -<<<<<<< HEAD - local-type: typedef-60.1 -======= - local-type: typedef-16.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.1

    		-<<<<<<< HEAD -

    Publishing status one of a specified set of substates to which a SITUATION can be assigned.

    -=======

    DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.2 -======= - +local-type: typedef-16.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.2

    		-<<<<<<< HEAD -

    situation applies only on the repeated day types within the overall validity period(s). For example Sunday.

    -=======

    Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - local-type: typedef-60.3 -======= - local-type: typedef-16.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.3

    		-<<<<<<< HEAD -

    Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.

    -=======

    Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Arbitrary application specific classifiers.

    +

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.

    -<<<<<<< HEAD - +local-type: typedef-60.4 -======= - +local-type: typedef-16.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.4

    		-<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    -<<<<<<< HEAD - local-type: typedef-60.1 -======= - local-type: typedef-16.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.1

    		-<<<<<<< HEAD -

    Publishing status one of a specified set of substates to which a SITUATION can be assigned.

    -=======

    DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.2 -======= - +local-type: typedef-16.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.2

    		-<<<<<<< HEAD -

    situation applies only on the repeated day types within the overall validity period(s). For example Sunday.

    -=======

    Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - local-type: typedef-60.3 -======= - local-type: typedef-16.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.3

    		-<<<<<<< HEAD -

    Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.

    -=======

    Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Arbitrary application specific classifiers.

    +

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.

    -<<<<<<< HEAD - +local-type: typedef-60.4 -======= - +local-type: typedef-16.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.4

    		-<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    -<<<<<<< HEAD - local-type: typedef-60.1 -======= - local-type: typedef-16.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.1

    		-<<<<<<< HEAD -

    Publishing status one of a specified set of substates to which a SITUATION can be assigned.

    -=======

    DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.2 -======= - +local-type: typedef-16.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.2

    		-<<<<<<< HEAD -

    situation applies only on the repeated day types within the overall validity period(s). For example Sunday.

    -=======

    Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Type for Raod scope for scope of SITUATION or effect.

    -=======

    Type for Road scope for scope of SITUATION or effect.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Affected Road as described by a Date2x location.

    -=======

    Affected Road as described by a Datex 2 location.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.6 -======= - +local-type: typedef-16.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.6

    		-<<<<<<< HEAD -

    Affected OPERATORs, If absent, taken from context. If present, any OPERATORs stated completely replace those from context.

    -=======

    Affected OPERATORs. If absent, taken from context. If present, any OPERATORs stated completely replace those from context.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.7 -======= - +local-type: typedef-16.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.7

    -<<<<<<< HEAD - +local-type: typedef-60.9 -======= - +local-type: typedef-16.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.9

    -<<<<<<< HEAD - +local-type: typedef-60.10 -======= - +local-type: typedef-16.10 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.10

    -<<<<<<< HEAD - +local-type: typedef-60.11 -======= - +local-type: typedef-16.11 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.11

    -<<<<<<< HEAD - +local-type: typedef-60.12 -======= - +local-type: typedef-16.12 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.12

    -<<<<<<< HEAD - +local-type: typedef-60.13 -======= - +local-type: typedef-16.13 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.13

    		-<<<<<<< HEAD -

    Ticket restriction conditiosn in effect. TPEG pti table pti25.

    -=======

    Ticket restriction conditions in effect. TPEG pti table pti25.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Refernce to a fare exceptions code that is allowed because of the disruption. An easement may relax a fare condition, for exampel "You may use your metro ticket on the bus', or 'You may use your bus ticket in teh metro between these two stops'.

    -=======

    Refernce to a fare exceptions code that is allowed because of the disruption. An easement may relax a fare condition, for example "You may use your metro ticket on the bus', or 'You may use your bus ticket in teh metro between these two stops'.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    An event which is not planned by the traffic OPERATOR, which is affecting, or has the potential to affect traffic flow. This SIRI-SX element embeds the Datex2 TrafficElement, making all elements optional because they may alternatvielky be specified by common SIRI-SRX SITUATION elements.

    -=======

    An event which is not planned by the traffic OPERATOR, which is affecting, or has the potential to affect traffic flow. This SIRI-SX element embeds the Datex 2 TrafficElement, making all elements optional because they may alternatvielky be specified by common SIRI-SRX SITUATION elements.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    The date/time that the SITUATIONRecord object (the first version of the record) was created by the original supplier.

    -=======

    The date/time that the SITUATION Record object (the first version of the record) was created by the original supplier.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    The date/time that this current version of the SITUATIONRecord was written into the database of the supplier which is involved in the data exchange.

    -=======

    The date/time that this current version of the SITUATION Record was written into the database of the supplier which is involved in the data exchange.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.17 -======= - +local-type: typedef-16.17 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.17

    		-<<<<<<< HEAD -

    -=======

    Information on delays.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    + + +

    + siri:UpdatedServiceLinks +

    +     		+

    + 0:1 +

    +     		+

    + +siri:ServiceLinkViewsStructure + +

    +     		+

    List of SERVICE LINKs having updated shapes in that journey. This is only to provide updated the shapes of the journey (as gml:linestring), not to provide additional SERVICE LINK (provided through the sequence of CALLS)

    +
    @@ -189100,11 +186074,7 @@

    27.47. The complex type siri:PtSituationElementStructure

    -<<<<<<< HEAD - local-type: typedef-60.1 -======= - local-type: typedef-16.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.1

    		-<<<<<<< HEAD -

    Publishing status one of a specified set of substates to which a SITUATION can be assigned.

    -=======

    DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.2 -======= - +local-type: typedef-16.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.2

    		-<<<<<<< HEAD -

    situation applies only on the repeated day types within the overall validity period(s). For example Sunday.

    -=======

    Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - local-type: typedef-60.3 -======= - local-type: typedef-16.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.3

    		-<<<<<<< HEAD -

    Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.

    -=======

    Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Arbitrary application specific classifiers.

    +

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.

    -<<<<<<< HEAD - +local-type: typedef-60.4 -======= - +local-type: typedef-16.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.4

    		-<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    -<<<<<<< HEAD - local-type: typedef-60.1 -======= - local-type: typedef-16.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.1

    		-<<<<<<< HEAD -

    Publishing status one of a specified set of substates to which a SITUATION can be assigned.

    -=======

    DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.2 -======= - +local-type: typedef-16.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.2

    		-<<<<<<< HEAD -

    situation applies only on the repeated day types within the overall validity period(s). For example Sunday.

    -=======

    Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - local-type: typedef-60.3 -======= - local-type: typedef-16.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + local-type: typedef-34.3

    		-<<<<<<< HEAD -

    Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.

    -=======

    Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -

    Arbitrary application specific classifiers.

    +

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.

    -<<<<<<< HEAD - +local-type: typedef-60.4 -======= - +local-type: typedef-16.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.4

    		-<<<<<<< HEAD -

    Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)

    -=======

    Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-60.14 -======= - +local-type: typedef-16.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.14

    -<<<<<<< HEAD - +local-type: typedef-60.16 -======= - +local-type: typedef-16.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.16

    		-<<<<<<< HEAD -

    Name of for source.

    -=======

    Name of Source.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -
    -

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4) -======= -
    -

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)

    @@ -192639,11 +189524,7 @@

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c
      /SecondaryReasons #complexType
    -<<<<<<< HEAD -   (typedef-60.4) -======= -   (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.4)

    @@ -192689,13 +189566,8 @@

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    @@ -192673,11 +189554,7 @@

    27.53. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    -<<<<<<< HEAD - +local-type: typedef-60.5 -======= - +local-type: typedef-16.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.5

    -<<<<<<< HEAD -
    -

    27.54. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5) -======= -
    -

    27.54. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.54. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)

    @@ -192715,11 +189587,7 @@

    27.54. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R
      /SecondaryReasons/Reason #complexType
    -<<<<<<< HEAD -   (typedef-60.5) -======= -   (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.5)

    @@ -193148,13 +190016,8 @@

    27.54. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R

    -<<<<<<< HEAD -
    -

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -193174,11 +190037,7 @@

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -193224,13 +190079,8 @@

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -193208,11 +190067,7 @@

    27.55. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    27.56. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    27.56. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.56. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -193250,11 +190100,7 @@

    27.56. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -193369,13 +190215,8 @@

    27.56. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    27.57. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    27.57. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.57. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -193395,11 +190236,7 @@

    27.57. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -193441,13 +190278,8 @@

    27.57. The complex type group[siri:DescriptionGroup]/InfoLinks#complex

    -<<<<<<< HEAD -
    -

    27.58. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2) -======= -
    -

    27.58. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.58. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)

    @@ -193467,11 +190299,7 @@

    27.58. The complex type group[siri:TemporalGroup]/Repetitions#complexT
      /Repetitions #complexType
    -<<<<<<< HEAD -   (typedef-60.2) -======= -   (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.2)

    @@ -193515,13 +190343,8 @@

    27.58. The complex type group[siri:TemporalGroup]/Repetitions#complexT

    -<<<<<<< HEAD -
    -

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4) -======= -
    -

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)

    @@ -193541,11 +190364,7 @@

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c
      /SecondaryReasons #complexType
    -<<<<<<< HEAD -   (typedef-60.4) -======= -   (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.4)

    @@ -193591,13 +190406,8 @@

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    @@ -193575,11 +190394,7 @@

    27.59. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    -<<<<<<< HEAD - +local-type: typedef-60.5 -======= - +local-type: typedef-16.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.5

    -<<<<<<< HEAD -
    -

    27.60. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5) -======= -
    -

    27.60. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.60. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)

    @@ -193617,11 +190427,7 @@

    27.60. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R
      /SecondaryReasons/Reason #complexType
    -<<<<<<< HEAD -   (typedef-60.5) -======= -   (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.5)

    @@ -194050,13 +190856,8 @@

    27.60. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R

    -<<<<<<< HEAD -
    -

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -194076,11 +190877,7 @@

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -194126,13 +190919,8 @@

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -194110,11 +190907,7 @@

    27.61. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    27.62. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    27.62. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.62. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -194152,11 +190940,7 @@

    27.62. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -194271,13 +191055,8 @@

    27.62. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    27.63. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    27.63. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.63. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -194297,11 +191076,7 @@

    27.63. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -194343,13 +191118,8 @@

    27.63. The complex type group[siri:DescriptionGroup]/InfoLinks#complex

    -<<<<<<< HEAD -
    -

    27.64. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2) -======= -
    -

    27.64. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.64. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)

    @@ -194369,11 +191139,7 @@

    27.64. The complex type group[siri:TemporalGroup]/Repetitions#complexT
      /Repetitions #complexType
    -<<<<<<< HEAD -   (typedef-60.2) -======= -   (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.2)

    @@ -194417,13 +191183,8 @@

    27.64. The complex type group[siri:TemporalGroup]/Repetitions#complexT

    -<<<<<<< HEAD -
    -

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4) -======= -
    -

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)

    @@ -194443,11 +191204,7 @@

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c
      /SecondaryReasons #complexType
    -<<<<<<< HEAD -   (typedef-60.4) -======= -   (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.4)

    @@ -194493,13 +191246,8 @@

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    @@ -194477,11 +191234,7 @@

    27.65. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    -<<<<<<< HEAD - +local-type: typedef-60.5 -======= - +local-type: typedef-16.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.5

    -<<<<<<< HEAD -
    -

    27.66. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5) -======= -
    -

    27.66. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.66. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)

    @@ -194519,11 +191267,7 @@

    27.66. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R
      /SecondaryReasons/Reason #complexType
    -<<<<<<< HEAD -   (typedef-60.5) -======= -   (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.5)

    @@ -194952,13 +191696,8 @@

    27.66. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R

    -<<<<<<< HEAD -
    -

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -194978,11 +191717,7 @@

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -195028,13 +191759,8 @@

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -195012,11 +191747,7 @@

    27.67. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    27.68. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    27.68. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.68. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -195054,11 +191780,7 @@

    27.68. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -195173,13 +191895,8 @@

    27.68. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    27.69. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    27.69. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.69. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -195199,11 +191916,7 @@

    27.69. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -195245,13 +191958,8 @@

    27.69. The complex type group[siri:DescriptionGroup]/InfoLinks#complex

    -<<<<<<< HEAD -
    -

    27.70. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2) -======= -
    -

    27.70. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.70. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)

    @@ -195271,11 +191979,7 @@

    27.70. The complex type group[siri:TemporalGroup]/Repetitions#complexT
      /Repetitions #complexType
    -<<<<<<< HEAD -   (typedef-60.2) -======= -   (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.2)

    @@ -195319,13 +192023,8 @@

    27.70. The complex type group[siri:TemporalGroup]/Repetitions#complexT

    -<<<<<<< HEAD -
    -

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-60.6) -======= -
    -

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-16.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)

    @@ -195345,11 +192044,7 @@

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operat
      /Operators #complexType
    -<<<<<<< HEAD -   (typedef-60.6) -======= -   (typedef-16.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.6)

    @@ -195439,13 +192130,8 @@

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operat

    @@ -195395,11 +192090,7 @@

    27.71. The complex type complexType[siri:AffectsScopeStructure]/Operat

    		-<<<<<<< HEAD -

    All OPERATORs.

    -=======

    All OPERATORs. DEPRECATED since SIRI 2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -
    -

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-60.7) -======= -
    -

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-16.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)

    @@ -195465,11 +192151,7 @@

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networ
      /Networks #complexType
    -<<<<<<< HEAD -   (typedef-60.7) -======= -   (typedef-16.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.7)

    @@ -195515,13 +192193,8 @@

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networ

    @@ -195499,11 +192181,7 @@

    27.72. The complex type complexType[siri:AffectsScopeStructure]/Networ

    -<<<<<<< HEAD - +local-type: typedef-60.8 -======= - +local-type: typedef-16.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.8

    -<<<<<<< HEAD -
    -

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-60.8) -======= -
    -

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-16.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)

    @@ -195541,11 +192214,7 @@

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networ
      /Networks/AffectedNetwork #complexType
    -<<<<<<< HEAD -   (typedef-60.8) -======= -   (typedef-16.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.8)

    @@ -196013,11 +192678,7 @@

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networ

    @@ -196148,13 +192809,8 @@

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networ

    @@ -195583,11 +192252,7 @@

    27.73. The complex type complexType[siri:AffectsScopeStructure]/Networ

    		-<<<<<<< HEAD -

    Operators of LINEs affected by incident. Overrides any value specified for (i) General Context.

    -=======

    Operators of LINEs affected by incident. Overrides any value specified for (i) General Context. DEPRECATED since SIRI 2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    All LINEs in the network are affected.

    -=======

    All LINEs in the network are affected. DEPRECATED since SIRI 2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -
    -

    27.74. The complex type complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-60.9) -======= -
    -

    27.74. The complex type complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-16.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.74. The complex type complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)

    @@ -196174,11 +192830,7 @@

    27.74. The complex type complexType[siri:AffectsScopeStructure]/StopPo
      /StopPoints #complexType
    -<<<<<<< HEAD -   (typedef-60.9) -======= -   (typedef-16.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.9)

    @@ -196220,13 +192872,8 @@

    27.74. The complex type complexType[siri:AffectsScopeStructure]/StopPo

    -<<<<<<< HEAD -
    -

    27.75. The complex type complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-60.10) -======= -
    -

    27.75. The complex type complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-16.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.75. The complex type complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)

    @@ -196246,11 +192893,7 @@

    27.75. The complex type complexType[siri:AffectsScopeStructure]/StopPl
      /StopPlaces #complexType
    -<<<<<<< HEAD -   (typedef-60.10) -======= -   (typedef-16.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.10)

    @@ -196292,13 +192935,8 @@

    27.75. The complex type complexType[siri:AffectsScopeStructure]/StopPl

    -<<<<<<< HEAD -
    -

    27.76. The complex type complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-60.11) -======= -
    -

    27.76. The complex type complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-16.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.76. The complex type complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)

    @@ -196318,11 +192956,7 @@

    27.76. The complex type complexType[siri:AffectsScopeStructure]/Places
      /Places #complexType
    -<<<<<<< HEAD -   (typedef-60.11) -======= -   (typedef-16.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.11)

    @@ -196364,13 +192998,8 @@

    27.76. The complex type complexType[siri:AffectsScopeStructure]/Places

    -<<<<<<< HEAD -
    -

    27.77. The complex type complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-60.12) -======= -
    -

    27.77. The complex type complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-16.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.77. The complex type complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)

    @@ -196390,11 +193019,7 @@

    27.77. The complex type complexType[siri:AffectsScopeStructure]/Vehicl
      /VehicleJourneys #complexType
    -<<<<<<< HEAD -   (typedef-60.12) -======= -   (typedef-16.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.12)

    @@ -196436,13 +193061,8 @@

    27.77. The complex type complexType[siri:AffectsScopeStructure]/Vehicl

    -<<<<<<< HEAD -
    -

    27.78. The complex type complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-60.13) -======= -
    -

    27.78. The complex type complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-16.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.78. The complex type complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)

    @@ -196462,11 +193082,7 @@

    27.78. The complex type complexType[siri:AffectsScopeStructure]/Vehicl
      /Vehicles #complexType
    -<<<<<<< HEAD -   (typedef-60.13) -======= -   (typedef-16.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.13)

    @@ -196508,13 +193124,8 @@

    27.78. The complex type complexType[siri:AffectsScopeStructure]/Vehicl

    -<<<<<<< HEAD -
    -

    27.79. The complex type complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-60.17) -======= -
    -

    27.79. The complex type complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-16.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.79. The complex type complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)

    @@ -196534,11 +193145,7 @@

    27.79. The complex type complexType[siri:PtConsequenceStructure]/Suita
      /Suitabilities #complexType
    -<<<<<<< HEAD -   (typedef-60.17) -======= -   (typedef-16.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.17)

    @@ -196580,13 +193187,8 @@

    27.79. The complex type complexType[siri:PtConsequenceStructure]/Suita

    -<<<<<<< HEAD -
    -

    27.80. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2) -======= -
    -

    27.80. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.80. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)

    @@ -196606,11 +193208,7 @@

    27.80. The complex type group[siri:TemporalGroup]/Repetitions#complexT
      /Repetitions #complexType
    -<<<<<<< HEAD -   (typedef-60.2) -======= -   (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.2)

    @@ -196654,13 +193252,8 @@

    27.80. The complex type group[siri:TemporalGroup]/Repetitions#complexT

    -<<<<<<< HEAD -
    -

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4) -======= -
    -

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)

    @@ -196680,11 +193273,7 @@

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c
      /SecondaryReasons #complexType
    -<<<<<<< HEAD -   (typedef-60.4) -======= -   (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.4)

    @@ -196730,13 +193315,8 @@

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    @@ -196714,11 +193303,7 @@

    27.81. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    -<<<<<<< HEAD - +local-type: typedef-60.5 -======= - +local-type: typedef-16.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.5

    -<<<<<<< HEAD -
    -

    27.82. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5) -======= -
    -

    27.82. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.82. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)

    @@ -196756,11 +193336,7 @@

    27.82. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R
      /SecondaryReasons/Reason #complexType
    -<<<<<<< HEAD -   (typedef-60.5) -======= -   (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.5)

    @@ -197189,13 +193765,8 @@

    27.82. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R

    -<<<<<<< HEAD -
    -

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -197215,11 +193786,7 @@

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -197265,13 +193828,8 @@

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -197249,11 +193816,7 @@

    27.83. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    27.84. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    27.84. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.84. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -197291,11 +193849,7 @@

    27.84. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -197410,13 +193964,8 @@

    27.84. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    27.85. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    27.85. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.85. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -197436,11 +193985,7 @@

    27.85. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -197482,13 +194027,8 @@

    27.85. The complex type group[siri:DescriptionGroup]/InfoLinks#complex

    -<<<<<<< HEAD -
    -

    27.86. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2) -======= -
    -

    27.86. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.86. The complex type group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)

    @@ -197508,11 +194048,7 @@

    27.86. The complex type group[siri:TemporalGroup]/Repetitions#complexT
      /Repetitions #complexType
    -<<<<<<< HEAD -   (typedef-60.2) -======= -   (typedef-16.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.2)

    @@ -197556,13 +194092,8 @@

    27.86. The complex type group[siri:TemporalGroup]/Repetitions#complexT

    -<<<<<<< HEAD -
    -

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4) -======= -
    -

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)

    @@ -197582,11 +194113,7 @@

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c
      /SecondaryReasons #complexType
    -<<<<<<< HEAD -   (typedef-60.4) -======= -   (typedef-16.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.4)

    @@ -197632,13 +194155,8 @@

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    @@ -197616,11 +194143,7 @@

    27.87. The complex type group[siri:ClassifierGroup]/SecondaryReasons#c

    -<<<<<<< HEAD - +local-type: typedef-60.5 -======= - +local-type: typedef-16.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.5

    -<<<<<<< HEAD -
    -

    27.88. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5) -======= -
    -

    27.88. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.88. The complex type group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)

    @@ -197658,11 +194176,7 @@

    27.88. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R
      /SecondaryReasons/Reason #complexType
    -<<<<<<< HEAD -   (typedef-60.5) -======= -   (typedef-16.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.5)

    @@ -198091,13 +194605,8 @@

    27.88. The complex type group[siri:ClassifierGroup]/SecondaryReasons/R

    -<<<<<<< HEAD -
    -

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-60.14) -======= -
    -

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)

    @@ -198117,11 +194626,7 @@

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexTyp
      /Images #complexType
    -<<<<<<< HEAD -   (typedef-60.14) -======= -   (typedef-16.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.14)

    @@ -198167,13 +194668,8 @@

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    @@ -198151,11 +194656,7 @@

    27.89. The complex type group[siri:DescriptionGroup]/Images#complexTyp

    -<<<<<<< HEAD - +local-type: typedef-60.15 -======= - +local-type: typedef-16.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-34.15

    -<<<<<<< HEAD -
    -

    27.90. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15) -======= -
    -

    27.90. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.90. The complex type group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)

    @@ -198193,11 +194689,7 @@

    27.90. The complex type group[siri:DescriptionGroup]/Images/Image#comp
      /Images/Image #complexType
    -<<<<<<< HEAD -   (typedef-60.15) -======= -   (typedef-16.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.15)

    @@ -198312,13 +194804,8 @@

    27.90. The complex type group[siri:DescriptionGroup]/Images/Image#comp

    -<<<<<<< HEAD -
    -

    27.91. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16) -======= -
    -

    27.91. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    27.91. The complex type group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)

    @@ -198338,11 +194825,7 @@

    27.91. The complex type group[siri:DescriptionGroup]/InfoLinks#complex
      /InfoLinks #complexType
    -<<<<<<< HEAD -   (typedef-60.16) -======= -   (typedef-16.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-34.16)

    @@ -198478,7 +194961,7 @@

    28.1. Simple type definitions

    stopPoint

     @@ -198486,7 +194969,39 @@

    28.1. Simple type definitions

    vehicleJourney

     + + + + + + + + + + + + + + + + @@ -198580,6 +195095,29 @@

    28.4. The toplevel element siri:ManualAction

    Description of action.

    +

    + + + + + + @@ -199263,16 +195797,12 @@

    28.16. The complex type siri:ActionDataStructure

    @@ -199548,11 +196070,7 @@

    28.17. The complex type siri:ActionsStructure

    @@ -200005,6 +196523,29 @@

    28.21. The complex type siri:ManualActionStructure

    Description of action.

     + + + + + + + + + + + + + + @@ -200356,6 +196916,29 @@

    28.23. The complex type siri:NotifyByPagerActionStructure

    Description of action.

     + + + + + + + @@ -200593,6 +197172,29 @@

    28.24. The complex type siri:NotifyBySmsActionStructure

    Description of action.

     + + + + + + + @@ -200832,6 +197430,29 @@

    28.25. The complex type siri:NotifyUserActionStructure

    Description of action.

     + + + + + + + @@ -201097,6 +197714,29 @@

    28.26. The complex type siri:ParameterisedActionStructure

    Description of action.

     + + + + + + + + + + + + + + @@ -201385,7 +198048,7 @@

    28.27. The complex type siri:PassengerInformationActionStructure

    @@ -201590,11 +198253,7 @@

    28.28. The complex type siri:PublishingActionStructure

    @@ -201718,6 +198377,29 @@

    28.29. The complex type siri:PublishToAlertsActionStructure

    Description of action.

     + + + + + + + @@ -201955,6 +198633,29 @@

    28.30. The complex type siri:PublishToDisplayActionStructure

    Description of action.

     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -203368,11 +200157,7 @@

    28.40. The complex type siri:TextualContentStructure

    @@ -203716,13 +200501,8 @@

    28.40. The complex type siri:TextualContentStructure

    @@ -198470,7 +194953,7 @@

    28.1. Simple type definitions

    general

    		 -

    -

    +

    DEPRECATED since SIRI 2.3, use anywhere instead. -v2.3
    -

    -

    +

    DEPRECATED since SIRI 2.3, use atStopPoint instead. -v2.3
    -

    -

    +

    DEPRECATED since SIRI 2.3, use onBoardVehicle instead. -v2.3

    +
    +

    anywhere

    +     		+

    Bird's eye perspective; e.g., passenger looks at an overview of situations on a network map. +v2.3

    +
    +

    atStopPoint

    +     		+

    From the passengers' perpective at a specific stop; e.g., at a display on a platform during interchange. +v2.3

    +
    +

    onBoardVehicle

    +     		+

    From the passengers' perspective while on board a specific vehicle; e.g., at an onboard display while moving in a vehicle. +v2.3

    +
    +

    whilePlanningTrip

    +     		+

    From the passengers' perspective while plannig a trip; e.g., while using a trip search application on a smartphone. +v2.3
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -199126,11 +195664,7 @@

    28.15. The group siri:ActionsGroup

    -<<<<<<< HEAD - +local-type: typedef-54.3 -======= - +local-type: typedef-12.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.3

    - - siri:Name - + siri:Name

    - - 1:1 - + 0:1

    		@@ -199317,16 +195847,12 @@

    28.16. The complex type siri:ActionDataStructure

    - - siri:Value - + siri:Value

    - - 1:* - + 0:*

    		@@ -199378,11 +195904,7 @@

    28.16. The complex type siri:ActionDataStructure

    -<<<<<<< HEAD - +local-type: typedef-54.2 -======= - +local-type: typedef-12.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.2

    -<<<<<<< HEAD - +local-type: typedef-54.3 -======= - +local-type: typedef-12.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.3

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -200140,6 +196681,29 @@

    28.22. The complex type siri:NotifyByEmailActionStructure

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -200204,11 +196768,7 @@

    28.22. The complex type siri:NotifyByEmailActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -200420,11 +197003,7 @@

    28.23. The complex type siri:NotifyByPagerActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -200657,11 +197259,7 @@

    28.24. The complex type siri:NotifyBySmsActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -200896,11 +197517,7 @@

    28.25. The complex type siri:NotifyUserActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -201232,6 +197872,29 @@

    28.27. The complex type siri:PassengerInformationActionStructureDescription of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -201319,7 +197982,7 @@

    28.27. The complex type siri:PassengerInformationActionStructure

    - siri:ActionPeriod + siri:Period

    		@@ -201334,7 +197997,7 @@

    28.27. The complex type siri:PassengerInformationActionStructure

    		-

    Period of effect of disruption, if different from that of SITUATION, specifically in case of multiple applicable periods (for example periodic roadworks during the night). If omitted, then the ValidityPeriods on PtSituationElement level apply, otherwise overwrites the former.

    +

    Period restricts the applicability of a PassengerInformationAction to a specific sub-range of the enclosing ValidityPeriod on PtSituationElement level. In particular when using the Perspective 'whilePlanningTrip', a single ValidityPeriod at PtSituationElement level may be insufficient to ensure correct selection of the actually affected journeys in a journey planning context. This applies whenever a PassengerInformationAction is intended to be effective only during certain parts of the overall SITUATION duration or validity (e.g. time-of-day–dependent passenger information). Period SHALL ONLY be used when a single ValidityPeriod is insufficient to differentiate the applicability of multiple actions. Period MUST always be a strict subset of the enclosing ValidityPeriod and MUST NOT start earlier or end later. For PassengerInformationActions with Perspective 'atStopPoint' and/or 'onBoardVehicle', Period has no meaning and SHALL NOT be used. If omitted, then the ValidityPeriods on PtSituationElement level apply.
    -

    The monotonically inscresing version of the passenger information instance. If absent, is the same version as the enclosing Situation

    +

    The monotonically increasing version of the passenger information instance. If absent, is the same version as the enclosing Situation

    -<<<<<<< HEAD - +local-type: typedef-54.4 -======= - +local-type: typedef-12.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.4

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -201782,11 +198464,7 @@

    28.29. The complex type siri:PublishToAlertsActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -202141,6 +198842,29 @@

    28.31. The complex type siri:PublishToMobileActionStructure

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -202327,6 +199051,29 @@

    28.32. The complex type siri:PublishToTvActionStructure

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -202513,6 +199260,29 @@

    28.33. The complex type siri:PublishToWebActionStructure

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -202745,6 +199515,29 @@

    28.34. The complex type siri:PushedActionStructure

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -202814,11 +199607,7 @@

    28.34. The complex type siri:PushedActionStructure

    -<<<<<<< HEAD - +local-type: typedef-54.1 -======= - +local-type: typedef-12.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.1

    -<<<<<<< HEAD - +local-type: typedef-54.3 -======= - +local-type: typedef-12.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-23.3

    -<<<<<<< HEAD -
    -

    28.41. The complex type element[siri:ManualAction]#complexType (typedef-54.3) -======= -
    -

    28.41. The complex type element[siri:ManualAction]#complexType (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.41. The complex type element[siri:ManualAction]#complexType (typedef-23.3)

    @@ -203742,11 +200522,7 @@

    28.41. The complex type element[siri:ManualAction]#complexType (typede
      #complexType
    -<<<<<<< HEAD -   (typedef-54.3) -======= -   (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.3)

    + + + + + + +
    @@ -203812,6 +200588,29 @@

    28.41. The complex type element[siri:ManualAction]#complexType (typede

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -203864,13 +200663,8 @@

    28.41. The complex type element[siri:ManualAction]#complexType (typede

    -<<<<<<< HEAD -
    -

    28.42. The complex type element[siri:ManualAction]#complexType (typedef-54.3) -======= -
    -

    28.42. The complex type element[siri:ManualAction]#complexType (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.42. The complex type element[siri:ManualAction]#complexType (typedef-23.3)

    @@ -203890,11 +200684,7 @@

    28.42. The complex type element[siri:ManualAction]#complexType (typede
      #complexType
    -<<<<<<< HEAD -   (typedef-54.3) -======= -   (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.3)

    + + + + + + +
    @@ -203960,6 +200750,29 @@

    28.42. The complex type element[siri:ManualAction]#complexType (typede

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -204012,13 +200825,8 @@

    28.42. The complex type element[siri:ManualAction]#complexType (typede

    -<<<<<<< HEAD -
    -

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-54.2) -======= -
    -

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-12.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)

    @@ -204038,11 +200846,7 @@

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishA
      /PublishAtScope #complexType
    -<<<<<<< HEAD -   (typedef-54.2) -======= -   (typedef-12.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.2)

    @@ -204058,24 +200862,12 @@

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishA

    -<<<<<<< HEAD - - siri:ScopeType - -======= siri:ScopeType ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - - 1:1 - -======= 0:1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		@@ -204121,13 +200913,8 @@

    28.43. The complex type complexType[siri:ActionDataStructure]/PublishA

    -<<<<<<< HEAD -
    -

    28.44. The complex type element[siri:ManualAction]#complexType (typedef-54.3) -======= -
    -

    28.44. The complex type element[siri:ManualAction]#complexType (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.44. The complex type element[siri:ManualAction]#complexType (typedef-23.3)

    @@ -204147,11 +200934,7 @@

    28.44. The complex type element[siri:ManualAction]#complexType (typede
      #complexType
    -<<<<<<< HEAD -   (typedef-54.3) -======= -   (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.3)

    + + + + + + +
    @@ -204217,6 +201000,29 @@

    28.44. The complex type element[siri:ManualAction]#complexType (typede

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -204269,13 +201075,8 @@

    28.44. The complex type element[siri:ManualAction]#complexType (typede

    -<<<<<<< HEAD -
    -

    28.45. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.45. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.45. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204295,11 +201096,7 @@

    28.45. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204338,13 +201135,8 @@

    28.45. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.46. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.46. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.46. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204364,11 +201156,7 @@

    28.46. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204407,13 +201195,8 @@

    28.46. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.47. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.47. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.47. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204433,11 +201216,7 @@

    28.47. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204476,13 +201255,8 @@

    28.47. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.48. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.48. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.48. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204502,11 +201276,7 @@

    28.48. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204545,13 +201315,8 @@

    28.48. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.49. The complex type complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-54.4) -======= -
    -

    28.49. The complex type complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-12.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.49. The complex type complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)

    @@ -204571,11 +201336,7 @@

    28.49. The complex type complexType[siri:PublishingActionStructure]/Pu
      /PublishAtScope #complexType
    -<<<<<<< HEAD -   (typedef-54.4) -======= -   (typedef-12.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.4)

    @@ -204591,24 +201352,12 @@

    28.49. The complex type complexType[siri:PublishingActionStructure]/Pu

    -<<<<<<< HEAD - - siri:ScopeType - -======= siri:ScopeType ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - - 1:1 - -======= 0:1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		@@ -204654,13 +201403,8 @@

    28.49. The complex type complexType[siri:PublishingActionStructure]/Pu

    -<<<<<<< HEAD -
    -

    28.50. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.50. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.50. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204680,11 +201424,7 @@

    28.50. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204723,13 +201463,8 @@

    28.50. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.51. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1) -======= -
    -

    28.51. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.51. The complex type complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)

    @@ -204749,11 +201484,7 @@

    28.51. The complex type complexType[siri:PushedActionStructure]/Before
      /BeforeNotices #complexType
    -<<<<<<< HEAD -   (typedef-54.1) -======= -   (typedef-12.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.1)

    @@ -204792,13 +201523,8 @@

    28.51. The complex type complexType[siri:PushedActionStructure]/Before

    -<<<<<<< HEAD -
    -

    28.52. The complex type element[siri:ManualAction]#complexType (typedef-54.3) -======= -
    -

    28.52. The complex type element[siri:ManualAction]#complexType (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    28.52. The complex type element[siri:ManualAction]#complexType (typedef-23.3)

    @@ -204818,11 +201544,7 @@

    28.52. The complex type element[siri:ManualAction]#complexType (typede
      #complexType
    -<<<<<<< HEAD -   (typedef-54.3) -======= -   (typedef-12.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-23.3)

    + + + + + + + @@ -206695,11 +203436,7 @@

    29.16. The complex type siri:AffectedCallStructure

    @@ -206723,20 +203460,12 @@

    29.16. The complex type siri:AffectedCallStructure

    @@ -207337,11 +204066,7 @@

    29.16. The complex type siri:AffectedCallStructure

    @@ -207823,8 +204548,6 @@

    29.18. The complex type siri:AffectedFacilityStructure

    @@ -207849,7 +204572,6 @@

    29.18. The complex type siri:AffectedFacilityStructure

    @@ -208121,12 +204843,6 @@

    29.20. The complex type siri:AffectedLineStructure

    - @@ -208217,14 +204932,11 @@

    29.20. The complex type siri:AffectedLineStructure

    -<<<<<<< HEAD -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 @@ -208240,11 +204952,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208268,11 +204976,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208320,11 +205024,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208348,11 +205048,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208376,11 +205072,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208404,11 +205096,7 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -208445,10 +205133,6 @@

    29.20. The complex type siri:AffectedLineStructure

    @@ -204888,6 +201610,29 @@

    28.52. The complex type element[siri:ManualAction]#complexType (typede

    Description of action.
    + + +

    + siri:Keywords +

    +     		+

    + 0:1 +

    +     		+

    + xs:NMTOKENS +

    +     		+

    A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).

    +
    @@ -206377,11 +203122,7 @@

    29.16. The complex type siri:AffectedCallStructure

    		-<<<<<<< HEAD -

    Type for an SCHEDULED STOP POINT affected by a SITUATION.

    -=======

    Base Type for an SCHEDULED STOP POINT affected by a SITUATION.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.1 -======= - +local-type: typedef-13.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.1

    -<<<<<<< HEAD - +local-type: typedef-64.2 -======= - +local-type: typedef-13.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.2

    		-<<<<<<< HEAD -

    Used to restrict stop points to some lines

    -=======

    Used to restrict stop points to some lines.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.16 -======= - +local-type: typedef-13.16 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.16

    -<<<<<<< HEAD -======= siri:FacilityLocation

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 siri:FacilityStatus

    		-<<<<<<< HEAD -

    -

    		-

    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.

    -=======

    siri:AffectedLineWithoutStopStructure

    @@ -208138,7 +204854,6 @@

    29.20. The complex type siri:AffectedLineStructure

    The element content starts with items inherited from the base type:

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    Inherited content is followed by own content:

    -<<<<<<< HEAD - +siri:AffectedStopPointStructure -======= +siri:AffectedStopPointWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +siri:AffectedStopPointStructure -======= +siri:AffectedStopPointWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.4 -======= - +local-type: typedef-13.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.4

    -<<<<<<< HEAD - +local-type: typedef-64.5 -======= - +local-type: typedef-13.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.5

    -<<<<<<< HEAD - +local-type: typedef-64.6 -======= - +local-type: typedef-13.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.6

    -<<<<<<< HEAD - +local-type: typedef-64.7 -======= - +local-type: typedef-13.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.7

    -<<<<<<< HEAD -
    -

    28.21. The complex type siri:AffectedModesStructure -=======

    29.21. The complex type siri:AffectedLineWithoutStopStructure

    @@ -208557,7 +205241,6 @@

    29.21. The complex type siri:AffectedLineWithoutStopStructure

    29.22. The complex type siri:AffectedModesStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -208639,11 +205322,7 @@

    29.22. The complex type siri:AffectedModesStructure

    @@ -208656,11 +205335,7 @@

    29.22. The complex type siri:AffectedModesStructure
    -<<<<<<< HEAD -

    28.22. The complex type siri:AffectedNetworkStructure -=======

    29.23. The complex type siri:AffectedNetworkStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.3 -======= - +local-type: typedef-13.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.3

    @@ -208707,11 +205382,7 @@

    29.23. The complex type siri:AffectedNetworkStructure

    @@ -209137,11 +205808,7 @@

    29.23. The complex type siri:AffectedNetworkStructure

    @@ -209273,11 +205940,7 @@

    29.23. The complex type siri:AffectedNetworkStructure
    -<<<<<<< HEAD -

    28.23. The complex type siri:AffectedOperatorStructure -=======

    29.24. The complex type siri:AffectedOperatorStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -

    Operators of LINEs affected by incident. Overrides any value specified for (i) General Context.

    -=======

    Operators of LINEs affected by incident. Overrides any value specified for (i) General Context. DEPRECATED since SIRI 2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    All LINEs in the network are affected.

    -=======

    All LINEs in the network are affected. DEPRECATED since SIRI 2.1

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    @@ -209429,11 +206092,7 @@

    29.24. The complex type siri:AffectedOperatorStructure
    -<<<<<<< HEAD -

    28.24. The complex type siri:AffectedPathLinkStructure -=======

    29.25. The complex type siri:AffectedPathLinkStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -209629,11 +206288,7 @@

    29.25. The complex type siri:AffectedPathLinkStructure
    -<<<<<<< HEAD -

    28.25. The complex type siri:AffectedPlaceStructure -=======

    29.26. The complex type siri:AffectedPlaceStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -209853,11 +206508,7 @@

    29.26. The complex type siri:AffectedPlaceStructure
    -<<<<<<< HEAD -

    28.26. The complex type siri:AffectedRouteStructure -=======

    29.27. The complex type siri:AffectedRouteStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -209947,11 +206598,7 @@

    29.27. The complex type siri:AffectedRouteStructure

    @@ -209975,11 +206622,7 @@

    29.27. The complex type siri:AffectedRouteStructure

    @@ -210003,11 +206646,7 @@

    29.27. The complex type siri:AffectedRouteStructure

    @@ -210045,11 +206684,7 @@

    29.27. The complex type siri:AffectedRouteStructure
    -<<<<<<< HEAD -

    28.27. The complex type siri:AffectedSectionStructure -=======

    29.28. The complex type siri:AffectedSectionStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.9 -======= - +local-type: typedef-13.9 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.9

    -<<<<<<< HEAD - +local-type: typedef-64.10 -======= - +local-type: typedef-13.10 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.10

    -<<<<<<< HEAD - +local-type: typedef-64.11 -======= - +local-type: typedef-13.11 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.11

    @@ -210134,11 +206769,7 @@

    29.28. The complex type siri:AffectedSectionStructure

    @@ -210221,11 +206852,7 @@

    29.28. The complex type siri:AffectedSectionStructure
    -<<<<<<< HEAD -

    28.28. The complex type siri:AffectedStopPlaceComponentStructure -=======

    29.29. The complex type siri:AffectedStopPlaceComponentStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.8 -======= - +local-type: typedef-13.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.8

    @@ -210498,11 +207125,7 @@

    29.29. The complex type siri:AffectedStopPlaceComponentStructure

    @@ -210540,11 +207163,7 @@

    29.29. The complex type siri:AffectedStopPlaceComponentStructure
    -<<<<<<< HEAD -

    28.29. The complex type siri:AffectedStopPlaceElementStructure -=======

    29.30. The complex type siri:AffectedStopPlaceElementStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.21 -======= - +local-type: typedef-13.21 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.21

    @@ -210599,11 +207218,7 @@

    29.30. The complex type siri:AffectedStopPlaceElementStructure
    -<<<<<<< HEAD -

    28.30. The complex type siri:AffectedStopPlaceStructure -=======

    29.31. The complex type siri:AffectedStopPlaceStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -210624,11 +207239,7 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    -<<<<<<< HEAD - - - -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 @@ -210700,6 +207303,30 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    Identifier of STOP PLACE affected by SITUATION.

    + + + + + + + @@ -210765,11 +207392,7 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    @@ -210793,11 +207416,7 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    @@ -210821,11 +207440,7 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    @@ -210834,14 +207449,11 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    -<<<<<<< HEAD -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 @@ -210857,20 +207469,12 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    @@ -210993,6 +207597,30 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructureIdentifier of STOP PLACE affected by SITUATION.

    + + + + + + + @@ -211058,11 +207686,7 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructure

    @@ -211086,11 +207710,7 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructure

    @@ -211114,11 +207734,7 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructure

    @@ -211131,11 +207747,7 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructure
    -<<<<<<< HEAD -

    28.31. The complex type siri:AffectedStopPointStructure -=======

    29.33. The complex type siri:AffectedStopPointStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - siri:AffectedStopPlaceElementStructure -======= siri:AffectedStopPlaceWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		@@ -210665,14 +207276,6 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    -

    Inherited content is followed by own content:

    -
    + + +

    + siri:StopPlaceName +

    +     		+

    + 0:* +

    +     		+

    + >siri:NaturalLanguageStringStructure + +

    +     		+

    Name of STOP PLACE affected by SITUATION. +v2.3

    +
    @@ -210721,7 +207348,7 @@

    29.31. The complex type siri:AffectedStopPlaceStructure

    		-

    Name of STOP PLACE. (Unbounded since SIRI 2.0)

    +

    Name of PLACE associated with STOP PLACE. (Unbounded since SIRI 2.0)

    -<<<<<<< HEAD - +local-type: typedef-64.18 -======= - +local-type: typedef-13.18 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.18

    -<<<<<<< HEAD - +local-type: typedef-64.19 -======= - +local-type: typedef-13.19 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.19

    -<<<<<<< HEAD - +local-type: typedef-64.20 -======= - +local-type: typedef-13.20 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.20

    Inherited content is followed by own content:

    -<<<<<<< HEAD - +local-type: typedef-64.17 -======= - +local-type: typedef-13.17 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.17

    		-<<<<<<< HEAD -

    Used to restrict STOP PLACEs to some lines

    -=======

    Used to restrict STOP PLACEs to some lines.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    + + +

    + siri:StopPlaceName +

    +     		+

    + 0:* +

    +     		+

    + >siri:NaturalLanguageStringStructure + +

    +     		+

    Name of STOP PLACE affected by SITUATION. +v2.3

    +
    @@ -211014,7 +207642,7 @@

    29.32. The complex type siri:AffectedStopPlaceWithoutLineStructure

    		-

    Name of STOP PLACE. (Unbounded since SIRI 2.0)

    +

    Name of PLACE associated with STOP PLACE. (Unbounded since SIRI 2.0)

    -<<<<<<< HEAD - +local-type: typedef-64.18 -======= - +local-type: typedef-13.18 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.18

    -<<<<<<< HEAD - +local-type: typedef-64.19 -======= - +local-type: typedef-13.19 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.19

    -<<<<<<< HEAD - +local-type: typedef-64.20 -======= - +local-type: typedef-13.20 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.20

    @@ -211155,12 +207767,6 @@

    29.33. The complex type siri:AffectedStopPointStructure

    - @@ -211481,11 +208086,7 @@

    29.33. The complex type siri:AffectedStopPointStructure

    @@ -211494,14 +208095,11 @@

    29.33. The complex type siri:AffectedStopPointStructure

    -<<<<<<< HEAD -======= ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 @@ -211517,20 +208115,12 @@

    29.33. The complex type siri:AffectedStopPointStructure

    @@ -211895,11 +208485,7 @@

    29.34. The complex type siri:AffectedStopPointWithoutLineStructure

    @@ -211912,11 +208498,7 @@

    29.34. The complex type siri:AffectedStopPointWithoutLineStructure
    -<<<<<<< HEAD -

    28.32. The complex type siri:AffectedVehicleJourneyStructure -=======

    29.35. The complex type siri:AffectedVehicleJourneyStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -

    -

    		-

    Type for an SCHEDULED STOP POINT affected by a SITUATION.

    -=======

    siri:AffectedStopPointWithoutLineStructure

    @@ -211172,7 +207778,6 @@

    29.33. The complex type siri:AffectedStopPointStructure

    The element content starts with items inherited from the base type:

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.1 -======= - +local-type: typedef-13.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.1

    Inherited content is followed by own content:

    -<<<<<<< HEAD - +local-type: typedef-64.2 -======= - +local-type: typedef-13.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.2

    		-<<<<<<< HEAD -

    Used to restrict stop points to some lines

    -=======

    Used to restrict stop points to some lines.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.1 -======= - +local-type: typedef-13.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.1

    @@ -212193,13 +208775,13 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212247,11 +208829,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212275,11 +208853,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212421,11 +208995,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212449,11 +209019,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212526,11 +209092,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212554,11 +209116,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure

    @@ -212596,11 +209154,7 @@

    29.35. The complex type siri:AffectedVehicleJourneyStructure
    -<<<<<<< HEAD -

    28.33. The complex type siri:AffectedVehicleStructure -=======

    29.36. The complex type siri:AffectedVehicleStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    - 0:* + 0:1

    - siri:VehicleModesEnumeration + siri:VehicleModesOfTransportEnumeration

    -<<<<<<< HEAD - +local-type: typedef-64.12 -======= - +local-type: typedef-13.12 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.12

    -<<<<<<< HEAD - +local-type: typedef-64.13 -======= - +local-type: typedef-13.13 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.13

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-64.14 -======= - +local-type: typedef-13.14 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.14

    -<<<<<<< HEAD - +local-type: typedef-64.15 -======= - +local-type: typedef-13.15 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-29.15

    @@ -213103,11 +209657,7 @@

    29.36. The complex type siri:AffectedVehicleStructure
    -<<<<<<< HEAD -

    28.34. The complex type siri:CasualtiesStructure -=======

    29.37. The complex type siri:CasualtiesStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213184,11 +209734,7 @@

    29.37. The complex type siri:CasualtiesStructure
    -<<<<<<< HEAD -

    28.35. The complex type siri:NetworkRefStructure -=======

    29.38. The complex type siri:NetworkRefStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213221,11 +209767,7 @@

    29.38. The complex type siri:NetworkRefStructure
    -<<<<<<< HEAD -

    28.36. The complex type siri:NetworkStructure -=======

    29.39. The complex type siri:NetworkStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213619,11 +210161,7 @@

    29.39. The complex type siri:NetworkStructure
    -<<<<<<< HEAD -

    28.37. The complex type siri:OffsetStructure -=======

    29.40. The complex type siri:OffsetStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213700,11 +210238,7 @@

    29.40. The complex type siri:OffsetStructure
    -<<<<<<< HEAD -

    28.38. The complex type siri:OperationalUnitRefStructure -=======

    29.41. The complex type siri:OperationalUnitRefStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213737,11 +210271,7 @@

    29.41. The complex type siri:OperationalUnitRefStructure
    -<<<<<<< HEAD -

    28.39. The complex type siri:SectionRefStructure -=======

    29.42. The complex type siri:SectionRefStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213774,11 +210304,7 @@

    29.42. The complex type siri:SectionRefStructure
    -<<<<<<< HEAD -

    28.40. The complex type siri:ZoneRefStructure -=======

    29.43. The complex type siri:ZoneRefStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -213810,13 +210336,8 @@

    29.43. The complex type siri:ZoneRefStructure

    -<<<<<<< HEAD -
    -

    29.44. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1) -======= -
    -

    29.44. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.44. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)

    @@ -213832,19 +210353,11 @@

    29.44. The complex type complexType[siri:AffectedStopPointWithoutLineS

    -<<<<<<< HEAD - complexType[siri:AffectedStopPointStructure] -
    -   /ConnectionLinks #complexType -
    -   (typedef-64.1) -======= complexType[siri:AffectedStopPointWithoutLineStructure]
      /ConnectionLinks #complexType
    -   (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.1)

    		@@ -213886,13 +210399,8 @@

    29.44. The complex type complexType[siri:AffectedStopPointWithoutLineS

    -<<<<<<< HEAD -
    -

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-64.2) -======= -
    -

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-13.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)

    @@ -213912,11 +210420,7 @@

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/L
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-64.2) -======= -   (typedef-13.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.2)

    @@ -213962,13 +210462,8 @@

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/L

    @@ -213946,11 +210450,7 @@

    29.45. The complex type complexType[siri:AffectedStopPointStructure]/L

    -<<<<<<< HEAD - +siri:AffectedLineStructure -======= +siri:AffectedLineWithoutStopStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    29.46. The complex type complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-64.16) -======= -
    -

    29.46. The complex type complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-13.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.46. The complex type complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)

    @@ -213988,11 +210483,7 @@

    29.46. The complex type complexType[siri:AffectedCallStructure]/Affect
      /AffectedInterchanges #complexType
    -<<<<<<< HEAD -   (typedef-64.16) -======= -   (typedef-13.16) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.16)

    @@ -214030,13 +210521,8 @@

    29.46. The complex type complexType[siri:AffectedCallStructure]/Affect

    -<<<<<<< HEAD -
    -

    29.47. The complex type complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-64.4) -======= -
    -

    29.47. The complex type complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-13.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.47. The complex type complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)

    @@ -214056,11 +210542,7 @@

    29.47. The complex type complexType[siri:AffectedLineStructure]/Routes
      /Routes #complexType
    -<<<<<<< HEAD -   (typedef-64.4) -======= -   (typedef-13.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.4)

    @@ -214102,13 +210584,8 @@

    29.47. The complex type complexType[siri:AffectedLineStructure]/Routes

    -<<<<<<< HEAD -
    -

    29.48. The complex type complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-64.5) -======= -
    -

    29.48. The complex type complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-13.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.48. The complex type complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)

    @@ -214128,11 +210605,7 @@

    29.48. The complex type complexType[siri:AffectedLineStructure]/Sectio
      /Sections #complexType
    -<<<<<<< HEAD -   (typedef-64.5) -======= -   (typedef-13.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.5)

    @@ -214174,13 +210647,8 @@

    29.48. The complex type complexType[siri:AffectedLineStructure]/Sectio

    -<<<<<<< HEAD -
    -

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-64.6) -======= -
    -

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-13.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)

    @@ -214200,11 +210668,7 @@

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPo
      /StopPoints #complexType
    -<<<<<<< HEAD -   (typedef-64.6) -======= -   (typedef-13.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.6)

    @@ -214250,13 +210710,8 @@

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPo

    @@ -214234,11 +210698,7 @@

    29.49. The complex type complexType[siri:AffectedLineStructure]/StopPo

    -<<<<<<< HEAD - +siri:AffectedStopPointStructure -======= +siri:AffectedStopPointWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-64.7) -======= -
    -

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-13.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)

    @@ -214276,11 +210731,7 @@

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPl
      /StopPlaces #complexType
    -<<<<<<< HEAD -   (typedef-64.7) -======= -   (typedef-13.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.7)

    @@ -214326,13 +210773,8 @@

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPl

    @@ -214310,11 +210761,7 @@

    29.50. The complex type complexType[siri:AffectedLineStructure]/StopPl

    -<<<<<<< HEAD - +siri:AffectedStopPlaceStructure -======= +siri:AffectedStopPlaceWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    29.51. The complex type complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-64.3) -======= -
    -

    29.51. The complex type complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-13.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.51. The complex type complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)

    @@ -214352,11 +210794,7 @@

    29.51. The complex type complexType[siri:AffectedModesStructure]/Mode#
      /Mode #complexType
    -<<<<<<< HEAD -   (typedef-64.3) -======= -   (typedef-13.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.3)

    @@ -214685,13 +211123,8 @@

    29.51. The complex type complexType[siri:AffectedModesStructure]/Mode#

    -<<<<<<< HEAD -
    -

    29.52. The complex type complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-64.9) -======= -
    -

    29.52. The complex type complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-13.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.52. The complex type complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)

    @@ -214711,11 +211144,7 @@

    29.52. The complex type complexType[siri:AffectedRouteStructure]/Secti
      /Sections #complexType
    -<<<<<<< HEAD -   (typedef-64.9) -======= -   (typedef-13.9) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.9)

    @@ -214757,13 +211186,8 @@

    29.52. The complex type complexType[siri:AffectedRouteStructure]/Secti

    -<<<<<<< HEAD -
    -

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-64.10) -======= -
    -

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-13.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)

    @@ -214783,11 +211207,7 @@

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopP
      /StopPoints #complexType
    -<<<<<<< HEAD -   (typedef-64.10) -======= -   (typedef-13.10) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.10)

    @@ -214880,13 +211296,8 @@

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopP

    @@ -214840,11 +211260,7 @@

    29.53. The complex type complexType[siri:AffectedRouteStructure]/StopP

    -<<<<<<< HEAD - +siri:AffectedStopPointStructure -======= +siri:AffectedStopPointWithoutLineStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    29.54. The complex type complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-64.11) -======= -
    -

    29.54. The complex type complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-13.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.54. The complex type complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)

    @@ -214906,11 +211317,7 @@

    29.54. The complex type complexType[siri:AffectedRouteStructure]/Route
      /RouteLinks #complexType
    -<<<<<<< HEAD -   (typedef-64.11) -======= -   (typedef-13.11) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.11)

    @@ -214952,13 +211359,8 @@

    29.54. The complex type complexType[siri:AffectedRouteStructure]/Route

    -<<<<<<< HEAD -
    -

    29.55. The complex type complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-64.8) -======= -
    -

    29.55. The complex type complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-13.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.55. The complex type complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)

    @@ -214978,11 +211380,7 @@

    29.55. The complex type complexType[siri:AffectedSectionStructure]/Ind
      /IndirectSectionRef #complexType
    -<<<<<<< HEAD -   (typedef-64.8) -======= -   (typedef-13.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.8)

    @@ -215308,13 +211706,8 @@

    29.55. The complex type complexType[siri:AffectedSectionStructure]/Ind

    -<<<<<<< HEAD -
    -

    29.56. The complex type complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-64.21) -======= -
    -

    29.56. The complex type complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-13.21) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.56. The complex type complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)

    @@ -215334,11 +211727,7 @@

    29.56. The complex type complexType[siri:AffectedStopPlaceComponentStr
      /AffectedFacilities #complexType
    -<<<<<<< HEAD -   (typedef-64.21) -======= -   (typedef-13.21) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.21)

    @@ -215380,13 +211769,8 @@

    29.56. The complex type complexType[siri:AffectedStopPlaceComponentStr

    -<<<<<<< HEAD -
    -

    29.57. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-64.18) -======= -
    -

    29.57. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-13.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.57. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)

    @@ -215402,19 +211786,11 @@

    29.57. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD - complexType[siri:AffectedStopPlaceStructure] -
    -   /AffectedFacilities #complexType -
    -   (typedef-64.18) -======= complexType[siri:AffectedStopPlaceWithoutLineStructure]
      /AffectedFacilities #complexType
    -   (typedef-13.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.18)

    		@@ -215456,13 +211832,8 @@

    29.57. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.58. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-64.19) -======= -
    -

    29.58. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-13.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.58. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)

    @@ -215478,19 +211849,11 @@

    29.58. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD - complexType[siri:AffectedStopPlaceStructure] -
    -   /AffectedComponents #complexType -
    -   (typedef-64.19) -======= complexType[siri:AffectedStopPlaceWithoutLineStructure]
      /AffectedComponents #complexType
    -   (typedef-13.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.19)

    		@@ -215528,13 +211891,8 @@

    29.58. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.59. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-64.20) -======= -
    -

    29.59. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-13.20) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.59. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)

    @@ -215550,19 +211908,11 @@

    29.59. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD - complexType[siri:AffectedStopPlaceStructure] -
    -   /AffectedNavigationPaths #complexType -
    -   (typedef-64.20) -======= complexType[siri:AffectedStopPlaceWithoutLineStructure]
      /AffectedNavigationPaths #complexType
    -   (typedef-13.20) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.20)

    		@@ -215604,13 +211954,8 @@

    29.59. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.60. The complex type complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-64.17) -======= -
    -

    29.60. The complex type complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-13.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.60. The complex type complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)

    @@ -215630,11 +211975,7 @@

    29.60. The complex type complexType[siri:AffectedStopPlaceStructure]/L
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-64.17) -======= -   (typedef-13.17) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.17)

    @@ -215676,13 +212017,8 @@

    29.60. The complex type complexType[siri:AffectedStopPlaceStructure]/L

    -<<<<<<< HEAD -
    -

    29.61. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-64.18) -======= -
    -

    29.61. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-13.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.61. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)

    @@ -215702,11 +212038,7 @@

    29.61. The complex type complexType[siri:AffectedStopPlaceWithoutLineS
      /AffectedFacilities #complexType
    -<<<<<<< HEAD -   (typedef-64.18) -======= -   (typedef-13.18) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.18)

    @@ -215748,13 +212080,8 @@

    29.61. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.62. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-64.19) -======= -
    -

    29.62. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-13.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.62. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)

    @@ -215774,11 +212101,7 @@

    29.62. The complex type complexType[siri:AffectedStopPlaceWithoutLineS
      /AffectedComponents #complexType
    -<<<<<<< HEAD -   (typedef-64.19) -======= -   (typedef-13.19) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.19)

    @@ -215816,13 +212139,8 @@

    29.62. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.63. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-64.20) -======= -
    -

    29.63. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-13.20) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.63. The complex type complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)

    @@ -215842,11 +212160,7 @@

    29.63. The complex type complexType[siri:AffectedStopPlaceWithoutLineS
      /AffectedNavigationPaths #complexType
    -<<<<<<< HEAD -   (typedef-64.20) -======= -   (typedef-13.20) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.20)

    @@ -215888,13 +212202,8 @@

    29.63. The complex type complexType[siri:AffectedStopPlaceWithoutLineS

    -<<<<<<< HEAD -
    -

    29.64. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1) -======= -
    -

    29.64. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.64. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)

    @@ -215914,11 +212223,7 @@

    29.64. The complex type complexType[siri:AffectedStopPointWithoutLineS
      /ConnectionLinks #complexType
    -<<<<<<< HEAD -   (typedef-64.1) -======= -   (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.1)

    @@ -215960,13 +212265,8 @@

    29.64. The complex type complexType[siri:AffectedStopPointWithoutLineS

    -<<<<<<< HEAD -
    -

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-64.2) -======= -
    -

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-13.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)

    @@ -215986,11 +212286,7 @@

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/L
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-64.2) -======= -   (typedef-13.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.2)

    @@ -216036,13 +212328,8 @@

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/L

    @@ -216020,11 +212316,7 @@

    29.65. The complex type complexType[siri:AffectedStopPointStructure]/L

    -<<<<<<< HEAD - +siri:AffectedLineStructure -======= +siri:AffectedLineWithoutStopStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    29.66. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1) -======= -
    -

    29.66. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.66. The complex type complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)

    @@ -216062,11 +212349,7 @@

    29.66. The complex type complexType[siri:AffectedStopPointWithoutLineS
      /ConnectionLinks #complexType
    -<<<<<<< HEAD -   (typedef-64.1) -======= -   (typedef-13.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.1)

    @@ -216108,13 +212391,8 @@

    29.66. The complex type complexType[siri:AffectedStopPointWithoutLineS

    -<<<<<<< HEAD -
    -

    29.67. The complex type complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-64.12) -======= -
    -

    29.67. The complex type complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-13.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.67. The complex type complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)

    @@ -216134,11 +212412,7 @@

    29.67. The complex type complexType[siri:AffectedVehicleJourneyStructu
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-64.12) -======= -   (typedef-13.12) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.12)

    @@ -216180,13 +212454,8 @@

    29.67. The complex type complexType[siri:AffectedVehicleJourneyStructu

    -<<<<<<< HEAD -
    -

    29.68. The complex type complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-64.13) -======= -
    -

    29.68. The complex type complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-13.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.68. The complex type complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)

    @@ -216206,11 +212475,7 @@

    29.68. The complex type complexType[siri:AffectedVehicleJourneyStructu
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-64.13) -======= -   (typedef-13.13) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.13)

    @@ -216252,13 +212517,8 @@

    29.68. The complex type complexType[siri:AffectedVehicleJourneyStructu

    -<<<<<<< HEAD -
    -

    29.69. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-64.14) -======= -
    -

    29.69. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-13.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.69. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)

    @@ -216278,11 +212538,7 @@

    29.69. The complex type complexType[siri:AffectedVehicleJourneyStructu
      /Calls #complexType
    -<<<<<<< HEAD -   (typedef-64.14) -======= -   (typedef-13.14) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.14)

    @@ -216324,13 +212580,8 @@

    29.69. The complex type complexType[siri:AffectedVehicleJourneyStructu

    -<<<<<<< HEAD -
    -

    29.70. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-64.15) -======= -
    -

    29.70. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-13.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    29.70. The complex type complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)

    @@ -216350,11 +212601,7 @@

    29.70. The complex type complexType[siri:AffectedVehicleJourneyStructu
      /Facilities #complexType
    -<<<<<<< HEAD -   (typedef-64.15) -======= -   (typedef-13.15) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-29.15)

    @@ -217019,20 +213266,12 @@

    30.1. Simple type definitions

     @@ -223968,11 +220195,7 @@

    34.5. The complex type siri:TargetedVehicleJourneyStructure

    @@ -223993,11 +220216,7 @@

    34.5. The complex type siri:TargetedVehicleJourneyStructure

    @@ -224082,11 +220301,7 @@

    34.5. The complex type siri:TargetedVehicleJourneyStructure

    @@ -224107,11 +220322,7 @@

    34.5. The complex type siri:TargetedVehicleJourneyStructure

    @@ -226905,11 +223116,7 @@

    39.4. The complex type siri:AnnotatedLineStructure

    @@ -226933,11 +223140,7 @@

    39.4. The complex type siri:AnnotatedLineStructure

    @@ -227081,11 +223284,7 @@

    39.5. The complex type siri:RouteDirectionStructure

    @@ -227295,11 +223494,7 @@

    39.6. The complex type siri:StopPointInPatternStructure

    @@ -227323,11 +223518,7 @@

    39.6. The complex type siri:StopPointInPatternStructure

    @@ -227491,13 +223682,8 @@

    39.6. The complex type siri:StopPointInPatternStructure

    @@ -216706,7 +212953,7 @@

    30.1. Simple type definitions

    mobilityImpairedAccessLimited

    		 -

    Access for mobility impaired passengers limited

    +

    Access is limited for mobility impaired passengers. The value should correspond to the overall summary of the AccessibilityAssessment of the StopPoint, when known. +v2.3
    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    element[siri:Predictability]
      #simpleType
    -<<<<<<< HEAD -   (typedef-55.2) -======= -   (typedef-11.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-39.2)

    		@@ -217077,20 +213316,12 @@

    30.1. Simple type definitions

    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    element[siri:VerificationStatus]
      #simpleType
    -<<<<<<< HEAD -   (typedef-55.1) -======= -   (typedef-11.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-39.1)

    		@@ -223943,11 +220174,7 @@

    34.5. The complex type siri:TargetedVehicleJourneyStructure

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-4.1 -======= - +local-type: typedef-2.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-69.1

    -<<<<<<< HEAD - +local-type: typedef-4.2 -======= - +local-type: typedef-2.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-69.2

    -<<<<<<< HEAD - +local-type: typedef-4.3 -======= - +local-type: typedef-2.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-69.3

    -<<<<<<< HEAD - +local-type: typedef-2.1 -======= - +local-type: typedef-3.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-67.1

    -<<<<<<< HEAD - +local-type: typedef-2.2 -======= - +local-type: typedef-3.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-67.2

    -<<<<<<< HEAD -
    -

    39.7. The complex type complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-4.1) -======= -
    -

    39.7. The complex type complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-2.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.7. The complex type complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)

    @@ -227517,11 +223703,7 @@

    39.7. The complex type complexType[siri:AnnotatedLineStructure]/Destin
      /Destinations #complexType
    -<<<<<<< HEAD -   (typedef-4.1) -======= -   (typedef-2.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-69.1)

    @@ -227564,13 +223746,8 @@

    39.7. The complex type complexType[siri:AnnotatedLineStructure]/Destin

    -<<<<<<< HEAD -
    -

    39.8. The complex type complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-4.2) -======= -
    -

    39.8. The complex type complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-2.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.8. The complex type complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)

    @@ -227590,11 +223767,7 @@

    39.8. The complex type complexType[siri:AnnotatedLineStructure]/Direct
      /Directions #complexType
    -<<<<<<< HEAD -   (typedef-4.2) -======= -   (typedef-2.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-69.2)

    @@ -227636,13 +223809,8 @@

    39.8. The complex type complexType[siri:AnnotatedLineStructure]/Direct

    -<<<<<<< HEAD -
    -

    39.9. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-4.3) -======= -
    -

    39.9. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-2.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.9. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)

    @@ -227662,11 +223830,7 @@

    39.9. The complex type complexType[siri:RouteDirectionStructure]/Journ
      /JourneyPatterns #complexType
    -<<<<<<< HEAD -   (typedef-4.3) -======= -   (typedef-2.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-69.3)

    @@ -227712,13 +223872,8 @@

    39.9. The complex type complexType[siri:RouteDirectionStructure]/Journ

    @@ -227696,11 +223860,7 @@

    39.9. The complex type complexType[siri:RouteDirectionStructure]/Journ

    -<<<<<<< HEAD - +local-type: typedef-4.4 -======= - +local-type: typedef-2.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-69.4

    -<<<<<<< HEAD -
    -

    39.10. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-4.4) -======= -
    -

    39.10. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-2.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.10. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)

    @@ -227738,11 +223893,7 @@

    39.10. The complex type complexType[siri:RouteDirectionStructure]/Jour
      /JourneyPatterns/JourneyPattern #complexType
    -<<<<<<< HEAD -   (typedef-4.4) -======= -   (typedef-2.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-69.4)

    @@ -227833,13 +223980,8 @@

    39.10. The complex type complexType[siri:RouteDirectionStructure]/Jour

    @@ -227817,11 +223968,7 @@

    39.10. The complex type complexType[siri:RouteDirectionStructure]/Jour

    -<<<<<<< HEAD - +local-type: typedef-4.5 -======= - +local-type: typedef-2.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-69.5

    -<<<<<<< HEAD -
    -

    39.11. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-4.5) -======= -
    -

    39.11. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-2.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.11. The complex type complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)

    @@ -227859,11 +224001,7 @@

    39.11. The complex type complexType[siri:RouteDirectionStructure]/Jour
      /JourneyPatterns/JourneyPattern/StopsInPattern #complexType
    -<<<<<<< HEAD -   (typedef-4.5) -======= -   (typedef-2.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-69.5)

    @@ -227905,13 +224043,8 @@

    39.11. The complex type complexType[siri:RouteDirectionStructure]/Jour

    -<<<<<<< HEAD -
    -

    39.12. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-2.1) -======= -
    -

    39.12. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-3.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.12. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)

    @@ -227931,11 +224064,7 @@

    39.12. The complex type complexType[siri:AnnotatedStopPointStructure]/
      /Features #complexType
    -<<<<<<< HEAD -   (typedef-2.1) -======= -   (typedef-3.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-67.1)

    @@ -228021,13 +224150,8 @@

    39.12. The complex type complexType[siri:AnnotatedStopPointStructure]/

    -<<<<<<< HEAD -
    -

    39.13. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-2.2) -======= -
    -

    39.13. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-3.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    39.13. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)

    @@ -228047,11 +224171,7 @@

    39.13. The complex type complexType[siri:AnnotatedStopPointStructure]/
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-2.2) -======= -   (typedef-3.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-67.2)

    @@ -228367,11 +224483,7 @@

    40.2. The complex type siri:AnnotatedStopPointStructure

    @@ -228430,13 +224542,8 @@

    40.2. The complex type siri:AnnotatedStopPointStructure

    @@ -228339,11 +224459,7 @@

    40.2. The complex type siri:AnnotatedStopPointStructure

    -<<<<<<< HEAD - +local-type: typedef-2.1 -======= - +local-type: typedef-3.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-67.1

    -<<<<<<< HEAD - +local-type: typedef-2.2 -======= - +local-type: typedef-3.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-67.2

    -<<<<<<< HEAD -
    -

    40.3. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-2.1) -======= -
    -

    40.3. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-3.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    40.3. The complex type complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)

    @@ -228456,11 +224563,7 @@

    40.3. The complex type complexType[siri:AnnotatedStopPointStructure]/F
      /Features #complexType
    -<<<<<<< HEAD -   (typedef-2.1) -======= -   (typedef-3.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-67.1)

    @@ -228546,13 +224649,8 @@

    40.3. The complex type complexType[siri:AnnotatedStopPointStructure]/F

    -<<<<<<< HEAD -
    -

    40.4. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-2.2) -======= -
    -

    40.4. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-3.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    40.4. The complex type complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)

    @@ -228572,11 +224670,7 @@

    40.4. The complex type complexType[siri:AnnotatedStopPointStructure]/L
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-2.2) -======= -   (typedef-3.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-67.2)

    @@ -229854,11 +225944,7 @@

    41.13. The group siri:SiriProductionTimetableIndexGroup

    @@ -229910,11 +225996,7 @@

    41.13. The group siri:SiriProductionTimetableIndexGroup

    @@ -230523,11 +226605,7 @@

    41.14. The complex type siri:DatedTimetableVersionFrameStructure

    @@ -230978,11 +227056,7 @@

    41.15. The complex type siri:ProductionTimetableCapabilitiesResponseSt

    @@ -231892,11 +227966,7 @@

    41.19. The complex type siri:ProductionTimetableRequestStructure

    @@ -232227,11 +228297,7 @@

    41.20. The complex type siri:ProductionTimetableServiceCapabilitiesStr

    @@ -232255,11 +228321,7 @@

    41.20. The complex type siri:ProductionTimetableServiceCapabilitiesStr

    @@ -232283,11 +228345,7 @@

    41.20. The complex type siri:ProductionTimetableServiceCapabilitiesStr

    @@ -232659,13 +228717,8 @@

    41.22. The complex type siri:TimetableValidityPeriod

    @@ -229700,11 +225794,7 @@

    41.12. The group siri:ProductionTimetableTopicGroup

    -<<<<<<< HEAD - +local-type: typedef-79.1 -======= - +local-type: typedef-72.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.1

    -<<<<<<< HEAD - +local-type: typedef-79.2 -======= - +local-type: typedef-72.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.2

    -<<<<<<< HEAD - +local-type: typedef-79.3 -======= - +local-type: typedef-72.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.3

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-79.7 -======= - +local-type: typedef-72.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.7

    -<<<<<<< HEAD - +local-type: typedef-79.1 -======= - +local-type: typedef-72.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.1

    -<<<<<<< HEAD - +local-type: typedef-79.4 -======= - +local-type: typedef-72.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.4

    -<<<<<<< HEAD - +local-type: typedef-79.5 -======= - +local-type: typedef-72.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.5

    -<<<<<<< HEAD - +local-type: typedef-79.6 -======= - +local-type: typedef-72.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-82.6

    -<<<<<<< HEAD -
    -

    41.23. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3) -======= -
    -

    41.23. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.23. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)

    @@ -232685,11 +228738,7 @@

    41.23. The complex type element[siri:ProductionTimetableCapabilitiesRe
      #complexType
    -<<<<<<< HEAD -   (typedef-79.3) -======= -   (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.3)

    @@ -232839,13 +228888,8 @@

    41.23. The complex type element[siri:ProductionTimetableCapabilitiesRe

    -<<<<<<< HEAD -
    -

    41.24. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-79.7) -======= -
    -

    41.24. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-72.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.24. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)

    @@ -232865,11 +228909,7 @@

    41.24. The complex type element[siri:ProductionTimetablePermissions]#c
      #complexType
    -<<<<<<< HEAD -   (typedef-79.7) -======= -   (typedef-72.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.7)

    @@ -232944,13 +228984,8 @@

    41.24. The complex type element[siri:ProductionTimetablePermissions]#c

    -<<<<<<< HEAD -
    -

    41.25. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2) -======= -
    -

    41.25. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.25. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)

    @@ -232970,11 +229005,7 @@

    41.25. The complex type element[siri:ProductionTimetableSubscriptionRe
      #complexType
    -<<<<<<< HEAD -   (typedef-79.2) -======= -   (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.2)

    @@ -233171,13 +229202,8 @@

    41.25. The complex type element[siri:ProductionTimetableSubscriptionRe

    -<<<<<<< HEAD -
    -

    41.26. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-79.1) -======= -
    -

    41.26. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-72.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.26. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)

    @@ -233197,11 +229223,7 @@

    41.26. The complex type group[siri:ProductionTimetableTopicGroup]/Line
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-79.1) -======= -   (typedef-72.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.1)

    @@ -233243,13 +229265,8 @@

    41.26. The complex type group[siri:ProductionTimetableTopicGroup]/Line

    -<<<<<<< HEAD -
    -

    41.27. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2) -======= -
    -

    41.27. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.27. The complex type element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)

    @@ -233269,11 +229286,7 @@

    41.27. The complex type element[siri:ProductionTimetableSubscriptionRe
      #complexType
    -<<<<<<< HEAD -   (typedef-79.2) -======= -   (typedef-72.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.2)

    @@ -233470,13 +229483,8 @@

    41.27. The complex type element[siri:ProductionTimetableSubscriptionRe

    -<<<<<<< HEAD -
    -

    41.28. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3) -======= -
    -

    41.28. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.28. The complex type element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)

    @@ -233496,11 +229504,7 @@

    41.28. The complex type element[siri:ProductionTimetableCapabilitiesRe
      #complexType
    -<<<<<<< HEAD -   (typedef-79.3) -======= -   (typedef-72.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.3)

    @@ -233650,13 +229654,8 @@

    41.28. The complex type element[siri:ProductionTimetableCapabilitiesRe

    -<<<<<<< HEAD -
    -

    41.29. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-79.7) -======= -
    -

    41.29. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-72.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.29. The complex type element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)

    @@ -233676,11 +229675,7 @@

    41.29. The complex type element[siri:ProductionTimetablePermissions]#c
      #complexType
    -<<<<<<< HEAD -   (typedef-79.7) -======= -   (typedef-72.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.7)

    @@ -233755,13 +229750,8 @@

    41.29. The complex type element[siri:ProductionTimetablePermissions]#c

    -<<<<<<< HEAD -
    -

    41.30. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-79.1) -======= -
    -

    41.30. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-72.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.30. The complex type group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)

    @@ -233781,11 +229771,7 @@

    41.30. The complex type group[siri:ProductionTimetableTopicGroup]/Line
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-79.1) -======= -   (typedef-72.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.1)

    @@ -233827,13 +229813,8 @@

    41.30. The complex type group[siri:ProductionTimetableTopicGroup]/Line

    -<<<<<<< HEAD -
    -

    41.31. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.4) -======= -
    -

    41.31. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.31. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)

    @@ -233853,11 +229834,7 @@

    41.31. The complex type complexType[siri:ProductionTimetableServiceCap
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-79.4) -======= -   (typedef-72.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.4)

    @@ -234054,13 +230031,8 @@

    41.31. The complex type complexType[siri:ProductionTimetableServiceCap

    -<<<<<<< HEAD -
    -

    41.32. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.5) -======= -
    -

    41.32. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.32. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)

    @@ -234080,11 +230052,7 @@

    41.32. The complex type complexType[siri:ProductionTimetableServiceCap
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-79.5) -======= -   (typedef-72.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.5)

    @@ -234228,13 +230196,8 @@

    41.32. The complex type complexType[siri:ProductionTimetableServiceCap

    -<<<<<<< HEAD -
    -

    41.33. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-79.6) -======= -
    -

    41.33. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-72.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    41.33. The complex type complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)

    @@ -234254,11 +230217,7 @@

    41.33. The complex type complexType[siri:ProductionTimetableServiceCap
      /SubscriptionPolicy #complexType
    -<<<<<<< HEAD -   (typedef-79.6) -======= -   (typedef-72.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-82.6)

    @@ -235748,11 +231703,7 @@

    42.14. The group siri:SituationExchangeTopicGroup

    @@ -235847,11 +231798,7 @@

    42.14. The group siri:SituationExchangeTopicGroup

    @@ -236164,11 +232111,7 @@

    42.14. The group siri:SituationExchangeTopicGroup

    @@ -236447,11 +232390,7 @@

    42.17. The group siri:SituationNetworkFilterGroup

    @@ -236546,11 +232485,7 @@

    42.17. The group siri:SituationNetworkFilterGroup

    @@ -237715,11 +233650,7 @@

    42.26. The complex type siri:SituationExchangeCapabilitiesResponseStru

    @@ -238227,11 +234158,7 @@

    42.28. The complex type siri:SituationExchangeDeliveryStructure

    @@ -238971,11 +234898,7 @@

    42.29. The complex type siri:SituationExchangeRequestStructure

    @@ -239070,11 +234993,7 @@

    42.29. The complex type siri:SituationExchangeRequestStructure

    @@ -239387,11 +235306,7 @@

    42.29. The complex type siri:SituationExchangeRequestStructure

    @@ -239616,11 +235531,7 @@

    42.30. The complex type siri:SituationExchangeServiceCapabilitiesStruc

    @@ -239644,11 +235555,7 @@

    42.30. The complex type siri:SituationExchangeServiceCapabilitiesStruc

    @@ -239696,11 +235603,7 @@

    42.30. The complex type siri:SituationExchangeServiceCapabilitiesStruc

    @@ -239724,11 +235627,7 @@

    42.30. The complex type siri:SituationExchangeServiceCapabilitiesStruc

    @@ -239887,11 +235786,7 @@

    42.31. The complex type siri:SituationExchangeServicePermissionStructu

    @@ -239925,11 +235820,7 @@

    42.31. The complex type siri:SituationExchangeServicePermissionStructu

    @@ -239958,11 +235849,7 @@

    42.31. The complex type siri:SituationExchangeServicePermissionStructu

    @@ -240218,13 +236105,8 @@

    42.32. The complex type siri:SituationExchangeSubscriptionStructure -<<<<<<< HEAD -
    -

    42.33. The complex type element[siri:SituationExchangePermissions]#complexType (typedef-73.8) -=======

    42.33. The complex type element[siri:SituationExchangePermissions]#complexType (typedef-77.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -234973,11 +230932,7 @@

    42.11. The group siri:SituationExchangePayloadGroup

    -<<<<<<< HEAD - +local-type: typedef-73.3 -======= +local-type: typedef-77.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Referance to an OPERATOR. If unspecified, all OPERATOR.s.

    -=======

    Reference to an OPERATOR. If unspecified, all OPERATOR.s.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.2 -======= +local-type: typedef-77.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.1 -======= +local-type: typedef-77.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Referance to an OPERATOR. If unspecified, all OPERATOR.s.

    -=======

    Reference to an OPERATOR. If unspecified, all OPERATOR.s.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.2 -======= +local-type: typedef-77.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.8 -======= +local-type: typedef-77.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.3 -======= +local-type: typedef-77.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Referance to an OPERATOR. If unspecified, all OPERATOR.s.

    -=======

    Reference to an OPERATOR. If unspecified, all OPERATOR.s.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.2 -======= +local-type: typedef-77.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.1 -======= +local-type: typedef-77.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.4 -======= +local-type: typedef-77.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.5 -======= +local-type: typedef-77.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.6 -======= +local-type: typedef-77.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-73.7 -======= +local-type: typedef-77.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    @@ -240244,11 +236126,7 @@

    42.33. The complex type element[siri:SituationExchangePermissions]#com
      #complexType
    -<<<<<<< HEAD -   (typedef-73.8) -=======   (typedef-77.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240322,13 +236200,8 @@

    42.33. The complex type element[siri:SituationExchangePermissions]#com

    -<<<<<<< HEAD -
    -

    42.34. The complex type group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-73.3) -=======

    42.34. The complex type group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240348,11 +236221,7 @@

    42.34. The complex type group[siri:SituationExchangePayloadGroup]/Situ
      /Situations #complexType
    -<<<<<<< HEAD -   (typedef-73.3) -=======   (typedef-77.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240408,24 +236277,15 @@

    42.34. The complex type group[siri:SituationExchangePayloadGroup]/Situ

    		-<<<<<<< HEAD -

    Type for individual IPT ncident.

    -=======

    Type for individual PT incident.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -
    -

    42.35. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2) -=======

    42.35. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240445,11 +236305,7 @@

    42.35. The complex type group[siri:SituationNetworkFilterGroup]/Lines#
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-73.2) -=======   (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240491,13 +236347,8 @@

    42.35. The complex type group[siri:SituationNetworkFilterGroup]/Lines#

    -<<<<<<< HEAD -
    -

    42.36. The complex type group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-73.1) -=======

    42.36. The complex type group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240517,11 +236368,7 @@

    42.36. The complex type group[siri:SituationExchangeTopicGroup]/Situat
      /SituationRoadFilter #complexType
    -<<<<<<< HEAD -   (typedef-73.1) -=======   (typedef-77.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240563,13 +236410,8 @@

    42.36. The complex type group[siri:SituationExchangeTopicGroup]/Situat

    -<<<<<<< HEAD -
    -

    42.37. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2) -=======

    42.37. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240589,11 +236431,7 @@

    42.37. The complex type group[siri:SituationNetworkFilterGroup]/Lines#
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-73.2) -=======   (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240635,13 +236473,8 @@

    42.37. The complex type group[siri:SituationNetworkFilterGroup]/Lines#

    -<<<<<<< HEAD -
    -

    42.38. The complex type element[siri:SituationExchangePermissions]#complexType (typedef-73.8) -=======

    42.38. The complex type element[siri:SituationExchangePermissions]#complexType (typedef-77.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240661,11 +236494,7 @@

    42.38. The complex type element[siri:SituationExchangePermissions]#com
      #complexType
    -<<<<<<< HEAD -   (typedef-73.8) -=======   (typedef-77.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240739,13 +236568,8 @@

    42.38. The complex type element[siri:SituationExchangePermissions]#com

    -<<<<<<< HEAD -
    -

    42.39. The complex type group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-73.3) -=======

    42.39. The complex type group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240765,11 +236589,7 @@

    42.39. The complex type group[siri:SituationExchangePayloadGroup]/Situ
      /Situations #complexType
    -<<<<<<< HEAD -   (typedef-73.3) -=======   (typedef-77.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240825,24 +236645,15 @@

    42.39. The complex type group[siri:SituationExchangePayloadGroup]/Situ

    		-<<<<<<< HEAD -

    Type for individual IPT ncident.

    -=======

    Type for individual PT incident.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -
    -

    42.40. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2) -=======

    42.40. The complex type group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240862,11 +236673,7 @@

    42.40. The complex type group[siri:SituationNetworkFilterGroup]/Lines#
      /Lines #complexType
    -<<<<<<< HEAD -   (typedef-73.2) -=======   (typedef-77.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240908,13 +236715,8 @@

    42.40. The complex type group[siri:SituationNetworkFilterGroup]/Lines#

    -<<<<<<< HEAD -
    -

    42.41. The complex type group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-73.1) -=======

    42.41. The complex type group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240934,11 +236736,7 @@

    42.41. The complex type group[siri:SituationExchangeTopicGroup]/Situat
      /SituationRoadFilter #complexType
    -<<<<<<< HEAD -   (typedef-73.1) -=======   (typedef-77.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -240980,13 +236778,8 @@

    42.41. The complex type group[siri:SituationExchangeTopicGroup]/Situat

    -<<<<<<< HEAD -
    -

    42.42. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.4) -=======

    42.42. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241006,11 +236799,7 @@

    42.42. The complex type complexType[siri:SituationExchangeServiceCapab
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-73.4) -=======   (typedef-77.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241359,13 +237148,8 @@

    42.42. The complex type complexType[siri:SituationExchangeServiceCapab

    -<<<<<<< HEAD -
    -

    42.43. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.5) -=======

    42.43. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241385,11 +237169,7 @@

    42.43. The complex type complexType[siri:SituationExchangeServiceCapab
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-73.5) -=======   (typedef-77.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241561,13 +237341,8 @@

    42.43. The complex type complexType[siri:SituationExchangeServiceCapab

    -<<<<<<< HEAD -
    -

    42.44. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.6) -=======

    42.44. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241587,11 +237362,7 @@

    42.44. The complex type complexType[siri:SituationExchangeServiceCapab
      /AccessControl #complexType
    -<<<<<<< HEAD -   (typedef-73.6) -=======   (typedef-77.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241692,13 +237463,8 @@

    42.44. The complex type complexType[siri:SituationExchangeServiceCapab

    -<<<<<<< HEAD -
    -

    42.45. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.7) -=======

    42.45. The complex type complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241718,11 +237484,7 @@

    42.45. The complex type complexType[siri:SituationExchangeServiceCapab
      /ResponseFeatures #complexType
    -<<<<<<< HEAD -   (typedef-73.7) -=======   (typedef-77.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -241736,13 +237498,8 @@

    42.45. The complex type complexType[siri:SituationExchangeServiceCapab

    -<<<<<<< HEAD -
    -

    42.46. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    42.46. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    42.46. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -241762,11 +237519,7 @@

    42.46. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -241834,13 +237587,8 @@

    42.46. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    42.47. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    42.47. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    42.47. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -241860,11 +237608,7 @@

    42.47. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -241949,13 +237693,8 @@

    42.47. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    42.48. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    42.48. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    42.48. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -241975,11 +237714,7 @@

    42.48. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -246071,11 +241802,7 @@

    43.35. The complex type siri:StopMonitoringCapabilitiesResponseStructu

    @@ -247407,11 +243134,7 @@

    43.39. The complex type siri:StopMonitoringFilterStructure

    @@ -248090,11 +243813,7 @@

    43.41. The complex type siri:StopMonitoringRequestStructure

    @@ -248234,11 +243953,7 @@

    43.42. The complex type siri:StopMonitoringServiceCapabilitiesStructur

    @@ -248262,11 +243977,7 @@

    43.42. The complex type siri:StopMonitoringServiceCapabilitiesStructur

    @@ -248338,11 +244049,7 @@

    43.42. The complex type siri:StopMonitoringServiceCapabilitiesStructur

    @@ -248476,11 +244183,7 @@

    43.43. The complex type siri:StopMonitoringServicePermissionStructure<

    @@ -248514,11 +244217,7 @@

    43.43. The complex type siri:StopMonitoringServicePermissionStructure<

    @@ -248547,11 +244246,7 @@

    43.43. The complex type siri:StopMonitoringServicePermissionStructure<

    @@ -248579,11 +244274,7 @@

    43.43. The complex type siri:StopMonitoringServicePermissionStructure<

    @@ -249286,13 +244977,8 @@

    43.46. The complex type siri:StopNoticeStructure

    @@ -243514,11 +239249,7 @@

    43.23. The group siri:StopMonitoringRequestPolicyGroup

    -<<<<<<< HEAD - +local-type: typedef-81.1 -======= +local-type: typedef-80.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.5 -======= +local-type: typedef-80.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.1 -======= +local-type: typedef-80.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.1 -======= +local-type: typedef-80.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.2 -======= +local-type: typedef-80.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.3 -======= +local-type: typedef-80.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-81.4 -======= +local-type: typedef-80.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    -<<<<<<< HEAD - +local-type: typedef-81.6 -======= +local-type: typedef-80.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    43.47. The complex type element[siri:StopMonitoringPermissions]#complexType (typedef-81.5) -=======

    43.47. The complex type element[siri:StopMonitoringPermissions]#complexType (typedef-80.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249312,11 +244998,7 @@

    43.47. The complex type element[siri:StopMonitoringPermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-81.5) -=======   (typedef-80.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249390,13 +245072,8 @@

    43.47. The complex type element[siri:StopMonitoringPermissions]#comple

    -<<<<<<< HEAD -
    -

    43.48. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1) -=======

    43.48. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249416,11 +245093,7 @@

    43.48. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M
      /MaximumNumberOfCalls #complexType
    -<<<<<<< HEAD -   (typedef-81.1) -=======   (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249480,13 +245153,8 @@

    43.48. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M

    -<<<<<<< HEAD -
    -

    43.49. The complex type element[siri:StopMonitoringPermissions]#complexType (typedef-81.5) -=======

    43.49. The complex type element[siri:StopMonitoringPermissions]#complexType (typedef-80.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249506,11 +245174,7 @@

    43.49. The complex type element[siri:StopMonitoringPermissions]#comple
      #complexType
    -<<<<<<< HEAD -   (typedef-81.5) -=======   (typedef-80.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249584,13 +245248,8 @@

    43.49. The complex type element[siri:StopMonitoringPermissions]#comple

    -<<<<<<< HEAD -
    -

    43.50. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1) -=======

    43.50. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249610,11 +245269,7 @@

    43.50. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M
      /MaximumNumberOfCalls #complexType
    -<<<<<<< HEAD -   (typedef-81.1) -=======   (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249674,13 +245329,8 @@

    43.50. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M

    -<<<<<<< HEAD -
    -

    43.51. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1) -=======

    43.51. The complex type group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249700,11 +245350,7 @@

    43.51. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M
      /MaximumNumberOfCalls #complexType
    -<<<<<<< HEAD -   (typedef-81.1) -=======   (typedef-80.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249764,13 +245410,8 @@

    43.51. The complex type group[siri:StopMonitoringRequestPolicyGroup]/M

    -<<<<<<< HEAD -
    -

    43.52. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.2) -=======

    43.52. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249790,11 +245431,7 @@

    43.52. The complex type complexType[siri:StopMonitoringServiceCapabili
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-81.2) -=======   (typedef-80.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -249987,13 +245624,8 @@

    43.52. The complex type complexType[siri:StopMonitoringServiceCapabili

    -<<<<<<< HEAD -
    -

    43.53. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-81.3) -=======

    43.53. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -250013,11 +245645,7 @@

    43.53. The complex type complexType[siri:StopMonitoringServiceCapabili
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-81.3) -=======   (typedef-80.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -250357,13 +245985,8 @@

    43.53. The complex type complexType[siri:StopMonitoringServiceCapabili

    -<<<<<<< HEAD -
    -

    43.54. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-81.4) -=======

    43.54. The complex type complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -250383,11 +246006,7 @@

    43.54. The complex type complexType[siri:StopMonitoringServiceCapabili
      /ResponseFeatures #complexType
    -<<<<<<< HEAD -   (typedef-81.4) -=======   (typedef-80.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -250447,13 +246066,8 @@

    43.54. The complex type complexType[siri:StopMonitoringServiceCapabili

    -<<<<<<< HEAD -
    -

    43.55. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    43.55. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    43.55. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -250473,11 +246087,7 @@

    43.55. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -250545,13 +246155,8 @@

    43.55. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    43.56. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    43.56. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    43.56. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -250571,11 +246176,7 @@

    43.56. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -250660,13 +246261,8 @@

    43.56. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    43.57. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    43.57. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    43.57. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -250686,11 +246282,7 @@

    43.57. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -250775,13 +246367,8 @@

    43.57. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    43.58. The complex type complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-81.6) -=======

    43.58. The complex type complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -250801,11 +246388,7 @@

    43.58. The complex type complexType[siri:StopMonitoringServicePermissi
      /StopMonitorPermissions #complexType
    -<<<<<<< HEAD -   (typedef-81.6) -=======   (typedef-80.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -253097,11 +248676,7 @@

    44.18. The complex type siri:StopTimetableServiceCapabilitiesStructure

    @@ -253149,11 +248724,7 @@

    44.18. The complex type siri:StopTimetableServiceCapabilitiesStructure

    @@ -253312,11 +248883,7 @@

    44.19. The complex type siri:StopTimetableServicePermissionStructure

    @@ -253350,11 +248917,7 @@

    44.19. The complex type siri:StopTimetableServicePermissionStructure

    @@ -253383,11 +248946,7 @@

    44.19. The complex type siri:StopTimetableServicePermissionStructure

    @@ -253415,11 +248974,7 @@

    44.19. The complex type siri:StopTimetableServicePermissionStructure

    @@ -254375,13 +249930,8 @@

    44.22. The complex type siri:TimetabledStopVisitStructure

    @@ -251949,11 +247532,7 @@

    44.13. The complex type siri:StopTimetableCapabilitiesResponseStructur

    -<<<<<<< HEAD - +local-type: typedef-82.3 -======= - +local-type: typedef-76.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-75.3

    -<<<<<<< HEAD - +local-type: typedef-82.1 -======= - +local-type: typedef-76.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-75.1

    -<<<<<<< HEAD - +local-type: typedef-82.2 -======= - +local-type: typedef-76.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-75.2

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    -<<<<<<< HEAD - +local-type: typedef-82.4 -======= - +local-type: typedef-76.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-75.4

    -<<<<<<< HEAD -
    -

    44.23. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-82.3) -======= -
    -

    44.23. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-76.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.23. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-75.3)

    @@ -254401,11 +249951,7 @@

    44.23. The complex type element[siri:StopTimetablePermissions]#complex
      #complexType
    -<<<<<<< HEAD -   (typedef-82.3) -======= -   (typedef-76.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-75.3)

    @@ -254479,13 +250025,8 @@

    44.23. The complex type element[siri:StopTimetablePermissions]#complex

    -<<<<<<< HEAD -
    -

    44.24. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-82.3) -======= -
    -

    44.24. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-76.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.24. The complex type element[siri:StopTimetablePermissions]#complexType (typedef-75.3)

    @@ -254505,11 +250046,7 @@

    44.24. The complex type element[siri:StopTimetablePermissions]#complex
      #complexType
    -<<<<<<< HEAD -   (typedef-82.3) -======= -   (typedef-76.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-75.3)

    @@ -254583,13 +250120,8 @@

    44.24. The complex type element[siri:StopTimetablePermissions]#complex

    -<<<<<<< HEAD -
    -

    44.25. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.1) -======= -
    -

    44.25. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.25. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)

    @@ -254609,11 +250141,7 @@

    44.25. The complex type complexType[siri:StopTimetableServiceCapabilit
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-82.1) -======= -   (typedef-76.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-75.1)

    @@ -254707,13 +250235,8 @@

    44.25. The complex type complexType[siri:StopTimetableServiceCapabilit

    -<<<<<<< HEAD -
    -

    44.26. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-82.2) -======= -
    -

    44.26. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-76.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.26. The complex type complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)

    @@ -254733,11 +250256,7 @@

    44.26. The complex type complexType[siri:StopTimetableServiceCapabilit
      /AccessControl #complexType
    -<<<<<<< HEAD -   (typedef-82.2) -======= -   (typedef-76.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-75.2)

    @@ -254862,13 +250381,8 @@

    44.26. The complex type complexType[siri:StopTimetableServiceCapabilit

    -<<<<<<< HEAD -
    -

    44.27. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    44.27. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.27. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -254888,11 +250402,7 @@

    44.27. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -254960,13 +250470,8 @@

    44.27. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    44.28. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    44.28. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.28. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -254986,11 +250491,7 @@

    44.28. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -255075,13 +250576,8 @@

    44.28. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    44.29. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    44.29. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.29. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -255101,11 +250597,7 @@

    44.29. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -255190,13 +250682,8 @@

    44.29. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    44.30. The complex type complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-82.4) -======= -
    -

    44.30. The complex type complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-76.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    44.30. The complex type complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)

    @@ -255216,11 +250703,7 @@

    44.30. The complex type complexType[siri:StopTimetableServicePermissio
      /StopMonitorPermissions #complexType
    -<<<<<<< HEAD -   (typedef-82.4) -======= -   (typedef-76.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-75.4)

    @@ -255424,11 +250903,7 @@

    45.1. Simple type definitions

    xs:nonNegativeInteger: (empty restriction)

     @@ -256629,11 +252104,7 @@

    47.2. The complex type siri:AbstractPermissionStructure

    @@ -256761,13 +252232,8 @@

    47.4. The complex type siri:CapabilityAccessControlStructure

    @@ -255360,11 +250843,7 @@

    45.1. Simple type definitions

    xs:nonNegativeInteger: (empty restriction)

    		 -<<<<<<< HEAD -

    Distance (metres) as defined by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres. ALternative units may be specifed by context.

    -=======

    Distance (in metres) as defined by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres.

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
    -<<<<<<< HEAD -

    Distance (metres per second) ALternative unist may be specifed by context.

    -=======

    Velocity (in metres per second).

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD -
    -

    47.5. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    47.5. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    47.5. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -256787,11 +252253,7 @@

    47.5. The complex type complexType[siri:AbstractPermissionStructure]/G
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -260468,11 +255918,7 @@

    50.19. The complex type siri:VehicleActivityStructure

    @@ -260786,11 +256232,7 @@

    50.20. The complex type siri:VehicleMonitoringCapabilitiesResponseStru

    @@ -261930,11 +257372,7 @@

    50.25. The complex type siri:VehicleMonitoringRequestStructure

    @@ -262094,11 +257532,7 @@

    50.26. The complex type siri:VehicleMonitoringServiceCapabilitiesStruc

    @@ -262122,11 +257556,7 @@

    50.26. The complex type siri:VehicleMonitoringServiceCapabilitiesStruc

    @@ -262174,11 +257604,7 @@

    50.26. The complex type siri:VehicleMonitoringServiceCapabilitiesStruc

    @@ -262202,11 +257628,7 @@

    50.26. The complex type siri:VehicleMonitoringServiceCapabilitiesStruc

    @@ -262365,11 +257787,7 @@

    50.27. The complex type siri:VehicleMonitoringServicePermissionStructu

    @@ -262403,11 +257821,7 @@

    50.27. The complex type siri:VehicleMonitoringServicePermissionStructu

    @@ -262436,11 +257850,7 @@

    50.27. The complex type siri:VehicleMonitoringServicePermissionStructu

    @@ -262468,11 +257878,7 @@

    50.27. The complex type siri:VehicleMonitoringServicePermissionStructu

    @@ -262885,13 +258291,8 @@

    50.29. The complex type siri:VehicleMonitorPermissionStructure

    @@ -256911,7 +252373,7 @@

    48.1. Simple type definitions

    		 -

    xs:NMTOKEN: (empty restriction)

    +

    xs:normalizedString: (empty restriction)

    Id type for document references.

    @@ -257016,7 +252478,7 @@

    48.1. Simple type definitions

    		 -

    xs:duration: (empty restriction)

    +

    xs:duration: value>=PT0S

    Limited version of duration. Must be positive.

    @@ -257054,20 +252516,12 @@

    48.1. Simple type definitions

    -<<<<<<< HEAD -

    -======= -

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +

    attribute[lang]
      #simpleType
    -<<<<<<< HEAD -   (typedef-24.1) -======= -   (typedef-1.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-71.1)

    		@@ -259341,11 +254795,7 @@

    50.14. The group siri:VehicleMonitoringRequestPolicyGroup

    -<<<<<<< HEAD - +local-type: typedef-80.1 -======= - +local-type: typedef-75.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.1

    -<<<<<<< HEAD - +local-type: typedef-80.2 -======= - +local-type: typedef-75.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.2

    -<<<<<<< HEAD - +local-type: typedef-80.7 -======= - +local-type: typedef-75.7 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.7

    -<<<<<<< HEAD - +local-type: typedef-80.1 -======= - +local-type: typedef-75.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.1

    -<<<<<<< HEAD - +local-type: typedef-80.3 -======= - +local-type: typedef-75.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.3

    -<<<<<<< HEAD - +local-type: typedef-80.4 -======= - +local-type: typedef-75.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.4

    -<<<<<<< HEAD - +local-type: typedef-80.5 -======= - +local-type: typedef-75.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.5

    -<<<<<<< HEAD - +local-type: typedef-80.6 -======= - +local-type: typedef-75.6 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.6

    -<<<<<<< HEAD - +local-type: typedef-36.1 -======= - +local-type: typedef-50.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-10.1

    -<<<<<<< HEAD - +local-type: typedef-56.2 -======= - +local-type: typedef-8.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.2

    -<<<<<<< HEAD - +local-type: typedef-56.1 -======= - +local-type: typedef-8.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-27.1

    -<<<<<<< HEAD - +local-type: typedef-80.8 -======= - +local-type: typedef-75.8 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-79.8

    -<<<<<<< HEAD -
    -

    50.30. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7) -======= -
    -

    50.30. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-75.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.30. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)

    @@ -262911,11 +258312,7 @@

    50.30. The complex type element[siri:VehicleMonitoringPermissions]#com
      #complexType
    -<<<<<<< HEAD -   (typedef-80.7) -======= -   (typedef-75.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.7)

    @@ -262989,13 +258386,8 @@

    50.30. The complex type element[siri:VehicleMonitoringPermissions]#com

    -<<<<<<< HEAD -
    -

    50.31. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1) -======= -
    -

    50.31. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.31. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)

    @@ -263015,11 +258407,7 @@

    50.31. The complex type group[siri:VehicleMonitoringRequestPolicyGroup
      /MaximumNumberOfCalls #complexType
    -<<<<<<< HEAD -   (typedef-80.1) -======= -   (typedef-75.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.1)

    @@ -263079,13 +258467,8 @@

    50.31. The complex type group[siri:VehicleMonitoringRequestPolicyGroup

    -<<<<<<< HEAD -
    -

    50.32. The complex type complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2) -======= -
    -

    50.32. The complex type complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-75.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.32. The complex type complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)

    @@ -263105,11 +258488,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon
      /MonitoredVehicleJourney #complexType
    -<<<<<<< HEAD -   (typedef-80.2) -======= -   (typedef-75.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.2)

    @@ -263576,11 +258951,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -263601,11 +258972,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -263690,11 +259057,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -263715,11 +259078,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264292,11 +259651,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264600,11 +259955,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264625,11 +259976,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264653,11 +260000,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264678,11 +260021,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264703,11 +260042,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -264805,13 +260140,8 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    @@ -263551,11 +258930,7 @@

    50.32. The complex type complexType[siri:VehicleActivityStructure]/Mon

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - >siri:NaturalLanguagePlaceNameStructure -======= >siri:NaturalLanguageStringStructure ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    		-<<<<<<< HEAD -

    Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)

    -=======

    Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)

    ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-57.4 -======= - +local-type: typedef-14.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.4

    -<<<<<<< HEAD - +local-type: typedef-57.5 -======= - +local-type: typedef-14.5 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-28.5

    -<<<<<<< HEAD - +local-type: typedef-50.2 -======= +local-type: typedef-18.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.3 -======= +local-type: typedef-18.3 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD - +local-type: typedef-50.4 -======= +local-type: typedef-18.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    -<<<<<<< HEAD -
    -

    50.33. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4) -======= -
    -

    50.33. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.33. The complex type group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)

    @@ -264831,11 +260161,7 @@

    50.33. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum
      /TrainNumbers #complexType
    -<<<<<<< HEAD -   (typedef-57.4) -======= -   (typedef-14.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.4)

    @@ -264877,13 +260203,8 @@

    50.33. The complex type group[siri:TrainOperationalInfoGroup]/TrainNum

    -<<<<<<< HEAD -
    -

    50.34. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5) -======= -
    -

    50.34. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.34. The complex type group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)

    @@ -264903,11 +260224,7 @@

    50.34. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP
      /JourneyParts #complexType
    -<<<<<<< HEAD -   (typedef-57.5) -======= -   (typedef-14.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-28.5)

    @@ -264949,13 +260266,8 @@

    50.34. The complex type group[siri:TrainOperationalInfoGroup]/JourneyP

    -<<<<<<< HEAD -
    -

    50.35. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2) -=======

    50.35. The complex type group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -264975,11 +260287,7 @@

    50.35. The complex type group[siri:JourneyFormationGroup]/TrainElement
      /TrainElements #complexType
    -<<<<<<< HEAD -   (typedef-50.2) -=======   (typedef-18.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -265066,13 +260374,8 @@

    50.35. The complex type group[siri:JourneyFormationGroup]/TrainElement

    -<<<<<<< HEAD -
    -

    50.36. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3) -=======

    50.36. The complex type group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -265092,11 +260395,7 @@

    50.36. The complex type group[siri:JourneyFormationGroup]/Trains#compl
      /Trains #complexType
    -<<<<<<< HEAD -   (typedef-50.3) -=======   (typedef-18.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -265183,13 +260482,8 @@

    50.36. The complex type group[siri:JourneyFormationGroup]/Trains#compl

    -<<<<<<< HEAD -
    -

    50.37. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4) -=======

    50.37. The complex type group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -265209,11 +260503,7 @@

    50.37. The complex type group[siri:JourneyFormationGroup]/CompoundTrai
      /CompoundTrains #complexType
    -<<<<<<< HEAD -   (typedef-50.4) -=======   (typedef-18.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -265300,13 +260590,8 @@

    50.37. The complex type group[siri:JourneyFormationGroup]/CompoundTrai

    -<<<<<<< HEAD -
    -

    50.38. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7) -======= -
    -

    50.38. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-75.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.38. The complex type element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)

    @@ -265326,11 +260611,7 @@

    50.38. The complex type element[siri:VehicleMonitoringPermissions]#com
      #complexType
    -<<<<<<< HEAD -   (typedef-80.7) -======= -   (typedef-75.7) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.7)

    @@ -265404,13 +260685,8 @@

    50.38. The complex type element[siri:VehicleMonitoringPermissions]#com

    -<<<<<<< HEAD -
    -

    50.39. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1) -======= -
    -

    50.39. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.39. The complex type group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)

    @@ -265430,11 +260706,7 @@

    50.39. The complex type group[siri:VehicleMonitoringRequestPolicyGroup
      /MaximumNumberOfCalls #complexType
    -<<<<<<< HEAD -   (typedef-80.1) -======= -   (typedef-75.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.1)

    @@ -265494,13 +260766,8 @@

    50.39. The complex type group[siri:VehicleMonitoringRequestPolicyGroup

    -<<<<<<< HEAD -
    -

    50.40. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3) -======= -
    -

    50.40. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.40. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)

    @@ -265520,11 +260787,7 @@

    50.40. The complex type complexType[siri:VehicleMonitoringServiceCapab
      /TopicFiltering #complexType
    -<<<<<<< HEAD -   (typedef-80.3) -======= -   (typedef-75.3) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.3)

    @@ -265666,13 +260929,8 @@

    50.40. The complex type complexType[siri:VehicleMonitoringServiceCapab

    -<<<<<<< HEAD -
    -

    50.41. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4) -======= -
    -

    50.41. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.41. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)

    @@ -265692,11 +260950,7 @@

    50.41. The complex type complexType[siri:VehicleMonitoringServiceCapab
      /RequestPolicy #complexType
    -<<<<<<< HEAD -   (typedef-80.4) -======= -   (typedef-75.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.4)

    @@ -265970,13 +261224,8 @@

    50.41. The complex type complexType[siri:VehicleMonitoringServiceCapab

    -<<<<<<< HEAD -
    -

    50.42. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5) -======= -
    -

    50.42. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.42. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)

    @@ -265996,11 +261245,7 @@

    50.42. The complex type complexType[siri:VehicleMonitoringServiceCapab
      /AccessControl #complexType
    -<<<<<<< HEAD -   (typedef-80.5) -======= -   (typedef-75.5) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.5)

    @@ -266124,13 +261369,8 @@

    50.42. The complex type complexType[siri:VehicleMonitoringServiceCapab

    -<<<<<<< HEAD -
    -

    50.43. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6) -======= -
    -

    50.43. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.43. The complex type complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)

    @@ -266150,11 +261390,7 @@

    50.43. The complex type complexType[siri:VehicleMonitoringServiceCapab
      /ResponseFeatures #complexType
    -<<<<<<< HEAD -   (typedef-80.6) -======= -   (typedef-75.6) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.6)

    @@ -266214,13 +261450,8 @@

    50.43. The complex type complexType[siri:VehicleMonitoringServiceCapab

    -<<<<<<< HEAD -
    -

    50.44. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1) -======= -
    -

    50.44. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.44. The complex type complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)

    @@ -266240,11 +261471,7 @@

    50.44. The complex type complexType[siri:AbstractPermissionStructure]/
      /GeneralCapabilities #complexType
    -<<<<<<< HEAD -   (typedef-36.1) -======= -   (typedef-50.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-10.1)

    @@ -266312,13 +261539,8 @@

    50.44. The complex type complexType[siri:AbstractPermissionStructure]/

    -<<<<<<< HEAD -
    -

    50.45. The complex type element[siri:OperatorPermissions]#complexType (typedef-56.2) -======= -
    -

    50.45. The complex type element[siri:OperatorPermissions]#complexType (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.45. The complex type element[siri:OperatorPermissions]#complexType (typedef-27.2)

    @@ -266338,11 +261560,7 @@

    50.45. The complex type element[siri:OperatorPermissions]#complexType
      #complexType
    -<<<<<<< HEAD -   (typedef-56.2) -======= -   (typedef-8.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.2)

    @@ -266427,13 +261645,8 @@

    50.45. The complex type element[siri:OperatorPermissions]#complexType

    -<<<<<<< HEAD -
    -

    50.46. The complex type element[siri:LinePermissions]#complexType (typedef-56.1) -======= -
    -

    50.46. The complex type element[siri:LinePermissions]#complexType (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.46. The complex type element[siri:LinePermissions]#complexType (typedef-27.1)

    @@ -266453,11 +261666,7 @@

    50.46. The complex type element[siri:LinePermissions]#complexType (typ
      #complexType
    -<<<<<<< HEAD -   (typedef-56.1) -======= -   (typedef-8.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-27.1)

    @@ -266542,13 +261751,8 @@

    50.46. The complex type element[siri:LinePermissions]#complexType (typ

    -<<<<<<< HEAD -
    -

    50.47. The complex type complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8) -======= -
    -

    50.47. The complex type complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-75.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    50.47. The complex type complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)

    @@ -266568,11 +261772,7 @@

    50.47. The complex type complexType[siri:VehicleMonitoringServicePermi
      /VehicleMonitoringPermissions #complexType
    -<<<<<<< HEAD -   (typedef-80.8) -======= -   (typedef-75.8) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-79.8)

    @@ -266790,11 +261986,7 @@

    51.1. The toplevel element siri:Siri

    @@ -267180,11 +262372,7 @@

    51.1. The toplevel element siri:Siri

    @@ -267366,13 +262554,8 @@

    51.1. The toplevel element siri:Siri

    @@ -266755,11 +261955,7 @@

    51.1. The toplevel element siri:Siri

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-33.2 -======= - +local-type: typedef-58.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-3.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    -<<<<<<< HEAD -
    -

    51.2. The complex type element[siri:Siri]#complexType (typedef-84.1) -=======

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -267392,11 +262575,7 @@

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1)   #complexType
    -<<<<<<< HEAD -   (typedef-84.1) -=======   (typedef-81.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38

    @@ -267509,11 +262684,7 @@

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1)

    @@ -267899,11 +263070,7 @@

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1)

    @@ -268085,13 +263252,8 @@

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1) -<<<<<<< HEAD -
    -

    51.3. The complex type element[siri:ServiceRequest]#complexType (typedef-77.2) -======= -
    -

    51.3. The complex type element[siri:ServiceRequest]#complexType (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    51.3. The complex type element[siri:ServiceRequest]#complexType (typedef-78.2)

    @@ -267474,11 +262653,7 @@

    51.2. The complex type element[siri:Siri]#complexType (typedef-81.1)

    -<<<<<<< HEAD - +local-type: typedef-77.2 -======= - +local-type: typedef-86.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.2

    -<<<<<<< HEAD - +local-type: typedef-33.2 -======= - +local-type: typedef-58.2 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-3.2

    -<<<<<<< HEAD - +local-type: typedef-77.4 -======= - +local-type: typedef-86.4 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-78.4

    @@ -268111,11 +263273,7 @@

    51.3. The complex type element[siri:ServiceRequest]#complexType (typed
      #complexType
    -<<<<<<< HEAD -   (typedef-77.2) -======= -   (typedef-86.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.2)

    @@ -268349,13 +263507,8 @@

    51.3. The complex type element[siri:ServiceRequest]#complexType (typed

    -<<<<<<< HEAD -
    -

    51.4. The complex type element[siri:SubscriptionRequest]#complexType (typedef-33.2) -======= -
    -

    51.4. The complex type element[siri:SubscriptionRequest]#complexType (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    51.4. The complex type element[siri:SubscriptionRequest]#complexType (typedef-3.2)

    @@ -268375,11 +263528,7 @@

    51.4. The complex type element[siri:SubscriptionRequest]#complexType (
      #complexType
    -<<<<<<< HEAD -   (typedef-33.2) -======= -   (typedef-58.2) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-3.2)

    @@ -268687,13 +263836,8 @@

    51.4. The complex type element[siri:SubscriptionRequest]#complexType (

    -<<<<<<< HEAD -
    -

    51.5. The complex type element[siri:ServiceDelivery]#complexType (typedef-77.4) -======= -
    -

    51.5. The complex type element[siri:ServiceDelivery]#complexType (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    51.5. The complex type element[siri:ServiceDelivery]#complexType (typedef-78.4)

    @@ -268713,11 +263857,7 @@

    51.5. The complex type element[siri:ServiceDelivery]#complexType (type
      #complexType
    -<<<<<<< HEAD -   (typedef-77.4) -======= -   (typedef-86.4) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-78.4)

    @@ -269026,13 +264162,8 @@

    51.5. The complex type element[siri:ServiceDelivery]#complexType (type

    @@ -268961,11 +264101,7 @@

    51.5. The complex type element[siri:ServiceDelivery]#complexType (type

    -<<<<<<< HEAD - +local-type: typedef-34.1 -======= - +local-type: typedef-59.1 ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 + +local-type: typedef-5.1

    -<<<<<<< HEAD -
    -

    51.6. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1) -======= -
    -

    51.6. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +
    +

    51.6. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)

    @@ -269052,11 +264183,7 @@

    51.6. The complex type group[siri:ServiceDeliveryRequestStatusGroup]/E
      /ErrorCondition #complexType
    -<<<<<<< HEAD -   (typedef-34.1) -======= -   (typedef-59.1) ->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38 +   (typedef-5.1)

    diff --git a/docs/xco-stype-description.xqm b/docs/xco-stype-description.xqm index addf83a3..1c0ba419 100644 --- a/docs/xco-stype-description.xqm +++ b/docs/xco-stype-description.xqm @@ -201,9 +201,13 @@ declare function sd:isTypeDescriptionEnumDesc($tdesc as xs:string?) :) declare function sd:castToComparable($s as xs:string?) as item()? { - if ($s castable as xs:date) then xs:date($s) - else if ($s castable as xs:dateTime) then xs:dateTime($s) - else if ($s castable as xs:time) then xs:time($s) + if ($s castable as xs:date) then xs:date($s) + else if ($s castable as xs:dateTime) then xs:dateTime($s) + else if ($s castable as xs:time) then xs:time($s) + (: Workaround for BaseX <12.1 which cannot compare xs:duration values. + Use ordered subtypes instead. See https://github.com/SIRI-CEN/SIRI/issues/218 :) + else if ($s castable as xs:dayTimeDuration) then xs:dayTimeDuration($s) + else if ($s castable as xs:yearMonthDuration) then xs:yearMonthDuration($s) else if ($s castable as xs:double) then number($s) else if ($s castable as xs:decimal) then number($s) else if ($s castable as xs:boolean) then xs:boolean($s) ! number(.) diff --git a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml index c7570c1f..9b5c39a2 100644 --- a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml +++ b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml @@ -1,234 +1,234 @@ - + - - 2022-04-14T09:17:32Z - ski-ems-out-sx_tesst - wcP9TgJhf - true - false - - 2022-04-14T09:17:32Z - ski-ddip-in-sx_test - 1 - - - 2022-04-14T09:17:23Z - ch - ski-ems-out-sx_test - ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6 - 1 - - ch - directReport - EMS - ski-ems-out-sx_test - - 2022-04-14T09:17:26Z - published - - 2022-08-26T04:00:00Z - 2022-08-26T21:00:00Z - - - 2022-04-14T09:17:23Z - 2022-08-26T21:59:00Z - - specialEvent - normal - 3 - public - stopPlace - true - DE - Haltestelle Pratteln, Bahnhof verschoben. - Pratteln, Bahnhof stop moved. - Grund ist eine Veranstaltung. - Due to an event. - - - - ch:1:sloid:94994 - Pratteln, Bahnhof - - - - - - - stopPlace - - - - ch:1:sloid:94994 - Pratteln, Bahnhof - - - - - - - 2022-04-14T09:17:23Z - 2022-08-26T21:59:00Z - - ems-696-1 - - - 2022-08-26T04:00:00Z - 2022-08-26T12:00:00Z - - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - whilePlanningTrip - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt - The bus stop has been moved by 500 meters in the direction of the old town - - - Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) - Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) - - - Dauer: 26.08.2022, 06:00 - 26.08.2022, 14:00 - Duration: 26.08.2022, 06:00 - 26.08.2022, 14:00 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - 2022-04-14T09:17:26Z - 2022-08-28T21:59:00Z - - ems-696-2 - - - 2022-08-26T13:00:00Z - 2022-08-26T21:00:00Z - - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - whilePlanningTrip - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben an die Wasenstrasse - The bus stop has been moved to Wasenstrasse - - - Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen - Please follow the signs to access the platforms - - - Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:00 - Duration: 26.08.2022, 15:00 - 26.08.2022, 23:00 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - 2022-08-26T02:00:00Z - 2022-08-26T12:00:00Z - - ems-696-3 - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - atStopPoint - onBoardVehicle - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt - The bus stop has been moved by 500 meters in the direction of the old town - - - Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) - Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) - - - Dauer: 26.08.2022, 04:00 - 26.08.2022, 14:00 - Duration: 26.08.2022, 04:00 - 26.08.2022, 14:00 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - 2022-08-26T13:00:00Z - 2022-08-26T21:59:00Z - - ems-696-6 - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - atStopPoint - onBoardVehicle - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben an die Wasenstrasse - The bus stop has been moved to Wasenstrasse - - - Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen - Please follow the signs to access the platforms - - - Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:59 - Duration: 26.08.2022, 15:00 - 26.08.2022, 23:59 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - - - - - \ No newline at end of file + + 2022-04-14T09:17:32Z + ski-ems-out-sx_tesst + wcP9TgJhf + true + false + + 2022-04-14T09:17:32Z + ski-ddip-in-sx_test + 1 + + + 2022-04-14T09:17:23Z + ch + ski-ems-out-sx_test + ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6 + 1 + + ch + directReport + EMS + ski-ems-out-sx_test + + 2022-04-14T09:17:26Z + published + + 2022-08-26T04:00:00Z + 2022-08-26T21:00:00Z + + + 2022-04-14T09:17:23Z + 2022-08-26T21:59:00Z + + specialEvent + normal + 3 + public + stopPlace + true + DE + Haltestelle Pratteln, Bahnhof verschoben. + Pratteln, Bahnhof stop moved. + Grund ist eine Veranstaltung. + Due to an event. + + + + ch:1:sloid:94994 + Pratteln, Bahnhof + + + + + + + stopPlace + + + + ch:1:sloid:94994 + Pratteln, Bahnhof + + + + + + + 2022-04-14T09:17:23Z + 2022-08-26T21:59:00Z + + ems-696-1 + + + 2022-08-26T04:00:00Z + 2022-08-26T12:00:00Z + + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + whilePlanningTrip + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt + The bus stop has been moved by 500 meters in the direction of the old town + + + Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) + Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) + + + Dauer: 26.08.2022, 06:00 - 26.08.2022, 14:00 + Duration: 26.08.2022, 06:00 - 26.08.2022, 14:00 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + 2022-04-14T09:17:26Z + 2022-08-28T21:59:00Z + + ems-696-2 + + + 2022-08-26T13:00:00Z + 2022-08-26T21:00:00Z + + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + whilePlanningTrip + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben an die Wasenstrasse + The bus stop has been moved to Wasenstrasse + + + Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen + Please follow the signs to access the platforms + + + Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:00 + Duration: 26.08.2022, 15:00 - 26.08.2022, 23:00 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + 2022-08-26T02:00:00Z + 2022-08-26T12:00:00Z + + ems-696-3 + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + atStopPoint + onBoardVehicle + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt + The bus stop has been moved by 500 meters in the direction of the old town + + + Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) + Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) + + + Dauer: 26.08.2022, 04:00 - 26.08.2022, 14:00 + Duration: 26.08.2022, 04:00 - 26.08.2022, 14:00 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + 2022-08-26T13:00:00Z + 2022-08-26T21:59:00Z + + ems-696-6 + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + atStopPoint + onBoardVehicle + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben an die Wasenstrasse + The bus stop has been moved to Wasenstrasse + + + Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen + Please follow the signs to access the platforms + + + Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:59 + Duration: 26.08.2022, 15:00 - 26.08.2022, 23:59 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + + + + + diff --git a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml index a0b3dd6f..037513c9 100644 --- a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml +++ b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml @@ -1,150 +1,150 @@ - + - - 2022-04-14T09:17:32Z - ski-ems-out-sx_tesst - wcP9TgJhf - true - false - - 2022-04-14T09:17:32Z - ski-ddip-in-sx_test - 1 - - - 2022-04-14T09:17:23Z - ch - ski-ems-out-sx_test - ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6 - 1 - - ch - directReport - EMS - ski-ems-out-sx_test - - 2022-04-14T09:17:26Z - published - - 2022-08-26T04:00:00Z - 2022-08-26T21:00:00Z - - - 2022-04-14T09:17:23Z - 2022-08-26T21:59:00Z - - specialEvent - normal - 3 - public - stopPlace - true - DE - Haltestelle Pratteln, Bahnhof verschoben. - Pratteln, Bahnhof stop moved. - Grund ist eine Veranstaltung. - Due to an event. - - - - ch:1:sloid:94994 - Pratteln, Bahnhof - - - - - - - stopPlace - - - - ch:1:sloid:94994 - Pratteln, Bahnhof - - - - - - - 2022-04-14T09:17:23Z - 2022-08-26T21:59:00Z - - - ems-696-1 - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - whilePlanningTrip - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt - The bus stop has been moved by 500 meters in the direction of the old town - - - Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) - Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) - - - Dauer: 26.08.2022, 06:00 - 26.08.2022, 23:00 - Duration: 26.08.2022, 06:00 - 26.08.2022, 23:00 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - 2022-08-26T02:00:00Z - 2022-08-26T21:59:00Z - - ems-696-2 - 2022-04-14T09:17:26Z - ch:1:sboid:100626 - atStopPoint - onBoardVehicle - - S - - Pratteln, Bahnhof verschoben - Pratteln, Bahnhof moved - - - Grund: Veranstaltung (ESAF) - Due to an event (ESAF) - - - Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt - The bus stop has been moved by 500 meters in the direction of the old town - - - Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) - Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) - - - Dauer: 26.08.2022, 04:00 - 26.08.2022, 23:59 - Duration: 26.08.2022, 04:00 - 26.08.2022, 23:59 - - - Bei Fragen wenden Sie sich an das Informationspersonal vor Ort - If you have any questions, please contact the information staff on site - - - - - - - - - - \ No newline at end of file + + 2022-04-14T09:17:32Z + ski-ems-out-sx_tesst + wcP9TgJhf + true + false + + 2022-04-14T09:17:32Z + ski-ddip-in-sx_test + 1 + + + 2022-04-14T09:17:23Z + ch + ski-ems-out-sx_test + ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6 + 1 + + ch + directReport + EMS + ski-ems-out-sx_test + + 2022-04-14T09:17:26Z + published + + 2022-08-26T04:00:00Z + 2022-08-26T21:00:00Z + + + 2022-04-14T09:17:23Z + 2022-08-26T21:59:00Z + + specialEvent + normal + 3 + public + stopPlace + true + DE + Haltestelle Pratteln, Bahnhof verschoben. + Pratteln, Bahnhof stop moved. + Grund ist eine Veranstaltung. + Due to an event. + + + + ch:1:sloid:94994 + Pratteln, Bahnhof + + + + + + + stopPlace + + + + ch:1:sloid:94994 + Pratteln, Bahnhof + + + + + + + 2022-04-14T09:17:23Z + 2022-08-26T21:59:00Z + + + ems-696-1 + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + whilePlanningTrip + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt + The bus stop has been moved by 500 meters in the direction of the old town + + + Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) + Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) + + + Dauer: 26.08.2022, 06:00 - 26.08.2022, 23:00 + Duration: 26.08.2022, 06:00 - 26.08.2022, 23:00 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + 2022-08-26T02:00:00Z + 2022-08-26T21:59:00Z + + ems-696-2 + 2022-04-14T09:17:26Z + ch:1:sboid:100626 + atStopPoint + onBoardVehicle + + S + + Pratteln, Bahnhof verschoben + Pratteln, Bahnhof moved + + + Grund: Veranstaltung (ESAF) + Due to an event (ESAF) + + + Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt + The bus stop has been moved by 500 meters in the direction of the old town + + + Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände) + Please use the temporary stop Pratteln, Bahnhof (direction Festgelände) + + + Dauer: 26.08.2022, 04:00 - 26.08.2022, 23:59 + Duration: 26.08.2022, 04:00 - 26.08.2022, 23:59 + + + Bei Fragen wenden Sie sich an das Informationspersonal vor Ort + If you have any questions, please contact the information staff on site + + + + + + + + + + diff --git a/xsd/siri_model/siri_estimatedVehicleJourney.xsd b/xsd/siri_model/siri_estimatedVehicleJourney.xsd index e19aaf04..f4ccbde3 100644 --- a/xsd/siri_model/siri_estimatedVehicleJourney.xsd +++ b/xsd/siri_model/siri_estimatedVehicleJourney.xsd @@ -467,4 +467,4 @@ the original journey and the nature of the difference. - \ No newline at end of file + diff --git a/xsd/siri_model/siri_journey.xsd b/xsd/siri_model/siri_journey.xsd index 3ce80e01..43437f92 100644 --- a/xsd/siri_model/siri_journey.xsd +++ b/xsd/siri_model/siri_journey.xsd @@ -1910,7 +1910,7 @@ TRAINs within a COMPOUND TRAIN may have different origins and destinations due t - + Provides information about updated SERVICE LINKs diff --git a/xsd/siri_model/siri_journey_support.xsd b/xsd/siri_model/siri_journey_support.xsd index f7e1e7a8..76d0076f 100644 --- a/xsd/siri_model/siri_journey_support.xsd +++ b/xsd/siri_model/siri_journey_support.xsd @@ -518,7 +518,7 @@ Has the following uses: - + Restricts boarding or alighting so that it is only permitted when the passenger is interchanging from/to a journey explicitly referenced in a JourneyRelation. @@ -533,7 +533,7 @@ Has the following uses: - + Restricts alighting so that it is only permitted when the passenger is interchanging to a journey explicitly referenced in a JourneyRelation. @@ -548,7 +548,7 @@ Has the following uses: - + Restricts boarding so that it is only permitted when the passenger is interchanging from a journey explicitly referenced in a JourneyRelation.