maps4fs 2.6.1__tar.gz → 2.7.0__tar.gz

{maps4fs-2.6.1 → maps4fs-2.7.0}/PKG-INFO

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

@@ -12,38 +12,30 @@ from maps4fs.logger import Logger
 logger = Logger()
 
 MFS_TEMPLATES_DIR = os.path.join(os.getcwd(), "templates")
+
 MFS_DEFAULTS_DIR = os.path.join(os.getcwd(), "defaults")
 MFS_DEM_DEFAULTS_DIR = os.path.join(MFS_DEFAULTS_DIR, "dem")
 MFS_OSM_DEFAULTS_DIR = os.path.join(MFS_DEFAULTS_DIR, "osm")
-os.makedirs(MFS_OSM_DEFAULTS_DIR, exist_ok=True)
-os.makedirs(MFS_DEM_DEFAULTS_DIR, exist_ok=True)
-logger.info("MFS_TEMPLATES_DIR: %s. MFS_DEFAULTS_DIR: %s.", MFS_TEMPLATES_DIR, MFS_DEFAULTS_DIR)
-
-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")
-logger.info("DEFAULT_OSM_PATH: %s. DEFAULT_DEM_PATH: %s.", DEFAULT_OSM_PATH, DEFAULT_DEM_PATH)
-
-
-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.
-    """
-    res = DEFAULT_OSM_PATH if os.path.isfile(DEFAULT_OSM_PATH) else None
-    logger.info("Default OSM in %s, result: %s", DEFAULT_OSM_PATH, res)
-    return res
+MFS_MSETTINGS_DEFAULTS_DIR = os.path.join(MFS_DEFAULTS_DIR, "main_settings")
+MFS_GSETTINGS_DEFAULTS_DIR = os.path.join(MFS_DEFAULTS_DIR, "generation_settings")
+default_dirs = [
+    MFS_DEM_DEFAULTS_DIR,
+    MFS_OSM_DEFAULTS_DIR,
+    MFS_MSETTINGS_DEFAULTS_DIR,
+    MFS_GSETTINGS_DEFAULTS_DIR,
+]
+for directory in default_dirs:
+    os.makedirs(directory, exist_ok=True)
 
-
-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.
-    """
-    res = DEFAULT_DEM_PATH if os.path.isfile(DEFAULT_DEM_PATH) else None
-    logger.info("Default DEM in %s, result: %s", DEFAULT_DEM_PATH, res)
-    return res
+logger.info("MFS_TEMPLATES_DIR: %s. MFS_DEFAULTS_DIR: %s.", MFS_TEMPLATES_DIR, MFS_DEFAULTS_DIR)
+logger.info(
+    "MFS_DEM_DEFAULTS_DIR: %s. MFS_OSM_DEFAULTS_DIR: %s. "
+    "MFS_MSETTINGS_DEFAULTS_DIR: %s. MFS_GSETTINGS_DEFAULTS_DIR: %s.",
+    MFS_DEM_DEFAULTS_DIR,
+    MFS_OSM_DEFAULTS_DIR,
+    MFS_MSETTINGS_DEFAULTS_DIR,
+    MFS_GSETTINGS_DEFAULTS_DIR,
+)
 
 
 def ensure_templates():

{maps4fs-2.6.1 → maps4fs-2.7.0}/maps4fs/generator/map.py

@@ -66,10 +66,23 @@ class Map:
         # endregion
 
         # region custom OSM properties
-        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)
+        mfsutils.check_and_fix_osm(custom_osm, save_directory=self.map_directory)
+        self.custom_osm = custom_osm
+        # endregion
+
+        # region custom DEM handling
+        self.custom_background_path: str | None = None
+        custom_dem = kwargs.get("custom_background_path", None)
+        if custom_dem and not os.path.isfile(custom_dem):
+            raise FileNotFoundError(f"Custom DEM file {custom_dem} does not exist.")
+
+        # Make a copy of the custom DEM to the map directory.
+        if custom_dem:
+            save_path = os.path.join(self.map_directory, os.path.basename(custom_dem))
+            shutil.copyfile(custom_dem, save_path)
+            self.custom_background_path = save_path
         # endregion
 
         # region main settings
@@ -125,9 +138,6 @@ 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.logger.info("Custom DEM path: %s", self.custom_background_path)
 
     def process_settings(self) -> None:
         """Checks the settings by predefined rules and updates them accordingly."""

{maps4fs-2.6.1 → maps4fs-2.7.0}/maps4fs/generator/settings.py

@@ -323,6 +323,7 @@ class MainSettings(NamedTuple):
     rotation: int
     dtm_provider: str
     custom_osm: bool
+    custom_dem: bool
     is_public: bool
     date: str
     time: str
@@ -358,6 +359,7 @@ class MainSettings(NamedTuple):
             "rotation": self.rotation,
             "dtm_provider": self.dtm_provider,
             "custom_osm": self.custom_osm,
+            "custom_dem": self.custom_dem,
             "is_public": self.is_public,
             "date": self.date,
             "time": self.time,
@@ -388,6 +390,7 @@ class MainSettings(NamedTuple):
             rotation=map.rotation,
             dtm_provider=map.dtm_provider.name(),
             custom_osm=bool(map.custom_osm),
+            custom_dem=bool(map.custom_background_path),
             is_public=map.kwargs.get("is_public", False),
             date=datetime.now().strftime("%Y-%m-%d"),
             time=datetime.now().strftime("%H:%M:%S"),

{maps4fs-2.6.1 → maps4fs-2.7.0}/maps4fs.egg-info/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.6.1"
+version = "2.7.0"
 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"}