maps4fs 1.8.184__tar.gz → 1.8.186__tar.gz

{maps4fs-1.8.184 → maps4fs-1.8.186}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.184
+Version: 1.8.186
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -686,29 +686,31 @@ The generator supports adding the own DTM providers, please refer to the [DTM Pr
 
 ### Supported DTM providers
 
-![coverage map](https://github.com/user-attachments/assets/138fa637-ce63-4dd9-bd11-bf92fe038a74)
+![coverage map](https://github.com/user-attachments/assets/e02a4b5e-c5a9-4e6f-826f-048081704ef9)
 
 In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
 
-| Provider Name                   | Resolution   | Developer                                   |
-| ------------------------------- | ------------ | ------------------------------------------- |
-| 🌎 SRTM30                       | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
-| 🇺🇸 USGS                         | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
-| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                     | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Hessen, Germany              | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Niedersachsen, Germany       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Bayern, Germany              | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
-| 🇩🇪 Nordrhein-Westfalen, Germany | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇨🇦 Canada                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇧🇪 Flanders, Belgium            | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇷 France                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇮🇹 Italy                        | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇳🇴 Norway                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇪🇸 Spain                        | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇮 Finland                      | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇰 Denmark                      | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇨🇭 Switzerland                  | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
+| Provider Name                      | Resolution   | Developer                                   |
+| ---------------------------------- | ------------ | ------------------------------------------- |
+| 🌎 SRTM30                          | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
+| 🇺🇸 USGS                            | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
+| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                        | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Hessen, Germany                 | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Niedersachsen, Germany          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Bayern, Germany                 | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
+| 🇩🇪 Nordrhein-Westfalen, Germany    | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Mecklenburg-Vorpommern, Germany | 1-25 meter   | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Baden-Württemberg, Germany      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇨🇦 Canada                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇧🇪 Flanders, Belgium               | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇷 France                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇮🇹 Italy                           | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇳🇴 Norway                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇪🇸 Spain                           | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇮 Finland                         | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇰 Denmark                         | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇨🇭 Switzerland                     | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
 
 ## Special thanks
 

{maps4fs-1.8.184 → maps4fs-1.8.186}/README.md

@@ -656,29 +656,31 @@ The generator supports adding the own DTM providers, please refer to the [DTM Pr
 
 ### Supported DTM providers
 
-![coverage map](https://github.com/user-attachments/assets/138fa637-ce63-4dd9-bd11-bf92fe038a74)
+![coverage map](https://github.com/user-attachments/assets/e02a4b5e-c5a9-4e6f-826f-048081704ef9)
 
 In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
 
-| Provider Name                   | Resolution   | Developer                                   |
-| ------------------------------- | ------------ | ------------------------------------------- |
-| 🌎 SRTM30                       | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
-| 🇺🇸 USGS                         | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
-| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                     | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Hessen, Germany              | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Niedersachsen, Germany       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Bayern, Germany              | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
-| 🇩🇪 Nordrhein-Westfalen, Germany | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇨🇦 Canada                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇧🇪 Flanders, Belgium            | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇷 France                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇮🇹 Italy                        | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇳🇴 Norway                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇪🇸 Spain                        | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇮 Finland                      | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇰 Denmark                      | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇨🇭 Switzerland                  | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
+| Provider Name                      | Resolution   | Developer                                   |
+| ---------------------------------- | ------------ | ------------------------------------------- |
+| 🌎 SRTM30                          | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
+| 🇺🇸 USGS                            | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
+| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                        | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Hessen, Germany                 | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Niedersachsen, Germany          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Bayern, Germany                 | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
+| 🇩🇪 Nordrhein-Westfalen, Germany    | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Mecklenburg-Vorpommern, Germany | 1-25 meter   | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Baden-Württemberg, Germany      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇨🇦 Canada                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇧🇪 Flanders, Belgium               | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇷 France                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇮🇹 Italy                           | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇳🇴 Norway                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇪🇸 Spain                           | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇮 Finland                         | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇰 Denmark                         | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇨🇭 Switzerland                     | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
 
 ## Special thanks
 

{maps4fs-1.8.184 → maps4fs-1.8.186}/maps4fs/__init__.py

@@ -17,6 +17,8 @@ from maps4fs.generator.dtm.france import FranceProvider
 from maps4fs.generator.dtm.norway import NorwayProvider
 from maps4fs.generator.dtm.denmark import DenmarkProvider
 from maps4fs.generator.dtm.switzerland import SwitzerlandProvider
+from maps4fs.generator.dtm.mv import MecklenburgVorpommernProvider
+from maps4fs.generator.dtm.baden import BadenWurttembergProvider
 from maps4fs.generator.game import Game
 from maps4fs.generator.map import Map
 from maps4fs.generator.settings import (

{maps4fs-1.8.184 → maps4fs-1.8.186}/maps4fs/generator/component/background.py

@@ -13,9 +13,9 @@ import numpy as np
 
 from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.component.base.component_mesh import MeshComponent
+from maps4fs.generator.component.texture import Texture
 from maps4fs.generator.dem import DEM
 from maps4fs.generator.settings import Parameters
-from maps4fs.generator.texture import Texture
 
 
 class Background(MeshComponent, ImageComponent):

{maps4fs-1.8.184 → maps4fs-1.8.186}/maps4fs/generator/component/base/component_image.py

@@ -116,3 +116,25 @@ class ImageComponent(Component):
             )
 
         cv2.imwrite(save_path, image)
+
+    @staticmethod
+    def transfer_border(src_image: np.ndarray, dst_image: np.ndarray | None, border: int) -> None:
+        """Transfers the border of the source image to the destination image.
+
+        Arguments:
+            src_image (np.ndarray): The source image.
+            dst_image (np.ndarray, optional): The destination image.
+            border (int): The border size.
+        """
+        borders = [
+            (slice(None, border), slice(None)),
+            (slice(None), slice(-border, None)),
+            (slice(-border, None), slice(None)),
+            (slice(None), slice(None, border)),
+        ]
+
+        for row_slice, col_slice in borders:
+            border_slice = (row_slice, col_slice)
+            if dst_image is not None:
+                dst_image[border_slice][src_image[border_slice] != 0] = 255
+            src_image[border_slice] = 0

maps4fs-1.8.186/maps4fs/generator/component/layer.py

@@ -0,0 +1,162 @@
+"""This module contains the class representing a layer with textures and tags."""
+
+from __future__ import annotations
+
+import os
+import re
+
+
+class Layer:
+    """Class which represents a layer with textures and tags.
+    It's using to obtain data from OSM using tags and make changes into corresponding textures.
+
+    Arguments:
+        name (str): Name of the layer.
+        tags (dict[str, str | list[str]]): Dictionary of tags to search for.
+        width (int | None): Width of the polygon in meters (only for LineString).
+        color (tuple[int, int, int]): Color of the layer in BGR format.
+        exclude_weight (bool): Flag to exclude weight from the texture.
+        priority (int | None): Priority of the layer.
+        info_layer (str | None): Name of the corresnponding info layer.
+        usage (str | None): Usage of the layer.
+        background (bool): Flag to determine if the layer is a background.
+        invisible (bool): Flag to determine if the layer is invisible.
+
+    Attributes:
+        name (str): Name of the layer.
+        tags (dict[str, str | list[str]]): Dictionary of tags to search for.
+        width (int | None): Width of the polygon in meters (only for LineString).
+    """
+
+    # pylint: disable=R0913
+    def __init__(  # pylint: disable=R0917
+        self,
+        name: str,
+        count: int,
+        tags: dict[str, str | list[str] | bool] | None = None,
+        width: int | None = None,
+        color: tuple[int, int, int] | list[int] | None = None,
+        exclude_weight: bool = False,
+        priority: int | None = None,
+        info_layer: str | None = None,
+        usage: str | None = None,
+        background: bool = False,
+        invisible: bool = False,
+        procedural: list[str] | None = None,
+        border: int | None = None,
+    ):
+        self.name = name
+        self.count = count
+        self.tags = tags
+        self.width = width
+        self.color = color if color else (255, 255, 255)
+        self.exclude_weight = exclude_weight
+        self.priority = priority
+        self.info_layer = info_layer
+        self.usage = usage
+        self.background = background
+        self.invisible = invisible
+        self.procedural = procedural
+        self.border = border
+
+    def to_json(self) -> dict[str, str | list[str] | bool]:  # type: ignore
+        """Returns dictionary with layer data.
+
+        Returns:
+            dict: Dictionary with layer data."""
+        data = {
+            "name": self.name,
+            "count": self.count,
+            "tags": self.tags,
+            "width": self.width,
+            "color": list(self.color),
+            "exclude_weight": self.exclude_weight,
+            "priority": self.priority,
+            "info_layer": self.info_layer,
+            "usage": self.usage,
+            "background": self.background,
+            "invisible": self.invisible,
+            "procedural": self.procedural,
+            "border": self.border,
+        }
+
+        data = {k: v for k, v in data.items() if v is not None}
+        return data  # type: ignore
+
+    @classmethod
+    def from_json(cls, data: dict[str, str | list[str] | bool]) -> Layer:
+        """Creates a new instance of the class from dictionary.
+
+        Arguments:
+            data (dict[str, str | list[str] | bool]): Dictionary with layer data.
+
+        Returns:
+            Layer: New instance of the class.
+        """
+        return cls(**data)  # type: ignore
+
+    def path(self, weights_directory: str) -> str:
+        """Returns path to the first texture of the layer.
+
+        Arguments:
+            weights_directory (str): Path to the directory with weights.
+
+        Returns:
+            str: Path to the texture.
+        """
+        idx = "01" if self.count > 0 else ""
+        weight_postfix = "_weight" if not self.exclude_weight else ""
+        return os.path.join(weights_directory, f"{self.name}{idx}{weight_postfix}.png")
+
+    def path_preview(self, weights_directory: str) -> str:
+        """Returns path to the preview of the first texture of the layer.
+
+        Arguments:
+            weights_directory (str): Path to the directory with weights.
+
+        Returns:
+            str: Path to the preview.
+        """
+        return self.path(weights_directory).replace(".png", "_preview.png")
+
+    def get_preview_or_path(self, weights_directory: str) -> str:
+        """Returns path to the preview of the first texture of the layer if it exists,
+        otherwise returns path to the texture.
+
+        Arguments:
+            weights_directory (str): Path to the directory with weights.
+
+        Returns:
+            str: Path to the preview or texture.
+        """
+        preview_path = self.path_preview(weights_directory)
+        return preview_path if os.path.isfile(preview_path) else self.path(weights_directory)
+
+    def paths(self, weights_directory: str) -> list[str]:
+        """Returns a list of paths to the textures of the layer.
+        NOTE: Works only after the textures are generated, since it just lists the directory.
+
+        Arguments:
+            weights_directory (str): Path to the directory with weights.
+
+        Returns:
+            list[str]: List of paths to the textures.
+        """
+        weight_files = os.listdir(weights_directory)
+
+        # Inconsistent names are the name of textures that are not following the pattern
+        # of texture_name{idx}_weight.png.
+        inconsistent_names = ["forestRockRoot", "waterPuddle"]
+
+        if self.name in inconsistent_names:
+            return [
+                os.path.join(weights_directory, weight_file)
+                for weight_file in weight_files
+                if weight_file.startswith(self.name)
+            ]
+
+        return [
+            os.path.join(weights_directory, weight_file)
+            for weight_file in weight_files
+            if re.match(rf"{self.name}\d{{2}}_weight.png", weight_file)
+        ]