fix: proper wrapping of multiply wrapped images

Author: constantinius

eoxserver/render/browse/objects.py

@@ -151,7 +151,7 @@ def from_file(cls, filename, env=None, raster_styles=None):
 class GeneratedBrowse(Browse):
     def __init__(self, name, band_expressions, ranges, nodata_values,
                  fields_and_coverages, field_list, footprint, raster_styles,
-                 variables, show_out_of_bounds_data=False,
+                 variables, show_out_of_bounds_data=False, env=None
                  ):
         self._name = name
         self._band_expressions = band_expressions
@@ -163,6 +163,7 @@ def __init__(self, name, band_expressions, ranges, nodata_values,
         self._raster_styles = raster_styles
         self._variables = variables
         self._show_out_of_bounds_data = show_out_of_bounds_data
+        self._env = env or {}
 
     @property
     def name(self):
@@ -244,6 +245,17 @@ def from_coverage_models(cls, band_expressions, ranges, nodata_values,
             for field_name, coverages in fields_and_coverage_models.items()
         }
 
+        env = None
+
+        for coverage_models in fields_and_coverage_models.values():
+            for coverage_model in coverage_models:
+                arraydata_item = coverage_model.arraydata_items.first()
+                if arraydata_item:
+                    env = get_vsi_env(arraydata_item.storage)
+                    break
+            if env:
+                break
+
         return cls(
             product_model.identifier,
             band_expressions,
@@ -259,6 +271,7 @@ def from_coverage_models(cls, band_expressions, ranges, nodata_values,
             raster_styles,
             variables,
             show_out_of_bounds_data,
+            env,
         )
 
 

eoxserver/render/mapserver/factories.py

@@ -63,11 +63,13 @@
 from eoxserver.render.colors import BASE_COLORS, COLOR_SCALES, OFFSITE_COLORS
 from eoxserver.resources.coverages import crss
 from eoxserver.resources.coverages.dateline import (
-    extent_crosses_dateline, wrap_extent_around_dateline
+    extent_crosses_dateline,
+    get_extent_wrappings,
 )
 from eoxserver.processing.gdal import reftools
 
 import logging
+
 logger = logging.getLogger(__name__)
 
 
@@ -366,14 +368,16 @@ def make_browse_layer_generator(self, map_obj, browses, map_,
                     creation_info, reset_info = (None, None)
 
                 layer_objs = _create_raster_layer_objs(
-                    map_obj, browse.extent, browse.spatial_reference,
-                    creation_info.filename if creation_info else '',
-                    filename_generator, {}
+                    map_obj,
+                    browse.extent,
+                    browse.spatial_reference,
+                    creation_info.filename if creation_info else "",
+                    filename_generator,
+                    browse.env,
                 )
 
                 for layer_obj in layer_objs:
                     if creation_info:
-                        layer_obj.data = creation_info.filename
                         if creation_info.env:
                             ms.set_env(map_obj, creation_info.env, True)
 
@@ -479,8 +483,13 @@ def make_browse_layer_generator(self, map_obj, browses, map_,
 
             elif isinstance(browse, Browse):
                 layer_objs = _create_raster_layer_objs(
-                    map_obj, browse.extent, browse.spatial_reference,
-                    browse.filename, filename_generator, browse.env, browse.mode,
+                    map_obj,
+                    browse.extent,
+                    browse.spatial_reference,
+                    browse.filename,
+                    filename_generator,
+                    browse.env,
+                    browse.mode,
                 )
                 ms.set_env(map_obj, browse.env, True)
             elif browse is None:
@@ -828,32 +837,31 @@ def _create_raster_layer_objs(map_obj, extent, sr, data, filename_generator, env
     if resample:
         layer_obj.setProcessingKey('RESAMPLE', resample)
 
+    layers = [layer_obj]
     if extent and sr.srid and extent_crosses_dateline(extent, sr.srid):
-        wrapped_extent = wrap_extent_around_dateline(extent, sr.srid)
-
-        wrapped_layer_obj = ms.layerObj(map_obj)
-        wrapped_layer_obj.type = ms.MS_LAYER_RASTER
-        wrapped_layer_obj.status = ms.MS_ON
-
-        wrapped_data = filename_generator.generate()
-        with gdal.config_env(env):
-            vrt.with_extent(data, wrapped_extent, wrapped_data)
-        wrapped_layer_obj.data = wrapped_data
-        # assumption that RGBA already has transparency in alpha band
-        if browse_mode != BROWSE_MODE_RGBA:
-            wrapped_layer_obj.offsite = ms.colorObj(0, 0, 0)
-
-        wrapped_layer_obj.metadata.set("ows_srs", short_epsg)
-        wrapped_layer_obj.metadata.set("wms_srs", short_epsg)
-        wrapped_layer_obj.setProjection(sr.proj)
-
-        wrapped_layer_obj.setExtent(*wrapped_extent)
-        wrapped_layer_obj.metadata.set(
-            "wms_extent", "%f %f %f %f" % wrapped_extent
-        )
-        return [layer_obj, wrapped_layer_obj]
-    else:
-        return [layer_obj]
+        for wrapped_extent in get_extent_wrappings(extent, sr.srid):
+            wrapped_layer_obj = ms.layerObj(map_obj)
+            wrapped_layer_obj.type = ms.MS_LAYER_RASTER
+            wrapped_layer_obj.status = ms.MS_ON
+
+            wrapped_data = filename_generator.generate()
+            with gdal.config_env(env):
+                vrt.with_extent(data, wrapped_extent, wrapped_data)
+            wrapped_layer_obj.data = wrapped_data
+
+            # assumption that RGBA already has transparency in alpha band
+            if browse_mode != BROWSE_MODE_RGBA:
+                wrapped_layer_obj.offsite = ms.colorObj(0, 0, 0)
+
+            wrapped_layer_obj.metadata.set("ows_srs", short_epsg)
+            wrapped_layer_obj.metadata.set("wms_srs", short_epsg)
+            wrapped_layer_obj.setProjection(sr.proj)
+
+            wrapped_layer_obj.setExtent(*wrapped_extent)
+            wrapped_layer_obj.metadata.set("wms_extent", "%f %f %f %f" % wrapped_extent)
+            layers.append(wrapped_layer_obj)
+
+    return layers
 
 
 def _create_polygon_layer(map_obj):

eoxserver/resources/coverages/dateline.py

@@ -30,6 +30,8 @@
 from osgeo import ogr
 from osgeo import osr
 
+from eoxserver.resources.coverages.crss import crs_bounds
+
 
 EXTENT_EPSG_4326 = ogr.CreateGeometryFromWkt(
     'POLYGON ((-180 -90, -180 90, 180 90, 180 -90, -180 -90))'
@@ -93,3 +95,34 @@ def wrap_extent_around_dateline(extent, srid=4326):
             "%d. Supported are SRIDs %s." %
             (srid, ", ".join(str(v) for v in CRS_WIDTH.keys()))
         )
+
+
+def get_extent_wrappings(extent, srid=4326):
+    """ Returns a list of extents covering the dateline if the given extent
+    crosses the dateline. Otherwise a list containing only the given extent
+    is returned.
+    """
+
+    crs_minx, _, crs_maxx, _ = crs_bounds(srid)
+    crs_width = crs_maxx - crs_minx
+
+    extents = []
+    working_extent = extent
+    while True:
+        working_extent = (working_extent[0] - crs_width, working_extent[1],
+                          working_extent[2] - crs_width, working_extent[3])
+        if working_extent[2] > crs_minx:
+            extents.append(working_extent)
+        else:
+            break
+
+    working_extent = extent
+    while True:
+        working_extent = (working_extent[0] + crs_width, working_extent[1],
+                          working_extent[2] + crs_width, working_extent[3])
+        if working_extent[0] < crs_maxx:
+            extents.append(working_extent)
+        else:
+            break
+
+    return extents