Skip to content

Commit

Permalink
Don't look for existing legend images - the legend services already d…
Browse files Browse the repository at this point in the history
…oes it at runtime
  • Loading branch information
manisandro committed Feb 13, 2025
1 parent c538fee commit 0fec96a
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions src/config_generator/legend_service_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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 = []
Expand Down

0 comments on commit 0fec96a

Please sign in to comment.