maps4fs 1.8.180__py3-none-any.whl → 1.8.181__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -245,6 +245,7 @@ class Background(MeshComponent, ImageComponent):
             decimation_agression=self.map.background_settings.decimation_agression,
             remove_center=remove_center,
             remove_size=self.map_size,
+            disable_tqdm=self.map.is_public,
         )
 
         mesh.export(save_path)

maps4fs/generator/component/base/component_mesh.py

@@ -59,6 +59,7 @@ class MeshComponent(Component):
         decimation_agression: int,
         remove_center: bool,
         remove_size: int,
+        disable_tqdm: bool = False,
     ) -> trimesh.Trimesh:
         """Generates a mesh from the given numpy array.
 
@@ -72,6 +73,7 @@ class MeshComponent(Component):
             decimation_agression (int): The agression of the decimation.
             remove_center (bool): Whether to remove the center from the mesh.
             remove_size (int): The size of the center to remove.
+            disable_tqdm (bool): Whether to disable the tqdm progress bar.
 
         Returns:
             trimesh.Trimesh: The generated mesh.
@@ -94,7 +96,7 @@ class MeshComponent(Component):
 
         skipped = 0
 
-        for i in tqdm(range(rows - 1), desc="Generating mesh", unit="row"):
+        for i in tqdm(range(rows - 1), desc="Generating mesh", unit="row", disable=disable_tqdm):
             for j in range(cols - 1):
                 top_left = i * cols + j
                 top_right = top_left + 1
@@ -113,7 +115,7 @@ class MeshComponent(Component):
 
         faces_np = np.array(faces)
         mesh = trimesh.Trimesh(vertices=vertices, faces=faces_np)
-        mesh = MeshComponent.rotate_mesh(mesh)
+        mesh = MeshComponent.rotate_mesh(mesh, disable_tqdm=disable_tqdm)
 
         if apply_decimation:
             percent = decimation_percent / 100
@@ -123,7 +125,7 @@ class MeshComponent(Component):
 
         try:
             if not mesh.is_watertight:
-                mesh = MeshComponent.fix_mesh(mesh)
+                mesh = MeshComponent.fix_mesh(mesh, disable_tqdm=disable_tqdm)
         except Exception:
             pass
 
@@ -141,11 +143,12 @@ class MeshComponent(Component):
         return mesh
 
     @staticmethod
-    def rotate_mesh(mesh: trimesh.Trimesh) -> trimesh.Trimesh:
+    def rotate_mesh(mesh: trimesh.Trimesh, disable_tqdm: bool = False) -> trimesh.Trimesh:
         """Rotates the given mesh by 180 degrees around the Y-axis and Z-axis.
 
         Arguments:
             mesh (trimesh.Trimesh): The mesh to rotate.
+            disable_tqdm (bool): Whether to disable the tqdm progress bar.
 
         Returns:
             trimesh.Trimesh: The rotated mesh.
@@ -157,18 +160,21 @@ class MeshComponent(Component):
             trimesh.transformations.rotation_matrix(np.pi, [0, 0, 1]),
         ]
 
-        for rotation_matrix in tqdm(rotation_matrices, desc="Rotating mesh", unit="rotation"):
+        for rotation_matrix in tqdm(
+            rotation_matrices, desc="Rotating mesh", unit="rotation", disable=disable_tqdm
+        ):
             mesh_copy.apply_transform(rotation_matrix)
 
         return mesh_copy
 
     @staticmethod
