maps4fs 1.5.9__py3-none-any.whl → 1.6.0__py3-none-any.whl

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/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/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.dist-info → maps4fs-1.6.0.dist-info}/METADATA

@@ -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.dist-info → maps4fs-1.6.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk
 maps4fs/generator/background.py,sha256=moTsEJM-hZgHQQiBjFVTWBKgPMqxup-58EErh4bq_dE,21342
 maps4fs/generator/component.py,sha256=RtXruvT4Fxfr7_xo9Bi-i3IIWcPd5QQOSpYJ_cNC49o,20408
 maps4fs/generator/config.py,sha256=0QmK052B8bxyHVhg3jzCORLfOBMMmqVfhhbqXKf6OMk,4383
-maps4fs/generator/dem.py,sha256=vGz-gUg_JArqHO7qewdnSR7WiF7ciUzY-OSqOluUDWw,12304
+maps4fs/generator/dem.py,sha256=gXmHRckXf9-3fNwEhZ8jk89oMn6eElghIQ1kUa0rcuk,10328
 maps4fs/generator/game.py,sha256=QHgVnyGYvEnfwGZ84-u-dpbCRr3UeVVqBbrwr5WG8dE,7992
 maps4fs/generator/grle.py,sha256=u8ZwSs313PIOkH_0B_O2tVTaZ-eYNkc30eKGtBxWzTM,17846
 maps4fs/generator/i3d.py,sha256=FLVlj0g90IXRuaRARD1HTnufsLpuaa5kHKdiME-LUZY,24329
@@ -12,16 +12,16 @@ maps4fs/generator/map.py,sha256=-iUFGqe11Df-oUrxhcnJzRZ0o6NZKRQ_blTq1h1Wezg,9287
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/satellite.py,sha256=Qnb6XxmXKnHdHKVMb9mJ3vDGtGkDHCOv_81hrrXdx3k,3660
 maps4fs/generator/settings.py,sha256=NWuK76ICr8gURQnzePat4JH9w-iACbQEKQebqu51gBE,4470
-maps4fs/generator/texture.py,sha256=sErusfv1AqQfP-veMrZ921Tz8DnGEhfB4ucggMmKrD4,31231
+maps4fs/generator/texture.py,sha256=7Z6Ci7urMvqk3-Jp9K2AKH2KlD1smEQS2qoc8Qzn8Uw,31204
 maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maps4fs/generator/dtm/dtm.py,sha256=THQ3RWVL9ut7A4omS8hEog-oQSSwYV0JcDMe0Iiw4fY,8009
-maps4fs/generator/dtm/srtm.py,sha256=7uEb-Pde_uTG4D311mZ634QYkB5yvV8t2DfNfXuhYGY,3066
+maps4fs/generator/dtm/srtm.py,sha256=x78VjI4onXxPx5CLrzpwEgFOA_E9f9zhouPdKC2YnBE,3190
 maps4fs/generator/dtm/usgs.py,sha256=U0kDog1UAa1lWiK4Pe3nnhXnnplOS4HZde1yqYqCiDw,13123
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.5.9.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.5.9.dist-info/METADATA,sha256=CEhXKo9Y6Nqmh7SL-_BV7XSHtD7eApd8-81Grfd-zp4,36231
-maps4fs-1.5.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.5.9.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.5.9.dist-info/RECORD,,
+maps4fs-1.6.0.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.6.0.dist-info/METADATA,sha256=36OOMtK0RoswMn9iyTDeJFuNeIVlhcmrDknK4Xe8HE4,36231
+maps4fs-1.6.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.6.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.6.0.dist-info/RECORD,,