From 2a11eadf685063d6ecfb90d79c1bbb5d75f93b28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 07:47:12 +0100 Subject: [PATCH 01/26] Bump urllib3 from 1.26.2 to 1.26.3 (#6908) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.2 to 1.26.3. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/1.26.3/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.2...1.26.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Toni --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5737510d620..34d79c32542 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ beautifulsoup4==4.9.3 httplib2<0.18.2 hyperlink==21.0.0 idna>=2.5,<2.11 -urllib3==1.26.2 +urllib3==1.26.3 Paver==1.3.4 python-slugify==4.0.1 decorator==4.4.2 From 040772e9a7209858e1547ed8eaadf67f8dea32cc Mon Sep 17 00:00:00 2001 From: Toni Date: Tue, 2 Feb 2021 15:42:44 +0100 Subject: [PATCH 02/26] [Fixes #6880] Circle CI upload tests fail irregulary (#6881) * [Fixes #6880] Circle CI upload tests fail irregulary * CircleCI test fix: sometimes expires due to upload timeout in the test environment * - Avoid infinite loop on upload testing * Revert "CircleCI test fix: sometimes expires due to upload timeout in the test environment" This reverts commit 66139fdbf0b7510a9829a3e01254f41782fb7e1d. Co-authored-by: Alessio Fabiani Co-authored-by: afabiani --- .circleci/config.yml | 1 + geonode/upload/tests/integration.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 084644f56b5..0e6e3ad92a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,6 +107,7 @@ jobs: docker-compose -f docker-compose-test.yml exec db psql -U postgres -d test_geonode_data -c 'CREATE EXTENSION IF NOT EXISTS postgis;' docker-compose -f docker-compose-test.yml exec django bash -c '<>' working_directory: ./ + no_output_timeout: 20m - run: name: Run pep8 checks command: | diff --git a/geonode/upload/tests/integration.py b/geonode/upload/tests/integration.py index 79dcea97b8a..19fbe74c96e 100644 --- a/geonode/upload/tests/integration.py +++ b/geonode/upload/tests/integration.py @@ -136,6 +136,7 @@ def tearDownClass(cls): def setUp(self): # await startup + self.wait_for_progress_cnt = 0 cl = Client( GEONODE_URL, GEONODE_USER, GEONODE_PASSWD ) @@ -169,6 +170,7 @@ def _post_teardown(self): pass def tearDown(self): + self.wait_for_progress_cnt = 0 connections.databases['default']['ATOMIC_REQUESTS'] = False for temp_file in self._tempfiles: @@ -423,9 +425,12 @@ def wait_for_progress(self, progress_url): resp = self.client.get(progress_url) json_data = resp.json() # "COMPLETE" state means done - if json_data.get('state', '') == 'RUNNING': - time.sleep(0.1) + if json_data.get('state', '') == 'RUNNING' and self.wait_for_progress_cnt < 300: + time.sleep(1.0) + self.wait_for_progress_cnt += 1 self.wait_for_progress(progress_url) + else: + self.wait_for_progress_cnt = 0 def temp_file(self, ext): fd, abspath = tempfile.mkstemp(ext) From 65c6267fe24e2f96ea0bad9399b8ef4c6c06e9f0 Mon Sep 17 00:00:00 2001 From: Alessio Fabiani Date: Tue, 2 Feb 2021 15:43:26 +0100 Subject: [PATCH 03/26] [Fixes #6914] Remove "add to basket" tool for documents and maps (#6915) --- .../templates/base/_resourcebase_snippet.html | 15 ++++++------ geonode/templates/search/_search_content.html | 23 +++++++++++-------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/geonode/base/templates/base/_resourcebase_snippet.html b/geonode/base/templates/base/_resourcebase_snippet.html index f1d8f210cc9..3662b7cba15 100644 --- a/geonode/base/templates/base/_resourcebase_snippet.html +++ b/geonode/base/templates/base/_resourcebase_snippet.html @@ -37,37 +37,36 @@

{{ item.title }}

+ {% endverbatim %} + + {% if facet_type == 'layers' %}
-

{% endverbatim %} +

{% verbatim %} + title="{% trans "Select" %}">

+ {% endif %} - {% endverbatim %} {% trans "Service is" %} {% trans "online" %} {% trans "Service is" %} {% trans "offline" %} - {% verbatim %} - {% endverbatim %} {% trans "Layer not ready yet. Still finalizing layer ingestion..." %} - {% verbatim %} - {% endverbatim %}
{% trans "SECURITY NOT YET SYNCHRONIZED" %} {% verbatim %}{% endverbatim %}{% trans "Sync permissions immediately" %}
{% trans "PENDING APPROVAL" %}
{% trans "UNPUBLISHED" %}
- {% verbatim %} + {% verbatim %}

{{ item.abstract.length > 300 ? '...' : ''}}

diff --git a/geonode/templates/search/_search_content.html b/geonode/templates/search/_search_content.html index 77762f6497a..f02f5c7eeb3 100644 --- a/geonode/templates/search/_search_content.html +++ b/geonode/templates/search/_search_content.html @@ -1,18 +1,23 @@ {% load i18n %}
- + + {% if facet_type == 'layers' %} + + + {% endif %}
- {% block bulk_perms_button %} -
- {% if facet_type == 'layers' %} -
- + + {% if facet_type == 'layers' %} + {% block bulk_perms_button %} +
+
+ +
- {% endif %} -
- {% endblock %} + {% endblock %} + {% endif %}
{% trans "Filters" %} From 158511a1633ec382fab72b872412d149383e1370 Mon Sep 17 00:00:00 2001 From: Toni Date: Tue, 2 Feb 2021 16:47:10 +0100 Subject: [PATCH 04/26] Added malnajdi as contributor --- .clabot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 448bcf08d34..49261933bfc 100644 --- a/.clabot +++ b/.clabot @@ -46,6 +46,7 @@ "burner761", "binkiesbane", "rukarangi", - "sarahsmi" + "sarahsmi", + "malnajdi" ] } From e9efc3dfd51549d129a7d29f7dacedd998fb09ab Mon Sep 17 00:00:00 2001 From: Florian Hoedt Date: Tue, 2 Feb 2021 17:59:24 +0100 Subject: [PATCH 05/26] [Fixes #6910] meaningful filename for document download (#6911) * get meaningful document filenames on download * - Strip extension from document title before slugify it (e.g.: image.jpg instead of imagejpg.jpg) Co-authored-by: afabiani Co-authored-by: Alessio Fabiani --- geonode/documents/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/geonode/documents/views.py b/geonode/documents/views.py index 56aac88a8cf..a4506f08fd0 100644 --- a/geonode/documents/views.py +++ b/geonode/documents/views.py @@ -17,7 +17,7 @@ # along with this program. If not, see . # ######################################################################### - +import os import json import logging import traceback @@ -29,6 +29,7 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.template import loader from django.utils.translation import ugettext as _ +from django.utils.text import slugify from django.contrib.auth.decorators import login_required from django.conf import settings from django.urls import reverse @@ -193,7 +194,8 @@ def document_download(request, docid): '401.html', context={ 'error_message': _("You are not allowed to view this document.")}, request=request), status=401) register_event(request, EventType.EVENT_DOWNLOAD, document) - return DownloadResponse(document.doc_file) + filename = slugify(os.path.splitext(os.path.basename(document.title))[0]) + return DownloadResponse(document.doc_file, basename=f"{filename}.{document.extension}") class DocumentUploadView(CreateView): From 91f1a4e62b36ceaf75cad8b8c8b503b6c6589836 Mon Sep 17 00:00:00 2001 From: afabiani Date: Tue, 2 Feb 2021 19:29:25 +0100 Subject: [PATCH 06/26] - CircleCI Upload Tests: trying to reduce more the risk of infinite loop on "wait_for_progress" --- geonode/upload/tests/integration.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/geonode/upload/tests/integration.py b/geonode/upload/tests/integration.py index 19fbe74c96e..13c8777c10f 100644 --- a/geonode/upload/tests/integration.py +++ b/geonode/upload/tests/integration.py @@ -421,16 +421,21 @@ def upload_file(self, fname, final_check, final_check(check_name, resp, data) def wait_for_progress(self, progress_url): - if progress_url: - resp = self.client.get(progress_url) - json_data = resp.json() - # "COMPLETE" state means done - if json_data.get('state', '') == 'RUNNING' and self.wait_for_progress_cnt < 300: - time.sleep(1.0) - self.wait_for_progress_cnt += 1 - self.wait_for_progress(progress_url) + try: + if progress_url: + resp = self.client.get(progress_url) + json_data = resp.json() + # "COMPLETE" state means done + if json_data and json_data.get('state', '') == 'RUNNING' and \ + self.wait_for_progress_cnt < 100: + self.wait_for_progress_cnt += 1 + self.wait_for_progress(progress_url) + else: + self.wait_for_progress_cnt = 0 else: self.wait_for_progress_cnt = 0 + except Exception: + self.wait_for_progress_cnt = 0 def temp_file(self, ext): fd, abspath = tempfile.mkstemp(ext) From 5e77b398ec4067a20c1a2450b9d03fffd8c52a4d Mon Sep 17 00:00:00 2001 From: "Mohammed Y. Alnajdi" Date: Wed, 3 Feb 2021 11:47:49 +0300 Subject: [PATCH 07/26] [Fixes #6916] gsimporter.api.NotFound caused by missing trailing slash at the end of GEOSERVER_LOCATION (#6913) * [Fixes #6916] gsimporter.api.NotFound caused by missing trailing slash at the end of GEOSERVER_LOCATION * [Fixes #6916] unit test for GEOSERVER_LOCATION --- geonode/settings.py | 4 ++++ geonode/tests/smoke.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/geonode/settings.py b/geonode/settings.py index b4089a4c89d..73cecfc53d5 100644 --- a/geonode/settings.py +++ b/geonode/settings.py @@ -951,6 +951,10 @@ 'GEOSERVER_LOCATION', 'http://localhost:8080/geoserver/' ) +# add trailing slash to geoserver location url. +if not GEOSERVER_LOCATION.endswith('/'): + GEOSERVER_LOCATION = '{}/'.format(GEOSERVER_LOCATION) + GEOSERVER_PUBLIC_SCHEMA = os.getenv( 'GEOSERVER_PUBLIC_SCHEMA', SITE_HOST_SCHEMA ) diff --git a/geonode/tests/smoke.py b/geonode/tests/smoke.py index ff772631efa..8cba4d513c4 100644 --- a/geonode/tests/smoke.py +++ b/geonode/tests/smoke.py @@ -128,6 +128,12 @@ def test_opensearch_description(self): response = self.client.get(reverse('opensearch_dispatch')) self.assertEqual(response.status_code, 200) + # Settings Tests # + + def test_settings_geoserver_location(self): + '''Ensure GEOSERVER_LOCATION variable ends with /''' + self.assertTrue(settings.GEOSERVER_LOCATION.endswith('/')) + class GeoNodeUtilsTests(GeoNodeBaseTestSupport): From ec6d728f746fff7597c17192c2d1db8f283f3975 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:49:27 +0100 Subject: [PATCH 08/26] Bump django-cors-headers from 3.6.0 to 3.7.0 (#6901) Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/adamchainz/django-cors-headers/releases) - [Changelog](https://github.com/adamchainz/django-cors-headers/blob/master/HISTORY.rst) - [Commits](https://github.com/adamchainz/django-cors-headers/compare/3.6.0...3.7.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 34d79c32542..5e4ac47b076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -128,7 +128,7 @@ python_resize_image==1.1.19 # required by monitoring psutil==5.8.0 -django-cors-headers==3.6.0 +django-cors-headers==3.7.0 user-agents xmljson django-ipware<3.1 From c5432b5a47a3952a019df70a97c13ff40f30fa81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:50:35 +0100 Subject: [PATCH 09/26] Bump amqp from 5.0.3 to 5.0.5 (#6905) Bumps [amqp](https://github.com/celery/py-amqp) from 5.0.3 to 5.0.5. - [Release notes](https://github.com/celery/py-amqp/releases) - [Changelog](https://github.com/celery/py-amqp/blob/master/Changelog) - [Commits](https://github.com/celery/py-amqp/compare/v5.0.3...v5.0.5) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e4ac47b076..aeea109ef36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ psycopg2==2.8.6 Django==2.2.16 # Other -amqp==5.0.3 +amqp==5.0.5 pyyaml>=4.2b1 beautifulsoup4==4.9.3 httplib2<0.18.2 From 28424ca5ee82a78504d3f27df8e5e8bca43e1aa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:51:55 +0100 Subject: [PATCH 10/26] Bump pip from 21.0 to 21.0.1 (#6900) Bumps [pip](https://github.com/pypa/pip) from 21.0 to 21.0.1. - [Release notes](https://github.com/pypa/pip/releases) - [Changelog](https://github.com/pypa/pip/blob/master/NEWS.rst) - [Commits](https://github.com/pypa/pip/compare/21.0...21.0.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aeea109ef36..e7a86a9b878 100644 --- a/requirements.txt +++ b/requirements.txt @@ -153,7 +153,7 @@ splinter==0.14.0 pytest-splinter==3.3.1 pytest-django==4.1.0 setuptools==52.0.0 -pip==21.0 +pip==21.0.1 Twisted==20.3.0 factory-boy==3.2.0 flaky==3.7.0 From be313d51d1ec5f39135a6e972b85894824feb789 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:53:29 +0100 Subject: [PATCH 11/26] Bump coverage from 5.3.1 to 5.4 (#6903) Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.3.1 to 5.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.3.1...coverage-5.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e7a86a9b878..7cccd294778 100644 --- a/requirements.txt +++ b/requirements.txt @@ -143,7 +143,7 @@ docker==4.4.1 invoke==1.5.0 # tests -coverage==5.3.1 +coverage==5.4 parse-type==0.5.2 requests-toolbelt==0.9.1 flake8==3.8.4 From f073274f8cf3f483d3f4ad05e98ca068846095f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:54:26 +0100 Subject: [PATCH 12/26] Bump pytest from 6.2.1 to 6.2.2 (#6907) Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7cccd294778..df11d938624 100644 --- a/requirements.txt +++ b/requirements.txt @@ -147,7 +147,7 @@ coverage==5.4 parse-type==0.5.2 requests-toolbelt==0.9.1 flake8==3.8.4 -pytest==6.2.1 +pytest==6.2.2 pytest-bdd==4.0.2 splinter==0.14.0 pytest-splinter==3.3.1 From 9a3913e030be293b5f8befe058528b0a99256de4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:57:34 +0100 Subject: [PATCH 13/26] Bump djangorestframework-gis from 0.16 to 0.17 (#6902) Bumps [djangorestframework-gis](https://github.com/openwisp/django-rest-framework-gis) from 0.16 to 0.17. - [Release notes](https://github.com/openwisp/django-rest-framework-gis/releases) - [Changelog](https://github.com/openwisp/django-rest-framework-gis/blob/master/CHANGES.rst) - [Commits](https://github.com/openwisp/django-rest-framework-gis/compare/v0.16.0...v0.17.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index df11d938624..d8696e90d19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -74,7 +74,7 @@ django-recaptcha==2.0.6 # REST djangorestframework==3.11.2 -djangorestframework-gis==0.16 +djangorestframework-gis==0.17 djangorestframework-guardian==0.3.0 drf-extensions==0.6.0 drf-writable-nested==0.6.2 From ae6f6c19aebab0f30dc69c0e2debd37eecf53822 Mon Sep 17 00:00:00 2001 From: afabiani Date: Wed, 3 Feb 2021 10:00:13 +0100 Subject: [PATCH 14/26] - Algin setup.cfg to requirements.txt --- setup.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index cd85711e3d4..3a5fd7f83a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,13 +32,13 @@ install_requires = Django==2.2.16 # Other - amqp==5.0.3 + amqp==5.0.5 pyyaml>=4.2b1 beautifulsoup4==4.9.3 httplib2<0.18.2 hyperlink==21.0.0 idna>=2.5,<2.11 - urllib3==1.26.2 + urllib3==1.26.3 Paver==1.3.4 python-slugify==4.0.1 decorator==4.4.2 @@ -100,7 +100,7 @@ install_requires = # REST djangorestframework==3.11.2 - djangorestframework-gis==0.16 + djangorestframework-gis==0.17 djangorestframework-guardian==0.3.0 drf-extensions==0.6.0 drf-writable-nested==0.6.2 @@ -152,7 +152,7 @@ install_requires = # required by monitoring psutil==5.8.0 - django-cors-headers==3.6.0 + django-cors-headers==3.7.0 user-agents xmljson django-ipware<3.1 @@ -167,17 +167,17 @@ install_requires = invoke==1.5.0 # tests - coverage==5.3.1 + coverage==5.4 parse-type==0.5.2 requests-toolbelt==0.9.1 flake8==3.8.4 - pytest==6.2.1 + pytest==6.2.2 pytest-bdd==4.0.2 splinter==0.14.0 pytest-splinter==3.3.1 pytest-django==4.1.0 setuptools==52.0.0 - pip==21.0 + pip==21.0.1 Twisted==20.3.0 factory-boy==3.2.0 flaky==3.7.0 From 0dad216e9a7881df84d1097a69644470014d11d0 Mon Sep 17 00:00:00 2001 From: Alessio Fabiani Date: Wed, 3 Feb 2021 16:50:08 +0100 Subject: [PATCH 15/26] =?UTF-8?q?[Fixes=20#6922][REST=20API=20v2]=20Expose?= =?UTF-8?q?=20the=20curated=20thumbnail=20URL=20if=20it=20has=E2=80=A6=20(?= =?UTF-8?q?#6923)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Fixes #6922][REST API v2] Expose the curated thumbnail URL if it has been uploaded * - Add REST APIs test suite to CircleCI --- .circleci/config.yml | 7 ++++ geonode/base/api/serializers.py | 22 ++++++++++-- geonode/base/api/tests.py | 61 ++++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e6e3ad92a0..6802ecc357e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,6 +131,13 @@ workflows: test_suite: coverage run --branch --source=geonode manage.py test -v 3 --keepdb $(python -c "import sys;from geonode import settings;sys.stdout.write('\'' '\''.join([a+'\''.tests'\'' for a in settings.GEONODE_APPS]))") requires: - geonode_test_suite_smoke + - build: + name: geonode_test_rest_apis + load_docker_cache: true + save_docker_cache: false + test_suite: coverage run --branch --source=geonode manage.py test -v 3 --keepdb geonode.base.api.tests geonode.layers.api.tests geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests + requires: + - geonode_test_suite_smoke - build: name: geonode_test_integration_csw load_docker_cache: true diff --git a/geonode/base/api/serializers.py b/geonode/base/api/serializers.py index 1c74ccb570d..8762d54938a 100644 --- a/geonode/base/api/serializers.py +++ b/geonode/base/api/serializers.py @@ -17,6 +17,7 @@ # along with this program. If not, see . # ######################################################################### +from django.conf import settings from django.contrib.auth.models import Group from django.contrib.auth import get_user_model @@ -25,6 +26,7 @@ from dynamic_rest.serializers import DynamicEphemeralSerializer, DynamicModelSerializer from dynamic_rest.fields.fields import DynamicRelationField, DynamicComputedField +from urllib.parse import urljoin from avatar.templatetags.avatar_tags import avatar_url from geonode.base.models import ( @@ -147,6 +149,22 @@ def get_attribute(self, instance): return avatar_url(instance, self.avatar_size) +class ThumbnailUrlField(DynamicComputedField): + + def __init__(self, **kwargs): + super(ThumbnailUrlField, self).__init__(**kwargs) + + def get_attribute(self, instance): + thumbnail_url = instance.thumbnail_url + if hasattr(instance, 'curatedthumbnail'): + if hasattr(instance.curatedthumbnail.img_thumbnail, 'url'): + thumbnail_url = instance.curatedthumbnail.thumbnail_url + + if thumbnail_url and 'http' not in thumbnail_url: + thumbnail_url = urljoin(settings.SITEURL, thumbnail_url) + return thumbnail_url + + class UserSerializer(DynamicModelSerializer): class Meta: @@ -215,11 +233,11 @@ def __init__(self, *args, **kwargs): self.fields['featured'] = serializers.BooleanField() self.fields['is_published'] = serializers.BooleanField() self.fields['is_approved'] = serializers.BooleanField() - self.fields['thumbnail_url'] = serializers.CharField() self.fields['detail_url'] = serializers.CharField(read_only=True) self.fields['created'] = serializers.DateTimeField(read_only=True) self.fields['last_updated'] = serializers.DateTimeField(read_only=True) + self.fields['thumbnail_url'] = ThumbnailUrlField() self.fields['keywords'] = DynamicRelationField( HierarchicalKeywordSerializer, embed=False, many=True) self.fields['regions'] = DynamicRelationField( @@ -246,7 +264,7 @@ class Meta: 'spatial_representation_type', 'temporal_extent_start', 'temporal_extent_end', 'supplemental_information', 'data_quality_statement', 'group', 'popular_count', 'share_count', 'rating', 'featured', 'is_published', 'is_approved', - 'thumbnail_url', 'detail_url', 'created', 'last_updated' + 'detail_url', 'created', 'last_updated' # TODO # csw_typename, csw_schema, csw_mdsource, csw_insert_date, csw_type, csw_anytext, csw_wkt_geometry, # metadata_uploaded, metadata_uploaded_preserve, metadata_xml, diff --git a/geonode/base/api/tests.py b/geonode/base/api/tests.py index 4ead6cae7aa..e30b70edc10 100644 --- a/geonode/base/api/tests.py +++ b/geonode/base/api/tests.py @@ -18,25 +18,34 @@ # ######################################################################### import logging - +from PIL import Image +from io import BytesIO +from unittest.mock import patch from urllib.parse import urljoin +import django from django.urls import reverse +from django.core.files import File from django.conf.urls import url, include from django.views.generic import TemplateView +from django.views.i18n import JavaScriptCatalog from rest_framework.test import APITestCase, URLPatternsTestCase from guardian.shortcuts import get_anonymous_user from geonode.api.urls import router from geonode.base.models import ResourceBase +from geonode.base.models import CuratedThumbnail from geonode import geoserver from geonode.utils import check_ogc_backend +from geonode.services.views import services from geonode.base.populate_test_data import create_models logger = logging.getLogger(__name__) +test_image = Image.new('RGBA', size=(50, 50), color=(155, 0, 0)) + class BaseApiTests(APITestCase, URLPatternsTestCase): @@ -58,6 +67,29 @@ class BaseApiTests(APITestCase, URLPatternsTestCase): url(r'^api/v2/', include(router.urls)), url(r'^api/v2/', include('geonode.api.urls')), url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), + url(r'^$', + TemplateView.as_view(template_name='layers/layer_list.html'), + {'facet_type': 'layers', 'is_layer': True}, + name='layer_browse'), + url(r'^$', + TemplateView.as_view(template_name='maps/map_list.html'), + {'facet_type': 'maps', 'is_map': True}, + name='maps_browse'), + url(r'^$', + TemplateView.as_view(template_name='documents/document_list.html'), + {'facet_type': 'documents', 'is_document': True}, + name='document_browse'), + url(r'^$', + TemplateView.as_view(template_name='groups/group_list.html'), + name='group_list'), + url(r'^search/$', + TemplateView.as_view(template_name='search/search.html'), + name='search'), + url(r'^$', services, name='services'), + url(r'^invitations/', include( + 'geonode.invitations.urls', namespace='geonode.invitations')), + url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), + url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog') ] if check_ogc_backend(geoserver.BACKEND_PACKAGE): @@ -427,3 +459,30 @@ def test_resource_types(self): self.assertTrue('map' in response.data['resource_types']) self.assertTrue('document' in response.data['resource_types']) self.assertTrue('service' in response.data['resource_types']) + + @patch('PIL.Image.open', return_value=test_image) + def test_thumbnail_urls(self, img): + """ + Ensure the thumbnail url reflects the current active Thumb on the resource. + """ + # Admin + self.assertTrue(self.client.login(username='admin', password='admin')) + + resource = ResourceBase.objects.filter(owner__username='bobby').first() + url = reverse('base-resources-detail', kwargs={'pk': resource.pk}) + response = self.client.get(url, format='json') + self.assertEqual(response.status_code, 200) + self.assertEqual(int(response.data['resource']['pk']), int(resource.pk)) + thumbnail_url = response.data['resource']['thumbnail_url'] + self.assertIsNone(thumbnail_url) + + f = BytesIO(test_image.tobytes()) + f.name = 'test_image.jpeg' + curated_thumbnail = CuratedThumbnail.objects.create(resource=resource, img=File(f)) + + url = reverse('base-resources-detail', kwargs={'pk': resource.pk}) + response = self.client.get(url, format='json') + self.assertEqual(response.status_code, 200) + self.assertEqual(int(response.data['resource']['pk']), int(resource.pk)) + thumbnail_url = response.data['resource']['thumbnail_url'] + self.assertTrue(curated_thumbnail.thumbnail_url in thumbnail_url) From 30910b2c6abb5a93d295eb0855d917771d510377 Mon Sep 17 00:00:00 2001 From: Alessio Fabiani Date: Wed, 3 Feb 2021 16:50:37 +0100 Subject: [PATCH 16/26] [Fixes #6918] Removal of QGIS support (#6919) * [Cleanup and Refactor] Remove QGIS server backend dependencies * [Cleanup and Refactor] Remove QGIS server backend dependencies * - Fix LGTM issues --- .dockerignore | 2 - .gitignore | 2 - .travis.yml | 60 -- docker-compose-qgis-server.yml | 22 - geonode/api/api.py | 185 +--- geonode/api/authorization.py | 5 +- geonode/api/resourcebase_api.py | 89 +- .../base/management/commands/fixoauthuri.py | 2 +- .../commands/set_all_layers_metadata.py | 4 +- geonode/base/populate_test_data.py | 2 +- .../leaflet/layers/layer_leaflet_map.html | 106 -- geonode/layers/forms.py | 10 +- .../layers/templates/layers/layer_detail.html | 68 +- geonode/layers/tests.py | 16 +- geonode/layers/urls.py | 2 +- geonode/layers/utils.py | 30 +- geonode/layers/views.py | 21 +- geonode/local_settings.py.geoserver.sample | 2 - geonode/local_settings.py.qgis.sample | 138 --- geonode/maps/models.py | 4 +- geonode/maps/qgis_server_views.py | 612 ----------- geonode/maps/templates/maps/map_detail.html | 18 - geonode/maps/tests.py | 40 +- geonode/maps/tests_populate_maplayers.py | 2 +- geonode/maps/urls.py | 31 +- geonode/maps/views.py | 24 +- .../migrations/0030_auto_20210118_1112.py | 18 + geonode/proxy/views.py | 2 +- geonode/qgis_server/__init__.py | 24 - geonode/qgis_server/admin.py | 42 - geonode/qgis_server/apps.py | 35 - geonode/qgis_server/context_processors.py | 60 -- geonode/qgis_server/forms.py | 49 - geonode/qgis_server/gis_tools.py | 164 --- geonode/qgis_server/helpers.py | 980 ------------------ geonode/qgis_server/management/__init__.py | 19 - .../management/commands/__init__.py | 19 - .../delete_orphaned_qgis_server_layers.py | 34 - .../management/commands/import_qgis_styles.py | 52 - geonode/qgis_server/middleware.py | 56 - .../qgis_server/migrations/0001_initial.py | 40 - .../migrations/0002_qgisservermap.py | 40 - .../migrations/0003_auto_20170727_0509.py | 55 - .../migrations/0004_auto_20170805_0223.py | 44 - .../migrations/0005_auto_20170823_0341.py | 40 - .../migrations/0006_auto_20200321_1349.py | 18 - geonode/qgis_server/migrations/__init__.py | 19 - geonode/qgis_server/models.py | 389 ------- geonode/qgis_server/signals.py | 421 -------- geonode/qgis_server/tasks/__init__.py | 19 - geonode/qgis_server/tasks/update.py | 161 --- .../templates/qgis_server/base.html | 21 - .../qgis_server/forms/qml_style.html | 88 -- geonode/qgis_server/tests/__init__.py | 19 - geonode/qgis_server/tests/data/test.xml | 332 ------ geonode/qgis_server/tests/data/test_grid.qml | 16 - geonode/qgis_server/tests/test_helpers.py | 308 ------ geonode/qgis_server/tests/test_management.py | 181 ---- .../qgis_server/tests/test_qgis_settings.py | 73 -- geonode/qgis_server/tests/test_views.py | 750 -------------- .../qgis_server/tests/test_xml_utilities.py | 89 -- geonode/qgis_server/urls.py | 167 --- geonode/qgis_server/views.py | 885 ---------------- geonode/qgis_server/xml_utilities.py | 136 --- geonode/security/tests.py | 7 +- geonode/settings.py | 10 - geonode/static/geonode/js/upload/LayerInfo.js | 4 +- geonode/tests/base.py | 2 +- geonode/tests/csw.py | 28 +- geonode/tests/integration.py | 145 +-- geonode/upload/forms.py | 5 - geonode/upload/tests/test_settings.py | 2 - geonode/urls.py | 9 +- geonode/utils.py | 188 +--- package/support/geonode.local_settings | 2 - pavement.py | 118 +-- scripts/misc/qgis_server_setup.sh | 34 - 77 files changed, 103 insertions(+), 7813 deletions(-) delete mode 100644 docker-compose-qgis-server.yml delete mode 100644 geonode/local_settings.py.qgis.sample delete mode 100644 geonode/maps/qgis_server_views.py create mode 100644 geonode/people/migrations/0030_auto_20210118_1112.py delete mode 100644 geonode/qgis_server/__init__.py delete mode 100644 geonode/qgis_server/admin.py delete mode 100644 geonode/qgis_server/apps.py delete mode 100644 geonode/qgis_server/context_processors.py delete mode 100644 geonode/qgis_server/forms.py delete mode 100644 geonode/qgis_server/gis_tools.py delete mode 100644 geonode/qgis_server/helpers.py delete mode 100644 geonode/qgis_server/management/__init__.py delete mode 100644 geonode/qgis_server/management/commands/__init__.py delete mode 100644 geonode/qgis_server/management/commands/delete_orphaned_qgis_server_layers.py delete mode 100644 geonode/qgis_server/management/commands/import_qgis_styles.py delete mode 100644 geonode/qgis_server/middleware.py delete mode 100644 geonode/qgis_server/migrations/0001_initial.py delete mode 100644 geonode/qgis_server/migrations/0002_qgisservermap.py delete mode 100644 geonode/qgis_server/migrations/0003_auto_20170727_0509.py delete mode 100644 geonode/qgis_server/migrations/0004_auto_20170805_0223.py delete mode 100644 geonode/qgis_server/migrations/0005_auto_20170823_0341.py delete mode 100644 geonode/qgis_server/migrations/0006_auto_20200321_1349.py delete mode 100644 geonode/qgis_server/migrations/__init__.py delete mode 100644 geonode/qgis_server/models.py delete mode 100644 geonode/qgis_server/signals.py delete mode 100644 geonode/qgis_server/tasks/__init__.py delete mode 100644 geonode/qgis_server/tasks/update.py delete mode 100644 geonode/qgis_server/templates/qgis_server/base.html delete mode 100644 geonode/qgis_server/templates/qgis_server/forms/qml_style.html delete mode 100644 geonode/qgis_server/tests/__init__.py delete mode 100644 geonode/qgis_server/tests/data/test.xml delete mode 100644 geonode/qgis_server/tests/data/test_grid.qml delete mode 100644 geonode/qgis_server/tests/test_helpers.py delete mode 100644 geonode/qgis_server/tests/test_management.py delete mode 100644 geonode/qgis_server/tests/test_qgis_settings.py delete mode 100644 geonode/qgis_server/tests/test_views.py delete mode 100644 geonode/qgis_server/tests/test_xml_utilities.py delete mode 100644 geonode/qgis_server/urls.py delete mode 100644 geonode/qgis_server/views.py delete mode 100644 geonode/qgis_server/xml_utilities.py delete mode 100755 scripts/misc/qgis_server_setup.sh diff --git a/.dockerignore b/.dockerignore index ce2c0518645..7d2e8d9944b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,4 @@ geonode/uploaded -geonode/qgis_layer -geonode/qgis_tiles geonode/static_root geonode/static/.components geonode/static/node_modules diff --git a/.gitignore b/.gitignore index 33164c196b8..f05e035ea63 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,6 @@ geonode/local_settings.py # Uploaded files geonode/uploaded -geonode/qgis_layer -geonode/qgis_tiles #Testing output .coverage diff --git a/.travis.yml b/.travis.yml index a6eeac4a76a..030371da15a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,40 +71,6 @@ jobs: - MONITORING_ENABLED: 'False' - SESSION_EXPIRED_CONTROL_ENABLED: 'True' - - stage: unit-tests - name: "QGis Server-backend Core Modules Smoke Tests" - virtualenv: - system_site_packages: false - env: - - BACKEND: 'geonode.qgis_server' - - DJANGO_SETTINGS_MODULE: 'geonode.local_settings' - - DOCKER_COMPOSE_VERSION: 1.19.0 - - QGIS_SERVER_URL: http://localhost:9000/ - - SITEURL: http://localhost:8000/ - - QGIS_SERVER_PORT: 9000 - - ON_TRAVIS: 'True' - - TEST_RUN_CORE: 'True' - - MONITORING_ENABLED: 'False' - - SESSION_EXPIRED_CONTROL_ENABLED: 'True' - - CELERY_ALWAYS_EAGER: 'True' - - - stage: unit-tests - name: "QGis Server-backend Contrib Apps Smoke Tests" - virtualenv: - system_site_packages: false - env: - - BACKEND: 'geonode.qgis_server' - - DJANGO_SETTINGS_MODULE: 'geonode.local_settings' - - DOCKER_COMPOSE_VERSION: 1.19.0 - - QGIS_SERVER_URL: http://localhost:9000/ - - SITEURL: http://localhost:8000/ - - QGIS_SERVER_PORT: 9000 - - ON_TRAVIS: 'True' - - TEST_RUN_INTERNAL_APPS: 'True' - - MONITORING_ENABLED: 'False' - - SESSION_EXPIRED_CONTROL_ENABLED: 'True' - - CELERY_ALWAYS_EAGER: 'True' - - stage: integration-tests name: "Backend Integration Tests" virtualenv: @@ -150,27 +116,6 @@ jobs: - GEODATABASE_URL: 'postgis://geonode:geonode@localhost:5432/upload_test' - DEFAULT_BACKEND_DATASTORE: 'datastore' - - stage: integration-tests - name: "QGis Server Integration Tests" - virtualenv: - system_site_packages: false - env: - - BACKEND: 'geonode.qgis_server' - - DJANGO_SETTINGS_MODULE: 'geonode.local_settings' - - DOCKER_COMPOSE_VERSION: 1.19.0 - - QGIS_SERVER_URL: http://localhost:9000/ - - SITEURL: http://localhost:8000/ - - QGIS_SERVER_PORT: 9000 - - ON_TRAVIS: 'True' - - TEST_RUNNER_KEEPDB: 'True' - - TEST_RUN_INTEGRATION: 'True' - - TEST_RUN_INTEGRATION_SERVER: 'True' - - MONITORING_ENABLED: 'False' - - SESSION_EXPIRED_CONTROL_ENABLED: 'True' - - CELERY_ALWAYS_EAGER: 'True' - - DATABASE_URL: 'postgis://geonode:geonode@localhost:5432/upload_test' - - GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY: 'leaflet' - - stage: frontend-tests name: "BDD Tests" virtualenv: @@ -215,7 +160,6 @@ before_install: sudo apt-get update; mkdir -p $HOME/buildout-cache/{eggs,downloads}; scripts/misc/geoserver_server_setup.sh before_install; - scripts/misc/qgis_server_setup.sh before_install; sudo apt-get autoremove sqlite3; sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf; sudo sed -i 's/peer/trust/' /etc/postgresql/12/main/pg_hba.conf; @@ -268,8 +212,6 @@ before_script: scripts/misc/create_dbs_travis.sh before_script; echo "For GeoServer Server Travis steps"; scripts/misc/geoserver_server_setup.sh before_script; - echo "For QGIS Server Travis steps"; - scripts/misc/qgis_server_setup.sh before_script; echo "Start NGINX server"; sudo nginx -s stop; sudo nginx -c `pwd`/scripts/misc/nginx_integration.conf; @@ -296,8 +238,6 @@ after_script: else echo "For GeoServer Server Travis steps"; scripts/misc/geoserver_server_setup.sh after_script; - echo "For QGIS Server Travis steps"; - scripts/misc/qgis_server_setup.sh after_script; echo "Stop NGINX server"; sudo nginx -c `pwd`/scripts/misc/nginx_integration.conf -s stop; echo "Cleanup"; diff --git a/docker-compose-qgis-server.yml b/docker-compose-qgis-server.yml deleted file mode 100644 index 9614ae7bb90..00000000000 --- a/docker-compose-qgis-server.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '2' -services: - - qgis-server: - image: kartoza/geonode_qgis-server - volumes: - # Mount this volume from current directory to - # The absolute path, so these files were mounted - # with the same path - - './:${GEONODE_PROJECT_PATH}' - environment: - - QGIS_LOG_FILE=/tmp/qgis-server/qgis.log - - QGIS_SERVER_LOG_FILE=/tmp/qgis-server/qgis-server.log - - QGIS_DEBUG=5 - - QGIS_SERVER_LOG_LEVEL=5 - - QGIS_PLUGINPATH=/opt/qgis-server/plugins/ - # It is important to include this environment variable - # QGIS-Server:LTR cgi needs it - - QGIS_PROJECT_FILE= - ports: - - "${QGIS_SERVER_PORT}:80" - network_mode: "bridge" diff --git a/geonode/api/api.py b/geonode/api/api.py index 75f8320462f..e5f1e3b7b3d 100644 --- a/geonode/api/api.py +++ b/geonode/api/api.py @@ -30,19 +30,14 @@ from django.contrib.contenttypes.models import ContentType from django.conf import settings from django.db.models import Count -from django.http.response import HttpResponse -from django.template.response import TemplateResponse from django.utils.translation import get_language from avatar.templatetags.avatar_tags import avatar_url -from tastypie import http -from tastypie.exceptions import BadRequest -from geonode import qgis_server, geoserver +from geonode import geoserver from geonode.api.paginator import CrossSiteXHRPaginator from geonode.api.authorization import GeoNodeStyleAuthorization, ApiLockdownAuthorization, \ GroupAuthorization, GroupProfileAuthorization -from geonode.qgis_server.models import QGISServerStyle from guardian.shortcuts import get_objects_for_user from tastypie.bundle import Bundle @@ -600,178 +595,6 @@ class Meta: authorization = ApiLockdownAuthorization() -class QGISStyleResource(ModelResource): - """Styles API for QGIS Server backend.""" - - body = fields.CharField(attribute='body', use_in='detail') - name = fields.CharField(attribute='name') - title = fields.CharField(attribute='title') - layer = fields.ForeignKey( - 'geonode.api.resourcebase_api.LayerResource', - attribute='layer', - null=True) - style_url = fields.CharField(attribute='style_url') - type = fields.CharField(attribute='type') - - class Meta: - paginator_class = CrossSiteXHRPaginator - queryset = QGISServerStyle.objects.all() - resource_name = 'styles' - detail_uri_name = 'id' - allowed_methods = ['get', 'post', 'delete'] - authorization = GeoNodeStyleAuthorization() - filtering = { - 'id': ALL, - 'title': ALL, - 'name': ALL, - 'layer': ALL_WITH_RELATIONS - } - - def populate_object(self, style): - """Populate results with necessary fields - - :param style: Style objects - :type style: QGISServerStyle - :return: - """ - try: - qgis_layer = style.layer_styles.first() - """:type: geonode.qgis_server.QGISServerLayer""" - style.layer = qgis_layer.layer - style.type = 'qml' - except Exception: - pass - return style - - def build_filters(self, filters=None, **kwargs): - """Apply custom filters for layer.""" - filters = super(QGISStyleResource, self).build_filters( - filters, **kwargs) - # Convert layer__ filters into layer_styles__layer__ - updated_filters = {} - for key, value in filters.items(): - key = key.replace('layer__', 'layer_styles__layer__') - updated_filters[key] = value - return updated_filters - - def build_bundle(self, obj=None, data=None, request=None, **kwargs): - """Override build_bundle method to add additional info.""" - - if obj is None and self._meta.object_class: - obj = self._meta.object_class() - - elif obj: - obj = self.populate_object(obj) - - return Bundle( - obj=obj, - data=data, - request=request, - **kwargs) - - def post_list(self, request, **kwargs): - """Attempt to redirect to QGIS Server Style management. - - A post method should have the following field: - - name: Slug name of style - title: Title of style - style: the style file uploaded - - Also, should have kwargs: - - layername or layer__name: The layer name associated with the style - - or - - layer__id: The layer id associated with the style - - """ - from geonode.qgis_server.views import qml_style - - # Extract layer name information - POST = request.POST - FILES = request.FILES - layername = POST.get('layername') or POST.get('layer__name') - if not layername: - layer_id = POST.get('layer__id') - layer = Layer.objects.get(id=layer_id) - layername = layer.name - - # move style file - FILES['qml'] = FILES['style'] - - response = qml_style(request, layername) - - if isinstance(response, TemplateResponse): - if response.status_code == 201: - obj = QGISServerStyle.objects.get( - layer_styles__layer__name=layername, - name=POST['name']) - updated_bundle = self.build_bundle(obj=obj, request=request) - location = self.get_resource_uri(updated_bundle) - - if not self._meta.always_return_data: - return http.HttpCreated(location=location) - else: - updated_bundle = self.full_dehydrate(updated_bundle) - updated_bundle = self.alter_detail_data_to_serialize( - request, updated_bundle) - return self.create_response( - request, updated_bundle, - response_class=http.HttpCreated, - location=location) - else: - context = response.context_data - # Check form valid - style_upload_form = context['style_upload_form'] - if not style_upload_form.is_valid(): - raise BadRequest(style_upload_form.errors.as_text()) - alert_message = context['alert_message'] - raise BadRequest(alert_message) - elif isinstance(response, HttpResponse): - response_class = None - if response.status_code == 403: - response_class = http.HttpForbidden - return self.error_response( - request, response.content, - response_class=response_class) - - def delete_detail(self, request, **kwargs): - """Attempt to redirect to QGIS Server Style management.""" - from geonode.qgis_server.views import qml_style - style_id = kwargs.get('id') - - qgis_style = QGISServerStyle.objects.get(id=style_id) - layername = qgis_style.layer_styles.first().layer.name - - response = qml_style(request, layername, style_name=qgis_style.name) - - if isinstance(response, TemplateResponse): - if response.status_code == 200: - # style deleted - return http.HttpNoContent() - else: - context = response.context_data - # Check form valid - style_upload_form = context['style_upload_form'] - if not style_upload_form.is_valid(): - raise BadRequest(style_upload_form.errors.as_text()) - alert_message = context['alert_message'] - raise BadRequest(alert_message) - elif isinstance(response, HttpResponse): - response_class = None - if response.status_code == 403: - response_class = http.HttpForbidden - return self.error_response( - request, response.content, - response_class=response_class) - - def delete_list(self, request, **kwargs): - """Do not allow delete list""" - return http.HttpForbidden() - - class GeoserverStyleResource(ModelResource): """Styles API for Geoserver backend.""" body = fields.CharField( @@ -844,11 +667,7 @@ def build_bundle(self, obj=None, data=None, request=None, **kwargs): **kwargs) -if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - class StyleResource(QGISStyleResource): - """Wrapper for Generic Style Resource""" - pass -elif check_ogc_backend(geoserver.BACKEND_PACKAGE): +if check_ogc_backend(geoserver.BACKEND_PACKAGE): class StyleResource(GeoserverStyleResource): """Wrapper for Generic Style Resource""" pass diff --git a/geonode/api/authorization.py b/geonode/api/authorization.py index 9addb98f43f..237e65dd4e8 100644 --- a/geonode/api/authorization.py +++ b/geonode/api/authorization.py @@ -28,7 +28,7 @@ from django.conf import settings -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.utils import check_ogc_backend @@ -133,9 +133,6 @@ def filter_by_resource_ids(self, object_list, permitted_ids): """Filter Style queryset by permitted resource ids.""" if check_ogc_backend(geoserver.BACKEND_PACKAGE): return object_list.filter(layer_styles__id__in=permitted_ids) - elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - return object_list.filter( - layer_styles__layer__id__in=permitted_ids) def read_list(self, object_list, bundle): permitted_ids = get_objects_for_user( diff --git a/geonode/api/resourcebase_api.py b/geonode/api/resourcebase_api.py index 53d175d92d8..f3c902c2a98 100644 --- a/geonode/api/resourcebase_api.py +++ b/geonode/api/resourcebase_api.py @@ -18,17 +18,13 @@ # ######################################################################### import re -import json import logging -from django.urls import resolve from django.db.models import Q from django.http import HttpResponse from django.conf import settings from django.contrib.staticfiles.templatetags import staticfiles from tastypie.authentication import MultiAuthentication, SessionAuthentication -from django.template.response import TemplateResponse -from tastypie import http from tastypie.bundle import Bundle from tastypie.constants import ALL, ALL_WITH_RELATIONS @@ -46,7 +42,7 @@ from tastypie.utils.mime import build_content_type -from geonode import get_version, qgis_server, geoserver +from geonode import get_version, geoserver from geonode.layers.models import Layer from geonode.maps.models import Map from geonode.geoapps.models import GeoApp @@ -714,17 +710,7 @@ class LayerResource(CommonModelApi): null=True, use_in='all', default=[]) - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - default_style = fields.ForeignKey( - 'geonode.api.api.StyleResource', - attribute='qgis_default_style', - null=True) - styles = fields.ManyToManyField( - 'geonode.api.api.StyleResource', - attribute='qgis_styles', - null=True, - use_in='detail') - elif check_ogc_backend(geoserver.BACKEND_PACKAGE): + if check_ogc_backend(geoserver.BACKEND_PACKAGE): default_style = fields.ForeignKey( 'geonode.api.api.StyleResource', attribute='default_style', @@ -830,35 +816,12 @@ def dehydrate_ogc_links(self, bundle): def dehydrate_gtype(self, bundle): return bundle.obj.gtype - def populate_object(self, obj): - """Populate results with necessary fields - - :param obj: Layer obj - :type obj: Layer - :return: - """ - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - # Provides custom links for QGIS Server styles info - # Default style - try: - obj.qgis_default_style = obj.qgis_layer.default_style - except Exception: - obj.qgis_default_style = None - - # Styles - try: - obj.qgis_styles = obj.qgis_layer.styles - except Exception: - obj.qgis_styles = [] - return obj - def build_bundle( self, obj=None, data=None, request=None, **kwargs): """Override build_bundle method to add additional info.""" if obj is None and self._meta.object_class: obj = self._meta.object_class() - elif obj: obj = self.populate_object(obj) @@ -867,50 +830,14 @@ def build_bundle( data=data, request=request, **kwargs) - def patch_detail(self, request, **kwargs): - """Allow patch request to update default_style. - - Request body must match this: - - { - 'default_style': - } + def populate_object(self, obj): + """Populate results with necessary fields + :param obj: Layer obj + :type obj: Layer + :return: """ - reason = 'Can only patch "default_style" field.' - try: - body = json.loads(request.body) - if 'default_style' not in body: - return http.HttpBadRequest(reason=reason) - match = resolve(body['default_style']) - style_id = match.kwargs['id'] - api_name = match.kwargs['api_name'] - resource_name = match.kwargs['resource_name'] - if not (resource_name == 'styles' and api_name == 'api'): - raise Exception() - - from geonode.qgis_server.models import QGISServerStyle - - style = QGISServerStyle.objects.get(id=style_id) - - layer_id = kwargs['id'] - layer = Layer.objects.get(id=layer_id) - except Exception: - return http.HttpBadRequest(reason=reason) - - from geonode.qgis_server.views import default_qml_style - - request.method = 'POST' - response = default_qml_style( - request, - layername=layer.name, - style_name=style.name) - - if isinstance(response, TemplateResponse): - if response.status_code == 200: - return HttpResponse(status=200) - - return self.error_response(request, response.content) + return obj # copy parent attribute before modifying VALUES = CommonModelApi.VALUES[:] diff --git a/geonode/base/management/commands/fixoauthuri.py b/geonode/base/management/commands/fixoauthuri.py index ff5bbb3ed99..ca3c16f4afd 100644 --- a/geonode/base/management/commands/fixoauthuri.py +++ b/geonode/base/management/commands/fixoauthuri.py @@ -23,7 +23,7 @@ from oauth2_provider.models import Application from oauth2_provider.generators import generate_client_id, generate_client_secret -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.utils import check_ogc_backend diff --git a/geonode/base/management/commands/set_all_layers_metadata.py b/geonode/base/management/commands/set_all_layers_metadata.py index 2a0299bb1f5..a2247aca807 100644 --- a/geonode/base/management/commands/set_all_layers_metadata.py +++ b/geonode/base/management/commands/set_all_layers_metadata.py @@ -21,7 +21,7 @@ from django.core.management.base import BaseCommand from geonode.layers.models import Layer -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.catalogue.models import catalogue_post_save from geonode.geoserver.helpers import ogc_server_settings import logging @@ -41,8 +41,6 @@ if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.helpers import set_attributes_from_geoserver as set_attributes -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.qgis_server.gis_tools import set_attributes class Command(BaseCommand): diff --git a/geonode/base/populate_test_data.py b/geonode/base/populate_test_data.py index f0ef01e3675..d38483347e7 100644 --- a/geonode/base/populate_test_data.py +++ b/geonode/base/populate_test_data.py @@ -36,7 +36,7 @@ from django.contrib.auth import get_user_model from django.core.files.uploadedfile import SimpleUploadedFile -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.maps.models import Map from geonode.layers.models import Layer from geonode.compat import ensure_string diff --git a/geonode/client/templates/leaflet/layers/layer_leaflet_map.html b/geonode/client/templates/leaflet/layers/layer_leaflet_map.html index 36d68f2e289..ce9fa957403 100644 --- a/geonode/client/templates/leaflet/layers/layer_leaflet_map.html +++ b/geonode/client/templates/leaflet/layers/layer_leaflet_map.html @@ -230,41 +230,6 @@ //adjust info L.control.navbar().addTo(map); } - - {% if OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} - {# expose map object to window #} - window.preview_map = map; - window.tile_layer = tile_layer; - - {# Trigger dialog for Style edit #} - $(".style-edit").on('click', function (event) { - $("#qgis-server-style-edit").modal('show'); - }); - - {# Attach form submit event #} - $("#qgis-server-style-add-form").on('submit', edit_style_on_submit); - - {# Attach handler for style change #} - $("input[name='style']").on('change', function(event){ - var $input = $(this); - if($input.prop('checked') == true){ - {# Tile url change #} - var url; - {% if resource.get_tiles_url %} - url = '{% url "qgis_server:tile" layername=resource.name style='style_name' %}'; - url = url.replace('style_name', $input.attr('id')); - url = decodeURIComponent(url); - tile_layer.setUrl(url); - {% endif %} - - {# Legend icon change #} - url = '{% url "qgis_server:legend" layername=resource.name style='style_name' %}'; - url = url.replace('style_name', $input.attr('id')); - url = decodeURIComponent(url); - $("#legend_icon").attr('src', url); - } - }); - {% endif %} }); function zoom_to_box(map, bbox) { @@ -274,75 +239,4 @@ ]; map.fitBounds(bounds); } - - - {% if OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} - - function createMapThumbnail() { - {# Use map extent #} - var map = window.preview_map; - var bbox = map.getBounds().toBBoxString(); - var data = { - 'bbox': bbox - }; - $.post('{% url "qgis_server:set-thumbnail" layername=resource.name %}', data); - } - - {# Event handler for style editing #} - function edit_style_on_submit(event){ - {# prevent form submit by default #} - var data = new FormData(); - $.each($("#id_qml")[0].files, function(i, file){ - data.append('qml', file); - }); - data.append('name', $("#id_name").val()); - data.append('title', $("#id_title").val()); - var action = $(this).attr('action'); - $.ajax({ - url: action, - data: data, - cache: false, - contentType: false, - processData: false, - type: 'POST', - success: function(data){ - if(data){ - $("#qgis-server-style-edit .modal-body").html(data); - $(document).ready(function() { - $("#qgis-server-style-add-form").on('submit', edit_style_on_submit); - }); - } - }, - error: function(jqXhr, textStatus, errorThrown){ - $("#qgis-server-style-edit .modal-body").html(jqXhr.responseText); - $(document).ready(function() { - $("#qgis-server-style-add-form").on('submit', edit_style_on_submit); - }); - } - }); - return false; - } - {% endif %} - -{% if OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} - - -{% endif %} diff --git a/geonode/layers/forms.py b/geonode/layers/forms.py index 8fd292d78fe..bba15a27675 100644 --- a/geonode/layers/forms.py +++ b/geonode/layers/forms.py @@ -25,7 +25,7 @@ from django import forms -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.utils import check_ogc_backend import json @@ -85,8 +85,6 @@ class LayerUploadForm(forms.Form): xml_file = forms.FileField(required=False) if check_ogc_backend(geoserver.BACKEND_PACKAGE): sld_file = forms.FileField(required=False) - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - qml_file = forms.FileField(required=False) charset = forms.CharField(required=False) metadata_uploaded_preserve = forms.BooleanField(required=False) @@ -102,8 +100,6 @@ class LayerUploadForm(forms.Form): # Adding style file based on the backend if check_ogc_backend(geoserver.BACKEND_PACKAGE): spatial_files.append('sld_file') - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - spatial_files.append('qml_file') spatial_files = tuple(spatial_files) @@ -218,8 +214,6 @@ def write_files(self): class NewLayerUploadForm(LayerUploadForm): if check_ogc_backend(geoserver.BACKEND_PACKAGE): sld_file = forms.FileField(required=False) - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - qml_file = forms.FileField(required=False) xml_file = forms.FileField(required=False) abstract = forms.CharField(required=False) @@ -238,8 +232,6 @@ class NewLayerUploadForm(LayerUploadForm): # Adding style file based on the backend if check_ogc_backend(geoserver.BACKEND_PACKAGE): spatial_files.append('sld_file') - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - spatial_files.append('qml_file') spatial_files = tuple(spatial_files) diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html index f29caec6b26..ee15c48a46a 100644 --- a/geonode/layers/templates/layers/layer_detail.html +++ b/geonode/layers/templates/layers/layer_detail.html @@ -440,10 +440,6 @@

{% trans "Pick your download format:" %}

{% get_obj_perms request.user for resource.layer as "layer_perms" %} {% endif %} - {% if OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} - {% get_obj_perms request.user for resource.layer as "layer_perms" %} - {% endif %} -
  • @@ -496,14 +492,6 @@

    {% trans "Styles" %}

    • {% endif %} {% endif %} - {% elif OGC_SERVER.default.BACKEND == 'geonode.qgis_server' and not resource.service %} - {% if "change_layer_style" in layer_perms and preview == 'leaflet' %} -
    - -

    {% trans "Styles" %}

    -     {% trans "Edit" %} -
    - {% endif %} {% endif %} {% if "change_resourcebase" in perms_list %}
    @@ -559,24 +547,24 @@

    {% trans "Layer" %}

    -
    - - -
    -
    - -
      - {% for link in metadata %} -
    • {{ link.name }}
      • - {% endfor %} -
        +
        + + +
        +
        + +
        {% if resource.storeType == 'dataStore' %} @@ -625,7 +613,7 @@

        {%trans "Legend" %}

        {% endif %}

      • {% trans "Maps using this layer" %}

        - {% if map_layers %} + {% if map_layers %}

        {% trans "List of maps using this layer:" %}

        {% endif %}
          @@ -650,7 +638,7 @@

          {% trans "Add the layer to an existing map" %}

          {% csrf_token %}

          {% trans "Click the button below to add the layer to the selected map." %}

          @@ -682,7 +670,7 @@

          {% trans "Styles" %}

          {% for style in resource_styles_all %}
        • {% if resource.default_style == style %} - + {% trans "(default style)" %} {% else %} @@ -692,20 +680,6 @@

          {% trans "Styles" %}

          {% empty %}
        • {% trans "No styles associated with this layer" %}
          • {% endfor %} - {% elif OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} - {% for style in resource.qgis_layer.styles.all %} -
        • - {% if resource.qgis_layer.default_style == style %} - - {% trans "(default style)" %} - {% else %} - - {% endif %} - {{ style.title }} -
          • - {% empty %} -
        • {% trans "No styles associated with this layer" %}
          • - {% endfor %} {% endif %}
        • diff --git a/geonode/layers/tests.py b/geonode/layers/tests.py index 32f4ad3da5e..88edb200197 100644 --- a/geonode/layers/tests.py +++ b/geonode/layers/tests.py @@ -46,7 +46,7 @@ from guardian.shortcuts import get_anonymous_user from guardian.shortcuts import assign_perm, remove_perm -from geonode import GeoNodeException, geoserver, qgis_server +from geonode import GeoNodeException, geoserver from geonode.decorators import on_ogc_backend from geonode.layers.models import Layer, Style, Attribute from geonode.layers.utils import ( @@ -630,20 +630,6 @@ def generate_files(*extensions): if d is not None: shutil.rmtree(d) - # Check that including a QML with a valid shapefile - # results in the QML - # getting picked up - d = None - try: - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - d, expected_files = generate_files("shp", "shx", "prj", "dbf", "qml", "json") - gotten_files = get_files(os.path.join(d, "foo.shp")) - gotten_files = {k: os.path.basename(v) for k, v in gotten_files.items()} - self.assertEqual(gotten_files, expected_files) - finally: - if d is not None: - shutil.rmtree(d) - # Check that capitalized extensions are ok d = None try: diff --git a/geonode/layers/urls.py b/geonode/layers/urls.py index 88d0399bf17..71e5c34a76f 100644 --- a/geonode/layers/urls.py +++ b/geonode/layers/urls.py @@ -18,7 +18,7 @@ # # ############################################################################## -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.utils import check_ogc_backend from django.conf.urls import url, include from django.views.generic import TemplateView diff --git a/geonode/layers/utils.py b/geonode/layers/utils.py index 73eb4f8ab78..251aabb9346 100644 --- a/geonode/layers/utils.py +++ b/geonode/layers/utils.py @@ -55,7 +55,7 @@ from geonode.maps.models import Map from geonode.base.auth import get_or_create_token from geonode.base.bbox_utils import BBOXHelper -from geonode import GeoNodeException, geoserver, qgis_server +from geonode import GeoNodeException, geoserver from geonode.people.utils import get_valid_user from geonode.layers.models import UploadSession, LayerFile from geonode.base.thumb_utils import thumb_exists @@ -98,8 +98,6 @@ # Use the http_client with one that knows the username # and password for GeoServer's management user. from geonode.geoserver.helpers import _prepare_thumbnail_body_from_opts -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.qgis_server.helpers import ogc_server_settings logger = logging.getLogger('geonode.layers.utils') @@ -240,32 +238,6 @@ def get_files(filename): 'distinct by spelling and not just case.') % filename raise GeoNodeException(msg) - # Only for QGIS Server - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - matches = glob.glob(glob_name + ".[qQ][mM][lL]") - logger.debug('Checking QML file') - logger.debug('Number of matches QML file : %s' % len(matches)) - logger.debug('glob name: %s' % glob_name) - if len(matches) == 1: - files['qml'] = matches[0] - elif len(matches) > 1: - msg = ('Multiple style files (qml) for %s exist; they need to be ' - 'distinct by spelling and not just case.') % filename - raise GeoNodeException(msg) - - # Provides json files for additional extra data - matches = glob.glob(glob_name + ".[jJ][sS][oO][nN]") - logger.debug('Checking JSON File') - logger.debug( - 'Number of matches JSON file : %s' % len(matches)) - logger.debug('glob name: %s' % glob) - - if len(matches) == 1: - files['json'] = matches[0] - elif len(matches) > 1: - msg = ('Multiple json files (json) for %s exist; they need to be ' - 'distinct by spelling and not just case.') % filename - raise GeoNodeException(msg) return files diff --git a/geonode/layers/views.py b/geonode/layers/views.py index 2e73d742a2d..17b7d5ada5f 100644 --- a/geonode/layers/views.py +++ b/geonode/layers/views.py @@ -93,7 +93,7 @@ from geonode.security.views import _perms_info_json from geonode.people.forms import ProfileForm, PocForm from geonode.documents.models import get_related_documents -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.security.utils import get_visible_resources from geonode.utils import ( @@ -114,11 +114,10 @@ from celery.utils.log import get_logger if check_ogc_backend(geoserver.BACKEND_PACKAGE): - from geonode.geoserver.helpers import (_render_thumbnail, - _prepare_thumbnail_body_from_opts, - gs_catalog) -if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.qgis_server.models import QGISServerLayer + from geonode.geoserver.helpers import ( + _render_thumbnail, + _prepare_thumbnail_body_from_opts, + gs_catalog) CONTEXT_LOG_FILE = ogc_server_settings.LOG_FILE @@ -613,7 +612,7 @@ def sld_definition(style): group = GroupProfile.objects.get(slug=layer.group.name) except GroupProfile.DoesNotExist: group = None - # a flag to be used for qgis server + show_popup = False if 'show_popup' in request.GET and request.GET["show_popup"]: show_popup = True @@ -1310,14 +1309,6 @@ def layer_replace(request, layername, template='layers/layer_replace.html'): else: if check_ogc_backend(geoserver.BACKEND_PACKAGE): out['ogc_backend'] = geoserver.BACKEND_PACKAGE - elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - try: - qgis_layer = QGISServerLayer.objects.get( - layer=layer) - qgis_layer.delete() - except QGISServerLayer.DoesNotExist: - pass - out['ogc_backend'] = qgis_server.BACKEND_PACKAGE saved_layer = file_upload( base_file, diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample index aea28b72c23..5182d0b91fd 100644 --- a/geonode/local_settings.py.geoserver.sample +++ b/geonode/local_settings.py.geoserver.sample @@ -598,8 +598,6 @@ LOGGING = { "handlers": ["console"], "level": "ERROR", }, "geonode": { "handlers": ["console"], "level": "INFO", }, - "geonode.qgis_server": { - "handlers": ["console"], "level": "ERROR", }, "geoserver-restconfig.catalog": { "handlers": ["console"], "level": "ERROR", }, "owslib": { diff --git a/geonode/local_settings.py.qgis.sample b/geonode/local_settings.py.qgis.sample deleted file mode 100644 index d95642c036e..00000000000 --- a/geonode/local_settings.py.qgis.sample +++ /dev/null @@ -1,138 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -""" There are 3 ways to override GeoNode settings: - 1. Using environment variables, if your changes to GeoNode are minimal. - 2. Creating a downstream project, if you are doing a lot of customization. - 3. Override settings in a local_settings.py file, legacy. -""" - -# flake8: noqa -# Disable flake8 check, since this is just a custom settings file - -import os - -try: - # import geonode settings - from geonode.settings import * -except ImportError: - pass - -qgis_server_apps_package = "geonode.qgis_server" - -GEONODE_APPS = list(GEONODE_APPS) -if qgis_server_apps_package not in GEONODE_APPS: - GEONODE_APPS += ("geonode.qgis_server", ) - -INSTALLED_APPS = list(INSTALLED_APPS) -if qgis_server_apps_package not in INSTALLED_APPS: - INSTALLED_APPS += ("geonode.qgis_server", ) - -# QGIS Server Backend settings - -# Delete Geoserver settings -USE_GEOSERVER = False -if 'geonode.geoserver' in INSTALLED_APPS: - INSTALLED_APPS.remove("geonode.geoserver") - -if 'geonode.geoserver' in GEONODE_APPS: - GEONODE_APPS.remove("geonode.geoserver") - -if 'PUBLIC_GEOSERVER' in locals() and \ - PUBLIC_GEOSERVER in MAP_BASELAYERS: - MAP_BASELAYERS.remove(PUBLIC_GEOSERVER) - del PUBLIC_GEOSERVER - -if 'LOCAL_GEOSERVER' in locals() and \ - LOCAL_GEOSERVER in MAP_BASELAYERS: - MAP_BASELAYERS.remove(LOCAL_GEOSERVER) - del LOCAL_GEOSERVER - -# Change context processors -geoserver_context_processor = 'geonode.geoserver.context_processors.geoserver_urls' -if geoserver_context_processor in TEMPLATES[0]['OPTIONS']['context_processors']: - TEMPLATES[0]['OPTIONS']['context_processors'].remove(geoserver_context_processor) -qgis_server_context_processor = 'geonode.qgis_server.context_processors.qgis_server_urls' -TEMPLATES[0]['OPTIONS']['context_processors'].append(qgis_server_context_processor) - -# Leaflet config -GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'leaflet' -GEONODE_CLIENT_HOOKSET = "geonode.client.hooksets.LeafletHookSet" -LEAFLET_CONFIG = { - 'TILES': [ - # Map Quest - ('Map Quest', - 'http://otile4.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', - 'Tiles Courtesy of MapQuest ' - '— Map data © ' - 'OpenStreetMap'), - ], - 'PLUGINS': { - 'esri-leaflet': { - 'js': 'lib/js/esri-leaflet.js', - 'auto-include': True, - }, - 'leaflet-fullscreen': { - 'css': 'lib/css/leaflet.fullscreen.css', - 'js': 'lib/js/Leaflet.fullscreen.min.js', - 'auto-include': True, - }, - }, - 'SRID': 3857, - 'RESET_VIEW': False -} - -# Legacy from Geoserver -OGC_URL_INSIDE = os.environ.get('OGC_URL_INSIDE', SITEURL) -# Not using GeoFence if using QGIS Server Backend -GEOFENCE_SECURITY_ENABLED = False - -OGC_SERVER = { - 'default': { - 'BACKEND': 'geonode.qgis_server', - 'LOCATION': OGC_URL_INSIDE + 'qgis-server/', - 'PUBLIC_LOCATION': SITEURL + 'qgis-server/', - 'GEOFENCE_SECURITY_ENABLED': GEOFENCE_SECURITY_ENABLED - } -} - -# OGC (WMS/WFS/WCS) Server Settings -tiles_directory = os.path.join(PROJECT_ROOT, "qgis_tiles") -QGIS_SERVER_URL = os.environ.get( - 'QGIS_SERVER_URL', 'http://qgis-server/') -QGIS_SERVER_CONFIG = { - 'tiles_directory': tiles_directory, - 'tile_path': tiles_directory + '/%s/%s/%d/%d/%d.png', - 'legend_path': tiles_directory + '/%s/%s/legend.png', - 'thumbnail_path': tiles_directory + '/%s/thumbnail.png', - 'map_tile_path': os.path.join( - tiles_directory, '%s', 'map_tiles', '%s', '%s', '%s', '%s.png'), - 'qgis_server_url': QGIS_SERVER_URL, - 'layer_directory': os.path.join(PROJECT_ROOT, "qgis_layer") -} - -import ast -on_travis = ast.literal_eval(os.environ.get('ON_TRAVIS', 'False')) -integration_tests = ast.literal_eval(os.environ.get('TEST_RUN_INTEGRATION', 'False')) - -SKIP_GEOSERVER_TEST = on_travis - -CELERY_TASK_ALWAYS_EAGER = ast.literal_eval( - os.environ.get('CELERY_TASK_ALWAYS_EAGER', 'True')) diff --git a/geonode/maps/models.py b/geonode/maps/models.py index 55979bfd338..beba6df1b14 100644 --- a/geonode/maps/models.py +++ b/geonode/maps/models.py @@ -43,7 +43,7 @@ layer_from_viewer_config, default_map_config) -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.utils import check_ogc_backend from deprecated import deprecated @@ -146,7 +146,7 @@ def json(self, layer_filter): def layer_json(lyr): return { "name": lyr.alternate, - "service": lyr.service_type if hasattr(lyr, 'service_type') else "QGIS Server", + "service": lyr.service_type if hasattr(lyr, 'service_type') else "", "serviceURL": "", "metadataURL": "" } diff --git a/geonode/maps/qgis_server_views.py b/geonode/maps/qgis_server_views.py deleted file mode 100644 index 40ce83eb076..00000000000 --- a/geonode/maps/qgis_server_views.py +++ /dev/null @@ -1,612 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### -import json -import requests -import math -import logging - -from django.conf import settings -from django.views.generic import CreateView, DetailView, UpdateView -from django.core.exceptions import ObjectDoesNotExist -from django.core.serializers.json import DjangoJSONEncoder -from django.views.decorators.clickjacking import xframe_options_exempt -from django.utils.decorators import method_decorator -from django.urls import reverse -from django.shortcuts import render -from django.http import HttpResponse - -from geonode.maps.views import _PERMISSION_MSG_VIEW, _resolve_map, _resolve_layer -from geonode.maps.models import Map, MapLayer -from geonode.layers.models import Layer - -from geonode.utils import default_map_config, forward_mercator, \ - llbbox_to_mercator, check_ogc_backend -from geonode import geoserver, qgis_server - -from urllib.parse import urlsplit - -if check_ogc_backend(geoserver.BACKEND_PACKAGE): - # FIXME: The post service providing the map_status object - # should be moved to geonode.geoserver. - from geonode.geoserver.helpers import ogc_server_settings - -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.qgis_server.helpers import ogc_server_settings - from geonode.qgis_server.tasks.update import create_qgis_server_thumbnail - -logger = logging.getLogger("geonode.maps.qgis_server_views") - - -class MapCreateView(CreateView): - model = Map - fields = '__all__' - template_name = 'leaflet/maps/map_view.html' - context_object_name = 'map' - - def get_context_data(self, **kwargs): - request = self.request - if request and 'access_token' in request.session: - access_token = request.session['access_token'] - else: - access_token = None - - DEFAULT_MAP_CONFIG, DEFAULT_BASE_LAYERS = default_map_config(request) - - layers = Layer.objects.all() - - if request.method == 'GET' and 'copy' in request.GET: - """Prepare context data.""" - request = self.request - mapid = self.request.GET['copy'] - - map_obj = _resolve_map( - request, mapid, 'base.view_resourcebase', _PERMISSION_MSG_VIEW) - - config = map_obj.viewer_json(request) - - # list all required layers - map_layers = MapLayer.objects.filter( - map_id=mapid).order_by('stack_order') - context = { - 'config': json.dumps(config), - 'create': False, - 'layers': layers, - 'map': map_obj, - 'map_layers': map_layers, - 'preview': getattr( - settings, - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY', - 'leaflet') - } - return context - else: - if request.method == 'GET': - params = request.GET - elif request.method == 'POST': - params = request.POST - else: - return self.render_to_response(status=405) - - if 'layer' in params: - bbox = None - map_obj = Map(projection=getattr( - settings, 'DEFAULT_MAP_CRS', 'EPSG:3857')) - - for layer_name in params.getlist('layer'): - try: - layer = _resolve_layer(request, layer_name) - except ObjectDoesNotExist: - # bad layer, skip - continue - - if not request.user.has_perm( - 'view_resourcebase', - obj=layer.get_self_resource()): - # invisible layer, skip inclusion - continue - - layer_bbox = layer.bbox - # assert False, str(layer_bbox) - if bbox is None: - bbox = list(layer_bbox[0:4]) - else: - bbox[0] = min(bbox[0], layer_bbox[0]) - bbox[1] = min(bbox[1], layer_bbox[1]) - bbox[2] = max(bbox[2], layer_bbox[2]) - bbox[3] = max(bbox[3], layer_bbox[3]) - - config = layer.attribute_config() - - # Add required parameters for GXP lazy-loading - config["title"] = layer.title - config["queryable"] = True - - config["srs"] = getattr(settings, - 'DEFAULT_MAP_CRS', 'EPSG:3857') - config["bbox"] = bbox if config["srs"] != 'EPSG:3857' \ - else llbbox_to_mercator( - [float(coord) for coord in bbox]) - - if layer.storeType == "remoteStore": - service = layer.remote_service - # Probably not a good idea to send the access token to every remote service. - # This should never match, so no access token should be sent to remote services. - ogc_server_url = urlsplit( - ogc_server_settings.PUBLIC_LOCATION).netloc - service_url = urlsplit( - service.base_url).netloc - - if access_token and ogc_server_url == service_url and \ - 'access_token' not in service.base_url: - url = '%s?access_token=%s' % (service.base_url, access_token) - else: - url = service.base_url - map_layers = MapLayer(map=map_obj, - name=layer.typename, - ows_url=layer.ows_url, - layer_params=json.dumps(config), - visibility=True, - source_params=json.dumps({ - "ptype": service.ptype, - "remote": True, - "url": url, - "name": service.name, - "title": "[R] %s" % service.title})) - else: - ogc_server_url = urlsplit( - ogc_server_settings.PUBLIC_LOCATION).netloc - layer_url = urlsplit(layer.ows_url).netloc - - if access_token and ogc_server_url == layer_url and \ - 'access_token' not in layer.ows_url: - url = layer.ows_url + '?access_token=' + \ - access_token - else: - url = layer.ows_url - map_layers = MapLayer( - map=map_obj, - name=layer.typename, - ows_url=url, - # use DjangoJSONEncoder to handle Decimal values - layer_params=json.dumps( - config, - cls=DjangoJSONEncoder), - visibility=True - ) - - if bbox and len(bbox) >= 4: - minx, miny, maxx, maxy = [float(coord) for coord in bbox] - x = (minx + maxx) / 2 - y = (miny + maxy) / 2 - - if getattr(settings, - 'DEFAULT_MAP_CRS', 'EPSG:3857') == "EPSG:4326": - center = list((x, y)) - else: - center = list(forward_mercator((x, y))) - - if center[1] == float('-inf'): - center[1] = 0 - - BBOX_DIFFERENCE_THRESHOLD = 1e-5 - - # Check if the bbox is invalid - valid_x = (maxx - minx) ** 2 > BBOX_DIFFERENCE_THRESHOLD - valid_y = (maxy - miny) ** 2 > BBOX_DIFFERENCE_THRESHOLD - - if valid_x: - width_zoom = math.log(360 / abs(maxx - minx), 2) - else: - width_zoom = 15 - - if valid_y: - height_zoom = math.log(360 / abs(maxy - miny), 2) - else: - height_zoom = 15 - - map_obj.center_x = center[0] - map_obj.center_y = center[1] - map_obj.zoom = math.ceil(min(width_zoom, height_zoom)) - - map_obj.handle_moderated_uploads() - - config = map_obj.viewer_json(request) - config['fromLayer'] = True - context = { - 'config': json.dumps(config), - 'create': True, - 'layers': layers, - 'map': map_obj, - 'map_layers': map_layers, - 'preview': getattr( - settings, - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY', - 'leaflet') - } - - else: - # list all required layers - layers = Layer.objects.all() - context = { - 'create': True, - 'layers': layers - } - return context - - def get_success_url(self): - pass - - def get_form_kwargs(self): - kwargs = super(MapCreateView, self).get_form_kwargs() - return kwargs - - -class MapDetailView(DetailView): - model = Map - template_name = 'leaflet/maps/map_view.html' - context_object_name = 'map' - - def get_context_data(self, **kwargs): - """Prepare context data.""" - - mapid = self.kwargs.get('mapid') - request = self.request - - map_obj = _resolve_map( - request, mapid, 'base.view_resourcebase', _PERMISSION_MSG_VIEW) - - config = map_obj.viewer_json(request) - # list all required layers - layers = Layer.objects.all() - map_layers = MapLayer.objects.filter( - map_id=mapid).order_by('stack_order') - context = { - 'config': json.dumps(config), - 'create': False, - 'layers': layers, - 'map': map_obj, - 'map_layers': map_layers, - 'preview': getattr( - settings, - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY', - 'leaflet') - } - return context - - def get_object(self): - return Map.objects.get(id=self.kwargs.get("mapid")) - - -class MapEmbedView(DetailView): - model = Map - template_name = 'leaflet/maps/map_detail.html' - context_object_name = 'map' - - def get_context_data(self, **kwargs): - """Prepare context data.""" - - mapid = self.kwargs.get('mapid') - request = self.request - - map_obj = _resolve_map( - request, mapid, 'base.view_resourcebase', _PERMISSION_MSG_VIEW) - - config = map_obj.viewer_json(request) - # list all required layers - map_layers = MapLayer.objects.filter( - map_id=mapid).order_by('stack_order') - context = { - 'config': json.dumps(config), - 'create': False, - 'resource': map_obj, - 'layers': map_layers, - 'preview': getattr( - settings, - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY', - 'leaflet') - } - return context - - def get_object(self): - return Map.objects.get(id=self.kwargs.get("mapid")) - - @method_decorator(xframe_options_exempt) - def dispatch(self, *args, **kwargs): - return super(MapEmbedView, self).dispatch(*args, **kwargs) - - -class MapEditView(UpdateView): - model = Map - fields = '__all__' - template_name = 'leaflet/maps/map_edit.html' - context_object_name = 'map' - - def get_context_data(self, **kwargs): - # list all required layers - mapid = self.kwargs.get('mapid') - request = self.request - map_obj = _resolve_map(request, - mapid, - 'base.view_resourcebase', - _PERMISSION_MSG_VIEW) - - config = map_obj.viewer_json(request) - layers = Layer.objects.all() - map_layers = MapLayer.objects.filter( - map_id=mapid).order_by('stack_order') - - context = { - 'create': False, - 'config': json.dumps(config), - 'layers': layers, - 'map_layers': map_layers, - 'map': map_obj, - 'preview': getattr( - settings, - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY', - 'leaflet') - } - return context - - def get(self, request, **kwargs): - self.object = Map.objects.get( - id=self.kwargs.get('mapid')) - form_class = self.get_form_class() - form = self.get_form(form_class) - context = self.get_context_data( - object=self.object, form=form) - return self.render_to_response(context) - - def get_success_url(self): - pass - - def get_form_kwargs(self): - kwargs = super(MapEditView, self).get_form_kwargs() - return kwargs - - -class MapUpdateView(UpdateView): - model = Map - fields = '__all__' - template_name = 'leaflet/maps/map_edit.html' - context_object_name = 'map' - - def get_context_data(self, **kwargs): - mapid = self.kwargs.get('mapid') - request = self.request - map_obj = _resolve_map(request, - mapid, - 'base.view_resourcebase', - _PERMISSION_MSG_VIEW) - - if request.method == 'POST': - if not request.user.is_authenticated: - return self.render_to_response( - 'You must be logged in to save new maps', - content_type="text/plain", - status=401 - ) - map_obj.overwrite = True - map_obj.save() - map_obj.set_default_permissions() - map_obj.handle_moderated_uploads() - # If the body has been read already, use an empty string. - # See https://github.com/django/django/commit/58d555caf527d6f1bdfeab14527484e4cca68648 - # for a better exception to catch when we move to Django 1.7. - try: - body = request.body - except Exception: - body = '' - - try: - # Call the base implementation first to get a context - context = super(MapUpdateView, self).get_context_data(**kwargs) - map_obj.update_from_viewer(body, context=context) - except ValueError as e: - return self.render_to_response(str(e), status=400) - else: - context = { - 'create': False, - 'status': 200, - 'map': map_obj, - 'content_type': 'application/json' - } - return context - else: - return self.render_to_response(status=405) - - def get(self, request, **kwargs): - self.object = Map.objects.get( - id=self.kwargs.get('mapid')) - form_class = self.get_form_class() - form = self.get_form(form_class) - context = self.get_context_data(object=self.object, - form=form) - return self.render_to_response(context) - - def get_object(self, queryset=None): - obj = Map.objects.get( - id=self.kwargs.get('mapid')) - return obj - - -def map_download_qlr(request, mapid): - """Download QLR file to open the maps' layer in QGIS desktop. - - :param request: The request from the frontend. - :type request: HttpRequest - - :param mapid: The id of the map. - :type mapid: String - - :return: QLR file. - """ - - map_obj = _resolve_map(request, - mapid, - 'base.view_resourcebase', - _PERMISSION_MSG_VIEW) - - def perm_filter(layer): - return request.user.has_perm( - 'base.view_resourcebase', - obj=layer.get_self_resource()) - - mapJson = map_obj.json(perm_filter) - - # we need to remove duplicate layers - j_map = json.loads(mapJson) - j_layers = j_map["layers"] - for j_layer in j_layers: - if j_layer["service"] is None: - j_layers.remove(j_layer) - continue - if (len([_l for _l in j_layers if _l == j_layer])) > 1: - j_layers.remove(j_layer) - - map_layers = [] - for layer in j_layers: - layer_name = layer["name"].split(":")[1] - ogc_url = reverse('qgis_server:layer-request', - kwargs={'layername': layer_name}) - url = settings.SITEURL + ogc_url.replace("/", "", 1) - - map_layers.append({ - 'type': 'raster', - 'display': layer_name, - 'driver': 'wms', - 'crs': 'EPSG:4326', - 'format': 'image/png', - 'styles': '', - 'layers': layer_name, - 'url': url - }) - - json_layers = json.dumps(map_layers) - url_server = settings.QGIS_SERVER_URL \ - + '?SERVICE=LAYERDEFINITIONS&LAYERS=' + json_layers - fwd_request = requests.get(url_server) - response = HttpResponse( - fwd_request.content, - content_type="application/x-qgis-layer-definition", - status=fwd_request.status_code) - response['Content-Disposition'] = 'attachment; filename=%s.qlr' \ - % map_obj.title - - return response - - -def map_download_leaflet(request, mapid, - template='leaflet/maps/map_embed.html'): - """Download leaflet map as static HTML. - - :param request: The request from the frontend. - :type request: HttpRequest - - :param mapid: The id of the map. - :type mapid: String - - :return: HTML file. - """ - - map_obj = _resolve_map(request, - mapid, - 'base.view_resourcebase', - _PERMISSION_MSG_VIEW) - map_layers = MapLayer.objects.filter( - map_id=mapid).order_by('stack_order') - layers = [] - for layer in map_layers: - if layer.group != 'background': - layers.append(layer) - - context = { - 'resource': map_obj, - 'map_layers': layers, - 'for_download': True - } - - the_page = render(request, template, context=context) - - response = HttpResponse( - the_page.content, content_type="html", - status=the_page.status_code) - response['Content-Disposition'] = 'attachment; filename=%s.html' \ - % (map_obj.title,) - - return response - - -def set_thumbnail_map(request, mapid): - """Update thumbnail based on map extent - - :param layername: The layer name in Geonode. - :type layername: basestring - - :return success: true if success, None if fail. - :type success: bool - """ - if request.method != 'POST': - return HttpResponse('Bad Request') - - map_layers = MapLayer.objects.filter(map__id=mapid) - local_layers = [_l for _l in map_layers if _l.local] - - layers = {} - for layer in local_layers: - try: - _l = Layer.objects.get(typename=layer.name) - layers[_l.name] = _l - except Layer.DoesNotExist: - msg = 'No Layer found for typename: {0}'.format(layer.name) - logger.debug(msg) - - if not layers: - # The signal is called too early, or the map has no layer yet. - return - - bbox = _get_bbox_from_layers(layers) - - # Give thumbnail creation to celery tasks, and exit. - create_qgis_server_thumbnail.apply_async( - ('maps.map', mapid, True, bbox)) - retval = { - 'success': True - } - return HttpResponse( - json.dumps(retval), content_type="application/json") - - -def _get_bbox_from_layers(layers): - """ - Calculate the bbox from a given list of Layer objects - """ - bbox = None - for layer in layers: - layer_bbox = layers[layer].bbox_string.split(',') - if bbox is None: - bbox = [float(key) for key in layer_bbox] - else: - bbox[0] = float(min(bbox[0], layer_bbox[0])) - bbox[1] = float(min(bbox[1], layer_bbox[1])) - bbox[2] = float(max(bbox[2], layer_bbox[2])) - bbox[3] = float(max(bbox[3], layer_bbox[3])) - - return bbox diff --git a/geonode/maps/templates/maps/map_detail.html b/geonode/maps/templates/maps/map_detail.html index 562cc5cb009..6b09f4c058c 100644 --- a/geonode/maps/templates/maps/map_detail.html +++ b/geonode/maps/templates/maps/map_detail.html @@ -255,24 +255,6 @@

        {% trans "Copy this map" %}

        {% endif %} - {% if OGC_SERVER.default.BACKEND == 'geonode.qgis_server' %} -
      • -

        {% trans "Embed this map" %}

        -

        {% trans "Embed this map to your own sites" %}

        -
        - - -
        -
        • - {% endif %} - {% include "base/_resourcebase_contact_snippet.html" %}
      diff --git a/geonode/maps/tests.py b/geonode/maps/tests.py index d2d13b3dc35..e404ae57fb2 100644 --- a/geonode/maps/tests.py +++ b/geonode/maps/tests.py @@ -36,7 +36,7 @@ from geonode.maps import MapsAppConfig from geonode.layers.models import Layer from geonode.compat import ensure_string -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.decorators import on_ogc_backend from geonode.maps.utils import fix_baselayers from geonode.base.models import License, Region @@ -613,32 +613,6 @@ def test_map_remove(self): response = self.client.get(url) self.assertEqual(response.status_code, 404) - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_map_download_leaflet(self): - """ Test that a map can be downloaded as leaflet""" - # first, get a new map: user needs to login - self.client.login(username='admin', password='admin') - new_map = reverse('new_map_json') - response = self.client.post( - new_map, - data=self.viewer_config, - content_type="text/json") - self.assertEqual(response.status_code, 200) - content = response.content - if isinstance(content, bytes): - content = content.decode('UTF-8') - map_id = int(json.loads(content)['id']) - self.client.logout() - - # then, obtain the map using leaflet - response = self.client.get( - reverse( - 'map_download_leaflet', args=(map_id, ))) - - # download map leafleT should return OK - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'html') - @on_ogc_backend(geoserver.BACKEND_PACKAGE) def test_map_embed(self): """Test that map can be properly embedded @@ -922,14 +896,10 @@ def test_fix_baselayers(self): if check_ogc_backend(geoserver.BACKEND_PACKAGE): # number of base layers (we remove the local geoserver entry from the total) n_baselayers = len(settings.MAP_BASELAYERS) - 1 - elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - # QGIS Server backend already excluded local geoserver entry - n_baselayers = len(settings.MAP_BASELAYERS) - - # number of local layers - n_locallayers = map_obj.layer_set.filter(local=True).count() - fix_baselayers(map_id) - self.assertEqual(1, n_baselayers + n_locallayers) + # number of local layers + n_locallayers = map_obj.layer_set.filter(local=True).count() + fix_baselayers(map_id) + self.assertEqual(1, n_baselayers + n_locallayers) def test_batch_edit(self): Model = Map diff --git a/geonode/maps/tests_populate_maplayers.py b/geonode/maps/tests_populate_maplayers.py index 9f8fd3d0819..dabdb602f99 100644 --- a/geonode/maps/tests_populate_maplayers.py +++ b/geonode/maps/tests_populate_maplayers.py @@ -18,7 +18,7 @@ # ######################################################################### -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.maps.models import Map, MapLayer maplayers = [{"fixed": False, diff --git a/geonode/maps/urls.py b/geonode/maps/urls.py index 9f64a6bf9ba..c0624fc4680 100644 --- a/geonode/maps/urls.py +++ b/geonode/maps/urls.py @@ -21,7 +21,7 @@ from django.conf.urls import url, include from django.views.generic import TemplateView -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.utils import check_ogc_backend from geonode.monitoring import register_url_event @@ -42,21 +42,6 @@ map_json = views.map_json map_thumbnail = views.map_thumbnail -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.maps.qgis_server_views import MapCreateView, \ - MapDetailView, MapEmbedView, MapEditView, MapUpdateView - - new_map_view = MapCreateView.as_view() - existing_map_view = MapDetailView.as_view() - map_embed = MapEmbedView.as_view() - - from geonode.maps.qgis_server_views import map_download_qlr, \ - map_download_leaflet, set_thumbnail_map - - map_edit = MapEditView.as_view() - map_json = MapUpdateView.as_view() - map_thumbnail = set_thumbnail_map - maps_list = register_url_event()(TemplateView.as_view(template_name='maps/map_list.html')) urlpatterns = [ @@ -91,17 +76,3 @@ views.MapAutocomplete.as_view(), name='autocomplete_map'), url(r'^', include('geonode.maps.api.urls')), ] - -if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - # Add QLR url specific for QGIS Server - urlpatterns += [ - url(r'^(?P[^/]+)/download$', - views.map_download, - name='map_download'), - url(r'^(?P[^/]+)/qlr$', - map_download_qlr, - name='map_download_qlr'), - url(r'^(?P[^/]+)/download_leaflet', - map_download_leaflet, - name='map_download_leaflet'), - ] diff --git a/geonode/maps/views.py b/geonode/maps/views.py index c3c247a5379..e3b9e525866 100644 --- a/geonode/maps/views.py +++ b/geonode/maps/views.py @@ -21,7 +21,7 @@ import math import logging import traceback -from urllib.parse import quote, urlsplit +from urllib.parse import quote, urlsplit, urljoin from itertools import chain from guardian.shortcuts import get_perms @@ -29,7 +29,7 @@ from django.contrib.auth.decorators import login_required from django.core.exceptions import ObjectDoesNotExist from django.urls import reverse -from django.shortcuts import render, redirect +from django.shortcuts import render from django.core.exceptions import PermissionDenied from django.core.serializers.json import DjangoJSONEncoder from django.http import ( @@ -65,7 +65,7 @@ from geonode.base.models import ( Thesaurus, TopicCategory) -from geonode import geoserver, qgis_server +from geonode import geoserver from geonode.groups.models import GroupProfile from geonode.base.auth import get_or_create_token from geonode.documents.models import get_related_documents @@ -74,7 +74,6 @@ from .tasks import delete_map from geonode.monitoring import register_event from geonode.monitoring.models import EventType -from requests.compat import urljoin from deprecated import deprecated from dal import autocomplete @@ -85,10 +84,9 @@ # FIXME: The post service providing the map_status object # should be moved to geonode.geoserver. from geonode.geoserver.helpers import ogc_server_settings - from geonode.geoserver.helpers import (_render_thumbnail, - _prepare_thumbnail_body_from_opts) -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - from geonode.qgis_server.helpers import ogc_server_settings + from geonode.geoserver.helpers import ( + _render_thumbnail, + _prepare_thumbnail_body_from_opts) logger = logging.getLogger("geonode.maps.views") @@ -1105,14 +1103,10 @@ def perm_filter(layer): j_layers.remove(j_layer) mapJson = json.dumps(j_map) - if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - url = urljoin(settings.SITEURL, - reverse("qgis_server:download-map", kwargs={'mapid': mapid})) - # qgis-server backend stop here, continue on qgis_server/views.py - return redirect(url) - # the path to geoserver backend continue here - resp, content = http_client.request(url, 'POST', body=mapJson) + url = urljoin(settings.SITEURL, + reverse("download-map", kwargs={'mapid': mapid})) + resp, content = http_client.request(url, 'POST', data=mapJson) status = int(resp.status_code) diff --git a/geonode/people/migrations/0030_auto_20210118_1112.py b/geonode/people/migrations/0030_auto_20210118_1112.py new file mode 100644 index 00000000000..8356c47f815 --- /dev/null +++ b/geonode/people/migrations/0030_auto_20210118_1112.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2021-01-18 11:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('people', '0029_auto_20201216_1335'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='language', + field=models.CharField(choices=[('af', 'Afrikaans'), ('ar', 'العربيّة'), ('ast', 'asturian'), ('az', 'Azərbaycanca'), ('bg', 'български'), ('be', 'беларуская'), ('bn', 'বাংলা'), ('br', 'brezhoneg'), ('bs', 'bosanski'), ('ca', 'català'), ('cs', 'česky'), ('cy', 'Cymraeg'), ('da', 'dansk'), ('de', 'Deutsch'), ('el', 'Ελληνικά'), ('en', 'English'), ('en-au', 'Australian English'), ('en-gb', 'British English'), ('eo', 'Esperanto'), ('es', 'español'), ('es-ar', 'español de Argentina'), ('es-mx', 'español de Mexico'), ('es-ni', 'español de Nicaragua'), ('es-ve', 'español de Venezuela'), ('et', 'eesti'), ('eu', 'Basque'), ('fa', 'فارسی'), ('fi', 'suomi'), ('fr', 'français'), ('fy', 'frysk'), ('ga', 'Gaeilge'), ('gl', 'galego'), ('he', 'עברית'), ('hi', 'Hindi'), ('hr', 'Hrvatski'), ('hu', 'Magyar'), ('ia', 'Interlingua'), ('id', 'Bahasa Indonesia'), ('io', 'ido'), ('is', 'Íslenska'), ('it', 'italiano'), ('ja', '日本語'), ('ka', 'ქართული'), ('kk', 'Қазақ'), ('km', 'Khmer'), ('kn', 'Kannada'), ('ko', '한국어'), ('lb', 'Lëtzebuergesch'), ('lt', 'Lietuviškai'), ('lv', 'latvieš'), ('mk', 'Македонски'), ('ml', 'Malayalam'), ('mn', 'Mongolian'), ('mr', 'मराठी'), ('my', 'မြန်မာဘာသာ'), ('nb', 'norsk (bokmål)'), ('ne', 'नेपाली'), ('nl', 'Nederlands'), ('nn', 'norsk (nynorsk)'), ('os', 'Ирон'), ('pa', 'Punjabi'), ('pl', 'polski'), ('pt', 'Português'), ('pt-br', 'Português Brasileiro'), ('ro', 'Română'), ('ru', 'Русский'), ('sk', 'slovenský'), ('sl', 'Slovenščina'), ('sq', 'shqip'), ('sr', 'српски'), ('sr-latn', 'srpski (latinica)'), ('sv', 'svenska'), ('sw', 'Kiswahili'), ('ta', 'தமிழ்'), ('te', 'తెలుగు'), ('th', 'ภาษาไทย'), ('tr', 'Türkçe'), ('tt', 'Татарча'), ('udm', 'Удмурт'), ('uk', 'Українська'), ('ur', 'اردو'), ('vi', 'Tiếng Việt'), ('zh-cn', '简体中文'), ('zh-hans', '简体中文'), ('zh-hant', '繁體中文'), ('zh-tw', '繁體中文')], default='en', max_length=10, verbose_name='language'), + ), + ] diff --git a/geonode/proxy/views.py b/geonode/proxy/views.py index b073d5e151b..b804e55e6a1 100644 --- a/geonode/proxy/views.py +++ b/geonode/proxy/views.py @@ -57,7 +57,7 @@ json_serializer_producer) from geonode.base.enumerations import LINK_TYPES as _LT -from geonode import geoserver, qgis_server # noqa +from geonode import geoserver # noqa from geonode.monitoring import register_event TIMEOUT = 300 diff --git a/geonode/qgis_server/__init__.py b/geonode/qgis_server/__init__.py deleted file mode 100644 index dfac570d150..00000000000 --- a/geonode/qgis_server/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2018 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -BACKEND_PACKAGE = 'geonode.qgis_server' - - -default_app_config = "geonode.qgis_server.apps.AppConfig" diff --git a/geonode/qgis_server/admin.py b/geonode/qgis_server/admin.py deleted file mode 100644 index cc42fae93f1..00000000000 --- a/geonode/qgis_server/admin.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from django.contrib import admin -from geonode.qgis_server.models import QGISServerLayer, QGISServerStyle - - -# Register your models here. -class QGISServerLayerAdmin(admin.ModelAdmin): - list_display = [ - 'layer', - 'base_layer_path' - ] - - -class QGISServerStyleAdmin(admin.ModelAdmin): - list_display = [ - 'name', - 'title', - 'style_url' - ] - - -admin.site.register(QGISServerLayer, QGISServerLayerAdmin) -admin.site.register(QGISServerStyle, QGISServerStyleAdmin) diff --git a/geonode/qgis_server/apps.py b/geonode/qgis_server/apps.py deleted file mode 100644 index 1693d4fe3dc..00000000000 --- a/geonode/qgis_server/apps.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2018 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### -from django.apps import AppConfig as BaseAppConfig - - -def run_setup_hooks(*args, **kwargs): - from .signals import register_qgis_server_signals - register_qgis_server_signals() - - -class AppConfig(BaseAppConfig): - - name = "geonode.qgis_server" - label = "qgis_server" - - def ready(self): - super(AppConfig, self).ready() - run_setup_hooks() diff --git a/geonode/qgis_server/context_processors.py b/geonode/qgis_server/context_processors.py deleted file mode 100644 index 4fc78efd272..00000000000 --- a/geonode/qgis_server/context_processors.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from django.conf import settings -from django.urls import reverse - -from geonode.geoserver.helpers import ogc_server_settings -from geonode.qgis_server.forms import QGISLayerStyleUploadForm - - -def qgis_server_urls(request): - """Global values to pass to templates""" - defaults = dict( - UPLOADER_URL=reverse('data_upload') if getattr( - settings, - 'UPLOADER', - dict()).get( - 'BACKEND', - 'geonode.rest') == 'geonode.importer' else reverse('layer_upload'), - LAYER_ANCILLARY_FILES_UPLOAD_URL=reverse('layer_upload'), - MAPFISH_PRINT_ENABLED=getattr(ogc_server_settings, 'MAPFISH_PRINT_ENABLED', False), - PRINT_NG_ENABLED=getattr(ogc_server_settings, 'PRINT_NG_ENABLED', False), - GEONODE_SECURITY_ENABLED=getattr(ogc_server_settings, 'GEONODE_SECURITY_ENABLED', False), - TIME_ENABLED=getattr( - settings, - 'UPLOADER', - dict()).get( - 'OPTIONS', - dict()).get( - 'TIME_ENABLED', - False), - MOSAIC_ENABLED=getattr( - settings, - 'UPLOADER', - dict()).get( - 'OPTIONS', - dict()).get( - 'MOSAIC_ENABLED', - False), - ) - - defaults['style_upload_form'] = QGISLayerStyleUploadForm() - return defaults diff --git a/geonode/qgis_server/forms.py b/geonode/qgis_server/forms.py deleted file mode 100644 index fcd80981564..00000000000 --- a/geonode/qgis_server/forms.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### -import os - -from django import forms -from django.core.exceptions import ValidationError -from django.core.validators import RegexValidator - - -def _extension_validator(value): - __, ext = os.path.splitext(value.name) - if not ext == '.qml': - raise ValidationError('Only accept QML file.') - - -class QGISLayerStyleUploadForm(forms.Form): - - alphanumeric = RegexValidator( - r'^[0-9a-zA-Z_]*$', - 'Only alphanumeric and underscore characters are allowed.') - - name = forms.CharField( - label='Name', required=True, - help_text='Name identifier for style', - validators=[alphanumeric]) - title = forms.CharField( - label='Title', required=True, - help_text='Human friendly title for style') - qml = forms.FileField( - label='QML', - help_text='QGIS Style file (QML)', - validators=[_extension_validator]) diff --git a/geonode/qgis_server/gis_tools.py b/geonode/qgis_server/gis_tools.py deleted file mode 100644 index 07e0eaa44b1..00000000000 --- a/geonode/qgis_server/gis_tools.py +++ /dev/null @@ -1,164 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -import logging -import traceback -from urllib.parse import urlencode -from urllib.request import urlretrieve -from os.path import splitext -from math import atan, degrees, sinh, pi -from defusedxml import lxml as dlxml - -from django.conf import settings as geonode_config - -from geonode.layers.models import Attribute -from geonode.qgis_server.models import QGISServerLayer - -logger = logging.getLogger(__name__) - - -def set_attributes(layer, overwrite=False): - """Retrieve layer attribute names & types from QGIS Server using - the WFS/WMS/WCS, then store in GeoNode database using Attribute model. - - This function is copied/adapted from set_attributes in geoserver/helper.py. - - :param layer: The layer where we want to add/update the attributes. - :type layer: QGISServerLayer - - :param overwrite: If we should overwrite or not in the database. - :type overwrite: bool - """ - if layer.storeType in ['dataStore']: - layer_name = layer.alternate - qgis_layer = QGISServerLayer.objects.get(layer=layer) - - qgis_server = geonode_config.QGIS_SERVER_CONFIG['qgis_server_url'] - basename, _ = splitext(qgis_layer.base_layer_path) - dft_url = qgis_server + '?' + urlencode({ - 'MAP': basename + '.qgs', - 'SERVICE': 'WFS', - 'VERSION': '1.0.0', - 'REQUEST': 'DescribeFeatureType', - 'LAYER': layer_name - }) - - # noinspection PyBroadException - try: - temp_file = urlretrieve(dft_url)[0] - with open(temp_file, 'r') as wfs_file: - doc = dlxml.fromstring(wfs_file.read()) - - path = './/{xsd}extension/{xsd}sequence/{xsd}element'.format( - xsd='{http://www.w3.org/2001/XMLSchema}') - - attribute_map = [ - [n.attrib['name'], n.attrib['type']] for n in doc.findall( - path) if n.attrib.get('name') and n.attrib.get('type')] - - except Exception: - tb = traceback.format_exc() - logger.debug(tb) - attribute_map = [] - else: - attribute_map = [] - - # We need 3 more items for description, attribute_label and display_order - attribute_map_dict = { - 'field': 0, - 'ftype': 1, - 'description': 2, - 'label': 3, - 'display_order': 4, - } - for attribute in attribute_map: - attribute.extend((None, None, 0)) - - attributes = layer.attribute_set.all() - - # Delete existing attributes if they no longer exist in an updated layer. - for la in attributes: - lafound = False - for attribute in attribute_map: - field, ftype, description, label, display_order = attribute - if field == la.attribute: - lafound = True - # store description and attribute_label in attribute_map - attribute[attribute_map_dict['description']] = la.description - attribute[attribute_map_dict['label']] = la.attribute_label - attribute[attribute_map_dict['display_order']] = la.display_order - - if overwrite or not lafound: - logger.debug( - 'Going to delete [%s] for [%s]', - la.attribute, - layer.name) - la.delete() - - # Add new layer attributes if they don't already exist. - if attribute_map is not None: - iter = len(Attribute.objects.filter(layer=layer)) + 1 - for attribute in attribute_map: - field, ftype, description, label, display_order = attribute - if field is not None: - _gs_attrs = Attribute.objects.filter( - layer=layer, attribute=field, attribute_type=ftype, - description=description, attribute_label=label, - display_order=display_order) - if _gs_attrs.count() > 1: - _gs_attrs.delete() - la, created = Attribute.objects.get_or_create( - layer=layer, attribute=field, attribute_type=ftype, - description=description, attribute_label=label, - display_order=display_order) - if created: - la.visible = ftype.find('gml:') != 0 - la.display_order = iter - la.save() - iter += 1 - logger.debug( - 'Created [%s] attribute for [%s]', - field, - layer.name) - else: - logger.debug('No attributes found') - - -def num2deg(x_tile, y_tile, zoom): - """Conversion of X,Y and zoom from a TMS url to lat/lon coordinates - See http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames - - :param x_tile: The X tile number. - :type x_tile: integer - - :param y_tile: The Y tile number. - :type y_tile: integer - - :param zoom: The zoom level, usually between 0 and 20. - :type zoom: integer - - :return: Tuple (lat,lon). - :rtype: list - """ - n = 2.0 ** zoom - lon_deg = x_tile / n * 360.0 - 180.0 - lat_rad = atan(sinh(pi * (1 - 2 * y_tile / n))) - lat_deg = degrees(lat_rad) - return lat_deg, lon_deg diff --git a/geonode/qgis_server/helpers.py b/geonode/qgis_server/helpers.py deleted file mode 100644 index c48477dca6f..00000000000 --- a/geonode/qgis_server/helpers.py +++ /dev/null @@ -1,980 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### -import logging -import math -import os -import re -import shutil -import json -from urllib.parse import unquote, urljoin - -import requests -from django.conf import settings -from django.contrib.contenttypes.models import ContentType -from django.contrib.gis.gdal import CoordTransform, SpatialReference -from django.contrib.gis.geos import GEOSGeometry, Point -from django.core.exceptions import ImproperlyConfigured -from django.urls import reverse -from defusedxml import lxml as dlxml -from requests import Request - -from geonode.compat import ensure_string -from geonode import qgis_server, geoserver -from geonode.utils import check_ogc_backend -from geonode.geoserver.helpers import OGC_Servers_Handler -from geonode.layers.models import Layer -from geonode.qgis_server.gis_tools import num2deg -from geonode.qgis_server.models import ( - QGISServerLayer, - QGISServerMap, - QGISServerStyle) - -if check_ogc_backend(geoserver.BACKEND_PACKAGE): - # FIXME: The post service providing the map_status object - # should be moved to geonode.geoserver. - from geonode.geoserver.helpers import ogc_server_settings -elif check_ogc_backend(qgis_server.BACKEND_PACKAGE): - ogc_server_settings = OGC_Servers_Handler(settings.OGC_SERVER)['default'] - - -logger = logging.getLogger("geonode.qgis_server.helpers") - - -def validate_django_settings(): - """Check that settings file configured correctly for qgis_server backend. - """ - # geonode.qgis_server must exists in INSTALLED_APPS and not geoserver - if 'geonode.qgis_server' not in settings.INSTALLED_APPS: - raise ImproperlyConfigured( - 'geonode.qgis_server module not included in INSTALLED_APPS.') - if ogc_server_settings.BACKEND == 'geonode.geoserver': - raise ImproperlyConfigured( - 'You want to use QGIS Server backend, but geonode.geoserver module' - ' is set as default BACKEND.') - - # LOCAL_GEOSERVER settings should not exists - if hasattr(settings, 'LOCAL_GEOSERVER'): - raise ImproperlyConfigured( - "This setting will not be used when using QGIS Server backend.") - - # Should not include geoserver context_processor - geoserver_context_processor = \ - 'geonode.geoserver.context_processors.geoserver_urls' - - context_processors = settings.TEMPLATES[ - 0]['OPTIONS']['context_processors'] - - # Should include qgis_server context_processor - qgis_server_context_processor = \ - 'geonode.qgis_server.context_processors.qgis_server_urls' - - if geoserver_context_processor in context_processors: - raise ImproperlyConfigured( - 'Geoserver context_processors should be excluded.') - - if qgis_server_context_processor not in context_processors: - raise ImproperlyConfigured( - 'QGIS Server context_processors should be included.') - - if not hasattr(settings, 'QGIS_SERVER_URL'): - raise ImproperlyConfigured( - 'QGIS_SERVER_URL setting should be configured.') - - if not hasattr(settings, 'QGIS_SERVER_CONFIG'): - raise ImproperlyConfigured( - 'QGIS_SERVER_CONFIG setting should be configured.') - - if not settings.GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'leaflet': - raise ImproperlyConfigured( - 'QGIS Server at the moment only works with ' - 'GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = leaflet.') - - # Check OGC Server settings - default_ogc_backend = settings.OGC_SERVER['default'] - - if not default_ogc_backend['BACKEND'] == qgis_server.BACKEND_PACKAGE: - raise ImproperlyConfigured( - "OGC_SERVER['default']['BACKEND'] should be set to " - "{package}.".format(package=qgis_server.BACKEND_PACKAGE)) - - return True - - -def transform_layer_bbox(layer, target_crs): - """Transform layer bbox to a different CRS. - - :param layer: Layer to take the bounding box from - :type layer: Layer - - :param target_crs: Integer of EPSG crs ID - :type target_crs: int - - :return: list converted BBox in target CRS, in the format: - [xmin,ymin,xmax,ymax] - :rtype: list(int) - """ - srid, wkt = layer.geographic_bounding_box.split(';') - srid = re.findall(r'\d+', srid) - geom = GEOSGeometry(wkt, srid=int(srid[0])) - geom.transform(target_crs) - return list(geom.extent) - - -def qgis_server_endpoint(internal=True): - """Return QGIS Server endpoint. - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: Base url endpoint - :rtype: str - """ - if internal: - try: - return settings.QGIS_SERVER_CONFIG['qgis_server_url'] - except AttributeError: - logging.error( - 'QGIS_SERVER_CONFIG option is missing "qgis_server_url" key') - raise - else: - # The generated URL is not a direct URL to QGIS Server, - # but it was a proxy from django instead. - endpoint_url = reverse('qgis_server:request') - - if hasattr(settings, 'TESTING') and settings.TESTING: - site_url = 'http://localhost:8000' - else: - site_url = settings.SITEURL - qgis_server_url = urljoin(site_url, endpoint_url) - return qgis_server_url - - -def tile_url_format(layer_name, style=None): - """Construct proxied QGIS Server URL format for tiles. - - This url is not an actual request, but rather a format url - that can be used by TMS service to generate tile request according - to this layer. - - :param layer_name: The layer name from the QGIS backend - :type layer_name: basestring - - :return: Tile url - :rtype: basestring - """ - url_kwargs = { - 'layername': layer_name - } - if style: - url_kwargs['style'] = style - url = reverse( - 'qgis_server:tile', - kwargs=url_kwargs) - # unquote url - # so that {z}/{x}/{y} is not quoted - url = unquote(url) - url = urljoin(settings.SITEURL, url) - return url - - -def tile_url(layer, z, x, y, style=None, internal=True): - """Construct actual tile request to QGIS Server. - - Different than tile_url_format, this method will return url for requesting - a tile, with all parameters filled out. - - :param layer: Layer to use - :type layer: Layer - - :param z: TMS coordinate, zoom parameter - :type z: int, str - - :param x: TMS coordinate, longitude parameter - :type x: int, str - - :param y: TMS coordinate, latitude parameter - :type y: int, str - - :param style: Layer style to choose - :type style: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: Tile url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format( - layer.name) - logger.debug(msg) - raise - - x = int(x) - y = int(y) - z = int(z) - - # Call the WMS - top, left = num2deg(x, y, z) - bottom, right = num2deg(x + 1, y + 1, z) - - transform = CoordTransform(SpatialReference(4326), SpatialReference(3857)) - top_left_corner = Point(left, top, srid=4326) - bottom_right_corner = Point(right, bottom, srid=4326) - top_left_corner.transform(transform) - bottom_right_corner.transform(transform) - - bottom = bottom_right_corner.y - right = bottom_right_corner.x - top = top_left_corner.y - left = top_left_corner.x - - bbox = ','.join(str(val) for val in [left, bottom, right, top]) - - if not style: - style = 'default' - - if style not in [s.name for s in qgis_layer.styles.all()]: - if qgis_layer.default_style: - style = qgis_layer.default_style.name - - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetMap', - 'BBOX': bbox, - 'CRS': 'EPSG:3857', - 'WIDTH': '256', - 'HEIGHT': '256', - 'MAP': qgis_layer.qgis_project_path, - 'LAYERS': layer.name, - 'STYLE': style, - 'FORMAT': 'image/png', - 'TRANSPARENT': 'true', - 'DPI': '96', - 'MAP_RESOLUTION': '96', - 'FORMAT_OPTIONS': 'dpi:96' - } - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - - return url - - -def map_thumbnail_url(instance, bbox=None, internal=True): - """Construct QGIS Server Url to fetch remote map thumbnail. - - :param instance: Map object - :type instance: geonode.maps.models.Map - - :param bbox: Bounding box of thumbnail in 4 tuple format - [xmin,ymin,xmax,ymax] - :type bbox: list(float) - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: thumbnail url - :rtype: str - """ - try: - qgis_map = QGISServerMap.objects.get(map=instance) - except QGISServerMap.DoesNotExist: - msg = 'No QGIS Server Map for existing map {0}'.format(instance.title) - logger.debug(msg) - raise - - qgis_project = qgis_map.qgis_project_path - if not os.path.exists(qgis_project): - msg = 'Map project not found for {0}'.format(qgis_project) - logger.debug(msg) - raise ValueError(msg) - - if not bbox: - # We get the extent of these layers. - # Reproject, in case of different CRS - bbox = transform_layer_bbox(instance, 4326) - return thumbnail_url( - bbox, qgis_map.qgis_map_name, qgis_project, internal=internal) - - -def layer_thumbnail_url(instance, style=None, bbox=None, internal=True): - """Construct QGIS Server Url to fetch remote layer thumbnail. - - :param instance: Layer object - :type instance: geonode.layers.models.Layer - - :param style: Layer style to choose - :type style: str - - :param bbox: Bounding box of thumbnail in 4 tuple format - [xmin,ymin,xmax,ymax] - :type bbox: list(float) - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: Thumbnail URL. - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=instance) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format( - instance.name) - logger.debug(msg) - raise - - qgis_project = qgis_layer.qgis_project_path - layers = instance.name - - if not style: - style = 'default' - - if style not in [s.name for s in qgis_layer.styles.all()]: - if qgis_layer.default_style: - style = qgis_layer.default_style.name - - if not bbox: - # We get the extent of the layer. - # Reproject, in case of different CRS - bbox = transform_layer_bbox(instance, 4326) - - return thumbnail_url(bbox, layers, qgis_project, style=style, internal=internal) - - -def thumbnail_url(bbox, layers, qgis_project, style=None, internal=True): - """Internal function to generate the URL for the thumbnail. - - :param bbox: The bounding box to use in the format [left,bottom,right,top]. - :type bbox: list - - :param layers: Name of the layer to use. - :type layers: basestring - - :param qgis_project: The path to the QGIS project. - :type qgis_project: basestring - - :param style: Layer style to choose - :type style: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: The WMS URL to fetch the thumbnail. - :rtype: basestring - """ - - x_min, y_min, x_max, y_max = bbox - # We calculate the margins according to 10 percent. - percent = 10 - delta_x = (x_max - x_min) / 100 * percent - delta_x = math.fabs(delta_x) - delta_y = (y_max - y_min) / 100 * percent - delta_y = math.fabs(delta_y) - # We apply the margins to the extent. - margin = [ - y_min - delta_y, - x_min - delta_x, - y_max + delta_y, - x_max + delta_x - ] - # Call the WMS. - bbox = ','.join([str(val) for val in margin]) - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetMap', - 'BBOX': bbox, - 'SRS': 'EPSG:4326', - 'WIDTH': '250', - 'HEIGHT': '250', - 'MAP': qgis_project, - 'LAYERS': layers, - 'STYLE': style, - 'FORMAT': 'image/png', - 'TRANSPARENT': 'true', - 'DPI': '96', - 'MAP_RESOLUTION': '96', - 'FORMAT_OPTIONS': 'dpi:96' - } - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def legend_url(layer, layertitle=False, style=None, internal=True): - """Construct QGIS Server url to fetch legend. - - :param layer: Layer to use - :type layer: Layer - - :param layertitle: Layer title flag. Set to True to include layer title - :type layertitle: bool - - :param style: Layer style to choose - :type style: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - if not style: - style = 'default' - - if style not in [s.name for s in qgis_layer.styles.all()]: - if qgis_layer.default_style: - style = qgis_layer.default_style.name - - query_string = { - 'MAP': qgis_project_path, - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetLegendGraphic', - 'LAYER': layer.name, - 'LAYERTITLE': str(layertitle).lower(), - 'FORMAT': 'image/png', - 'STYLE': style, - 'TILED': 'true', - 'TRANSPARENT': 'true', - 'LEGEND_OPTIONS': ( - 'fontAntiAliasing:true;fontSize:11;fontName:Arial') - } - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def qgs_url(layer, style=None, internal=True): - """Construct QGIS Server url to fetch QGS. - - :param layer: Layer to use - :type layer: Layer - - :param style: Layer style to choose - :type style: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url for QGS - :rtype: str - """ - qgis_server_url = qgis_server_endpoint(internal) - - url = requests.compat.urljoin( - settings.SITEURL, - reverse('qgis_server:layer-request', - kwargs={'layername': layer.name})) - - # for now, style always set to '' - if not style: - style = '' - else: - style = 'default' - - layers = [{ - 'type': 'raster', - 'display': layer.name, - 'driver': 'wms', - 'crs': 'EPSG:4326', - 'format': 'image/png', - 'styles': style, - 'layers': layer.name, - 'url': url - }] - - json_layers = json.dumps(layers) - - url_server = qgis_server_url + \ - '?SERVICE=PROJECTDEFINITIONS&LAYERS=' + json_layers - - return url_server - - -def qlr_url(layer, style=None, internal=True): - """Construct QGIS Server url to fetch QLR. - - :param layer: Layer to use - :type layer: Layer - - :param style: Layer style to choose - :type style: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url for QLR - :rtype: str - """ - qgis_server_url = qgis_server_endpoint(internal) - url = requests.compat.urljoin( - settings.SITEURL, - reverse('qgis_server:layer-request', - kwargs={'layername': layer.name})) - - # for now, style always set to '' - if not style: - style = '' - else: - style = 'default' - - layers = [{ - 'type': 'raster', - 'display': layer.name, - 'driver': 'wms', - 'crs': 'EPSG:4326', - 'format': 'image/png', - 'styles': style, - 'layers': layer.name, - 'url': url - }] - json_layers = json.dumps(layers) - - url_server = qgis_server_url + \ - '?SERVICE=LAYERDEFINITIONS&LAYERS=' + json_layers - - return url_server - - -def wms_get_capabilities_url(layer=None, internal=True): - """Construct WMS GetCapabilities request. - - :param layer: Layer to inspect - :type layer: Layer - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - query_string = { - 'MAP': qgis_project_path, - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetCapabilities', - 'LAYER': layer.name - } - - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def style_get_url(layer, style_name, internal=True): - """Get QGIS Server style as xml. - - :param layer: Layer to inspect - :type layer: Layer - - :param style_name: Style name as given by QGIS Server - :type style_name: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - query_string = { - 'PROJECT': qgis_project_path, - 'SERVICE': 'STYLEMANAGER', - 'REQUEST': 'GetStyle', - 'LAYER': layer.name, - 'NAME': style_name - } - - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def style_add_url(layer, style_name, internal=True): - """Add QGIS Server style to QGIS Project. - - This style file is stored on qml LayerFile in upload_session. - After the file is uploaded, it has to be deleted. - - :param layer: Layer to inspect - :type layer: Layer - - :param style_name: Style name as given by QGIS Server - :type style_name: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - # QML File is taken from uploaded file - query_string = { - 'SERVICE': 'STYLEMANAGER', - 'PROJECT': qgis_project_path, - 'REQUEST': 'AddStyle', - 'LAYER': layer.name, - 'NAME': style_name, - 'QML': qgis_layer.qml_path, - 'REMOVEQML': 'TRUE' - } - - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def style_remove_url(layer, style_name, internal=True): - """Remove QGIS Server style from QGIS Project. - - :param layer: Layer to inspect - :type layer: Layer - - :param style_name: Style name as given by QGIS Server - :type style_name: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - query_string = { - 'SERVICE': 'STYLEMANAGER', - 'PROJECT': qgis_project_path, - 'REQUEST': 'RemoveStyle', - 'LAYER': layer.name, - 'NAME': style_name - } - - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def style_set_default_url(layer, style_name, internal=True): - """Remove QGIS Server style from QGIS Project. - - :param layer: Layer to inspect - :type layer: Layer - - :param style_name: Style name as given by QGIS Server - :type style_name: str - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :return: QGIS Server request url - :rtype: str - """ - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - qgis_project_path = qgis_layer.qgis_project_path - - query_string = { - 'SERVICE': 'STYLEMANAGER', - 'PROJECT': qgis_project_path, - 'REQUEST': 'SetDefaultStyle', - 'LAYER': layer.name, - 'NAME': style_name - } - - qgis_server_url = qgis_server_endpoint(internal) - url = Request('GET', qgis_server_url, params=query_string).prepare().url - return url - - -def style_list(layer, internal=True, generating_qgis_capabilities=False): - """Query list of styles from QGIS Server. - - :param layer: Layer to inspect - :type layer: Layer - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - - :param generating_qgis_capabilities: internal Flag for the method to tell - that this function were executed to generate QGIS GetCapabilities - request for querying Style list. This flag is used for recursion. - Default to False as recursion base. - :type generating_qgis_capabilities: bool - - :return: List of QGISServerStyle - :rtype: list(QGISServerStyle) - """ - # We get the list of style from GetCapabilities request - # Must call from public URL because we need public LegendURL - url = wms_get_capabilities_url(layer, internal=internal) - try: - response = requests.get(url) - - root_xml = dlxml.fromstring(ensure_string(response.content)) - styles_xml = root_xml.xpath( - 'wms:Capability/wms:Layer/wms:Layer/wms:Style', - namespaces={ - 'xlink': 'http://www.w3.org/1999/xlink', - 'wms': 'http://www.opengis.net/wms' - }) - - # Fetch styles body - try: - qgis_layer = QGISServerLayer.objects.get(layer=layer) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - styles_obj = [ - QGISServerStyle.from_get_capabilities_style_xml( - qgis_layer, style_xml)[0] - for style_xml in styles_xml] - - # Only tried to generate/fix QGIS GetCapabilities to return correct style - # list, if: - # - the current request return empty styles_obj (no styles, not possible) - # - does not currently tried to generate QGIS GetCapabilities to fix this - # problem - if not styles_obj and not generating_qgis_capabilities: - # It's not possible to have empty style. There will always be default - # style. - # Initiate a dummy requests to trigger build style list on QGIS Server - # side - - # write an empty file if it doesn't exists - open(qgis_layer.qml_path, 'a').close() - - # Basically add a new style then deletes it to force QGIS to refresh - # style list in project properties. We don't care the request result. - dummy_style_name = '__tmp__dummy__name__' - style_url = style_add_url(layer, dummy_style_name) - requests.get(style_url) - style_url = style_remove_url(layer, dummy_style_name) - requests.get(style_url) - - # End the requests and rely on the next request to build style models - # to avoid infinite recursion - - # Set generating_qgis_capabilities flag to True to avoid next - # recursion - return style_list( - layer, internal=internal, generating_qgis_capabilities=True) - - # Manage orphaned styles - style_names = [s.name for s in styles_obj] - for style in qgis_layer.styles.all(): - if style.name not in style_names: - if style == qgis_layer.default_style: - qgis_layer.default_style = None - qgis_layer.save() - style.delete() - - # Set default style if not yet set - set_default_style = False - try: - if not qgis_layer.default_style: - set_default_style = True - except Exception: - set_default_style = True - - if set_default_style and styles_obj: - qgis_layer.default_style = styles_obj[0] - qgis_layer.save() - - return styles_obj - except Exception: - msg = 'No QGIS Style for existing layer {0}'.format(layer.name) - logger.debug(msg) - raise - - -def create_qgis_project( - layer, qgis_project_path, overwrite=False, internal=True): - """Create a new QGS Project for a given layer. - - :param layer: Layer or list of layers - :type layer: geonode.layers.models.Layer, - list(geonode.layers.models.Layer) - - :param qgis_project_path: Path to to create qgis project - :type qgis_project_path: str - - :param overwrite: Flag to recreate QGIS Project if necessary - :type overwrite: bool - - :param internal: Flag to switch between public url and internal url. - Public url will be served by Django Geonode (proxified). - :type internal: bool - """ - if isinstance(layer, Layer): - qgis_layer = QGISServerLayer.objects.get(layer=layer) - files = qgis_layer.base_layer_path - names = layer.name - logger.debug('File %s is exists: %s' % ( - files, str(os.path.exists(files)) - )) - elif isinstance(layer, list): - qgis_layer = [] - for lyr in layer: - qgis_layer.append(QGISServerLayer.objects.get(layer=lyr)) - files = [ql.base_layer_path for ql in qgis_layer] - - for fl in files: - logger.debug('File %s is exists: %s' % ( - fl, str(os.path.exists(fl)) - )) - - files = ';'.join(files) - - names = [lyr.name for lyr in layer] - names = ';'.join(names) - else: - raise ValueError( - 'Unexpected argument layer: {0}'.format(layer)) - - overwrite = str(overwrite).lower() - - query_string = { - 'SERVICE': 'MAPCOMPOSITION', - 'PROJECT': qgis_project_path, - 'FILES': files, - 'NAMES': names, - 'OVERWRITE': overwrite, - 'REMOVEQML': True - } - qgis_server_url = qgis_server_endpoint(internal) - response = requests.get(qgis_server_url, params=query_string) - return response - - -def delete_orphaned_qgis_server_layers(): - """Delete orphaned QGIS Server files.""" - layer_path = settings.QGIS_SERVER_CONFIG['layer_directory'] - if not os.path.exists(layer_path): - logger.warning("{path} not exists".format(path=layer_path)) - return - for filename in os.listdir(layer_path): - basename, __ = os.path.splitext(filename) - fn = os.path.join(layer_path, filename) - if QGISServerLayer.objects.filter( - base_layer_path__icontains=basename).count() == 0: - logger.warning("Removing orphan layer file {}".format(fn)) - try: - os.remove(fn) - except OSError: - logger.error("Could not delete file {}".format(fn)) - - -def delete_orphaned_qgis_server_caches(): - """Delete orphaned QGIS Server tile caches.""" - tiles_path = settings.QGIS_SERVER_CONFIG['tiles_directory'] - if not os.path.exists(tiles_path): - print("{path} not exists".format(path=tiles_path)) - return - for basename in os.listdir(tiles_path): - path = os.path.join(tiles_path, basename) - if QGISServerLayer.objects.filter( - base_layer_path__icontains=basename).count() == 0: - print("Removing orphan layer file {}".format(path)) - try: - shutil.rmtree(path) - except OSError: - logger.error("Could not delete file {}".format(path)) - - -def get_model_path(instance): - """Get a Django model instance's app label and name. - - :param instance: An instance of a Django model - :type instance: django.db.models.Model - """ - - model_type = ContentType.objects.get_for_model(instance) - return "{app_label}.{model_name}".format( - app_label=model_type.app_label, - model_name=model_type.model - ) diff --git a/geonode/qgis_server/management/__init__.py b/geonode/qgis_server/management/__init__.py deleted file mode 100644 index b0fb2f81c70..00000000000 --- a/geonode/qgis_server/management/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### diff --git a/geonode/qgis_server/management/commands/__init__.py b/geonode/qgis_server/management/commands/__init__.py deleted file mode 100644 index b0fb2f81c70..00000000000 --- a/geonode/qgis_server/management/commands/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### diff --git a/geonode/qgis_server/management/commands/delete_orphaned_qgis_server_layers.py b/geonode/qgis_server/management/commands/delete_orphaned_qgis_server_layers.py deleted file mode 100644 index f7932dfe22c..00000000000 --- a/geonode/qgis_server/management/commands/delete_orphaned_qgis_server_layers.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from django.core.management.base import BaseCommand - -from geonode.layers.utils import delete_orphaned_layers -from geonode.qgis_server.helpers import delete_orphaned_qgis_server_layers, \ - delete_orphaned_qgis_server_caches - - -class Command(BaseCommand): - help = ("Delete orphaned QGIS Server layers.") - - def handle(self, *args, **options): - delete_orphaned_layers() - delete_orphaned_qgis_server_layers() - delete_orphaned_qgis_server_caches() diff --git a/geonode/qgis_server/management/commands/import_qgis_styles.py b/geonode/qgis_server/management/commands/import_qgis_styles.py deleted file mode 100644 index a37a3ccec71..00000000000 --- a/geonode/qgis_server/management/commands/import_qgis_styles.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from django.core.management.base import BaseCommand -from geonode.layers.models import Layer -from geonode.qgis_server.helpers import style_list -import logging - - -logger = logging.getLogger(__name__) - - -class Command(BaseCommand): - help = ("Import QGIS Server styles associated with layers.") - - def handle(self, *args, **options): - layers = Layer.objects.all() - - for l in layers: - try: - l.qgis_layer - except Exception: - logger.warning("Layer {} has no associated qgis_layer".format(l.name)) - continue - - if l.qgis_layer: - print("Fetching styles for layer %s".format(l.name)) - - try: - styles = style_list(l, internal=False) - except Exception: - logger.warning("Failed to fetch styles") - continue - - print("Successfully fetch %d style(s)\n".format(len(styles))) diff --git a/geonode/qgis_server/middleware.py b/geonode/qgis_server/middleware.py deleted file mode 100644 index b586153682d..00000000000 --- a/geonode/qgis_server/middleware.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### -from django.utils.deprecation import MiddlewareMixin - - -class QGISServerLayerMiddleware(MiddlewareMixin): - - def __init__(self, get_response): - self.get_response = get_response - - def process_template_response(self, request, response): - """Middleware to add more context for QGIS Server backend app. - - :type request: django.http.request.HttpRequest - :type response: django.template.response.TemplateResponse - """ - - template_name = response.template_name - if template_name == 'layers/layer_detail.html': - self.layer_detail(request, response) - - return response - - def layer_detail(self, request, response): - """Provide more context for layer_detail view - - :type request: django.http.request.HttpRequest - :type response: django.template.response.TemplateResponse - """ - context = response.context_data - - if 'resource' in context: - # provides context for QML Style - layer = context['resource'] - """:type: geonode.layers.models.Layer""" - use_qml_style = layer.upload_session.layerfile_set.filter( - name='qml').count() > 0 - - context['use_qml_style'] = use_qml_style diff --git a/geonode/qgis_server/migrations/0001_initial.py b/geonode/qgis_server/migrations/0001_initial.py deleted file mode 100644 index ad5041fb6a8..00000000000 --- a/geonode/qgis_server/migrations/0001_initial.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('layers', '24_to_26'), - ] - - operations = [ - migrations.CreateModel( - name='QGISServerLayer', - fields=[ - ('layer', models.OneToOneField(primary_key=True, on_delete=models.CASCADE, serialize=False, to='layers.Layer')), - ('base_layer_path', models.CharField(help_text='Location of the base layer.', max_length=100, verbose_name='Base Layer Path')), - ], - ), - ] diff --git a/geonode/qgis_server/migrations/0002_qgisservermap.py b/geonode/qgis_server/migrations/0002_qgisservermap.py deleted file mode 100644 index 90c62cea02b..00000000000 --- a/geonode/qgis_server/migrations/0002_qgisservermap.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('maps', '24_initial'), - ('qgis_server', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='QGISServerMap', - fields=[ - ('map', models.OneToOneField(primary_key=True, on_delete=models.CASCADE, serialize=False, to='maps.Map')), - ], - ), - ] diff --git a/geonode/qgis_server/migrations/0003_auto_20170727_0509.py b/geonode/qgis_server/migrations/0003_auto_20170727_0509.py deleted file mode 100644 index d8f019d7f0c..00000000000 --- a/geonode/qgis_server/migrations/0003_auto_20170727_0509.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('qgis_server', '0002_qgisservermap'), - ] - - operations = [ - migrations.CreateModel( - name='QGISServerStyle', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=255, verbose_name='style name')), - ('title', models.CharField(max_length=255, null=True, blank=True)), - ('body', models.TextField(null=True, verbose_name='style xml', blank=True)), - ('style_url', models.CharField(max_length=1000, null=True, verbose_name='style url')), - ('style_legend_url', models.CharField(max_length=1000, null=True, verbose_name='style legend url')), - ], - ), - migrations.AddField( - model_name='qgisserverlayer', - name='default_style', - field=models.ForeignKey(related_name='layer_default_style', on_delete=models.SET_NULL, - default=None, to='qgis_server.QGISServerStyle', null=True), - ), - migrations.AddField( - model_name='qgisserverlayer', - name='styles', - field=models.ManyToManyField(related_name='layer_styles', to='qgis_server.QGISServerStyle'), - ), - ] diff --git a/geonode/qgis_server/migrations/0004_auto_20170805_0223.py b/geonode/qgis_server/migrations/0004_auto_20170805_0223.py deleted file mode 100644 index 2265231db5b..00000000000 --- a/geonode/qgis_server/migrations/0004_auto_20170805_0223.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('qgis_server', '0003_auto_20170727_0509'), - ] - - operations = [ - migrations.AlterField( - model_name='qgisserverlayer', - name='layer', - field=models.OneToOneField(related_name='qgis_layer', on_delete=models.CASCADE, - primary_key=True, serialize=False, to='layers.Layer'), - ), - migrations.AlterField( - model_name='qgisserverstyle', - name='name', - field=models.CharField(max_length=255, verbose_name='style name'), - ), - ] diff --git a/geonode/qgis_server/migrations/0005_auto_20170823_0341.py b/geonode/qgis_server/migrations/0005_auto_20170823_0341.py deleted file mode 100644 index 36f17431a8f..00000000000 --- a/geonode/qgis_server/migrations/0005_auto_20170823_0341.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('qgis_server', '0004_auto_20170805_0223'), - ] - - operations = [ - migrations.AlterField( - model_name='qgisserverlayer', - name='default_style', - field=models.ForeignKey(related_name='layer_default_style', on_delete=models.SET_NULL, - default=None, to='qgis_server.QGISServerStyle', null=True), - ), - ] diff --git a/geonode/qgis_server/migrations/0006_auto_20200321_1349.py b/geonode/qgis_server/migrations/0006_auto_20200321_1349.py deleted file mode 100644 index 9b05d419cf9..00000000000 --- a/geonode/qgis_server/migrations/0006_auto_20200321_1349.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.11 on 2020-03-21 13:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('qgis_server', '0005_auto_20170823_0341'), - ] - - operations = [ - migrations.AlterField( - model_name='qgisserverlayer', - name='base_layer_path', - field=models.CharField(help_text='Location of the base layer.', max_length=2000, verbose_name='Base Layer Path'), - ), - ] diff --git a/geonode/qgis_server/migrations/__init__.py b/geonode/qgis_server/migrations/__init__.py deleted file mode 100644 index 6b11a24a6e0..00000000000 --- a/geonode/qgis_server/migrations/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### diff --git a/geonode/qgis_server/models.py b/geonode/qgis_server/models.py deleted file mode 100644 index a325d348209..00000000000 --- a/geonode/qgis_server/models.py +++ /dev/null @@ -1,389 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -import logging -import os -from shutil import rmtree -from xml.etree import ElementTree - -import requests -from django.conf import settings -from django.db import models -from django.utils.translation import ugettext_lazy as _ -from geonode.security.models import PermissionLevelMixin -from lxml import etree -from defusedxml import lxml as dlxml -from six import string_types - -from geonode import qgis_server -from geonode.compat import ensure_string -from geonode.layers.models import Layer -from geonode.maps.models import Map -from geonode.utils import check_ogc_backend - -logger = logging.getLogger("geonode.qgis_server.models") - -if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - QGIS_LAYER_DIRECTORY = settings.QGIS_SERVER_CONFIG['layer_directory'] - QGIS_TILES_DIRECTORY = settings.QGIS_SERVER_CONFIG['tiles_directory'] - - if not os.path.exists(QGIS_LAYER_DIRECTORY): - os.mkdir(QGIS_LAYER_DIRECTORY) - - -class QGISServerLayer(models.Model, PermissionLevelMixin): - """Model for Layer in QGIS Server Backend. - """ - - accepted_format = [ - 'tif', 'tiff', 'asc', 'shp', 'shx', 'dbf', 'prj', 'qml', 'xml', 'qgs'] - - geotiff_format = ['tif', 'tiff'] - - ascii_format = ['asc'] - - layer = models.OneToOneField( - Layer, - primary_key=True, - related_name='qgis_layer', - on_delete=models.CASCADE - ) - base_layer_path = models.CharField( - name='base_layer_path', - verbose_name='Base Layer Path', - help_text='Location of the base layer.', - max_length=2000 - ) - - default_style = models.ForeignKey( - 'qgis_server.QGISServerStyle', - related_name='layer_default_style', - default=None, - null=True, - on_delete=models.SET_NULL) - styles = models.ManyToManyField( - 'qgis_server.QGISServerStyle', - related_name='layer_styles') - - @property - def files(self): - """Returned all files related with this layer. - - :return: List of related paths - :rtype: list(str) - """ - base_path = self.base_layer_path - base_name, __ = os.path.splitext(base_path) - extensions_list = list(QGISServerLayer.accepted_format) - - # QGIS can create a .aux.xml too - extensions_list += ['.aux.xml'] - found_files = [] - for ext in extensions_list: - file_path = '{base}.{ext}'.format( - base=base_name, - ext=ext) - if os.path.exists(file_path): - found_files.append(file_path) - return found_files - - @property - def qgis_layer_path_prefix(self): - """Returned QGIS layer path prefix. - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - Path prefix: /usr/src/geonode/geonode/qgis_layer/jakarta_flood - """ - prefix, __ = os.path.splitext(self.base_layer_path) - return prefix - - @property - def qgis_layer_name(self): - """Returned QGIS Layer name associated with this layer. - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - QGIS Layer name: jakarta_flood - """ - return os.path.basename(self.qgis_layer_path_prefix) - - @property - def qgis_project_path(self): - """Returned QGIS Project path related with this layer. - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - QGIS Project path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.qgs - """ - return '{prefix}.qgs'.format(prefix=self.qgis_layer_path_prefix) - - @property - def cache_path(self): - """Returned the location of tile cache for this layer. - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - QGIS cache path: /usr/src/geonode/geonode/qgis_tiles/jakarta_flood - - :return: Base path of layer cache - :rtype: str - """ - return os.path.join(QGIS_TILES_DIRECTORY, self.qgis_layer_name) - - @property - def qml_path(self): - """Returned the location of QML path for this layer (if any). - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - QGIS QML path: /usr/src/geonode/geonode/qgis_tiles/jakarta_flood.qml - - :return: Base path of qml style - :rtype: str - """ - return '{prefix}.qml'.format(prefix=self.qgis_layer_path_prefix) - - def delete_qgis_layer(self): - """Delete all files related to this object from disk.""" - for file_path in self.files: - try: - os.remove(file_path) - except OSError: - pass - - # Removing the cache. - path = self.cache_path - logger.debug('Removing the cache from a qgis layer : %s' % path) - try: - rmtree(path) - except OSError: - pass - - # Removing orphaned styles - for style in QGISServerStyle.objects.filter(layer_styles=None): - style.delete() - - def get_self_resource(self): - """Get associated resource base.""" - # Associate this model with resource - try: - return self.layer.get_self_resource() - except Exception: - return None - - class Meta: - app_label = "qgis_server" - - -class QGISServerStyle(models.Model, PermissionLevelMixin): - """Model wrapper for QGIS Server styles.""" - name = models.CharField(_('style name'), max_length=255) - title = models.CharField(max_length=255, null=True, blank=True) - body = models.TextField(_('style xml'), null=True, blank=True) - style_url = models.CharField(_('style url'), null=True, max_length=1000) - style_legend_url = models.CharField( - _('style legend url'), null=True, max_length=1000) - - @classmethod - def from_get_capabilities_style_xml( - cls, qgis_layer, style_xml, style_url=None, synchronize=True): - """Convert to this model from GetCapabilities Style tag. - - :param qgis_layer: Associated QGIS Server Layer - :type qgis_layer: QGISServerLayer - - :param style_xml: xml string or object - :type style_xml: str | lxml.etree.Element | - xml.etree.ElementTree.Element - - :param style_url: style information stored as xml - :type style_url: str - - :param synchronize: Flag, if true then synchronize the new value - :type synchronize: bool - - :return: QGISServerStyle model and boolean flag created - :rtype: QGISServerStyle, bool - """ - - if isinstance(style_xml, string_types): - style_xml = dlxml.fromstring(style_xml) - - elif isinstance(style_xml, ElementTree.Element): - style_xml = dlxml.fromstring( - ElementTree.tostring( - style_xml, encoding='utf-8', method='xml')) - - namespaces = { - 'wms': 'http://www.opengis.net/wms', - 'xlink': 'http://www.w3.org/1999/xlink' - } - - filter_dict = { - 'name': style_xml.xpath( - 'wms:Name', namespaces=namespaces)[0].text, - - 'layer_styles': qgis_layer - } - - # if style_body is none, try fetch it from QGIS Server - if not style_url: - from geonode.qgis_server.helpers import style_get_url - style_url = style_get_url( - qgis_layer.layer, filter_dict['name'], internal=False) - - response = requests.get(style_url) - style_body = etree.tostring( - dlxml.fromstring(ensure_string(response.content)), pretty_print=True) - - default_dict = { - 'title': style_xml.xpath( - 'wms:Title', namespaces=namespaces)[0].text, - - 'style_legend_url': style_xml.xpath( - 'wms:LegendURL/wms:OnlineResource', - namespaces=namespaces)[0].attrib[ - '{http://www.w3.org/1999/xlink}href'], - - 'style_url': style_url, - - 'body': style_body - } - - # filter_dict['defaults'] = default_dict - - # Can't use get_or_create function for some reason. - # So use regular query - - try: - style_obj = QGISServerStyle.objects.get(**filter_dict) - created = False - except QGISServerStyle.DoesNotExist: - style_obj = QGISServerStyle(**default_dict) - style_obj.name = filter_dict['name'] - style_obj.save() - created = True - - if created or synchronize: - # Try to synchronize this model with the given parameters - style_obj.name = filter_dict['name'] - - style_obj.style_url = default_dict['style_url'] - style_obj.body = default_dict['body'] - style_obj.title = default_dict['title'] - style_obj.style_legend_url = default_dict['style_legend_url'] - style_obj.save() - - style_obj.layer_styles.add(qgis_layer) - style_obj.save() - - return style_obj, created - - @property - def style_tile_cache_path(self): - """Returned the location of tile cache for this layer style. - - Example base path: /usr/src/geonode/geonode/qgis_layer/jakarta_flood.shp - - QGIS cache path: /usr/src/geonode/geonode/qgis_tiles/jakarta_flood/ - default_style - - :return: Base path of layer cache - :rtype: str - """ - return os.path.join( - QGIS_TILES_DIRECTORY, self.layer_styles.first().layer.name, self.name) - - def get_self_resource(self): - """Get associated resource base.""" - # Associate this model with resource - try: - qgis_layer = self.layer_styles.first() - """:type: QGISServerLayer""" - return qgis_layer.get_self_resource() - except Exception: - return None - - class Meta: - app_label = "qgis_server" - - -class QGISServerMap(models.Model, PermissionLevelMixin): - """Model wrapper for QGIS Server Map.""" - - map = models.OneToOneField( - Map, - primary_key=True, - name='map', - on_delete=models.CASCADE - ) - - map_name_format = 'map_{id}' - - @property - def qgis_map_name(self): - """Returned QGIS Map name associated with this layer. - - based on map_name_format - Example QGIS Map name: map_1 - """ - return self.map_name_format.format(id=self.map.id) - - @property - def qgis_map_path_prefix(self): - """Returned QGIS map path prefix. - - based on map_name_format - Path prefix: /usr/src/geonode/geonode/qgis_layer/map_1 - """ - return os.path.join(QGIS_LAYER_DIRECTORY, self.qgis_map_name) - - @property - def qgis_project_path(self): - """Returned QGIS Project path related with this map. - - based on map_name_format - QGIS Project path: /usr/src/geonode/geonode/qgis_layer/map_1.qgs - """ - return '{prefix}.qgs'.format(prefix=self.qgis_map_path_prefix) - - @property - def cache_path(self): - """Returned the location of tile cache for this layer. - - based on map_name_format - QGIS cache path: /usr/src/geonode/geonode/qgis_tiles/map_1 - - :return: Base path of layer cache - :rtype: str - """ - return os.path.join(QGIS_TILES_DIRECTORY, self.qgis_map_name) - - def get_self_resource(self): - """Get associated resource base.""" - # Associate this model with resource - try: - return self.layer.get_self_resource() - except Exception: - return None - - class Meta: - app_label = "qgis_server" diff --git a/geonode/qgis_server/signals.py b/geonode/qgis_server/signals.py deleted file mode 100644 index 7edf9b933ec..00000000000 --- a/geonode/qgis_server/signals.py +++ /dev/null @@ -1,421 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - - -import logging -import os -import shutil - -from osgeo import ogr, osr, gdal -from django.conf import settings -from django.contrib.gis.geos import Polygon -from django.urls import reverse -from django.db.models import signals -from django.dispatch import Signal -from requests.compat import urljoin - -from geonode import qgis_server -from geonode.base.models import Link -from geonode.layers.models import Layer -from geonode.compat import ensure_string -from geonode.maps.models import Map, MapLayer -from geonode.decorators import on_ogc_backend -from geonode.qgis_server.gis_tools import set_attributes -from geonode.qgis_server.helpers import create_qgis_project, get_model_path -from geonode.qgis_server.models import QGISServerLayer, QGISServerMap -from geonode.qgis_server.tasks.update import create_qgis_server_thumbnail -from geonode.qgis_server.xml_utilities import update_xml -from geonode.utils import check_ogc_backend, set_resource_default_links - -logger = logging.getLogger("geonode.qgis_server.signals") - -if check_ogc_backend(qgis_server.BACKEND_PACKAGE): - QGIS_layer_directory = settings.QGIS_SERVER_CONFIG['layer_directory'] - -qgis_map_with_layers = Signal(providing_args=[]) - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_layer_post_delete(instance, sender, **kwargs): - """Removes the layer from Local Storage.""" - logger.debug('QGIS Server Layer Post Delete') - instance.delete_qgis_layer() - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_pre_delete(instance, sender, **kwargs): - """Removes the layer from Local Storage.""" - # logger.debug('QGIS Server Pre Delete') - # Deleting QGISServerLayer object happened on geonode level since it's - # OneToOne relationship - # Delete file is included when deleting the object. - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_pre_save(instance, sender, **kwargs): - """Send information to QGIS Server. - - The attributes sent include: - - * Title - * Abstract - * Name - * Keywords - * Metadata Links, - * Point of Contact name and url - """ - # logger.debug('QGIS Server Pre Save') - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_post_save(instance, sender, **kwargs): - """Save keywords to QGIS Server. - - The way keywords are implemented requires the layer to be saved to the - database before accessing them. - - This hook also creates QGIS Project. Which is essentials for QGIS Server. - There are also several Geonode Links generated, like thumbnail and legends - - :param instance: geonode Layer - :type instance: Layer - - :param sender: geonode Layer type - :type sender: type(Layer) - """ - if not sender == Layer: - return - # TODO - # 1. Create or update associated QGISServerLayer [Done] - # 2. Create Link for the tile and legend. - logger.debug('QGIS Server Post Save') - - # copy layer to QGIS Layer Directory - try: - geonode_layer_path = instance.get_base_file()[0].file.path - except AttributeError: - logger.debug('Layer does not have base file') - return - - qgis_layer, created = QGISServerLayer.objects.get_or_create( - layer=instance) - logger.debug('Geonode Layer Path %s' % geonode_layer_path) - - base_filename, original_ext = os.path.splitext(geonode_layer_path) - extensions = QGISServerLayer.accepted_format - - is_shapefile = False - - for ext in extensions: - if os.path.exists(base_filename + '.' + ext): - is_shapefile = is_shapefile or ext == 'shp' - try: - if created: - # Assuming different layer has different filename because - # geonode rename it - shutil.copy2( - base_filename + '.' + ext, - QGIS_layer_directory - ) - logger.debug('Create new basefile') - else: - # If there is already a file, replace the old one - qgis_layer_base_filename = qgis_layer.qgis_layer_path_prefix - shutil.copy2( - base_filename + '.' + ext, - qgis_layer_base_filename + '.' + ext - ) - logger.debug('Overwrite existing basefile') - logger.debug( - 'Copying %s' % base_filename + '.' + ext + ' Success') - logger.debug('Into %s' % QGIS_layer_directory) - except IOError as e: - logger.debug( - 'Copying %s' % base_filename + '.' + ext + ' FAILED ' + e) - if created: - # Only set when creating new QGISServerLayer Object - geonode_filename = os.path.basename(geonode_layer_path) - basename = os.path.splitext(geonode_filename)[0] - qgis_layer.base_layer_path = os.path.join( - QGIS_layer_directory, - basename + original_ext # Already with dot - ) - qgis_layer.save() - - # refresh to get QGIS Layer - instance.refresh_from_db() - - # Set layer crs - try: - if is_shapefile: - dataset = ogr.Open(geonode_layer_path) - layer = dataset.GetLayer() - spatial_ref = layer.GetSpatialRef() - srid = spatial_ref.GetAuthorityCode(None) if spatial_ref else None - if srid: - instance.srid = srid - else: - dataset = gdal.Open(geonode_layer_path) - prj = dataset.GetProjection() - srs = osr.SpatialReference(wkt=prj) - srid = srs.GetAuthorityCode(None) if srs else None - if srid: - instance.srid = srid - except Exception as e: - logger.debug("Can't retrieve projection: {layer}".format( - layer=geonode_layer_path)) - logger.exception(e) - - # Refresh and create the instance default links - set_resource_default_links(instance, qgis_layer, is_shapefile=is_shapefile, original_ext=original_ext) - - # Create thumbnail - overwrite = getattr(instance, 'overwrite', False) - create_qgis_server_thumbnail.apply_async(( - get_model_path(instance), - instance.id, - overwrite - )) - - # Attributes - set_attributes(instance) - - # Update xml file - - # Read metadata from layer that InaSAFE use. - # Some are not found: organisation, email, url - try: - new_values = { - 'date': instance.date.isoformat(), - 'abstract': instance.abstract, - 'title': instance.title, - 'license': instance.license_verbose, - } - except (TypeError, AttributeError): - new_values = {} - - # Get the path of the metadata file - basename, _ = os.path.splitext(qgis_layer.base_layer_path) - xml_file_path = basename + '.xml' - if os.path.exists(xml_file_path): - try: - update_xml(xml_file_path, new_values) - except (TypeError, AttributeError): - pass - - # Also update xml in QGIS Server - xml_file_path = qgis_layer.qgis_layer_path_prefix + '.xml' - if os.path.exists(xml_file_path): - try: - update_xml(xml_file_path, new_values) - except (TypeError, AttributeError): - pass - - # Remove existing tile caches if overwrite - if overwrite: - tiles_directory = settings.QGIS_SERVER_CONFIG['tiles_directory'] - basename, _ = os.path.splitext(qgis_layer.base_layer_path) - basename = os.path.basename(basename) - tiles_cache_path = os.path.join(tiles_directory, basename) - try: - shutil.rmtree(tiles_cache_path) - except OSError: - # The path doesn't exists yet - pass - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_pre_save_maplayer(instance, sender, **kwargs): - logger.debug('QGIS Server Pre Save Map Layer %s' % instance.name) - try: - layer = Layer.objects.get(alternate=instance.name) - if layer: - instance.local = True - except Layer.DoesNotExist: - pass - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def qgis_server_post_save_map(instance, sender, **kwargs): - """Post Save Map Hook for QGIS Server - - This hook will creates QGIS Project for a given map. - This hook also generates thumbnail link. - """ - logger.debug('QGIS Server Post Save Map custom') - map_id = instance.id - map_layers = MapLayer.objects.filter(map__id=map_id) - - # Geonode map supports local layers and remote layers - # Remote layers were provided from other OGC services, so we don't - # deal with it at the moment. - local_layers = [_l for _l in map_layers if _l.local] - - layers = [] - for layer in local_layers: - try: - _l = Layer.objects.get(alternate=layer.name) - if not _l.qgis_layer: - raise QGISServerLayer.DoesNotExist - layers.append(_l) - except Layer.DoesNotExist: - msg = 'No Layer found for typename: {0}'.format(layer.name) - logger.debug(msg) - except QGISServerLayer.DoesNotExist: - msg = 'No QGIS Server Layer found for typename: {0}'.format( - layer.name) - logger.debug(msg) - - if not layers: - # The signal is called too early, or the map has no layer yet. - return - - base_url = settings.SITEURL - # download map - map_download_url = urljoin( - base_url, - reverse( - 'map_download', - kwargs={'mapid': instance.id})) - logger.debug('map_download_url: %s' % map_download_url) - link_name = 'Download Data Layers' - Link.objects.update_or_create( - resource=instance.resourcebase_ptr, - name=link_name, - defaults=dict( - extension='html', - mime='text/html', - url=map_download_url, - link_type='data' - ) - ) - # WMC map layer workspace - ogc_wmc_url = urljoin( - base_url, - reverse( - 'map_wmc', - kwargs={'mapid': instance.id})) - logger.debug('wmc_download_url: %s' % ogc_wmc_url) - link_name = 'Download Web Map Context' - link_mime = 'application/xml' - Link.objects.update_or_create( - resource=instance.resourcebase_ptr, - name=link_name, - defaults=dict( - extension='wmc.xml', - mime=link_mime, - url=ogc_wmc_url, - link_type='data' - ) - ) - - # QLR map layer workspace - ogc_qlr_url = urljoin( - base_url, - reverse( - 'map_download_qlr', - kwargs={'mapid': instance.id})) - logger.debug('qlr_map_download_url: %s' % ogc_qlr_url) - link_name = 'Download QLR Layer file' - link_mime = 'application/xml' - Link.objects.update_or_create( - resource=instance.resourcebase_ptr, - name=link_name, - defaults=dict( - extension='qlr', - mime=link_mime, - url=ogc_qlr_url, - link_type='data' - ) - ) - - # Set default bounding box based on all layers extents. - # bbox format [xmin, xmax, ymin, ymax] - bbox = instance.get_bbox_from_layers(instance.local_layers) - instance.set_bounds_from_bbox(bbox, instance.srid) - Map.objects.filter(id=map_id).update( - bbox_polygon=Polygon.from_bbox(( - instance.bbox_x0, - instance.bbox_x1, - instance.bbox_y0, - instance.bbox_y1 - )), - srid=instance.srid, - zoom=instance.zoom, - center_x=instance.center_x, - center_y=instance.center_y) - - # Check overwrite flag - overwrite = getattr(instance, 'overwrite', False) - - # Create the QGIS Project - qgis_map, created = QGISServerMap.objects.get_or_create(map=instance) - - # if it is newly created qgis_map, we should overwrite if existing files - # exists. - overwrite = created or overwrite - response = create_qgis_project( - layer=layers, - qgis_project_path=qgis_map.qgis_project_path, - overwrite=overwrite, - internal=True) - - logger.debug('Create project url: {url}'.format(url=response.url)) - logger.debug( - 'Creating the QGIS Project : %s -> %s' % ( - qgis_map.qgis_project_path, ensure_string(response.content))) - - # Generate map thumbnail - create_qgis_server_thumbnail.apply_async(( - get_model_path(instance), - instance.id, - True - )) - - -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def register_qgis_server_signals(): - """Helper function to register model signals.""" - # Do it only if qgis_server is being used - logger.debug('Registering signals QGIS Server') - signals.pre_save.connect( - qgis_server_pre_save, - dispatch_uid='Layer-qgis_server_pre_save', - sender=Layer) - signals.pre_delete.connect( - qgis_server_pre_delete, - dispatch_uid='Layer-qgis_server_pre_delete', - sender=Layer) - signals.post_save.connect( - qgis_server_post_save, - dispatch_uid='Layer-qgis_server_post_save', - sender=Layer) - signals.pre_save.connect( - qgis_server_pre_save_maplayer, - dispatch_uid='MapLayer-qgis_server_pre_save_maplayer', - sender=MapLayer) - signals.post_save.connect( - qgis_server_post_save_map, - dispatch_uid='Map-qgis_server_post_save_map', - sender=Map) - signals.post_delete.connect( - qgis_server_layer_post_delete, - dispatch_uid='QGISServerLayer-qgis_server_layer_post_delete', - sender=QGISServerLayer) diff --git a/geonode/qgis_server/tasks/__init__.py b/geonode/qgis_server/tasks/__init__.py deleted file mode 100644 index b0fb2f81c70..00000000000 --- a/geonode/qgis_server/tasks/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### diff --git a/geonode/qgis_server/tasks/update.py b/geonode/qgis_server/tasks/update.py deleted file mode 100644 index c48c267a2b5..00000000000 --- a/geonode/qgis_server/tasks/update.py +++ /dev/null @@ -1,161 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -import logging -import shutil -import socket - -import requests -from django.apps import apps -from geonode.celery_app import app -from requests.exceptions import HTTPError - - -from geonode.layers.models import Layer -from geonode.layers.utils import create_thumbnail -from geonode.maps.models import Map -from geonode.qgis_server.helpers import map_thumbnail_url, layer_thumbnail_url -from geonode.qgis_server.models import QGISServerLayer - -from geonode import qgis_server -from geonode.compat import ensure_string -from geonode.decorators import on_ogc_backend - -logger = logging.getLogger(__name__) - - -@app.task( - name='geonode.qgis_server.tasks.update.create_qgis_server_thumbnail', - queue='update', - autoretry_for=(QGISServerLayer.DoesNotExist, ), - retry_kwargs={'max_retries': 5, 'countdown': 5}) -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def create_qgis_server_thumbnail(model_path, object_id, overwrite=False, bbox=None): - """Task to update thumbnails. - - This task will formulate OGC url to generate thumbnail and then pass it - to geonode - - :param instance: Resource instance, can be a layer or map - :type instance: Layer, Map - - :param overwrite: set True to overwrite - :type overwrite: bool - - :param bbox: Bounding box of thumbnail in 4 tuple format - [xmin,ymin,xmax,ymax] - :type bbox: list(float) - - :return: - """ - thumbnail_remote_url = None - instance = apps.get_model(model_path).objects.get(id=object_id) - try: - # to make sure it is executed after the instance saved - if isinstance(instance, Layer): - thumbnail_remote_url = layer_thumbnail_url( - instance, bbox=bbox, internal=False) - elif isinstance(instance, Map): - thumbnail_remote_url = map_thumbnail_url( - instance, bbox=bbox, internal=False) - else: - # instance type does not have associated thumbnail - return True - if not thumbnail_remote_url: - return True - logger.debug('Create thumbnail for %s' % thumbnail_remote_url) - - if overwrite: - # if overwrite, then delete existing thumbnail links - instance.link_set.filter( - resource=instance.get_self_resource(), - name="Remote Thumbnail").delete() - instance.link_set.filter( - resource=instance.get_self_resource(), - name="Thumbnail").delete() - - create_thumbnail( - instance, thumbnail_remote_url, - overwrite=overwrite, check_bbox=False) - return True - # if it is socket exception, we should raise it, because there is - # something wrong with the url - except socket.error as e: - logger.error('Thumbnail url not accessed {url}'.format( - url=thumbnail_remote_url)) - logger.exception(e) - # reraise exception with original traceback - raise - except QGISServerLayer.DoesNotExist as e: - logger.exception(e) - # reraise exception with original traceback - raise - except Exception as e: - logger.exception(e) - return False - - -@app.task( - name='geonode.qgis_server.tasks.update.cache_request', - queue='update') -@on_ogc_backend(qgis_server.BACKEND_PACKAGE) -def cache_request(self, url, cache_file): - """Cache a given url request to a file. - - On some rare occasions, QGIS Server url request is taking too long to - complete. This could be a problem if user is requesting something like - a tile or legend from Web interface and when it takes too long, the - connection will reset. This case will make the request never be completed - because the request died with user connection. - - For this kind of request, it is better to register the request as celery - task. This will make the task to keep running, even if connection is - reset. - - :param url: The target url to request - :type url: str - - :param cache_file: The target file path to save the cache - :type cache_file: str - - :return: True if succeeded - :rtype: bool - """ - logger.debug('Requesting url: {url}'.format(url=url)) - response = requests.get(url, stream=True) - - if not response.status_code == 200: - # Failed to fetch request. Abort with error message - msg = ( - 'Failed to fetch requested url: {url}\n' - 'With HTTP status code: {status_code}\n' - 'Content: {content}') - msg = msg.format( - url=url, - status_code=response.status_code, - content=ensure_string(response.content)) - raise HTTPError(msg) - - with open(cache_file, 'wb') as out_file: - shutil.copyfileobj(response.raw, out_file) - - del response - - return True diff --git a/geonode/qgis_server/templates/qgis_server/base.html b/geonode/qgis_server/templates/qgis_server/base.html deleted file mode 100644 index 09d26f38bf0..00000000000 --- a/geonode/qgis_server/templates/qgis_server/base.html +++ /dev/null @@ -1,21 +0,0 @@ - -{% comment %} -As the developer of this package, don't place anything here if you can help it -since this allows developers to have interoperability between your template -structure and their own. - -Example: Developer melding the 2SoD pattern to fit inside with another pattern:: - - {% extends "base.html" %} - {% load static %} - - - {% block extra_js %} - - - {% block javascript %} - - {% endblock javascript %} - - {% endblock extra_js %} -{% endcomment %} diff --git a/geonode/qgis_server/templates/qgis_server/forms/qml_style.html b/geonode/qgis_server/templates/qgis_server/forms/qml_style.html deleted file mode 100644 index 3c1790486c7..00000000000 --- a/geonode/qgis_server/templates/qgis_server/forms/qml_style.html +++ /dev/null @@ -1,88 +0,0 @@ - -{% load i18n %} -{% load bootstrap_tags %} - -{% if page_reload %} - -

      -{% trans "Layer Style changed. Redirecting to apply changes..." %} -

      -

      -{% trans "You may also use browser reload." %} -

      -{% else %} - - - - - - - - - - {% for style in resource.qgis_layer.styles.all %} - - - - - - {% endfor %} - -
      {% trans "Name" %}{% trans "Title" %}{% trans "Action" %}
      - {{ style.name|safe }} - {% if resource.qgis_layer.default_style.name == style.name %} - {% trans "(default style)" %} - {% endif %} - {{ style.title|safe }} - {% if resource.qgis_layer.default_style.name != style.name %} - - {% endif %} - {% trans "Download Style" %} - -
      - {% if alert %} -
      - {{ alert_message }} - {% if alert_class == 'alert-success' %} -
      - {% trans "Reload to see changes" %} - {% endif %} -
      - {% endif %} -
      -
      - {% csrf_token %} - {{ style_upload_form|as_bootstrap }} - -
      -
      - -{% endif %} diff --git a/geonode/qgis_server/tests/__init__.py b/geonode/qgis_server/tests/__init__.py deleted file mode 100644 index b0fb2f81c70..00000000000 --- a/geonode/qgis_server/tests/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### diff --git a/geonode/qgis_server/tests/data/test.xml b/geonode/qgis_server/tests/data/test.xml deleted file mode 100644 index d83e9311daf..00000000000 --- a/geonode/qgis_server/tests/data/test.xml +++ /dev/null @@ -1,332 +0,0 @@ - - - - None - - - eng - - - utf8 - - - dataset - - - - - - - - - - - - - - - - - - - pointOfContact - - - - - - - - ISO 19115:2003 - Geographic information - Metadata - - - ISO 19115:2003 - - - - - - - Buildings - - - - - - - - publication - - - - - - - - - - revision - - - - - - - - - - creation - - - - - - - None - - - - - - - - - - - - - revision - - - - - - - - - - - - - - - - - - - pointOfContact - - - - - - - continual - - - - - - - Human health and safety - - - theme - - - - - GEMET - INSPIRE themes, version 1.0 - - - - - 2008-06-01 - - - publication - - - - - - - - - - - Open Data Commons Open Database License (ODbL) - - - - - eng - - - geoscientificInformation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - polygon - - - - - - - - - structure - - - - - - 3.5 - - - - - - {"government": ["Government"], "residential": ["Residential"], "commercial": ["Commercial"], "health": ["Clinic/Doctor"], "education": ["School"], "place of worship": ["Place of Worship - Islam"]} - - - TYPE - - - - - - OpenStreetMap - www.openstreetmap.org - - - exposure - - - - - - classified - - - - - - - - - - - - - - unknown - - - unknown - - - - - - - - - - - - - - - - - - - - - - dataset - - - - - - - - - - - - - - - - - - - creation - - - - - - - See the referenced specification - - - true - - - - - - - - - - - - - - - - - - continual - - - This record was generated by InaSAFE (http://inasafe.org) - - - - diff --git a/geonode/qgis_server/tests/data/test_grid.qml b/geonode/qgis_server/tests/data/test_grid.qml deleted file mode 100644 index 217a5921214..00000000000 --- a/geonode/qgis_server/tests/data/test_grid.qml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - --9999 --236.1545301164897 -StretchToMinimumMaximum - - - - - - -0 - diff --git a/geonode/qgis_server/tests/test_helpers.py b/geonode/qgis_server/tests/test_helpers.py deleted file mode 100644 index cde5f15ac18..00000000000 --- a/geonode/qgis_server/tests/test_helpers.py +++ /dev/null @@ -1,308 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from geonode.tests.base import GeoNodeBaseTestSupport - -import os -from urllib.parse import urlparse, parse_qs -import unittest -from imghdr import what - -from geonode.qgis_server.models import QGISServerLayer -from lxml import etree -from defusedxml import lxml as dlxml - -import gisdata -import shutil - -import requests -from django.conf import settings -from django.core.management import call_command -from django.core.files.storage import default_storage as storage -from django.urls import reverse - -from geonode import qgis_server -from geonode.base.models import Region -from geonode.compat import ensure_string -from geonode.decorators import on_ogc_backend -from geonode.layers.utils import file_upload -from geonode.qgis_server.helpers import get_model_path, \ - validate_django_settings, transform_layer_bbox, \ - qgis_server_endpoint, tile_url_format, tile_url, \ - style_get_url, style_add_url, style_list, style_set_default_url, \ - style_remove_url - - -class HelperTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_validate_settings(self): - """Test settings validation""" - self.assertTrue(validate_django_settings()) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_transform_layer_bbox(self): - """Test bbox CRS conversion""" - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - uploaded = file_upload(filename) - - new_bbox = transform_layer_bbox(uploaded, 3857) - - expected_bbox = [ - 10793092.549352637, -615294.6893182159, - 10810202.947307253, -591232.8900397272] - - self.assertEqual(new_bbox, expected_bbox) - - new_bbox = transform_layer_bbox(uploaded, 4326) - - expected_bbox = [ - 96.956, -5.5187329999999, - 97.10970532, -5.3035455519999] - - self.assertEqual(new_bbox, expected_bbox) - - uploaded.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_qgis_server_endpoint(self): - """Test QGIS Server endpoint url.""" - - # Internal url should go to http://qgis-server (docker container - self.assertEqual( - settings.QGIS_SERVER_URL, qgis_server_endpoint(internal=True)) - # Public url should go to proxy url - parse_result = urlparse(qgis_server_endpoint(internal=False)) - self.assertEqual(parse_result.path, reverse('qgis_server:request')) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_tile_url(self): - """Test to return tile format.""" - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - uploaded = file_upload(filename) - - tile_format = tile_url_format(uploaded.name) - - # Accessing this directly should return 404 - response = self.client.get(tile_format) - self.assertEqual(response.status_code, 404) - - qgis_tile_url = tile_url(uploaded, 11, 1576, 1054, internal=True) - - parse_result = urlparse(qgis_tile_url) - - base_net_loc = urlparse(settings.QGIS_SERVER_URL).netloc - - self.assertEqual(base_net_loc, parse_result.netloc) - - query_string = parse_qs(parse_result.query) - - expected_query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetMap', - 'BBOX': '10801469.341,-606604.256471,10821037.2203,-587036.37723', - 'CRS': 'EPSG:3857', - 'WIDTH': '256', - 'HEIGHT': '256', - 'LAYERS': 'test_grid', - 'STYLE': 'default', - 'FORMAT': 'image/png', - 'TRANSPARENT': 'true', - 'DPI': '96', - 'MAP_RESOLUTION': '96', - 'FORMAT_OPTIONS': 'dpi:96' - } - for key, value in expected_query_string.items(): - # urlparse.parse_qs returned a dictionary of list - actual_value = query_string[key][0] - self.assertEqual(actual_value, value) - - # Check that qgis server returns valid url - # Use python requests because the endpoint is not django - response = requests.get(qgis_tile_url) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.headers.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - uploaded.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_style_management_url(self): - """Test QGIS Server style management url construction.""" - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - uploaded = file_upload(filename) - - # Get default style - # There will always be a default style when uploading a layer - style_url = style_get_url(uploaded, 'default', internal=True) - - response = requests.get(style_url) - - self.assertEqual(response.status_code, 200) - self.assertEqual(response.headers.get('Content-Type'), 'text/xml') - - # it has to contains qgis tags - style_xml = dlxml.fromstring(ensure_string(response.content)) - self.assertTrue('qgis' in style_xml.tag) - - # Add new style - # change default style slightly - self.assertTrue('WhiteToBlack' not in ensure_string(response.content)) - self.assertTrue('BlackToWhite' in ensure_string(response.content)) - new_style_xml = dlxml.fromstring( - ensure_string(response.content).replace('BlackToWhite', 'WhiteToBlack')) - new_xml_content = etree.tostring(new_style_xml, pretty_print=True) - - # save it to qml file, accessible by qgis server - qgis_layer = QGISServerLayer.objects.get(layer=uploaded) - with open(qgis_layer.qml_path, mode='w') as f: - f.write(new_xml_content) - - style_url = style_add_url(uploaded, 'new_style', internal=True) - - response = requests.get(style_url) - - self.assertEqual(response.status_code, 200) - self.assertEqual(ensure_string(response.content), 'OK') - - # Get style list - qml_styles = style_list(uploaded, internal=False) - if qml_styles: - expected_style_names = ['default', 'new_style'] - actual_style_names = [s.name for s in qml_styles] - self.assertEqual( - set(expected_style_names), - set(actual_style_names)) - - # Get new style - style_url = style_get_url(uploaded, 'new_style', internal=True) - - response = requests.get(style_url) - - self.assertEqual(response.status_code, 200) - self.assertEqual(response.headers.get('Content-Type'), 'text/xml') - self.assertTrue('WhiteToBlack' in ensure_string(response.content)) - - # Set default style - style_url = style_set_default_url( - uploaded, 'new_style', internal=True) - - response = requests.get(style_url) - - self.assertEqual(response.status_code, 200) - self.assertEqual(ensure_string(response.content), 'OK') - - # Remove style - style_url = style_remove_url(uploaded, 'new_style', internal=True) - - response = requests.get(style_url) - - self.assertEqual(response.status_code, 200) - self.assertEqual(ensure_string(response.content), 'OK') - - # Cleanup - uploaded.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - @unittest.skipIf( - not os.environ.get('ON_TRAVIS', False), - 'Only run this on Travis') - def test_delete_orphan(self): - """Test orphan deletions. - - This test only started in travis to avoid accidentally deleting owners - data. - """ - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - uploaded = file_upload(filename) - - # Clean up first - call_command('delete_orphaned_qgis_server_layers') - - # make request to generate tile cache - response = self.client.get( - reverse('qgis_server:tile', kwargs={ - 'z': '11', - 'x': '1576', - 'y': '1054', - 'layername': uploaded.name - })) - self.assertEqual(response.status_code, 200) - - # register file list - layer_path = settings.QGIS_SERVER_CONFIG['layer_directory'] - tiles_path = settings.QGIS_SERVER_CONFIG['tiles_directory'] - - # Use sets to perform difference operation later - qgis_layers = set(os.listdir(layer_path)) - tile_caches = set(os.listdir(tiles_path)) - # storage.listdir returns a (directories, files) tuple - geonode_layers = set(storage.listdir("layers")[1]) - - # run management command. should not change anything - call_command('delete_orphaned_qgis_server_layers') - - actual_qgis_layers = set(os.listdir(layer_path)) - actual_tile_caches = set(os.listdir(tiles_path)) - actual_geonode_layers = set(storage.listdir("layers")[1]) - - self.assertEqual(qgis_layers, actual_qgis_layers) - self.assertEqual(tile_caches, actual_tile_caches) - self.assertEqual(geonode_layers, actual_geonode_layers) - - # now create random file without reference - shutil.copy( - os.path.join(layer_path, 'test_grid.tif'), - os.path.join(layer_path, 'test_grid_copy.tif')) - shutil.copytree( - os.path.join(tiles_path, 'test_grid'), - os.path.join(tiles_path, 'test_grid_copy')) - with storage.open(os.path.join("layers", "test_grid.tif"), 'rb') as f: - storage.save(os.path.join("layers", "test_grid_copy.tif"), f) - - actual_qgis_layers = set(os.listdir(layer_path)) - actual_tile_caches = set(os.listdir(tiles_path)) - actual_geonode_layers = set(storage.listdir("layers")[1]) - - # run management command. This should clear the files. But preserve - # registered files (the one that is saved in database) - call_command('delete_orphaned_qgis_server_layers') - - self.assertEqual( - {'test_grid_copy.tif'}, - actual_qgis_layers - qgis_layers) - self.assertEqual( - {'test_grid_copy'}, - actual_tile_caches - tile_caches) - self.assertEqual( - {'test_grid_copy.tif'}, - actual_geonode_layers - geonode_layers) - - # cleanup - uploaded.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_get_model_path(self): - region = Region.objects.first() - model_path = get_model_path(region) - self.assertEqual(model_path, 'base.region') diff --git a/geonode/qgis_server/tests/test_management.py b/geonode/qgis_server/tests/test_management.py deleted file mode 100644 index 73f7d1fc7ee..00000000000 --- a/geonode/qgis_server/tests/test_management.py +++ /dev/null @@ -1,181 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from geonode.tests.base import GeoNodeBaseTestSupport - -import os -from urllib.parse import unquote -from imghdr import what - -import gisdata -from django.core.management import call_command -from geonode import qgis_server -from geonode.qgis_server.models import QGISServerLayer, QGISServerStyle -from geonode.decorators import on_ogc_backend - -from geonode.layers.models import Layer - - -class TestManagementCommands(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_import_layers(self): - """Importlayers management command should properly overwrite.""" - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - call_command('importlayers', filename, overwrite=True) - - # Check that layer is created - self.assertEqual(Layer.objects.count(), 1) - layer = Layer.objects.first() - self.assertEqual( - layer.name, 'san_andres_y_providencia_administrative') - - # Check that QGIS Project is created - qgis_layer = QGISServerLayer.objects.get(layer=layer) - qgs_path = qgis_layer.qgis_project_path - self.assertTrue(os.path.exists(qgs_path)) - qgis_project_modified_time = os.path.getmtime(qgs_path) - - # Save all modified time of files - modified_time = {} - for f in qgis_layer.files: - modified_time[f] = os.path.getmtime(f) - layer_modified_time = {} - for f in layer.upload_session.layerfile_set.all(): - layer_modified_time[f.file.path] = os.path.getmtime( - f.file.path) - - # Check that no cache is generated yet - self.assertFalse(os.path.exists(qgis_layer.cache_path)) - - # Check that tiles link is created - tiles_link = layer.link_set.get(name='Tiles') - """:type: geonode.base.models.Link""" - self.assertEqual(tiles_link.extension, 'tiles') - tiles_url = unquote(tiles_link.url) - tiles = { - 'z': 7, - 'x': 34, - 'y': 59 - } - - # Try request a tile so a cache is generated - self.client.login(username='admin', password='admin') - self.client.get(tiles_url.format(**tiles)) - - # Check tiles cache generated - self.assertTrue(os.path.exists(qgis_layer.cache_path)) - tiles_png = os.path.join( - qgis_layer.cache_path, 'default', str(tiles['z']), str(tiles['x']), - str(tiles['y']) + '.png') - self.assertTrue(os.path.exists(tiles_png)) - self.assertEqual(what(tiles_png), 'png') - - # Now, re-import the same file - call_command('importlayers', filename, overwrite=True) - - # Check that it is still registered as the same layer - self.assertEqual(Layer.objects.count(), 1) - layer = Layer.objects.first() - self.assertEqual( - layer.name, 'san_andres_y_providencia_administrative') - - # Check that QGIS Project is created and new - qgis_layer = QGISServerLayer.objects.get(layer=layer) - qgs_path = qgis_layer.qgis_project_path - self.assertTrue(os.path.exists(qgs_path)) - self.assertNotEqual( - qgis_project_modified_time, os.path.getmtime(qgs_path)) - - # Compare modified time and it should be different - for f in qgis_layer.files: - # for qgis_layer the filename will be the same (overwritten) - self.assertNotEqual(modified_time[f], os.path.getmtime(f)) - for f in layer.upload_session.layerfile_set.all(): - # for geonode layers, filename might not be the same, so compare - # extension instead - filepath = f.file.path - __, extension = os.path.splitext(filepath) - old_mtime = [ - v for k, v in layer_modified_time.items() - if k.endswith(extension)][0] - self.assertNotEqual(old_mtime, os.path.getmtime(filepath)) - - # New geonode layers might not be the same name, but in that case - # previous files should not exists - for f in layer.upload_session.layerfile_set.all(): - filepath = f.file.path - if filepath not in layer_modified_time.keys(): - __, extension = os.path.splitext(filepath) - old_filepath = [ - k for k in layer_modified_time.keys() - if k.endswith(extension)][0] - self.assertFalse(os.path.exists(old_filepath)) - - # Tile caches should be deleted - self.assertFalse(os.path.exists(qgis_layer.cache_path)) - - # Cleanup - layer.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_import_qgis_styles(self): - """import_qgis_styles management commands should run properly.""" - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - call_command('importlayers', filename, overwrite=True) - - # Check layer have default style after importing - layer = Layer.objects.get( - name='san_andres_y_providencia_administrative') - - qgis_layer = layer.qgis_layer - self.assertTrue(qgis_layer.default_style) - - self.assertTrue(QGISServerStyle.objects.count() == 1) - - # Delete styles - qgis_layer.default_style.delete() - - self.assertTrue(QGISServerStyle.objects.count() == 0) - - qgis_layer.refresh_from_db() - - self.assertFalse(qgis_layer.default_style) - - # Import styles - - call_command('import_qgis_styles') - - layer.refresh_from_db() - qgis_layer = layer.qgis_layer - qgis_layer.refresh_from_db() - - self.assertTrue(qgis_layer.default_style) - - self.assertTrue(QGISServerStyle.objects.count() == 1) - - # Cleanup - layer.delete() diff --git a/geonode/qgis_server/tests/test_qgis_settings.py b/geonode/qgis_server/tests/test_qgis_settings.py deleted file mode 100644 index 1180e9b780d..00000000000 --- a/geonode/qgis_server/tests/test_qgis_settings.py +++ /dev/null @@ -1,73 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from geonode.tests.base import GeoNodeBaseTestSupport - -import requests -from django.test import LiveServerTestCase -from django.conf import settings -from geonode.decorators import on_ogc_backend -from geonode import qgis_server -from geonode.qgis_server.helpers import validate_django_settings -from geonode.qgis_server.helpers import ogc_server_settings - - -class QGISSettingsTest(GeoNodeBaseTestSupport): - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_settings(self): - """Check that applied settings configured correctly.""" - self.assertTrue(validate_django_settings()) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_qgis_server_connection(self): - """Test that QGIS Server url is reachable.""" - qgis_server_url = settings.QGIS_SERVER_URL - response = requests.get(qgis_server_url) - message = 'Cannot reach QGIS Server url at {url}' - message = message.format(url=qgis_server_url) - self.assertTrue(response.ok, message) - self.assertIn( - 'Service unknown or unsupported', response.content, message) - - # Test if OTF-Plugin is installed - url = qgis_server_url + '?SERVICE=MAPCOMPOSITION' - response = requests.get(url) - message = 'OTF-Project is not installed on QGIS-Server {url}' - message = message.format(url=url) - self.assertTrue(response.ok, message) - self.assertIn( - 'PROJECT parameter is missing.', response.content, message) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_siteurl_connection(self): - """Test that SITEURL is properly configured and reachable.""" - siteurl = settings.SITEURL - response = self.client.get(siteurl) - message = 'SITEURL were not properly configured: {url}' - message = message.format(url=siteurl) - - self.assertEqual(response.status_code, 200, message) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_ogc_server_wrapper(self): - """Test that OGC_Server settings were properly wrapped.""" - self.assertTrue(ogc_server_settings.PUBLIC_LOCATION) - self.assertTrue(ogc_server_settings.LOCATION) diff --git a/geonode/qgis_server/tests/test_views.py b/geonode/qgis_server/tests/test_views.py deleted file mode 100644 index 28b8cc1bb7d..00000000000 --- a/geonode/qgis_server/tests/test_views.py +++ /dev/null @@ -1,750 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from geonode.tests.base import GeoNodeBaseTestSupport - -import io -import json -import os -from urllib.parse import urlsplit, urlunsplit -import zipfile -from imghdr import what - -import requests -from defusedxml import lxml as dlxml - -import gisdata -from django.conf import settings -from django.contrib.staticfiles.templatetags import staticfiles -from django.core.files.storage import default_storage as storage -from django.urls import reverse - -from geonode import qgis_server -from geonode.compat import ensure_string -from geonode.base.thumb_utils import thumb_path -from geonode.decorators import on_ogc_backend -from geonode.layers.utils import file_upload -from geonode.maps.models import Map -from geonode.qgis_server.helpers import wms_get_capabilities_url, style_list - - -class DefaultViewsTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_default_context(self): - """Test default context provided by qgis_server.""" - - response = self.client.get('/') - - context = response.context - - # Necessary context to ensure compatibility with views - # Some view needs these context to do some javascript logic. - self.assertIn('UPLOADER_URL', context) - self.assertIn('MAPFISH_PRINT_ENABLED', context) - self.assertIn('PRINT_NG_ENABLED', context) - self.assertIn('GEONODE_SECURITY_ENABLED', context) - self.assertIn('TIME_ENABLED', context) - self.assertIn('MOSAIC_ENABLED', context) - - -class QGISServerViewsTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_ogc_specific_layer(self): - """Test we can use QGIS Server API for a layer. - - For now, we are just checking we can call these views without any - exceptions. We should improve this test by checking the result. - """ - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - uploaded = file_upload(filename) - - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - vector_layer = file_upload(filename) - - params = {'layername': uploaded.name} - - # Zip - response = self.client.get( - reverse('qgis_server:download-zip', kwargs=params)) - self.assertEqual(response.status_code, 200) - try: - f = io.StringIO(ensure_string(response.content)) - zipped_file = zipfile.ZipFile(f, 'r') - - for one_file in zipped_file.namelist(): - # We shoudn't get any QGIS project - self.assertFalse(one_file.endswith('.qgs')) - self.assertIsNone(zipped_file.testzip()) - finally: - zipped_file.close() - f.close() - - # Legend - response = self.client.get( - reverse('qgis_server:legend', kwargs=params)) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # Tile - coordinates = {'z': '11', 'x': '1576', 'y': '1054'} - coordinates.update(params) - response = self.client.get( - reverse('qgis_server:tile', kwargs=coordinates)) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # Tile 404 - response = self.client.get( - reverse('qgis_server:tile', kwargs=params)) - self.assertEqual(response.status_code, 404) - self.assertEqual( - response.get('Content-Type'), 'text/html; charset=utf-8') - - # Geotiff - response = self.client.get( - reverse('qgis_server:geotiff', kwargs=params)) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/tiff') - self.assertEqual(what('', h=ensure_string(response.content)), 'tiff') - - # Layer is already on the database - # checking the Link - links = uploaded.link_set.download().filter( - name__in=settings.DOWNLOAD_FORMATS_RASTER) - - # checks signals.py for the hardcoded names in QLR and QGS - qlr_link = links.get(name='QGIS layer file (.qlr)') - self.assertIn("download-qlr", qlr_link.url) - qgs_link = links.get(name='QGIS project file (.qgs)') - self.assertIn("download-qgs", qgs_link.url) - - # QLR - response = self.client.get( - reverse('qgis_server:download-qlr', kwargs=params)) - self.assertEqual(response.status_code, 200) - self.assertEqual( - response.get('Content-Type'), - 'application/x-qgis-layer-definition') - # check file name's extension - file_name = response.get('Content-Disposition').split('filename=') - file_ext = file_name[1].split('.') - self.assertEqual(file_ext[1], "qlr") - - # QGS - response = self.client.get( - reverse('qgis_server:download-qgs', kwargs=params)) - self.assertEqual(response.status_code, 200) - self.assertEqual( - response.get('Content-Type'), - 'application/x-qgis-project') - # check file name's extension - file_name = response.get('Content-Disposition').split('filename=') - file_ext = file_name[1].split('.') - self.assertEqual(file_ext[1], "qgs") - - response = self.client.get( - reverse('qgis_server:geotiff', kwargs={ - 'layername': vector_layer.name - })) - self.assertEqual(response.status_code, 404) - - # QML Styles - # Request list of styles - response = self.client.get( - reverse('qgis_server:download-qml', kwargs=params)) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'application/json') - # Should return a default style list - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - actual_result = json.loads(content) - actual_result = [s['name'] for s in actual_result] - expected_result = ['default'] - self.assertEqual(set(expected_result), set(actual_result)) - - # Get single styles - response = self.client.get( - reverse('qgis_server:download-qml', kwargs={ - 'layername': params['layername'], - 'style_name': 'default' - })) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'text/xml') - - # Set thumbnail from viewed bbox - response = self.client.get( - reverse('qgis_server:set-thumbnail', kwargs=params)) - self.assertEqual(response.status_code, 400) - data = { - 'bbox': '-5.54025,96.9406,-5.2820,97.1250' - } - response = self.client.post( - reverse('qgis_server:set-thumbnail', kwargs=params), - data=data) - # User dont have permission - self.assertEqual(response.status_code, 403) - # Should log in - self.client.login(username='admin', password='admin') - response = self.client.post( - reverse('qgis_server:set-thumbnail', kwargs=params), - data=data) - self.assertEqual(response.status_code, 200) - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - retval = json.loads(content) - expected_retval = { - 'success': True - } - self.assertEqual(retval, expected_retval) - - # OGC Server specific for THE layer - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetLegendGraphics', - 'FORMAT': 'image/png', - 'LAYERS': uploaded.name, - } - response = self.client.get( - reverse('qgis_server:layer-request', kwargs=params), query_string) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # OGC Server for the Geonode instance - # GetLegendGraphics is a shortcut when using the main OGC server. - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetLegendGraphics', - 'FORMAT': 'image/png', - 'LAYERS': uploaded.name, - } - response = self.client.get( - reverse('qgis_server:request'), query_string) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # WMS GetCapabilities - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetCapabilities' - } - - response = self.client.get( - reverse('qgis_server:request'), query_string) - self.assertEqual(response.status_code, 200, ensure_string(response.content)) - self.assertEqual( - ensure_string(response.content), 'GetCapabilities is not supported yet.') - - query_string['LAYERS'] = uploaded.name - - response = self.client.get( - reverse('qgis_server:request'), query_string) - get_capabilities_content = ensure_string(response.content) - - # Check xml content - self.assertEqual(response.status_code, 200, ensure_string(response.content)) - root = dlxml.fromstring(ensure_string(response.content)) - layer_xml = root.xpath( - 'wms:Capability/wms:Layer/wms:Layer/wms:Name', - namespaces={'wms': 'http://www.opengis.net/wms'}) - self.assertEqual(len(layer_xml), 1) - self.assertEqual(layer_xml[0].text, uploaded.name) - # GetLegendGraphic request returned must be valid - layer_xml = root.xpath( - 'wms:Capability/wms:Layer/' - 'wms:Layer/wms:Style/wms:LegendURL/wms:OnlineResource', - namespaces={ - 'xlink': 'http://www.w3.org/1999/xlink', - 'wms': 'http://www.opengis.net/wms' - }) - legend_url = layer_xml[0].attrib[ - '{http://www.w3.org/1999/xlink}href'] - - response = self.client.get(legend_url) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.get('Content-Type'), 'image/png') - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # Check get capabilities using helper returns the same thing - response = requests.get(wms_get_capabilities_url( - uploaded, internal=False)) - self.assertEqual(response.status_code, 200) - self.assertEqual(get_capabilities_content, ensure_string(response.content)) - - # WMS GetMap - query_string = { - 'SERVICE': 'WMS', - 'VERSION': '1.3.0', - 'REQUEST': 'GetMap', - 'FORMAT': 'image/png', - 'LAYERS': uploaded.name, - 'HEIGHT': 250, - 'WIDTH': 250, - 'SRS': 'EPSG:4326', - 'BBOX': '-5.54025,96.9406,-5.2820,97.1250', - } - response = self.client.get( - reverse('qgis_server:request'), query_string) - self.assertEqual(response.status_code, 200, ensure_string(response.content)) - self.assertEqual( - response.get('Content-Type'), 'image/png', ensure_string(response.content)) - self.assertEqual(what('', h=ensure_string(response.content)), 'png') - - # End of the test, we should remove every files related to the test. - uploaded.delete() - vector_layer.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_download_map_qlr(self): - """Test download QLR file for a map""" - # 2 layers to be added to the map - filename = os.path.join( - gisdata.GOOD_DATA, 'raster/relief_san_andres.tif') - layer1 = file_upload(filename) - - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - layer2 = file_upload(filename) - - # construct json request for new map - json_payload = InitialSetup.generate_initial_map(layer1, layer2) - - self.client.login(username='admin', password='admin') - - response = self.client.post( - reverse('new_map_json'), - data=json.dumps(json_payload), - content_type='application/json') - # map is successfully saved - self.assertEqual(response.status_code, 200) - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - map_id = json.loads(content).get('id') - - map = Map.objects.get(id=map_id) - - # check that QLR is added to the links - links = map.link_set.download() - map_qlr_link = links.get(name='Download QLR Layer file') - self.assertIn('qlr', map_qlr_link.url) - - # QLR - response = self.client.get( - reverse('map_download_qlr', kwargs={'mapid': map_id})) - self.assertEqual(response.status_code, 200) - self.assertEqual( - response.get('Content-Type'), - 'application/x-qgis-layer-definition') - - # cleanup - map.delete() - layer1.delete() - layer2.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_map_json(self): - # 2 layers to be added to the map - filename = os.path.join( - gisdata.GOOD_DATA, 'raster/relief_san_andres.tif') - layer1 = file_upload(filename) - - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - layer2 = file_upload(filename) - - json_payload = InitialSetup.generate_initial_map(layer1, layer2) - # First, create a map with two layers - # Need to log in for saving a map - self.client.login(username='admin', password='admin') - - result_new_map = self.client.post( - reverse('new_map_json'), - json.dumps(json_payload), - content_type='application/json') - # the new map is successfully saved - self.assertEqual(result_new_map.status_code, 200) - - map_id = json.loads(result_new_map.content).get('id') - # try to remove one layer - layers = json_payload['map']['layers'] - before_remove = len(layers) - after_remove = before_remove - 1 - layer = layers[0] - layers.remove(layer) - - # check if the layer is eliminated from the map - result_update_map = self.client.post( - reverse('map_json', kwargs={'mapid': map_id}), - data=json.dumps(json_payload), - content_type='application/json') - # successfully updated - self.assertEqual(result_update_map.status_code, 200) - # the number of layers on the map decrease by 1 - self.assertEqual( - len(result_update_map.context_data['map'].layers), - after_remove) - - # clean up - map = Map.objects.get(id=map_id) - map.delete() - layer1.delete() - layer2.delete() - - -class QGISServerStyleManagerTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - def data_path(self, path): - project_root = os.path.abspath(settings.PROJECT_ROOT) - return os.path.join( - project_root, 'qgis_server/tests/data', path) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_list_style(self): - """Test querying list of styles from QGIS Server.""" - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - layer = file_upload(filename) - """:type: geonode.layers.models.Layer""" - - actual_list_style = style_list(layer, internal=False) - expected_list_style = ['default'] - - # There will be a default style - if actual_list_style: - self.assertEqual( - set(expected_list_style), - set(style.name for style in actual_list_style)) - - style_list_url = reverse( - 'qgis_server:download-qml', - kwargs={ - 'layername': layer.name - }) - response = self.client.get(style_list_url) - self.assertEqual(response.status_code, 200) - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - actual_list_style = json.loads(content) - - # There will be a default style - self.assertEqual( - set(expected_list_style), - set(style['name'] for style in actual_list_style)) - - layer.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_add_delete_style(self): - """Test add new style using qgis_server views.""" - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - layer = file_upload(filename) - """:type: geonode.layers.models.Layer""" - - self.client.login(username='admin', password='admin') - - qml_path = self.data_path('test_grid.qml') - add_style_url = reverse( - 'qgis_server:upload-qml', - kwargs={ - 'layername': layer.name}) - - with open(qml_path) as file_handle: - form_data = { - 'name': 'new_style', - 'title': 'New Style', - 'qml': file_handle - } - response = self.client.post( - add_style_url, - data=form_data) - - self.assertEqual(response.status_code, 201) - - actual_list_style = style_list(layer, internal=False) - if actual_list_style: - expected_list_style = ['default', 'new_style'] - self.assertEqual( - set(expected_list_style), - set(style.name for style in actual_list_style)) - - # Test delete request - delete_style_url = reverse( - 'qgis_server:remove-qml', - kwargs={ - 'layername': layer.name, - 'style_name': 'default'}) - - response = self.client.delete(delete_style_url) - self.assertEqual(response.status_code, 200) - - actual_list_style = style_list(layer, internal=False) - if actual_list_style: - expected_list_style = ['new_style'] - self.assertEqual( - set(expected_list_style), - set(style.name for style in actual_list_style)) - - # Check new default - default_style_url = reverse( - 'qgis_server:default-qml', - kwargs={ - 'layername': layer.name}) - - response = self.client.get(default_style_url) - - self.assertEqual(response.status_code, 200) - expected_default_style_retval = { - 'name': 'new_style', - } - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - actual_default_style_retval = json.loads(content) - - for key, value in expected_default_style_retval.items(): - self.assertEqual(actual_default_style_retval[key], value) - - layer.delete() - - -class ThumbnailGenerationTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_thumbnail_links(self): - """Test that thumbnail links were created after upload.""" - - filename = os.path.join(gisdata.GOOD_DATA, 'raster/test_grid.tif') - layer = file_upload(filename) - """:type: geonode.layers.models.Layer""" - - # check that we have remote thumbnail - remote_thumbnail_link = layer.link_set.get( - name__icontains='remote thumbnail') - self.assertTrue(remote_thumbnail_link.url) - - # thumbnail won't generate because remote thumbnail uses public - # address - - remote_thumbnail_url = remote_thumbnail_link.url - - # Replace url's basename, we want to access it using django client - parse_result = urlsplit(remote_thumbnail_url) - remote_thumbnail_url = urlunsplit( - ('', '', parse_result.path, parse_result.query, '')) - - response = self.client.get(remote_thumbnail_url) - - thumbnail_path = thumb_path("layer-thumb.png") - - layer.save_thumbnail(thumbnail_path, ensure_string(response.content)) - - # Check thumbnail created - self.assertTrue(storage.exists(thumbnail_path)) - self.assertEqual(what(thumbnail_path), 'png') - - # Check that now we have thumbnail - self.assertTrue(layer.has_thumbnail()) - - missing_thumbnail_url = staticfiles.static(settings.MISSING_THUMBNAIL) - - self.assertTrue(layer.get_thumbnail_url() != missing_thumbnail_url) - - thumbnail_links = layer.link_set.filter(name__icontains='thumbnail') - self.assertTrue(len(thumbnail_links) > 0) - - link_names = ['remote thumbnail', 'thumbnail'] - for link in thumbnail_links: - self.assertIn(link.name.lower(), link_names) - - # cleanup - layer.delete() - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_map_thumbnail(self): - """Creating map will create thumbnail.""" - filename = os.path.join( - gisdata.GOOD_DATA, 'raster/relief_san_andres.tif') - layer1 = file_upload(filename) - - filename = os.path.join( - gisdata.GOOD_DATA, - 'vector/san_andres_y_providencia_administrative.shp') - layer2 = file_upload(filename) - """:type: geonode.layers.models.Layer""" - - # construct json request for new map - json_payload = InitialSetup.generate_initial_map(layer1, layer2) - - self.client.login(username='admin', password='admin') - - response = self.client.post( - reverse('new_map_json'), - json.dumps(json_payload), - content_type='application/json') - - self.assertEqual(response.status_code, 200) - content = ensure_string(response.content) - if isinstance(content, bytes): - content = content.decode('UTF-8') - map_id = json.loads(content).get('id') - - map = Map.objects.get(id=map_id) - - # check that we have remote thumbnail - remote_thumbnail_link = map.link_set.filter( - name__icontains='remote thumbnail').first() - self.assertTrue(remote_thumbnail_link.url) - - # thumbnail won't generate because remote thumbnail uses public - # address - - remote_thumbnail_url = remote_thumbnail_link.url - - # Replace url's basename, we want to access it using django client - parse_result = urlsplit(remote_thumbnail_url) - remote_thumbnail_url = urlunsplit( - ('', '', parse_result.path, parse_result.query, '')) - - response = self.client.get(remote_thumbnail_url) - - thumbnail_path = thumb_path("map-thumb.png") - - map.save_thumbnail(thumbnail_path, ensure_string(response.content)) - - # Check thumbnail created - self.assertTrue(storage.exists(thumbnail_path)) - self.assertEqual(what(thumbnail_path), 'png') - - # Check that now we have thumbnail - self.assertTrue(map.has_thumbnail()) - - missing_thumbnail_url = staticfiles.static(settings.MISSING_THUMBNAIL) - - self.assertTrue(map.get_thumbnail_url() != missing_thumbnail_url) - - thumbnail_links = map.link_set.filter(name__icontains='thumbnail') - self.assertTrue(len(thumbnail_links) > 0) - - link_names = ['remote thumbnail', 'thumbnail'] - for link in thumbnail_links: - self.assertIn(link.name.lower(), link_names) - - # cleanup - map.delete() - layer1.delete() - layer2.delete() - - -class InitialSetup(): - - @classmethod - def generate_initial_map(cls, layer1, layer2): - # construct json request for new map - json_payload = { - "sources": { - "source_OpenMapSurfer Roads": { - "url": "http://korona.geog.uni-heidelberg.de/tiles" - "/roads/x={x}&y={y}&z={z}" - }, - "source_OpenStreetMap": { - "url": "http://{s}.tile.osm.org/{z}/{x}/{y}.png" - }, - "source_san_andres_y_providencia_administrative": { - "url": "http://geonode.dev/qgis-server/tiles" - "/san_andres_y_providencia_administrative/" - "{z}/{x}/{y}.png" - }, - "source_relief_san_andres": { - "url": "http://geonode.dev/qgis-server/tiles" - "/relief_san_andres/{z}/{x}/{y}.png" - } - }, - "about": { - "title": "San Andreas", - "abstract": "San Andreas sample map" - }, - "map": { - "center": [12.91890657418042, -81.298828125], - "zoom": 6, - "projection": "", - "layers": [ - { - "name": "OpenMapSurfer_Roads", - "title": "OpenMapSurfer Roads", - "visibility": True, - "url": "http://korona.geog.uni-heidelberg.de/tiles/" - "roads/x={x}&y={y}&z={z}", - "group": "background", - "source": "source_OpenMapSurfer Roads" - }, - { - "name": "osm", - "title": "OpenStreetMap", - "visibility": False, - "url": "http://{s}.tile.osm.org/{z}/{x}/{y}.png", - "group": "background", - "source": "source_OpenStreetMap" - }, - { - "name": layer2.alternate, - "title": layer2.name, - "visibility": True, - "url": "http://geonode.dev/qgis-server/tiles" - "/san_andres_y_providencia_administrative/" - "{z}/{x}/{y}.png", - "source": "source_" - "san_andres_y_providencia_administrative" - }, - { - "name": layer1.alternate, - "title": layer1.name, - "visibility": True, - "url": "http://geonode.dev/qgis-server/tiles" - "/relief_san_andres/{z}/{x}/{y}.png", - "source": "source_relief_san_andres" - } - ] - } - } - - return json_payload diff --git a/geonode/qgis_server/tests/test_xml_utilities.py b/geonode/qgis_server/tests/test_xml_utilities.py deleted file mode 100644 index df0a35cdb6b..00000000000 --- a/geonode/qgis_server/tests/test_xml_utilities.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from geonode.tests.base import GeoNodeBaseTestSupport - -from xml.etree import ElementTree -import os -import shutil - -from geonode import qgis_server -from geonode.decorators import on_ogc_backend -from geonode.qgis_server.xml_utilities import ( - insert_xml_element, update_xml) - - -class XMLUtilitiesTest(GeoNodeBaseTestSupport): - - fixtures = ['initial_data.json', 'people_data.json'] - - """Test for xml utilities module.""" - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_insert_xml_element(self): - """Check we can't insert custom nested elements""" - root = ElementTree.Element('root') - b = ElementTree.SubElement(root, 'b') - ElementTree.SubElement(b, 'c') - - new_element_path = 'd/e/f' - expected_xml = 'TESTtext' - - element = insert_xml_element(root, new_element_path) - element.text = 'TESTtext' - result_xml = ElementTree.tostring(root) - - self.assertEqual(expected_xml, result_xml) - - @on_ogc_backend(qgis_server.BACKEND_PACKAGE) - def test_update_xml(self): - """Test inserting xml element.""" - file_path = os.path.realpath(__file__) - test_dir = os.path.dirname(file_path) - xml_file_path = os.path.join(test_dir, 'data', 'test.xml') - - # Creating temporary xml file - temp_xml_file_path = os.path.join(test_dir, 'data', 'temp_test.xml') - shutil.copy2(xml_file_path, temp_xml_file_path) - - # Check if the temp file is created - self.assertTrue(os.path.exists(temp_xml_file_path)) - - new_values = { - 'title': 'New Title', - } - - # Make sure there is no new value in the xml - with open(temp_xml_file_path, 'r') as temp_xml_file: - temp_xml_content = temp_xml_file.read() - - self.assertNotIn(new_values['title'], temp_xml_content) - - # Updating the xml file - update_xml(temp_xml_file_path, new_values) - - # Check if the new value has been added. - with open(temp_xml_file_path, 'r') as temp_xml_file: - temp_xml_content = temp_xml_file.read() - self.assertIn(new_values['title'], temp_xml_content) - - # Remove temp file - os.remove(temp_xml_file_path) - self.assertFalse(os.path.exists(temp_xml_file_path)) diff --git a/geonode/qgis_server/urls.py b/geonode/qgis_server/urls.py deleted file mode 100644 index 1ee357804cc..00000000000 --- a/geonode/qgis_server/urls.py +++ /dev/null @@ -1,167 +0,0 @@ -# -*- coding: utf-8 -*- -######################################################################### -# -# Copyright (C) 2016 OSGeo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -######################################################################### - -from django.conf.urls import url - -from geonode.qgis_server.views import ( - download_zip, - download_qgs, - download_map, - tile, - tile_404, - legend, - layer_ogc_request, - qgis_server_request, - qgis_server_pdf, - qgis_server_map_print, - geotiff, - download_qlr, - qml_style, set_thumbnail, default_qml_style) - - -urlpatterns = [ - # Specific for a QGIS Layer - # '', - url( - r'^download-zip/(?P[\w]*)$', - download_zip, - name='download-zip' - ), - url( - r'^download-qgs/(?P[\w]*)$', - download_qgs, - name='download-qgs' - ), - url( - r'^download-map/(?P\d+)$', - download_map, - name='download-map' - ), - url( - r'^tiles/' - r'(?P[^/]*)/' - r'(?P[0-9]*)/' - r'(?P[0-9]*)/' - r'(?P[0-9]*).png$', - tile, - name='tile' - ), - url( - r'^tiles/' - r'(?P[^/]*)/' - r'(?P