From c59d1039fcfe483fed50f522441bcae0d328fa09 Mon Sep 17 00:00:00 2001 From: Nataliia Kovalchuk Date: Wed, 7 Aug 2024 12:22:47 +0200 Subject: [PATCH 1/5] fix: Update mapping for the terms of use --- ckanext/geocat/utils/mapping_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ckanext/geocat/utils/mapping_utils.py b/ckanext/geocat/utils/mapping_utils.py index a5d09f7..e069043 100644 --- a/ckanext/geocat/utils/mapping_utils.py +++ b/ckanext/geocat/utils/mapping_utils.py @@ -19,10 +19,10 @@ DCT = Namespace("http://purl.org/dc/terms/") SKOS = Namespace("http://www.w3.org/2004/02/skos/core#") -TERMS_OF_USE_OPEN = 'NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired' # noqa -TERMS_OF_USE_BY = 'NonCommercialAllowed-CommercialAllowed-ReferenceRequired' # noqa -TERMS_OF_USE_ASK = 'NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired' # noqa -TERMS_OF_USE_BY_ASK = 'NonCommercialAllowed-CommercialWithPermission-ReferenceRequired' # noqa +TERMS_OF_USE_OPEN = 'https://opendata.swiss/terms-of-use/#terms_open' # noqa +TERMS_OF_USE_BY = 'https://opendata.swiss/terms-of-use#terms_by' # noqa +TERMS_OF_USE_ASK = 'https://opendata.swiss/terms-of-use#terms_ask' # noqa +TERMS_OF_USE_BY_ASK = 'https://opendata.swiss/terms-of-use#terms_by_ask' # noqa VALID_TERMS_OF_USE = [ TERMS_OF_USE_BY, TERMS_OF_USE_ASK, From 93a9f1fa9dea58ff1b9232d558d159052c720b85 Mon Sep 17 00:00:00 2001 From: kovalch Date: Wed, 7 Aug 2024 13:19:31 +0200 Subject: [PATCH 2/5] update: Update mapping for the terms of use --- ckanext/geocat/utils/geocat-terms-of-use.xml | 46 ++++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/ckanext/geocat/utils/geocat-terms-of-use.xml b/ckanext/geocat/utils/geocat-terms-of-use.xml index 7c2bb28..229ce53 100644 --- a/ckanext/geocat/utils/geocat-terms-of-use.xml +++ b/ckanext/geocat/utils/geocat-terms-of-use.xml @@ -1,6 +1,8 @@ @@ -18,44 +20,72 @@ 2019-09-24 - + Opendata OPEN: Open use. Opendata OPEN: Utilisation libre. Opendata OPEN: Freie Nutzung. Opendata OPEN: Libero utilizzo. Freie Nutzung Utilisation libre - NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired + + + NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired + NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired + + + https://opendata.swiss/en/terms-of-use/#terms_open + - + Opendata BY: Open use. Must provide the source. Opendata BY: Utilisation libre. Obligation d’indiquer la source. Opendata BY: Freie Nutzung. Quellenangabe ist Pflicht. Opendata BY: Libero utilizzo. Indicazione della fonte obbligatoria. Utilizzo a fini commerciali ammesso soltanto previo consenso del titolare dei dati Freie Nutzung. Quellenangabe ist Pflicht. Utilisation libre. Obligation d’indiquer la source. - NonCommercialAllowed-CommercialAllowed-ReferenceRequired + + + NonCommercialAllowed-CommercialAllowed-ReferenceRequired + NonCommercialAllowed-CommercialAllowed-ReferenceRequired + + + https://opendata.swiss/en/terms-of-use/#terms_by + - + Opendata ASK: Open use. Use for commercial purposes requires permission of the data owner. Opendata ASK: Utilisation libre. Utilisation à des fins commerciales uniquement avec l’autorisation du fournisseur des données. Opendata ASK: Freie Nutzung. Kommerzielle Nutzung nur mit Bewilligung des Datenlieferanten zulässig. Opendata ASK: Libero utilizzo. Utilizzo a fini commerciali ammesso soltanto previo consenso del titolare dei dati. Freie Nutzung. Kommerzielle Nutzung nur mit Bewilligung des Datenlieferanten zulässig. Utilisation libre. Utilisation à des fins commerciales uniquement avec l’autorisation du fournisseur des données. - NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired + + + NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired + NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired + + + https://opendata.swiss/en/terms-of-use/#terms_ask + - + Opendata BY ASK: Open use. Must provide the source. Use for commercial purposes requires permission of the data owner. Opendata BY ASK: Utilisation libre. Obligation d’indiquer la source. Utilisation commerciale uniquement avec l’autorisation du fournisseur des données. Opendata BY ASK: Freie Nutzung. Quellenangabe ist Pflicht. Kommerzielle Nutzung nur mit Bewilligung des Datenlieferanten zulässig. Opendata BY ASK: Libero utilizzo. Indicazione della fonte obbligatoria. Utilizzo a fini commerciali ammesso soltanto previo consenso del titolare dei dati. Freie Nutzung. Quellenangabe ist Pflicht. Kommerzielle Nutzung nur mit Bewilligung des Datenlieferanten zulässig. Utilisation libre. Obligation d’indiquer la source. Utilisation commerciale uniquement avec l’autorisation du fournisseur des données. - NonCommercialAllowed-CommercialWithPermission-ReferenceRequired + + + NonCommercialAllowed-CommercialWithPermission-ReferenceRequired + NonCommercialAllowed-CommercialWithPermission-ReferenceRequired + + + https://opendata.swiss/en/terms-of-use/#terms_by_ask + From b0bf71b1814e0a2883fc542c7ad16c32fe0e4bc1 Mon Sep 17 00:00:00 2001 From: kovalch Date: Wed, 7 Aug 2024 13:57:57 +0200 Subject: [PATCH 3/5] fix: Update tests with correct term of use Values --- ckanext/geocat/tests/test_distribution_metadata.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ckanext/geocat/tests/test_distribution_metadata.py b/ckanext/geocat/tests/test_distribution_metadata.py index edd506d..4f71b88 100644 --- a/ckanext/geocat/tests/test_distribution_metadata.py +++ b/ckanext/geocat/tests/test_distribution_metadata.py @@ -58,8 +58,8 @@ def setUp(self): def test_resources_are_picked_up_correctly_with_dataset_fields(self): self.assertEquals(4, len(self.distributions)) for distribution in self.distributions: - self.assertEquals(distribution.get('rights'), "NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired") - self.assertEquals(distribution.get('license'), "NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired") + self.assertEquals(distribution.get('rights'), "https://opendata.swiss/terms-of-use/#terms_open") + self.assertEquals(distribution.get('license'), "https://opendata.swiss/terms-of-use/#terms_open") self.assertEquals(distribution.get('issued'), self.dataset.get('issued')) self.assertEquals(distribution.get('modified'), self.dataset.get('modified')) self._is_multi_lang(distribution['title']) @@ -111,8 +111,8 @@ def setUp(self): def test_fields_that_come_from_the_dataset(self): self.assertEquals(6, len(self.distributions)) for distribution in self.distributions: - self.assertEquals(distribution.get('rights'), "NonCommercialAllowed-CommercialAllowed-ReferenceRequired") - self.assertEquals(distribution.get('license'), "NonCommercialAllowed-CommercialAllowed-ReferenceRequired") + self.assertEquals(distribution.get('rights'), "https://opendata.swiss/en/terms-of-use/#terms_by") + self.assertEquals(distribution.get('license'), "https://opendata.swiss/en/terms-of-use/#terms_by") self.assertEquals(distribution.get('issued'), self.dataset.get('issued')) self.assertEquals(distribution.get('modified'), self.dataset.get('modified')) self._is_multi_lang(distribution['title']) From b495ca393e1e61be6247675818fea56f57cec628 Mon Sep 17 00:00:00 2001 From: kovalch Date: Wed, 7 Aug 2024 15:53:55 +0200 Subject: [PATCH 4/5] fix: Remove language lable from the uri --- .../geocat/tests/test_distribution_metadata.py | 4 ++-- ckanext/geocat/utils/geocat-terms-of-use.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ckanext/geocat/tests/test_distribution_metadata.py b/ckanext/geocat/tests/test_distribution_metadata.py index 4f71b88..70dfbf0 100644 --- a/ckanext/geocat/tests/test_distribution_metadata.py +++ b/ckanext/geocat/tests/test_distribution_metadata.py @@ -111,8 +111,8 @@ def setUp(self): def test_fields_that_come_from_the_dataset(self): self.assertEquals(6, len(self.distributions)) for distribution in self.distributions: - self.assertEquals(distribution.get('rights'), "https://opendata.swiss/en/terms-of-use/#terms_by") - self.assertEquals(distribution.get('license'), "https://opendata.swiss/en/terms-of-use/#terms_by") + self.assertEquals(distribution.get('rights'), "https://opendata.swiss/terms-of-use/#terms_by") + self.assertEquals(distribution.get('license'), "https://opendata.swiss/terms-of-use/#terms_by") self.assertEquals(distribution.get('issued'), self.dataset.get('issued')) self.assertEquals(distribution.get('modified'), self.dataset.get('modified')) self._is_multi_lang(distribution['title']) diff --git a/ckanext/geocat/utils/geocat-terms-of-use.xml b/ckanext/geocat/utils/geocat-terms-of-use.xml index 229ce53..9b6a173 100644 --- a/ckanext/geocat/utils/geocat-terms-of-use.xml +++ b/ckanext/geocat/utils/geocat-terms-of-use.xml @@ -33,8 +33,8 @@ NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired - https://opendata.swiss/en/terms-of-use/#terms_open - + https://opendata.swiss/terms-of-use/#terms_open + @@ -50,8 +50,8 @@ NonCommercialAllowed-CommercialAllowed-ReferenceRequired - https://opendata.swiss/en/terms-of-use/#terms_by - + https://opendata.swiss/terms-of-use/#terms_by + @@ -67,8 +67,8 @@ NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired - https://opendata.swiss/en/terms-of-use/#terms_ask - + https://opendata.swiss/terms-of-use/#terms_ask + @@ -84,8 +84,8 @@ NonCommercialAllowed-CommercialWithPermission-ReferenceRequired - https://opendata.swiss/en/terms-of-use/#terms_by_ask - + https://opendata.swiss/terms-of-use/#terms_by_ask + From 9fde65108a24be9113430767016af4f578d2baf2 Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Thu, 8 Aug 2024 11:31:02 +0200 Subject: [PATCH 5/5] style: Remove unneeded noqas --- ckanext/geocat/utils/mapping_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ckanext/geocat/utils/mapping_utils.py b/ckanext/geocat/utils/mapping_utils.py index e069043..f9d04b0 100644 --- a/ckanext/geocat/utils/mapping_utils.py +++ b/ckanext/geocat/utils/mapping_utils.py @@ -19,10 +19,10 @@ DCT = Namespace("http://purl.org/dc/terms/") SKOS = Namespace("http://www.w3.org/2004/02/skos/core#") -TERMS_OF_USE_OPEN = 'https://opendata.swiss/terms-of-use/#terms_open' # noqa -TERMS_OF_USE_BY = 'https://opendata.swiss/terms-of-use#terms_by' # noqa -TERMS_OF_USE_ASK = 'https://opendata.swiss/terms-of-use#terms_ask' # noqa -TERMS_OF_USE_BY_ASK = 'https://opendata.swiss/terms-of-use#terms_by_ask' # noqa +TERMS_OF_USE_OPEN = 'https://opendata.swiss/terms-of-use/#terms_open' +TERMS_OF_USE_BY = 'https://opendata.swiss/terms-of-use#terms_by' +TERMS_OF_USE_ASK = 'https://opendata.swiss/terms-of-use#terms_ask' +TERMS_OF_USE_BY_ASK = 'https://opendata.swiss/terms-of-use#terms_by_ask' VALID_TERMS_OF_USE = [ TERMS_OF_USE_BY, TERMS_OF_USE_ASK,