maps4fs 1.1.6__tar.gz → 1.2.4__tar.gz

{maps4fs-1.1.6 → maps4fs-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.1.6
+Version: 1.2.4
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -43,7 +43,7 @@ Requires-Dist: pympler
   <a href="#Background-terrain">Background terrain</a> •
   <a href="#Overview-image">Overview image</a><br>
   <a href="#DDS-conversion">DDS conversion</a> •
-  <a href="#For-advanced-users">For advanced users</a> •
+  <a href="#Advanced-settings">Advanced settings</a> •
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="#Special-thanks">Special thanks</a>
@@ -68,6 +68,9 @@ Requires-Dist: pympler
 🔄 Support map rotation 🆕<br>
 🌾 Automatically generates fields 🆕<br>
 🌽 Automatically generates farmlands 🆕<br>
+🌿 Automatically generates decorative foliage 🆕<br>
+🌲 Automatically generates forests 🆕<br>
+🌊 Automatically generates water planes 🆕<br>
 🌍 Based on real-world data from OpenStreetMap<br>
 🏞️ Generates height map using SRTM dataset<br>
 📦 Provides a ready-to-use map template for the Giants Editor<br>
@@ -84,6 +87,12 @@ Requires-Dist: pympler
 🛰️ Realistic background terrain with satellite images.<br><br>
 <img src="https://github.com/user-attachments/assets/6e3c0e99-2cce-46ac-82db-5cb60bba7a30"><br>
 📐 Perfectly aligned background terrain.<br><br>
+<img src="https://github.com/user-attachments/assets/5764b2ec-e626-426f-9f5d-beb12ba95133"><br>
+🌿 Automatically generates decorative foliage.<br><br>
+<img src="https://github.com/user-attachments/assets/27a5e541-a9f5-4504-b8d2-64aae9fb3e52"><br>
+🌲 Automatically generates forests.<br><br>
+<img src="https://github.com/user-attachments/assets/cce7d4e0-cba2-4dd2-b22d-03137fb2e860"><br>
+🌊 Automatically generates water planes.<br><br>
 <img src="https://github.com/user-attachments/assets/80e5923c-22c7-4dc0-8906-680902511f3a"><br>
 🗒️ True-to-life blueprints for fast and precise modding.<br><br>
 <img width="480" src="https://github.com/user-attachments/assets/1a8802d2-6a3b-4bfa-af2b-7c09478e199b"><br>
@@ -95,6 +104,9 @@ Requires-Dist: pympler
 <a href="https://www.youtube.com/watch?v=Nl_aqXJ5nAk" target="_blank"><img src="https://github.com/user-attachments/assets/4845e030-0e73-47ab-a5a3-430308913060"/></a>
 <p align="center"><i>How to Generate a Map for Farming Simulator 25 and 22 from a real place using maps4FS.</i></p>
 
+![Map example](https://github.com/user-attachments/assets/c46a3581-dd17-462f-b815-e36d4f724947)
+<p align="center"><i>Map example generated with maps4fs.</i></p>
+
 ## Quick Start
 There are several ways to use the tool. You obviously need the **first one**, but you can choose any of the others depending on your needs.<br>
 ### 🚜 For most users
@@ -453,7 +465,7 @@ List of the important DDS files:
 - `preview.dds` - 2048x2048 pixels, the preview image of the map on the loading screen,
 - `mapsUS/overview.dds` - 4096x4096 pixels, the overview image of the map (in-game map)
 
-## For advanced users
+## Advanced settings
 The tool supports the custom size of the map. To use this feature select `Custom` in the `Map size` dropdown and enter the desired size. The tool will generate a map with the size you entered.<br>
 
 ⛔️ Do not use this feature, if you don't know what you're doing. In most cases, the Giants Editor will just crash on opening the file, because you need to enter specific values for the map size.<br><br>
@@ -470,6 +482,8 @@ You can also apply some advanced settings to the map generation process. Note th
 
 - Plateau height: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
 
+- Water depth: this value will be subtracted from each pixel of the DEM image, where water resources are located. Pay attention that it's not in meters, instead it in the pixel value of DEM, which is 16 bit image with possible values from 0 to 65535. When this value is set, the same value will be added to the plateau setting to avoid negative heights.
+
 ### Texture Advanced settings
 
 - Fields padding - this value (in meters) will be applied to each field, making it smaller. It's useful when the fields are too close to each other and you want to make them smaller. By default, it's set to 0.
@@ -478,6 +492,12 @@ You can also apply some advanced settings to the map generation process. Note th
 
 - Farmlands margin - this value (in meters) will be applied to each farmland, making it bigger. You can use the value to adjust how much the farmland should be bigger than the actual field. By default, it's set to 3.
 
+### Vegetation Advanced settings
+
+- Forest density - the density of the forest in meters. The lower the value, the lower the distance between the trees, which makes the forest denser. Note, that low values will lead to enormous number of trees, which may cause the Giants Editor to crash or lead to performance issues. By default, it's set to 10.
+
+- Random plants - when adding decorative foliage, enabling this option will add different species of plants to the map. If unchecked only basic grass (smallDenseMix) will be added. Defaults to True.
+
 ## Resources
 In this section, you'll find a list of the resources that you need to create a map for the Farming Simulator.<br>
 To create a basic map, you only need the Giants Editor. But if you want to create a background terrain - the world around the map, so it won't look like it's floating in the void - you also need Blender and the Blender Exporter Plugins. To create realistic textures for the background terrain, the QGIS is required to obtain high-resolution satellite images.<br>

{maps4fs-1.1.6 → maps4fs-1.2.4}/README.md

@@ -18,7 +18,7 @@
   <a href="#Background-terrain">Background terrain</a> •
   <a href="#Overview-image">Overview image</a><br>
   <a href="#DDS-conversion">DDS conversion</a> •
-  <a href="#For-advanced-users">For advanced users</a> •
+  <a href="#Advanced-settings">Advanced settings</a> •
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="#Special-thanks">Special thanks</a>
@@ -43,6 +43,9 @@
 🔄 Support map rotation 🆕<br>
 🌾 Automatically generates fields 🆕<br>
 🌽 Automatically generates farmlands 🆕<br>
+🌿 Automatically generates decorative foliage 🆕<br>
+🌲 Automatically generates forests 🆕<br>
+🌊 Automatically generates water planes 🆕<br>
 🌍 Based on real-world data from OpenStreetMap<br>
 🏞️ Generates height map using SRTM dataset<br>
 📦 Provides a ready-to-use map template for the Giants Editor<br>
@@ -59,6 +62,12 @@
 🛰️ Realistic background terrain with satellite images.<br><br>
 <img src="https://github.com/user-attachments/assets/6e3c0e99-2cce-46ac-82db-5cb60bba7a30"><br>
 📐 Perfectly aligned background terrain.<br><br>
+<img src="https://github.com/user-attachments/assets/5764b2ec-e626-426f-9f5d-beb12ba95133"><br>
+🌿 Automatically generates decorative foliage.<br><br>
+<img src="https://github.com/user-attachments/assets/27a5e541-a9f5-4504-b8d2-64aae9fb3e52"><br>
+🌲 Automatically generates forests.<br><br>
+<img src="https://github.com/user-attachments/assets/cce7d4e0-cba2-4dd2-b22d-03137fb2e860"><br>
+🌊 Automatically generates water planes.<br><br>
 <img src="https://github.com/user-attachments/assets/80e5923c-22c7-4dc0-8906-680902511f3a"><br>
 🗒️ True-to-life blueprints for fast and precise modding.<br><br>
 <img width="480" src="https://github.com/user-attachments/assets/1a8802d2-6a3b-4bfa-af2b-7c09478e199b"><br>
@@ -70,6 +79,9 @@
 <a href="https://www.youtube.com/watch?v=Nl_aqXJ5nAk" target="_blank"><img src="https://github.com/user-attachments/assets/4845e030-0e73-47ab-a5a3-430308913060"/></a>
 <p align="center"><i>How to Generate a Map for Farming Simulator 25 and 22 from a real place using maps4FS.</i></p>
 
+![Map example](https://github.com/user-attachments/assets/c46a3581-dd17-462f-b815-e36d4f724947)
+<p align="center"><i>Map example generated with maps4fs.</i></p>
+
 ## Quick Start
 There are several ways to use the tool. You obviously need the **first one**, but you can choose any of the others depending on your needs.<br>
 ### 🚜 For most users
@@ -428,7 +440,7 @@ List of the important DDS files:
 - `preview.dds` - 2048x2048 pixels, the preview image of the map on the loading screen,
 - `mapsUS/overview.dds` - 4096x4096 pixels, the overview image of the map (in-game map)
 
-## For advanced users
+## Advanced settings
 The tool supports the custom size of the map. To use this feature select `Custom` in the `Map size` dropdown and enter the desired size. The tool will generate a map with the size you entered.<br>
 
 ⛔️ Do not use this feature, if you don't know what you're doing. In most cases, the Giants Editor will just crash on opening the file, because you need to enter specific values for the map size.<br><br>
@@ -445,6 +457,8 @@ You can also apply some advanced settings to the map generation process. Note th
 
 - Plateau height: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
 
+- Water depth: this value will be subtracted from each pixel of the DEM image, where water resources are located. Pay attention that it's not in meters, instead it in the pixel value of DEM, which is 16 bit image with possible values from 0 to 65535. When this value is set, the same value will be added to the plateau setting to avoid negative heights.
+
 ### Texture Advanced settings
 
 - Fields padding - this value (in meters) will be applied to each field, making it smaller. It's useful when the fields are too close to each other and you want to make them smaller. By default, it's set to 0.
@@ -453,6 +467,12 @@ You can also apply some advanced settings to the map generation process. Note th
 
 - Farmlands margin - this value (in meters) will be applied to each farmland, making it bigger. You can use the value to adjust how much the farmland should be bigger than the actual field. By default, it's set to 3.
 
+### Vegetation Advanced settings
+
+- Forest density - the density of the forest in meters. The lower the value, the lower the distance between the trees, which makes the forest denser. Note, that low values will lead to enormous number of trees, which may cause the Giants Editor to crash or lead to performance issues. By default, it's set to 10.
+
+- Random plants - when adding decorative foliage, enabling this option will add different species of plants to the map. If unchecked only basic grass (smallDenseMix) will be added. Defaults to True.
+
 ## Resources
 In this section, you'll find a list of the resources that you need to create a map for the Farming Simulator.<br>
 To create a basic map, you only need the Giants Editor. But if you want to create a background terrain - the world around the map, so it won't look like it's floating in the void - you also need Blender and the Blender Exporter Plugins. To create realistic textures for the background terrain, the QGIS is required to obtain high-resolution satellite images.<br>

{maps4fs-1.1.6 → maps4fs-1.2.4}/maps4fs/generator/background.py

@@ -3,8 +3,10 @@ around the map."""
 
 from __future__ import annotations
 
+import json
 import os
 import shutil
+from copy import deepcopy
 
 import cv2
 import numpy as np
@@ -17,6 +19,7 @@ from maps4fs.generator.dem import (
     DEFAULT_PLATEAU,
     DEM,
 )
+from maps4fs.generator.texture import Texture
 
 DEFAULT_DISTANCE = 2048
 RESIZE_FACTOR = 1 / 8
@@ -25,6 +28,7 @@ FULL_PREVIEW_NAME = "PREVIEW"
 ELEMENTS = [FULL_NAME, FULL_PREVIEW_NAME]
 
 
+# pylint: disable=R0902
 class Background(Component):
     """Component for creating 3D obj files based on DEM data around the map.
 
@@ -43,7 +47,9 @@ class Background(Component):
     def preprocess(self) -> None:
         """Registers the DEMs for the background terrain."""
         self.light_version = self.kwargs.get("light_version", False)
+        self.water_depth = self.kwargs.get("water_depth", 0)
         self.stl_preview_path: str | None = None
+        self.water_resources_path: str | None = None
 
         if self.rotation:
             self.logger.debug("Rotation is enabled: %s.", self.rotation)
@@ -51,21 +57,29 @@ class Background(Component):
         else:
             output_size_multiplier = 1
 
-        background_size = self.map_size + DEFAULT_DISTANCE * 2
-        rotated_size = int(background_size * output_size_multiplier)
+        self.background_size = self.map_size + DEFAULT_DISTANCE * 2
+        self.rotated_size = int(self.background_size * output_size_multiplier)
 
         self.background_directory = os.path.join(self.map_directory, "background")
+        self.water_directory = os.path.join(self.map_directory, "water")
         os.makedirs(self.background_directory, exist_ok=True)
+        os.makedirs(self.water_directory, exist_ok=True)
 
         autoprocesses = [self.kwargs.get("auto_process", False), False]
+        self.output_paths = [
+            os.path.join(self.background_directory, f"{name}.png") for name in ELEMENTS
+        ]
+        self.not_substracted_path = os.path.join(self.background_directory, "not_substracted.png")
+
         dems = []
 
-        for name, autoprocess in zip(ELEMENTS, autoprocesses):
+        for name, autoprocess, output_path in zip(ELEMENTS, autoprocesses, self.output_paths):
             dem = DEM(
                 self.game,
+                self.map,
                 self.coordinates,
-                background_size,
-                rotated_size,
+                self.background_size,
+                self.rotated_size,
                 self.rotation,
                 self.map_directory,
                 self.logger,
@@ -76,8 +90,8 @@ class Background(Component):
             )
             dem.preprocess()
             dem.is_preview = self.is_preview(name)  # type: ignore
-            dem.set_output_resolution((rotated_size, rotated_size))
-            dem.set_dem_path(os.path.join(self.background_directory, f"{name}.png"))
+            dem.set_output_resolution((self.rotated_size, self.rotated_size))
+            dem.set_dem_path(output_path)
             dems.append(dem)
 
         self.dems = dems
@@ -97,8 +111,17 @@ class Background(Component):
         """Launches the component processing. Iterates over all tiles and processes them
         as a result the DEM files will be saved, then based on them the obj files will be
         generated."""
+        self.create_background_textures()
+
         for dem in self.dems:
             dem.process()
+            if not dem.is_preview:  # type: ignore
+                shutil.copyfile(dem.dem_path, self.not_substracted_path)
+
+        if self.water_depth:
+            self.subtraction()
+
+        for dem in self.dems:
             if not dem.is_preview:  # type: ignore
                 cutted_dem_path = self.cutout(dem.dem_path)
                 if self.game.additional_dem_name is not None:
@@ -106,6 +129,7 @@ class Background(Component):
 
         if not self.light_version:
             self.generate_obj_files()
+            self.generate_water_resources_obj()
         else:
             self.logger.info("Light version is enabled, obj files will not be generated.")
 
@@ -222,13 +246,20 @@ class Background(Component):
         return main_dem_path
 
     # pylint: disable=too-many-locals
-    def plane_from_np(self, dem_data: np.ndarray, save_path: str, is_preview: bool = False) -> None:
+    def plane_from_np(
+        self,
+        dem_data: np.ndarray,
+        save_path: str,
+        is_preview: bool = False,
+        include_zeros: bool = True,
+    ) -> None:
         """Generates a 3D obj file based on DEM data.
 
         Arguments:
             dem_data (np.ndarray) -- The DEM data as a numpy array.
             save_path (str) -- The path where the obj file will be saved.
             is_preview (bool, optional) -- If True, the preview mesh will be generated.
+            include_zeros (bool, optional) -- If True, the mesh will include the zero height values.
         """
         dem_data = cv2.resize(  # pylint: disable=no-member
             dem_data, (0, 0), fx=RESIZE_FACTOR, fy=RESIZE_FACTOR
@@ -246,6 +277,9 @@ class Background(Component):
         x, y = np.meshgrid(x, y)
         z = dem_data
 
+        ground = z.max()
+        self.logger.debug("Ground level: %s", ground)
+
         self.logger.debug(
             "Starting to generate a mesh for with shape: %s x %s. This may take a while...",
             cols,
@@ -255,6 +289,8 @@ class Background(Component):
         vertices = np.column_stack([x.ravel(), y.ravel(), z.ravel()])
         faces = []
 
+        skipped = 0
+
         for i in range(rows - 1):
             for j in range(cols - 1):
                 top_left = i * cols + j
@@ -262,9 +298,15 @@ class Background(Component):
                 bottom_left = top_left + cols
                 bottom_right = bottom_left + 1
 
+                if ground in [z[i, j], z[i, j + 1], z[i + 1, j], z[i + 1, j + 1]]:
+                    skipped += 1
+                    continue
+
                 faces.append([top_left, bottom_left, bottom_right])
                 faces.append([top_left, bottom_right, top_right])
 
+        self.logger.debug("Skipped faces: %s", skipped)
+
         faces = np.array(faces)  # type: ignore
         mesh = trimesh.Trimesh(vertices=vertices, faces=faces)
 
@@ -282,13 +324,14 @@ class Background(Component):
             mesh.apply_scale([0.5, 0.5, 0.5])
             self.mesh_to_stl(mesh)
         else:
-            multiplier = self.kwargs.get("multiplier", DEFAULT_MULTIPLIER)
-            if multiplier != 1:
-                z_scaling_factor = 1 / multiplier
-            else:
-                z_scaling_factor = 1 / 2**5
-            self.logger.debug("Z scaling factor: %s", z_scaling_factor)
-            mesh.apply_scale([1 / RESIZE_FACTOR, 1 / RESIZE_FACTOR, z_scaling_factor])
+            if not include_zeros:
+                multiplier = self.kwargs.get("multiplier", DEFAULT_MULTIPLIER)
+                if multiplier != 1:
+                    z_scaling_factor = 1 / multiplier
+                else:
+                    z_scaling_factor = 1 / 2**5
+                self.logger.debug("Z scaling factor: %s", z_scaling_factor)
+                mesh.apply_scale([1 / RESIZE_FACTOR, 1 / RESIZE_FACTOR, z_scaling_factor])
 
         mesh.export(save_path)
         self.logger.debug("Obj file saved: %s", save_path)
@@ -412,3 +455,123 @@ class Background(Component):
 
         cv2.imwrite(colored_dem_path, dem_data_colored)
         return colored_dem_path
+
+    def create_background_textures(self) -> None:
+        """Creates background textures for the map."""
+        if not os.path.isfile(self.game.texture_schema):
+            self.logger.warning("Texture schema file not found: %s", self.game.texture_schema)
+            return
+
+        with open(self.game.texture_schema, "r", encoding="utf-8") as f:
+            layers_schema = json.load(f)
+
+        background_layers = []
+        for layer in layers_schema:
+            if layer.get("background") is True:
+                layer_copy = deepcopy(layer)
+                layer_copy["count"] = 1
+                layer_copy["name"] = f"{layer['name']}_background"
+                background_layers.append(layer_copy)
+
+        if not background_layers:
+            return
+
+        self.background_texture = Texture(  # pylint: disable=W0201
+            self.game,
+            self.map,
+            self.coordinates,
+            self.background_size,
+            self.rotated_size,
+            rotation=self.rotation,
+            map_directory=self.map_directory,
+            logger=self.logger,
+            light_version=self.light_version,
+            custom_schema=background_layers,
+        )
+
+        self.background_texture.preprocess()
+        self.background_texture.process()
+
+        processed_layers = self.background_texture.get_background_layers()
+        weights_directory = self.game.weights_dir_path(self.map_directory)
+        background_paths = [layer.path(weights_directory) for layer in processed_layers]
+        self.logger.debug("Found %s background textures.", len(background_paths))
+
+        if not background_paths:
+            self.logger.warning("No background textures found.")
+            return
+
+        # Merge all images into one.
+        background_image = np.zeros((self.background_size, self.background_size), dtype=np.uint8)
+        for path in background_paths:
+            layer = cv2.imread(path, cv2.IMREAD_GRAYSCALE)
+            background_image = cv2.add(background_image, layer)  # type: ignore
+
+        background_save_path = os.path.join(self.water_directory, "water_resources.png")
+        cv2.imwrite(background_save_path, background_image)
+        self.logger.info("Background texture saved: %s", background_save_path)
+        self.water_resources_path = background_save_path  # pylint: disable=W0201
+
+    def subtraction(self) -> None:
+        """Subtracts the water depth from the DEM data where the water resources are located."""
+        if not self.water_resources_path:
+            self.logger.warning("Water resources texture not found.")
+            return
+
+        # Single channeled 8 bit image, where the water have values of 255, and the rest 0.
+        water_resources_image = cv2.imread(self.water_resources_path, cv2.IMREAD_UNCHANGED)
+        mask = water_resources_image == 255
+
+        # Make mask a little bit smaller (1 pixel).
+        mask = cv2.erode(mask.astype(np.uint8), np.ones((3, 3), np.uint8), iterations=1).astype(
+            bool
+        )
+
+        for output_path in self.output_paths:
+            if FULL_PREVIEW_NAME in output_path:
+                continue
+            dem_image = cv2.imread(output_path, cv2.IMREAD_UNCHANGED)
+
+            # Create a mask where water_resources_image is 255 (or not 0)
+            # Subtract water_depth from dem_image where mask is True
+            dem_image[mask] = dem_image[mask] - self.water_depth
+
+            # Save the modified dem_image back to the output path
+            cv2.imwrite(output_path, dem_image)
+            self.logger.debug("Water depth subtracted from DEM data: %s", output_path)
+
+    def generate_water_resources_obj(self) -> None:
+        """Generates 3D obj files based on water resources data."""
+        if not self.water_resources_path:
+            self.logger.warning("Water resources texture not found.")
+            return
+
+        # Single channeled 8 bit image, where the water have values of 255, and the rest 0.
+        plane_water = cv2.imread(self.water_resources_path, cv2.IMREAD_UNCHANGED)
+        dilated_plane_water = cv2.dilate(
+            plane_water.astype(np.uint8), np.ones((5, 5), np.uint8), iterations=5
+        ).astype(np.uint8)
+        plane_save_path = os.path.join(self.water_directory, "plane_water.obj")
+        self.plane_from_np(
+            dilated_plane_water, plane_save_path, is_preview=False, include_zeros=False
+        )
+
+        # Single channeled 16 bit DEM image of terrain.
+        background_dem = cv2.imread(self.not_substracted_path, cv2.IMREAD_UNCHANGED)
+
+        # Remove all the values from the background dem where the plane_water is 0.
+        background_dem[plane_water == 0] = 0
+
+        # Dilate the background dem to make the water more smooth.
+        elevated_water = cv2.dilate(background_dem, np.ones((3, 3), np.uint16), iterations=10)
+
+        # Use the background dem as a mask to prevent the original values from being overwritten.
+        mask = background_dem > 0
+
+        # Combine the dilated background dem with non-dilated background dem.
+        elevated_water = np.where(mask, background_dem, elevated_water)
+        elevated_save_path = os.path.join(self.water_directory, "elevated_water.obj")
+
+        self.plane_from_np(
+            elevated_water, elevated_save_path, is_preview=False, include_zeros=False
+        )

{maps4fs-1.1.6 → maps4fs-1.2.4}/maps4fs/generator/component.py

@@ -17,6 +17,7 @@ from maps4fs.generator.qgis import save_scripts
 
 if TYPE_CHECKING:
     from maps4fs.generator.game import Game
+    from maps4fs.generator.map import Map
 
 
 # pylint: disable=R0801, R0903, R0902, R0904
@@ -25,6 +26,7 @@ class Component:
 
     Arguments:
         game (Game): The game instance for which the map is generated.
+        map (Map): The map instance for which the component is generated.
         coordinates (tuple[float, float]): The latitude and longitude of the center of the map.
         map_size (int): The size of the map in pixels.
         map_rotated_size (int): The size of the map in pixels after rotation.
@@ -37,6 +39,7 @@ class Component:
     def __init__(
         self,
         game: Game,
+        map: Map,  # pylint: disable=W0622
         coordinates: tuple[float, float],
         map_size: int,
         map_rotated_size: int,
@@ -46,6 +49,7 @@ class Component:
         **kwargs,  # pylint: disable=W0613, R0913, R0917
     ):
         self.game = game
+        self.map = map
         self.coordinates = coordinates
         self.map_size = map_size
         self.map_rotated_size = map_rotated_size
@@ -326,6 +330,7 @@ class Component:
 
         return cs_x, cs_y
 
+    # pylint: disable=R0914
     def fit_polygon_into_bounds(
         self, polygon_points: list[tuple[int, int]], margin: int = 0, angle: int = 0
     ) -> list[tuple[int, int]]:
@@ -367,8 +372,13 @@ class Component:
         bounds = box(min_x, min_y, max_x, max_y)
 
         # Intersect the polygon with the bounds to fit it within the map
-        fitted_polygon = polygon.intersection(bounds)
-        self.logger.debug("Fitted the polygon into the bounds: %s", bounds)
+        try:
+            fitted_polygon = polygon.intersection(bounds)
+            self.logger.debug("Fitted the polygon into the bounds: %s", bounds)
+        except Exception as e:
+            raise ValueError(  # pylint: disable=W0707
+                f"Could not fit the polygon into the bounds: {e}"
+            )
 
         if not isinstance(fitted_polygon, Polygon):
             raise ValueError("The fitted polygon is not a valid polygon.")

{maps4fs-1.1.6 → maps4fs-1.2.4}/maps4fs/generator/game.py

@@ -36,6 +36,7 @@ class Game:
     _map_template_path: str | None = None
     _texture_schema: str | None = None
     _grle_schema: str | None = None
+    _tree_schema: str | None = None
 
     # Order matters! Some components depend on others.
     components = [Texture, I3d, GRLE, Background, Config]
@@ -109,6 +110,19 @@ class Game:
             raise ValueError("GRLE layers schema path not set.")
         return self._grle_schema
 
+    @property
+    def tree_schema(self) -> str:
+        """Returns the path to the tree layers schema file.
+
+        Raises:
+            ValueError: If the tree layers schema path is not set.
+
+        Returns:
+            str: The path to the tree layers schema file."""
+        if not self._tree_schema:
+            raise ValueError("Tree layers schema path not set.")
+        return self._tree_schema
+
     def dem_file_path(self, map_directory: str) -> str:
         """Returns the path to the DEM file.
 
@@ -187,6 +201,7 @@ class FS25(Game):
     _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")
 
     def dem_file_path(self, map_directory: str) -> str:
         """Returns the path to the DEM file.