Merge branch 'next' into enhancement-FareDebit

nick-knowles · Jul 25, 2024 · 21f28da · 21f28da
2 parents 7843801 + 4d95205
commit 21f28da
Show file tree

Hide file tree

Showing 346 changed files with 73,952 additions and 14,746 deletions.
diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh
@@ -22,9 +22,9 @@ while IFS= read -r -d $'\0' filename; do
   fi
   # Remove temp file
   rm "${filename}.pretty"
-done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)
+done < <(/usr/bin/find examples xsd -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)
 
 if [ ${PARSING_ERROR} -ne 0 ]; then
   exit ${PARSING_ERROR}
 fi
-echo -e '\033[0;32mFinished validating XML file structure and linting XSD and XML files\033[0m'
+echo -e '\033[0;32mFinished linting XSD and XML files\033[0m'
diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh
@@ -9,7 +9,7 @@ set -e
 
 echo "Validating NeTEx XML examples ..."
 
-if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
+if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
   echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
 else
   echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/NeTEx.spp b/NeTEx.spp
diff --git a/README.md b/README.md
diff --git a/change_log.md b/change_log.md
diff --git a/examples/functions/bookingArrangements/generalframe.xml b/examples/functions/bookingArrangements/generalframe.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
+	<PublicationTimestamp>2023-10-04T09:30:47.0Z</PublicationTimestamp>
+	<ParticipantRef>NDOV</ParticipantRef>
+	<dataObjects>
+		<GeneralFrame id="test:GeneralFrame:1" version="1.0">
+			<Name>BookingArrangement test</Name>
+			<members>
+				<BookingArrangement id="test:BookingArrangement:1" version="1.0">
+					<LatestBookingTime>16:00:00</LatestBookingTime>
+					<MinimumBookingPeriod>PT1H</MinimumBookingPeriod>
+					<BookingUrl>assitace.org.uk/wibledon</BookingUrl>
+				</BookingArrangement>
+			</members>
+		</GeneralFrame>
+		<ResourceFrame id="test:GeneralFrame:1" version="1.0">
+			<bookingArrangements>
+				<BookingArrangement id="test:BookingArrangement:2" version="1.0">
+					<LatestBookingTime>16:00:00</LatestBookingTime>
+					<MinimumBookingPeriod>PT1H</MinimumBookingPeriod>
+					<BookingUrl>assitace.org.uk/wibledon</BookingUrl>
+				</BookingArrangement>
+			</bookingArrangements>
+		</ResourceFrame>
+	</dataObjects>
+</PublicationDelivery>