diff --git a/src/config_generator/feature_info_service_config.py b/src/config_generator/feature_info_service_config.py index 8cfc581..c5924ae 100644 --- a/src/config_generator/feature_info_service_config.py +++ b/src/config_generator/feature_info_service_config.py @@ -47,14 +47,9 @@ def config(self): config['service'] = 'feature-info' # additional service config - cfg_config = self.service_config.get('config', {}) - if 'default_qgis_server_url' not in cfg_config: - # use default QGIS server URL from ConfigGenerator config - # if not set in service config - cfg_config['default_qgis_server_url'] = \ - self.default_qgis_server_url - - config['config'] = cfg_config + config['config'] = self.service_config.get('config', {}) + # Use default_qgis_server_url from ConfigGenerator config if not explicitly set + config['default_qgis_server_url'] = config.get('default_qgis_server_url', self.default_qgis_server_url) resources = OrderedDict() config['resources'] = resources diff --git a/src/config_generator/legend_service_config.py b/src/config_generator/legend_service_config.py index 100a3a4..335506f 100644 --- a/src/config_generator/legend_service_config.py +++ b/src/config_generator/legend_service_config.py @@ -43,15 +43,9 @@ def config(self): config = super().config() # additional service config - cfg_config = self.service_config.get('config', {}) - if 'default_qgis_server_url' not in cfg_config: - # use default QGIS server URL from ConfigGenerator config - # if not set in service config - cfg_config['default_qgis_server_url'] = \ - self.default_qgis_server_url - - self.legend_images_path = cfg_config['legend_images_path'] - config['config'] = cfg_config + config['config'] = self.service_config.get('config', {}) + # Use default_qgis_server_url from ConfigGenerator config if not explicitly set + config['default_qgis_server_url'] = config.get('default_qgis_server_url', self.default_qgis_server_url) resources = OrderedDict() config['resources'] = resources diff --git a/src/config_generator/ogc_service_config.py b/src/config_generator/ogc_service_config.py index 6892765..773e3d7 100644 --- a/src/config_generator/ogc_service_config.py +++ b/src/config_generator/ogc_service_config.py @@ -42,14 +42,9 @@ def config(self): config = super().config() # additional service config - cfg_config = self.service_config.get('config', {}) - if 'default_qgis_server_url' not in cfg_config: - # use default QGIS server URL from ConfigGenerator config - # if not set in service config - cfg_config['default_qgis_server_url'] = \ - self.default_qgis_server_url - - config['config'] = cfg_config + config['config'] = self.service_config.get('config', {}) + # Use default_qgis_server_url from ConfigGenerator config if not explicitly set + config['default_qgis_server_url'] = config.get('default_qgis_server_url', self.default_qgis_server_url) resources = OrderedDict() config['resources'] = resources