Honour print layers in defaultBackgroundLayers

Author: manisandro

src/config_generator/capabilities_reader.py

@@ -44,12 +44,13 @@ def __init__(self, generator_config, logger, use_cached_project_metadata, cache_
 
     # WMS GetProjectSettings
 
-    def read_wms_service_capabilities(self, url, service_name, item):
+    def read_wms_service_capabilities(self, url, service_name, item, themes_config):
         """Load and parse WMS GetProjectSettings for a theme item.
 
         :param str url: service URL
         :param str service_name: service name
         :param object item: theme item
+        :param object themes_config: themes config
         """
 
         try:
@@ -180,7 +181,7 @@ def read_wms_service_capabilities(self, url, service_name, item):
 
             # collect internal print layers
             internal_print_layers = item.get('extraPrintLayers', [])
-            for bg_layer in item.get('backgroundLayers', []):
+            for bg_layer in item.get('backgroundLayers', themes_config.get('defaultBackgroundLayers', [])):
                 printLayer = bg_layer.get('printLayer', None)
                 if printLayer:
                     if isinstance(printLayer, str):

src/config_generator/theme_reader.py

@@ -49,7 +49,8 @@ def __init__(self, generator_config, themes_config, logger, print_layouts, use_c
         )
 
         self.read_metadata_for_group(
-            themes_config.get('themes', {})
+            themes_config.get('themes', {}),
+            themes_config
         )
 
     def wms_service_names(self):
@@ -65,16 +66,16 @@ def wfs_service_names(self):
                 wfs_services.append(service_name)
         return sorted(wfs_services)
 
-    def read_metadata_for_group(self, item_group):
+    def read_metadata_for_group(self, item_group, themes_config):
         """Recursively read theme metadata for theme item group."""
         for item in item_group.get('items', []):
-            self.read_metadata_for_theme(item)
+            self.read_metadata_for_theme(item, themes_config)
 
         for group in item_group.get('groups', []):
             # collect group items
-            self.read_metadata_for_group(group)
+            self.read_metadata_for_group(group, themes_config)
 
-    def read_metadata_for_theme(self, item):
+    def read_metadata_for_theme(self, item, themes_config):
         """Read theme metadata for a theme item.
 
         :param obj item: QWC2 themes config item.
@@ -88,7 +89,7 @@ def read_metadata_for_theme(self, item):
 
         self.logger.info("<b>Reading theme %s</b>" % url)
 
-        wms_capabilities = self.capabilities_reader.read_wms_service_capabilities(url, service_name, item)
+        wms_capabilities = self.capabilities_reader.read_wms_service_capabilities(url, service_name, item, themes_config)
 
         wfs_capabilities = {}
         if self.generate_wfs_services: