maps4fs 2.9.3__py3-none-any.whl → 2.9.31__py3-none-any.whl

maps4fs/generator/component/grle.py

@@ -542,6 +542,17 @@ class GRLE(ImageComponent, XMLComponent):
 
         for layer in texture_component.get_area_type_layers():
             pixel_value = area_type_to_pixel_value(layer.area_type)  # type: ignore
+            # * Not enabled for now.
+            # * If the layer is invisible, we need to draw the mask from the info layer.
+            # if layer.invisible:
+            #     self.logger.debug("Processing invisible area type layer: %s.", layer.name)
+            #     if layer.info_layer:
+            #         self.logger.debug("Info layer available: %s.", layer.info_layer)
+            #         weight_image = self.draw_invisible_layer_mask(layer, environment_size)
+            #     else:
+            #         self.logger.debug("No info layer available for layer: %s.", layer.name)
+            #         continue
+            # else:
             weight_image = self.get_resized_weight(layer, environment_size)  # type: ignore
             if weight_image is None:
                 self.logger.warning("Weight image for area type layer not found in %s.", layer.name)
@@ -562,6 +573,52 @@ class GRLE(ImageComponent, XMLComponent):
         self.logger.debug("Environment InfoLayer PNG file saved: %s.", info_layer_environment_path)
         self.preview_paths["environment"] = info_layer_environment_path
 
+    # def draw_invisible_layer_mask(self, layer: Layer, resize_to: int) -> np.ndarray:
+    #     """Draw the mask for the invisible layer.
+
+    #     Arguments:
+    #         layer (Layer): The layer for which to draw the mask.
+    #         resize_to (int): The size to which the mask should be resized.
+
+    #     Returns:
+    #         np.ndarray: The resized mask.
+    #     """
+    #     mask = np.zeros((self.map.size, self.map.size), dtype=np.uint8)
+    #     polygons = self.get_infolayer_data(Parameters.TEXTURES, layer.info_layer)
+    #     self.logger.debug("Found %d polygons in info layer %s.", len(polygons), layer.info_layer)
+
+    #     for polygon in polygons:
+    #         try:
+    #             fitted_polygon = self.fit_object_into_bounds(
+    #                 polygon_points=polygon,
+    #                 # margin=self.map.grle_settings.farmland_margin,
+    #                 angle=self.rotation,
+    #             )
+    #         except ValueError as e:
+    #             self.logger.debug(
+    #                 "Polygon could not be fitted into the map bounds with error: %s",
+    #                 e,
+    #             )
+    #             continue
+    #         polygon_np = self.polygon_points_to_np(fitted_polygon)
+
+    #         try:
+    #             cv2.fillPoly(mask, [polygon_np], (float(255),))  # type: ignore
+    #         except Exception as e:
+    #             self.logger.debug(
+    #                 "Polygon could not be added to the mask with error: %s",
+    #                 e,
+    #             )
+    #             continue
+
+    #     resized_mask = cv2.resize(
+    #         mask,
+    #         (resize_to, resize_to),
+    #         interpolation=cv2.INTER_NEAREST,
+    #     )
+
+    #     return resized_mask
+
     @monitor_performance
     def get_resized_weight(
         self, layer: Layer, resize_to: int, dilations: int = 3

maps4fs/generator/config.py

@@ -82,15 +82,31 @@ def ensure_templates():
                 text=True,
             )
 
-            # Make the preparation script executable
-            prep_script = os.path.join(clone_dir, "prepare_data.sh")
+            if os.name == "nt":
+                logger.info("Detected Windows OS, running PowerShell preparation script...")
+                prep_script = os.path.join(clone_dir, "prepare_data.ps1")
+                for_subprocess = [
+                    "powershell",
+                    "-ExecutionPolicy",
+                    "Bypass",
+                    "-File",
+                    "prepare_data.ps1",
+                ]
+            else:
+                logger.info("Detected non-Windows OS, running bash preparation script...")
+                prep_script = os.path.join(clone_dir, "prepare_data.sh")
+                for_subprocess = ["./prepare_data.sh"]
+
             if os.path.exists(prep_script):
-                os.chmod(prep_script, 0o755)
+                try:
+                    os.chmod(prep_script, 0o755)
+                except Exception as e:
+                    logger.warning("Could not set execute permissions on script: %s", str(e))
 
                 logger.info("Running data preparation script...")
                 # Run the preparation script from the cloned directory
                 subprocess.run(
-                    ["./prepare_data.sh"], cwd=clone_dir, check=True, capture_output=True, text=True
+                    for_subprocess, cwd=clone_dir, check=True, capture_output=True, text=True
                 )
 
                 # Copy the generated data directory to templates directory

maps4fs/generator/game.py

@@ -6,6 +6,8 @@ from __future__ import annotations
 
 import os
 
+from typing import Callable
+
 import maps4fs.generator.config as mfscfg
 from maps4fs.generator.component.background import Background
 from maps4fs.generator.component.config import Config
@@ -166,8 +168,7 @@ class Game:
             map_directory (str): The path to the map directory.
 
         Returns:
-            str: The path to the DEM file.
-        """
+            str: The path to the DEM file."""
         raise NotImplementedError
 
     def weights_dir_path(self, map_directory: str) -> str:
