maps4fs 1.7.6__py3-none-any.whl → 1.7.8__py3-none-any.whl

maps4fs/generator/game.py

@@ -58,18 +58,19 @@ class Game:
         return os.path.join(map_directory, "maps", "map", "map.xml")
 
     @classmethod
-    def from_code(cls, code: str) -> Game:
+    def from_code(cls, code: str, map_template_path: str | None = None) -> Game:
         """Returns the game instance based on the game code.
 
         Arguments:
             code (str): The code of the game.
+            map_template_path (str, optional): Path to the map template file. Defaults to None.
 
         Returns:
             Game: The game instance.
         """
         for game in cls.__subclasses__():
             if game.code and game.code.lower() == code.lower():
-                return game()
+                return game(map_template_path)
         raise ValueError(f"Game with code {code} not found.")
 
     @property

maps4fs/generator/grle.py

@@ -163,7 +163,7 @@ class GRLE(Component):
         # use fields_np as base layer and overlay farmlands_np on top of it with 50% alpha blending.
         return cv2.addWeighted(fields_np, 0.5, farmlands_np, 0.5, 0)
 
-    # pylint: disable=R0801, R0914
+    # pylint: disable=R0801, R0914, R0915
     def _add_farmlands(self) -> None:
         """Adds farmlands to the InfoLayer PNG file."""
 
@@ -174,18 +174,20 @@ class GRLE(Component):
         with open(textures_info_layer_path, "r", encoding="utf-8") as textures_info_layer_file:
             textures_info_layer = json.load(textures_info_layer_file)
 
+        farmlands = []
+        farmyards: list[list[tuple[int, int]]] | None = textures_info_layer.get("farmyards")
+        if farmyards and self.map.grle_settings.add_farmyards:
+            farmlands.extend(farmyards)
+            self.logger.debug("Found %s farmyards in textures info layer.", len(farmyards))
+
         fields: list[list[tuple[int, int]]] | None = textures_info_layer.get("fields")
         if not fields:
             self.logger.warning("Fields data not found in textures info layer.")
             return
+        farmlands.extend(fields)
 
         self.logger.debug("Found %s fields in textures info layer.", len(fields))
 
-        farmyards: list[list[tuple[int, int]]] | None = textures_info_layer.get("farmyards")
-        if farmyards and self.map.grle_settings.add_farmyards:
-            fields.extend(farmyards)
-            self.logger.debug("Found %s farmyards in textures info layer.", len(farmyards))
-
         info_layer_farmlands_path = os.path.join(
             self.game.weights_dir_path(self.map_directory), "infoLayer_farmlands.png"
         )
@@ -212,10 +214,10 @@ class GRLE(Component):
         # the farmland_id. So as a result we do not have a gap in the farmland IDs.
         farmland_id = 1
 
-        for field in fields:
+        for farmland_data in farmlands:
             try:
                 fitted_field = self.fit_object_into_bounds(
-                    polygon_points=field,
+                    polygon_points=farmland_data,
                     margin=self.map.grle_settings.farmland_margin,
                     angle=self.rotation,
                 )

{maps4fs-1.7.6.dist-info → maps4fs-1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.7.6
+Version: 1.7.8
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -594,6 +594,8 @@ The tool also supports the expert settings. Do not use them until you read the d
 
 - Upload custom background image - if you have an image, which represents the map and background terrain you can use it for generation. Note, that the image should meet the following requirements: 1:1 aspect ratio, size = map size + 2048 * 2, it should be uint16 (unsigned 16-bit integer) grayscale (single channel) image. The image should be in the PNG format. If any of the requirements are not met, the tool raises an error. If you're using rotation, the image should already be rotated.
 
+- Upload custom map template - you can use your own map template for generation. Note, that is must have the same structure as built-in templates. It's recommended to use the built-in templates and edit them as you need, instead of creating the new ones from scratch.
+
 ## Resources
 In this section, you'll find a list of the resources that you need to create a map for the Farming Simulator.<br>
 To create a basic map, you only need the Giants Editor. But if you want to create a background terrain - the world around the map, so it won't look like it's floating in the void - you also need Blender and the Blender Exporter Plugins. To create realistic textures for the background terrain, the QGIS is required to obtain high-resolution satellite images.<br>

{maps4fs-1.7.6.dist-info → maps4fs-1.7.8.dist-info}/RECORD

@@ -5,8 +5,8 @@ maps4fs/generator/background.py,sha256=tV4UXvtkNN-OSvv6ujp4jFWRU1xGBgEvSakVGZ1H4
 maps4fs/generator/component.py,sha256=pbpGaWy5C0UzxpcJ72HPY2gMol98snDr-bvNZSX4yY0,20823
 maps4fs/generator/config.py,sha256=0QmK052B8bxyHVhg3jzCORLfOBMMmqVfhhbqXKf6OMk,4383
 maps4fs/generator/dem.py,sha256=20gx0dzX0LyO6ipvDitst-BwGfcKogFqgQf9Q2qMH5U,10933
-maps4fs/generator/game.py,sha256=Nf5r2ubV4YVAVHGzJyhbF2GnOC0qV3HlHYIZBCWciHs,7992
-maps4fs/generator/grle.py,sha256=hcbVBJ4j_Zr2QvEVo2cYNh2jARVXp_X3onifBtp9Zxs,20922
+maps4fs/generator/game.py,sha256=GmCl_KQ9D-UwKao4HFEb0PRAm829ThtSZfkgzK3Oh2g,8143
+maps4fs/generator/grle.py,sha256=g9AHq3yBJgRxNnvHt9W_heU7tnJjYzEkLzGpoKFR34M,21007
 maps4fs/generator/i3d.py,sha256=pUyHKWKcw43xVCf3Y8iabtbQba05LYxMHi8vziGksIA,24843
 maps4fs/generator/map.py,sha256=a50KQEr1XZKjS_WKXywGwh4OC3gyjY6M8FTc0eNcxpg,10183
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
@@ -23,8 +23,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.7.6.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.7.6.dist-info/METADATA,sha256=JJrc4bG4NmytUf6tI4QdMF2_a2GJjKLzUnHOGLIuE28,40436
-maps4fs-1.7.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.7.6.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.7.6.dist-info/RECORD,,
+maps4fs-1.7.8.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.7.8.dist-info/METADATA,sha256=sRpKVOaUwW-yNcVKTmxCmgamzSCXWe5yNBke1hmIy3g,40705
+maps4fs-1.7.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.7.8.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.7.8.dist-info/RECORD,,