-    def fix_mesh(mesh: trimesh.Trimesh) -> trimesh.Trimesh:
+    def fix_mesh(mesh: trimesh.Trimesh, disable_tqdm: bool = False) -> trimesh.Trimesh:
         """Fixes the given mesh by filling holes, fixing normals, fixing winding, fixing inversion,
         fixing broken faces, and stitching.
 
         Arguments:
             mesh (trimesh.Trimesh): The mesh to fix.
+            disable_tqdm (bool): Whether to disable the tqdm progress bar.
 
         Returns:
             trimesh.Trimesh: The fixed mesh.
@@ -184,7 +190,7 @@ class MeshComponent(Component):
             trimesh.repair.stitch,
         ]
 
-        for method in tqdm(fix_methods, desc="Fixing mesh", unit="method"):
+        for method in tqdm(fix_methods, desc="Fixing mesh", unit="method", disable=disable_tqdm):
             method(mesh_copy)  # type: ignore
 
         return mesh_copy

maps4fs/generator/component/grle.py

@@ -79,7 +79,9 @@ class GRLE(ImageComponent, XMLComponent):
             self.logger.debug("GRLE schema is not obtained, skipping the processing.")
             return
 
-        for info_layer in tqdm(grle_schema, desc="Preparing GRLE files", unit="layer"):
+        for info_layer in tqdm(
+            grle_schema, desc="Preparing GRLE files", unit="layer", disable=self.map.is_public
+        ):
             if isinstance(info_layer, dict):
                 file_path = os.path.join(
                     self.game.weights_dir_path(self.map_directory), info_layer["name"]
@@ -208,7 +210,9 @@ class GRLE(ImageComponent, XMLComponent):
 
         farmland_id = 1
 
-        for farmland in tqdm(farmlands, desc="Adding farmlands", unit="farmland"):
+        for farmland in tqdm(
+            farmlands, desc="Adding farmlands", unit="farmland", disable=self.map.is_public
+        ):
             try:
                 fitted_farmland = self.fit_object_into_bounds(
                     polygon_points=farmland,
@@ -362,7 +366,9 @@ class GRLE(ImageComponent, XMLComponent):
         # B and G channels remain the same (zeros), while we change the R channel.
         possible_r_values = [65, 97, 129, 161, 193, 225]
 
-        for _ in tqdm(range(count), desc="Adding islands of plants", unit="island"):
+        for _ in tqdm(
+            range(count), desc="Adding islands of plants", unit="island", disable=self.map.is_public
+        ):
             # Randomly choose the value for the island.
             plant_value = choice(possible_r_values)
             # Randomly choose the size of the island.

maps4fs/generator/component/i3d.py

@@ -249,7 +249,7 @@ class I3d(XMLComponent):
         node_id = NODE_ID_STARTING_VALUE
         field_id = 1
 
-        for field in tqdm(fields, desc="Adding fields", unit="field"):
+        for field in tqdm(fields, desc="Adding fields", unit="field", disable=self.map.is_public):
             try:
                 fitted_field = self.fit_object_into_bounds(
                     polygon_points=field, angle=self.rotation, border=border

maps4fs/generator/component/satellite.py

@@ -82,6 +82,7 @@ class Satellite(ImageComponent):
                     zoom=task.zoom,
                     from_center=True,
                     logger=self.logger,
+                    show_progress=not self.map.is_public,
                 )
 
             except Exception as e:

maps4fs/generator/dtm/base/wcs.py

@@ -1,7 +1,7 @@
 """This module contains the base WCS provider."""
 
-from abc import abstractmethod
 import os
+from abc import abstractmethod
 
 from owslib.wcs import WebCoverageService
 from tqdm import tqdm
@@ -68,7 +68,7 @@ class WCSProvider(DTMProvider):
         params = self.get_wcs_instance_parameters()
         wcs = WebCoverageService(**params)
 
-        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
+        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile", disable=self.map.is_public):
             file_name = "_".join(map(str, tile)) + ".tif"
             file_path = os.path.join(self.shared_tiff_path, file_name)
             if not os.path.exists(file_path):

maps4fs/generator/dtm/base/wms.py

@@ -1,7 +1,7 @@
 """This module contains the base WMS provider."""
 
-from abc import abstractmethod
 import os
+from abc import abstractmethod
 
 from owslib.wms import WebMapService
 from tqdm import tqdm
@@ -59,7 +59,7 @@ class WMSProvider(DTMProvider):
             # auth=Authentication(verify=False),
             timeout=600,
         )
-        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
+        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile", disable=self.map.is_public):
             file_name = "_".join(map(str, tile)) + ".tif"
             file_path = os.path.join(self.shared_tiff_path, file_name)
             if not os.path.exists(file_path):

maps4fs/generator/dtm/dtm.py

@@ -10,8 +10,8 @@ from typing import TYPE_CHECKING, Type
 from zipfile import ZipFile
 
 import numpy as np
-import osmnx as ox  # type: ignore
-import rasterio  # type: ignore
+import osmnx as ox
+import rasterio
 import requests
 from pydantic import BaseModel
 from rasterio.enums import Resampling
@@ -29,7 +29,6 @@ class DTMProviderSettings(BaseModel):
     """Base class for DTM provider settings models."""
 
 
-# pylint: disable=too-many-public-methods, too-many-instance-attributes
 class DTMProvider(ABC):
     """Base class for DTM providers."""
 
@@ -54,7 +53,6 @@ class DTMProvider(ABC):
 
     _base_instructions = None
 
-    # pylint: disable=R0913, R0917
     def __init__(
         self,
         coordinates: tuple[float, float],
@@ -62,7 +60,7 @@ class DTMProvider(ABC):
         size: int,
         directory: str,
         logger: Logger,
-        map: Map | None = None,  # pylint: disable=W0622
+        map: Map,
     ):
         self._coordinates = coordinates
         self._user_settings = user_settings
@@ -347,6 +345,7 @@ class DTMProvider(ABC):
             unit="tile",
             initial=len(tif_files),
             total=len(urls),
+            disable=self.map.is_public,
         ):
             try:
                 file_name = os.path.basename(url)

maps4fs/generator/map.py

@@ -156,6 +156,8 @@ class Map:
             save_path = os.path.join(self.map_directory, "custom_background.png")
             shutil.copyfile(self.custom_background_path, save_path)
 
+        self.is_public = kwargs.get("is_public", False)
+
         try:
             shutil.unpack_archive(game.template_path, self.map_directory)
             self.logger.debug("Map template unpacked to %s", self.map_directory)

maps4fs/generator/texture.py

@@ -370,7 +370,9 @@ class Texture(Component):
         """Rotates textures of the layers which have tags."""
         if self.rotation:
             # Iterate over the layers which have tags and rotate them.
-            for layer in tqdm(self.layers, desc="Rotating textures", unit="layer"):
+            for layer in tqdm(
+                self.layers, desc="Rotating textures", unit="layer", disable=self.map.is_public
+            ):
                 if layer.tags:
                     self.logger.debug("Rotating layer %s.", layer.name)
                     layer_paths = layer.paths(self._weights_dir)
@@ -415,7 +417,9 @@ class Texture(Component):
     def _prepare_weights(self):
         self.logger.debug("Starting preparing weights from %s layers.", len(self.layers))
 
-        for layer in tqdm(self.layers, desc="Preparing weights", unit="layer"):
+        for layer in tqdm(
+            self.layers, desc="Preparing weights", unit="layer", disable=self.map.is_public
+        ):
             self._generate_weights(layer)
         self.logger.debug("Prepared weights for %s layers.", len(self.layers))
 
@@ -491,7 +495,9 @@ class Texture(Component):
         # Key is a layer.info_layer, value is a list of polygon points as tuples (x, y).
         info_layer_data = defaultdict(list)
 
-        for layer in tqdm(layers, desc="Drawing textures", unit="layer"):
+        for layer in tqdm(
+            layers, desc="Drawing textures", unit="layer", disable=self.map.is_public
+        ):
             if self.map.texture_settings.skip_drains and layer.usage == "drain":
                 self.logger.debug("Skipping layer %s because of the usage.", layer.name)
                 continue
@@ -567,7 +573,9 @@ class Texture(Component):
         contains any non-zero values (255), splits those non-values between different weight
         files of the corresponding layer and saves the changes to the files.
         """
