maps4fs 1.8.209__py3-none-any.whl → 1.8.211__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -245,7 +245,6 @@ 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

@@ -68,7 +68,6 @@ 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.
 
@@ -82,7 +81,6 @@ 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.
@@ -105,7 +103,7 @@ class MeshComponent(Component):
 
         skipped = 0
 
-        for i in tqdm(range(rows - 1), desc="Generating mesh", unit="row", disable=disable_tqdm):
+        for i in tqdm(range(rows - 1), desc="Generating mesh", unit="row"):
             for j in range(cols - 1):
                 top_left = i * cols + j
                 top_right = top_left + 1
@@ -124,7 +122,7 @@ class MeshComponent(Component):
 
         faces_np = np.array(faces)
         mesh = trimesh.Trimesh(vertices=vertices, faces=faces_np)
-        mesh = MeshComponent.rotate_mesh(mesh, disable_tqdm=disable_tqdm)
+        mesh = MeshComponent.rotate_mesh(mesh)
 
         if apply_decimation:
             percent = decimation_percent / 100
@@ -134,7 +132,7 @@ class MeshComponent(Component):
 
         try:
             if not mesh.is_watertight:
-                mesh = MeshComponent.fix_mesh(mesh, disable_tqdm=disable_tqdm)
+                mesh = MeshComponent.fix_mesh(mesh)
         except Exception:
             pass
 
@@ -152,12 +150,11 @@ class MeshComponent(Component):
         return mesh
 
     @staticmethod
-    def rotate_mesh(mesh: trimesh.Trimesh, disable_tqdm: bool = False) -> trimesh.Trimesh:
+    def rotate_mesh(mesh: trimesh.Trimesh) -> 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.
@@ -170,20 +167,21 @@ class MeshComponent(Component):
         ]
 
         for rotation_matrix in tqdm(
-            rotation_matrices, desc="Rotating mesh", unit="rotation", disable=disable_tqdm
+            rotation_matrices,
+            desc="Rotating mesh",
+            unit="rotation",
         ):
             mesh_copy.apply_transform(rotation_matrix)
 
         return mesh_copy
 
     @staticmethod
-    def fix_mesh(mesh: trimesh.Trimesh, disable_tqdm: bool = False) -> trimesh.Trimesh:
+    def fix_mesh(mesh: trimesh.Trimesh) -> 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.
@@ -199,7 +197,7 @@ class MeshComponent(Component):
             trimesh.repair.stitch,
         ]
 
-        for method in tqdm(fix_methods, desc="Fixing mesh", unit="method", disable=disable_tqdm):
+        for method in tqdm(fix_methods, desc="Fixing mesh", unit="method"):
             method(mesh_copy)  # type: ignore
 
         return mesh_copy

maps4fs/generator/component/grle.py

