maps4fs 1.8.11__py3-none-any.whl → 1.8.12__py3-none-any.whl

maps4fs/generator/grle.py

@@ -10,7 +10,7 @@ import numpy as np
 from shapely.geometry import Polygon  # type: ignore
 from tqdm import tqdm
 
-from maps4fs.generator.component import Component
+from maps4fs.generator.component.base.component import Component
 from maps4fs.generator.texture import PREVIEW_MAXIMUM_SIZE, Texture
 
 ISLAND_DISTORTION = 0.3
@@ -92,7 +92,7 @@ class GRLE(Component):
                 else:
                     info_layer_data = np.zeros((height, width, channels), dtype=data_type)
                 self.logger.debug("Shape of %s: %s.", info_layer["name"], info_layer_data.shape)
-                cv2.imwrite(file_path, info_layer_data)  # pylint: disable=no-member
+                cv2.imwrite(file_path, info_layer_data)
                 self.logger.debug("InfoLayer PNG file %s created.", file_path)
             else:
                 self.logger.warning("Invalid InfoLayer schema: %s.", info_layer)
@@ -104,7 +104,6 @@ class GRLE(Component):
         else:
             self.logger.warning("Adding plants it's not supported for the %s.", self.game.code)
 
-    # pylint: disable=no-member
     def previews(self) -> list[str]:
         """Returns a list of paths to the preview images (empty list).
         The component does not generate any preview images so it returns an empty list.
@@ -131,7 +130,7 @@ class GRLE(Component):
             image_with_fields = self.overlay_fields(image_colored)
             if image_with_fields is None:
                 continue
-            cv2.imwrite(with_fields_save_path, image_with_fields)  # pylint: disable=no-member
+            cv2.imwrite(with_fields_save_path, image_with_fields)
             preview_paths.append(with_fields_save_path)
 
         return preview_paths
@@ -201,7 +200,6 @@ class GRLE(Component):
             self.logger.warning("InfoLayer PNG file %s not found.", info_layer_farmlands_path)
             return
 
-        # pylint: disable=no-member
         image = cv2.imread(info_layer_farmlands_path, cv2.IMREAD_UNCHANGED)
         farmlands_xml_path = os.path.join(self.map_directory, "map/config/farmlands.xml")
         if not os.path.isfile(farmlands_xml_path):
@@ -244,7 +242,6 @@ class GRLE(Component):
             field_np = field_np // 2
             self.logger.debug("Divided the coordinates by 2.")
 
-            # pylint: disable=no-member
             try:
                 cv2.fillPoly(image, [field_np], farmland_id)  # type: ignore
             except Exception as e:  # pylint: disable=W0718
@@ -267,7 +264,7 @@ class GRLE(Component):
 
         self.logger.debug("Farmlands added to the farmlands XML file: %s.", farmlands_xml_path)
 
-        cv2.imwrite(info_layer_farmlands_path, image)  # pylint: disable=no-member
+        cv2.imwrite(info_layer_farmlands_path, image)
         self.logger.debug(
             "Farmlands added to the InfoLayer PNG file: %s.", info_layer_farmlands_path
         )
@@ -300,7 +297,7 @@ class GRLE(Component):
             forest_image_path = forest_layer.get_preview_or_path(weights_directory)
             self.logger.debug("Forest image path: %s.", forest_image_path)
             if forest_image_path:
-                # pylint: disable=no-member
+
                 forest_image = cv2.imread(forest_image_path, cv2.IMREAD_UNCHANGED)
 
         if not grass_image_path or not os.path.isfile(grass_image_path):
@@ -318,22 +315,20 @@ class GRLE(Component):
             return
 
         # Single channeled 8-bit image, where non-zero values (255) are where the grass is.
-        grass_image = cv2.imread(  # pylint: disable=no-member
-            grass_image_path, cv2.IMREAD_UNCHANGED  # pylint: disable=no-member
-        )
+        grass_image = cv2.imread(grass_image_path, cv2.IMREAD_UNCHANGED)
 
         # Density map of the fruits is 2X size of the base image, so we need to resize it.
         # We'll resize the base image to make it bigger, so we can compare the values.
-        grass_image = cv2.resize(  # pylint: disable=no-member
+        grass_image = cv2.resize(
             grass_image,
             (grass_image.shape[1] * 2, grass_image.shape[0] * 2),
-            interpolation=cv2.INTER_NEAREST,  # pylint: disable=no-member
+            interpolation=cv2.INTER_NEAREST,
         )
         if forest_image is not None:
-            forest_image = cv2.resize(  # pylint: disable=no-member
+            forest_image = cv2.resize(
                 forest_image,
                 (forest_image.shape[1] * 2, forest_image.shape[0] * 2),
-                interpolation=cv2.INTER_NEAREST,  # pylint: disable=no-member
+                interpolation=cv2.INTER_NEAREST,
             )
 
             # Add non zero values from the forest image to the grass image.
@@ -348,7 +343,6 @@ class GRLE(Component):
         if not base_layer_pixel_value:
             base_layer_pixel_value = 131
 
-        # pylint: disable=no-member
         def create_island_of_plants(image: np.ndarray, count: int) -> np.ndarray:
             """Create an island of plants in the image.
 

