Fixing regressions

EOxServer · Sep 15, 2023 · 0af02fc · 0af02fc
1 parent 0e87b7c
commit 0af02fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/eoxserver/render/browse/defaultstyles.py b/eoxserver/render/browse/defaultstyles.py
@@ -11,9 +11,9 @@
 for name, entries in COLOR_SCALES.items():
     DEFAULT_RASTER_STYLES[name] = RasterStyle(
         name,
+        "ramp",
         name,
         name,
-        "ramp",
         [
             RasterStyleColorEntry(i, color)
             for i, color in entries

diff --git a/eoxserver/render/browse/objects.py b/eoxserver/render/browse/objects.py
@@ -103,7 +103,7 @@ def footprint(self):
             return polygon
 
     @classmethod
-    def from_model(cls, product_model, browse_model):
+    def from_model(cls, product_model, browse_model, raster_styles=None):
         filename = get_vsi_path(browse_model)
         env = get_vsi_env(browse_model.storage)
         size = (browse_model.width, browse_model.height)
@@ -129,11 +129,12 @@ def from_model(cls, product_model, browse_model):
         return cls(
             name, filename, env, size, extent,
             browse_model.coordinate_reference_system, mode,
-            product_model.footprint
+            product_model.footprint,
+            raster_styles if raster_styles is not None else {}
         )
 
     @classmethod
-    def from_file(cls, filename, env=None):
+    def from_file(cls, filename, env=None, raster_styles=None):
         env = env or {}
         ds = gdal.Open(filename)
         size = (ds.RasterXSize, ds.RasterYSize)
@@ -142,7 +143,8 @@ def from_file(cls, filename, env=None):
 
         return cls(
             filename, env, filename, size, extent,
-            ds.GetProjection(), mode, None
+            ds.GetProjection(), mode, None,
+            raster_styles if raster_styles is not None else {},
         )
 
 

diff --git a/eoxserver/render/mapserver/factories.py b/eoxserver/render/mapserver/factories.py
@@ -214,7 +214,10 @@ def create_coverage_layer(self, map_obj: Map, coverage: Coverage, fields: List[F
 
             for layer_obj in layer_objs:
                 _create_raster_style(
-                    style or "blackwhite", layer_obj, range_[0], range_[1], [
+                    DEFAULT_RASTER_STYLES[style or "blackwhite"],
+                    layer_obj,
+                    range_[0],
+                    range_[1], [
                         nil_value[0] for nil_value in field.nil_values
                     ]
                 )