maps4fs 2.1.6__py3-none-any.whl → 2.1.8__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -601,9 +601,7 @@ class Background(MeshComponent, ImageComponent):
                 fitted_polygon = shapely.Polygon(fitted_polygon_points)
                 fitted_polygons.append(fitted_polygon)
             except Exception as e:
-                self.logger.warning(
-                    "Could not fit polygon into bounds with error: %s, polygon: %s", e, polygon
-                )
+                self.logger.debug("Could not fit polygon into bounds with error: %s.", e)
                 continue
 
         if not fitted_polygons:

maps4fs/generator/component/i3d.py

@@ -562,12 +562,14 @@ class I3d(XMLComponent):
                 self.map.i3d_settings.forest_density,
             )
 
+            shift = (
+                self.map.i3d_settings.forest_density
+                * self.map.i3d_settings.trees_relative_shift
+                / 100
+            )
+
             for x, y in self.non_empty_pixels(forest_image, step=step):  # type: ignore
-                shifted_x, shifted_y = self.randomize_coordinates(
-                    (x, y),
-                    step,
-                    self.map.i3d_settings.trees_relative_shift,
-                )
+                shifted_x, shifted_y = self.randomize_coordinates((x, y), shift)
 
                 shifted_x, shifted_y = int(shifted_x), int(shifted_y)
 
@@ -600,25 +602,23 @@ class I3d(XMLComponent):
         self.forest_info["tree_limit"] = self.map.i3d_settings.tree_limit
         self.forest_info["initial_step"] = self.map.i3d_settings.forest_density
         self.forest_info["actual_step"] = step
+        self.forest_info["shift"] = shift
 
         self.assets.forests = self.xml_path
 
     @staticmethod
     def randomize_coordinates(
-        coordinates: tuple[int, int], density: int, shift_percent: int
+        coordinates: tuple[int, int], shift_range: float
     ) -> tuple[float, float]:
         """Randomizes the coordinates of the point with the given density.
 
         Arguments:
             coordinates (tuple[int, int]): The coordinates of the point.
-            density (int): The density of the randomization.
-            shift_percent (int): Maximum relative shift in percent.
+            shift_range (float): Maximum absolute shift in pixels.
 
         Returns:
             tuple[float, float]: The randomized coordinates of the point.
         """
-        shift_range = density * shift_percent / 100
-
         x_shift = uniform(-shift_range, shift_range)
         y_shift = uniform(-shift_range, shift_range)
 
@@ -658,8 +658,7 @@ class I3d(XMLComponent):
         Returns:
             int: The number of non-empty pixels in the image.
         """
-        result = np.count_nonzero(image > 0)
-        return result
+        return int(np.count_nonzero(image > 0))
 
     def get_step_by_limit(
         self, image: np.ndarray, limit: int, current_step: int | None = None

maps4fs/generator/map.py

@@ -290,8 +290,6 @@ class Map:
             self.size,
             self.rotation,
         )
-        error_text = None
-
         for game_component in self.game.components:
             component = game_component(
                 self.game,
@@ -311,35 +309,18 @@ class Map:
 
             try:
                 component.process()
-            except Exception as e:
-                self.logger.error(
-                    "Error processing component %s: %s",
-                    component.__class__.__name__,
-                    e,
-                )
-                error_text = str(e)
-                raise e
-
-            finally:
-                with open(self.main_settings_path, "r", encoding="utf-8") as file:
-                    main_settings_json = json.load(file)
-
-                main_settings_json["completed"] = True
-                main_settings_json["error"] = error_text
-
-                with open(self.main_settings_path, "w", encoding="utf-8") as file:
-                    json.dump(main_settings_json, file, indent=4)
-
-            try:
                 component.commit_generation_info()
             except Exception as e:
                 self.logger.error(
-                    "Error committing generation info for component %s: %s",
+                    "Error processing or committing generation info for component %s: %s",
                     component.__class__.__name__,
                     e,
                 )
+                self._update_main_settings({"error": str(e)})
                 raise e
 
+        self._update_main_settings({"completed": True})
+
         self.logger.debug(
             "Map generation completed. Game code: %s. Coordinates: %s, size: %s. Rotation: %s.",
             self.game.code,
@@ -348,6 +329,20 @@ class Map:
             self.rotation,
         )
 
+    def _update_main_settings(self, data: dict[str, Any]) -> None:
+        """Update main settings with provided data.
+
+        Arguments:
+            data (dict[str, Any]): Data to update main settings.
+        """
+        with open(self.main_settings_path, "r", encoding="utf-8") as file:
+            main_settings_json = json.load(file)
+
+        main_settings_json.update(data)
+
+        with open(self.main_settings_path, "w", encoding="utf-8") as file:
+            json.dump(main_settings_json, file, indent=4)
+
     def get_component(self, component_name: str) -> Component | None:
         """Get component by name.
 

