maps4fs 2.1.3__tar.gz → 2.1.5__tar.gz

{maps4fs-2.1.3 → maps4fs-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.3
+Version: 2.1.5
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs/generator/component/background.py

@@ -69,6 +69,8 @@ class Background(MeshComponent, ImageComponent):
         )
         self.not_resized_path: str = os.path.join(self.background_directory, "not_resized.png")
 
+        self.flatten_water_to: int | None = None
+
         self.dem = DEM(
             self.game,
             self.map,
@@ -520,11 +522,26 @@ class Background(MeshComponent, ImageComponent):
             if self.map.shared_settings.mesh_z_scaling_factor is not None
             else 257
         )
+        flatten_to = None
+        subtract_by = int(self.map.dem_settings.water_depth * z_scaling_factor)
+
+        if self.map.background_settings.flatten_water:
+            try:
+                mask = water_resources_image == 255
+                flatten_to = int(np.mean(dem_image[mask]) - subtract_by)  # type: ignore
+                self.flatten_water_to = flatten_to  # type: ignore
+            except Exception as e:
+                self.logger.warning("Error occurred while flattening water: %s", e)
 
         dem_image = self.subtract_by_mask(
             dem_image,  # type: ignore
             water_resources_image,  # type: ignore
-            int(self.map.dem_settings.water_depth * z_scaling_factor),
+            subtract_by=subtract_by,
+            flatten_to=flatten_to,
+        )
+
+        dem_image = self.blur_edges_by_mask(
+            dem_image, water_resources_image, smaller_kernel=3, iterations=5, bigger_kernel=5  # type: ignore
         )
 
         # Save the modified dem_image back to the output path
@@ -594,7 +611,7 @@ class Background(MeshComponent, ImageComponent):
             return
 
         # Create a mesh from the 3D polygons
-        mesh = self.mesh_from_3d_polygons(fitted_polygons)
+        mesh = self.mesh_from_3d_polygons(fitted_polygons, single_z_value=self.flatten_water_to)
         if mesh is None:
             self.logger.warning("No mesh could be created from the water polygons.")
             return
@@ -607,13 +624,16 @@ class Background(MeshComponent, ImageComponent):
         mesh.export(line_based_save_path)
         self.logger.debug("Line-based water mesh saved to %s", line_based_save_path)
 
-    def mesh_from_3d_polygons(self, polygons: list[shapely.Polygon]) -> Trimesh | None:
+    def mesh_from_3d_polygons(
+        self, polygons: list[shapely.Polygon], single_z_value: int | None = None
+    ) -> Trimesh | None:
         """Create a simple mesh from a list of 3D shapely Polygons.
         Each polygon must be flat (all Z the same or nearly the same for each polygon).
         Returns a single Trimesh mesh.
 
         Arguments:
             polygons (list[shapely.Polygon]): List of 3D shapely Polygons to create the mesh from.
+            single_z_value (int | None): The Z value to use for all vertices in the mesh.
 
         Returns:
             Trimesh: A single Trimesh object containing the mesh created from the polygons.
@@ -645,9 +665,12 @@ class Background(MeshComponent, ImageComponent):
                 dists = np.linalg.norm(exterior_2d - v[:2], axis=1)
                 idx = np.argmin(dists)
                 # z = exterior_coords[idx, 2]
-                z = self.get_z_coordinate_from_dem(
-                    not_resized_dem, exterior_coords[idx, 0], exterior_coords[idx, 1]  # type: ignore
-                )
+                if not single_z_value:
+                    z = self.get_z_coordinate_from_dem(
+                        not_resized_dem, exterior_coords[idx, 0], exterior_coords[idx, 1]  # type: ignore
+                    )
+                else:
+                    z = single_z_value
                 vertices_3d.append([v[0], v[1], z])
             vertices_3d = np.array(vertices_3d)  # type: ignore
 

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs/generator/component/base/component.py

@@ -417,7 +417,7 @@ class Component:
             fitted_osm_object = osm_object.intersection(bounds)
             self.logger.debug("Fitted the osm_object into the bounds: %s", bounds)
         except Exception as e:
-            raise ValueError(f"Could not fit the osm_object into the bounds: {e}")
+            raise ValueError(f"Could not fit the osm_object into the bounds: {e}") from e
 
         if not isinstance(fitted_osm_object, object_type):
             raise ValueError("The fitted osm_object is not valid (probably splitted into parts).")

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs/generator/component/base/component_image.py

@@ -67,6 +67,7 @@ class ImageComponent(Component):
         mask_by: int = 255,
         erode_kernel: int | None = 3,
         erode_iter: int | None = 1,
+        flatten_to: int | None = None,
     ) -> np.ndarray:
         """Subtracts a value from the image where the mask is equal to the mask by value.
 
@@ -77,6 +78,7 @@ class ImageComponent(Component):
             mask_by (int, optional): The value to mask by. Defaults to 255.
             erode_kernel (int, optional): The kernel size for the erosion. Defaults to 3.
             erode_iter (int, optional): The number of iterations for the erosion. Defaults to 1.
+            flatten_to_mean (bool, optional): Whether to flatten the image to the mean value.
 
         Returns:
             np.ndarray: The image with the subtracted value.
@@ -90,6 +92,10 @@ class ImageComponent(Component):
             ).astype(bool)
 
         image[mask] = image[mask] - subtract_by
+
+        if flatten_to:
+            image[mask] = flatten_to
+
         return image
 
     @staticmethod

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs/generator/component/dem.py

@@ -132,7 +132,7 @@ class DEM(ImageComponent):
             raise ValueError(
                 f"Failed to get DEM data from DTM provider: {e}. "
                 "Try using different DTM provider."
-            )
+            ) from e
 
         if len(data.shape) != 2:
             self.logger.error("DTM provider returned incorrect data: more than 1 channel.")

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs/generator/settings.py

@@ -164,6 +164,8 @@ class BackgroundSettings(SettingsModel):
         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.
         flatten_roads (bool): if True, roads will be flattened in the DEM data.
+        flatten_water (bool): if True, the bottom of the water resources will be flattened
+            to the average height of the water resources.
     """
 
     generate_background: bool = False
@@ -171,6 +173,7 @@ class BackgroundSettings(SettingsModel):
     water_blurriness: int = 20
     remove_center: bool = True
     flatten_roads: bool = False
+    flatten_water: bool = False
 
 
 class GRLESettings(SettingsModel):

{maps4fs-2.1.3 → maps4fs-2.1.5}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.3
+Version: 2.1.5
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.3 → maps4fs-2.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.1.3"
+version = "2.1.5"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "Apache License 2.0"}