maps4fs 1.8.197__tar.gz → 1.8.199__tar.gz

{maps4fs-1.8.197 → maps4fs-1.8.199}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.197
+Version: 1.8.199
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.197 → maps4fs-1.8.199}/maps4fs/generator/component/background.py

@@ -84,6 +84,7 @@ class Background(MeshComponent, ImageComponent):
 
         if not self.map.custom_background_path:
             self.dem.process()
+            self.validate_np_for_mesh(self.dem.dem_path, self.map_size)
 
         shutil.copyfile(self.dem.dem_path, self.not_substracted_path)
         self.save_map_dem(self.dem.dem_path, save_path=self.not_resized_path)

{maps4fs-1.8.197 → maps4fs-1.8.199}/maps4fs/generator/component/base/component_mesh.py

@@ -1,5 +1,7 @@
 """Base class for all components that primarily used to work with meshes."""
 
+import os
+
 import cv2
 import numpy as np
 import trimesh
@@ -17,24 +19,31 @@ class MeshComponent(Component):
         """Checks if the given image is a valid for mesh generation.
 
         Arguments:
-            image_path (str): The path to the custom background image.
+            image_path (str): The path to the background image.
             map_size (int): The size of the map.
 
         Raises:
-            ValueError: If the custom background image does not meet the requirements.
+            FileNotFoundError: If the background image is not found.
+            ValueError: If the background image does not meet the requirements.
         """
+        if not os.path.isfile(image_path):
+            raise FileNotFoundError(f"Can't find the background DEM image at {image_path}.")
+
         image = cv2.imread(image_path, cv2.IMREAD_UNCHANGED)
+        if image is None:
+            raise ValueError(f"Can't read the background DEM image at {image_path}.")
+
         if image.shape[0] != image.shape[1]:
-            raise ValueError("The custom background image must be a square.")
+            raise ValueError("The background image must be a square.")
 
         if image.shape[0] != map_size + Parameters.BACKGROUND_DISTANCE * 2:
-            raise ValueError("The custom background image must have the size of the map + 4096.")
+            raise ValueError("The background image must have the size of the map + 4096.")
 
         if len(image.shape) != 2:
-            raise ValueError("The custom background image must be a grayscale image.")
+            raise ValueError("The background image must be a grayscale image.")
 
         if image.dtype != np.uint16:
-            raise ValueError("The custom background image must be a 16-bit grayscale image.")
+            raise ValueError("The background image must be a 16-bit grayscale image.")
 
     @staticmethod
     def mesh_to_stl(mesh: trimesh.Trimesh, save_path: str) -> None:

{maps4fs-1.8.197 → maps4fs-1.8.199}/maps4fs/generator/dtm/dtm.py

@@ -249,10 +249,16 @@ class DTMProvider(ABC):
         return None
 
     @classmethod
-    def get_valid_provider_descriptions(cls, lat_lon: tuple[float, float]) -> dict[str, str]:
+    def get_valid_provider_descriptions(
+        cls, lat_lon: tuple[float, float], default_code: str = "srtm30"
+    ) -> dict[str, str]:
         """Get descriptions of all providers, where keys are provider codes and
         values are provider descriptions.
 
+        Arguments:
+            lat_lon (tuple): Latitude and longitude of the center point.
+            default_code (str): Default provider code.
+
         Returns:
             dict: Provider descriptions.
         """
@@ -262,6 +268,10 @@ class DTMProvider(ABC):
                 code = provider.code()
                 if code is not None:
                     providers[code] = provider.description()
+
+        # Sort the dictionary, to make sure that the default provider is the first one.
+        providers = dict(sorted(providers.items(), key=lambda item: item[0] != default_code))
+
         return providers
 
     @classmethod

{maps4fs-1.8.197 → maps4fs-1.8.199}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.197
+Version: 1.8.199
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.197 → maps4fs-1.8.199}/pyproject.toml

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