maps4fs 1.8.197__py3-none-any.whl → 1.8.199__py3-none-any.whl

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

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

@@ -7,7 +7,7 @@ maps4fs/generator/map.py,sha256=FA9ZLpVMS2RLRDgWZdOo-kLzqMUBza3EZ_89-Gfw_s4,1119
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=ZHwLn1ObdOuhyUTzQTYvyDs7YZ0SbVLgTSpoeUtqi0c,6708
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=47hQskCT-RfubhJKd9vHDqZOj2lwkYROY1ob5v79b54,18767
+maps4fs/generator/component/background.py,sha256=JDprgCieWZXNL0IuVCdl363tjxAX6KEjfxehGXEkADg,18839
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=nDA6vjjfWFL0Hkz6aso1aLIwuksbxzZw9syNax1bD04,19134
 maps4fs/generator/component/i3d.py,sha256=kJ3Th1mSdBC9j8cyWBwIyYm0fKzYJtocI0jYWkVX3AU,19713
@@ -17,7 +17,7 @@ maps4fs/generator/component/texture.py,sha256=VqxUmK7HHw-G_C_qS1rb5mSpkzGwI0dAnW
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZwYyqoDZM7aI1RHw8,21273
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
-maps4fs/generator/component/base/component_mesh.py,sha256=43JY8X0ugIWAJq5y11vTJM9UfbL7SSugj8LkdPmni10,8871
+maps4fs/generator/component/base/component_mesh.py,sha256=zx6TElBBMxo-D5AxqAYemtvkl2k4hHThf0OH7LgNRMY,9159
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
 maps4fs/generator/dtm/__init__.py,sha256=hzKESJm2QhIQnPKxTYCFohpvRWOmLfXZfEnrMbntp1s,1392
 maps4fs/generator/dtm/arctic.py,sha256=LSivLLjtd6TJUaPYvgSYQ4KalMTaY58zFvwivSh45uM,2587
@@ -26,7 +26,7 @@ maps4fs/generator/dtm/bavaria.py,sha256=nH2wTxiIdQgKotauTqD-zztwFgfZzIdym2sjmSqf
 maps4fs/generator/dtm/canada.py,sha256=XJ_za2LDV9PEV7hmjPnzdwPbpr6ezAR73-HDVaTuKPk,1290
 maps4fs/generator/dtm/czech.py,sha256=sT0gwbtEnizVNcZeL7kyDdwmKvB3w8m6UgJR7ZTk1to,1058
 maps4fs/generator/dtm/denmark.py,sha256=JFuBRrCJTMXe_vdO3gRCwsnZ3nZOp_Y6671Kq8aXRGM,1591
-maps4fs/generator/dtm/dtm.py,sha256=QGsA-JysmOXFdZa7RsaXwmB4aGK0gys0DZUG6AIBT30,17476
+maps4fs/generator/dtm/dtm.py,sha256=FOOI9_vl0KoF3EfLaLm2mvFWeOrjH2_d61VNM2NIjEg,17852
 maps4fs/generator/dtm/england.py,sha256=3URUm7uLH_RYXcQdDW3Vt09GWKAE8RAy1ZFJB94kXOA,1124
 maps4fs/generator/dtm/finland.py,sha256=VpXpvCgzbyKA6VGSa7ikSzE4B-cLfR1_2zOHvS8delc,1870
 maps4fs/generator/dtm/flanders.py,sha256=LltmowbS84_DaBHAS9XYoJPMunX6sWGy6zaVACHj5Ro,1039
@@ -51,8 +51,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RclEqxEWLbMxuEkkegQP8jybzugwQ1_R3rdfDe0s21U,2104
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.197.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.197.dist-info/METADATA,sha256=fswQduWDANskTQxoORkgeZrJdZku9uPBSP7sB8uTDB8,44904
-maps4fs-1.8.197.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.197.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.197.dist-info/RECORD,,
+maps4fs-1.8.199.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.199.dist-info/METADATA,sha256=C6odRfeNlXWxxVObXCeR4W0aJ_DNHjnhsOySqQJ7M2E,44904
+maps4fs-1.8.199.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.199.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.199.dist-info/RECORD,,