maps4fs 1.3.2__py3-none-any.whl → 1.3.6__py3-none-any.whl

maps4fs/generator/background.py

@@ -123,8 +123,6 @@ class Background(Component):
             self.generate_obj_files()
         if self.map.background_settings.generate_water:
             self.generate_water_resources_obj()
-        else:
-            self.logger.info("Light version is enabled, obj files will not be generated.")
 
     def make_copy(self, dem_path: str, dem_name: str) -> None:
         """Copies DEM data to additional DEM file.
@@ -138,7 +136,7 @@ class Background(Component):
         additional_dem_path = os.path.join(dem_directory, dem_name)
 
         shutil.copyfile(dem_path, additional_dem_path)
-        self.logger.info("Additional DEM data was copied to %s.", additional_dem_path)
+        self.logger.debug("Additional DEM data was copied to %s.", additional_dem_path)
 
     def info_sequence(self) -> dict[str, str | float | int]:
         """Returns a dictionary with information about the background terrain.
@@ -340,7 +338,7 @@ class Background(Component):
         preview_path = os.path.join(self.previews_directory, "background_dem.stl")
         mesh.export(preview_path)
 
-        self.logger.info("STL file saved: %s", preview_path)
+        self.logger.debug("STL file saved: %s", preview_path)
 
         self.stl_preview_path = preview_path  # pylint: disable=attribute-defined-outside-init
 
@@ -478,7 +476,7 @@ class Background(Component):
             rotation=self.rotation,
             map_directory=self.map_directory,
             logger=self.logger,
-            custom_schema=background_layers,  # type: ignore
+            texture_custom_schema=background_layers,  # type: ignore
         )
 
         self.background_texture.preprocess()
@@ -501,7 +499,7 @@ class Background(Component):
 
         background_save_path = os.path.join(self.water_directory, "water_resources.png")
         cv2.imwrite(background_save_path, background_image)
-        self.logger.info("Background texture saved: %s", background_save_path)
+        self.logger.debug("Background texture saved: %s", background_save_path)
         self.water_resources_path = background_save_path  # pylint: disable=W0201
 
     def subtraction(self) -> None:

maps4fs/generator/config.py

@@ -38,7 +38,7 @@ class Config(Component):
             self.logger.warning("Map XML file not found: %s.", self._map_xml_path)
             return
         tree = ET.parse(self._map_xml_path)
-        self.logger.info("Map XML file loaded from: %s.", self._map_xml_path)
+        self.logger.debug("Map XML file loaded from: %s.", self._map_xml_path)
         root = tree.getroot()
         for map_elem in root.iter("map"):
             map_elem.set("width", str(self.map_size))

maps4fs/generator/dem.py

@@ -255,7 +255,7 @@ class DEM(Component):
             )
 
         cv2.imwrite(self._dem_path, resampled_data)
-        self.logger.info("DEM data was saved to %s.", self._dem_path)
+        self.logger.debug("DEM data was saved to %s.", self._dem_path)
 
         if self.rotation:
             self.rotate_dem()
@@ -401,7 +401,7 @@ class DEM(Component):
 
         scaling_factor = self._get_scaling_factor(max_dev)
         adjusted_max_height = int(65535 * scaling_factor)