@@ -341,6 +342,45 @@ class Game:
             bool: True if the mesh should be processed, False otherwise."""
         return self._mesh_processing
 
+    def validate_template(self, map_directory: str) -> None:
+        """Validates that all required files exist in the map template directory.
+
+        Arguments:
+            map_directory (str): The path to the map directory.
+
+        Raises:
+            FileNotFoundError: If any required files are missing from the template.
+        """
+        all_files = []
+        for root, _, files in os.walk(map_directory):
+            for file in files:
+                all_files.append(os.path.join(root, file))
+
+        missing_files = []
+        for func in self.required_file_methods():
+            try:
+                required_filepath = func(map_directory)
+            except NotImplementedError:
+                continue
+            if required_filepath not in all_files:
+                missing_files.append(required_filepath)
+        if missing_files:
+            raise FileNotFoundError(f"The following files are not found: {missing_files}.")
+
+    def required_file_methods(self) -> list[Callable[[str], str]]:
+        """Returns a list of methods that return paths to required files for map generation.
+
+        Returns:
+            list[Callable[[str], str]]: List of methods that take a map directory path
+                and return file paths that are required for the map template.
+        """
+        return [
+            self.map_xml_path,
+            self.i3d_file_path,
+            self.get_environment_xml_path,
+            self.get_farmlands_xml_path,
+        ]
+
 
 class FS22(Game):
     """Class used to define the game version FS22."""

{maps4fs-2.9.3.dist-info → maps4fs-2.9.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.9.3
+Version: 2.9.31
 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.9.3.dist-info → maps4fs-2.9.31.dist-info}/RECORD

@@ -1,8 +1,8 @@
 maps4fs/__init__.py,sha256=5ixsCA5vgcIV0OrF9EJBm91Mmc_KfMiDRM-QyifMAvo,386
 maps4fs/logger.py,sha256=aZAa9glzgvH6ySVDLelSPTwHfWZtpGK5YBl-ufNUsPg,801
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/config.py,sha256=dHJLBt-Ua5rMMvUujAa3cuPSYvDA7tgfY7Z8tpvT_zo,7176
-maps4fs/generator/game.py,sha256=_LNiH__7FeSGsPKsuvAGiktt5GcJQVqcQYtsFZNWGyM,16106
+maps4fs/generator/config.py,sha256=p_yetsUWQBskC-FJwc9NnoJ_XHJvmpqs9ZNOIGDcOSo,7868
+maps4fs/generator/game.py,sha256=QKJ6tXH59ubKx3MuHWnCKYXRhgKOa_lWh30OAMTJDFE,17605
 maps4fs/generator/map.py,sha256=ak74FNSDQXPqaB0gOaZqVo8Sy0fvf_3iXHg6FJkHPpA,15888
 maps4fs/generator/monitor.py,sha256=Yrc7rClpmJK53SRzrOYZNBlwJmb5l6TkW-laFbyBEno,3524
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
@@ -13,7 +13,7 @@ maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM
 maps4fs/generator/component/background.py,sha256=c2bjK3DkQXvA6Gtb_hUM9m-7fIVgp2BxJp09c4ZY3_A,49434
 maps4fs/generator/component/config.py,sha256=tI2RQaGIqBgJIi9KjYfMZZ8AWg_YVUm6KKsBHGV241g,31285
 maps4fs/generator/component/dem.py,sha256=vMVJtU2jAS-2lfB9JsqodZsrUvY1h5xr3Dh5qk6txwk,11895
-maps4fs/generator/component/grle.py,sha256=uOd0dP-TeS85SZ87wafVj7AQv8L5VSdg2O0pDrtm_p0,27500
+maps4fs/generator/component/grle.py,sha256=FAcGmG7yq0icOElRoO4QMsVisZMsNrLhfNSWvGKnOHg,29899
 maps4fs/generator/component/i3d.py,sha256=t6Y9JPXvKJ91wTBg_-noIsxDPk1OSdY9EwM5ZtgOl9Q,26771
 maps4fs/generator/component/layer.py,sha256=bdy1XGOODyPqYUM3b_wEY2H9Piz-AaHsCDecl-qRHiM,6627
 maps4fs/generator/component/satellite.py,sha256=1bPqd8JqAPqU0tEI9m-iuljMW9hXqlaCIxvq7kdpMY0,5219
@@ -23,8 +23,8 @@ maps4fs/generator/component/base/component.py,sha256=-7H3donrH19f0_rivNyI3fgLsiZ
 maps4fs/generator/component/base/component_image.py,sha256=GXFkEFARNRkWkDiGSjvU4WX6f_8s6R1t2ZYqZflv1jk,9626
 maps4fs/generator/component/base/component_mesh.py,sha256=2wGe_-wAZVRljMKzzVJ8jdzIETWg7LjxGj8A3inH5eI,25550
 maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
-maps4fs-2.9.3.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
-maps4fs-2.9.3.dist-info/METADATA,sha256=ytA78FbbbRnbDGRMyD6qz0K3I9egsVsRdMkp49qL0-w,10042
-maps4fs-2.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.9.3.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.9.3.dist-info/RECORD,,
+maps4fs-2.9.31.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
+maps4fs-2.9.31.dist-info/METADATA,sha256=PRyTxe_eyZh-PTlrk7rBm3qc6kzMFE3hBskAEpZEPiY,10043
+maps4fs-2.9.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.9.31.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.9.31.dist-info/RECORD,,