From a017cad2ea92ab454b3d8e3f1c282b60a45d534b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 8 Sep 2021 13:23:50 +0200 Subject: [PATCH 01/13] Remove .circleci as per request #98 (#227) --- .circleci/config.yml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index fdbd1dce5..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: 2 -aliases: -- &post_build - name: Trigger downstream builds - command: | - echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV - echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV - echo 'export GITHUB_TOKEN="$GITHUB_TOKEN"' >> $BASH_ENV - /tools/trigger_build.sh "entur/netex-java-model.git" "master" "$(git log -1 --pretty=%B)" -jobs: - build: - docker: - - image: eu.gcr.io/carbon-1287/circleci-toolbox-image - auth: - username: _json_key - password: $GCLOUD_SERVICE_KEY - steps: - - checkout - - run: echo "Running xmllint to validate schema" - - run: xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/stopPlace/Netex_01_StopPoints_NoFrills_1.xml - - run: echo "Finished running xmllint" - trigger-dependants: - docker: - - image: eu.gcr.io/carbon-1287/circleci-toolbox-image - auth: - username: _json_key - password: $GCLOUD_SERVICE_KEY - steps: - - run: *post_build -workflows: - version: 2 - install-validate: - jobs: - - build: - context: org-carbon - - trigger-dependants: - context: org-carbon - requires: - - build - filters: - branches: - only: - - master From d5f21adfd18cb1046fe71f34898e97dbde6bb591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Wed, 8 Sep 2021 15:22:12 +0200 Subject: [PATCH 02/13] Fix documentation of CrossingEquipmentGroup/VisualGuidanceBands (#230) --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a86c97b6..5554f1cf1 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 @@ -1401,7 +1401,7 @@ Rail transport, Roads and Road transport - Whether crossing has tactile guidance strips. + Whether crossing has visual guidance bands or guidance strips. From 2236cb66627f6ccb320a3cfc0e027c6523ed4a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Wed, 8 Sep 2021 17:37:22 +0200 Subject: [PATCH 03/13] Fix Id type for GeneralSign (#231) --- .../part1_ifopt/netex_ifopt_equipmentSigns_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd index 8cbe4a8de..325167355 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd @@ -361,7 +361,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. From 522f7429688ffd8a5a85e8d709219d059b54ac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 14:49:21 +0200 Subject: [PATCH 04/13] Fix doc of AssistanceFacilityList (#236) --- .../netex_reusableComponents/netex_facility_version.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index a222013d7..43f56a08c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - List of Couchette FACILITies. + List of ASSISTANCE FACILITies. @@ -214,7 +214,7 @@ Rail transport, Roads and Road transport - List of Couchette FACILITies. + List of ASSISTANCE FACILITies. @@ -376,7 +376,7 @@ Rail transport, Roads and Road transport - List of Couchette FACILITies. + List of ASSISTANCE FACILITies. From d27a440c8800feeb596e6a51f07075378ef5f2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 14:56:58 +0200 Subject: [PATCH 05/13] Fix typo RightSideBorder (#238) --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index fc36ecb07..bcbf9a16e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -176,7 +176,7 @@ Rail transport, Roads and Road transport - Type of border on the right side (n the direction of the PATH LINK).+v1.1 + Type of border on the right side (in the direction of the PATH LINK). From 915ab9d41c7df4ce5989d08a9cb45b55fdc9a514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 14:58:57 +0200 Subject: [PATCH 06/13] Fix typo and doc of SharpsDisposal (#239) * Fix SharpsDispsal documentation * Fix typo in SharpsDispsal -> SharpsDisp_o_sal --- .../part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 0b7680051..d9f6e22d4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -479,9 +479,9 @@ Rail transport, Roads and Road transport Elements for a RUBBISH DISPOSAL EQUIPMENT type. - + - Whether there is CCTV. + Whether there are disposal facilities for needles or medical sharps. From 3939436d16f364630c35c849c6b064062ed6232f Mon Sep 17 00:00:00 2001 From: syversenkr Date: Thu, 23 Sep 2021 15:12:30 +0200 Subject: [PATCH 07/13] Fixed unique IDs failing due to constraint checks (#234) --- ...01.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml index b20ddfa2e..ac5bf4d74 100644 --- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml +++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml @@ -3520,9 +3520,9 @@ Oyster_PayAsYouGo_right - PayAsYouGo_trip metro - + Cant Break Metro journeys - Flat far simgle tripcase. + Flat fare single trip case. @@ -13565,7 +13565,7 @@ All other journeys on this service - + Travelcard and Freedom Pass discounts do not apply on this route. false @@ -14280,7 +14280,7 @@ Oyster card holders who want to travel on the Emirates Air Line as part of a 360 cableway - + From 6b7ed773a346d1bd5d071d34f175ec12311bb90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 15:12:56 +0200 Subject: [PATCH 08/13] Fix CounterService documentation (#240) --- .../part1_ifopt/netex_ifopt_localService_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd index ac4f3b8cb..296beadf2 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd @@ -508,7 +508,7 @@ Rail transport, Roads and Road transport - Whether there are wheel chair trolleys. + Whether left luggage is a counter service. From 61af5c1af88b74d0e97f0f400857635dcef4c101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 15:13:52 +0200 Subject: [PATCH 09/13] Fix doc of LevelGroup Description (#241) --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 526a8bb5d..a6bd221a4 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 @@ -569,7 +569,7 @@ Rail transport, Roads and Road transport - Name of LEVEL. + Description of LEVEL. From a84325749ece128ffe6a495c19a6b7b0884ada6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Thu, 23 Sep 2021 15:26:04 +0200 Subject: [PATCH 10/13] Fix LuggageTrolleys documentation (#237) --- .../part1_ifopt/netex_ifopt_localService_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd index 296beadf2..0fa9301bc 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd @@ -363,7 +363,7 @@ Rail transport, Roads and Road transport - Whether there are wheel chair trolleys. + Whether there are trolleys. From 4a1f9b60086b5f7fc4172b9e2c18d8931136c92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Mon, 27 Sep 2021 10:45:06 +0200 Subject: [PATCH 11/13] Fix doc of AccessSpaceType (#244) --- xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1a4075f78..5f20ebf88 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 @@ -749,7 +749,7 @@ contained within its parent QUAY. - Type of ACCESS SPACE. + Type of passage associated with ACCESS SPACE. From fcdbbc2945e04d1d5062cf911f9f971fc2816308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Mon, 27 Sep 2021 17:13:32 +0200 Subject: [PATCH 12/13] Fix documentation of ScopeOfTicketsAvailable (#232) --- .../part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd index 783bc438d..749f34310 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd @@ -183,7 +183,7 @@ Rail transport, Roads and Road transport - Types of Ticket available. + Scope of Ticket available. From c997b0e3ee477f8b154d3fbad5006cab9eda34a1 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 12 Oct 2021 22:27:06 +0200 Subject: [PATCH 13/13] Typo musicalInstrument (#245) First reported: https://github.com/entur/netex-java-model/issues/20 --- .../part3_fares/netex_usageParameterLuggage_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd index 889a891d6..80db465f2 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd @@ -121,7 +121,7 @@ Rail transport, Roads and Road transport - +