maps4fs 1.5.9__tar.gz → 1.6.0__tar.gz

{maps4fs-1.5.9 → maps4fs-1.6.0}/PKG-INFO

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

{maps4fs-1.5.9 → maps4fs-1.6.0}/maps4fs/generator/dem.py

@@ -280,55 +280,3 @@ class DEM(Component):
             list: Empty list.
         """
         return []
-
-    def _get_scaling_factor(self, maximum_deviation: int) -> float:
-        """Calculate scaling factor for DEM data normalization.
-        NOTE: Needs reconsideration for the implementation.
-
-        Arguments:
-            maximum_deviation (int): Maximum deviation in DEM data.
-
-        Returns:
-            float: Scaling factor for DEM data normalization.
-        """
-        ESTIMATED_MAXIMUM_DEVIATION = 1000  # pylint: disable=C0103
-        scaling_factor = maximum_deviation / ESTIMATED_MAXIMUM_DEVIATION
-        return scaling_factor if scaling_factor < 1 else 1
-
-    def _normalize_dem(self, data: np.ndarray) -> np.ndarray:
-        """Normalize DEM data to 16-bit unsigned integer using max height from settings.
-        Arguments:
-            data (np.ndarray): DEM data from SRTM file after cropping.
-        Returns:
-            np.ndarray: Normalized DEM data.
-        """
-        self.logger.debug("Starting DEM data normalization.")
-        # Calculate the difference between the maximum and minimum values in the DEM data.
-
-        max_height = data.max()
-        min_height = data.min()
-        max_dev = max_height - min_height
-        self.logger.debug(
-            "Maximum deviation: %s with maximum at %s and minimum at %s.",
-            max_dev,
-            max_height,
-            min_height,
-        )
-
-        scaling_factor = self._get_scaling_factor(max_dev)
-        adjusted_max_height = int(65535 * scaling_factor)
-        self.logger.debug(
-            "Maximum deviation: %s. Scaling factor: %s. Adjusted max height: %s.",
-            max_dev,
-            scaling_factor,
-            adjusted_max_height,
-        )
-        normalized_data = (
-            (data - data.min()) / (data.max() - data.min()) * adjusted_max_height
-        ).astype("uint16")
-        self.logger.debug(
-            "DEM data was normalized to %s - %s.",
-            normalized_data.min(),
-            normalized_data.max(),
-        )
-        return normalized_data

{maps4fs-1.5.9 → maps4fs-1.6.0}/maps4fs/generator/dtm/srtm.py

@@ -24,10 +24,11 @@ class SRTM30Provider(DTMProvider):
     _author = "[iwatkot](https://github.com/iwatkot)"
 
     _instructions = (
-        "ℹ️ Set the Multiplier value in the DEM Settings, when using this DTM provider. "
-        "Otherwise, the dem file will contain values in meters exactly as on Earth "
-        "and you probably won't see any terrain by eye. "
-        "Note that the multiplier value may be big enough to make the terrain visible."
+        "ℹ️ If you're a rookie in the Giants Editor check the **Apply the default multiplier** "
+        "checkbox. Otherwise, you can change the multiplier value in the DEM Settings. "
+        "If you will not apply the default multiplier and not change the value in the DEM "
+        "Settings, you'll have the DEM image with the original values as on Earth, which can "
+        "not be seen by eye and will lead to completely flat terrain. "
     )
 
     def __init__(self, *args, **kwargs):

{maps4fs-1.5.9 → maps4fs-1.6.0}/maps4fs/generator/texture.py

@@ -305,8 +305,7 @@ class Texture(Component):
         useful_attributes = [
             "coordinates",
             "bbox",
-            "map_height",
-            "map_width",
+            "map_size",
             "rotation",
             "minimum_x",
             "minimum_y",

{maps4fs-1.5.9 → maps4fs-1.6.0}/maps4fs.egg-info/PKG-INFO

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

{maps4fs-1.5.9 → maps4fs-1.6.0}/pyproject.toml

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

{maps4fs-1.5.9 → maps4fs-1.6.0}/tests/test_generator.py

@@ -8,6 +8,11 @@ import cv2
 
 from maps4fs import DTMProvider, Map
 from maps4fs.generator.game import Game
+from maps4fs.generator.settings import (
+    BackgroundSettings,
+    DEMSettings,
+    SatelliteSettings,
+)
 
 working_directory = os.getcwd()
 
@@ -168,6 +173,13 @@ def test_map_pack():
 
     height, width = get_random_size()
 
+    dem_settings = DEMSettings(multiplier=2, blur_radius=15, plateau=1000, water_depth=500)
+
+    background_settings = BackgroundSettings(
+        generate_background=True, generate_water=True, resize_factor=16
+    )
+    satellite_settings = SatelliteSettings(download_images=True, satellite_margin=0, zoom_level=14)
+
     directory = map_directory(game_code)
     map = Map(
         game=game,
@@ -177,6 +189,9 @@ def test_map_pack():
         size=height,
         rotation=30,
         map_directory=directory,
+        dem_settings=dem_settings,
+        background_settings=background_settings,
+        satellite_settings=satellite_settings,
     )
     for _ in map.generate():
         pass