-        self.logger.info(
+        self.logger.debug(
             "Maximum deviation: %s. Scaling factor: %s. Adjusted max height: %s.",
             max_dev,
             scaling_factor,

maps4fs/generator/grle.py

@@ -43,7 +43,7 @@ class GRLE(Component):
         try:
             grle_schema_path = self.game.grle_schema
         except ValueError:
-            self.logger.info("GRLE schema processing is not implemented for this game.")
+            self.logger.warning("GRLE schema processing is not implemented for this game.")
             return
 
         try:
@@ -57,7 +57,7 @@ class GRLE(Component):
     def process(self) -> None:
         """Generates InfoLayer PNG files based on the GRLE schema."""
         if not self._grle_schema:
-            self.logger.info("GRLE schema is not obtained, skipping the processing.")
+            self.logger.debug("GRLE schema is not obtained, skipping the processing.")
             return
 
         for info_layer in self._grle_schema:
@@ -84,7 +84,7 @@ class GRLE(Component):
 
         self._add_farmlands()
         if self.game.code == "FS25":
-            self.logger.info("Game is %s, plants will be added.", self.game.code)
+            self.logger.debug("Game is %s, plants will be added.", self.game.code)
             self._add_plants()
         else:
             self.logger.warning("Adding plants it's not supported for the %s.", self.game.code)
@@ -120,7 +120,7 @@ class GRLE(Component):
             self.game.weights_dir_path(self.map_directory), "infoLayer_farmlands.png"
         )
 
-        self.logger.info(
+        self.logger.debug(
             "Adding farmlands to the InfoLayer PNG file: %s.", info_layer_farmlands_path
         )
 
@@ -190,10 +190,10 @@ class GRLE(Component):
 
         tree.write(farmlands_xml_path)
 
-        self.logger.info("Farmlands added to the farmlands XML file: %s.", farmlands_xml_path)
+        self.logger.debug("Farmlands added to the farmlands XML file: %s.", farmlands_xml_path)
 
         cv2.imwrite(info_layer_farmlands_path, image)  # pylint: disable=no-member
-        self.logger.info(
+        self.logger.debug(
             "Farmlands added to the InfoLayer PNG file: %s.", info_layer_farmlands_path
         )
 
@@ -354,7 +354,7 @@ class GRLE(Component):
 
         # Add islands of plants to the base image.
         island_count = self.map_size
-        self.logger.info("Adding %s islands of plants to the base image.", island_count)
+        self.logger.debug("Adding %s islands of plants to the base image.", island_count)
         if self.map.grle_settings.random_plants:
             grass_image_copy = create_island_of_plants(grass_image_copy, island_count)
         self.logger.debug("Islands of plants added to the base image.")
@@ -391,4 +391,4 @@ class GRLE(Component):
         # Ensure that order of channels is correct because CV2 uses BGR and we need RGB.
         density_map_fruits = cv2.cvtColor(density_map_fruits, cv2.COLOR_BGR2RGB)
         cv2.imwrite(density_map_fruit_path, density_map_fruits)
-        self.logger.info("Updated density map for fruits saved in %s.", density_map_fruit_path)
+        self.logger.debug("Updated density map for fruits saved in %s.", density_map_fruit_path)

maps4fs/generator/i3d.py

@@ -47,19 +47,20 @@ class I3d(Component):
             self._map_i3d_path = self.game.i3d_file_path(self.map_directory)
             self.logger.debug("Map I3D path: %s.", self._map_i3d_path)
         except NotImplementedError:
-            self.logger.info("I3D file processing is not implemented for this game.")
+            self.logger.warning("I3D file processing is not implemented for this game.")
             self._map_i3d_path = None
 
     def process(self) -> None:
         """Updates the map I3D file with the default settings."""
         self._update_i3d_file()
         self._add_fields()
-        self._add_forests()
+        if self.game.code == "FS25":
+            self._add_forests()
 
     def _get_tree(self) -> ET.ElementTree | None:
         """Returns the ElementTree instance of the map I3D file."""
         if not self._map_i3d_path:
-            self.logger.info("I3D is not obtained, skipping the update.")
+            self.logger.debug("I3D is not obtained, skipping the update.")
             return None
         if not os.path.isfile(self._map_i3d_path):
             self.logger.warning("I3D file not found: %s.", self._map_i3d_path)
@@ -117,7 +118,7 @@ class I3d(Component):
                 )
 
         tree.write(self._map_i3d_path)  # type: ignore
-        self.logger.info("Map I3D file saved to: %s.", self._map_i3d_path)
+        self.logger.debug("Map I3D file saved to: %s.", self._map_i3d_path)
 
     def previews(self) -> list[str]:
         """Returns a list of paths to the preview images (empty list).
@@ -234,7 +235,7 @@ class I3d(Component):
                     field_id += 1
 
             tree.write(self._map_i3d_path)  # type: ignore
-            self.logger.info("Map I3D file saved to: %s.", self._map_i3d_path)
+            self.logger.debug("Map I3D file saved to: %s.", self._map_i3d_path)
 
     def get_name_indicator_node(self, node_id: int, field_id: int) -> tuple[ET.Element, int]:
         """Creates a name indicator node with given node ID and field ID.
@@ -327,24 +328,28 @@ class I3d(Component):
     # pylint: disable=R0911
     def _add_forests(self) -> None:
         """Adds forests to the map I3D file."""
-        try:
-            tree_schema_path = self.game.tree_schema
-        except ValueError:
-            self.logger.warning("Tree schema path not set for the Game %s.", self.game.code)
-            return
-
-        if not os.path.isfile(tree_schema_path):
-            self.logger.warning("Tree schema file was not found: %s.", tree_schema_path)
-            return
-
-        try:
-            with open(tree_schema_path, "r", encoding="utf-8") as tree_schema_file:
-                tree_schema: list[dict[str, str | int]] = json.load(tree_schema_file)
-        except json.JSONDecodeError as e:
-            self.logger.warning(
-                "Could not load tree schema from %s with error: %s", tree_schema_path, e
-            )
-            return
+        custom_schema = self.kwargs.get("tree_custom_schema")
+        if custom_schema:
+            tree_schema = custom_schema
+        else:
+            try:
+                tree_schema_path = self.game.tree_schema
+            except ValueError:
+                self.logger.warning("Tree schema path not set for the Game %s.", self.game.code)
+                return
+
+            if not os.path.isfile(tree_schema_path):
+                self.logger.warning("Tree schema file was not found: %s.", tree_schema_path)
+                return
+
+            try:
+                with open(tree_schema_path, "r", encoding="utf-8") as tree_schema_file:
+                    tree_schema = json.load(tree_schema_file)  # type: ignore
+            except json.JSONDecodeError as e:
+                self.logger.warning(
+                    "Could not load tree schema from %s with error: %s", tree_schema_path, e
+                )
+                return
 
         texture_component: Texture | None = self.map.get_component("Texture")  # type: ignore
         if not texture_component:
@@ -399,7 +404,7 @@ class I3d(Component):
                 (xcs, ycs), self.map.i3d_settings.forest_density
             )
 
-            random_tree = choice(tree_schema)
+            random_tree = choice(tree_schema)  # type: ignore
             tree_name = random_tree["name"]
             tree_id = random_tree["reference_id"]
 
@@ -417,7 +422,7 @@ class I3d(Component):
         self.logger.info("Added %s trees to the I3D file.", tree_count)
 
         tree.write(self._map_i3d_path)  # type: ignore
-        self.logger.info("Map I3D file saved to: %s.", self._map_i3d_path)
+        self.logger.debug("Map I3D file saved to: %s.", self._map_i3d_path)
 
     @staticmethod
     def randomize_coordinates(coordinates: tuple[int, int], density: int) -> tuple[float, float]:

maps4fs/generator/map.py

@@ -71,10 +71,12 @@ class TextureSettings(NamedTuple):
     Attributes:
         dissolve (bool): dissolve the texture into several images.
         fields_padding (int): padding around the fields.
+        skip_drains (bool): skip drains generation.
     """
 
     dissolve: bool = True
     fields_padding: int = 0
+    skip_drains: bool = False
 
 
 # pylint: disable=R0913, R0902
@@ -102,6 +104,7 @@ class Map:
         grle_settings: GRLESettings = GRLESettings(),
         i3d_settings: I3DSettings = I3DSettings(),
         texture_settings: TextureSettings = TextureSettings(),
+        **kwargs,
     ):
         if not logger:
             logger = Logger(to_stdout=True, to_file=False)
@@ -137,6 +140,9 @@ class Map:
         os.makedirs(self.map_directory, exist_ok=True)
         self.logger.debug("Map directory created: %s", self.map_directory)
 
+        self.texture_custom_schema = kwargs.get("texture_custom_schema", None)
+        self.tree_custom_schema = kwargs.get("tree_custom_schema", None)
+
         try:
             shutil.unpack_archive(game.template_path, self.map_directory)
             self.logger.debug("Map template unpacked to %s", self.map_directory)
@@ -149,6 +155,14 @@ class Map:
         Yields:
             Generator[str, None, None]: Component names.
         """
+        self.logger.info(
+            "Starting map generation. Game code: %s. Coordinates: %s, size: %s. Rotation: %s.",
+            self.game.code,
+            self.coordinates,
+            self.size,
+            self.rotation,
+        )
+
         for game_component in self.game.components:
             component = game_component(
                 self.game,
@@ -159,6 +173,8 @@ class Map:
                 self.rotation,
                 self.map_directory,
                 self.logger,
+                texture_custom_schema=self.texture_custom_schema,
+                tree_custom_schema=self.tree_custom_schema,
             )
             self.components.append(component)
 
@@ -184,6 +200,14 @@ class Map:
                 )
                 raise e
 
