maps4fs 2.1.8__tar.gz → 2.2.0__tar.gz

{maps4fs-2.1.8 → maps4fs-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.8
+Version: 2.2.0
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

maps4fs-2.2.0/maps4fs/generator/config.py

@@ -0,0 +1,93 @@
+"""This module contains configuration files for the maps4fs generator."""
+
+import os
+import shutil
+import subprocess
+
+from osmnx import settings as ox_settings
+
+from maps4fs.logger import Logger
+
+logger = Logger()
+
+DEFAULT_TEMPLATES_DIR = os.path.join(os.getcwd(), "data")
+MFS_TEMPLATES_DIR = os.getenv("MFS_TEMPLATES_DIRECTORY")
+if MFS_TEMPLATES_DIR is None:
+    logger.info("MFS_TEMPLATES_DIRECTORY is not set. Using default templates directory.")
+    MFS_TEMPLATES_DIR = DEFAULT_TEMPLATES_DIR
+else:
+    logger.info("MFS_TEMPLATES_DIRECTORY is set to: %s", MFS_TEMPLATES_DIR)
+    if not os.path.isdir(MFS_TEMPLATES_DIR):
+        logger.info("Templates directory %s does not exist. Creating it.", MFS_TEMPLATES_DIR)
+        os.makedirs(MFS_TEMPLATES_DIR, exist_ok=True)
+
+    # Check if there any files (directory is empty).
+    if not os.listdir(MFS_TEMPLATES_DIR):
+        logger.info("Templates directory %s is empty. Copying default files.", MFS_TEMPLATES_DIR)
+        for item in os.listdir(DEFAULT_TEMPLATES_DIR):
+            s = os.path.join(DEFAULT_TEMPLATES_DIR, item)
+            d = os.path.join(MFS_TEMPLATES_DIR, item)
+            if os.path.isdir(s):
+                shutil.copytree(s, d, False, None)
+            else:
+                shutil.copy2(s, d)
+        logger.info("Default files copied to %s.", MFS_TEMPLATES_DIR)
+    else:
+        logger.warning(
+            "Templates directory %s is not empty. Will not copy default files. "
+            "Ensure that the directory contains the necessary template files.",
+            MFS_TEMPLATES_DIR,
+        )
+
+MFS_ROOT_DIR = os.getenv("MFS_ROOT_DIRECTORY", os.path.join(os.getcwd(), "mfsrootdir"))
+MFS_CACHE_DIR = os.path.join(MFS_ROOT_DIR, "cache")
+MFS_DATA_DIR = os.path.join(MFS_ROOT_DIR, "data")
+os.makedirs(MFS_CACHE_DIR, exist_ok=True)
+os.makedirs(MFS_DATA_DIR, exist_ok=True)
+logger.info(
+    "MFS_ROOT_DIR: %s. MFS_CACHE_DIR: %s. MFS_DATA_DIR: %s.",
+    MFS_ROOT_DIR,
+    MFS_CACHE_DIR,
+    MFS_DATA_DIR,
+)
+
+DTM_CACHE_DIR = os.path.join(MFS_CACHE_DIR, "dtm")
+SAT_CACHE_DIR = os.path.join(MFS_CACHE_DIR, "sat")
+
+osmnx_cache = os.path.join(MFS_CACHE_DIR, "osmnx")
+osmnx_data = os.path.join(MFS_CACHE_DIR, "odata")
+os.makedirs(osmnx_cache, exist_ok=True)
+os.makedirs(osmnx_data, exist_ok=True)
+
+
+ox_settings.cache_folder = osmnx_cache
+ox_settings.data_folder = osmnx_data
+
+
+def get_package_version(package_name: str) -> str:
+    """Get the package version.
+
+    Arguments:
+        package_name (str): The name of the package to check.
+
+    Returns:
+        str: The version of the package, or "unknown" if it cannot be determined.
+    """
+    try:
+        result = subprocess.run(
+            [os.sys.executable, "-m", "pip", "show", package_name],  # type: ignore
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True,
+        )
+        for line in result.stdout.splitlines():
+            if line.startswith("Version:"):
+                return line.split(":", 1)[1].strip()
+        return "unknown"
+    except Exception:
+        return "unknown"
+
+
+PACKAGE_VERSION = get_package_version("maps4fs")
+logger.info("maps4fs version: %s", PACKAGE_VERSION)

{maps4fs-2.1.8 → maps4fs-2.2.0}/maps4fs/generator/game.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 
 import os
 
+import maps4fs.generator.config as mfscfg
 from maps4fs.generator.component.background import Background
 from maps4fs.generator.component.config import Config
 from maps4fs.generator.component.grle import GRLE
@@ -13,8 +14,6 @@ from maps4fs.generator.component.i3d import I3d
 from maps4fs.generator.component.satellite import Satellite
 from maps4fs.generator.component.texture import Texture
 
-working_directory = os.getcwd()
-
 
 class Game:
     """Class used to define different versions of the game for which the map is generated.
@@ -34,10 +33,10 @@ class Game:
     code: str | None = None
     dem_multipliyer: int = 2
     _additional_dem_name: str | None = None
-    _map_template_path: str | None = None
-    _texture_schema: str | None = None
-    _grle_schema: str | None = None
-    _tree_schema: str | None = None
+    _map_template_file: str | None = None
+    _texture_schema_file: str | None = None
+    _grle_schema_file: str | None = None
+    _tree_schema_file: str | None = None
     _i3d_processing: bool = True
     _plants_processing: bool = True
     _environment_processing: bool = True
@@ -50,6 +49,27 @@ class Game:
     def __init__(self, map_template_path: str | None = None):
         if map_template_path:
             self._map_template_path = map_template_path
+        else:
+            if not self._map_template_file:
+                raise ValueError("Map template file not set.")
+            self._map_template_path = os.path.join(
+                mfscfg.MFS_TEMPLATES_DIR, self._map_template_file  # type: ignore
+            )
+
+        if not self._texture_schema_file:
+            self._texture_schema = None
+        else:
+            self._texture_schema = os.path.join(mfscfg.MFS_TEMPLATES_DIR, self._texture_schema_file)  # type: ignore
+
+        if not self._grle_schema_file:
+            self._grle_schema = None
+        else:
+            self._grle_schema = os.path.join(mfscfg.MFS_TEMPLATES_DIR, self._grle_schema_file)  # type: ignore
+
+        if not self._tree_schema_file:
+            self._tree_schema = None
+        else:
+            self._tree_schema = os.path.join(mfscfg.MFS_TEMPLATES_DIR, self._tree_schema_file)  # type: ignore
 
     def set_components_by_names(self, component_names: list[str]) -> None:
         """Sets the components used for map generation by their names.
@@ -297,8 +317,8 @@ class FS22(Game):
     """Class used to define the game version FS22."""
 
     code = "FS22"
-    _map_template_path = os.path.join(working_directory, "data", "fs22-map-template.zip")
-    _texture_schema = os.path.join(working_directory, "data", "fs22-texture-schema.json")
+    _map_template_file = "fs22-map-template.zip"
+    _texture_schema_file = "fs22-texture-schema.json"
     _i3d_processing = False
     _environment_processing = False
     _fog_processing = False
@@ -342,10 +362,10 @@ class FS25(Game):
     code = "FS25"
     dem_multipliyer: int = 2
     _additional_dem_name = "unprocessedHeightMap.png"
-    _map_template_path = os.path.join(working_directory, "data", "fs25-map-template.zip")
-    _texture_schema = os.path.join(working_directory, "data", "fs25-texture-schema.json")
-    _grle_schema = os.path.join(working_directory, "data", "fs25-grle-schema.json")
-    _tree_schema = os.path.join(working_directory, "data", "fs25-tree-schema.json")
+    _map_template_file = "fs25-map-template.zip"
+    _texture_schema_file = "fs25-texture-schema.json"
+    _grle_schema_file = "fs25-grle-schema.json"
+    _tree_schema_file = "fs25-tree-schema.json"
 
     def dem_file_path(self, map_directory: str) -> str:
         """Returns the path to the DEM file.

{maps4fs-2.1.8 → maps4fs-2.2.0}/maps4fs/generator/map.py

@@ -96,6 +96,7 @@ class Map:
                 "longitude": coordinates[1],
                 "country": self.get_country_by_coordinates(),
                 "size": size,
+                "output_size": self.output_size,
                 "rotation": rotation,
                 "dtm_provider": dtm_provider.name(),
                 "custom_osm": bool(custom_osm),

{maps4fs-2.1.8 → maps4fs-2.2.0}/maps4fs/generator/settings.py

@@ -307,6 +307,7 @@ class MainSettings(NamedTuple):
     longitude: float
     country: str
     size: int
+    output_size: int | None
     rotation: int
     dtm_provider: str
     custom_osm: bool
@@ -342,6 +343,7 @@ class MainSettings(NamedTuple):
             "longitude": self.longitude,
             "country": self.country,
             "size": self.size,
+            "output_size": self.output_size,
             "rotation": self.rotation,
             "dtm_provider": self.dtm_provider,
             "custom_osm": self.custom_osm,

{maps4fs-2.1.8 → maps4fs-2.2.0}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.8
+Version: 2.2.0
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.8 → maps4fs-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.1.8"
+version = "2.2.0"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "Apache License 2.0"}

maps4fs-2.1.8/maps4fs/generator/config.py

@@ -1,52 +0,0 @@
-"""This module contains configuration files for the maps4fs generator."""
-
-import os
-import subprocess
-
-from osmnx import settings as ox_settings
-
-MFS_ROOT_DIR = os.getenv("MFS_ROOT_DIRECTORY", os.path.join(os.getcwd(), "mfsrootdir"))
-MFS_CACHE_DIR = os.path.join(MFS_ROOT_DIR, "cache")
-MFS_DATA_DIR = os.path.join(MFS_ROOT_DIR, "data")
-os.makedirs(MFS_CACHE_DIR, exist_ok=True)
-os.makedirs(MFS_DATA_DIR, exist_ok=True)
-
-DTM_CACHE_DIR = os.path.join(MFS_CACHE_DIR, "dtm")
-SAT_CACHE_DIR = os.path.join(MFS_CACHE_DIR, "sat")
-
-osmnx_cache = os.path.join(MFS_CACHE_DIR, "osmnx")
-osmnx_data = os.path.join(MFS_CACHE_DIR, "odata")
-os.makedirs(osmnx_cache, exist_ok=True)
-os.makedirs(osmnx_data, exist_ok=True)
-
-
-ox_settings.cache_folder = osmnx_cache
-ox_settings.data_folder = osmnx_data
-
-
-def get_package_version(package_name: str) -> str:
-    """Get the package version.
-
-    Arguments:
-        package_name (str): The name of the package to check.
-
-    Returns:
-        str: The version of the package, or "unknown" if it cannot be determined.
-    """
-    try:
-        result = subprocess.run(
-            [os.sys.executable, "-m", "pip", "show", package_name],  # type: ignore
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            check=True,
-        )
-        for line in result.stdout.splitlines():
-            if line.startswith("Version:"):
-                return line.split(":", 1)[1].strip()
-        return "unknown"
-    except Exception:
-        return "unknown"
-
-
-PACKAGE_VERSION = get_package_version("maps4fs")