fixing bug related with the thumbnail's update on a map (#13033)

Author: Gpetrak

geonode/base/api/views.py

@@ -680,11 +680,16 @@ def set_thumbnail_from_bbox(self, request, resource_id, *args, **kwargs):
         try:
             resource = ResourceBase.objects.get(id=ast.literal_eval(resource_id))
 
+            map_thumb_from_bbox = False
+            if isinstance(resource.get_real_instance(), Map):
+                map_thumb_from_bbox = True
+
             if not isinstance(resource.get_real_instance(), (Dataset, Map)):
                 raise NotImplementedError("Not implemented: Endpoint available only for Dataset and Maps")
 
             request_body = request.data if request.data else json.loads(request.body)
             try:
+                # bbox format: (xmin, xmax, ymin, ymax)
                 bbox = request_body["bbox"] + [request_body["srid"]]
                 zoom = request_body.get("zoom", None)
             except MultiValueDictKeyError:
@@ -695,7 +700,11 @@ def set_thumbnail_from_bbox(self, request, resource_id, *args, **kwargs):
                 zoom = request_body.get("zoom", None)
 
             thumbnail_url = create_thumbnail(
-                resource.get_real_instance(), bbox=bbox, background_zoom=zoom, overwrite=True
+                resource.get_real_instance(),
+                bbox=bbox,
+                background_zoom=zoom,
+                overwrite=True,
+                map_thumb_from_bbox=map_thumb_from_bbox,
             )
             return Response(
                 {"message": "Thumbnail correctly created.", "success": True, "thumbnail_url": thumbnail_url}, status=200

geonode/thumbs/thumbnails.py

@@ -62,6 +62,7 @@ def create_thumbnail(
     styles: Optional[List] = None,
     overwrite: bool = False,
     background_zoom: Optional[int] = None,
+    map_thumb_from_bbox: bool = False,
 ) -> None:
     """
     Function generating and saving a thumbnail of the given instance (Dataset or Map), which is composed of
@@ -111,7 +112,7 @@ def create_thumbnail(
 
     if isinstance(instance, Map):
         is_map_with_datasets = MapLayer.objects.filter(map=instance, local=True).exclude(dataset=None).exists()
-        if is_map_with_datasets:
+        if is_map_with_datasets and not map_thumb_from_bbox:
             compute_bbox_from_datasets = True
     if bbox:
         bbox = bbox_utils.clean_bbox(bbox, target_crs)