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

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)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.7
+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.7.dist-info → maps4fs-2.1.8.dist-info}/RECORD

@@ -12,7 +12,7 @@ maps4fs/generator/component/background.py,sha256=JANbVgcBXpaQ0HB1eeV16KkFgpU-Txj
 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=IkhGCXci6TxJPPb_ERe4uiU1nJywHantka4dlueGjbM,26674
+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.7.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-2.1.7.dist-info/METADATA,sha256=25mAea17c6kCMCSzbWkPFo2EDiVqrHQcn4fRbmmbh7w,45431
-maps4fs-2.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.1.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.1.7.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,,