maps4fs 2.5.3__py3-none-any.whl → 2.5.4__py3-none-any.whl

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/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.dist-info → maps4fs-2.5.4.dist-info}/METADATA

@@ -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.dist-info → maps4fs-2.5.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 maps4fs/__init__.py,sha256=5ixsCA5vgcIV0OrF9EJBm91Mmc_KfMiDRM-QyifMAvo,386
 maps4fs/logger.py,sha256=6sem0aFKQqtVjQ_yNu9iGcc-hqzLQUhfxco05K6nqow,763
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/config.py,sha256=kFGeChqHUqqDoMpu1ieQpUg5d8DmqFL7yD0_LadFN44,6159
+maps4fs/generator/config.py,sha256=8eWdMTizo47aYVuOQbhxrgIBMsDtrDIZ01KCFI14UUM,6460
 maps4fs/generator/game.py,sha256=nf6iuYNA5NJc-ir_WOgkw-MdJVgetVHeEtxbWJYt3Vo,14462
-maps4fs/generator/map.py,sha256=_eVfdGzE9HZCY0sRyGP8fBdCcVuYomREcmgKiAsmcjo,12881
+maps4fs/generator/map.py,sha256=ZTkTlQhBcKB_sMapua_QfaD0moc2MJ-kQix2lWD6pUk,12885
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=WvuNe9-aqiEABjGP_ySsZi_HU6OnJFvBbMVhkm_cf4k,12923
 maps4fs/generator/statistics.py,sha256=Dp1-NS-DWv0l0UdmhOoXeQs_N-Hs7svYUnmziSW5Z9I,2098
@@ -22,8 +22,8 @@ maps4fs/generator/component/base/component.py,sha256=lf0V9CLUXMg88Nm2yI3rP5taVYY
 maps4fs/generator/component/base/component_image.py,sha256=WTGC6v1KuS5sLNCC95Z48nCspvATKKNOuhTNYzTWXr4,8315
 maps4fs/generator/component/base/component_mesh.py,sha256=3hC-qDT8Vde6SmRMqs9USAkrF-gL2dDTYW71ATpxUS4,9130
 maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
-maps4fs-2.5.3.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
-maps4fs-2.5.3.dist-info/METADATA,sha256=TUPpvg5-KvFRJJzI_nfIG6bt2XIDk_hsU4rgESV7zac,10113
-maps4fs-2.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.5.3.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.5.3.dist-info/RECORD,,
+maps4fs-2.5.4.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
+maps4fs-2.5.4.dist-info/METADATA,sha256=cUIlIjfVwW0PV4Wm7An13RXBGR5xOvxsCv2qWa9cnKo,10113
+maps4fs-2.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.5.4.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.5.4.dist-info/RECORD,,