maps4fs 2.9.32__py3-none-any.whl → 2.9.33__py3-none-any.whl

maps4fs/generator/component/texture.py

@@ -7,6 +7,7 @@ import os
 import shutil
 import warnings
 from collections import defaultdict
+from time import perf_counter
 from typing import Any, Callable, Generator, Optional
 
 import cv2
@@ -815,6 +816,7 @@ class Texture(ImageComponent):
 
         ox_settings.use_cache = self.map.texture_settings.use_cache
         ox_settings.requests_timeout = 30
+        ox_settings.log_console = True
 
         objects = self.fetch_osm_data(tags)
         if objects is None or objects.empty:
@@ -843,7 +845,14 @@ class Texture(ImageComponent):
                     warnings.simplefilter("ignore", FutureWarning)
                     objects = ox.features_from_xml(self.map.custom_osm, tags=tags)
             else:
+                ox_start_time = perf_counter()
+                self.logger.info("------------------------------------------")
+                self.logger.info("Fetching OSM data for tags: %s.", tags)
                 objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
+                self.logger.info("Fetched %s objects for tags: %s.", len(objects), tags)
+                ox_end_time = perf_counter()
+                self.logger.info("OSM data fetch time: %.2f seconds.", ox_end_time - ox_start_time)
+                self.logger.info("------------------------------------------")
         except Exception as e:
             self.logger.debug("Error fetching objects for tags: %s. Error: %s.", tags, e)
             return None

maps4fs/generator/config.py

@@ -51,11 +51,19 @@ def ensure_templates():
     If MFS_TEMPLATES_DIR is empty or doesn't exist, clone the maps4fsdata
     repository and run the preparation script to populate it.
     """
-
     # Check if templates directory exists and has content
-    if os.path.exists(MFS_TEMPLATES_DIR) and os.listdir(MFS_TEMPLATES_DIR):
-        logger.info("Templates directory already exists and contains data: %s", MFS_TEMPLATES_DIR)
-        return
+    if os.path.exists(MFS_TEMPLATES_DIR):  # and os.listdir(MFS_TEMPLATES_DIR):
+        logger.info("Templates directory already exists: %s", MFS_TEMPLATES_DIR)
+
+        files = [
+            entry
+            for entry in os.listdir(MFS_TEMPLATES_DIR)
+            if os.path.isfile(os.path.join(MFS_TEMPLATES_DIR, entry))
+        ]
+
+        if files:
+            logger.info("Templates directory contains files and will not be modified.")
+            return
 
     logger.info("Templates directory is empty or missing, preparing data...")
 
@@ -156,6 +164,27 @@ def ensure_template_subdirs() -> None:
     logger.info("Templates directory is ready at: %s", MFS_TEMPLATES_DIR)
 
 
+def reload_templates() -> None:
+    """Reload templates by removing existing files and re-preparing them.
+    Does not affect nested directories containing user data.
+    If needed, the files should be removed manually.
+    """
+    logger.info("Reloading templates...")
+    # Remove files from the templates directory.
+    # But do not remove nested directories, because they contain user data.
+    # Only remove files in the top-level templates directory.
+    for item in os.listdir(MFS_TEMPLATES_DIR):
+        item_path = os.path.join(MFS_TEMPLATES_DIR, item)
+        if os.path.isfile(item_path):
+            try:
+                os.remove(item_path)
+            except Exception as e:
+                logger.warning("Could not remove file %s: %s", item_path, str(e))
+    ensure_templates()
+    ensure_template_subdirs()
+    logger.info("Templates reloaded successfully.")
+
+
 ensure_templates()
 ensure_template_subdirs()
 

{maps4fs-2.9.32.dist-info → maps4fs-2.9.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.9.32
+Version: 2.9.33
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: GNU Affero General Public License v3.0

{maps4fs-2.9.32.dist-info → maps4fs-2.9.33.dist-info}/RECORD

@@ -1,7 +1,7 @@
 maps4fs/__init__.py,sha256=5ixsCA5vgcIV0OrF9EJBm91Mmc_KfMiDRM-QyifMAvo,386
 maps4fs/logger.py,sha256=aZAa9glzgvH6ySVDLelSPTwHfWZtpGK5YBl-ufNUsPg,801
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/config.py,sha256=_s5pLpATVF-hwpcVquDUOhochD1RghPJczwyKepXtrc,7889
+maps4fs/generator/config.py,sha256=gLYch5ZTmuJ4Bo9EKzwutZVpOHsTVlY90gSFLkzegmk,9035
 maps4fs/generator/game.py,sha256=bflRv0lxJ9-wkRvauh0k0RzIgF7zVWguygqQLcC7U-s,18457
 maps4fs/generator/map.py,sha256=9F3PaoK63sbhNONvHN46k62-ZFMBQy5qvu9T193gwWs,16045
 maps4fs/generator/monitor.py,sha256=Yrc7rClpmJK53SRzrOYZNBlwJmb5l6TkW-laFbyBEno,3524
@@ -18,14 +18,14 @@ maps4fs/generator/component/grle.py,sha256=FAcGmG7yq0icOElRoO4QMsVisZMsNrLhfNSWv
 maps4fs/generator/component/i3d.py,sha256=qB18jQWfWjlTiaZ4fHd16vv359hN2YHRLzGTZuJnbbU,27166
 maps4fs/generator/component/layer.py,sha256=-MHnIXyJ7Xth9wOcjJCX-XkXBIYYv23lRRGbQ0XlHdU,7602
 maps4fs/generator/component/satellite.py,sha256=1bPqd8JqAPqU0tEI9m-iuljMW9hXqlaCIxvq7kdpMY0,5219
-maps4fs/generator/component/texture.py,sha256=pmX8KE96dJAwzhnOe_ed-1In6sOLXs8-qdJ0aPc-ePM,38526
+maps4fs/generator/component/texture.py,sha256=tr0hyTdQew388FbqeK_gCEdzMJ9mX_5NPLkNN6uCg24,39108
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=-7H3donrH19f0_rivNyI3fgLsiZkntXfGywEx4tOnM4,23924
 maps4fs/generator/component/base/component_image.py,sha256=GXFkEFARNRkWkDiGSjvU4WX6f_8s6R1t2ZYqZflv1jk,9626
 maps4fs/generator/component/base/component_mesh.py,sha256=2wGe_-wAZVRljMKzzVJ8jdzIETWg7LjxGj8A3inH5eI,25550
 maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
-maps4fs-2.9.32.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
-maps4fs-2.9.32.dist-info/METADATA,sha256=4X4Nut1e-f0FRrwMLVvJy1LZwUxhs4JH6C1KAleQ4Yk,10213
-maps4fs-2.9.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.9.32.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.9.32.dist-info/RECORD,,
+maps4fs-2.9.33.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
+maps4fs-2.9.33.dist-info/METADATA,sha256=WV4lKidF0KkY8h1Nx4sqGGq-jy6dvsTAX7vmZX3T0HI,10213
+maps4fs-2.9.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.9.33.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.9.33.dist-info/RECORD,,