UmS-CEN_CR-079

.travis.yml

@@ -4,4 +4,7 @@ before_script:
   - sudo apt-get install -qq libxml2-utils
 
 script:
-  - bash xmllint-check.sh
+  - bash .travis/xmllint-check.sh
+
+after_script:
+  - bash .travis/travis-ci_git-commit.sh

.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

xmllint-check.sh → .travis/xmllint-check.sh

@@ -1,4 +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
+find examples/ -iname "*.xml" | xargs xmllint --noout --schema xsd/siri.xsd

CHANGELOG.md

@@ -0,0 +1,105 @@
+# Changelog
+
+## 20201117 - Sync CEN Integration 
+(https://github.com/SIRI-CEN/SIRI/commit/ad55f2c45f97e67ac6abf00a00020e6ec149565c)
+* SituationExchangeRequestPolicyGroup:Language unbounded
+* ProductionTimetableServiceCapabilitiesStructure:ProductionTimetableServiceCapabilitiesStructure new Filters added
+* DatedTimetableVersionFrameStructure: new elements added
+* ProductionTimetableRequestPolicyGroup: new elements added, Language unbounded
+* Changes in ProductionTimetableTopicGroup
+* GeneralMessageRequestPolicyGroup:Language unbounded
+* FacilityMonitoringRequestPolicyGroup:Language unbounded
+* EstimatedTimetableServiceCapabilitiesStructure: new elements added
+* EstimatedTimetableSubscriptionPolicyGroup: new elements added
+* EstimatedTimetableRequestPolicyGroup: new elements added, Language unbounded
+* VehicleFeaturesRequestPolicyGroup: Language unbounded
+* ProductCategoriesRequestPolicyGroup: Language unbounded
+* LinesDiscoveryRequestPolicyGroup: Language unbounded
+* StopPointsDiscoveryRequestPolicyGroup: Language unbounded
+* ConnectionTimetableRequestPolicyGroup: Language unbounded
+* ConnectionMonitoringRequestPolicyGroup: Language unbounded
+* KeyListStructure added
+* LengthType, WeightType, NumberOfPassengers, PercentageType added
+* DayTypeEnumeration / TimetableTypeEnumeration / RoutePointTypeEnumeration / StopPointTypeEnumeration / BookingStatusEnumeration / TicketRestrictionEnumeration / InterchangeStatusEnumeration / ReportTypeEnumeration   
+* TpegReasonGroup clean up
+* SituationBaseIdentityGroup.ParticipantRef 0.1 instead of 1.1
+* VerificationStatus clean up
+* Predictability uses PredictabilityEnumeration instead of  VerificationStatusEnumeration
+* ServiceConditionEnumeration / SeverityEnumeration clean up
+* StopPlaceTypeEnumeration added
+* AffectedStopPlaceComponentStructure/AffectedPathLinkStructure:AccessibilityFeatureEnumeration in Siri namespace instead of ifopt
+* AffectedStopPlaceStructure: StopPlaceTypeEnumeration in Siri namespace instead of ifopt
+* PtAdviceStructure: new elements added
+* PtConsequenceStructure:ConditionGroup instead of element condition 
+* DefaultedTextStructure extends NaturalLanguageStringStructure instead of PopulatedStringType with xml:lang optional
+* ScopeTypeEnumeration: new values added
+* StatusGroup:Progress 0.1 instead of 1.1 (because default provided)
+* SituationSourceStructure:Country element renaming undo, type set to ifopt:CountryRefStructure
+* BrandingCodeType, BrandingRefStructure, BrandingStructure: new elements
+* OccupancyEnumeration: new values added 
+* TrainOperationalInfoGroup: new element JourneyFormationGroup added
+* new element DatedTrainOperationalInfoGroup / DatedJourneyPartInfoStructure added
+* JourneyPartInfoStructure: new elements and cardinality changes
+* ProgressDataQualityGroup:PredictionInaccurateReason new element added
+* VehicleModesOfTransportEnumeration new values added
+* FilterByVehicleMode / FilterByProductCategoryRef: new elements added
+* PredictionInaccurateReasonEnumeration, JourneyRelationTypeEnumeration, QuayTypeEnumeration, TrainElementTypeEnumeration, TrainSizeEnumeration, TypeOfFuelEnumeration, FareClass, FareClasses, FareClassListOfEnumerations, FareClassEnumeration, VehicleInFormationStatusEnumeration, FormationChangeEnumeration new elements added
+* TrainElementCodeType, TrainElementRefStructure, TrainElementRef, TrainComponentCodeType, TrainComponentRefStructure, TrainComponentRef, TrainCodeType, TrainRefStructure, TrainRef, CompoundTrainCodeType, CompoundTrainRefStructure, CompoundTrainRef, TrainInCompoundTrainCodeType, TrainInCompoundTrainRefStructure, TrainInCompoundTrainRef, EntranceToVehicleCodeType, EntranceToVehicleRefStructure, EntranceToVehicleRef, TrainFormationReferenceGroup: new elements added
+* ConnectingJourneyRefStructure, DatedVehicleJourneyIndirectRefStructure, QuayType, JourneyRelationsStructure, JourneyRelationStructure, JourneyRelationInfoGroup, RelatedCallStructure, RelatedJourneyPartStructure, RelatedJourneyStructure, JourneyFormationGroup, VehicleOrientationRelativeToQuay, FormationAssignmentStructure, FormationConditionStructure, FormationStatusStructure, VehicleInFormationStatusStructure, FormationStatusInfoGroup, RecommendationStructure, PassengerCapacityGroup, OccupancyScopeFilterGroup, OccupancyValuesGroup, GroupReservationStructure, VehicleOccupancyStructure, PassengerCapacityStructure, TrainElementStructure, TrainElementGroup, TrainComponentStructure, TrainComponentGroup, TrainStructure, TrainGroup, CompoundTrainStructure, TrainInCompoundTrainStructure, TrainInCompoundTrainGroup, PassageBetweenTrainsStructure, VehicleTypeGroup, VehicleTypePropertiesGroup, VehicleAccessibilityRequirementsGroup, VehicleDimensionsGroup, DepartureCancellationReason, ArrivalCancellationReason : new elements added
+* StopAssignmentStructure: new elements added 
+* OnwardVehicleArrivalTimesGroup/DatedVehicleJourneyStructure: new elements added
+* MonitoredStopDepartureStatusGroup / MonitoredStopArrivalStatusGroup / AimedVehicleDepartureGroup / AimedVehicleArrivalGroup : new elements  added, cardinality of elements changed
+* DatedOperationalInfoGroup/CountingTypeEnumeration/CountingTrendEnumeration/CountedFeatureUnitEnumeration/FacilityCategoryEnumeration: new elements
+* /ToServiceJourneyInterchangeStructure/DatedCallStructure/ DisruptionGroup/RemedyStructure/FacilityConditionStructure/MonitoredCountingStructure/FacilityScheduleRefGroup/RecordedCallGroup/CallRealTimeInfoGroup/EstimatedVehicleJourneyStructure/EstimatedServiceJourneyInterchangeStructure: new elements added
+* RemovedServiceJourneyInterchangeStructure/RemovedDatedVehicleJourneyStructure: new element
+* ToServiceJourneyInterchangeStructure/AbstractServiceJourneyInterchangeStructure: some elements removed, new elements added
+* RequestMessageRef: type changed to MessageQualifierStructure
+* SubscriptionRef: type changed to SubscriptionQualifierStructure
+* SubscriptionRenewal: new element added
+* MessageRef: type changed to MessageRefStructure
+* DataReceivedAcknowledgement/TerminationResponseStatusStructure:Status: cardinality changed to optional
+* ReferenceContextGroup:Language: set unbounded
+* remove used element: AreaOfInterestEnumeration
+
+## 20201120 - Sync CEN Integration CR69
+(https://github.com/SIRI-CEN/SIRI/commit/6929d799588e5f62fd6342f07882c8cfa9353e71)
+* DescriptionGroup:Language type set xsd:language
+* ImagesStructure new element
+* DescriptionGroup:Internal new type InternalContentStructure
+* DescriptionGroup:Images new type ImagesStructure
+* DescriptionGroup:InfoLinksStructure new element InfoLinksStructure
+* PublishingAction moved from ActionsStructure to ParameterisedActionStructure as a choice to ActionData
+* PublishAtScope renamed to PublicationScope
+* new element Classification in PassengerInformationActionStructure
+* ActionsGroup:PublishByPerspectiveAction new element as a wrapper element for PublishingActions
+* Delete unused elements in UmS ActionPeriodStructure, AffectsSegmentStructure, Duration235959
+* TextualContentStructure: ActionsGroup deleted
+* Element RemarkContent:Remark renamed to RemarkText
+* Element ReasonContentStructure renamed to ReasonNameContentStructure
+* TextualContentStructure:Internal moved after RemarkContent
+* TextualContentStructure:Images new type ImagesStructure, moved after Internal
+* TextualContentStructure:InfoLinks new type InfoLinksStructureStructure, moved after Images
+* PublicEventTypeEnum, FacilityCategoryEnumeration, RemedyStructure: clean up 
+
+## 20201124 - Sync CEN CR079 
+* AffectedStopPlaceStructure: new Lines element
+* AffectedLineStructure: new elements StopPoints, StopPlaces
+* AffectedStopPointStructure:StopPlaceRef / StopPlaceName / Lines
+* RoutePointTypeEnumeration
+* XML Schema upgrade
+* Default in version attributes=2.1
+* StopMonitoringRequestPolicyGroup:IncludeSituations default=false
+* DeliveryEndpointGroup:MessageQualifierStructure replaced by MessageRefStructure
+* SubscriptionIdentifierResourcePropertyGroup: SubscriptionQualifierStructure replaced by SubscriptionRefStructure
+* AffectedNetworkStructure: SelectedRoutes type set to AffectedRouteStructure, AffectedSection element added in choice between AllLine, SelectedRoutes and AffectedLine
+* SituationExchangeSubscriptionRequest:IncrementatlUpdates default set to false
+
+
+## TODOs
+### Remaining DIFFS with CEN
+* clean up SX examples
+* AffectedStopDepartureGroup:DeparturePlatformName unbounded
+* siri-modes-v1.1.xsd
+* SX examples
+* Delete zrescue
+* integrate *cloze-elements