+        self.logger.info(
+            "Map generation completed. Game code: %s. Coordinates: %s, size: %s. Rotation: %s.",
+            self.game.code,
+            self.coordinates,
+            self.size,
+            self.rotation,
+        )
+
     def get_component(self, component_name: str) -> Component | None:
         """Get component by name.
 
@@ -231,7 +255,7 @@ class Map:
         if remove_source:
             try:
                 shutil.rmtree(self.map_directory)
-                self.logger.info("Map directory removed: %s", self.map_directory)
+                self.logger.debug("Map directory removed: %s", self.map_directory)
             except Exception as e:  # pylint: disable=W0718
-                self.logger.error("Error removing map directory %s: %s", self.map_directory, e)
+                self.logger.debug("Error removing map directory %s: %s", self.map_directory, e)
         return archive_path

maps4fs/generator/texture.py

@@ -178,7 +178,7 @@ class Texture(Component):
 
     def preprocess(self) -> None:
         """Preprocesses the data before the generation."""
-        custom_schema = self.kwargs.get("custom_schema")
+        custom_schema = self.kwargs.get("texture_custom_schema")
         if custom_schema:
             layers_schema = custom_schema  # type: ignore
             self.logger.info("Custom schema loaded with %s layers.", len(layers_schema))
@@ -202,7 +202,7 @@ class Texture(Component):
 
         base_layer = self.get_base_layer()
         if base_layer:
-            self.logger.info("Base layer found: %s.", base_layer.name)
+            self.logger.debug("Base layer found: %s.", base_layer.name)
         else:
             self.logger.warning("No base layer found.")
 
@@ -313,7 +313,7 @@ class Texture(Component):
 
         for layer in self.layers:
             self._generate_weights(layer)
-        self.logger.info("Prepared weights for %s layers.", len(self.layers))
+        self.logger.debug("Prepared weights for %s layers.", len(self.layers))
 
     def _generate_weights(self, layer: Layer) -> None:
         """Generates weight files for textures. Each file is a numpy array of zeros and
