backed out reverse colormap style changes

RENCI · Feb 2, 2024 · 32d1120 · 32d1120
1 parent 8a26cbd
commit 32d1120
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/load-geoserver-images.py b/load-geoserver-images.py
@@ -158,7 +158,7 @@ def add_s3_coveragestore(logger, geo, s3_url, instance_id, worksp, layergrp):
             title, meta_dict = update_layer_title(logger, geo, instance_id, worksp, store_name)
 
             # set the default style for this layer - maxele style for now
-            style_name = "maxele_env_style_v2_rev"
+            style_name = "maxele_env_style_v2"
             geo.set_default_style(worksp, store_name, style_name)
 
             # TODO: DO WE NEED THIS?
@@ -205,12 +205,12 @@ def add_imagemosaic_coveragestore(logger, geo, url, instance_id, worksp, imagemo
 
             # set the default style for this layer
             if "swan" in layer_name:
-                style_name = f"{layer_name.split('_')[1]}_env_style_v2_rev"
-            #elif "maxele" in layer_name:
+                style_name = f"{layer_name.split('_')[1]}_env_style_v2"
+            elif "maxele" in layer_name:
                 # style_name = f"{layer_name.split('_')[1][:-2]}_env_style_v2"
-                #style_name = f"{layer_name.split('_')[1][:-2]}_env_style_v2_rev"
+                style_name = f"{layer_name.split('_')[1][:-2]}_env_style_rick"
             else:
-                style_name = f"{layer_name.split('_')[1][:-2]}_env_style_v2_rev"
+                style_name = f"{layer_name.split('_')[1][:-2]}_env_style"
             geo.set_default_style(worksp, layer_name, style_name)
 
             # update DB with url of layer for access from website NEED INSTANCE ID for this
@@ -264,7 +264,7 @@ def add_kalpana_coveragestore(logger, geo, url, instance_id, worksp, kalpana_pat
                 title, meta_dict = update_layer_title(logger, geo, instance_id, worksp, title_layer_name, kalpana=True)
 
                 # set the default style for this layer
-                geo.set_default_style(worksp, layer_name, 'maxele_env_style_v2_rev')
+                geo.set_default_style(worksp, layer_name, 'maxele_env_style_v2')
 
                 # update DB with url of layer for access from website NEED INSTANCE ID for this
                 layer_url = f'{url}/{worksp}/wcs?service=WCS&version=1.1.1&request=DescribeCoverage&identifiers={worksp}:{layer_name}'

diff --git a/terria_catalogV8DB.py b/terria_catalogV8DB.py
@@ -463,11 +463,11 @@ def get_datestr_from_title(self, title):
     def get_wms_style(self, layername):
 
         if self.MAXWVEL_STYLE in layername:
-            return f'{self.MAXWVEL_STYLE}_env_style_v2_rev'
+            return f'{self.MAXWVEL_STYLE}_env_style'
         elif self.SWAN_STYLE in layername:
-            return f'{self.SWAN_STYLE}_env_style_v2_rev'
+            return f'{self.SWAN_STYLE}_env_style_v2'
         else:
-            return f'{self.MAXELE_STYLE}_env_style_v2_rev'
+            return f'{self.MAXELE_STYLE}_env_style_v2'
 
 
     # create an info section for this group item