-        for layer in tqdm(self.layers, desc="Dissolving textures", unit="layer"):
+        for layer in tqdm(
+            self.layers, desc="Dissolving textures", unit="layer", disable=self.map.is_public
+        ):
             if not layer.tags:
                 self.logger.debug("Layer %s has no tags, there's nothing to dissolve.", layer.name)
                 continue

{maps4fs-1.8.180.dist-info → maps4fs-1.8.181.dist-info}/METADATA

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

{maps4fs-1.8.180.dist-info → maps4fs-1.8.181.dist-info}/RECORD

@@ -3,26 +3,26 @@ maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/dem.py,sha256=oLN02bWNax73HzFsseRBOV47Azl_1L7qdrzuxHh4i_c,11886
 maps4fs/generator/game.py,sha256=FFAyckuTW6Ix5aRACXOj2eiA72xd3OMCcOARrMhS164,11025
-maps4fs/generator/map.py,sha256=N3lSIEmGQXSrOYXochHEib5djmxL5szFM2crT31Nwog,11312
+maps4fs/generator/map.py,sha256=ONeScf0MnYRhlW33ykQBJcXd_GbMqP7p1QQlhODD5hE,11369
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=cFlN-gK8QcySqyPtcGm-2fLnxQnlmC3Y9kQufJxwI3Y,6270
-maps4fs/generator/texture.py,sha256=_IfqIuxH4934VJXKtdABHa6ToPWk3T0xknvlu-rZ5Uc,36570
+maps4fs/generator/texture.py,sha256=-xIpt71y349Hb0svnFln3e6Bu2GjI5jjNdmooP5TrOI,36778
 maps4fs/generator/component/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/component/background.py,sha256=cBBp-ULrJzuNG9wfE_MaxzAn_mR24neqtL7WjxXEb3I,18749