maps4fs/generator/map.py

@@ -7,7 +7,8 @@ import os
 import shutil
 from typing import Any, Generator
 
-from maps4fs.generator.component import Component
+from maps4fs.generator.background import Background
+from maps4fs.generator.component.base.component import Component
 from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
 from maps4fs.generator.game import Game
 from maps4fs.generator.settings import (
@@ -20,6 +21,7 @@ from maps4fs.generator.settings import (
     SplineSettings,
     TextureSettings,
 )
+from maps4fs.generator.texture import Texture
 from maps4fs.logger import Logger
 
 
@@ -236,6 +238,44 @@ class Map:
                 return component
         return None
 
+    def get_texture_component(self) -> Texture | None:
+        """Get texture component.
+
+        Returns:
+            Texture | None: Texture instance or None if not found.
+        """
+        component = self.get_component("Texture")
+        if not isinstance(component, Texture):
+            return None
+        return component
+
+    def get_background_component(self) -> Background | None:
+        """Get background component.
+
+        Returns:
+            Background | None: Background instance or None if not found.
+        """
+        component = self.get_component("Background")
+        if not isinstance(component, Background):
+            return None
+        return component
+
+    def get_texture_layer(self, by_usage: str | None = None) -> Texture.Layer | None:
+        """Get texture layer by usage.
+
+        Arguments:
+            by_usage (str, optional): Texture usage.
+
+        Returns:
+            Texture.Layer | None: Texture layer instance or None if not found.
+        """
+        texture_component = self.get_texture_component()
+        if not texture_component:
+            return None
+        if by_usage:
+            return texture_component.get_layer_by_usage(by_usage)
+        return None
+
     def previews(self) -> list[str]:
         """Get list of preview images.
 

maps4fs/generator/satellite.py

@@ -7,7 +7,7 @@ import cv2
 from pygmdl import save_image  # type: ignore
 
 from maps4fs.generator.background import DEFAULT_DISTANCE
-from maps4fs.generator.component import Component
+from maps4fs.generator.component.base.component import Component
 from maps4fs.generator.texture import PREVIEW_MAXIMUM_SIZE
 
 
@@ -65,7 +65,6 @@ class Satellite(Component):
                 self.logger.error(f"Failed to download satellite image: {e}")
                 continue
 
-    # pylint: disable=no-member
     def previews(self) -> list[str]:
         """Returns the paths to the preview images.
 

maps4fs/generator/settings.py

@@ -7,6 +7,16 @@ from typing import Any
 from pydantic import BaseModel, ConfigDict
 
 
+class Parameters:
+    """Simple class to store string constants for parameters."""
+
+    FIELD = "field"
+    FIELDS = "fields"
+    TEXTURES = "textures"
+    FOREST = "forest"
+    ROADS_POLYLINES = "roads_polylines"
+
+
 class SharedSettings(BaseModel):
     """Represents the shared settings for all components."""
 
@@ -147,6 +157,7 @@ class I3DSettings(SettingsModel):
     """
 
     forest_density: int = 10
+    trees_relative_shift: int = 20
 
 
 class TextureSettings(SettingsModel):

maps4fs/generator/texture.py

@@ -18,7 +18,7 @@ import shapely.geometry  # type: ignore
 from shapely.geometry.base import BaseGeometry  # type: ignore
 from tqdm import tqdm
 
-from maps4fs.generator.component import Component
+from maps4fs.generator.component.base.component import Component
 
 PREVIEW_MAXIMUM_SIZE = 2048
 
@@ -277,7 +277,6 @@ class Texture(Component):
             self.dissolve()
         self.copy_procedural()
 
-    # pylint: disable=no-member
     def add_borders(self) -> None:
         """Iterates over all the layers and picks the one which have the border propety defined.
         Borders are distance from the edge of the map on each side (top, right, bottom, left).
@@ -330,7 +329,7 @@ class Texture(Component):
         if not os.path.isfile(blockmask_path):
             self.logger.debug("BLOCKMASK.png not found, creating an empty file.")
             img = np.zeros((self.map_size, self.map_size), dtype=np.uint8)
-            cv2.imwrite(blockmask_path, img)  # pylint: disable=no-member
+            cv2.imwrite(blockmask_path, img)
 
         pg_layers_by_type = defaultdict(list)
         for layer in self.layers:
@@ -353,7 +352,7 @@ class Texture(Component):
                     # pylint: disable=E1101
                     texture = cv2.imread(texture_path, cv2.IMREAD_UNCHANGED)
                     merged_texture[texture == 255] = 255
-                cv2.imwrite(procedural_save_path, merged_texture)  # pylint: disable=no-member
+                cv2.imwrite(procedural_save_path, merged_texture)
                 self.logger.debug(
                     "Procedural file %s merged from %s textures.",
                     procedural_save_path,
@@ -441,7 +440,7 @@ class Texture(Component):
 
         for filepath in filepaths:
             img = np.zeros(size, dtype=np.uint8)
-            cv2.imwrite(filepath, img)  # pylint: disable=no-member
+            cv2.imwrite(filepath, img)
 
     @property
     def layers(self) -> list[Layer]:
@@ -476,7 +475,7 @@ class Texture(Component):
             ),
         )
 
