diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh index f3dfc1c91..d7c6f915d 100755 --- 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/examples/functions/fares/rail/Netex_era_crossborder_de.xml b/examples/functions/fares/rail/Netex_era_crossborder_de.xml index ad0edbff0..0e4ff6483 100644 --- a/examples/functions/fares/rail/Netex_era_crossborder_de.xml +++ b/examples/functions/fares/rail/Netex_era_crossborder_de.xml @@ -187,6 +187,11 @@ Use separate Composite frames to group AND + rail + + + longDistance + @@ -455,6 +460,11 @@ Saturdays / Sundays / public holidays: 00:00 to 03:00 the following dayDresden to Wroclaw section + rail + + + highSpeedRail + @@ -1479,7 +1489,7 @@ issued to DB ticket vending machines. Every day - ANy time + Any time 00:00:00 P1DT3H diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index 273b712c4..43dcaca72 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -9130,7 +9130,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g Every day - ANy time + Any time 00:00:00 diff --git a/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml b/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml index e632a17c2..0f432f7a2 100644 --- a/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml +++ b/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml @@ -1303,7 +1303,7 @@ The Calendar is shown coded as - + 22 44 2 diff --git a/examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml b/examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml index e9b3f320c..6f7077a1c 100644 --- a/examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml +++ b/examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml @@ -1,40 +1,13 @@ - - - - - - - - - - + + 2011-03-24T17:04:40.873+01:00 ERA001 Example for the mapping of simple timetables - + - + era http://www.era.eu/codes @@ -45,32 +18,259 @@ - - - - - - + + + + + 2011-02-07T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-05-06T00:00:00 + 1001111100111110011111001111100111110011111001111100111110011111001111100011110001111 + + + 2011-02-07T00:00:00 + 2011-08-29T00:00:00 + 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-07T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-07-09T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-07-02T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-06T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000001100000110000011000001100000110000011000001100000111 + + + 2011-02-12T00:00:00 + 2011-08-26T00:00:00 + 1011111101111110111111011111101111110111111011111101111110111111011111101111110011111011111101111110111111001111101111110111111011111101111110111110011111001111100111110011111001111100111110011111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 00100000010000001000000100000010000001000000100000000000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-04-03T00:00:00 + 2011-04-03T00:00:00 + 1 + + + 2011-02-11T00:00:00 + 2011-08-26T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-11T00:00:00 + 2011-08-25T00:00:00 + 0001111000111100011110001111000111100011110001111000111100011110001111000011100001110001111000111100011110000111000111100011110001111000111100011110001111000111100011110001111000111100011110001111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 0100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-07-03T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000011 + + + 2011-02-06T00:00:00 + 2011-06-26T00:00:00 + 100000010000001000000100000010000001000000100000010000000000000100000010000001100000100000010000001000000100000010000001000000100000010000001 + + + 2011-04-03T00:00:00 + 2011-04-03T00:00:00 + 1 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-11T00:00:00 + 2011-08-26T00:00:00 + 10011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 + + + 2011-02-06T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-08T00:00:00 + 2011-08-26T00:00:00 + 11110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-07-04T00:00:00 + 2011-08-27T00:00:00 + 1111110111111011111101111110111111011111101111110111111 + + + 2011-02-12T00:00:00 + 2011-07-02T00:00:00 + 101111110111111011111101111110111111011111101111110111111011111101111110111111001111101111110111111011111100111110111111011111101111110111111 + + + 2011-02-06T00:00:00 + 2011-08-28T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001100000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-02-14T00:00:00 + 2011-08-26T00:00:00 + 11111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-05-09T00:00:00 + 2011-08-26T00:00:00 + 11111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-05T00:00:00 + 2011-08-27T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-07-04T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-07-01T00:00:00 + 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-11T00:00:00 + 2011-08-27T00:00:00 + 110111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111100111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-07-04T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-07-01T00:00:00 + 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111000111100111110011111 + + + + + + + + 2011-02-07T00:00:00 2011-08-26T00:00:00 EUROSTAR 10:32:00 + + + - + - + - + @@ -78,28 +278,26 @@ - - 2011-02-07T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - - - + + + + 2011-02-11T00:00:00 2011-05-06T00:00:00 EUROSTAR 09:26:00 + + + - + - + @@ -107,42 +305,40 @@ - - 2011-02-11T00:00:00 - 2011-05-06T00:00:00 - 1001111100111110011111001111100111110011111001111100111110011111001111100011110001111 - - - - - + + + + 2011-02-07T00:00:00 2011-08-29T00:00:00 EUROSTAR 12:53:00 + + + - + - + - + - + @@ -152,7 +348,7 @@ false - + @@ -160,35 +356,33 @@ - - 2011-02-07T00:00:00 - 2011-08-29T00:00:00 - 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - - - + + + + 2011-02-07T00:00:00 2011-08-26T00:00:00 EUROSTAR 13:02:00 + + + - + - + - + @@ -198,7 +392,7 @@ false - + @@ -206,35 +400,33 @@ - - 2011-02-07T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - - - + + + + 2011-07-09T00:00:00 2011-08-27T00:00:00 EUROSTAR 12:02:00 + + + - + - + - + @@ -244,7 +436,7 @@ false - + @@ -252,35 +444,33 @@ - - 2011-07-09T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001 - - - - - + + + + 2011-02-12T00:00:00 2011-07-02T00:00:00 EUROSTAR 12:02:00 + + + - + - + - + @@ -288,35 +478,33 @@ - - 2011-02-12T00:00:00 - 2011-07-02T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-06T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 21:02:00 - - + EUROSTAR + 21:02:00 + + + + + - + - + @@ -326,7 +514,7 @@ false - + @@ -334,35 +522,33 @@ - - 2011-02-06T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000001100000110000011000001100000110000011000001100000111 - - - + + - + 2011-02-12T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 20:32:00 - - + EUROSTAR + 20:32:00 + + + + + - + - + @@ -372,7 +558,7 @@ false - + @@ -380,42 +566,40 @@ - - 2011-02-12T00:00:00 - 2011-08-26T00:00:00 - 1011111101111110111111011111101111110111111011111101111110111111011111101111110011111011111101111110111111001111101111110111111011111101111110111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 21:29:00 - - + EUROSTAR + 21:29:00 + + + + + - + - + - + @@ -423,35 +607,33 @@ - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 21:54:00 - - + EUROSTAR + 21:54:00 + + + + + - + - + @@ -459,42 +641,40 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 19:23:00 - - + EUROSTAR + 19:23:00 + + + + + - + - + - + @@ -504,7 +684,7 @@ false - + @@ -512,28 +692,26 @@ - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - - + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 18:53:00 - - + EUROSTAR + 18:53:00 + + + + + - + @@ -543,14 +721,14 @@ true - + - + @@ -558,35 +736,33 @@ - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 00100000010000001000000100000010000001000000100000000000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-04-03T00:00:00 2011-04-03T00:00:00 - EUROSTAR - 20:51:00 - - + EUROSTAR + 20:51:00 + + + + + - + - + @@ -594,35 +770,33 @@ - - 2011-04-03T00:00:00 - 2011-04-03T00:00:00 - 1 - - - + + - + 2011-02-11T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 20:29:00 - - + EUROSTAR + 20:29:00 + + + + + - + - + @@ -630,42 +804,40 @@ - - 2011-02-11T00:00:00 - 2011-08-26T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-11T00:00:00 2011-08-25T00:00:00 - EUROSTAR - 20:29:00 - - + EUROSTAR + 20:29:00 + + + + + - + - + - + @@ -673,35 +845,33 @@ - - 2011-02-11T00:00:00 - 2011-08-25T00:00:00 - 0001111000111100011110001111000111100011110001111000111100011110001111000011100001110001111000111100011110000111000111100011110001111000111100011110001111000111100011110001111000111100011110001111 - - - + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 18:32:00 - - + EUROSTAR + 18:32:00 + + + + + - + - + @@ -711,7 +881,7 @@ false - + @@ -719,35 +889,33 @@ - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 0100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 18:32:00 - - + EUROSTAR + 18:32:00 + + + + + - + - + @@ -757,7 +925,7 @@ false - + @@ -765,42 +933,40 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-07-03T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 17:25:00 - - + EUROSTAR + 17:25:00 + + + + + - + - + - + @@ -810,7 +976,7 @@ false - + @@ -818,42 +984,40 @@ - - 2011-07-03T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-06T00:00:00 2011-06-26T00:00:00 - EUROSTAR - 17:25:00 - - + EUROSTAR + 17:25:00 + + + + + - + - + - + @@ -863,7 +1027,7 @@ false - + @@ -871,42 +1035,40 @@ - - 2011-02-06T00:00:00 - 2011-06-26T00:00:00 - 100000010000001000000100000010000001000000100000010000000000000100000010000001100000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-04-03T00:00:00 2011-04-03T00:00:00 - EUROSTAR - 17:25:00 - - + EUROSTAR + 17:25:00 + + + + + - + - + - + @@ -914,35 +1076,33 @@ - - 2011-04-03T00:00:00 - 2011-04-03T00:00:00 - 1 - - - + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 19:24:00 - - + EUROSTAR + 19:24:00 + + + + + - + - + @@ -950,35 +1110,33 @@ - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - - + + - + 2011-02-11T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 16:32:00 - - + EUROSTAR + 16:32:00 + + + + + - + - + @@ -988,7 +1146,7 @@ false - + @@ -996,42 +1154,40 @@ - - 2011-02-11T00:00:00 - 2011-08-26T00:00:00 - 10011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 17:59:00 - - + EUROSTAR + 17:59:00 + + + + + - + - + - + @@ -1039,35 +1195,33 @@ - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 - - - + + - + 2011-02-06T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 15:32:00 - - + EUROSTAR + 15:32:00 + + + + + - + - + @@ -1075,36 +1229,33 @@ - - 2011-02-06T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-08T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 15:02:00 - - - + EUROSTAR + 15:02:00 + + + + + - + - + @@ -1112,35 +1263,33 @@ - - 2011-02-08T00:00:00 - 2011-08-26T00:00:00 - 11110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 16:54:00 - - + EUROSTAR + 16:54:00 + + + + + - + - + @@ -1148,42 +1297,40 @@ - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 14:25:00 - - + EUROSTAR + 14:25:00 + + + + + - + - + - + @@ -1193,7 +1340,7 @@ false - + @@ -1201,28 +1348,26 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-07-04T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 13:12:00 - - + EUROSTAR + 13:12:00 + + + + + - + @@ -1232,14 +1377,14 @@ true - + - + @@ -1247,28 +1392,26 @@ - - 2011-07-04T00:00:00 - 2011-08-27T00:00:00 - 1111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-02-12T00:00:00 2011-07-02T00:00:00 - EUROSTAR - 13:12:00 - - + EUROSTAR + 13:12:00 + + + + + - + @@ -1278,14 +1421,14 @@ true - + - + @@ -1293,28 +1436,26 @@ - - 2011-02-12T00:00:00 - 2011-07-02T00:00:00 - 101111110111111011111101111110111111011111101111110111111011111101111110111111001111101111110111111011111100111110111111011111101111110111111 - - - + + - + 2011-02-06T00:00:00 2011-08-28T00:00:00 - EUROSTAR - 12:11:00 - - + EUROSTAR + 12:11:00 + + + + + - + @@ -1324,14 +1465,14 @@ true - + - + @@ -1339,28 +1480,26 @@ - - 2011-02-06T00:00:00 - 2011-08-28T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001100000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 11:11:00 - - + EUROSTAR + 11:11:00 + + + + + - + @@ -1370,21 +1509,21 @@ true - + - + - + @@ -1392,28 +1531,26 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-02-14T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 08:41:00 - - + EUROSTAR + 08:41:00 + + + + + - + @@ -1423,14 +1560,14 @@ true - + - + @@ -1438,35 +1575,33 @@ - - 2011-02-14T00:00:00 - 2011-08-26T00:00:00 - 11111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 10:02:00 - - + EUROSTAR + 10:02:00 + + + + + - + - + @@ -1474,28 +1609,26 @@ - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 - EUROSTAR - 09:11:00 - - + EUROSTAR + 09:11:00 + + + + + - + @@ -1505,21 +1638,21 @@ true - + - + - + @@ -1527,28 +1660,26 @@ - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 09:11:00 - - + EUROSTAR + 09:11:00 + + + + + - + @@ -1558,14 +1689,14 @@ true - + - + @@ -1573,28 +1704,26 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 08:25:00 - - + EUROSTAR + 08:25:00 + + + + + - + @@ -1604,14 +1733,14 @@ true - + - + @@ -1619,28 +1748,26 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-05-09T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 08:59:00 - - + EUROSTAR + 08:59:00 + + + + + - + @@ -1648,35 +1775,33 @@ - - 2011-05-09T00:00:00 - 2011-08-26T00:00:00 - 11111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-05T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 08:58:00 - - + EUROSTAR + 08:58:00 + + + + + - + - + @@ -1684,35 +1809,33 @@ - - 2011-02-05T00:00:00 - 2011-08-27T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-07-04T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 09:54:00 - - + EUROSTAR + 09:54:00 + + + + + - + - + @@ -1720,28 +1843,26 @@ - - 2011-07-04T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-11T00:00:00 2011-07-01T00:00:00 - EUROSTAR - 10:27:00 - - + EUROSTAR + 10:27:00 + + + + + - + @@ -1749,28 +1870,26 @@ - - 2011-02-11T00:00:00 - 2011-07-01T00:00:00 - 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111001111100111110011111 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 07:12:00 - - + EUROSTAR + 07:12:00 + + + + + - + @@ -1780,21 +1899,21 @@ true - + - + - + @@ -1802,42 +1921,40 @@ - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-11T00:00:00 2011-08-27T00:00:00 - EUROSTAR - 07:24:00 - - + EUROSTAR + 07:24:00 + + + + + - + - + - + @@ -1845,28 +1962,26 @@ - - 2011-02-11T00:00:00 - 2011-08-27T00:00:00 - 110111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111100111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-07-04T00:00:00 2011-08-26T00:00:00 - EUROSTAR - 06:33:00 - - + EUROSTAR + 06:33:00 + + + + + - + @@ -1876,7 +1991,7 @@ true - + @@ -1886,21 +2001,21 @@ true - + - + - + @@ -1908,28 +2023,26 @@ - - 2011-07-04T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-11T00:00:00 2011-07-01T00:00:00 - EUROSTAR - 06:33:00 - - + EUROSTAR + 06:33:00 + + + + + - + @@ -1939,7 +2052,7 @@ true - + @@ -1949,21 +2062,21 @@ true - + - + - + @@ -1971,12 +2084,7 @@ - - 2011-02-11T00:00:00 - 2011-07-01T00:00:00 - 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111000111100111110011111 - - + diff --git a/examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml b/examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml index 274e15840..997a7540d 100644 --- a/examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml +++ b/examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml @@ -6,14 +6,14 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 Actual --> - + 2011-03-24T17:04:40.873+01:00 ERA001 Example for the mapping of simple timetables - + - + tap http://www.era.eu/codes @@ -44,27 +44,254 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - - - + + + + + 2011-02-07T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-05-06T00:00:00 + 1001111100111110011111001111100111110011111001111100111110011111001111100011110001111 + + + 2011-02-07T00:00:00 + 2011-08-29T00:00:00 + 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-07T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-07-09T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-07-02T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-06T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000001100000110000011000001100000110000011000001100000111 + + + 2011-02-12T00:00:00 + 2011-08-26T00:00:00 + 1011111101111110111111011111101111110111111011111101111110111111011111101111110011111011111101111110111111001111101111110111111011111101111110111110011111001111100111110011111001111100111110011111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 00100000010000001000000100000010000001000000100000000000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-04-03T00:00:00 + 2011-04-03T00:00:00 + 1 + + + 2011-02-11T00:00:00 + 2011-08-26T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-11T00:00:00 + 2011-08-25T00:00:00 + 0001111000111100011110001111000111100011110001111000111100011110001111000011100001110001111000111100011110000111000111100011110001111000111100011110001111000111100011110001111000111100011110001111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 0100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-07-03T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000011 + + + 2011-02-06T00:00:00 + 2011-06-26T00:00:00 + 100000010000001000000100000010000001000000100000010000000000000100000010000001100000100000010000001000000100000010000001000000100000010000001 + + + 2011-04-03T00:00:00 + 2011-04-03T00:00:00 + 1 + + + 2011-02-11T00:00:00 + 2011-08-29T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-11T00:00:00 + 2011-08-26T00:00:00 + 10011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 + + + 2011-02-06T00:00:00 + 2011-08-29T00:00:00 + 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-08T00:00:00 + 2011-08-26T00:00:00 + 11110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-07-04T00:00:00 + 2011-08-27T00:00:00 + 1111110111111011111101111110111111011111101111110111111 + + + 2011-02-12T00:00:00 + 2011-07-02T00:00:00 + 101111110111111011111101111110111111011111101111110111111011111101111110111111001111101111110111111011111100111110111111011111101111110111111 + + + 2011-02-06T00:00:00 + 2011-08-28T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001100000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-02-14T00:00:00 + 2011-08-26T00:00:00 + 11111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-29T00:00:00 + 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 + + + 2011-02-13T00:00:00 + 2011-08-29T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-05-09T00:00:00 + 2011-08-26T00:00:00 + 11111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 + + + 2011-02-05T00:00:00 + 2011-08-27T00:00:00 + 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-07-04T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-07-01T00:00:00 + 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111001111100111110011111 + + + 2011-02-12T00:00:00 + 2011-08-27T00:00:00 + 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + 2011-02-11T00:00:00 + 2011-08-27T00:00:00 + 110111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111100111110111111011111101111110111111011111101111110111111011111101111110111111 + + + 2011-07-04T00:00:00 + 2011-08-26T00:00:00 + 111110011111001111100111110011111001111100111110011111 + + + 2011-02-11T00:00:00 + 2011-07-01T00:00:00 + 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111000111100111110011111 + + + + + + - + 2011-02-07T00:00:00 2011-08-26T00:00:00 EUROSTAR 10:32:00 + + + - + - + @@ -73,7 +300,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -83,30 +310,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-07T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-11T00:00:00 2011-05-06T00:00:00 EUROSTAR 09:26:00 + + + - + - + @@ -116,29 +341,27 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-05-06T00:00:00 - 1001111100111110011111001111100111110011111001111100111110011111001111100011110001111 - - - + + - + 2011-02-07T00:00:00 2011-08-29T00:00:00 12:53:00 + + + - + - + @@ -147,7 +370,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -156,7 +379,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -167,7 +390,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -177,30 +400,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-07T00:00:00 - 2011-08-29T00:00:00 - 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-07T00:00:00 2011-08-26T00:00:00 EUROSTAR 13:02:00 + + + - + - + @@ -209,7 +430,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -220,7 +441,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -230,30 +451,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-07T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-07-09T00:00:00 2011-08-27T00:00:00 EUROSTAR 12:02:00 + + + - + - + @@ -262,7 +481,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -273,7 +492,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -283,30 +502,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-07-09T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-12T00:00:00 2011-07-02T00:00:00 EUROSTAR 12:02:00 + + + - + - + @@ -315,7 +532,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -325,30 +542,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-07-02T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-06T00:00:00 2011-08-29T00:00:00 EUROSTAR 21:02:00 + + + - + - + @@ -357,7 +572,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -368,7 +583,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -378,30 +593,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-06T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000001100000110000011000001100000110000011000001100000111 - - - + + - + 2011-02-12T00:00:00 2011-08-26T00:00:00 EUROSTAR 20:32:00 + + + - + - + @@ -410,7 +623,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -421,7 +634,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -431,30 +644,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-26T00:00:00 - 1011111101111110111111011111101111110111111011111101111110111111011111101111110011111011111101111110111111001111101111110111111011111101111110111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 EUROSTAR 21:29:00 + + + - + - + @@ -463,7 +674,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -472,7 +683,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -482,30 +693,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 21:54:00 + + + - + - + @@ -514,7 +723,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -524,34 +733,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 EUROSTAR 19:23:00 + + + - + - + @@ -560,7 +767,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -569,7 +776,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -580,7 +787,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -590,34 +797,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 EUROSTAR 18:53:00 + + + - + - + @@ -628,7 +833,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -637,7 +842,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -647,34 +852,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 00100000010000001000000100000010000001000000100000000000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - + - - - + + + - + 2011-04-03T00:00:00 2011-04-03T00:00:00 EUROSTAR 20:51:00 + + + - + - + @@ -683,7 +886,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -693,34 +896,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-04-03T00:00:00 - 2011-04-03T00:00:00 - 1 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-26T00:00:00 EUROSTAR 20:29:00 + + + - + - + @@ -729,7 +930,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -739,34 +940,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-26T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-25T00:00:00 EUROSTAR 20:29:00 + + + - + - + @@ -775,7 +974,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -784,7 +983,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -794,34 +993,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-25T00:00:00 - 0001111000111100011110001111000111100011110001111000111100011110001111000011100001110001111000111100011110000111000111100011110001111000111100011110001111000111100011110001111000111100011110001111 - - + - - - + + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 EUROSTAR 18:32:00 + + + - + - + @@ -830,7 +1027,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -841,7 +1038,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -851,34 +1048,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 0100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - + - - - + + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 18:32:00 + + + - + - + @@ -887,7 +1082,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -898,7 +1093,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -908,34 +1103,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - + - - - + + + - + 2011-07-03T00:00:00 2011-08-29T00:00:00 EUROSTAR 17:25:00 + + + - + - + @@ -944,7 +1137,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -953,7 +1146,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -964,7 +1157,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -974,34 +1167,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-07-03T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000011 - - + - - - + + + - + 2011-02-06T00:00:00 2011-06-26T00:00:00 EUROSTAR 17:25:00 + + + - + - + @@ -1010,7 +1201,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1019,7 +1210,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1030,7 +1221,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1040,34 +1231,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-06T00:00:00 - 2011-06-26T00:00:00 - 100000010000001000000100000010000001000000100000010000000000000100000010000001100000100000010000001000000100000010000001000000100000010000001 - - + - - - + + + - + 2011-04-03T00:00:00 2011-04-03T00:00:00 EUROSTAR 17:25:00 + + + - + - + @@ -1076,7 +1265,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1085,7 +1274,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1095,34 +1284,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-04-03T00:00:00 - 2011-04-03T00:00:00 - 1 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-29T00:00:00 EUROSTAR 19:24:00 + + + - + - + @@ -1131,7 +1318,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1141,34 +1328,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-29T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - + - - - + + + - + 2011-02-11T00:00:00 2011-08-26T00:00:00 EUROSTAR 16:32:00 + + + - + - + @@ -1177,7 +1362,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1188,7 +1373,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1198,34 +1383,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-26T00:00:00 - 10011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - + - - - + + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 EUROSTAR 17:59:00 + + + - + - + @@ -1234,7 +1417,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1243,7 +1426,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1253,34 +1436,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 - - + - - - + + + - + 2011-02-06T00:00:00 2011-08-29T00:00:00 EUROSTAR 15:32:00 + + + - + - + @@ -1289,7 +1470,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1299,37 +1480,32 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-06T00:00:00 - 2011-08-29T00:00:00 - 1000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - + - - - + + + - + 2011-02-08T00:00:00 2011-08-26T00:00:00 EUROSTAR 15:02:00 - + + + - + - + @@ -1338,7 +1514,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1348,30 +1524,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-08T00:00:00 - 2011-08-26T00:00:00 - 11110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 EUROSTAR 16:54:00 + + + - + - + @@ -1380,7 +1554,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1390,30 +1564,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011111101111110111111011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 14:25:00 + + + - + - + @@ -1422,7 +1594,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1431,7 +1603,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1442,7 +1614,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1452,30 +1624,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-07-04T00:00:00 2011-08-27T00:00:00 EUROSTAR 13:12:00 + + + - + - + @@ -1486,7 +1656,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1495,7 +1665,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1505,30 +1675,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-07-04T00:00:00 - 2011-08-27T00:00:00 - 1111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-02-12T00:00:00 2011-07-02T00:00:00 EUROSTAR 13:12:00 + + + - + - + @@ -1539,7 +1707,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1548,7 +1716,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1558,30 +1726,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-07-02T00:00:00 - 101111110111111011111101111110111111011111101111110111111011111101111110111111001111101111110111111011111100111110111111011111101111110111111 - - - + + - + 2011-02-06T00:00:00 2011-08-28T00:00:00 EUROSTAR 12:11:00 + + + - + - + @@ -1592,7 +1758,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1601,7 +1767,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1611,30 +1777,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-06T00:00:00 - 2011-08-28T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001100000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 11:11:00 + + + - + - + @@ -1645,7 +1809,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1654,7 +1818,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1663,7 +1827,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1673,30 +1837,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-02-14T00:00:00 2011-08-26T00:00:00 EUROSTAR 08:41:00 + + + - + - + @@ -1707,7 +1869,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1716,7 +1878,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1726,30 +1888,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-14T00:00:00 - 2011-08-26T00:00:00 - 11111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-12T00:00:00 2011-08-29T00:00:00 EUROSTAR 10:02:00 + + + - + - + @@ -1758,7 +1918,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1768,30 +1928,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-29T00:00:00 - 1100000110000011000001100000110000011000001100000110000011000001100000111000011100001100000110000011000001110000110000011000001100000110000011000001100000110000011000001100000110000011000001100000111 - - - + + - + 2011-02-13T00:00:00 2011-08-29T00:00:00 EUROSTAR 09:11:00 + + + - + - + @@ -1802,7 +1960,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1811,7 +1969,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1820,7 +1978,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1830,30 +1988,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-13T00:00:00 - 2011-08-29T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 09:11:00 + + + - + - + @@ -1864,7 +2020,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1873,7 +2029,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1883,30 +2039,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 08:25:00 + + + - + - + @@ -1917,7 +2071,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1926,7 +2080,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -1936,30 +2090,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-05-09T00:00:00 2011-08-26T00:00:00 EUROSTAR 08:59:00 + + + - + - + @@ -1969,30 +2121,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-05-09T00:00:00 - 2011-08-26T00:00:00 - 11111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-05T00:00:00 2011-08-27T00:00:00 EUROSTAR 08:58:00 + + + - + - + @@ -2001,7 +2151,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2011,30 +2161,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-05T00:00:00 - 2011-08-27T00:00:00 - 100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-07-04T00:00:00 2011-08-26T00:00:00 EUROSTAR 09:54:00 + + + - + - + @@ -2043,7 +2191,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2053,30 +2201,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-07-04T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-11T00:00:00 2011-07-01T00:00:00 EUROSTAR 10:27:00 + + + - + - + @@ -2086,30 +2232,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-07-01T00:00:00 - 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111001111100111110011111 - - - + + - + 2011-02-12T00:00:00 2011-08-27T00:00:00 EUROSTAR 07:12:00 + + + - + - + @@ -2120,7 +2264,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2129,7 +2273,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2138,7 +2282,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2148,30 +2292,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-12T00:00:00 - 2011-08-27T00:00:00 - 10000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001 - - - + + - + 2011-02-11T00:00:00 2011-08-27T00:00:00 EUROSTAR 07:24:00 + + + - + - + @@ -2180,7 +2322,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2189,7 +2331,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2199,30 +2341,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-08-27T00:00:00 - 110111111011111101111110111111011111101111110111111011111101111110111111001111100111110111111011111101111110011111011111100111110111111011111101111110111111011111101111110111111011111101111110111111 - - - + + - + 2011-07-04T00:00:00 2011-08-26T00:00:00 EUROSTAR 06:33:00 + + + - + - + @@ -2233,7 +2373,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2244,7 +2384,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2253,7 +2393,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2262,7 +2402,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2272,30 +2412,28 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-07-04T00:00:00 - 2011-08-26T00:00:00 - 111110011111001111100111110011111001111100111110011111 - - - + + - + 2011-02-11T00:00:00 2011-07-01T00:00:00 EUROSTAR 06:33:00 + + + - + - + @@ -2306,7 +2444,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2317,7 +2455,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2326,7 +2464,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2335,7 +2473,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - + @@ -2345,12 +2483,7 @@ Provided by Stefan Jugtelt era (C) NeTEx 2011 - - 2011-02-11T00:00:00 - 2011-07-01T00:00:00 - 100111110011111001111100111110011111001111100111110011111001111100111110001111000111100111110011111001111100011110011111000111100111110011111 - - + diff --git a/examples/standards/era_uic/Netex_era_uic_calendar.xml b/examples/standards/era_uic/Netex_era_uic_calendar.xml index f913048b7..dc9e388a1 100644 --- a/examples/standards/era_uic/Netex_era_uic_calendar.xml +++ b/examples/standards/era_uic/Netex_era_uic_calendar.xml @@ -80,8 +80,11 @@ This example shows the usage of Operating calendars with reference to it from th rail - + EUROSTAR + + + 9121 rail @@ -125,8 +128,7 @@ This example shows the usage of Operating calendars with reference to it from th - - + diff --git a/examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml b/examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml index 19dfb315c..257514fd3 100644 --- a/examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml +++ b/examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml @@ -60,6 +60,30 @@ This example shows the usage of coupled journeys, footnodes and two directions f + + + + 2009-03-21T00:00:00 + 2009-03-22T00:00:00 + 11 + + + 2008-12-15T00:00:00 + 2009-06-13T00:00:00 + 1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111 + + + 2008-12-14T00:00:00 + 2009-12-12T00:00:00 + 1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + 2008-12-14T00:00:00 + 2009-12-12T00:00:00 + 1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + @@ -147,7 +171,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f - + Phoenix @@ -157,6 +181,9 @@ This example shows the usage of coupled journeys, footnodes and two directions f tap:FootNode_0084457_2009-03-21/2009-03-22_2 + + + 457 rail @@ -515,13 +542,11 @@ This example shows the usage of coupled journeys, footnodes and two directions f cyclesAllowedWithReservation - - 2009-03-21T00:00:00 - 2009-03-22T00:00:00 - 11 - - - + + + + + 60457 rail @@ -640,14 +665,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f seating - - 2008-12-15T00:00:00 - 2009-06-13T00:00:00 - 1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111 - - - + + Phoenix + + + 456 rail @@ -1039,14 +1062,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f doubleSleeper - - 2008-12-14T00:00:00 - 2009-12-12T00:00:00 - 1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - + + Kopernikus + + + 60456 rail @@ -1167,12 +1188,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f seating - - 2008-12-14T00:00:00 - 2009-12-12T00:00:00 - 1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - + diff --git a/examples/standards/era_uic/Netex_era_uic_simpletimetable.xml b/examples/standards/era_uic/Netex_era_uic_simpletimetable.xml index 570d133c0..99d82b3f5 100644 --- a/examples/standards/era_uic/Netex_era_uic_simpletimetable.xml +++ b/examples/standards/era_uic/Netex_era_uic_simpletimetable.xml @@ -28,6 +28,15 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data + + + + 2011-02-07T00:00:00 + 2011-08-29T00:00:00 + 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 + + + @@ -86,8 +95,11 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data - + EUROSTAR + + + 9129 rail @@ -159,12 +171,7 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data premiumClass businessClass secondClass - - 2011-02-07T00:00:00 - 2011-08-29T00:00:00 - 000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011 - - + diff --git a/examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml b/examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml index 6dcb17fa2..c157cb72d 100644 --- a/examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml +++ b/examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml @@ -90,6 +90,18 @@ Assumes there is not a common calendar but rather specific days + + + 2006-11-04T12:00:00 + 2006-07-30T12:00:00 + 11111001111101 + + + 2006-11-04T12:00:00 + 2006-11-04T12:00:00 + 1 + + @@ -105,8 +117,11 @@ Assumes there is not a common calendar but rather specific days rail - + 11:45:00Z + + + Swedish Railways @@ -139,7 +154,7 @@ Assumes there is not a common calendar but rather specific days - + text for stop @@ -159,18 +174,16 @@ Assumes there is not a common calendar but rather specific days - + - - 2006-11-04T12:00:00 - 2006-11-04T12:00:00 - 1 - - - + + 15:26:00Z + + + @@ -208,18 +221,13 @@ Assumes there is not a common calendar but rather specific days - + - - 2006-11-04T12:00:00 - 2006-07-30T12:00:00 - 11111001111101 - - + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml index a1f16ab45..aabe4aba4 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml @@ -5675,7 +5675,7 @@ Metrobus (including Fastway services), Southdown PSV, Compass Travel Every day - ANy time + Any time 00:00:00 diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 90eb79d5e..e2de7a16b 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -1660,7 +1660,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla Every day - ANy time + Any time 00:00:00 diff --git a/examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml b/examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml index c88969882..3cae86a02 100644 --- a/examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml +++ b/examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml @@ -14,7 +14,7 @@ The data comes from the sample-feed.zip available at http://code.google.com/tr 2. MAPPING A CALENDAR DATE maps to a VALIDITY CONDITION -The condition can be included as part of a SERVICE CALENDAR FRAME alonfg with the calendar.txts +The condition can be included as part of a SERVICE CALENDAR FRAME along with the calendar.txts GTFS NeTEx service_id, @id diff --git a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml index f54b901e5..a2ce23369 100644 --- a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml +++ b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml @@ -324,7 +324,7 @@ is relevant for supplying an Integrator with partial data from multiple sources. - + 90 50 1 diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example1-basic.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example1-basic.xml index 820c37e34..b6395749d 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example1-basic.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example1-basic.xml @@ -61,16 +61,28 @@ MES+200:KMT' --> + + + + 2006-11-04T12:00:00 + 2006-11-04T12:00:00 + 1 + + + Uic Example of a very simple train timetable rail - + ALPHA TANGO 05:03:00 + + + @@ -272,12 +284,7 @@ PDT++:::58:::' (TAPTSI B.4.7009 58 TRN Intercités) --> - - 2006-11-04T12:00:00 - 2006-11-04T12:00:00 - 1 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example1.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example1.xml index 8f977d442..321f7effc 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example1.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example1.xml @@ -443,6 +443,17 @@ Data is selected just for the stops for a single journey + + + + + + 2006-11-04T12:00:00 + 2006-11-04T12:00:00 + 1 + + + ALPHA TANGO @@ -499,6 +510,10 @@ Data is selected just for the stops for a single journey 05:03:00 + + + + @@ -700,12 +715,7 @@ PDT++:::58:::' (TAPTSI B.4.7009 58 TRN Intercités) --> - - 2006-11-04T12:00:00 - 2006-11-04T12:00:00 - 1 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.1-Classic_train.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.1-Classic_train.xml index 708b7cd33..cbddeba2c 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.1-Classic_train.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.1-Classic_train.xml @@ -79,6 +79,17 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-03-28T00:00:00 + 2022-06-18T23:59:59 + 11111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + @@ -154,7 +165,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Uic Example of a very simple train timetable rail - + 06:57:00 + + + + VR @@ -415,13 +430,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - - 2022-03-28T00:00:00 - 2022-06-18T23:59:59 - 11111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.2-Coach_group.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.2-Coach_group.xml index 0971bc3cb..e71d983a5 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.2-Coach_group.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.2-Coach_group.xml @@ -64,6 +64,41 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2021-12-19T00:00:00 + 2022-01-25T00:00:00 + 11100000000000000000000000000000000111 + + + + 2021-12-19T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + + 2021-12-19T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + + 2021-12-19T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + + 2021-12-19T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + @@ -176,7 +211,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider A single journey with three parts, each with a different Coach train number to rail - + 06:57:00 + + + + CD @@ -278,13 +317,7 @@ RLS+13+6'--> - - - 2021-12-19T00:00:00 - 2022-01-25T00:00:00 - 11100000000000000000000000000000000111 - - + @@ -355,7 +388,7 @@ ID Stop_number Service Relation Transfer_time Certainty representing the splitting at off coaches at each stage rail - + 06:57:00 + + + CD @@ -411,14 +447,8 @@ POR+005510033++' --> - - - 2021-12-19T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to: Coaches C407 Warsaw Bohumin rail @@ -427,6 +457,9 @@ POR+005510033++' --> Intercity Coach Group 06:57:00 + + + CD @@ -445,14 +478,8 @@ POR+005510033++' --> - - - 2021-12-19T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to Warsaw Breclaw rail @@ -461,6 +488,9 @@ POR+005510033++' --> Intercity Coach Group 06:57:00 + + + CD @@ -490,14 +520,8 @@ POR+005510033++' --> - - - 2021-12-19T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to: Warsaw Budapest-Nuygati rail @@ -506,6 +530,9 @@ POR+005510033++' --> Intercity Coach Group 06:57:00 + + + CD @@ -546,13 +573,7 @@ POR+005510033++' --> - - - 2021-12-19T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.3-Leo_Express.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.3-Leo_Express.xml index d6981a60a..aae44cf54 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.3-Leo_Express.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.3-Leo_Express.xml @@ -98,6 +98,17 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-04-01T00:00:00 + 2022-12-10T23:59:59 + 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + @@ -283,7 +294,7 @@ MES+363700:MTR' --> - + 06:36:00 + + + + LE @@ -577,14 +592,7 @@ MES+363700:MTR' --> - - - 2022-04-01T00:00:00 - 2022-12-10T23:59:59 - 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.4-Load_and_Unload.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.4-Load_and_Unload.xml index 595aeea50..1305bf8d8 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.4-Load_and_Unload.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.4-Load_and_Unload.xml @@ -75,6 +75,18 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-01-01T00:00:00 + 2022-09-04T23:59:59 + 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + + @@ -102,7 +114,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider rail - + train 06:32:00 + + + + SZ Pitzniski promet d.o.o @@ -283,14 +299,7 @@ ASD+9' --> - - - 2022-01-01T00:00:00 - 2022-09-04T23:59:59 - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.5-Interchange.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.5-Interchange.xml index c8e4d4dcf..818f5ff33 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.5-Interchange.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.5-Interchange.xml @@ -87,6 +87,17 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-03-11T00:00:00 + 2022-03-18T23:59:59 + 10000001 + + + @@ -186,7 +197,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider rail - + 06:57:00 + + + + DB Vertrieb GBH @@ -594,13 +609,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P incomingPassportControl - - - 2022-03-11T00:00:00 - 2022-03-18T23:59:59 - 10000001 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.6-Check_In.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.6-Check_In.xml index 3ccf3e47c..aa9a02593 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.6-Check_In.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.6-Check_In.xml @@ -63,6 +63,17 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-01-29T00:00:00 + 2022-04-16T23:59:59 + 100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + @@ -79,7 +90,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider - + 08:06:00 + + + + Movia @@ -177,13 +192,7 @@ ASD+44::0803' --> - - - 2022-01-29T00:00:00 - 2022-04-16T23:59:59 - 100000010000001000000100000010000001000000100000010000001000000100000010000001 - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tariff_and_Reservation.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tariff_and_Reservation.xml index 909138606..7c6470ccb 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tariff_and_Reservation.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tariff_and_Reservation.xml @@ -101,6 +101,18 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2021-12-12T00:00:00 + 2022-12-12T23:59:59 + 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + + @@ -296,7 +308,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider rail - + 10:42:00 + + + + CFR Calaton Train 686 @@ -747,14 +763,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P incomingPassportControl - - - 2021-12-12T00:00:00 - 2022-12-12T23:59:59 - 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - + diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tarrif_and_Reservation.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tarrif_and_Reservation.xml deleted file mode 100644 index 9340dc16c..000000000 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.7-Tarrif_and_Reservation.xml +++ /dev/null @@ -1,672 +0,0 @@ - - - - 2022-02-15T09:30:46.0Z - SYS001 - - - 2022-02-15T09:30:46.0Z - SYS002 - - P3M - - - Example of encoding Simple SKDUPD Tariff_and_Reservatioexample in NeTEx - - - - op7 - http://www.operator.hu/ - Operator's data - - - uic - http://www.uic.org/ - UIC data - - - - - - - - - - - - WIEN HBF - railStation - - - - HEGYESHALOM - railStation - - - - MOSONMAGYAROVAR - railStation - - - - GYOER - railStation - - - - TATABANUA - railStation - - - - BUDAPEST-KELENFOELD - railStation - - - - BUDAPEST-KELETI - railStation - - - - SZOLNOK - railStation - - - - TOEROEKSZENTMIKLOS - railStation - - - - KISIJSALLAS - railStation - - - - KARCAG - railStation - - - - PUESPOEKLADANY - railStation - - - - HAJDUSZOBOSZLO - railStation - - - - DEBRECEN-SZAZABADSAGTELEP - railStation - - - - DEBRECEN-SZAZABADSAGTELEP - railStation - - - - DEBRECEN-KONDOROS - railStation - - - - NAGYCSERE - railStation - - - - HALAP - railStation - - - - VAMOSPERCS - railStation - - - - SZENTANNANPUTZU - railStation - - - - NYIRABRANY - railStation - - - - VALEA LUI MIHAI - railStation - - - - CAREI - railStation - - - - SATU MARU - railStation - - - - ODOREU - railStation - - - - MEDIESU AURIT - railStation - - - - APA - railStation - - - - SEINI - railStation - - - - CICARLAU - railStation - - - - BAIA MARA - railStation - - - - - - Border points are noted for fares - - - NICKELSDORF GRENZE - - - HEGYESHALOM GR. - - - NYIRABRANY GR - - - NYIRABRANY (GR) - - - - - NICKELSDORF GRENZE - - - - - HEGYESHALOM GR. - - - - - NYIRABRANY GR - - - - NYIRABRANY (GR) - - - - - - rail - - - - Tariff and Reservation - rail - - interregionalRail - - Train - Interregional - - 10:42:00 - CFR Calaton - - - - - - - - - 1-14 - - - - - 10:46:00 - 15:56:00 - - - 14-34 - - - - - 16:02:00 - 22:08:00 - - - - - - - reservationsPossible - - trainWithTcvAndMarketPrice - - - - - firstClass - - - - - familyCarriage - - - - - - - - - WIEN HBF - - false - - - - - - - NICKELSDORF GRENZE - Border Point - - - HEGYESHALOM GR. - Border Point - - - HEGYESHALOM - - - - - - - - - MOSONMAGYAROVAR - - - - - - - - - GYOER - - - - - - - - - TATABANUA - - - - - - - - - BUDAPEST-KELENFOELD - - - - - - - - - BUDAPEST-KELETI - - - - - - - - - SZOLNOK - - - - - - - - - TOEROEKSZENTMIKLOS - - - - - - - - - KISIJSALLAS - - - - - - - - - KARCAG - - - - - - - - - POESPOEKLADANY - - - - - - - - - HAJDUSZOBOSZLO - - - - - - - - - DEBRECEN-SZAZABADSAGTELEP - - - - - - - - - DEBRECEN-SZAZABADSAGTELEP - - - - - - - - - DEBRECEN-KONDOROS - - - - - - - - - NAGYCSERE - - - - - - - - - HALAP - - - - - - - - - VAMOSPERCS - - - - - - - - - SZENTANNANPUTZU - - - - - - - - - NYIRABRANY - - - - - - - - - NYIRABRANY GR - - - NYIRABRANY (GR) - - - VALEA LUI MIHAI - - - - - - - - - CAREI - - - - - - - - - SATU MARU - - - - - - - - - ODOREU - - - - - - - - - MEDIESU AURIT - - - - - - - - - APA - - - - - - - - - SEINI - - - - - - - - - CICARLAU - - - - - - - - - BAIA MARA - - - - - false - - - - - - NICKELSDORF GRENZE - outgoingPassportControl - - - HEGYESHALOM GR. - incomingPassportControl - - - NYIRABRANY GR - outgoingPassportControl - - - NYIRABRANY (GR) - incomingPassportControl - - - - 2021-12-12T00:00:00 - 2022-12-12T23:59:59 - 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - - - - - 686 - 686 - - - - - - - diff --git a/examples/standards/tap_tsi/TAP-SKDUPD-example2.xml b/examples/standards/tap_tsi/TAP-SKDUPD-example2.xml index 142e7803b..bb850aa88 100644 --- a/examples/standards/tap_tsi/TAP-SKDUPD-example2.xml +++ b/examples/standards/tap_tsi/TAP-SKDUPD-example2.xml @@ -60,6 +60,17 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider + + + + + + 2022-03-28T00:00:00 + 2022-06-18T23:59:59 + 11111101111110111111011111101111110111111011111101111110111111011111101111110111111 + + + @@ -135,7 +146,7 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Uic Example of a very simple train timetable rail - + @@ -148,6 +159,9 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Intercity 06:57:00 + + + VR @@ -372,12 +386,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-03-28T00:00:00 - 2022-06-18T23:59:59 - 11111101111110111111011111101111110111111011111101111110111111011111101111110111111 - - + @@ -405,6 +414,40 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P + + + + + + + 2022-01-23T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + + + 2022-01-23T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + 2022-01-23T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + 2022-01-23T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + 2022-01-23T00:00:00 + 2022-01-25T23:59:59 + 11100000000000000000000000000000000111 + + + @@ -513,7 +556,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P A single journey with three parts, each with a different Coach train number to rail - + @@ -526,6 +569,9 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Coach Group 06:57:00 + + + CD @@ -595,12 +641,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-23T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - + @@ -667,7 +708,7 @@ ID Stop_number Service Relation Transfer_time Certainty representing the splitting at off coaches at each stage rail - + @@ -680,6 +721,9 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Coach Group 06:57:00 + + + CD @@ -712,13 +756,8 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-23T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to: Coaches C407 Warsaw Bohumin rail @@ -727,6 +766,9 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P Intercity Coach Group 06:57:00 + + + CD @@ -745,13 +787,8 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-23T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to Warsaw Breclaw rail @@ -760,6 +797,9 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P Intercity Coach Group 06:57:00 + + + CD @@ -789,13 +829,8 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-23T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - - + + Connecting to: Warsaw Budapest-Nuygati rail @@ -804,6 +839,9 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P Intercity Coach Group 06:57:00 + + + CD @@ -844,12 +882,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-23T00:00:00 - 2022-01-25T23:59:59 - 11100000000000000000000000000000000111 - - + @@ -965,6 +998,16 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P + + + + + 2022-04-01T00:00:00 + 2022-12-10T23:59:59 + 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + @@ -1047,7 +1090,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - + @@ -1059,6 +1102,10 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Intercity 06:36:00 + + + + LE 410 @@ -1291,12 +1338,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-04-01T00:00:00 - 2022-12-10T23:59:59 - 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - + @@ -1324,6 +1366,18 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P + + + + + + 2022-01-01T00:00:00 + 2022-09-04T23:59:59 + 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + + @@ -1351,7 +1405,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P rail - + @@ -1364,6 +1418,10 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider train 06:32:00 + + + + SZ Pitzniski promet d.o.o 850 @@ -1510,13 +1568,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P - - 2022-01-01T00:00:00 - 2022-09-04T23:59:59 - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - + @@ -1544,6 +1596,17 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P + + + + + + 2022-03-11T00:00:00 + 2022-03-18T23:59:59 + 10000001 + + + @@ -1643,7 +1706,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P rail - + @@ -1658,6 +1721,10 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider high-speed train 06:57:00 + + + + DB Vertrieb GBH @@ -2019,12 +2086,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P incomingPassportControl - - 2022-03-11T00:00:00 - 2022-03-18T23:59:59 - 10000001 - - + @@ -2103,6 +2165,17 @@ ID Stop_number Service Relation Transfer_time Certainty + + + + + + 2022-01-29T00:00:00 + 2022-04-16T23:59:59 + 100000010000001000000100000010000001000000100000010000001000000100000010000001 + + + @@ -2119,7 +2192,7 @@ ID Stop_number Service Relation Transfer_time Certainty - + 08:06:00 + + + + Movia @@ -2196,12 +2273,7 @@ ID FromStopNumber ToStopNumber ASD_or_SER Reservation_in_equipment Equipment Tar - - 2022-01-29T00:00:00 - 2022-04-16T23:59:59 - 100000010000001000000100000010000001000000100000010000001000000100000010000001 - - + @@ -2223,6 +2295,18 @@ ID FromStopNumber ToStopNumber ASD_or_SER Reservation_in_equipment Equipment Tar + + + + + + 2021-12-12T00:00:00 + 2022-12-12T23:59:59 + 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 + + + + @@ -2418,7 +2502,7 @@ ID FromStopNumber ToStopNumber ASD_or_SER Reservation_in_equipment Equipment Tar rail - + @@ -2431,6 +2515,10 @@ ID Service_number Reservation Tariff Service_Mode Service_Name Service_Provider Interregional 10:42:00 + + + + CFR Calaton @@ -2828,13 +2916,7 @@ ID Stop_number UIC Arrival_time Arrival_offset Departure_time Departure_offset P incomingPassportControl - - 2021-12-12T00:00:00 - 2022-12-12T23:59:59 - 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - - - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd index c9898486f..4d5409a13 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd @@ -60,12 +60,12 @@ Rail transport, Roads and Road transport - Dummy Abstract Assignment An Assignment assigns a property to an assignment element. It has a name and n order. + Dummy Abstract Assignment. An Assignment assigns a property to an other element. It has a name and an order. - Type for ASSIGNMENT. + Type for ASSIGNMENT. @@ -74,7 +74,7 @@ Rail transport, Roads and Road transport - Order in which to show ASSIGNMENT, + Order in which to show an ASSIGNMENT. @@ -82,7 +82,7 @@ Rail transport, Roads and Road transport - Elements for an ASSIGNMENT. An Assignment assignes a property to an aelent element. It has a name and n order. + Elements for an ASSIGNMENT. An ASSIGNMENT assigns a property to an another element. It has a name and an order. @@ -92,14 +92,14 @@ Rail transport, Roads and Road transport - Description of ASSIGNMENT. + Description of ASSIGNMENT. - A set of properties to be applied to an another element. It has a name and an order. + A set of properties to be applied to an another element. It has a name and an order. @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport - Type for ASSIGNMENT. + Type for ASSIGNMENT. diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 1ffdb74eb..11baf46dc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -212,6 +212,11 @@ Rail transport, Roads and Road transport Company registration number including Country prefix. + + + Company registered tax number including Country prefix. + + An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 9987b6efa..e814d0b59 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -2,6 +2,7 @@ + @@ -158,6 +159,11 @@ Rail transport, Roads and Road transport Whether timings and validity applies to both directions (true) or just to the from-to direction of the TRANSFER. + + + If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 917930d72..67009557b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -496,7 +496,6 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index fcce32eb5..551cae7e5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -1099,6 +1099,13 @@ Rail transport, Roads and Road transport + + + + List of values for PASSENGER INFORMATION EQUIPMENT. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 53a39f1d8..472cc728b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -68,19 +68,23 @@ Rail transport, Roads and Road transport - Access MODE for SITEs. + Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if in OTHER LEG of the TRIP a monomodal non-public transport is used. - Allowed values for Access MODEs for SITEs. + Allowed values for Access MODEs for SITEs, VEHICLE MEETING POINTS and TRANSFER and for monomodal non-public transport OTHER LEG in TRIP. - + + + Taxi can now be modeled as VEHICLE MODE as well. + + @@ -210,36 +214,98 @@ Rail transport, Roads and Road transport - Allowed values for MODES of Transport : TPEG pti_table 01. + Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used. - - + + + If all modes are meant. + + + + + Use only when no other entry applies. + + - + + + Special type of bus with two overhead wires using spring-loaded trolley poles. + + - + + + Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different. + + - - - - - - - - + + + Deprecated. Use Mode rail with RailSubmode longDistance. + + + + + Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + + + + + Within an urban area. For underground and railway. + + + + + All air related Mode. No special distinction is done. + + + + + Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. + + + + + Can be only two cabines or multiple. + + + + + cable railway on steep slope using two counterbalanced carriages. + + + + + A collection for all Mode involving snow and ice. + + - - + + + Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route. + + + + + General Mode for elevators and for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. + + - See pti12_x. + For all alternative modes where a vehicle is driven by the user. See pti12_x. + + + + + To be avoided. + + + + + Use only when no other entry applies. - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index 372d6958f..56225bcf1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -214,8 +214,13 @@ Rail transport, Roads and Road transport - - + + + depreciated. Will be panthograph. + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index e63f4f081..776a8f7f2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -261,8 +261,16 @@ Local train adapted for running in mountain railway lines. - - + + + Deprecated. Use metro + + + + + Replaces the Mode urbanRail. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd index 5e8b16bed..ddb3e1d38 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd @@ -380,7 +380,7 @@ Rail transport, Roads and Road transport - An correspondence from a ZONE in a source layer, onto a name place: i.e. TOPOGRAPHIC PLACE. +v1.1 + TOPOGRAPHICAL PROJECTION allows any ZONE to be directly mapped to a TOPOGRAPHICAL PLACE, e.g. a TARIFF ZONE, ADMINISTRATIVE ZONE can be stated as having the same bounds as another zone. +v1.1 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index e8880cdcc..cc687d43e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -594,7 +594,7 @@ Rail transport, Roads and Road transport - + Identifier of PASSENGER CAPACITY. @@ -962,7 +962,7 @@ Rail transport, Roads and Road transport Short Name of VEHICLE. - + Description +V1.2.2 diff --git a/xsd/netex_framework/netex_utility/netex_units.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd index d058cabe6..c65e9a14f 100644 --- a/xsd/netex_framework/netex_utility/netex_units.xsd +++ b/xsd/netex_framework/netex_utility/netex_units.xsd @@ -81,11 +81,6 @@ Weight = Kilos Speed = Metres per second. - - - TYPO - DEPRECATED. - - diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd index 87e076ba0..19a010128 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd @@ -26,7 +26,7 @@ NJSK Review ColourSystem and ColourName should be type xsd:normalizedString, not xsd:string. 2019-03-25SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes to Presentation and PrintPresentation elements. - Add icon to TypeOfInfolink enum values + Add icon to TypeOfInfoLink enum values 2019-03-30FR49 CD #53 Accessibility Changes NJSK revise: Add FontSizeEnum as a general property @@ -350,7 +350,7 @@ Rail transport, Roads and Road transport - Name of default colour value for printed text associated with entity, in specified ColourSystem. + Name of default colour value for printed text associated with entity, in specified ColourSystem. @@ -396,7 +396,7 @@ Rail transport, Roads and Road transport - Type for a Currency . Based on ISO 4717 values. + Type for a Currency. Based on ISO 4717 values. @@ -418,9 +418,9 @@ Rail transport, Roads and Road transport - + - Enumeration of Uses of language. + Enumeration of functional classification of an info link. @@ -453,21 +453,21 @@ Rail transport, Roads and Road transport - Type for Info LinK. + Type for Info Link. - Functional classifcation of infolink + Functional classifcation of an info link. - + - Software platform for which link is targeted, eg ios, android + Software platform for which link is targeted, e.g. iOS, Android. diff --git a/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd b/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd deleted file mode 100644 index d741525fe..000000000 --- a/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 5842d2b86..9bcb678e4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -708,7 +708,7 @@ Rail transport, Roads and Road transport - Slope (integer in meters) for inclined moving walks.+v1.1 + Maximum gradient in degrees for inclined moving walks.+v1.1 diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 25806f79e..892b1bdb0 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd @@ -763,22 +763,22 @@ Rail transport, Roads and Road transport - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations. Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd index f5e860836..21c5a8eab 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd @@ -105,12 +105,16 @@ Rail transport, Roads and Road transport - Type for containment in frame of STOP PLACE. + Type for containment in frame of STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. - + + + Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. + + @@ -147,7 +151,7 @@ Rail transport, Roads and Road transport - Version of a named place where public transport may be accessed. May be a building complex (e.g. a station) or an on-street location. + Version of a named place where public transport may be accessed. May be a building complex (e.g. a station) or an on-street location. Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd index f510fde3f..3ee3e7969 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd @@ -168,7 +168,6 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index 62e982a4a..13908bb0c 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -406,16 +406,19 @@ Rail transport, Roads and Road transport - Property Elements of a LINE. + Property elements of a LINE. - + - Primary OPERATOR of LINE. + A line should always have an AUTHORITY, even when the information is provided in a ResponsibilitySet. - - - + + + + An OPERATOR should be set, even when the same as the AUTHORITY. In some cases OPERATOR or AUTHORITY are managed through a ResponsibilitySet. However, for compatibility OperatorRef and AuthorityRef still should be filled in. + + Additional OPERATORs for LINE. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd index 5377cc9ed..6eea96b3b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd @@ -84,10 +84,9 @@ Rail transport, Roads and Road transport - - - - + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index afa50de0d..4ea754234 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -241,6 +241,11 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. + + + List of PASSENGER INFORMATION Equipments. + + @@ -328,7 +333,7 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. - Whether ENTITY is currently in use. Default is "released" + Whether ENTITY is currently in use. Default is "active". diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd index bc882c250..f0846e90b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd @@ -370,7 +370,7 @@ Rail transport, Roads and Road transport - Stop May be used to access transport system. + Stop may be used to access transport system. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 9403fac92..15bb407f8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -164,10 +164,9 @@ Rail transport, Roads and Road transport - - - - + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd index bcf3a54c9..fcd6a8eb0 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd @@ -547,24 +547,22 @@ Rail transport, Roads and Road transport - - - - - Identifier of POINT at which LINK ends. - - - - - Distance for TIMING LINK. - - - - - Run time for TIMING LINK - TIME BAND given by context. - - - + + + + Identifier of POINT at which LINK ends. + + + + + Distance for TIMING LINK. + + + + + Run time for TIMING LINK - TIME BAND given by context. + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd index 84fd7388b..532e4c103 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd @@ -114,37 +114,6 @@ Rail transport, Roads and Road transport - - - A visit to a SCHEDULED STOP POINT as part of a VEHICLE JOURNEY. A CALL is a view of a POINT IN JOURNEY PATTERN that adds in derived data. No Constraints - - - - - - - - - - - - - - - - - - - Identifier of ENTITY. - - - - - - Data type for CALL. @@ -490,36 +459,6 @@ Rail transport, Roads and Road transport - - - A visit to a SCHEDULED STOP POINT as part of a VEHICLE JOURNEY. A CALL is a view of a POINT IN JOURNEY PATTERN that adds in derived data. - - - - - - - - - - - - - - - - - - - - - - - - Elements describing the DATED CALL. diff --git a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd deleted file mode 100644 index cb600ed51..000000000 --- a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd deleted file mode 100644 index 65b9a8ab6..000000000 --- a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - main schema - e-service developers - V1.0 Christophe Duquesne - Nicholas Knowles - Europe - First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2014-10-04 - - - 2014-10-04 - - - -

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

