Merge branch 'dev'

Author: wolfidan

src/pyrad_proc/pyrad/flow/flow_aux.py

@@ -56,7 +56,8 @@
     _MPROFILE_AVAILABLE = False
 
 from pyrad import proc
-from ..io.config import read_config, DEFAULT_CONFIG
+from ..io.config import read_config
+from ..io.default_config import DEFAULT_CONFIG
 from ..io.read_data_radar import get_data
 from ..io.write_data import write_to_s3
 from ..io.io_aux import get_datetime, get_file_list, get_scan_list
@@ -1079,7 +1080,6 @@ def _create_cfg_dict(cfgfile):
     try:
         print("- Main config file : {}".format(cfgfile))
         cfg = read_config(cfg["configFile"], cfg=cfg, defaults=DEFAULT_CONFIG["main"])
-
         # Convert loc and prod config files to absolute paths if needed
         filenames = [
             "locationConfigFile",
@@ -1088,7 +1088,6 @@ def _create_cfg_dict(cfgfile):
         for fname in filenames:
             if not os.path.isabs(cfg[fname]):
                 cfg[fname] = os.path.join(cfg["configpath"], cfg[fname])
-
         print("- Location config file : {}".format(cfg["locationConfigFile"]))
         cfg = read_config(
             cfg["locationConfigFile"], cfg=cfg, defaults=DEFAULT_CONFIG["loc"]

src/pyrad_proc/pyrad/graph/plots_aux.py

@@ -34,6 +34,38 @@
 mpl.rcParams.update({"font.size": 16})
 mpl.rcParams.update({"font.family": "sans-serif"})
 
+_CARTOPY_AVAILABLE = False
+try:
+    from cartopy.io.img_tiles import GoogleTiles
+
+    # Define ESRI terrain tiles
+    class ShadedReliefESRI(GoogleTiles):
+        def __init__(self, cache):
+            super().__init__(self, cache=cache)
+            self.desired_tile_form = "RGB"
+
+        # shaded relief
+        def _image_url(self, tile):
+            x, y, z = tile
+            return (
+                f"https://server.arcgisonline.com/ArcGIS/rest/services/Elevation/"
+                f"World_Hillshade/MapServer/tile/{z}/{y}/{x}"
+            )
+
+    class OTM(GoogleTiles):
+        def __init__(self, cache):
+            super().__init__(self, cache=cache)
+            self.desired_tile_form = "RGB"
+
+        # OpenTopoMap
+        def _image_url(self, tile):
+            x, y, z = tile
+            return f"https://a.tile.opentopomap.org/{z}/{x}/{y}.png"
+
+    _CARTOPY_AVAILABLE = True
+except ImportError:
+    pass
+
 
 def generate_complex_range_Doppler_title(radar, field, ray, datetime_format=None):
     """

src/pyrad_proc/pyrad/graph/plots_grid.py

@@ -29,39 +29,11 @@
 import pyart
 
 from .plots_aux import get_norm
+from .plots_aux import _CARTOPY_AVAILABLE
 
-try:
+if _CARTOPY_AVAILABLE:
     import cartopy
-    from cartopy.io.img_tiles import GoogleTiles
-
-    # Define ESRI terrain tiles
-    class ShadedReliefESRI(GoogleTiles):
-        def __init__(self, cache):
-            super().__init__(self, cache=cache)
-            self.desired_tile_form = "RGB"
-
-        # shaded relief
-        def _image_url(self, tile):
-            x, y, z = tile
-            return (
-                f"https://server.arcgisonline.com/ArcGIS/rest/services/Elevation/"
-                f"World_Hillshade/MapServer/tile/{z}/{y}/{x}"
-            )
-
-    class OTM(GoogleTiles):
-        def __init__(self, cache):
-            super().__init__(self, cache=cache)
-            self.desired_tile_form = "RGB"
-
-        # OpenTopoMap
-        def _image_url(self, tile):
-            x, y, z = tile
-            return f"https://a.tile.opentopomap.org/{z}/{x}/{y}.png"
-
-    _CARTOPY_AVAILABLE = True
-except ImportError:
-    _CARTOPY_AVAILABLE = False
-
+    from .plots_aux import ShadedReliefESRI, OTM
 
 try:
     import pydda

src/pyrad_proc/pyrad/graph/plots_vol.py

@@ -27,6 +27,12 @@
     plot_field_coverage
 
 """
+from copy import deepcopy
+import numpy as np
+import os
+from netCDF4 import num2date
+import pyart
+import matplotlib.pyplot as plt
 
 from ..io.write_data import write_histogram
 from ..util.radar_utils import compute_histogram_sweep
@@ -36,47 +42,12 @@
 from .plots_aux import generate_complex_range_Doppler_title
 from .plots_aux import generate_fixed_rng_span_title
 from .plots_aux import get_colobar_label, get_norm, generate_fixed_rng_title
-import pyart
-import matplotlib.pyplot as plt
 from ..util import warn
-from copy import deepcopy
-
-import numpy as np
-import os
+from .plots_aux import _CARTOPY_AVAILABLE
 
-from netCDF4 import num2date
-
-try:
+if _CARTOPY_AVAILABLE:
     import cartopy
-    from cartopy.io.img_tiles import GoogleTiles
-
-    # Define ESRI terrain tiles
-    class ShadedReliefESRI(GoogleTiles):
-        def __init__(self):
-            super().__init__(self, cache=True)
-            self.desired_tile_form = "RGB"
-
-        # shaded relief
-        def _image_url(self, tile):
-            x, y, z = tile
-            return (
-                f"https://server.arcgisonline.com/ArcGIS/rest/services/Elevation/"
-                f"World_Hillshade/MapServer/tile/{z}/{y}/{x}"
-            )
-
-    class OTM(GoogleTiles):
-        def __init__(self):
-            super().__init__(self, cache=True)
-            self.desired_tile_form = "RGB"
-
-        # OpenTopoMap
-        def _image_url(self, tile):
-            x, y, z = tile
-            return f"https://a.tile.opentopomap.org/{z}/{x}/{y}.png"
-
-    _CARTOPY_AVAILABLE = True
-except ImportError:
-    _CARTOPY_AVAILABLE = False
+    from .plots_aux import ShadedReliefESRI, OTM
 
 try:
     import shapely

src/pyrad_proc/pyrad/io/__init__.py

@@ -213,7 +213,7 @@
 """
 
 from .config import read_config  # noqa
-
+from .default_config import DEFAULT_CONFIG  # noqa
 from .read_data_radar import get_data, add_field, interpol_field  # noqa
 
 from .read_data_icon import read_icon_data, read_icon_coord  # noqa