Merge pull request #534 from EOxServer/thumbnails

Thumbnails fixes

autotest/autotest/urls.py

@@ -20,6 +20,9 @@
     re_path(r'^ows', include("eoxserver.services.urls")),
     re_path(r'^opensearch/', include('eoxserver.services.opensearch.urls')),
 
+    # enable the coverage URLs
+    re_path(r'^coverages/', include('eoxserver.resources.coverages.urls')),
+
     # enable the client
     re_path(r'^client/', include('eoxserver.webclient.urls')),
 

eoxserver/instance_template/project_name/urls.py

@@ -48,6 +48,9 @@
     re_path(r'^ows', include("eoxserver.services.urls")),
     re_path(r'^opensearch/', include('eoxserver.services.opensearch.urls')),
 
+    # enable the coverage URLs
+    re_path(r'^coverages/', include('eoxserver.resources.coverages.urls')),
+
     # enable the client
     re_path(r'^client/', include('eoxserver.webclient.urls')),
 

eoxserver/resources/coverages/registration/stac.py

@@ -479,6 +479,23 @@ def register_stac_product(stac_item, product_type=None, storage=None,
                         asset, file_href, product, storage, browse_type
                     )
 
+    # adding thumbnail image, which is the first one with role thumbnail
+    thumbnail_asset = next(
+        (
+            asset
+            for asset in assets
+            if 'thumbnail' in asset.get('roles')
+        ),
+        None
+    )
+    if thumbnail_asset:
+        models.MetaDataItem.objects.create(
+            eo_object=product,
+            semantic=models.MetaDataItem.semantic_names['thumbnail'],
+            storage=storage,
+            location=get_path_from_href(thumbnail_asset['href'], file_href),
+        )
+
     return (product, replaced)
 
 

eoxserver/resources/coverages/views.py

@@ -11,7 +11,8 @@
 import shutil
 
 from django.http import (
-    HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, FileResponse
+    HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, FileResponse,
+    Http404
 )
 from django.contrib.gis.geos import GEOSGeometry
 from django.db import transaction
@@ -73,10 +74,13 @@ def metadata(request, identifier, semantic):
 
     frmt = request.GET.get('format')
 
-    semantic_code = {
-        name: code
-        for code, name in models.MetaDataItem.SEMANTIC_CHOICES
-    }[semantic]
+    try:
+        semantic_code = {
+            name: code
+            for code, name in models.MetaDataItem.SEMANTIC_CHOICES
+        }[semantic]
+    except KeyError as exc:
+        raise Http404(semantic) from exc
 
     qs = models.MetaDataItem.objects.filter(
         eo_object__identifier=identifier, semantic=semantic_code,

eoxserver/services/opensearch/formats/base.py

@@ -31,9 +31,9 @@
 from django.http import QueryDict
 from lxml.builder import ElementMaker
 try:
-    from django.core.urlresolvers import reverse
+    from django.core.urlresolvers import reverse, NoReverseMatch
 except ImportError:
-    from django.urls import reverse
+    from django.urls import reverse, NoReverseMatch
 
 from django.conf import settings
 from django.utils.module_loading import import_string
@@ -300,7 +300,7 @@ def encode_item_links(self, request, collection_id, item):
                         )
                     )
 
-                if wms_small:
+                if thumbnail_link or wms_small:
                     # "Thumbnail" image
                     links.append(
                         MEDIA("content",
@@ -594,12 +594,15 @@ def _create_download_link(self, request, product):
     def _create_thumbail_link(self, request, item):
         semantic = models.MetaDataItem.semantic_codes['thumbnail']
         if item.metadata_items.filter(semantic=semantic).exists():
-            return request.build_absolute_uri(
-                reverse("metadata", kwargs={
-                    'identifier': item.identifier,
-                    'semantic': 'thumbnail'
-                })
-            )
+            try:
+                return request.build_absolute_uri(
+                    reverse("metadata", kwargs={
+                        'identifier': item.identifier,
+                        'semantic': 'thumbnail'
+                    })
+                )
+            except NoReverseMatch:
+                return None
 
     def _make_metadata_href(self, request, item, metadata_item):
         semantic_name = models.MetaDataItem.semantic_names[metadata_item.semantic]