-

This sub-schema describes the PI QUERY identifier types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support.xsd - [ISO 639-2/B] ENG - Kizoom, 109-123 Clifton Street, London EC4A 4LD - - http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2009-2014 - - -
    -
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
    • -
- - Version 1.0 Draft for approval - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx SALES TRANSACTION identifier types. - Standard - - - NeTEx: PI QUERY identifier types. - - - - - Type for identifier of a PASSENGER QUERY. - - - - - - Reference to a PASSENGER QUERY. - - - - - Type for Reference to a PASSENGER QUERY. - - - - - - Identifier of a PASSENGER QUERY. - - - - - - - - - Type for identifier of a TRIP PLAN QUERY. - - - - - - Reference to a TRIP PLAN QUERY. - - - - - Type for Reference to a TRIP PLAN QUERY. - - - - - - Identifier of a TRIP PLAN QUERY. - - - - - - - - - Type for identifier of a SCHEDULE QUERY. - - - - - - Reference to a SCHEDULE QUERY. - - - - - Type for Reference to a SCHEDULE QUERY. - - - - - - Identifier of a SCHEDULE QUERY. - - - - - - - - - Type for identifier of a STOP DEPARTURE QUERY. - - - - - - Reference to a STOP DEPARTURE QUERY. - - - - - Type for Reference to a STOP DEPARTURE QUERY. - - - - - - Identifier of a STOP DEPARTURE QUERY. - - - - - - - - - Type for identifier of a STOP FINDER QUERY. - - - - - - Reference to a STOP FINDER QUERY. - - - - - Type for Reference to a STOP FINDER QUERY. - - - - - - Identifier of a STOP FINDER QUERY. - - - - - - - - - Type for identifier of a FARE QUERY. - - - - - - Reference to a FARE QUERY. - - - - - Type for Reference to a FARE QUERY. - - - - - - Identifier of a FARE QUERY. - - - - - - - - - Type for identifier of a SINGLE TRIP FARE QUERY. - - - - - - Reference to a SINGLE TRIP FARE QUERY. - - - - - Type for Reference to a SINGLE TRIP FARE QUERY. - - - - - - Identifier of a SINGLE TRIP FARE QUERY. - - - - - - - - - Type for identifier of a REPEATED TRIP FARE QUERY. - - - - - - Reference to a REPEATED TRIP FARE QUERY. - - - - - Type for Reference to a REPEATED TRIP FARE QUERY. - - - - - - Identifier of a REPEATED TRIP FARE QUERY. - - - - - - diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 5e392fc7d..5e1b8b319 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -389,7 +389,7 @@ Rail transport, Roads and Road transport - ANy mode to which Mode validitry parameters apply + v1.2.2 + Any mode to which Mode validity parameters apply +v1.2.2 diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd index 1d021cab6..44f022728 100644 --- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - A rounding step to use to round a range of values. ANy value larger than the step key and smaller tha the next step key should be rounded to this value. + A rounding step to use to round a range of values. Any value larger than the step key and smaller tha the next step key should be rounded to this value. diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd index 80d22393b..d261e800d 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd @@ -263,7 +263,7 @@ Rail transport, Roads and Road transport - The number and characteristics of persons entitled to travel in addition to the holder of an access right. + The number and characteristics of persons entitled to travel including the holder of the access right. @@ -315,27 +315,27 @@ Rail transport, Roads and Road transport - Group size elements for GROUP TICKET Group. + Group size elements for GROUP TICKET Group. This includes the card holder(s). - Maximum number of persons overall allowed on GROUP TICKET. + Minimal number of persons overall allowed on GROUP TICKET. - Maximum number of persons overall allowed on GROUP TICKET. + Maximum number of persons overall allowed on GROUP TICKET (card holders and companions). - Minium number of card holders needed on GROUP TICKET, if any. + Minimum number of card holders needed on GROUP TICKET, if any. - Minimum and maximum numbers of users in each category allowed on GROUP TICKET. + Minimum and maximum numbers of users in each category allowed on GROUP TICKET. diff --git a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_support.xsd deleted file mode 100644 index b39a1dda8..000000000 --- a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_support.xsd +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - main schema - e-service developers - Nicholas Knowles - Christophe Duquesne - Europe - First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2020-10-06Add for New Modes - - 2020-10-06 New Modes Add PARKING CAPACITY ASSIGNEMNT - - -

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

