From 0fec96a422ce631ffb6218adb41ed19d52724106 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 13 Feb 2025 18:26:28 +0100 Subject: [PATCH] Don't look for existing legend images - the legend services already does it at runtime --- src/config_generator/legend_service_config.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/config_generator/legend_service_config.py b/src/config_generator/legend_service_config.py index 8f43110..f50afdc 100644 --- a/src/config_generator/legend_service_config.py +++ b/src/config_generator/legend_service_config.py @@ -26,17 +26,16 @@ def __init__(self, generator_config, themes_reader, config_models, """ super().__init__('legend', schema_url, service_config, logger) + self.config_models = config_models + self.permissions_query = PermissionsQuery(config_models, logger) + # get default QGIS server URL from ConfigGenerator config self.default_qgis_server_url = generator_config.get( 'default_qgis_server_url', 'http://localhost:8001/ows/' ).rstrip('/') + '/' - self.legend_images_path = None self.themes_reader = themes_reader - self.config_models = config_models - self.permissions_query = PermissionsQuery(config_models, logger) - def config(self): """Return service config.""" # get base config @@ -50,7 +49,6 @@ def config(self): cfg_config['default_qgis_server_url'] = \ self.default_qgis_server_url - self.legend_images_path = cfg_config['legend_images_path'] config['config'] = cfg_config resources = OrderedDict() @@ -134,16 +132,6 @@ def collect_wms_layers(self, layer, mapid): wms_layer = OrderedDict() wms_layer['name'] = layer['name'] - layer_legend_images_path = os.path.join( - self.legend_images_path, mapid, layer['name']) - - # Look for already existing legend images in self.legend_images_path, - # without looking at the file extensions - legend_image_path_candidates = glob.glob(layer_legend_images_path + ".*") - if legend_image_path_candidates: - # If there are multiple images found, then just take the first one - wms_layer['legend_image'] = legend_image_path_candidates[0] - if 'layers' in layer: # group layer sublayers = []