maps4fs 1.8.242__py3-none-any.whl → 1.8.244__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -291,7 +291,7 @@ class Background(MeshComponent, ImageComponent):
         mesh = self.mesh_from_np(
             dem_data,
             include_zeros=include_zeros,
-            z_scaling_factor=self.get_z_scaling_factor(),
+            z_scaling_factor=self.get_z_scaling_factor(ignore_height_scale_multiplier=True),
             resize_factor=self.map.background_settings.resize_factor,
             apply_decimation=self.map.background_settings.apply_decimation,
             decimation_percent=self.map.background_settings.decimation_percent,

maps4fs/generator/component/i3d.py

@@ -430,80 +430,118 @@ class I3d(XMLComponent):
 
         return tree_schema  # type: ignore
 
+    def _get_random_tree(
+        self, tree_schema: list[dict[str, str]], leaf_type: str | None = None
+    ) -> dict[str, str]:
+        """Gets a random tree from the tree schema.
+        If the leaf type is provided, the method tries to get a tree with the same leaf type.
+
+        Arguments:
+            tree_schema (list[dict[str, str]]): The tree schema.
+            leaf_type (str, optional): The leaf type of the tree. Defaults to None.
+
+        Returns:
+            dict[str, str]: The random tree from the schema
+        """
+        if not leaf_type:
+            return choice(tree_schema)
+
+        try:
+            leaf_type = leaf_type.split("_")[0]
+        except IndexError:
+            return choice(tree_schema)
+
+        if leaf_type == "mixed":
+            trees_with_leaf_type = [tree for tree in tree_schema if tree.get("leaf_type")]
+            return choice(trees_with_leaf_type)
+
+        trees_by_leaf_type = [tree for tree in tree_schema if tree.get("leaf_type") == leaf_type]
+        if not trees_by_leaf_type:
+            return choice(tree_schema)
+
+        return choice(trees_by_leaf_type)
+
     def _add_forests(self) -> None:
         """Adds forests to the map I3D file."""
         tree_schema = self._read_tree_schema()
         if not tree_schema:
             return
 
-        forest_layer = self.map.get_texture_layer(by_usage=Parameters.FOREST)
-        if not forest_layer:
+        if self.map.texture_settings.use_precise_tags:
+            forest_layers = self.map.get_texture_layers(by_usage=Parameters.FOREST)
+        else:
+            layer = self.map.get_texture_layer(by_usage=Parameters.FOREST)
+            forest_layers = [layer] if layer else []
+        if not forest_layers:
             self.logger.warning("Forest layer not found.")
             return
 
-        weights_directory = self.game.weights_dir_path(self.map_directory)
-        forest_image_path = forest_layer.get_preview_or_path(weights_directory)
+        node_id = TREE_NODE_ID_STARTING_VALUE
 
-        if not forest_image_path or not os.path.isfile(forest_image_path):
-            self.logger.warning("Forest image not found.")
-            return
+        for forest_layer in forest_layers:
+            weights_directory = self.game.weights_dir_path(self.map_directory)
+            forest_image_path = forest_layer.get_preview_or_path(weights_directory)
 
-        tree = self.get_tree()
-        root = tree.getroot()
-        scene_node = root.find(".//Scene")
-        if scene_node is None:
-            self.logger.warning("Scene element not found in I3D file.")
-            return
+            if not forest_image_path or not os.path.isfile(forest_image_path):
+                self.logger.warning("Forest image not found.")
+                continue
 
-        node_id = TREE_NODE_ID_STARTING_VALUE
+            tree = self.get_tree()
+            root = tree.getroot()
+            scene_node = root.find(".//Scene")
+            if scene_node is None:
+                self.logger.warning("Scene element not found in I3D file.")
+                return
 
-        trees_node = self.create_element(
-            "TransformGroup",
-            {
-                "name": "trees",
-                "translation": "0 0 0",
-                "nodeId": str(node_id),
-            },
-        )
-        node_id += 1
+            trees_node = self.create_element(
+                "TransformGroup",
+                {
+                    "name": "trees",
+                    "translation": "0 0 0",
+                    "nodeId": str(node_id),
+                },
+            )
+            node_id += 1
 
-        not_resized_dem = self.get_not_resized_dem()
-        if not_resized_dem is None:
-            self.logger.warning("Not resized DEM not found.")
-            return
+            not_resized_dem = self.get_not_resized_dem()
+            if not_resized_dem is None:
+                self.logger.warning("Not resized DEM not found.")
+                return
 
-        forest_image = cv2.imread(forest_image_path, cv2.IMREAD_UNCHANGED)
-        for x, y in self.non_empty_pixels(forest_image, step=self.map.i3d_settings.forest_density):
-            shifted_x, shifted_y = self.randomize_coordinates(
-                (x, y),
-                self.map.i3d_settings.forest_density,
-                self.map.i3d_settings.trees_relative_shift,
-            )
+            forest_image = cv2.imread(forest_image_path, cv2.IMREAD_UNCHANGED)
+            for x, y in self.non_empty_pixels(
+                forest_image, step=self.map.i3d_settings.forest_density
+            ):
+                shifted_x, shifted_y = self.randomize_coordinates(
+                    (x, y),
+                    self.map.i3d_settings.forest_density,
+                    self.map.i3d_settings.trees_relative_shift,
+                )
 
-            shifted_x, shifted_y = int(shifted_x), int(shifted_y)
+                shifted_x, shifted_y = int(shifted_x), int(shifted_y)
 
-            z = self.get_z_coordinate_from_dem(not_resized_dem, shifted_x, shifted_y)
+                z = self.get_z_coordinate_from_dem(not_resized_dem, shifted_x, shifted_y)
 
-            xcs, ycs = self.top_left_coordinates_to_center((shifted_x, shifted_y))
-            node_id += 1
+                xcs, ycs = self.top_left_coordinates_to_center((shifted_x, shifted_y))
+                node_id += 1
 
-            rotation = randint(-180, 180)
+                rotation = randint(-180, 180)
 
-            random_tree = choice(tree_schema)
-            tree_name = random_tree["name"]
-            tree_id = random_tree["reference_id"]
+                random_tree = self._get_random_tree(tree_schema, forest_layer.precise_usage)
+                tree_name = random_tree["name"]
+                tree_id = random_tree["reference_id"]
 
-            data = {
-                "name": tree_name,
-                "translation": f"{xcs} {z} {ycs}",
-                "rotation": f"0 {rotation} 0",
-                "referenceId": str(tree_id),
-                "nodeId": str(node_id),
-            }
-            trees_node.append(self.create_element("ReferenceNode", data))
+                data = {
+                    "name": tree_name,
+                    "translation": f"{xcs} {z} {ycs}",
+                    "rotation": f"0 {rotation} 0",
+                    "referenceId": str(tree_id),
+                    "nodeId": str(node_id),
+                }
+                trees_node.append(self.create_element("ReferenceNode", data))
 
-        scene_node.append(trees_node)
-        self.save_tree(tree)
+            scene_node.append(trees_node)
+            self.save_tree(tree)
 
     @staticmethod
     def randomize_coordinates(

maps4fs/generator/component/layer.py

@@ -44,6 +44,8 @@ class Layer:
         invisible: bool = False,
         procedural: list[str] | None = None,
         border: int | None = None,
+        precise_tags: dict[str, str | list[str] | bool] | None = None,
+        precise_usage: str | None = None,
     ):
         self.name = name
         self.count = count
@@ -58,6 +60,8 @@ class Layer:
         self.invisible = invisible
         self.procedural = procedural
         self.border = border
+        self.precise_tags = precise_tags
+        self.precise_usage = precise_usage
 
     def to_json(self) -> dict[str, str | list[str] | bool]:  # type: ignore
         """Returns dictionary with layer data.
@@ -78,6 +82,8 @@ class Layer:
             "invisible": self.invisible,
             "procedural": self.procedural,
             "border": self.border,
+            "precise_tags": self.precise_tags,
+            "precise_usage": self.precise_usage,
         }
 
         data = {k: v for k, v in data.items() if v is not None}

maps4fs/generator/component/texture.py

@@ -123,6 +123,17 @@ class Texture(ImageComponent):
                 return layer
         return None
 
+    def get_layers_by_usage(self, usage: str) -> list[Layer]:
+        """Returns layer by usage.
+
+        Arguments:
+            usage (str): Usage of the layer.
+
+        Returns:
+            list[Layer]: List of layers.
+        """
+        return [layer for layer in self.layers if layer.usage == usage]
+
     def process(self) -> None:
         """Processes the data to generate textures."""
         self._prepare_weights()
@@ -211,7 +222,7 @@ class Texture(ImageComponent):
         if self.rotation:
             # Iterate over the layers which have tags and rotate them.
             for layer in tqdm(self.layers, desc="Rotating textures", unit="layer"):
-                if layer.tags:
+                if layer.tags or layer.precise_tags:
                     self.logger.debug("Rotating layer %s.", layer.name)
                     layer_paths = layer.paths(self._weights_dir)
                     layer_paths += [layer.path_preview(self._weights_dir)]
@@ -263,7 +274,7 @@ class Texture(ImageComponent):
         Arguments:
             layer (Layer): Layer with textures and tags.
         """
-        if layer.tags is None:
+        if layer.tags is None and layer.precise_tags is None:
             size = (self.map_size, self.map_size)
         else:
             size = (self.map_rotated_size, self.map_rotated_size)
@@ -316,7 +327,9 @@ class Texture(ImageComponent):
     def draw(self) -> None:
         """Iterates over layers and fills them with polygons from OSM data."""
         layers = self.layers_by_priority()
-        layers = [layer for layer in layers if layer.tags is not None]
+        layers = [
+            layer for layer in layers if layer.tags is not None or layer.precise_tags is not None
+        ]
 
         cumulative_image = None
 
@@ -376,7 +389,18 @@ class Texture(ImageComponent):
             info_layer_data (dict[list[list[int]]]): Dictionary to store info layer data.
             layer_image (np.ndarray): Layer image.
         """
-        for polygon in self.objects_generator(layer.tags, layer.width, layer.info_layer):
+        tags = layer.tags
+        if self.map.texture_settings.use_precise_tags:
+            if layer.precise_tags:
+                self.logger.debug(
+                    "Using precise tags: %s for layer %s.", layer.precise_tags, layer.name
+                )
+                tags = layer.precise_tags
+
+        if tags is None:
+            return
+
+        for polygon in self.objects_generator(tags, layer.width, layer.info_layer):
             if not len(polygon) > 2:
                 self.logger.debug("Skipping polygon with less than 3 points.")
                 continue
@@ -746,7 +770,11 @@ class Texture(ImageComponent):
             preview_size,
         )
 
-        active_layers = [layer for layer in self.layers if layer.tags is not None]
+        active_layers = [
+            layer
+            for layer in self.layers
+            if layer.tags is not None or layer.precise_tags is not None
+        ]
         self.logger.debug("Following layers have tag textures: %s.", len(active_layers))
 
         images = [

maps4fs/generator/dem.py

@@ -144,15 +144,24 @@ class DEM(Component):
             data = self.dtm_provider.get_numpy()
         except Exception as e:  # pylint: disable=W0718
             self.logger.error("Failed to get DEM data from DTM provider: %s.", e)
-            raise e
+            raise ValueError(
+                f"Failed to get DEM data from DTM provider: {e}. "
+                "Try using different DTM provider."
+            )
 
         if len(data.shape) != 2:
             self.logger.error("DTM provider returned incorrect data: more than 1 channel.")
-            raise ValueError("DTM provider returned incorrect data: more than 1 channel.")
+            raise ValueError(
+                "DTM provider returned incorrect data: more than 1 channel. "
+                "Try using different DTM provider."
+            )
 
         if data.dtype not in ["int16", "uint16", "float", "float32"]:
             self.logger.error("DTM provider returned incorrect data type: %s.", data.dtype)
-            raise ValueError(f"DTM provider returned incorrect data type: {data.dtype}.")
+            raise ValueError(
+                f"DTM provider returned incorrect data type: {data.dtype}. "
+                "Try using different DTM provider."
+            )
 
         self.logger.debug(
             "DEM data was retrieved from DTM provider. Shape: %s, dtype: %s. Min: %s, max: %s.",
@@ -167,7 +176,7 @@ class DEM(Component):
         # Check if the data contains any non zero values, otherwise raise an error.
         if not np.any(data):
             self.logger.error("DTM provider returned empty data.")
-            raise ValueError("DTM provider returned empty data.")
+            raise ValueError("DTM provider returned empty data. Try using different DTM provider.")
 
         # 1. Resize DEM data to the output resolution.
         resampled_data = self.resize_to_output(data)

maps4fs/generator/map.py

@@ -307,6 +307,25 @@ class Map:
             return texture_component.get_layer_by_usage(by_usage)
         return None
 
+    def get_texture_layers(
+        self,
+        by_usage: str | None = None,
+    ) -> None | list[Layer]:
+        """Get texture layers by usage.
+
+        Arguments:
+            by_usage (str, optional): Texture usage.
+
+        Returns:
+            None | list[Layer]: List of texture layers.
+        """
+        texture_component = self.get_texture_component()
+        if not texture_component:
+            return None
+        if by_usage:
+            return texture_component.get_layers_by_usage(by_usage)
+        return None
+
     def previews(self) -> list[str]:
         """Get list of preview images.
 

maps4fs/generator/settings.py

@@ -206,6 +206,7 @@ class TextureSettings(SettingsModel):
     fields_padding: int = 0
     skip_drains: bool = False
     use_cache: bool = True
+    use_precise_tags: bool = False
 
 
 class SplineSettings(SettingsModel):

{maps4fs-1.8.242.dist-info → maps4fs-1.8.244.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.242
+Version: 1.8.244
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -523,6 +523,8 @@ Let's have a closer look at the fields:
 - `invisible` - set it to True for the textures, which should not be drawn in the files, but only to save the data in the JSON file (related to the previous field).
 - `procedural` - is a list of corresponding files, that will be used for a procedural generation. For example: `"procedural": ["PG_meadow", "PG_acres"]` - means that the texture will be used for two procedural generation files: `masks/PG_meadow.png` and `masks/PG_acres.png`. Note, that the one procuderal name can be applied to multiple textures, in this case they will be merged into one mask.
 - `border` - this value defines the border between the texture and the edge of the map. It's used to prevent the texture from being drawn on the edge of the map. The value is in pixels.
+- `precise_tags` - can be used for more specific tags, for example instead of `"natural": "wood"` you can use `"leaf_type": "broadleaved"` to draw only broadleaved trees.
+- `precise_usage` - the same as `usage`, but being used with `precise_tags`.
 
 ## Background terrain
 
@@ -655,6 +657,8 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - Use cache - if enabled, the tool will use the cached OSM data for generating the map. It's useful when you're generating the same map multiple times and don't want to download the OSM data each time. But if you've made some changes to the OSM data, you should disable this option to get the updated data. By default, it's set to True. This option has no effect when you're using the custom OSM file.
 
+- Use precise tags - if enabled, the tool will use the precise tags from the texture schema and will ignore basic tags specified for the texture. In the default schema being used for specific types of forests: broadleaved, needleleaved, mixed, and so on. Note, that if it's enabled and the object does not have the precise tag, it will not be drawn on the map. By default, it's set to False.
+
 ### Splines Advanced settings
 
 - Splines density - number of points, which will be added (interpolate) between each pair of existing points. The higher the value, the denser the spline will be. It can smooth the splines, but high values can in opposite make the splines look unnatural.

{maps4fs-1.8.242.dist-info → maps4fs-1.8.244.dist-info}/RECORD

@@ -1,20 +1,20 @@
 maps4fs/__init__.py,sha256=EGvLVoRpSt4jITswsGbe1ISVmGAZAMQJcBmTwtyuVxI,335
 maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/dem.py,sha256=a9B3tatj7pzvvdLIyLw7BA3JoDTibFczpqiXJnx054U,12864
+maps4fs/generator/dem.py,sha256=CDfdDGCWhFn2_QYY5TtxgsXm3lgJ4W4qD-46UU3u-ck,13207
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
-maps4fs/generator/map.py,sha256=9tQTEMYvh4RSC5ACp7fE7RhVDGa7Mc-P5W95h-Zineg,13069
+maps4fs/generator/map.py,sha256=64uIHCwfpFyFXZJSayB0tuRFn0LVuTwf0wrAi4KMv00,13600
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=KFyzqtJ2BwjuESRzqSWyNuFlHS7W_wc8K_1tkLRKHwQ,6902
+maps4fs/generator/settings.py,sha256=285LjC5mUuzpHNPubBqd928MU7Yd_ZlLEnkBY3RbiHs,6937
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=Pr2dKNghC4ds9Gm8pj7LPWdAX-twYGy1Nfj7QY7pXX4,21012
+maps4fs/generator/component/background.py,sha256=QwyTaltQOTo3lD1uxewY99zw5Wd91CBWRQ35cC67WuE,21047
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=KlNbbYY4oyFfB_0qTInrweBTyLUW0koSSpqclkRw-Lk,19381
-maps4fs/generator/component/i3d.py,sha256=9OhGHFrgf8i9ZV9sKKVPLGMAUcSGZjNOxwSC38zRa9k,21382
-maps4fs/generator/component/layer.py,sha256=QPcEzTv_8N9wYvHAZy8OezfATaVLG-YetSfCXf2lnFI,5892
+maps4fs/generator/component/i3d.py,sha256=QsqtyOLyc_Y10UthV03EjZO60mHBubPvbEvLIsxzank,23017
+maps4fs/generator/component/layer.py,sha256=hbTBMLamKOWv_MXbnk-LjLyNV91jPsF33UEc17rBZCM,6185
 maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
-maps4fs/generator/component/texture.py,sha256=GWOE7w2maydB2LDku-YEC1w1oc8kcnnZ1SPTL6b82H8,30966
+maps4fs/generator/component/texture.py,sha256=ELU5QwysZaMPH9QQkE5jzIHAOzZ_Y8khcT9ruZuxQpQ,31803
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=CIR4Fjn9YfLU4y7nB_jOaz7PjGFvBcDnHlvXxeahpdM,21499
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
@@ -53,8 +53,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.242.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.242.dist-info/METADATA,sha256=0foJVSbmrPUAJZ7L7AHhiN4u5qCw0XjSqb8a9UONleI,46452
-maps4fs-1.8.242.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.242.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.242.dist-info/RECORD,,
+maps4fs-1.8.244.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.244.dist-info/METADATA,sha256=P1k1UFEjijon_156MSDJV1TQq3LXmyrUg5XXhQ-F2SQ,47093
+maps4fs-1.8.244.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.244.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.244.dist-info/RECORD,,