diff --git a/ckanext/geocat/tests/test_distribution_metadata.py b/ckanext/geocat/tests/test_distribution_metadata.py index 70dfbf0..a678bfd 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'), "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('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'), "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('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 9b6a173..8e505ad 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/terms-of-use/#terms_open - + https://opendata.swiss/terms-of-use#terms_open + @@ -50,8 +50,8 @@ NonCommercialAllowed-CommercialAllowed-ReferenceRequired - https://opendata.swiss/terms-of-use/#terms_by - + https://opendata.swiss/terms-of-use#terms_by + @@ -67,8 +67,8 @@ NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired - https://opendata.swiss/terms-of-use/#terms_ask - + https://opendata.swiss/terms-of-use#terms_ask + @@ -84,8 +84,8 @@ NonCommercialAllowed-CommercialWithPermission-ReferenceRequired - https://opendata.swiss/terms-of-use/#terms_by_ask - + https://opendata.swiss/terms-of-use#terms_by_ask + diff --git a/ckanext/geocat/utils/mapping_utils.py b/ckanext/geocat/utils/mapping_utils.py index f9d04b0..de1c7db 100644 --- a/ckanext/geocat/utils/mapping_utils.py +++ b/ckanext/geocat/utils/mapping_utils.py @@ -19,7 +19,7 @@ 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' +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'