TNO Intern

Commit 242a6360 authored by Arjo Segers's avatar Arjo Segers
Browse files

Fixed reading settings for map styles.

parent aedfb69c

src/cso/cso_catalogue.py

+10 −9
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
# 2025-09, Arjo Segers

#   Updated plotting of gridded fields.

#   Extended unit conversions.

#   Fixed reading of settings for map styles.

#
@@ -362,7 +363,7 @@ class CSO_Catalogue(CSO_CatalogueBase): 
            figsize = eval(self.GetSetting("figsize"))



            # no-data color:

            color_nan = self.GetSetting("color_nan", default="0.80")

            color_nan = self.GetSetting("color_nan", default="0.90")

            # extra map properties:

            bmp_kwargs = self.GetSetting("map", totype="dict", default=dict())
@@ -714,7 +715,7 @@ class CSO_SimCatalogue(CSO_CatalogueBase): 
        figsize = eval(self.GetSetting("figsize"))



        # no-data color:

        color_nan = self.GetSetting("color_nan", default="0.80")

        color_nan = self.GetSetting("color_nan", default="0.90")

        # extra map properties:

        bmp_kwargs = self.GetSetting("map", totype="dict", default=dict())
@@ -788,20 +789,20 @@ class CSO_SimCatalogue(CSO_CatalogueBase): 
                        # settings for this variable:

                        vkey = "var.%s" % varname

                        # originating variable:

                        vsource = self.GetSetting("var.{varname}.source", default="data:" + varname)

                        vsource = self.GetSetting(f"var.{varname}.source", default="data:" + varname)

                        # target units:

                        vunits = self.GetSetting("var.{varname}.units", default="None")

                        vunits = self.GetSetting(f"var.{varname}.units", default="None")

                        # plot type:

                        ptype = self.GetSetting("var.{varname}.type", default="map")

                        ptype = self.GetSetting(f"var.{varname}.type", default="map")

                        # long name used in labels:

                        long_name = self.GetSetting("var.{varname}.long_name", default=varname)

                        long_name = self.GetSetting(f"var.{varname}.long_name", default=varname)



                        # switch:

                        if ptype == "map":

                            # style:

                            vmin = eval(self.GetSetting("var.{varname}.vmin", default="None"))

                            vmax = eval(self.GetSetting("var.{varname}.vmax", default="None"))

                            colors = eval(self.GetSetting("var.{varname}.colors", default="None"))

                            vmin = eval(self.GetSetting(f"var.{varname}.vmin", default="None"))

                            vmax = eval(self.GetSetting(f"var.{varname}.vmax", default="None"))

                            colors = eval(self.GetSetting(f"var.{varname}.colors", default="None"))



                            # variable source:

                            #    [data:]vname