{maps4fs-2.1.6.dist-info → maps4fs-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.6
+Version: 2.1.8
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.6.dist-info → maps4fs-2.1.8.dist-info}/RECORD

@@ -3,16 +3,16 @@ maps4fs/logger.py,sha256=6sem0aFKQqtVjQ_yNu9iGcc-hqzLQUhfxco05K6nqow,763
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/config.py,sha256=hBJqCay6mzV2h32EqTCFYywvrOuMpkvOCF9IDBBtO2U,1572
 maps4fs/generator/game.py,sha256=Qqeh1rg0RFghhu9uhBMn_XKXYkTkg7fsjY1xO2eIZRw,13777
-maps4fs/generator/map.py,sha256=OzYfo28pwV4naYBQPNlCcNcK2lib1iKvGU-FuOI-Vs4,19123
+maps4fs/generator/map.py,sha256=VOJJYQYzSkk-ed38R__SoYpi50YUYWO8kpLeZ2TB6tM,19024
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=8dN96L5Ueb5LxgJaKNv8-zH2Yym627o4Uj8zJYHfT8g,11312
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=OaKFvHMjAGiSL2T_eoZ1maxVbDBbZJTAcKJwDtLZFGI,34534
+maps4fs/generator/component/background.py,sha256=JANbVgcBXpaQ0HB1eeV16KkFgpU-Txj5kB5eJNEDAv0,34473
 maps4fs/generator/component/config.py,sha256=uL76h9UwyhZKZmbxz0mBmWtEPN6qYay4epTEqqtej60,8601
 maps4fs/generator/component/dem.py,sha256=mtsdTIcEHmR9mW1LMcCaX4F2OCch9BM_WXHkvJby9ZY,11930
 maps4fs/generator/component/grle.py,sha256=3BKGlR0q0t0NvmqeT81WieS6MIc_UlMQjIDDZiqTiws,27243
-maps4fs/generator/component/i3d.py,sha256=L-QAbr3Z7Ye5N0BeS_qvY9bqYxYs0eVnRCGWp77etrE,26693
+maps4fs/generator/component/i3d.py,sha256=RvpiW9skkZ6McyahC-AeIdPuSQjpXiFs1l0xOioJAu4,26638
 maps4fs/generator/component/layer.py,sha256=U_DzJTn1m_yGOtwuvbXxr7oL7YHHBGBcK37lyJNnZDk,6508
 maps4fs/generator/component/satellite.py,sha256=9nKwL8zQ-BB6WFMx2m8zduFn6RaxSNv6Vtpge1-QMYE,5052
 maps4fs/generator/component/texture.py,sha256=Ngvfe51grb6Ead6WvNjx1Zr0yz65y8y2vY8xUteLoNo,35019
@@ -21,8 +21,8 @@ maps4fs/generator/component/base/component.py,sha256=AP7b6rmYV_HdyyHlCTo9s6fyBXy
 maps4fs/generator/component/base/component_image.py,sha256=WTGC6v1KuS5sLNCC95Z48nCspvATKKNOuhTNYzTWXr4,8315
 maps4fs/generator/component/base/component_mesh.py,sha256=3hC-qDT8Vde6SmRMqs9USAkrF-gL2dDTYW71ATpxUS4,9130
 maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
-maps4fs-2.1.6.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-2.1.6.dist-info/METADATA,sha256=amG-uQo1ur-xCY6szLwNhC73me-eWELw-uWhwkKcC2A,45431
-maps4fs-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.1.6.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.1.6.dist-info/RECORD,,
+maps4fs-2.1.8.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-2.1.8.dist-info/METADATA,sha256=A1yjg3hwPS8EptLoOemoTdMW645MbvQDfAv8aKvRDII,45431
+maps4fs-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.1.8.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.1.8.dist-info/RECORD,,