maps4fs 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -597,6 +597,7 @@ class Background(MeshComponent, ImageComponent):
                     polygon_points=polygon.exterior.coords,
                     angle=self.rotation,
                     canvas_size=self.background_size,
+                    xshift=-Parameters.BACKGROUND_DISTANCE,
                 )
                 fitted_polygon = shapely.Polygon(fitted_polygon_points)
                 fitted_polygons.append(fitted_polygon)

maps4fs/generator/component/base/component.py

@@ -365,6 +365,8 @@ class Component:
         angle: int = 0,
         border: int = 0,
         canvas_size: int | None = None,
+        xshift: int = 0,
+        yshift: int = 0,
     ) -> list[tuple[int, int]]:
         """Fits a polygon into the bounds of the map.
 
@@ -374,6 +376,9 @@ class Component:
             margin (int, optional): The margin to add to the polygon. Defaults to 0.
             angle (int, optional): The angle to rotate the polygon by. Defaults to 0.
             border (int, optional): The border to add to the bounds. Defaults to 0.
+            canvas_size (int, optional): The size of the canvas. Defaults to None.
+            xshift (int, optional): The x-axis shift to apply. Will be added to calculated offset.
+            yshift (int, optional): The y-axis shift to apply. Will be added to calculated offset.
 
         Returns:
             list[tuple[int, int]]: The points of the polygon fitted into the map bounds.
@@ -400,8 +405,11 @@ class Component:
             )
             osm_object = rotate(osm_object, -angle, origin=(center_x, center_y))
             offset = int((self.map_size / 2) - (self.map_rotated_size / 2)) * self.map.size_scale
-            self.logger.debug("Translating the osm_object by %s", offset)
-            osm_object = translate(osm_object, xoff=offset, yoff=offset)
+            xoff = yoff = offset
+            xoff += xshift
+            yoff += yshift
+            self.logger.debug("Translating the osm_object by X: %s, Y: %s", xoff, yoff)
+            osm_object = translate(osm_object, xoff=xoff, yoff=yoff)
             self.logger.debug("Rotated and translated the osm_object.")
 
         if margin and object_type is Polygon:

maps4fs/generator/component/layer.py

@@ -49,6 +49,7 @@ class Layer:
         area_type: str | None = None,
         area_water: bool = False,
         indoor: bool = False,
+        merge_into: str | None = None,
     ):
         self.name = name
         self.count = count
@@ -68,6 +69,7 @@ class Layer:
         self.area_type = area_type
         self.area_water = area_water
         self.indoor = indoor
+        self.merge_into = merge_into
 
     def to_json(self) -> dict[str, str | list[str] | bool]:  # type: ignore
         """Returns dictionary with layer data.
@@ -93,6 +95,7 @@ class Layer:
             "area_type": self.area_type,
             "area_water": self.area_water,
             "indoor": self.indoor,
+            "merge_into": self.merge_into,
         }
 
         data = {k: v for k, v in data.items() if v is not None}

maps4fs/generator/component/texture.py

@@ -172,6 +172,7 @@ class Texture(ImageComponent):
         self._read_parameters()
         self.draw()
         self.rotate_textures()
+        self.merge_into()
 
         if not self.kwargs.get("skip_scaling", False):
             self.scale_textures()
@@ -256,6 +257,46 @@ class Texture(ImageComponent):
                     "Procedural file %s copied from %s.", procedural_save_path, texture_paths[0]
                 )
 