-    # pylint: disable=no-member, R0912, R0915
+    # pylint: disable = R0912
     def draw(self) -> None:
         """Iterates over layers and fills them with polygons from OSM data."""
         layers = self.layers_by_priority()
@@ -845,7 +844,6 @@ class Texture(Component):
         preview_paths.append(self._osm_preview())
         return preview_paths
 
-    # pylint: disable=no-member
     def _osm_preview(self) -> str:
         """Merges layers into one image and saves it into the png file.
 

maps4fs/toolbox/background.py

@@ -22,9 +22,7 @@ def plane_from_np(
             will result in a simpler mesh.
         save_path (str) -- The path to save the obj file.
     """
-    dem_data = cv2.resize(  # pylint: disable=no-member
-        dem_data, (0, 0), fx=resize_factor, fy=resize_factor
-    )
+    dem_data = cv2.resize(dem_data, (0, 0), fx=resize_factor, fy=resize_factor)
 
     # Invert the height values.
     dem_data = dem_data.max() - dem_data

{maps4fs-1.8.11.dist-info → maps4fs-1.8.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.11
+Version: 1.8.12
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -611,6 +611,8 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - 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.
 
+- Trees relative shift - represents the maximum possible shift of the tree from it's original position in percents of the forest density value. The higher the value, the more the trees will be shifted from their original positions. Warning: higher values can lead to overlapping trees.
+
 ### Texture Advanced settings
 
 - Dissolve - if enabled, the values from one layer will be splitted between different layers of texture, making it look more natural. Warning: it's a time-consuming process, recommended to enable it, when you generating the final version of the map, not some test versions.

{maps4fs-1.8.11.dist-info → maps4fs-1.8.12.dist-info}/RECORD

@@ -1,18 +1,21 @@
 maps4fs/__init__.py,sha256=_KfKq_ppTfHH6N7yLHTPjYc0QP2AG1HT8BfYTR9SMJE,853
 maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/background.py,sha256=wLiJQroR4IjxpCekVnm030qnrOR9utoKqOVN5n-UwSQ,25023
-maps4fs/generator/component.py,sha256=p2bn37VlTLWu_pqH96GCV7LgKzj5Y0d3yATpXGegFDI,20950
-maps4fs/generator/config.py,sha256=0QmK052B8bxyHVhg3jzCORLfOBMMmqVfhhbqXKf6OMk,4383
-maps4fs/generator/dem.py,sha256=20gx0dzX0LyO6ipvDitst-BwGfcKogFqgQf9Q2qMH5U,10933
-maps4fs/generator/game.py,sha256=GmCl_KQ9D-UwKao4HFEb0PRAm829ThtSZfkgzK3Oh2g,8143
-maps4fs/generator/grle.py,sha256=wWYzi7tqYy5f1CVbYyk2T92nJJntahtV7wSsVnrEgqM,21181
-maps4fs/generator/i3d.py,sha256=o90zZU1dEzOaBzgrt2C6ymlYIsI8i2Oicqafz7TC1mo,25148
-maps4fs/generator/map.py,sha256=a50KQEr1XZKjS_WKXywGwh4OC3gyjY6M8FTc0eNcxpg,10183
+maps4fs/generator/background.py,sha256=p6rciVwGXgmx7o_LoeugjqUY6JLqVdaID9vt33W9Seg,24774
+maps4fs/generator/dem.py,sha256=RsIaL3LabYnZzow2fzmccsnzBo0m1YjcVVxUkJJGJMU,10735
+maps4fs/generator/game.py,sha256=zpS6PDd4Nej_VgpncVBeIhEFkAAyXYAD4Pgj-b_sLbQ,9196
+maps4fs/generator/grle.py,sha256=5bWTTVSYHr2wKbuynYdz6IGYZFD-dlbZBErDPCZ8NQ8,20726
+maps4fs/generator/map.py,sha256=ataDN-Hsx3XlHdisrLBZbP7q1aKFDaSXG939MEGsiE4,11513
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/satellite.py,sha256=_7RcuNmR1mjxEJWMDsjnzKUIqWxnGUn50XtjB7HmSPg,3661
-maps4fs/generator/settings.py,sha256=9vbXISQrE-aDY7ATpvZ7LVJMqjfwa3-gNl-huI8XLO0,5666
-maps4fs/generator/texture.py,sha256=tH7cbX10WL8WbwmMh_7ndIBNZptNgr_CMGbpGFL3HHM,36584
+maps4fs/generator/satellite.py,sha256=jeKZ1IC5kReewDBDIxGzQc11UaGceysyh_XAOxw6JO0,3644
+maps4fs/generator/settings.py,sha256=rzXOJi6d6GY7GMWZ5SYwKQoih_qcZKkYAuVwiyPMyjo,5917
+maps4fs/generator/texture.py,sha256=VEmbjTpv-asnQs7yo2pSjvE-jJI8zOFisnNGRbAsQVk,36432
+maps4fs/generator/component/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
+maps4fs/generator/component/i3d.py,sha256=3x38yL-kSJ8ylBwICBb6wPYzRSky4gVj8XCk2jzYSeo,19861
+maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/component/base/component.py,sha256=U3XJae0GUvHN08psv2j24Y4PBAAytSkSK3AmD-VjjXE,21404
+maps4fs/generator/component/base/component_xml.py,sha256=DLSUobR0GtVCdBWOCwZ9VLJv5vY9da5l4fzp86W8QhE,3446
 maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maps4fs/generator/dtm/bavaria.py,sha256=7njrEvSCYAC8ZVyvS-_84iXHhWA0oHKrEqSzxdnZuGs,4293
 maps4fs/generator/dtm/dtm.py,sha256=tbYPlpDbFS374ywHrYIJwRflRRzGzi7M5mmcVqwCYBw,22880
@@ -26,11 +29,11 @@ maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk
 maps4fs/generator/dtm/base/wcs.py,sha256=3Irnk9eJPsuRXe1GNpnEK4sWlbpPSJIJUT1V2W-qpKo,2278
 maps4fs/generator/dtm/base/wms.py,sha256=tevNGOf9VgGYBtc1TTd_oXWHLjU-nLowTIG8QShWDA0,2197
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
+maps4fs/toolbox/background.py,sha256=ym9a6TjZpRC2ButAUaQ_rwhOEuAo2ScwUQsXdJrV_Hs,2111
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.11.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.11.dist-info/METADATA,sha256=1CgbhfFSFcu225ZMFjp-19OSnDvN74h_W_gmyx0Osv8,41869
-maps4fs-1.8.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.11.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.11.dist-info/RECORD,,
+maps4fs-1.8.12.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.12.dist-info/METADATA,sha256=CYg5s5X_QicDgtaC7_2u0E56TESJ7Hf3UtMCKUDIWbI,42156
+maps4fs-1.8.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.12.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.12.dist-info/RECORD,,