@@ -388,6 +388,9 @@ class Texture(Component):
         info_layer_data = defaultdict(list)
 
         for layer in layers:
+            if self.map.texture_settings.skip_drains and layer.usage == "drain":
+                self.logger.debug("Skipping layer %s because of the usage.", layer.name)
+                continue
             if not layer.tags:
                 self.logger.debug("Layer %s has no tags, there's nothing to draw.", layer.name)
                 continue
@@ -416,7 +419,7 @@ class Texture(Component):
             cumulative_image = cv2.bitwise_or(cumulative_image, output_image)
 
             cv2.imwrite(layer_path, output_image)
-            self.logger.info("Texture %s saved.", layer_path)
+            self.logger.debug("Texture %s saved.", layer_path)
 
         # Save info layer data.
         with open(self.info_layer_path, "w", encoding="utf-8") as f:
@@ -481,8 +484,6 @@ class Texture(Component):
 
             self.logger.info("Dissolved layer %s.", layer.name)
 
-        self.logger.info("Dissolving finished.")
-
     def draw_base_layer(self, cumulative_image: np.ndarray) -> None:
         """Draws base layer and saves it into the png file.
         Base layer is the last layer to be drawn, it fills the remaining area of the map.
@@ -496,7 +497,7 @@ class Texture(Component):
             self.logger.debug("Drawing base layer %s.", layer_path)
             img = cv2.bitwise_not(cumulative_image)
             cv2.imwrite(layer_path, img)
-            self.logger.info("Base texture %s saved.", layer_path)
+            self.logger.debug("Base texture %s saved.", layer_path)
 
     def get_relative_x(self, x: float) -> int:
         """Converts UTM X coordinate to relative X coordinate in map image.
@@ -635,9 +636,8 @@ class Texture(Component):
         is_fieds = info_layer == "fields"
         try:
             objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
-        except Exception as e:  # pylint: disable=W0718
-            self.logger.warning("Error fetching objects for tags: %s.", tags)
-            self.logger.warning(e)
+        except Exception:  # pylint: disable=W0718
+            self.logger.debug("Error fetching objects for tags: %s.", tags)
             return
         objects_utm = ox.projection.project_gdf(objects, to_latlong=False)
         self.logger.debug("Fetched %s elements for tags: %s.", len(objects_utm), tags)
@@ -712,5 +712,5 @@ class Texture(Component):
         preview_path = os.path.join(self.previews_directory, "textures_osm.png")
 
         cv2.imwrite(preview_path, merged)  # type: ignore
-        self.logger.info("Preview saved to %s.", preview_path)
+        self.logger.debug("Preview saved to %s.", preview_path)
         return preview_path

