Make linear default layer names unique (#1416)

* Make linear default layer names unique

Currently, similar variables result in layers of same name, which
overwrirte each other in registration.

Fix #1415

* fix

* f

* f

* f

* test

* removed python 3.9

* fixed python 3.9.12

* removed python 3.9

* removed python gsl fixing

* removed gsl

* fix python to 3.9

* fix gsl

Author: joernu76

.github/workflows/testing.yml

@@ -28,9 +28,10 @@ jobs:
         | sed -e "s/.*://" > reqs.txt \
         && source /opt/conda/bin/activate mssenv \
         && conda config --add channels conda-forge \
+        && conda config --set channel_priority strict \
         && conda install --revision 0 \
-        && conda install mamba python \
-        && mamba install pyvirtualdisplay python \
+        && conda install mamba python=3.9.12 \
+        && mamba install pyvirtualdisplay python=3.9.12 \
         && mamba install --file reqs.txt \
         && mamba install --file requirements.d/development.txt)
 

localbuild/meta.yaml

@@ -32,6 +32,7 @@ requirements:
     - chameleon
     - execnet
     - fastkml  =0.11
+    - gsl =2.7.0
     - isodate
     - lxml
     - netcdf4

mslib/mswms/mpl_lsec_styles.py

@@ -43,8 +43,7 @@ def __init__(self, driver, variable="air_temperature", filetype="ml"):
         self.required_datafields = [(filetype, self.variable, None)]
         if filetype != "pl":
             self.required_datafields.insert(0, (filetype, "air_pressure", "Pa"))
-        abbreviation = "".join([text[0] for text in self.variable.split("_")])
-        self.name = f"LS_{str.upper(abbreviation)}"
+        self.name = f"LS_Default_{variable}"
         self.title = f"{self.variable} Linear Plot"
 
 

mslib/mswms/wms.py

@@ -452,6 +452,9 @@ def register_hsec_layer(self, datasets, layer_class):
                     self.hsec_layer_registry[dataset] = {}
                 else:
                     raise ValueError("dataset '%s' not available", dataset)
+            if layer.name in self.hsec_layer_registry[dataset]:
+                raise ValueError(f"new layer is already registered? dataset={dataset} layer.name={layer.name} "
+                                 f"new={layer} old={self.hsec_layer_registry[dataset][layer.name]}")
             self.hsec_layer_registry[dataset][layer.name] = layer
 
     def register_vsec_layer(self, datasets, layer_class):
@@ -477,6 +480,9 @@ def register_vsec_layer(self, datasets, layer_class):
                     self.vsec_layer_registry[dataset] = {}
                 else:
                     raise ValueError("dataset '%s' not available", dataset)
+            if layer.name in self.vsec_layer_registry[dataset]:
+                raise ValueError(f"new layer is already registered? dataset={dataset} layer.name={layer.name} "
+                                 f"new={layer} old={self.vsec_layer_registry[dataset][layer.name]}")
             self.vsec_layer_registry[dataset][layer.name] = layer
 
     def register_lsec_layer(self, datasets, variable=None, filetype="ml", layer_class=None):
@@ -505,6 +511,9 @@ def register_lsec_layer(self, datasets, variable=None, filetype="ml", layer_clas
                     self.lsec_layer_registry[dataset] = {}
                 else:
                     raise ValueError("dataset '%s' not available", dataset)
+            if layer.name in self.lsec_layer_registry[dataset]:
+                raise ValueError(f"new layer is already registered? dataset={dataset} layer.name={layer.name} "
+                                 f"new={layer} old={self.lsec_layer_registry[dataset][layer.name]}")
             self.lsec_layer_registry[dataset][layer.name] = layer
 
     def create_service_exception(self, code=None, text="", version="1.3.0"):