[Fixes #7060] Refactoring of thumbnail creation

.circleci/config.yml

@@ -128,7 +128,7 @@ workflows:
           name: geonode_test_suite
           load_docker_cache: true
           save_docker_cache: false
-          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]))")
+          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]))") geonode.thumbs.tests
           requires:
             - geonode_test_suite_smoke
       - build:

.env_dev

@@ -20,11 +20,11 @@ POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
-GEONODE_GEODATABASE_PASSWORD=geonode_data
+GEONODE_GEODATABASE_PASSWORD=geonode
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public
 DATABASE_URL=postgis://geonode:geonode@localhost:5432/geonode
-GEODATABASE_URL=postgis://geonode_data:geonode@localhost:5432/geonode_data
+GEODATABASE_URL=postgis://geonode:geonode@localhost:5432/geonode_data
 GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
@@ -39,9 +39,9 @@ SITEURL=http://localhost:8000/
 
 ALLOWED_HOSTS="['django', '*']"
 
-# DEFAULT_BACKEND_UPLOADER=geonode.importer
-# TIME_ENABLED=True
-# MOSAIC_ENABLED=False
+DEFAULT_BACKEND_UPLOADER=geonode.importer
+TIME_ENABLED=True
+MOSAIC_ENABLED=False
 HAYSTACK_SEARCH=False
 HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
 HAYSTACK_ENGINE_INDEX_NAME=haystack

.gitignore

@@ -7,7 +7,6 @@ pip-log.txt
 MANIFEST
 dist
 .idea/
-.vscode/
 .pytest_cache/
 pip-wheel-metadata/
 # supporting stuff pulled in by paver script

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Django",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/manage.py",
+            "envFile": "${workspaceFolder}/.env_dev",
+            "args": [
+                "runserver",
+                "0.0.0.0:8000"
+            ],
+            "django": true
+        }
+    ]
+}

codecov.yml

@@ -1,26 +1,26 @@
-codecov:
-  notify:
-    require_ci_to_pass: yes
-
-coverage:
-  precision: 2
-  round: down
-  range: "60...100"
-
-  status:
-    project: yes
-    patch: yes
-    changes: no
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
-comment:
-  layout: "header, diff"
-  behavior: default
-  require_changes: no
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "60...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "header, diff"
+  behavior: default
+  require_changes: no

geonode/api/tests.py

@@ -17,7 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
-from unittest.case import TestCase
 from unittest.mock import patch
 from django.conf import settings
 
@@ -530,9 +529,14 @@ def test_tags_lockdown(self):
         self.assertEqual(len(self.deserialize(resp)['objects']), 5)
 
 
-class ThesaurusKeywordResourceTests(ResourceTestCaseMixin, TestCase):
+class ThesaurusKeywordResourceTests(ResourceTestCaseMixin, GeoNodeBaseTestSupport):
     #  loading test thesausurs
-    fixtures = ["test_thesaurus.json"]
+    fixtures = [
+        'initial_data.json',
+        "test_thesaurus.json",
+        'group_test_data.json',
+        'default_oauth_apps.json'
+    ]
 
     def setUp(self):
         super(ThesaurusKeywordResourceTests, self).setUp()

geonode/base/models.py

@@ -1518,7 +1518,7 @@ def save_thumbnail(self, filename, image):
                         (_default_thumb_size['width'], _default_thumb_size['height']),
                         resample=Image.ANTIALIAS)
                     cover = ImageOps.fit(im, (_default_thumb_size['width'], _default_thumb_size['height']))
-                    cover.save(storage.path(_upload_path), format='JPEG')
+                    cover.save(storage.path(_upload_path), format='PNG')
                 except Exception as e:
                     logger.debug(e)
 

geonode/base/tests.py

@@ -79,6 +79,9 @@ def setUp(self):
         super(ThumbnailTests, self).setUp()
         self.rb = ResourceBase.objects.create()
 
+    def tearDown(self):
+        super().tearDown()
+
     def test_initial_behavior(self):
         """
         Tests that an empty resource has a missing image as default thumbnail.
@@ -100,10 +103,16 @@ def test_monochromatic_image(self, image):
         """
         Tests that an monochromatic image does not change the current resource thumbnail.
         """
+        filename = 'test-thumb'
+
         current = self.rb.get_thumbnail_url()
-        self.rb.save_thumbnail('test-thumb', image)
+        self.rb.save_thumbnail(filename, image)
         self.assertEqual(current, urlparse(self.rb.get_thumbnail_url()).path)
 
+        # cleanup: remove saved thumbnail
+        thumb_utils.remove_thumbs(filename)
+        self.assertFalse(thumb_utils.thumb_exists(filename))
+
     @patch('PIL.Image.open', return_value=test_image)
     def test_thumb_utils_methods(self, image):
         """
@@ -120,6 +129,10 @@ def test_thumb_utils_methods(self, image):
         self.assertTrue(thumb_utils.thumb_exists(filename))
         self.assertEqual(thumb_utils.thumb_size(upload_path), 10000)
 
+        # cleanup: remove saved thumbnail
+        thumb_utils.remove_thumbs(filename)
+        self.assertFalse(thumb_utils.thumb_exists(filename))
+
 
 class TestThumbnailUrl(GeoNodeBaseTestSupport):
 
@@ -948,6 +961,7 @@ def __get_last_thesaurus():
 
 @override_settings(THESAURUS_DEFAULT_LANG="en")
 class TestThesaurusAvailableForm(TestCase):
+    #  loading test thesausurs
     fixtures = [
         "test_thesaurus.json"
     ]

geonode/client/templates/ol/layers/layer_ol2_map.html

@@ -61,8 +61,8 @@
                "https://c.tile.openstreetmap.org/${z}/${x}/${y}.png"]),
           	source
     	];
-
-    	var map = new OpenLayers.Map({
+        // olMap is used by thumbnail.js to POST to the thumbnail update view
+    	var map = window.olMap = new OpenLayers.Map({
             div: 'preview_map',
             projection: new OpenLayers.Projection('EPSG:900913'),
             layers: layers,

geonode/client/templates/ol/maps/map_ol2.html

@@ -46,7 +46,8 @@
         layers.push(source);
         {% endif %}
     {% endfor %}
-    var map = new OpenLayers.Map({
+    // olMap is used by thumbnail.js to POST to the thumbnail update view
+    window.olMap = new OpenLayers.Map({
         div: 'preview_map',
         projection: new OpenLayers.Projection('EPSG:900913'),
         layers: layers,