@@ -79,9 +79,7 @@ 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", disable=self.map.is_public
-        ):
+        for info_layer in tqdm(grle_schema, desc="Preparing GRLE files", unit="layer"):
             if isinstance(info_layer, dict):
                 file_path = os.path.join(
                     self.game.weights_dir_path(self.map_directory), info_layer["name"]
@@ -210,9 +208,7 @@ class GRLE(ImageComponent, XMLComponent):
 
         farmland_id = 1
 
-        for farmland in tqdm(
-            farmlands, desc="Adding farmlands", unit="farmland", disable=self.map.is_public
-        ):
+        for farmland in tqdm(farmlands, desc="Adding farmlands", unit="farmland"):
             try:
                 fitted_farmland = self.fit_object_into_bounds(
                     polygon_points=farmland,
@@ -366,9 +362,7 @@ 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", disable=self.map.is_public
-        ):
+        for _ in tqdm(range(count), desc="Adding islands of plants", unit="island"):
             # 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", disable=self.map.is_public):
+        for field in tqdm(fields, desc="Adding fields", unit="field"):
             try:
                 fitted_field = self.fit_object_into_bounds(
                     polygon_points=field, angle=self.rotation, border=border

maps4fs/generator/component/satellite.py

@@ -82,7 +82,6 @@ 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/component/texture.py

@@ -210,9 +210,7 @@ class Texture(ImageComponent):
         """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", disable=self.map.is_public
-            ):
+            for layer in tqdm(self.layers, desc="Rotating textures", unit="layer"):
                 if layer.tags:
                     self.logger.debug("Rotating layer %s.", layer.name)
                     layer_paths = layer.paths(self._weights_dir)
@@ -254,9 +252,7 @@ class Texture(ImageComponent):
     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", disable=self.map.is_public
-        ):
+        for layer in tqdm(self.layers, desc="Preparing weights", unit="layer"):
             self._generate_weights(layer)
         self.logger.debug("Prepared weights for %s layers.", len(self.layers))
 
@@ -328,9 +324,7 @@ class Texture(ImageComponent):
         # Key is a layer.info_layer, value is a list of polygon points as tuples (x, y).
         info_layer_data: dict[str, list[list[int]]] = defaultdict(list)
 
-        for layer in tqdm(
-            layers, desc="Drawing textures", unit="layer", disable=self.map.is_public
-        ):
+        for layer in tqdm(layers, desc="Drawing textures", unit="layer"):
             if self.map.texture_settings.skip_drains and layer.usage == "drain":
                 self.logger.debug("Skipping layer %s because of the usage.", layer.name)
                 continue
@@ -417,9 +411,7 @@ class Texture(ImageComponent):
         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", disable=self.map.is_public
-        ):
+        for layer in tqdm(self.layers, desc="Dissolving textures", unit="layer"):
             if not layer.tags:
                 self.logger.debug("Layer %s has no tags, there's nothing to dissolve.", layer.name)
                 continue

maps4fs/generator/dtm/base/wcs.py

@@ -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", disable=self.map.is_public):
+        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
             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

@@ -59,7 +59,7 @@ class WMSProvider(DTMProvider):
             # auth=Authentication(verify=False),
             timeout=600,
         )
-        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile", disable=self.map.is_public):
+        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
             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

@@ -383,7 +383,6 @@ 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

@@ -154,8 +154,6 @@ 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-1.8.209.dist-info → maps4fs-1.8.211.dist-info}/METADATA

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

{maps4fs-1.8.209.dist-info → maps4fs-1.8.211.dist-info}/RECORD

@@ -3,21 +3,21 @@ maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/dem.py,sha256=Nyz64BWM---Vpy1mi8bbhHEfd2Wc2rWw9UqHraqXDJ8,11771
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
-maps4fs/generator/map.py,sha256=FA9ZLpVMS2RLRDgWZdOo-kLzqMUBza3EZ_89-Gfw_s4,11193
+maps4fs/generator/map.py,sha256=1mbnOWXVEDeFHWDBBDX9ugzRtrGBQYrJ5ruKmPUsMe8,11136
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=ZHwLn1ObdOuhyUTzQTYvyDs7YZ0SbVLgTSpoeUtqi0c,6708
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=JDprgCieWZXNL0IuVCdl363tjxAX6KEjfxehGXEkADg,18839
+maps4fs/generator/component/background.py,sha256=ppxK2RheCYrLRnBkLeZUst6Ciopo9Z_zUyjS-n8YwGE,18794
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
-maps4fs/generator/component/grle.py,sha256=nDA6vjjfWFL0Hkz6aso1aLIwuksbxzZw9syNax1bD04,19134
-maps4fs/generator/component/i3d.py,sha256=kJ3Th1mSdBC9j8cyWBwIyYm0fKzYJtocI0jYWkVX3AU,19713
+maps4fs/generator/component/grle.py,sha256=kCx00SJdYEDr0tcHFvHC99928e9Eke2t_LwNxkqfvBg,18984
+maps4fs/generator/component/i3d.py,sha256=z2ZkflA5E8FrHcGleXSVKZRWvkqclz_Yh_qxJI86enE,19685
 maps4fs/generator/component/layer.py,sha256=QPcEzTv_8N9wYvHAZy8OezfATaVLG-YetSfCXf2lnFI,5892
-maps4fs/generator/component/satellite.py,sha256=xzxqHp-G-jRgyI38-XdaMPdGWiC3PdhVJAjBnZL9wL8,5004
-maps4fs/generator/component/texture.py,sha256=VqxUmK7HHw-G_C_qS1rb5mSpkzGwI0dAnW3-o5HCGgU,31026
+maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
+maps4fs/generator/component/texture.py,sha256=UXVzNht5ETO9-wI9cZ-ojXTgkr227B2CDZ5VwXMm_Bc,30818
 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=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
-maps4fs/generator/component/base/component_mesh.py,sha256=zx6TElBBMxo-D5AxqAYemtvkl2k4hHThf0OH7LgNRMY,9159
+maps4fs/generator/component/base/component_mesh.py,sha256=pc7UVakZCnJPV-0Ukdsm6aUD3NFZbOUazuEbb44k170,8747
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
 maps4fs/generator/dtm/__init__.py,sha256=VIWcZiMZ0UtnJl7rQL-PVHDivXbZVwrBWumjhTTnnKY,1454
 maps4fs/generator/dtm/arctic.py,sha256=LSivLLjtd6TJUaPYvgSYQ4KalMTaY58zFvwivSh45uM,2587
@@ -26,7 +26,7 @@ maps4fs/generator/dtm/bavaria.py,sha256=nH2wTxiIdQgKotauTqD-zztwFgfZzIdym2sjmSqf
 maps4fs/generator/dtm/canada.py,sha256=XJ_za2LDV9PEV7hmjPnzdwPbpr6ezAR73-HDVaTuKPk,1290
 maps4fs/generator/dtm/czech.py,sha256=sT0gwbtEnizVNcZeL7kyDdwmKvB3w8m6UgJR7ZTk1to,1058
 maps4fs/generator/dtm/denmark.py,sha256=JFuBRrCJTMXe_vdO3gRCwsnZ3nZOp_Y6671Kq8aXRGM,1591
-maps4fs/generator/dtm/dtm.py,sha256=FOOI9_vl0KoF3EfLaLm2mvFWeOrjH2_d61VNM2NIjEg,17852
+maps4fs/generator/dtm/dtm.py,sha256=dXPQH6eT0InoPtt5ZD8TUS5uhrOSqB_t4UiDjhueZMs,17812
 maps4fs/generator/dtm/england.py,sha256=3URUm7uLH_RYXcQdDW3Vt09GWKAE8RAy1ZFJB94kXOA,1124
 maps4fs/generator/dtm/finland.py,sha256=VpXpvCgzbyKA6VGSa7ikSzE4B-cLfR1_2zOHvS8delc,1870
 maps4fs/generator/dtm/flanders.py,sha256=LltmowbS84_DaBHAS9XYoJPMunX6sWGy6zaVACHj5Ro,1039
@@ -46,14 +46,14 @@ maps4fs/generator/dtm/srtm.py,sha256=zeQovZCC6AKzdKAxypKQFuIn1mi2c9EUpRjaA4jSVVs
 maps4fs/generator/dtm/switzerland.py,sha256=Jn3qYVEps_K6cH-9rMfB_zoXMxhzWQKPnlKkSE-TehE,3549
 maps4fs/generator/dtm/usgs_wcs.py,sha256=X8VxdhyH0-EciGE_X-KgrAM6sVLTGssYIhtebOj8MPI,1021
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
-maps4fs/generator/dtm/base/wcs.py,sha256=PRG3IIwj2RWZh2y3d3taCxEsulDcwSYmsaaseNcjW3M,2538
-maps4fs/generator/dtm/base/wms.py,sha256=14ssC11SeitP9PYJwXx6669w4JZ5Z4KSobV9pWtYVQE,2292
+maps4fs/generator/dtm/base/wcs.py,sha256=lQAp_gVz9_XUmtyobJkskiefQpuJH4o1Vwb3CSQ0lQA,2510
+maps4fs/generator/dtm/base/wms.py,sha256=6Va2UMhg_s0TMOfMhxrPbsiAPiw6-vXBglnaij032I0,2264
 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.209.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.209.dist-info/METADATA,sha256=2291unPlMlwr1rRnVDlpUnlYCsksfNu2F4DrhXQeink,45409
-maps4fs-1.8.209.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.209.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.209.dist-info/RECORD,,
+maps4fs-1.8.211.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.211.dist-info/METADATA,sha256=sgf8q9pnxL8u908MqfLBE3AyVRGyxI8h4WwXNH_g0rs,45409
+maps4fs-1.8.211.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.211.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.211.dist-info/RECORD,,