maps4fs 1.8.251__py3-none-any.whl → 1.9.0__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -15,8 +15,8 @@ from trimesh import Trimesh
 
 from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.component.base.component_mesh import MeshComponent
+from maps4fs.generator.component.dem import DEM
 from maps4fs.generator.component.texture import Texture
-from maps4fs.generator.dem import DEM
 from maps4fs.generator.settings import Parameters
 
 

maps4fs/generator/component/base/component_image.py

@@ -138,3 +138,26 @@ class ImageComponent(Component):
             if dst_image is not None:
                 dst_image[border_slice][src_image[border_slice] != 0] = 255
             src_image[border_slice] = 0
+
+    def apply_blur(
+        self, data: np.ndarray, blur_radius: int, sigma_x: int = 10, sigma_y: int = 10
+    ) -> np.ndarray:
+        """Apply blur to DEM data.
+
+        Arguments:
+            data (np.ndarray): DEM data.
+            blur_radius (int): Radius of the blur.
+            sigma_x (int, optional): Standard deviation in X direction. Defaults to 10.
+            sigma_y (int, optional): Standard deviation in Y direction. Defaults to 10.
+
+        Returns:
+            np.ndarray: Blurred DEM data.
+        """
+        if blur_radius == 0:
+            return data
+
+        blurred_data = cv2.GaussianBlur(
+            data, (blur_radius, blur_radius), sigmaX=sigma_x, sigmaY=sigma_y
+        )
+
+        return blurred_data

maps4fs/generator/{dem.py → component/dem.py}

@@ -9,12 +9,12 @@ import numpy as np
 # import rasterio  # type: ignore
 from pympler import asizeof  # type: ignore
 
-from maps4fs.generator.component.base.component import Component
+from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.dtm.dtm import DTMProvider
 
 
 # pylint: disable=R0903, R0902
-class DEM(Component):
+class DEM(ImageComponent):
     """Component for processing Digital Elevation Model data.
 
     Arguments:
@@ -200,7 +200,7 @@ class DEM(Component):
         self.update_info("normalized", resampled_data)
 
         # 6. Blur DEM data.
-        resampled_data = self.apply_blur(resampled_data)
+        resampled_data = self.apply_blur(resampled_data, blur_radius=self.blur_radius)
 
         cv2.imwrite(self._dem_path, resampled_data)
         self.logger.debug("DEM data was saved to %s.", self._dem_path)
@@ -316,35 +316,6 @@ class DEM(Component):
 
         return resampled_data
 
-    def apply_blur(self, data: np.ndarray) -> np.ndarray:
-        """Apply blur to DEM data.
-
-        Arguments:
-            data (np.ndarray): DEM data.
-
-        Returns:
-            np.ndarray: Blurred DEM data.
-        """
-        if self.blur_radius == 0:
-            return data
-
-        self.logger.debug(
-            "Applying Gaussion blur to DEM data with kernel size %s.",
-            self.blur_radius,
-        )
-
-        blurred_data = cv2.GaussianBlur(
-            data, (self.blur_radius, self.blur_radius), sigmaX=10, sigmaY=10
-        )
-        self.logger.debug(
-            "DEM data was blurred. Shape: %s, dtype: %s. Min: %s, max: %s.",
-            blurred_data.shape,
-            blurred_data.dtype,
-            blurred_data.min(),
-            blurred_data.max(),
-        )
-        return blurred_data
-
     def rotate_dem(self) -> None:
         """Rotate DEM image."""
         self.logger.debug("Rotating DEM image by %s degrees.", self.rotation)

maps4fs/generator/component/grle.py

@@ -173,18 +173,22 @@ class GRLE(ImageComponent, XMLComponent):
     def _add_farmlands(self) -> None:
         """Adds farmlands to the InfoLayer PNG file."""
         farmlands = []
+
+        fields = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
+        if fields:
+            self.logger.debug("Found %s fields in textures info layer.", len(fields))
+            farmlands.extend(fields)
+
         farmyards = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FARMYARDS)
         if farmyards and self.map.grle_settings.add_farmyards:
             farmlands.extend(farmyards)
             self.logger.debug("Found %s farmyards in textures info layer.", len(farmyards))
 
-        fields = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
-        if not fields:
-            self.logger.debug("Fields data not found in textures info layer.")
+        if not farmlands:
+            self.logger.warning(
+                "No farmlands was obtained from fields or farmyards, skipping the processing."
+            )
             return
-        farmlands.extend(fields)
-
-        self.logger.debug("Found %s fields in textures info layer.", len(fields))
 
         info_layer_farmlands_path = self.game.get_farmlands_path(self.map_directory)
 

{maps4fs-1.8.251.dist-info → maps4fs-1.9.0.dist-info}/METADATA

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

{maps4fs-1.8.251.dist-info → maps4fs-1.9.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
 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=CDfdDGCWhFn2_QYY5TtxgsXm3lgJ4W4qD-46UU3u-ck,13207
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
 maps4fs/generator/map.py,sha256=64uIHCwfpFyFXZJSayB0tuRFn0LVuTwf0wrAi4KMv00,13600
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=E5sfkfJgcjh9QHpa7ILlV_jnrF6USpsOFxkooVnxrbs,6968
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=hsyNmHgi9NUcp3SoSawJeCDJY3tJNDMwmb_x1ovi0Fg,22852
+maps4fs/generator/component/background.py,sha256=_QK9pqWs5SeJFljOJS8woImK7kkU37ZIo4QMux4dACw,22862
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
-maps4fs/generator/component/grle.py,sha256=KlNbbYY4oyFfB_0qTInrweBTyLUW0koSSpqclkRw-Lk,19381
+maps4fs/generator/component/dem.py,sha256=zUKRwVT5DC5VpZMo79zKipxGW0Waw0Pxn10RIEB3wrQ,12430
+maps4fs/generator/component/grle.py,sha256=99CFheRn2aDuE041iZj2usmh5spKSryKg3L848jVWdg,19475
 maps4fs/generator/component/i3d.py,sha256=iVXYYGzDpSp5J7vAo_LFnDA8GDAy43Y6aUIf7yP_ZTI,23101
 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=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
+maps4fs/generator/component/base/component_image.py,sha256=AMYrStFSfeE_G34JKN5CJFFB6ZCTof-fJwMVKq3Y2H4,5521
 maps4fs/generator/component/base/component_mesh.py,sha256=BsxS5NlUK2hLhksgCwSoMK-00GNAwK2fYGpgb3R4n1w,9396
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
 maps4fs/generator/dtm/__init__.py,sha256=CzK8ZdLU5Iv7DrwK5hIQ41zVsLRFgZO-IuRxf-NCVqg,1516
@@ -54,8 +54,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.251.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.251.dist-info/METADATA,sha256=UtavrpUygqDfTGLz7iH0Yz2QDhh_xKWRpC4JxqTmkt4,47443
-maps4fs-1.8.251.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-maps4fs-1.8.251.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.251.dist-info/RECORD,,
+maps4fs-1.9.0.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.9.0.dist-info/METADATA,sha256=Wd59mYegea9cIBPQSnHkHy_dIiDGttopm-vEcwYLyQM,47441
+maps4fs-1.9.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+maps4fs-1.9.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.9.0.dist-info/RECORD,,

{maps4fs-1.8.251.dist-info → maps4fs-1.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any