-

This sub-schema describes the PARKING CAPACITYASSIGNMENT identifier Types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_5/netex_newModes}netex_nm_ParkingCapacityAssignment_support.xsd - [ISO 639-2/B] ENG - CEN TC278 WG3 SG9 - - http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2019-2020 - - -
    -
  • Derived from the Transmodel standard.
    • -
- - Version 1.0 - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx PARKING CAPACITYASSIGNMENT types. - Standard - - - NeTEx PARKING CAPACITY ASSIGNMENT Identifer types for - - - - - - Type for a list of PARKING AREA CAPACITY ASSIGNMENTs. +v1.2.2 - - - - - - - - - - - - Type for identifier of a PARKING AREA CAPACITY ASSIGNMENT. - - - - - - Reference to a PARKING AREA CAPACITY ASSIGNMENT. +v1.2.2 - - - - - Allowed values for PARKING CAPACITY TYPE. - - - - - - - - - - - - Type for a reference to a PARKING AREA CAPACITY ASSIGNMENT. +v1.2.2 - - - - - - Identifier of PARKING CAPACITY ASSIGNMENT. - - - - - - diff --git a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd deleted file mode 100644 index fc2703484..000000000 --- a/xsd/netex_part_5/part5_nd/netex_nm_ParkingCapacityAssignment_version.xsd +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - main schema - e-service developers - Nicholas Knowles - Christophe Duquesne - Europe - First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2020-10-15Add for New Modes - - - 2020-10-15 - - -

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

