maps4fs 1.9.53__py3-none-any.whl → 2.0.0__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -308,10 +308,6 @@ class Background(MeshComponent, ImageComponent):
             dem_data,
             include_zeros=include_zeros,
             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,
-            decimation_agression=self.map.background_settings.decimation_agression,
             remove_center=remove_center,
             remove_size=self.scaled_size,
         )

maps4fs/generator/component/base/component_mesh.py

@@ -62,10 +62,6 @@ class MeshComponent(Component):
         image: np.ndarray,
         include_zeros: bool,
         z_scaling_factor: float,
-        resize_factor: int,
-        apply_decimation: bool,
-        decimation_percent: int,
-        decimation_agression: int,
         remove_center: bool,
         remove_size: int,
     ) -> trimesh.Trimesh:
@@ -75,10 +71,6 @@ class MeshComponent(Component):
             image (np.ndarray): The numpy array to generate the mesh from.
             include_zeros (bool): Whether to include zero values in the mesh.
             z_scaling_factor (float): The scaling factor for the Z-axis.
-            resize_factor (int): The resizing factor.
-            apply_decimation (bool): Whether to apply decimation to the mesh.
-            decimation_percent (int): The percent of the decimation.
-            decimation_agression (int): The agression of the decimation.
             remove_center (bool): Whether to remove the center from the mesh.
             remove_size (int): The size of the center to remove.
 
@@ -88,7 +80,7 @@ class MeshComponent(Component):
         output_x_size, _ = image.shape
         image = image.max() - image
 
-        image = image[::resize_factor, ::resize_factor]
+        image = image[:: Parameters.RESIZE_FACTOR, :: Parameters.RESIZE_FACTOR]
 
         rows, cols = image.shape
         x = np.linspace(0, cols - 1, cols)
@@ -124,22 +116,9 @@ class MeshComponent(Component):
         mesh = trimesh.Trimesh(vertices=vertices, faces=faces_np)
         mesh = MeshComponent.rotate_mesh(mesh)
 
