Merge branch 'integration' (v2.1)

SIRI-CEN · Oct 25, 2022 · 87fe020 · 87fe020
2 parents b9786f1 + ce97bed
commit 87fe020
Show file tree

Hide file tree

Showing 141 changed files with 20,063 additions and 23,043 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
-language: c
+language: minimal
 
 before_script:
   - sudo apt-get install -qq libxml2-utils
 
 script:
-  - "xmllint --noout --schema xsd/siri.xsd examples/siri_exa_framework/*xml examples/siri_exm_CM/*xml examples/siri_exm_CT/*xml examples/siri_exm_ET/*xml examples/siri_exm_FM/*xml examples/siri_exm_GM/*xml examples/siri_exm_PT/*xml examples/siri_exm_SM/*xml examples/siri_exm_ST/*xml examples/siri_exm_SX/*xml examples/siri_exm_VM/*xml examples/siri_exu_capability/*xml examples/siri_exu_discovery/*xml"
+  - bash .travis/xmllint-check.sh
+
+after_script:
+  - bash .travis/travis-ci_git-commit.sh
diff --git a/.travis/travis-ci_git-commit.sh b/.travis/travis-ci_git-commit.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# function to make a commit on a branch in a Travis CI build
+# be sure to avoid creating a Travis CI fork bomb
+# see https://gist.github.com/mitchellkrogza/a296ab5102d7e7142cc3599fca634203 and https://github.com/travis-ci/travis-ci/issues/1701
+function travis-branch-commit() {
+    local head_ref branch_ref
+    head_ref=$(git rev-parse HEAD)
+    if [[ $? -ne 0 || ! $head_ref ]]; then
+        err "Failed to get HEAD reference"
+        return 1
+    fi
+    branch_ref=$(git rev-parse "$TRAVIS_BRANCH")
+    if [[ $? -ne 0 || ! $branch_ref ]]; then
+        err "Failed to get $TRAVIS_BRANCH reference"
+        return 1
+    fi
+    if [[ $head_ref != $branch_ref ]]; then
+        msg "HEAD ref ($head_ref) does not match $TRAVIS_BRANCH ref ($branch_ref)"
+        msg "Someone may have pushed new commits before this build cloned the repo"
+        return 1
+    fi
+    if ! git checkout "$TRAVIS_BRANCH"; then
+        err "Failed to checkout $TRAVIS_BRANCH"
+        return 1
+    fi
+
+    if ! git add --all .; then
+        err "Failed to add modified files to git index"
+        return 1
+    fi
+    # make Travis CI skip this build
+    if ! git commit -m "Travis CI update [skip ci]"; then
+        err "Failed to commit updates"
+        return 1
+    fi
+    # add to your .travis.yml: `branches\n  except:\n  - "/travis_build-\\d+/"\n`
+    local git_tag=travis_build-$TRAVIS_BUILD_NUMBER
+    if ! git tag "$git_tag" -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER"; then
+        err "Failed to create git tag: $git_tag"
+        return 1
+    fi
+    local remote=origin
+    if [[ $GH_TOKEN ]]; then
+        remote=https://$GH_TOKEN@github.com/$GH_REPO
+    fi
+    if [[ $TRAVIS_BRANCH == master ]]; then
+        msg "Not pushing updates to branch $TRAVIS_BRANCH"
+        return 0
+    fi
+    if ! git push --quiet --follow-tags "$remote" "$TRAVIS_BRANCH" > /dev/null 2>&1; then
+        err "Failed to push git changes"
+        return 1
+    fi
+}
+
+function msg() {
+    echo "travis-commit: $*"
+}
+
+function err() {
+    msg "$*" 1>&2
+}
+
+travis-branch-commit
diff --git a/.travis/xmllint-check.sh b/.travis/xmllint-check.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+/usr/bin/find . -name "*.xsd" -type f | while read i; do XMLLINT_INDENT=" " xmllint --pretty 1 "$i" > "$i.pretty"; mv "$i.pretty" "$i"; done; /usr/bin/find . -name "*.xml" -type f | while read i; do XMLLINT_INDENT=" " xmllint --pretty 1 "$i" > "$i.pretty"; mv "$i.pretty" "$i"; done; /usr/bin/find . -name "*.wsdl" -type f | while read i; do XMLLINT_INDENT=" " xmllint --pretty 1 "$i" > "$i.pretty"; mv "$i.pretty" "$i"; done;
+echo "finished formatting"
+find examples/ -iname "*.xml" | xargs xmllint --noout --schema xsd/siri.xsd
diff --git a/Siri.spp b/Siri.spp
diff --git a/Siri.xpr b/Siri.xpr
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <meta>
+        <filters directoryPatterns="" filePatterns="" positiveFilePatterns="" showHiddenFiles="false"/>
+        <options/>
+    </meta>
+    <projectTree name="Siri.xpr">
+        <folder name="examples">
+            <folder name="SIRI-AA  Generic framework Examples">
+                <file name="examples/siri_exa_framework/exa_checkStatus_request.xml"/>
+                <file name="examples/siri_exa_framework/exa_checkStatus_response.xml"/>
+                <file name="examples/siri_exa_framework/exa_dataReady_request.xml"/>
+                <file name="examples/siri_exa_framework/exa_dataReady_response.xml"/>
+                <file name="examples/siri_exa_framework/exa_dataReceived_response.xml"/>
+                <file name="examples/siri_exa_framework/exa_dataSupply_request.xml"/>
+                <file name="examples/siri_exa_framework/exa_heartbeat_request.xml"/>
+                <file name="examples/siri_exa_framework/exa_requestSubscription_response.xml"/>
+                <file name="examples/siri_exa_framework/exa_terminateSubscription_request.xml"/>
+                <file name="examples/siri_exa_framework/exa_terminateSubscription_response_err.xml"/>
+                <file name="examples/siri_exa_framework/exa_terminateSubscription_response.xml"/>
+            </folder>
+            <folder name="SIRI-CM Connection Monitoring Examples">
+                <file name="examples/siri_exm_CM/exc_connectionMonitoring_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_CM/exc_connectionMonitoring_request.xml"/>
+                <file name="examples/siri_exm_CM/exc_connectionMonitoring_subscriptionRequest.xml"/>
+                <file name="examples/siri_exm_CM/exc_connectionMonitoringDistributor_response.xml"/>
+                <file name="examples/siri_exm_CM/exc_connectionMonitoringFeeder_response.xml"/>
+            </folder>
+            <folder name="SIRI-CT Connection Timetable Examples">
+                <file name="examples/siri_exm_CT/exc_connectionTimetable_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_CT/exc_connectionTimetable_request.xml"/>
+                <file name="examples/siri_exm_CT/exc_connectionTimetable_response.xml"/>
+                <file name="examples/siri_exm_CT/exc_connectionTimetable_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-ET Estimated Timetable Examples">
+                <file name="examples/siri_exm_ET/ext_estimatedTimetable_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_ET/ext_estimatedTimetable_request.xml"/>
+                <file name="examples/siri_exm_ET/ext_estimatedTimetable_response.xml"/>
+                <file name="examples/siri_exm_ET/ext_estimatedTimetable_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-FM Facility Monitoring Examples">
+                <file name="examples/siri_exm_FM/exf_facilityMonitoring_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_FM/exf_facilityMonitoring_request.xml"/>
+                <file name="examples/siri_exm_FM/exf_facilityMonitoring_response.xml"/>
+                <file name="examples/siri_exm_FM/exf_facilityMonitoring_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-GM General Message Timetable Examples">
+                <file name="examples/siri_exm_GM/exm_generalMessage_capabilityResponse.xml"/>
+                <file name="examples/siri_exm_GM/exm_generalMessage_request.xml"/>
+                <file name="examples/siri_exm_GM/exm_generalMessage_response_embed.xml"/>
+                <file name="examples/siri_exm_GM/exm_generalMessage_response.xml"/>
+                <file name="examples/siri_exm_GM/exm_generalMessage_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-PT Production Timetable Examples">
+                <file name="examples/siri_exm_PT/ext_productionTimetable_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_PT/ext_productionTimetable_request.xml"/>
+                <file name="examples/siri_exm_PT/ext_productionTimetable_response.xml"/>
+                <file name="examples/siri_exm_PT/ext_productionTimetable_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-SM Stop Monitoring Examples">
+                <file name="examples/siri_exm_SM/exp_stopMonitoring_permissions.xml"/>
+                <file name="examples/siri_exm_SM/exs_stopMonitoring_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_SM/exs_stopMonitoring_request.xml"/>
+                <file name="examples/siri_exm_SM/exs_stopMonitoring_response_equip.xml"/>
+                <file name="examples/siri_exm_SM/exs_stopMonitoring_response.xml"/>
+                <file name="examples/siri_exm_SM/exs_stopMonitoring_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-ST Stop Timetable Examples">
+                <file name="examples/siri_exm_ST/exs_stopTimetable_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_ST/exs_stopTimetable_request.xml"/>
+                <file name="examples/siri_exm_ST/exs_stopTimetable_response.xml"/>
+                <file name="examples/siri_exm_ST/exs_stopTimetable_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-SX Stituation Exchange Examples">
+				<folder name="VDV736 Profile Examples">
+					<file name="examples/siri_exm_SX/VDV736_exm/SX_1010_first_message.xml"/>
+					<file name="examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml"/>
+					<file name="examples/siri_exm_SX/VDV736_exm/SX_1135_main_message_update.xml"/>
+					<file name="examples/siri_exm_SX/VDV736_exm/SX_1247_end_message.xml"/>
+				</folder>
+				<file name="examples/siri_exm_SX/exx_situationExchange_ATOC.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_capabilityResponse.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_Pt.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_request.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_response.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_road.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchange_subscriptionRequest.xml"/>
+                <file name="examples/siri_exm_SX/exx_situationExchangeResponse.xml"/>
+            </folder>
+            <folder name="SIRI-VM Vehicle Monitoring Examples">
+                <file name="examples/siri_exm_VM/exv_vehicleMonitoring_capabilitiesResponse.xml"/>
+                <file name="examples/siri_exm_VM/exv_vehicleMonitoring_request.xml"/>
+                <file name="examples/siri_exm_VM/exv_vehicleMonitoring_response.xml"/>
+                <file name="examples/siri_exm_VM/exv_vehicleMonitoring_subscriptionRequest.xml"/>
+            </folder>
+            <folder name="SIRI-XX Capability ">
+                <file name="examples/siri_exu_capability/exd_allServices_capabilitiesRequest.xml"/>
+            </folder>
+            <folder name="SIRI-XX Discovery">
+                <file name="examples/siri_exu_discovery/exd_lines_discoveryRequest.xml"/>
+                <file name="examples/siri_exu_discovery/exd_lines_discoveryResponse.xml"/>
+                <file name="examples/siri_exu_discovery/exd_productCategories_discoveryRequest.xml"/>
+                <file name="examples/siri_exu_discovery/exd_productCategories_discoveryResponse.xml"/>
+                <file name="examples/siri_exu_discovery/exd_serviceFeatures_discoveryRequest.xml"/>
+                <file name="examples/siri_exu_discovery/exd_serviceFeatures_discoveryResponse.xml"/>
+                <file name="examples/siri_exu_discovery/exd_stopPoints_discoveryRequest.xml"/>
+                <file name="examples/siri_exu_discovery/exd_stopPoints_discoveryResponse.xml"/>
+                <file name="examples/siri_exu_discovery/exd_vehicleFeatures_discoveryRequest.xml"/>
+                <file name="examples/siri_exu_discovery/exd_vehicleFeatures_discoveryResponse.xml"/>
+            </folder>
+        </folder>
+        <folder name="schema">
+            <folder name="acsb">
+                <file name="xsd/acsb/acsb_accessibility.xsd"/>
+                <file name="xsd/acsb/acsb_all.xsd"/>
+                <file name="xsd/acsb/acsb_limitations.xsd"/>
+                <file name="xsd/acsb/acsb_passengerMobility.xsd"/>
+            </folder>
+            <folder name="datex2">
+                <file name="xsd/datex2/DATEXIISchema.xsd"/>
+            </folder>
+            <folder name="ifopt">
+                <file name="xsd/ifopt/ifopt_administration.xsd"/>
+                <file name="xsd/ifopt/ifopt_allStopPlace.xsd"/>
+                <file name="xsd/ifopt/ifopt_checkpoint.xsd"/>
+                <file name="xsd/ifopt/ifopt_countries.xsd"/>
+                <file name="xsd/ifopt/ifopt_equipment.xsd"/>
+                <file name="xsd/ifopt/ifopt_location.xsd"/>
+                <file name="xsd/ifopt/ifopt_modes.xsd"/>
+                <file name="xsd/ifopt/ifopt_modification.xsd"/>
+                <file name="xsd/ifopt/ifopt_path.xsd"/>
+                <file name="xsd/ifopt/ifopt_stop.xsd"/>
+                <file name="xsd/ifopt/ifopt_time.xsd"/>
+                <file name="xsd/ifopt/ifopt_types.xsd"/>
+            </folder>
+			<folder name="xml">
+				<file name="xsd/xml/2008/09/xsd.xsl"/>
+				<file name="xsd/xml/2009/01/XMLSchema.xsd"/>
+			</folder>
+			<folder name="siri_utility">
+				<file name="xsd/siri_utility/siri_all_utility.xsd"/>
+				<file name="xsd/siri_utility/siri_location.xsd"/>
+				<file name="xsd/siri_utility/siri_participant.xsd"/>
+				<file name="xsd/siri_utility/siri_permissions.xsd"/>
+				<file name="xsd/siri_utility/siri_types.xsd"/>
+				<file name="xsd/siri_utility/siri_utility.xsd"/>
+			</folder>
+            <folder name="services">
+                <file name="xsd/siri_connectionMonitoring_service.xsd"/>
+                <file name="xsd/siri_connectionTimetable_service.xsd"/>
+                <file name="xsd/siri_discovery.xsd"/>
+                <file name="xsd/siri_estimatedTimetable_service.xsd"/>
+                <file name="xsd/siri_facilityMonitoring_service.xsd"/>
+                <file name="xsd/siri_generalMessage_service.xsd"/>
+                <file name="xsd/siri_productionTimetable_service.xsd"/>
+                <file name="xsd/siri_situationExchange_service.xsd"/>
+                <file name="xsd/siri_stopMonitoring_service.xsd"/>
+                <file name="xsd/siri_stopTimetable_service.xsd"/>
+                <file name="xsd/siri_vehicleMonitoring_service.xsd"/>
+            </folder>
+            <folder name="siri">
+                <file name="xsd/siri/siri_all_framework.xsd"/>
+                <file name="xsd/siri/siri_base.xsd"/>
+                <file name="xsd/siri/siri_common_services.xsd"/>
+                <file name="xsd/siri/siri_request_errorConditions.xsd"/>
+                <file name="xsd/siri/siri_requests.xsd"/>
+            </folder>
+            <folder name="siri_model">
+                <folder name="siri_components">
+                    <file name="xsd/siri_model/siri_facilities.xsd"/>
+                    <file name="xsd/siri_model/siri_facility.xsd"/>
+                    <file name="xsd/siri_model/siri_feature_support.xsd"/>
+                    <file name="xsd/siri_model/siri_journey_support.xsd"/>
+                    <file name="xsd/siri_model/siri_journey.xsd"/>
+                    <file name="xsd/siri_model/siri_modelPermissions.xsd"/>
+                    <file name="xsd/siri_model/siri_modes.xsd"/>
+                    <file name="xsd/siri_model/siri_operator_support.xsd"/>
+                    <file name="xsd/siri_model/siri_reference.xsd"/>
+                    <file name="xsd/siri_model/siri_situationActions.xsd"/>
+                    <file name="xsd/siri_model/siri_situationAffects.xsd"/>
+                    <file name="xsd/siri_model/siri_situationClassifiers.xsd"/>
+                    <file name="xsd/siri_model/siri_situationIdentity.xsd"/>
+                    <file name="xsd/siri_model/siri_situationReasons.xsd"/>
+                    <file name="xsd/siri_model/siri_situationServiceTypes.xsd"/>
+                    <file name="xsd/siri_model/siri_targetedVehicleJourney.xsd"/>
+                    <file name="xsd/siri_model/siri_time.xsd"/>
+                </folder>
+                <folder name="siri_journeys">
+                    <file name="xsd/siri_model/siri_datedVehicleJourney.xsd"/>
+                    <file name="xsd/siri_model/siri_estimatedVehicleJourney.xsd"/>
+					<file name="xsd/siri_model/siri_facility.xsd"/>
+                    <file name="xsd/siri_model/siri_interchangeJourney.xsd"/>
+                    <file name="xsd/siri_model/siri_monitoredVehicleJourney.xsd"/>
+                    <file name="xsd/siri_model/siri_targetedVehicleJourney.xsd"/>
+                    <file name="xsd/siri_model/siri_situation.xsd"/>
+                </folder>
+                <folder name="siri_model_discovery">
+					<file name="xsd/siri_model/siri_all_situation.xsd"/>
+					<file name="xsd/siri_model_discovery/siri_connectionLink.xsd"/>
+					<file name="xsd/siri_model_discovery/siri_feature.xsd"/>
+					<file name="xsd/siri_model_discovery/siri_line.xsd"/>
+					<file name="xsd/siri_model_discovery/siri_stopPoint.xsd"/>
+				</folder>
+                <file name="xsd/siri_model/siri_all_journeyModel.xsd"/>
+                <file name="xsd/siri_model/siri_all_model.xsd"/>
+                <file name="xsd/siri_model/siri_all_situation.xsd"/>
+                <file name="xsd/siri_model/siri_all.xsd"/>
+            </folder>
+            <file name="xsd/siri.xsd"/>
+            <file name="xsd/siriSg.xsd"/>
+        </folder>
+        <folder name="wsdl">
+            <folder name="wsdl_model">
+                <file name="xsd/wsdl_model/siri_wsConsumer-Framework.xsd"/>
+                <file name="xsd/wsdl_model/siri_wsConsumer-Services.xsd"/>
+                <file name="xsd/wsdl_model/siri_wsProducer-DiscoveryCapability.xsd"/>
+                <file name="xsd/wsdl_model/siri_wsProducer-Framework.xsd"/>
+                <file name="xsd/wsdl_model/siri_wsProducer-Services.xsd"/>
+            </folder>
+            <file name="xsd/siri_wsConsumer-Document.wsdl"/>
+            <file name="xsd/siri_wsConsumer-WSDL2.wsdl"/>
+            <file name="xsd/siri_wsConsumer.wsdl"/>
+            <file name="xsd/siri_wsProducer-Document.wsdl"/>
+            <file name="xsd/siri_wsProducer-WSDL2.wsdl"/>
+            <file name="xsd/siri_wsProducer.wsdl"/>
+        </folder>
+    </projectTree>
+</project>
diff --git a/examples/siri_exm_CM/exc_connectionMonitoringDistributor_response.xml b/examples/siri_exm_CM/exc_connectionMonitoringDistributor_response.xml
@@ -38,14 +38,14 @@
       <DataFrameRef>2001-12-17</DataFrameRef>
       <DatedVehicleJourneyRef>09876</DatedVehicleJourneyRef>
      </FramedVehicleJourneyRef>