-

This sub-schema describes the PARKING CAPACITY ASSIGNMENT types.

- - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_5/netex_newModes}netex_nm_ParkingCapacityAssignment_version.xsd - [ISO 639-2/B] ENG - CEN TC278 WG3 SG9 - - http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2029-2020 - - -
    -
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
    • -
- - Version 1.0 - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx PARKING CAPACITY ASSIGNMENT types. - Standard - - - PARKING CAPACITY ASSIGNMENT data types - - - - - The allocation of a place to a MOBILITY SERVICE. +V1.2.2 - - - - - - - - - - - - - - - - - - - - Elements for a PARKING CAPACITY ASSIGNMENT. - - - - - - - Identifier of ENTITY. - - - - - - - - - Type for PARKING AREA CAPACITY ASSIGNMENT restricts id. - - - - - - - Elements for a PARKING CAPACITY ASSIGNMENT. - - - - - - - - - Elements for a PARKING AREA CAPACITY ASSIGNMENT. - - - - - - - Type of capacity assignment - - - - - Number of spaces available. - - - - - Number of additional vehicles that can be supplied or stored. - - - - - diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd index 9e8052300..47918c6a2 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd @@ -136,7 +136,7 @@ Rail transport, Roads and Road transport - Allowed values for Meeting Usage. +v1.2.2 + Allowed values for meeting usage of VEHICLE MEETING POINTs. +v1.2.2