-        if apply_decimation:
-            percent = decimation_percent / 100
-            mesh = mesh.simplify_quadric_decimation(
-                percent=percent, aggression=decimation_agression
-            )
-
-        # * Looks like it takes some time but has no effect on the result.
-        # try:
-        #     if not mesh.is_watertight:
-        #         mesh = MeshComponent.fix_mesh(mesh)
-        # except Exception:
-        #     pass
-
         mesh = MeshComponent.mesh_to_output_size(
             mesh,
-            resize_factor,
+            Parameters.RESIZE_FACTOR,
             z_scaling_factor,
             output_x_size,
             skip_resize_to_expected_size=not include_zeros,

maps4fs/generator/component/grle.py

@@ -13,8 +13,6 @@ from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.component.base.component_xml import XMLComponent
 from maps4fs.generator.settings import Parameters
 
-FARMLAND_ID_LIMIT = 254
-
 
 def plant_to_pixel_value(plant_name: str) -> int | None:
     """Returns the pixel value representation of the plant.
@@ -229,7 +227,7 @@ class GRLE(ImageComponent, XMLComponent):
 
             farmland_np = self.polygon_points_to_np(fitted_farmland, divide=2)
 
-            if farmland_id > FARMLAND_ID_LIMIT:
+            if farmland_id > Parameters.FARMLAND_ID_LIMIT:
                 self.logger.warning(
                     "Farmland ID limit reached. Skipping the rest of the farmlands. "
                     "Giants Editor supports maximum 254 farmlands."
@@ -335,7 +333,7 @@ class GRLE(ImageComponent, XMLComponent):
         grass_image_copy[grass_image != 0] = base_layer_pixel_value
 
         # Add islands of plants to the base image.
-        island_count = int(self.scaled_size * self.map.grle_settings.plants_island_percent // 100)
+        island_count = int(self.scaled_size * Parameters.PLANTS_ISLAND_PERCENT // 100)
         self.logger.debug("Adding %s islands of plants to the base image.", island_count)
         if self.map.grle_settings.random_plants:
             grass_image_copy = self.create_island_of_plants(grass_image_copy, island_count)
@@ -387,8 +385,8 @@ class GRLE(ImageComponent, XMLComponent):
             plant_value = choice(possible_r_values)
             # Randomly choose the size of the island.
             island_size = randint(
-                self.map.grle_settings.plants_island_minimum_size,
-                self.map.grle_settings.plants_island_maximum_size,
+                Parameters.PLANTS_ISLAND_MINIMUM_SIZE,
+                Parameters.PLANTS_ISLAND_MAXIMUM_SIZE,
             )
             # Randomly choose the position of the island.
             x = randint(0, image.shape[1] - island_size)
@@ -396,10 +394,10 @@ class GRLE(ImageComponent, XMLComponent):
 
             try:
                 polygon_points = self.get_rounded_polygon(
-                    num_vertices=self.map.grle_settings.plants_island_vertex_count,
+                    num_vertices=Parameters.PLANTS_ISLAND_VERTEX_COUNT,
                     center=(x + island_size // 2, y + island_size // 2),
                     radius=island_size // 2,
-                    rounding_radius=self.map.grle_settings.plants_island_rounding_radius,
+                    rounding_radius=Parameters.PLANTS_ISLAND_ROUNDING_RADIUS,
                 )
                 if not polygon_points:
                     continue

maps4fs/generator/component/i3d.py

@@ -119,6 +119,12 @@ class I3d(XMLComponent):
         tree = self.get_tree(splines_i3d_path)
 
         roads_polylines = self.get_infolayer_data(Parameters.TEXTURES, Parameters.ROADS_POLYLINES)
+
+        if self.map.i3d_settings.field_splines:
+            fields_polygons = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
+            if isinstance(roads_polylines, list) and isinstance(fields_polygons, list):
+                roads_polylines.extend(fields_polygons)
+
         if not roads_polylines:
             self.logger.warning("Roads polylines data not found in textures info layer.")
             return
@@ -152,8 +158,14 @@ class I3d(XMLComponent):
 
         node_id = SPLINES_NODE_ID_STARTING_VALUE
         for road_id, road_info in enumerate(roads_polylines, start=1):
-            points = road_info.get("points")
-            tags = road_info.get("tags")
+            if isinstance(road_info, dict):
+                points = road_info.get("points")
+                tags = road_info.get("tags")
+                is_field = False
+            else:
+                points = road_info
+                tags = "field"
+                is_field = True
 
             try:
                 fitted_road = self.fit_object_into_bounds(
@@ -168,11 +180,11 @@ class I3d(XMLComponent):
                 continue
 
             fitted_road = self.interpolate_points(
-                fitted_road, num_points=self.map.spline_settings.spline_density
+                fitted_road, num_points=self.map.i3d_settings.spline_density
             )
             fitted_roads = [(fitted_road, "original")]
 
-            if self.map.spline_settings.add_reversed_splines:
+            if self.map.i3d_settings.add_reversed_splines:
                 reversed_fitted_road = fitted_road[::-1]
                 fitted_roads.append((reversed_fitted_road, "reversed"))
 
@@ -208,15 +220,16 @@ class I3d(XMLComponent):
 
                 shapes_node.append(nurbs_curve_node)
 
-                user_attribute_node = self.get_user_attribute_node(
-                    node_id,
-                    attributes=[
-                        ("maxSpeedScale", "integer", "1"),
-                        ("speedLimit", "integer", "100"),
-                    ],
-                )
+                if not is_field:
+                    user_attribute_node = self.get_user_attribute_node(
+                        node_id,
+                        attributes=[
+                            ("maxSpeedScale", "integer", "1"),
+                            ("speedLimit", "integer", "100"),
+                        ],
+                    )
 
-                user_attributes_node.append(user_attribute_node)
+                    user_attributes_node.append(user_attribute_node)
                 node_id += 1
 
         tree.write(splines_i3d_path)  # type: ignore

maps4fs/generator/component/satellite.py

@@ -55,13 +55,12 @@ class Satellite(ImageComponent):
             self.logger.debug("Satellite images download is disabled.")
             return
 
-        margin = self.map.satellite_settings.satellite_margin
-        overview_size = (self.map_size + margin) * 2
+        overview_size = self.map_size * 2
         overwiew_path = os.path.join(self.satellite_directory, "satellite_overview.png")
 
         self.assets.overview = overwiew_path
 
-        background_size = self.map_size + (Parameters.BACKGROUND_DISTANCE + margin) * 2
+        background_size = self.map_size + Parameters.BACKGROUND_DISTANCE * 2
         background_path = os.path.join(self.satellite_directory, "satellite_background.png")
 
         self.assets.background = background_path

maps4fs/generator/map.py

@@ -6,12 +6,15 @@ import json
 import os
 import shutil
 from typing import Any, Generator
+from xml.etree import ElementTree as ET
 
+import osmnx as ox
 from geopy.geocoders import Nominatim
+from osmnx._errors import InsufficientResponseError
 
 from maps4fs.generator.component import Background, Component, Layer, Texture
 from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
-from maps4fs.generator.game import Game
+from maps4fs.generator.game import FS25, Game
 from maps4fs.generator.settings import (
     BackgroundSettings,
     DEMSettings,
@@ -19,7 +22,6 @@ from maps4fs.generator.settings import (
     I3DSettings,
     SatelliteSettings,
     SharedSettings,
-    SplineSettings,
     TextureSettings,
 )
 from maps4fs.generator.statistics import send_advanced_settings, send_main_settings
@@ -53,7 +55,6 @@ class Map:
         grle_settings: GRLESettings = GRLESettings(),
         i3d_settings: I3DSettings = I3DSettings(),
         texture_settings: TextureSettings = TextureSettings(),
-        spline_settings: SplineSettings = SplineSettings(),
         satellite_settings: SatelliteSettings = SatelliteSettings(),
         **kwargs,
     ):
@@ -108,6 +109,21 @@ class Map:
         self.custom_osm = custom_osm
         log_entry += f"Custom OSM file: {custom_osm}. "
 
+        if self.custom_osm:
+            osm_is_valid = check_osm_file(self.custom_osm)
+            if not osm_is_valid:
+                self.logger.warning(
+                    "Custom OSM file %s is not valid. Attempting to fix it.", custom_osm
+                )
+                fixed, fixed_errors = fix_osm_file(self.custom_osm)
+                if not fixed:
+                    raise ValueError(
+                        f"Custom OSM file {custom_osm} is not valid and cannot be fixed."
+                    )
+                self.logger.info(
+                    "Custom OSM file %s fixed. Fixed errors: %d", custom_osm, fixed_errors
+                )
+
         # Make a copy of a custom osm file to the map directory, so it will be
         # included in the output archive.
         if custom_osm:
@@ -131,8 +147,6 @@ class Map:
         log_entry += f"I3D settings: {i3d_settings}. "
         self.texture_settings = texture_settings
         log_entry += f"Texture settings: {texture_settings}. "
-        self.spline_settings = spline_settings
-        log_entry += f"Spline settings: {spline_settings}. "
         self.satellite_settings = satellite_settings
 
         self.logger.info(log_entry)
@@ -145,7 +159,6 @@ class Map:
             grle_settings,
             i3d_settings,
             texture_settings,
-            spline_settings,
             satellite_settings,
         ]
 
@@ -386,3 +399,62 @@ class Map:
             self.logger.error("Error getting country name by coordinates: %s", e)
             return "Unknown"
         return "Unknown"
+
+
+def check_osm_file(file_path: str) -> bool:
+    """Tries to read the OSM file using OSMnx and returns True if the file is valid,
+    False otherwise.
+
+    Arguments:
+        file_path (str): Path to the OSM file.
+
+    Returns:
+        bool: True if the file is valid, False otherwise.
+    """
+    with open(FS25().texture_schema, encoding="utf-8") as f:
+        schema = json.load(f)
+
+    tags = []
+    for element in schema:
+        element_tags = element.get("tags")
+        if element_tags:
+            tags.append(element_tags)
+
+    for tag in tags:
+        try:
+            ox.features_from_xml(file_path, tags=tag)
+        except InsufficientResponseError:
+            continue
+        except Exception:  # pylint: disable=W0718
+            return False
+    return True
+
+
+def fix_osm_file(input_file_path: str, output_file_path: str | None = None) -> tuple[bool, int]:
+    """Fixes the OSM file by removing all the <relation> nodes and all the nodes with
+    action='delete'.
+
+    Arguments:
+        input_file_path (str): Path to the input OSM file.
+        output_file_path (str | None): Path to the output OSM file. If None, the input file
+            will be overwritten.
+
+    Returns:
+        tuple[bool, int]: A tuple containing the result of the check_osm_file function
+            and the number of fixed errors.
+    """
+    broken_entries = ["relation", ".//*[@action='delete']"]
+
+    tree = ET.parse(input_file_path)
+    root = tree.getroot()
+
+    fixed_errors = 0
+    for entry in broken_entries:
+        for element in root.findall(entry):
+            root.remove(element)
+            fixed_errors += 1
+
+    tree.write(output_file_path)  # type: ignore
+    result = check_osm_file(output_file_path)  # type: ignore
+
+    return result, fixed_errors

maps4fs/generator/settings.py

@@ -25,6 +25,16 @@ class Parameters:
     FULL = "FULL"
     PREVIEW = "PREVIEW"
 
+    RESIZE_FACTOR = 8
+
+    FARMLAND_ID_LIMIT = 254
+
+    PLANTS_ISLAND_PERCENT = 100
+    PLANTS_ISLAND_MINIMUM_SIZE = 10
+    PLANTS_ISLAND_MAXIMUM_SIZE = 200
+    PLANTS_ISLAND_VERTEX_COUNT = 30
+    PLANTS_ISLAND_ROUNDING_RADIUS = 15
+
 
 class SharedSettings(BaseModel):
     """Represents the shared settings for all components."""
@@ -143,25 +153,15 @@ class BackgroundSettings(SettingsModel):
     Attributes:
         generate_background (bool): generate obj files for the background terrain.
         generate_water (bool): generate obj files for the water.
-        resize_factor (int): resize factor for the background terrain and water.
-            It will be used as 1 / resize_factor of the original size.
         water_blurriness (int): blurriness of the water.
         remove_center (bool): remove the center of the background terrain.
             It will be used to remove the center of the map where the player starts.
-        apply_decimation (bool): apply decimation to the background terrain.
-        decimation_percent (int): percentage of the decimation.
-        decimation_agression (int): agression of the decimation.
-            It will be used to control the amount of decimation applied to the background terrain.
     """
 
     generate_background: bool = False
     generate_water: bool = False
     water_blurriness: int = 20
-    resize_factor: int = 8
     remove_center: bool = True
-    apply_decimation: bool = False
-    decimation_percent: int = 25
-    decimation_agression: int = 3
 
 
 class GRLESettings(SettingsModel):
@@ -169,9 +169,15 @@ class GRLESettings(SettingsModel):
 
     Attributes:
         farmland_margin (int): margin around the farmland.
-        random_plants (bool): generate random plants on the map or use the default one.
-        add_farmyards (bool): If True, regions of frarmyards will be added to the map
+        add_farmyards (bool): If True, regions of farmyards will be added to the map
             without corresponding fields.
+        base_price (int): base price for the farmland.
+        price_scale (int): scale for the price of the farmland.
+        add_grass (bool): if True, grass will be added to the map.
+        base_grass (tuple | str): base grass to be used on the map.
+        random_plants (bool): generate random plants on the map or use the default one.
+        fill_empty_farmlands (bool): if True, empty farmlands will be filled with grass.
+
     """
 
     farmland_margin: int = 0
@@ -181,11 +187,6 @@ class GRLESettings(SettingsModel):
     add_grass: bool = True
     base_grass: tuple | str = ("smallDenseMix", "meadow")
     random_plants: bool = True
-    plants_island_minimum_size: int = 10
-    plants_island_maximum_size: int = 200
-    plants_island_vertex_count: int = 30
-    plants_island_rounding_radius: int = 15
-    plants_island_percent: int = 100
     fill_empty_farmlands: bool = False
 
 
@@ -193,13 +194,23 @@ class I3DSettings(SettingsModel):
     """Represents the advanced settings for I3D component.
 
     Attributes:
+        add_trees (bool): add trees to the map.
         forest_density (int): density of the forest (distance between trees).
+        trees_relative_shift (int): relative shift of the trees.
+        spline_density (int): the number of extra points that will be added between each two
+            existing points.
+        add_reversed_splines (bool): if True, reversed splines will be added to the map.
+        field_splines (bool): if True, splines will be added to the fields.
     """
 
     add_trees: bool = True
     forest_density: int = 10
     trees_relative_shift: int = 20
 
+    spline_density: int = 2
+    add_reversed_splines: bool = False
+    field_splines: bool = False
+
 
 class TextureSettings(SettingsModel):
     """Represents the advanced settings for texture component.
@@ -217,18 +228,6 @@ class TextureSettings(SettingsModel):
     use_precise_tags: bool = False
 
 
-class SplineSettings(SettingsModel):
-    """Represents the advanced settings for spline component.
-
-    Attributes:
-        spline_density (int): the number of extra points that will be added between each two
-            existing points.
-    """
-
-    spline_density: int = 2
-    add_reversed_splines: bool = False
-
-
 class SatelliteSettings(SettingsModel):
     """Represents the advanced settings for satellite component.
 
@@ -238,5 +237,4 @@ class SatelliteSettings(SettingsModel):
     """
 
     download_images: bool = False
-    satellite_margin: int = 0
     zoom_level: int = 16

{maps4fs-1.9.53.dist-info → maps4fs-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 1.9.53
+Version: 2.0.0
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -28,7 +28,7 @@ Requires-Dist: tqdm
 Requires-Dist: scipy
 Dynamic: license-file
 
-⚠️ Learn more about the upcoming 2.0 changes in the [migration guide](docs/migration.md).  
+⚠️ Learn more about the 2.0 changes in the [migration guide](docs/migration.md).  
 ⚠️ Some components are deprecated and there are major changes in the project structure.
 
 
@@ -624,16 +624,8 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - Water blurriness - used to make the water surface smoother. The higher the value, the more flat surface of the water planes will be. However, too high values can lead to the water planes mesh not matching the terrain.
 
-- Resize factor - the factor by which the background terrain will be resized. It will be used as 1 / resize_factor while generating the models. Which means that the larger the value the more the terrain will be resized. The lowest value is 1, in this case background terrain will not be resized. Note, than low values will lead to long processing and enormous size of the obj files.
-
 - Remove center - if enabled, the playable region (map terrain) will be removed from the background terrain. By default, it's set to True.
 
-- Apply decimation - if enabled, the mesh will be simplified to reduce the number of faces.
-
-- Decimation percent - the target percentage of decimation. The higher the value, the more simplified the mesh will be. Note, that high values will break the 3D model entirely.
-
-- Decimation agression - the aggression of the decimation. The higher the value, the more aggressive the
-  decimation will be, which means the higher it will affect the geometry. It's not recommended to make it higher than the default value, otherwise the background terrain will not match the map terrain.
 
 ### GRLE Advanced settings
 
@@ -651,16 +643,6 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - Base grass - you can select which plant will be used as a base grass on the map.
 
-- Plants island minimum size - when random plants are enabled, the generator will add islands of differents plants to the map and choose the random size of those island between the minimum and maximum values. This one is the minimum size of the island in meters.
-
-- Plants island maximum size - it's the same as above, but for the maximum size of the island in meters.
-
-- Plants island vertex count - the number of vertices in the island. The higher the value, the more detailed the island will be. Note, that high values will turn the smoothed island into geometric madness.
-
-- Plants insland rounding radius - used to round the vertices of the island. The higher the value, the more rounded the island will be.
-
-- Plants island percent - defines the relation between the map size and the number of islands of plants. For example, if set to 100% for map size of 2048 will be added 2048 islands of plants.
-
 - Fill empty farmlands - if enabled, the empty (zero value) pixels of the farmlands image will be replaces with the value of 255.
 
 ### I3D Advanced settings
@@ -671,6 +653,10 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - 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.
 
+- 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.
+- Add reversed splines - if enabled, the tool will add the reversed copies of the splines. It can be useful if you want to have the splines on both directions. By default, it's set to False.
+- Field splines - if enabled, the tool will generate the splines around the fields. It may not work if the field appears on the map only partially, e.g., when the part of the field is outside the map area. By default, it's set to False.
+
 ### 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.
@@ -683,10 +669,6 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - 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.
-- Add reversed splines - if enabled, the tool will add the reversed copies of the splines. It can be useful if you want to have the splines on both directions. By default, it's set to False.
 
 ### Satellite Advanced settings
 

{maps4fs-1.9.53.dist-info → maps4fs-2.0.0.dist-info}/RECORD

@@ -2,23 +2,23 @@ maps4fs/__init__.py,sha256=EGvLVoRpSt4jITswsGbe1ISVmGAZAMQJcBmTwtyuVxI,335
 maps4fs/logger.py,sha256=WDfR14hxqy8b6xtwL6YIu2LGzFO1sbt0LxMgfsDTOkA,865
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/game.py,sha256=g8lMHuuRRmJLSDsQTAMv8p_-qntYMiZKnAqn7ru96i0,11645
-maps4fs/generator/map.py,sha256=3q9S4tYWeRaYO_ENLD_80towAEnIVn11_9mXNsqN6eg,13964
+maps4fs/generator/map.py,sha256=XEY2wYWl7ABcJ2i1-05t-4mduuGYhE07nscoA_7va_g,16288
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=E_M47X2QhbBqgiNraBDQd62lAQlNWHYLq30HQ59_4k4,7490
+maps4fs/generator/settings.py,sha256=8UbET3X1IbA7D4DX5HesZ7ijXLdzCCp7B3p3mFCZs8s,7429
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=AfbgNUai3tvpMe8lYmfiaM1n51ssunECy4gRglihumU,24032
+maps4fs/generator/component/background.py,sha256=9CyT5MoQWILFwEGZThZnn3l1UEDI-5Sg0-VUV9TT240,23722
 maps4fs/generator/component/config.py,sha256=IP530sapLofFskSnBEB96G0aUSd6Sno0G9ET3ca0ZOQ,3696
 maps4fs/generator/component/dem.py,sha256=Bvm3ViA6PpR7RXRAHBj5rgYB9PWy55Qj6PhTMv6dJRI,11953
-maps4fs/generator/component/grle.py,sha256=ao3-4B4QUVl0XgOmYAj9L48KGaZtCZRTB1BqYgdAJIc,19613
-maps4fs/generator/component/i3d.py,sha256=xTiZYQRahYBsVALxmnsBygzTHJLE54ucXvHK8LWCYAs,23914
+maps4fs/generator/component/grle.py,sha256=5ftHSg8FwSkabVlStlfG_erGZSOrilU-RUvCobfT1Yw,19539
+maps4fs/generator/component/i3d.py,sha256=5703ntFt7EQKFpQWQN5ST_bM08akV3rpSwKZDvkFp6w,24462
 maps4fs/generator/component/layer.py,sha256=-br4gAGcGeBNb3ldch9XFEK0lhXqb1IbArhFB5Owu54,6186
-maps4fs/generator/component/satellite.py,sha256=47V9aPbv7k-2C-PsoXd33EO92yavFzB6_MRCd7fLP6k,5042
+maps4fs/generator/component/satellite.py,sha256=OsxoNOCgkUtRzL7Geuqubsf6uoKXAIN8jQvrJ7IFeAI,4958
 maps4fs/generator/component/texture.py,sha256=Nc_oOHX3b4vJm8FnNOn3W4EQGFkW0zW0rGzO_0nTJMM,33392
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=HeNDaToKrS6OLeJepKZA7iQzZQDYy-9QRtv1A73Ire0,22090
 maps4fs/generator/component/base/component_image.py,sha256=2NYJgCU8deHl7O2FYFYk38WKZVJygFoc2gjBXwH6vjM,5970
-maps4fs/generator/component/base/component_mesh.py,sha256=BsxS5NlUK2hLhksgCwSoMK-00GNAwK2fYGpgb3R4n1w,9396
+maps4fs/generator/component/base/component_mesh.py,sha256=7CfaEpfj_4P5LfAjFT4L76pTokqf6zmla9__sQNLUpA,8587
 maps4fs/generator/component/base/component_xml.py,sha256=V9pGUvHh6UF6BP0qFARqDq9vquoAgq1zJqhOgBoeS_Y,3983
 maps4fs/generator/dtm/__init__.py,sha256=CzK8ZdLU5Iv7DrwK5hIQ41zVsLRFgZO-IuRxf-NCVqg,1516
 maps4fs/generator/dtm/arctic.py,sha256=LSivLLjtd6TJUaPYvgSYQ4KalMTaY58zFvwivSh45uM,2587
@@ -50,12 +50,8 @@ maps4fs/generator/dtm/usgs_wcs.py,sha256=X8VxdhyH0-EciGE_X-KgrAM6sVLTGssYIhtebOj
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
 maps4fs/generator/dtm/base/wcs.py,sha256=lQAp_gVz9_XUmtyobJkskiefQpuJH4o1Vwb3CSQ0lQA,2510
 maps4fs/generator/dtm/base/wms.py,sha256=6Va2UMhg_s0TMOfMhxrPbsiAPiw6-vXBglnaij032I0,2264
-maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/toolbox/background.py,sha256=RB0pHuRyfnDuqYtO2gUypfPm4G5cYRFdT2W-DG49zy0,2427
-maps4fs/toolbox/custom_osm.py,sha256=fjVSl9Ztc8_q0DxgNkhM7tE0Y-XpX8xcGGW-Tunp0R8,2518
-maps4fs/toolbox/dem.py,sha256=mbn3ZqMRhhYmzgssm2CGvg6aa89MUBOJPq6QyE54OLY,4191
-maps4fs-1.9.53.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.9.53.dist-info/METADATA,sha256=8Q5ZfUvd2GzOFcVfhHJouP6vgKs-77Nbk_6mAASL8bE,49397
-maps4fs-1.9.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-1.9.53.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.9.53.dist-info/RECORD,,
+maps4fs-2.0.0.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-2.0.0.dist-info/METADATA,sha256=kaF0PzplnuFhL2_8PLKYGd_mbowqWQi7G0rhvK7T9A8,47725
+maps4fs-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.0.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.0.0.dist-info/RECORD,,

maps4fs/toolbox/__init__.py

@@ -1 +0,0 @@
-# pylint: disable=missing-module-docstring

maps4fs/toolbox/background.py

@@ -1,70 +0,0 @@
-"""This module contains functions to work with the background terrain of the map."""
-
-import warnings
-
-import cv2
-import numpy as np
-import trimesh  # type: ignore
-
-
-# pylint: disable=R0914
-def plane_from_np(
-    dem_data: np.ndarray,
-    resize_factor: float,
-    simplify_factor: int,
-    save_path: str,
-) -> None:
-    """Generates a 3D obj file based on DEM data.
-
-    Arguments:
-        dem_data (np.ndarray) -- The DEM data as a numpy array.
-        resize_factor (float) -- The factor by which the DEM data will be resized. Bigger values
-            will result in a bigger mesh.
-        simplify_factor (int) -- The factor by which the mesh will be simplified. Bigger values
-            will result in a simpler mesh.
-        save_path (str) -- The path to save the obj file.
-    """
-    warnings.warn(
-        "The 'plane_from_np' function is deprecated and will be removed in maps4fs 2.0. "
-        "Use 'trimesh' directly instead or maps4fs.generator.component.base.component_mesh."
-        "MeshComponent.mesh_from_np' instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    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
-
-    rows, cols = dem_data.shape
-    x = np.linspace(0, cols - 1, cols)
-    y = np.linspace(0, rows - 1, rows)
-    x, y = np.meshgrid(x, y)
-    z = dem_data
-
-    vertices = np.column_stack([x.ravel(), y.ravel(), z.ravel()])
-    faces = []
-
-    for i in range(rows - 1):
-        for j in range(cols - 1):
-            top_left = i * cols + j
-            top_right = top_left + 1
-            bottom_left = top_left + cols
-            bottom_right = bottom_left + 1
-
-            faces.append([top_left, bottom_left, bottom_right])
-            faces.append([top_left, bottom_right, top_right])
-
-    faces = np.array(faces)  # type: ignore
-    mesh = trimesh.Trimesh(vertices=vertices, faces=faces)
-
-    # Apply rotation: 180 degrees around Y-axis and Z-axis
-    rotation_matrix_y = trimesh.transformations.rotation_matrix(np.pi, [0, 1, 0])
-    rotation_matrix_z = trimesh.transformations.rotation_matrix(np.pi, [0, 0, 1])
-    mesh.apply_transform(rotation_matrix_y)
-    mesh.apply_transform(rotation_matrix_z)
-
-    # Simplify the mesh to reduce the number of faces.
-    mesh = mesh.simplify_quadric_decimation(face_count=len(faces) // simplify_factor)
-
-    mesh.export(save_path)

maps4fs/toolbox/custom_osm.py

@@ -1,82 +0,0 @@
-"""This module contains functions to work with custom OSM files."""
-
-import json
-import warnings
-from xml.etree import ElementTree as ET
-
-import osmnx as ox
-from osmnx._errors import InsufficientResponseError
-
-from maps4fs.generator.game import FS25
-
-
-def check_osm_file(file_path: str) -> bool:
-    """Tries to read the OSM file using OSMnx and returns True if the file is valid,
-    False otherwise.
-
-    Arguments:
-        file_path (str): Path to the OSM file.
-
-    Returns:
-        bool: True if the file is valid, False otherwise.
-    """
-    warnings.warn(
-        "The 'check_osm_file' function is deprecated and will be removed in maps4fs 2.0. "
-        "The feature will be directly integrated into the maps4fs generator. "
-        "And will not be available as a separate function.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    with open(FS25().texture_schema, encoding="utf-8") as f:
-        schema = json.load(f)
-
-    tags = []
-    for element in schema:
-        element_tags = element.get("tags")
-        if element_tags:
-            tags.append(element_tags)
-
-    for tag in tags:
-        try:
-            ox.features_from_xml(file_path, tags=tag)
-        except InsufficientResponseError:
-            continue
-        except Exception:  # pylint: disable=W0718
-            return False
-    return True
-
-
-def fix_osm_file(input_file_path: str, output_file_path: str) -> tuple[bool, int]:
-    """Fixes the OSM file by removing all the <relation> nodes and all the nodes with
-    action='delete'.
-
-    Arguments:
-        input_file_path (str): Path to the input OSM file.
-        output_file_path (str): Path to the output OSM file.
-
-    Returns:
-        tuple[bool, int]: A tuple containing the result of the check_osm_file function
-            and the number of fixed errors.
-    """
-    warnings.warn(
-        "The 'fix_osm_file' function is deprecated and will be removed in maps4fs 2.0. "
-        "The feature will be directly integrated into the maps4fs generator. "
-        "And will not be available as a separate function.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    broken_entries = ["relation", ".//*[@action='delete']"]
-
-    tree = ET.parse(input_file_path)
-    root = tree.getroot()
-
-    fixed_errors = 0
-    for entry in broken_entries:
-        for element in root.findall(entry):
-            root.remove(element)
-            fixed_errors += 1
-
-    tree.write(output_file_path)
-    result = check_osm_file(output_file_path)
-
-    return result, fixed_errors

maps4fs/toolbox/dem.py

@@ -1,131 +0,0 @@
-"""This module contains functions for working with Digital Elevation Models (DEMs)."""
-
-import os
-import warnings
-
-import rasterio  # type: ignore
-from pyproj import Transformer
-from rasterio.io import DatasetReader  # type: ignore
-from rasterio.windows import from_bounds  # type: ignore
-
-
-def read_geo_tiff(file_path: str) -> DatasetReader:
-    """Read a GeoTIFF file and return the DatasetReader object.
-
-    Arguments:
-        file_path (str): The path to the GeoTIFF file.
-
-    Raises:
-        FileNotFoundError: If the file is not found.
-        RuntimeError: If there is an error reading the file.
-
-    Returns:
-        DatasetReader: The DatasetReader object for the GeoTIFF file.
-    """
-    warnings.warn(
-        "The 'read_geo_tiff' function is deprecated and will be removed in maps4fs 2.0. "
-        "Use 'rasterio.open' directly instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    if not os.path.isfile(file_path):
-        raise FileNotFoundError(f"File not found: {file_path}")
-
-    try:
-        src = rasterio.open(file_path)
-    except Exception as e:
-        raise RuntimeError(f"Error reading file: {file_path}") from e
-
-    if not src.bounds or not src.crs:
-        raise RuntimeError(
-            f"Can not read bounds or CRS from file: {file_path}. "
-            f"Bounds: {src.bounds}, CRS: {src.crs}"
-        )
-
-    return src
-
-
-def get_geo_tiff_bbox(
-    src: DatasetReader, dst_crs: str | None = "EPSG:4326"
-) -> tuple[float, float, float, float]:
-    """Return the bounding box of a GeoTIFF file in the destination CRS.
-
-    Arguments:
-        src (DatasetReader): The DatasetReader object for the GeoTIFF file.
-        dst_crs (str, optional): The destination CRS. Defaults to "EPSG:4326".
-
-    Returns:
-        tuple[float, float, float, float]: The bounding box in the destination CRS
-            as (north, south, east, west).
-    """
-    warnings.warn(
-        "The 'get_geo_tiff_bbox' function is deprecated and will be removed in maps4fs 2.0. "
-        "Use 'rasterio' methods directly instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    left, bottom, right, top = src.bounds
-
-    transformer = Transformer.from_crs(src.crs, dst_crs, always_xy=True)
-
-    east, north = transformer.transform(left, top)
-    west, south = transformer.transform(right, bottom)
-
-    return north, south, east, west
-
-
-# pylint: disable=R0914
-def extract_roi(file_path: str, bbox: tuple[float, float, float, float]) -> str:
-    """Extract a region of interest (ROI) from a GeoTIFF file and save it as a new file.
-
-    Arguments:
-        file_path (str): The path to the GeoTIFF file.
-        bbox (tuple[float, float, float, float]): The bounding box of the region of interest
-            as (north, south, east, west).
-
-    Raises:
-        RuntimeError: If there is no data in the selected region.
-
-    Returns:
-        str: The path to the new GeoTIFF file containing the extracted ROI.
-    """
-    warnings.warn(
-        "The 'extract_roi' function is deprecated and will be removed in maps4fs 2.0. "
-        "Use 'rasterio' methods directly instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    with rasterio.open(file_path) as src:
-        transformer = Transformer.from_crs("EPSG:4326", src.crs, always_xy=True)
-        north, south, east, west = bbox
-
-        left, bottom = transformer.transform(west, south)
-        right, top = transformer.transform(east, north)
-
-        window = from_bounds(left, bottom, right, top, src.transform)
-        data = src.read(window=window)
-
-    if not data.size > 0:
-        raise RuntimeError("No data in the selected region.")
-
-    base_name = os.path.basename(file_path).split(".")[0]
-    dir_name = os.path.dirname(file_path)
-
-    output_name = f"{base_name}_{north}_{south}_{east}_{west}.tif"
-
-    output_path = os.path.join(dir_name, output_name)
-
-    with rasterio.open(
-        output_path,
-        "w",
-        driver="GTiff",
-        height=data.shape[1],
-        width=data.shape[2],
-        count=data.shape[0],
-        dtype=data.dtype,
-        crs=src.crs,
-        transform=src.window_transform(window),
-    ) as dst:
-        dst.write(data)
-
-    return output_path