-     <PublishedLineName>Line A11C</PublishedLineName>
-     <DirectionName>Outbound</DirectionName>
+     <PublishedLineName xml:lang="EN">Line A11C</PublishedLineName>
+     <DirectionName xml:lang="EN">Outbound</DirectionName>
      <OperatorRef>1s23</OperatorRef>
      <ProductCategoryRef>School</ProductCategoryRef>
      <ServiceFeatureRef>CyclesPermitted</ServiceFeatureRef>
      <VehicleFeatureRef>LowFloors</VehicleFeatureRef>
-     <OriginName>Purgatory</OriginName>
-     <DestinationName>Paradise</DestinationName>
+     <OriginName xml:lang="EN">Purgatory</OriginName>
+     <DestinationName xml:lang="EN">Paradise</DestinationName>
      <JourneyNote>from A to B</JourneyNote>
      <OriginAimedDepartureTime>2001-12-17T08:30:47-05:00</OriginAimedDepartureTime>
      <DestinationAimedArrivalTime>2001-12-17T10:30:47-05:00</DestinationAimedArrivalTime>
@@ -69,8 +69,8 @@
     <DistributorJourney>
      <LineRef>123</LineRef>
      <DirectionRef>OUT</DirectionRef>
-     <PublishedLineName>Line 123</PublishedLineName>
-     <DirectionName>Outbound</DirectionName>
+     <PublishedLineName xml:lang="EN">Line 123</PublishedLineName>
+     <DirectionName xml:lang="EN">Outbound</DirectionName>
     </DistributorJourney>
     <FeederVehicleJourneyRef>
      <DataFrameRef>2001-12-17</DataFrameRef>