Don't re-generate theme thumbnail when using cached project metadata

Author: manisandro

src/config_generator/map_viewer_config.py

@@ -571,14 +571,21 @@ def get_thumbnail(self, cfg_item, service_name, capabilities, assets_dir):
                 thumbnail_directory, thumbnail_filename)
 
         if os.path.exists(thumbnail_path):
-            self.logger.info("Found existing thumbnail %s for theme %s" % (
+            self.logger.info("Using manually provided thumbnail %s for theme %s" % (
                 thumbnail_filename, service_name))
             return os.path.join('img/mapthumbs', thumbnail_filename)
 
         if self.use_default_map_thumbnail:
             self.logger.info("Using default map thumbnail for " + service_name)
             return os.path.join('img/mapthumbs', 'default.jpg')
 
+        basename = cfg_item["url"].rsplit("/")[-1].rstrip("?") + ".png"
+        thumbnail = os.path.join(assets_dir, "img/genmapthumbs", basename)
+        if self.use_cached_project_metadata:
+            if os.path.isfile(thumbnail):
+                self.logger.info("Using pre-existing autogenerated thumbnail for " + service_name)
+                return 'img/genmapthumbs/' + basename
+
         self.logger.info("Using WMS GetMap to generate thumbnail for " + service_name)
 
         root_layer = capabilities.get('root_layer', {})
@@ -643,13 +650,11 @@ def get_thumbnail(self, cfg_item, service_name, capabilities, assets_dir):
 
             document = response.content
 
-            basename = cfg_item["url"].rsplit("/")[-1].rstrip("?") + ".png"
             try:
                 os.makedirs(os.path.join(assets_dir, "img/genmapthumbs/"))
             except Exception as e:
                 if not isinstance(e, FileExistsError):
                     self.logger.warn("The directory for auto generated thumbnails could not be created\n %s" % (str(e)))
-            thumbnail = os.path.join(assets_dir, "img/genmapthumbs", basename)
             with open(thumbnail, "wb") as fh:
                 fh.write(document)
             return 'img/genmapthumbs/' + basename