+maps4fs/generator/component/background.py,sha256=1JPFZFgRFXGWE5u957gemudC4VzlRazzVBgv9diPzP8,18794
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
-maps4fs/generator/component/grle.py,sha256=aKMjVJNuKHJJ2gsXaH00bz10kWaIbbZXU_JbP-ZAGw4,18990
-maps4fs/generator/component/i3d.py,sha256=z2ZkflA5E8FrHcGleXSVKZRWvkqclz_Yh_qxJI86enE,19685
-maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
+maps4fs/generator/component/grle.py,sha256=fT0LRR9cHi0oIPGY7zxsnrAvxnnsZs-lxQxhBhm43z8,19140
+maps4fs/generator/component/i3d.py,sha256=kJ3Th1mSdBC9j8cyWBwIyYm0fKzYJtocI0jYWkVX3AU,19713
+maps4fs/generator/component/satellite.py,sha256=xzxqHp-G-jRgyI38-XdaMPdGWiC3PdhVJAjBnZL9wL8,5004
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZwYyqoDZM7aI1RHw8,21273
 maps4fs/generator/component/base/component_image.py,sha256=fFgY6k2CbLIg3HS7KeiHi9iFQPJXCAxmBueYh2ExlFU,3918
-maps4fs/generator/component/base/component_mesh.py,sha256=jtsEQZkqiCkycYpueq1M1eqgxdShL_bHaJT6Upu8PLI,8412
+maps4fs/generator/component/base/component_mesh.py,sha256=43JY8X0ugIWAJq5y11vTJM9UfbL7SSugj8LkdPmni10,8871
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
 maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maps4fs/generator/dtm/bavaria.py,sha256=7njrEvSCYAC8ZVyvS-_84iXHhWA0oHKrEqSzxdnZuGs,4293
 maps4fs/generator/dtm/canada.py,sha256=lYONwm6aNX5cjVggR3AiZZF9dlCDAWg0M8RMaObog8s,1288
 maps4fs/generator/dtm/denmark.py,sha256=GMB9PPxXth6V1v3XuURVWVabJf4xlr158bKfeIIisek,1476
-maps4fs/generator/dtm/dtm.py,sha256=vZh3Z5grfQy0gvo-xAgXwkWExk1kW1pGVw2nk54hN-8,16983
+maps4fs/generator/dtm/dtm.py,sha256=eTegemDvvbDekxPJA8SJFgtTAwVLi5jfDXa3FxJHsyE,16845
 maps4fs/generator/dtm/england.py,sha256=YyCYwnNUJuBeeMNUozfKIj_yNjHpGeuH1Mz0NiAJL-U,1122
 maps4fs/generator/dtm/finland.py,sha256=Chi3-3sanLIYpipjtPpTu9tqnL3DYcnygSDCPm1s24c,1753
 maps4fs/generator/dtm/flanders.py,sha256=81pKkrM40SeOe1LSlcsTNXSmUNpofC4D454DG6WFSyA,1037
@@ -38,14 +38,14 @@ maps4fs/generator/dtm/srtm.py,sha256=ob6AUuEn3G3G9kdqTA2VhT335N65RRBJsqAfHuw0gA8
 maps4fs/generator/dtm/switzerland.py,sha256=GC5fbWL5kkiWksB-H4dWl4I7GSmOsUZ_ywPpfkxBTo8,3547
 maps4fs/generator/dtm/usgs.py,sha256=1XzLP5GJbe6xcqzkOrEBUtR2SPw7gm6rl1nw5YXmBP8,3253
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
-maps4fs/generator/dtm/base/wcs.py,sha256=UfkLNHqsYTr2ytjyZjWDocq2hFC_qyFCvl-_tnz6gHM,2510
-maps4fs/generator/dtm/base/wms.py,sha256=hiupNvNjwDZs3oUE41R9OhDtsMgqQI0rfVBYKB4N7GE,2264
+maps4fs/generator/dtm/base/wcs.py,sha256=PRG3IIwj2RWZh2y3d3taCxEsulDcwSYmsaaseNcjW3M,2538
+maps4fs/generator/dtm/base/wms.py,sha256=14ssC11SeitP9PYJwXx6669w4JZ5Z4KSobV9pWtYVQE,2292
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 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.180.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.180.dist-info/METADATA,sha256=pGroCVCggi-YpaaLtC0j3GE5UBAeWsoTiEukhYuOjzM,44229
-maps4fs-1.8.180.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.180.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.180.dist-info/RECORD,,
+maps4fs-1.8.181.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.181.dist-info/METADATA,sha256=lSXjtMsf3nY098isYPXV9XwTLWmSOQw0ce8z-shIePo,44229
+maps4fs-1.8.181.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.181.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.181.dist-info/RECORD,,