maps4fs 2.1.2__tar.gz → 2.1.4__tar.gz

{maps4fs-2.1.2 → maps4fs-2.1.4}/PKG-INFO

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

{maps4fs-2.1.2 → maps4fs-2.1.4}/maps4fs/generator/component/background.py

@@ -21,6 +21,8 @@ from maps4fs.generator.component.dem import DEM
 from maps4fs.generator.component.texture import Texture
 from maps4fs.generator.settings import Parameters
 
+SEGMENT_LENGTH = 2
+
 
 class Background(MeshComponent, ImageComponent):
     """Component for creating 3D obj files based on DEM data around the map.
@@ -97,6 +99,10 @@ class Background(MeshComponent, ImageComponent):
         cutted_dem_path = self.save_map_dem(self.output_path)
         shutil.copyfile(self.output_path, self.not_substracted_path)
         self.save_map_dem(self.output_path, save_path=self.not_resized_path)
+
+        if self.map.background_settings.flatten_roads:
+            self.flatten_roads()
+
         if self.game.additional_dem_name is not None:
             self.make_copy(cutted_dem_path, self.game.additional_dem_name)
 
@@ -521,6 +527,10 @@ class Background(MeshComponent, ImageComponent):
             int(self.map.dem_settings.water_depth * z_scaling_factor),
         )
 
+        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
         cv2.imwrite(self.output_path, dem_image)
         self.logger.debug("Water depth subtracted from DEM data: %s", self.output_path)
@@ -723,3 +733,94 @@ class Background(MeshComponent, ImageComponent):
         self.assets.water_mesh = elevated_save_path
 
         self.plane_from_np(elevated_water, elevated_save_path, include_zeros=False)
+
+    def flatten_roads(self) -> None:
+        """Flattens the roads in the DEM data by averaging the height values along the road polylines."""
+        if not self.not_resized_path or not os.path.isfile(self.not_resized_path):
+            self.logger.warning("No DEM data found for flattening roads.")
+            return
+
+        dem_image = cv2.imread(self.not_resized_path, cv2.IMREAD_UNCHANGED)
+        if dem_image is None:
+            self.logger.warning("Failed to read DEM data.")
+            return
+
+        roads_polylines = self.get_infolayer_data(Parameters.TEXTURES, Parameters.ROADS_POLYLINES)
+        if not roads_polylines:
+            self.logger.warning("No roads polylines found in textures info layer.")
+            return
+
+        self.logger.debug("Found %s roads polylines in textures info layer.", len(roads_polylines))
+
+        full_mask = np.zeros(dem_image.shape, dtype=np.uint8)
+
+        for road_polyline in tqdm(roads_polylines, desc="Flattening roads", unit="road"):
+            points = road_polyline.get("points")
+            width = road_polyline.get("width")
+            if not points or not width:
+                self.logger.warning("Skipping road with insufficient data: %s", road_polyline)
+                continue
+
+            try:
+                fitted_road = self.fit_object_into_bounds(
+                    linestring_points=points, angle=self.rotation
+                )
+            except ValueError as e:
+                self.logger.debug(
+                    "Road polyline could not be fitted into the map bounds with error: %s",
+                    e,
+                )
+                continue
+
+            polyline = shapely.LineString(fitted_road)
+
+            total_length = polyline.length
+            self.logger.debug("Total length of the road polyline: %s", total_length)
+
+            current_distance = 0
+            segments: list[shapely.LineString] = []
+            while current_distance < total_length:
+                start_point = polyline.interpolate(current_distance)
+                end_distance = min(current_distance + SEGMENT_LENGTH, total_length)
+                end_point = polyline.interpolate(end_distance)
+
+                # Create a small segment LineString
+                segment = shapely.LineString([start_point, end_point])
+                segments.append(segment)
+                current_distance += SEGMENT_LENGTH
+
+            self.logger.debug("Number of segments created: %s", len(segments))
+
+            road_polygons: list[shapely.Polygon] = []
+            for segment in segments:
+                polygon = segment.buffer(
+                    width * 2, resolution=4, cap_style="flat", join_style="mitre"
+                )
+                road_polygons.append(polygon)
+
+            for polygon in road_polygons:
+                polygon_points = polygon.exterior.coords
+                road_np = self.polygon_points_to_np(polygon_points)
+                mask = np.zeros(dem_image.shape, dtype=np.uint8)
+
+                try:
+                    cv2.fillPoly(mask, [road_np], 255)  # type: ignore
+                except Exception as e:
+                    self.logger.debug("Could not create mask for road with error: %s", e)
+                    continue
+
+                mean_value = cv2.mean(dem_image, mask=mask)[0]  # type: ignore
+                dem_image[mask == 255] = mean_value
+                full_mask[mask == 255] = 255
+
+        main_dem_path = self.game.dem_file_path(self.map_directory)
+        dem_image = self.blur_by_mask(dem_image, full_mask)
+        dem_image = self.blur_edges_by_mask(dem_image, full_mask)
+
+        output_size = dem_image.shape[0] + 1
+        resized_dem = cv2.resize(
+            dem_image, (output_size, output_size), interpolation=cv2.INTER_NEAREST
+        )
+
+        cv2.imwrite(main_dem_path, resized_dem)
+        self.logger.debug("Flattened roads saved to DEM file: %s", main_dem_path)

{maps4fs-2.1.2 → maps4fs-2.1.4}/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.2 → maps4fs-2.1.4}/maps4fs/generator/component/base/component_image.py

@@ -175,3 +175,59 @@ class ImageComponent(Component):
         elif blur_radius % 2 == 0:
             blur_radius += 1
         return blur_radius
+
+    def blur_by_mask(self, data: np.ndarray, mask: np.ndarray, blur_radius: int = 3) -> np.ndarray:
+        """Blurs the provided image only where the mask is set.
+
+        Arguments:
+            data (np.ndarray): The image data to be blurred.
+            mask (np.ndarray): The mask where the blur should be applied.
+
+        Returns:
+            np.ndarray: The image with the blur applied according to the mask.
+        """
+        if data.shape[:2] != mask.shape[:2]:
+            raise ValueError("Data and mask must have the same dimensions.")
+
+        # Create a blurred version of the data
+        blurred_data = cv2.GaussianBlur(data, (blur_radius, blur_radius), sigmaX=3)
+
+        # Combine the blurred data with the original data using the mask
+        result = np.where(mask == 255, blurred_data, data)
+
+        return result
+
+    def blur_edges_by_mask(
+        self,
+        data: np.ndarray,
+        mask: np.ndarray,
+        bigger_kernel: int = 3,
+        smaller_kernel: int = 1,
+        iterations: int = 1,
+    ) -> np.ndarray:
+        """Blurs the edges of the edge region where changes were made by mask earlier.
+        Creates a slightly bigger mask, a slightly smaller mask, subtract them
+        and obtains the mask for the edges.
+        Then applies blur to the image data only where the mask is set.
+
+        Arguments:
+            data (np.ndarray): The image data to be blurred.
+            mask (np.ndarray): The mask where changes were made.
+            blur_radius (int): The radius of the blur.
+
+        Returns:
+            np.ndarray: The image with the edges blurred according to the mask.
+        """
+        if data.shape[:2] != mask.shape[:2]:
+            raise ValueError("Data and mask must have the same dimensions.")
+
+        bigger_mask = cv2.dilate(
+            mask, np.ones((bigger_kernel, bigger_kernel), np.uint8), iterations=iterations
+        )
+        smaller_mask = cv2.erode(
+            mask, np.ones((smaller_kernel, smaller_kernel), np.uint8), iterations=iterations
+        )
+
+        edge_mask = cv2.subtract(bigger_mask, smaller_mask)
+
+        return self.blur_by_mask(data, edge_mask)

{maps4fs-2.1.2 → maps4fs-2.1.4}/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.2 → maps4fs-2.1.4}/maps4fs/generator/settings.py

@@ -163,12 +163,14 @@ class BackgroundSettings(SettingsModel):
         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.
+        flatten_roads (bool): if True, roads will be flattened in the DEM data.
     """
 
     generate_background: bool = False
     generate_water: bool = False
     water_blurriness: int = 20
     remove_center: bool = True
+    flatten_roads: bool = False
 
 
 class GRLESettings(SettingsModel):

{maps4fs-2.1.2 → maps4fs-2.1.4}/maps4fs.egg-info/PKG-INFO

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

{maps4fs-2.1.2 → maps4fs-2.1.4}/pyproject.toml

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