maps4fs 0.9.8__py3-none-any.whl → 0.9.92__py3-none-any.whl

maps4fs/generator/dem.py

@@ -9,6 +9,7 @@ import cv2
 import numpy as np
 import rasterio  # type: ignore
 import requests
+from pympler import asizeof  # type: ignore
 
 from maps4fs.generator.component import Component
 
@@ -79,6 +80,22 @@ class DEM(Component):
         )
         return dem_width, dem_height
 
+    def to_ground(self, data: np.ndarray) -> np.ndarray:
+        """Receives the signed 16-bit integer array and converts it to the ground level.
+        If the min value is negative, it will become zero value and the rest of the values
+        will be shifted accordingly.
+        """
+        # For examlem, min value was -50, it will become 0 and for all values we'll +50.
+
+        if data.min() < 0:
+            self.logger.debug("Array contains negative values, will be shifted to the ground.")
+            data = data + abs(data.min())
+
+        self.logger.debug(
+            "Array was shifted to the ground. Min: %s, max: %s.", data.min(), data.max()
+        )
+        return data
+
     # pylint: disable=no-member
     def process(self) -> None:
         """Reads SRTM file, crops it to map size, normalizes and blurs it,
@@ -119,10 +136,15 @@ class DEM(Component):
             data.max(),
         )
 
+        data = self.to_ground(data)
+
         resampled_data = cv2.resize(
             data, dem_output_resolution, interpolation=cv2.INTER_LINEAR
         ).astype("uint16")
 
+        size_of_resampled_data = asizeof.asizeof(resampled_data) / 1024 / 1024
+        self.logger.debug("Size of resampled data: %s MB.", size_of_resampled_data)
+
         self.logger.debug(
             "Maximum value in resampled data: %s, minimum value: %s.",
             resampled_data.max(),
@@ -135,6 +157,17 @@ class DEM(Component):
         else:
             self.logger.debug("Auto processing is disabled, DEM data will not be normalized.")
             resampled_data = resampled_data * self.multiplier
+
+            self.logger.debug(
+                "DEM data was multiplied by %s. Min: %s, max: %s.",
+                self.multiplier,
+                resampled_data.min(),
+                resampled_data.max(),
+            )
+
+            size_of_resampled_data = asizeof.asizeof(resampled_data) / 1024 / 1024
+            self.logger.debug("Size of resampled data: %s MB.", size_of_resampled_data)
+
             # Clip values to 16-bit unsigned integer range.
             resampled_data = np.clip(resampled_data, 0, 65535)
             resampled_data = resampled_data.astype("uint16")

maps4fs/generator/map.py

@@ -116,15 +116,19 @@ class Map:
                 )
         return previews
 
-    def pack(self, archive_name: str) -> str:
+    def pack(self, archive_path: str, remove_source: bool = True) -> str:
         """Pack map directory to zip archive.
 
         Args:
-            archive_name (str): Name of the archive.
+            archive_path (str): Path to the archive.
+            remove_source (bool, optional): Remove source directory after packing.
 
         Returns:
             str: Path to the archive.
         """
-        archive_path = shutil.make_archive(archive_name, "zip", self.map_directory)
-        self.logger.info("Map packed to %s.zip", archive_name)
+        archive_path = shutil.make_archive(archive_path, "zip", self.map_directory)
+        self.logger.info("Map packed to %s.zip", archive_path)
+        if remove_source:
+            shutil.rmtree(self.map_directory)
+            self.logger.info("Map directory removed: %s", self.map_directory)
         return archive_path

{maps4fs-0.9.8.dist-info → maps4fs-0.9.92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.9.8
+Version: 0.9.92
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -21,6 +21,7 @@ Requires-Dist: geopy
 Requires-Dist: trimesh
 Requires-Dist: imageio
 Requires-Dist: tifffile
+Requires-Dist: pympler
 
 <div align="center" markdown>
 <a href="https://discord.gg/Sj5QKKyE42">

{maps4fs-0.9.8.dist-info → maps4fs-0.9.92.dist-info}/RECORD

@@ -4,18 +4,18 @@ maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk
 maps4fs/generator/background.py,sha256=AP-Z3F-4I9achvA9xsaXAAoA6IHtmPLxb1RkUsVYdbg,14036
 maps4fs/generator/component.py,sha256=ZEDjChPnvqAsgnBu2f2YBOlwGOlfax4VaAYBcJerLIQ,10684
 maps4fs/generator/config.py,sha256=ZO5BWDU-S3p0-ndKDSFa8Oin3YcYy0iH8B4lqEA_07Q,4275
-maps4fs/generator/dem.py,sha256=XLpzjJMPZCxjrF-AhwTeEb-OQoCHEtYdK0b8z3Gb-is,15712
+maps4fs/generator/dem.py,sha256=7UnIUnXbN3OVMSHKgrFcyzWYCMgk6vIg1-ehrNn4ek8,17042
 maps4fs/generator/game.py,sha256=94HjPNOyy6XSSOnBp-uxrkBglKyC-X3ULIrrucfdlKw,6825
 maps4fs/generator/i3d.py,sha256=UuQiQRusPQ2f6PvGKxJ_UZeXsx3uG15efmy8Ysnm3F8,3597
-maps4fs/generator/map.py,sha256=v8OOLmhAkgqq64tQgEDbV6DmbgOVm3NXJBDDy0nJf60,4226
+maps4fs/generator/map.py,sha256=_LQe54KLfS_4M462UiiNSqKyUroqnQ8inwXZIZDP9a0,4487
 maps4fs/generator/path_steps.py,sha256=yeN6hmOD8O2LMozUf4HcQMIy8WJ5sHF5pGQT_s2FfOw,3147
 maps4fs/generator/qgis.py,sha256=R5Iv3ovyLXkhAL5Oy41u3ZLNOSEbc1byLetzPootO7o,6091
 maps4fs/generator/texture.py,sha256=CwaXZfAG4e3D3YR7yVR2MC677EHpbUWTboCS3G6jkhk,17723
 maps4fs/generator/tile.py,sha256=3vmfjQiPiiUZKPuIo5tg2rOKkgcP1NRVkMGK-Vo10-A,2138
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/toolbox/dem.py,sha256=53KVZ6IKIlK642eYFSRDAC8l2HL9IEUpQNYkkTC56uU,3510
-maps4fs-0.9.8.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
-maps4fs-0.9.8.dist-info/METADATA,sha256=IU-GDGBqpwXJPdf4aWGWqXVog7lC_zGDPFN9ehCwne0,25170
-maps4fs-0.9.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-0.9.8.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-0.9.8.dist-info/RECORD,,
+maps4fs-0.9.92.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
+maps4fs-0.9.92.dist-info/METADATA,sha256=wQTqG8ZcfeJYv4IYn9vIor9WtK36JnxPFAbjzTV-Tqw,25194
+maps4fs-0.9.92.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-0.9.92.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-0.9.92.dist-info/RECORD,,