maps4fs 2.5.3__tar.gz → 2.5.4__tar.gz

{maps4fs-2.5.3 → maps4fs-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.5.3
+Version: 2.5.4
 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.5.3 → maps4fs-2.5.4}/maps4fs/generator/config.py

@@ -21,10 +21,23 @@ os.makedirs(MFS_DEM_DEFAULTS_DIR, exist_ok=True)
 DEFAULT_OSM_PATH = os.path.join(MFS_OSM_DEFAULTS_DIR, "custom_osm.osm")
 DEFAULT_DEM_PATH = os.path.join(MFS_DEM_DEFAULTS_DIR, "custom_dem.png")
 
-DEFAULT_OSM = DEFAULT_OSM_PATH if os.path.isfile(DEFAULT_OSM_PATH) else None
-DEFAULT_DEM = DEFAULT_DEM_PATH if os.path.isfile(DEFAULT_DEM_PATH) else None
-logger.info("Default OSM: %s", DEFAULT_OSM)
-logger.info("Default DEM: %s", DEFAULT_DEM)
+
+def default_osm() -> str | None:
+    """Get the path to the default OSM file if it exists.
+
+    Returns:
+        str | None: The path to the default OSM file, or None if it doesn't exist.
+    """
+    return DEFAULT_OSM_PATH if os.path.isfile(DEFAULT_OSM_PATH) else None
+
+
+def default_dem() -> str | None:
+    """Get the path to the default DEM file if it exists.
+
+    Returns:
+        str | None: The path to the default DEM file, or None if it doesn't exist.
+    """
+    return DEFAULT_DEM_PATH if os.path.isfile(DEFAULT_DEM_PATH) else None
 
 
 def ensure_templates():

{maps4fs-2.5.3 → maps4fs-2.5.4}/maps4fs/generator/map.py

@@ -66,7 +66,7 @@ class Map:
         # endregion
 
         # region custom OSM properties
-        self.custom_osm = custom_osm or mfscfg.DEFAULT_OSM
+        self.custom_osm = custom_osm or mfscfg.default_osm()
         if custom_osm and not os.path.isfile(custom_osm):
             raise FileNotFoundError(f"Custom OSM file {custom_osm} does not exist.")
         mfsutils.check_and_fix_osm(self.custom_osm, save_directory=self.map_directory)
@@ -126,7 +126,7 @@ class Map:
         self.shared_settings = SharedSettings()
         self.components: list[Component] = []
         custom_dem = kwargs.get("custom_background_path", None)
-        self.custom_background_path = custom_dem or mfscfg.DEFAULT_DEM
+        self.custom_background_path = custom_dem or mfscfg.default_dem()
 
     def process_settings(self) -> None:
         """Checks the settings by predefined rules and updates them accordingly."""

{maps4fs-2.5.3 → maps4fs-2.5.4}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.5.3
+Version: 2.5.4
 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.5.3 → maps4fs-2.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.5.3"
+version = "2.5.4"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "GNU Affero General Public License v3.0"}