+    def get_layer_by_name(self, layer_name: str) -> Layer | None:
+        """Returns the layer with the given name.
+
+        Arguments:
+            layer_name: The name of the layer to retrieve.
+
+        Returns:
+            The layer with the given name, or None if not found.
+        """
+        for layer in self.layers:
+            if layer.name == layer_name:
+                return layer
+        return None
+
+    def merge_into(self) -> None:
+        """Merges the content of layers into their target layers."""
+        for layer in self.layers:
+            if layer.merge_into:
+                target_layer = self.get_layer_by_name(layer.merge_into)
+                if target_layer:
+                    target_layer_image = cv2.imread(
+                        target_layer.path(self._weights_dir), cv2.IMREAD_UNCHANGED
+                    )
+                    layer_image = cv2.imread(layer.path(self._weights_dir), cv2.IMREAD_UNCHANGED)
+                    if target_layer_image is not None and layer_image is not None:
+                        if target_layer_image.shape != layer_image.shape:
+                            self.logger.warning(
+                                "Layer %s and target layer %s have different shapes, skipping merge.",
+                                layer.name,
+                                target_layer.name,
+                            )
+                            continue
+                        target_layer_image = cv2.add(target_layer_image, layer_image)
+                        cv2.imwrite(target_layer.path(self._weights_dir), target_layer_image)
+                    self.logger.debug("Merged layer %s into %s.", layer.name, target_layer.name)
+
+                    # Clear the content of the layer which have merge_into property.
+                    cv2.imwrite(layer.path(self._weights_dir), np.zeros_like(layer_image))
+                    self.logger.debug("Cleared layer %s.", layer.name)
+
     def rotate_textures(self) -> None:
         """Rotates textures of the layers which have tags."""
         if self.rotation:

{maps4fs-2.2.1.dist-info → maps4fs-2.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.2.1
+Version: 2.2.3
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -54,6 +54,7 @@ Dynamic: license-file
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
   <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
+  <a href="docs/my_maps.md">My Maps</a> •
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
   <a href="#Schemas-Editor">Schemas Editor</a> •
@@ -565,6 +566,7 @@ Let's have a closer look at the fields:
 - `area_type` - one of the supported by Giants Editor area types, such as: "open_land", "city", "village", "harbor", "industrial", "open_water". It will be reflected in the environment info layer file.  
 - `area_water` - whenever this field is set to true, the area will be considered as water, and it will be changed in the environment info layer file.
 - `indoor` - whenever this field is set to true, the area will be considered as indoor, and it will be reflected in the indoorMask info layer.
+- `merge_into` - if specified, the layer with this parameter will be merged into the target layer and the content of the layer will be transferred to the target layer.
 
 ## Background terrain
 

{maps4fs-2.2.1.dist-info → maps4fs-2.2.3.dist-info}/RECORD

@@ -8,21 +8,21 @@ maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,611
 maps4fs/generator/settings.py,sha256=NukAt1s4CS0HEWmUcBPc8OiqkWqjts3AvvkX0APZKes,11385
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=JANbVgcBXpaQ0HB1eeV16KkFgpU-Txj5kB5eJNEDAv0,34473
+maps4fs/generator/component/background.py,sha256=-GNA6zdQmfu7Oi4Cny0uhxlgl39VbvhEGhl4wKdh0ew,34533
 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=RvpiW9skkZ6McyahC-AeIdPuSQjpXiFs1l0xOioJAu4,26638
-maps4fs/generator/component/layer.py,sha256=U_DzJTn1m_yGOtwuvbXxr7oL7YHHBGBcK37lyJNnZDk,6508
+maps4fs/generator/component/layer.py,sha256=bdy1XGOODyPqYUM3b_wEY2H9Piz-AaHsCDecl-qRHiM,6627
 maps4fs/generator/component/satellite.py,sha256=9nKwL8zQ-BB6WFMx2m8zduFn6RaxSNv6Vtpge1-QMYE,5052
-maps4fs/generator/component/texture.py,sha256=Ngvfe51grb6Ead6WvNjx1Zr0yz65y8y2vY8xUteLoNo,35019
+maps4fs/generator/component/texture.py,sha256=gXZgr73ehT3_qjuIku0j7N7exloywtmmEQKBJ-MDcco,36988
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/component/base/component.py,sha256=AP7b6rmYV_HdyyHlCTo9s6fyBXyyqGyBv-DYVynBGws,22884
+maps4fs/generator/component/base/component.py,sha256=lf0V9CLUXMg88Nm2yI3rP5taVYYlNivud0x6kbhBYqA,23312
 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.2.1.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-2.2.1.dist-info/METADATA,sha256=cMaMkvanQQIYGtV3u0BV5CXZ9t4Jlm64ngl9DqVUf5w,46032
-maps4fs-2.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.2.1.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.2.1.dist-info/RECORD,,
+maps4fs-2.2.3.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-2.2.3.dist-info/METADATA,sha256=_DBytlg4xeIbCRKklRtwA_dgB6FWk7bF3OAMXqPfnLk,46244
+maps4fs-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.2.3.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.2.3.dist-info/RECORD,,