Merge branch 'master' into getlegendgraphic

Author: baloola

eoxserver/contrib/mapserver.py

@@ -297,6 +297,7 @@ def set_env(map_obj, env, fail_on_override=False, return_old=False):
 
     return old_values
 
+
 @contextlib.contextmanager
 def config_env(map_obj, env, fail_on_override=False, reset_old=True):
     old_env = set_env(env, fail_on_override, reset_old)

eoxserver/render/mapserver/config.py

@@ -42,3 +42,6 @@
 # render requests
 
 DEFAULT_EOXS_MAPSERVER_HEATMAP_RANGE_DEFAULT = (0, 10)
+
+# default for EOXS_MAPSERVER_HEATMAP_STYLE_DEFAULT
+DEFAULT_EOXS_MAPSERVER_HEATMAP_STYLE_DEFAULT = "plasma"

eoxserver/render/mapserver/factories.py

@@ -56,6 +56,7 @@
 from eoxserver.render.coverage.objects import Coverage, Field
 from eoxserver.render.mapserver.config import (
     DEFAULT_EOXS_MAPSERVER_HEATMAP_RANGE_DEFAULT,
+    DEFAULT_EOXS_MAPSERVER_HEATMAP_STYLE_DEFAULT,
     DEFAULT_EOXS_MAPSERVER_LAYER_FACTORIES,
 )
 from eoxserver.render.colors import BASE_COLORS, COLOR_SCALES, OFFSITE_COLORS
@@ -763,9 +764,14 @@ def create(self, map_obj: ms.mapObj, layer: Layer):
             DEFAULT_EOXS_MAPSERVER_HEATMAP_RANGE_DEFAULT
         )
 
+        default_style = getattr(
+            settings, 'EOXS_MAPSERVER_HEATMAP_STYLE_DEFAULT',
+            DEFAULT_EOXS_MAPSERVER_HEATMAP_STYLE_DEFAULT
+        )
+
         range_ = layer.range or default_range
         _create_raster_style(
-            DEFAULT_RASTER_STYLES[layer.style or "plasma"],
+            DEFAULT_RASTER_STYLES[layer.style or default_style],
             layer_obj,
             range_[0],
             range_[1],