{maps4fs-1.3.2.dist-info → maps4fs-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.3.2
+Version: 1.3.6
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -483,6 +483,8 @@ You can also apply some advanced settings to the map generation process. Note th
 
 - Texture dissolving - if enabled, the values from one layer will be splitted between different layers of texture, making it look more natural. By default, it's set to True. Can be turned of for faster processing.
 
+- Skip drains - if enabled, the tool will not generate the drains and ditches on the map. By default, it's set to False. Use this if you don't need the drains on the map.
+
 ### Farmlands Advanced settings
 
 - Farmlands margin - this value (in meters) will be applied to each farmland, making it bigger. You can use the value to adjust how much the farmland should be bigger than the actual field. By default, it's set to 3.

maps4fs-1.3.6.dist-info/RECORD

@@ -0,0 +1,21 @@
+maps4fs/__init__.py,sha256=MlM_vkLH_22xoBwhoRD52JDECCmeAJ8gBQr7RMQZmis,261
+maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
+maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/background.py,sha256=KFoO6GKaNrJDUoMrDyeroZG63Cv9aGkMgHaa0QYEpiU,22306
+maps4fs/generator/component.py,sha256=XN-3Zx0bujugpuRk3YB-pYNwUHREdyt_cLxPd7pr57g,17967
+maps4fs/generator/config.py,sha256=0QmK052B8bxyHVhg3jzCORLfOBMMmqVfhhbqXKf6OMk,4383
+maps4fs/generator/dem.py,sha256=MZf3ZjawJ977TxqB1q9nNpvPZUNwfmm2EaJDtVU-eCU,15939
+maps4fs/generator/game.py,sha256=ZQeYzPzPB3CG41avdhNCyTZpHEeedqNBuAbNevTZuXg,7931
+maps4fs/generator/grle.py,sha256=xKIpyhYsZol-IXcBULbX7wWZ1n83BWTZqaf8FLodchE,17499
+maps4fs/generator/i3d.py,sha256=bW7FLAISFKCPUmad7ANz1loWI07oEZlEQOEL_tv0YmQ,18483
+maps4fs/generator/map.py,sha256=a-nwDsKq6u9RLB2htueXtJtdDZbocpj_KxGhBw5AoEI,8776
+maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
+maps4fs/generator/texture.py,sha256=tNhv-_AOrv4Wf7knbrN9LZBkvApgsrGffGPAzZScr7g,27745
+maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
+maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
+maps4fs-1.3.6.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.3.6.dist-info/METADATA,sha256=pczjM5FWcRCAJiNtW3JRwl0SeNYEAlQUwc1V2UWyjtY,31082
+maps4fs-1.3.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.3.6.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.3.6.dist-info/RECORD,,

maps4fs-1.3.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-maps4fs/__init__.py,sha256=MlM_vkLH_22xoBwhoRD52JDECCmeAJ8gBQr7RMQZmis,261
-maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
-maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/background.py,sha256=LDM8377BpBa9Iy1AMK0c0sbW8QTvhVM3yFlf-bu8APU,22400
-maps4fs/generator/component.py,sha256=XN-3Zx0bujugpuRk3YB-pYNwUHREdyt_cLxPd7pr57g,17967
-maps4fs/generator/config.py,sha256=b7qY0luC-_WM_c72Ohtlf4FrB37X5cALInbestSdUsw,4382
-maps4fs/generator/dem.py,sha256=DoQk6IPkS47eF21rh7JZoiUr1bAzuJkdF41ejAqykW4,15937
-maps4fs/generator/game.py,sha256=ZQeYzPzPB3CG41avdhNCyTZpHEeedqNBuAbNevTZuXg,7931
-maps4fs/generator/grle.py,sha256=zdYM-MHGfa3CHKgnOnd4EpCKF6HfY_sUfeJbo7-cic0,17489
-maps4fs/generator/i3d.py,sha256=fsKveRWQk68fpWRwMYqSL4RfHkD0dLUyNHi_iAyANso,18225
-maps4fs/generator/map.py,sha256=r0yEqQB56aqo0MxZMVLdP8w9xmQao0R3WTp6Sg-C4bY,7913
-maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/texture.py,sha256=57R0v4QuB-tnr_75hgGxfUTX5ennrULkhqiDNTgzi4s,27629
-maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
-maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.3.2.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.3.2.dist-info/METADATA,sha256=PysvMKUBYzqwHkBqoahH6uziBlrrNCySs8RKvv6XlhM,30910
-maps4fs-1.3.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.3.2.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.3.2.dist-info/RECORD,,