maps4fs 0.9.92__py3-none-any.whl → 0.9.94__py3-none-any.whl

maps4fs/generator/dem.py

@@ -14,7 +14,7 @@ from pympler import asizeof  # type: ignore
 from maps4fs.generator.component import Component
 
 SRTM = "https://elevation-tiles-prod.s3.amazonaws.com/skadi/{latitude_band}/{tile_name}.hgt.gz"
-DEFAULT_MULTIPLIER = 1.0
+DEFAULT_MULTIPLIER = 1
 DEFAULT_BLUR_RADIUS = 35
 DEFAULT_PLATEAU = 0
 
@@ -146,9 +146,10 @@ class DEM(Component):
         self.logger.debug("Size of resampled data: %s MB.", size_of_resampled_data)
 
         self.logger.debug(
-            "Maximum value in resampled data: %s, minimum value: %s.",
+            "Maximum value in resampled data: %s, minimum value: %s. Data type: %s.",
             resampled_data.max(),
             resampled_data.min(),
+            resampled_data.dtype,
         )
 
         if self.auto_process:
@@ -159,10 +160,11 @@ class DEM(Component):
             resampled_data = resampled_data * self.multiplier
 
             self.logger.debug(
-                "DEM data was multiplied by %s. Min: %s, max: %s.",
+                "DEM data was multiplied by %s. Min: %s, max: %s. Data type: %s.",
                 self.multiplier,
                 resampled_data.min(),
                 resampled_data.max(),
+                resampled_data.dtype,
             )
 
             size_of_resampled_data = asizeof.asizeof(resampled_data) / 1024 / 1024

maps4fs/generator/map.py

@@ -129,6 +129,9 @@ class Map:
         archive_path = shutil.make_archive(archive_path, "zip", self.map_directory)
         self.logger.info("Map packed to %s.zip", archive_path)
         if remove_source:
-            shutil.rmtree(self.map_directory)
-            self.logger.info("Map directory removed: %s", self.map_directory)
+            try:
+                shutil.rmtree(self.map_directory)
+                self.logger.info("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)
         return archive_path

maps4fs/generator/texture.py

@@ -110,7 +110,51 @@ class Texture(Component):
             weight_postfix = "_weight" if not self.exclude_weight else ""
             return os.path.join(weights_directory, f"{self.name}{idx}{weight_postfix}.png")
 
+        def path_preview(self, previews_directory: str) -> str:
+            """Returns path to the preview of the first texture of the layer.
+
+            Arguments:
+                previews_directory (str): Path to the directory with previews.
+
+            Returns:
+                str: Path to the preview.
+            """
+            return self.path(previews_directory).replace(".png", "_preview.png")
+
+        def get_preview_or_path(self, previews_directory: str) -> str:
+            """Returns path to the preview of the first texture of the layer if it exists,
+            otherwise returns path to the texture.
+
+            Arguments:
+                previews_directory (str): Path to the directory with previews.
+
+            Returns:
+                str: Path to the preview or texture.
+            """
+            preview_path = self.path_preview(previews_directory)
+            return preview_path if os.path.isfile(preview_path) else self.path(previews_directory)
+
+        def paths(self, weights_directory: str) -> list[str]:
+            """Returns a list of paths to the textures of the layer.
+            NOTE: Works only after the textures are generated, since it just lists the directory.
+
+            Arguments:
+                weights_directory (str): Path to the directory with weights.
+
+            Returns:
+                list[str]: List of paths to the textures.
+            """
+            weight_files = os.listdir(weights_directory)
+            return [
+                os.path.join(weights_directory, weight_file)
+                for weight_file in weight_files
+                if weight_file.startswith(self.name)
+            ]
+
     def preprocess(self) -> None:
+        self.light_version = self.kwargs.get("light_version", False)
+        self.logger.debug("Light version: %s.", self.light_version)
+
         if not os.path.isfile(self.game.texture_schema):
             raise FileNotFoundError(f"Texture layers schema not found: {self.game.texture_schema}")
 
@@ -285,6 +329,68 @@ class Texture(Component):
         if cumulative_image is not None:
             self.draw_base_layer(cumulative_image)
 
+        if not self.light_version:
+            self.dissolve()
+        else:
+            self.logger.info("Skipping dissolve in light version of the map.")
+
+    def dissolve(self) -> None:
+        """Dissolves textures of the layers with tags into sublayers for them to look more
+        natural in the game.
+        Iterates over all layers with tags and reads the first texture, checks if the file
+        contains any non-zero values (255), splits those non-values between different weight
+        files of the corresponding layer and saves the changes to the files.
+        """
+        for layer in self.layers:
+            if not layer.tags:
+                self.logger.debug("Layer %s has no tags, there's nothing to dissolve.", layer.name)
+                continue
+            layer_path = layer.path(self._weights_dir)
+            layer_paths = layer.paths(self._weights_dir)
+
+            if len(layer_paths) < 2:
+                self.logger.debug("Layer %s has only one texture, skipping.", layer.name)
+                continue
+
+            self.logger.debug("Dissolving layer from %s to %s.", layer_path, layer_paths)
+
+            # Check if the image contains any non-zero values, otherwise continue.
+            layer_image = cv2.imread(layer_path, cv2.IMREAD_UNCHANGED)
+
+            if not np.any(layer_image):
+                self.logger.debug(
+                    "Layer %s does not contain any non-zero values, skipping.", layer.name
+                )
+                continue
+
+            # Save the original image to use it for preview later, without combining the sublayers.
+            cv2.imwrite(layer.path_preview(self._weights_dir), layer_image.copy())
+
+            # Get the coordinates of non-zero values.
+            non_zero_coords = np.column_stack(np.where(layer_image > 0))
+
+            # Prepare sublayers.
+            sublayers = [np.zeros_like(layer_image) for _ in range(layer.count)]
+
+            # Randomly assign non-zero values to sublayers.
+            for coord in non_zero_coords:
+                sublayers[np.random.randint(0, layer.count)][coord[0], coord[1]] = 255
+
+            # # ! Debug test if the sublayers are correct.
+            # if True:
+            #     combined = cv2.bitwise_or(*sublayers)
+            #     # Match the original image with the combined sublayers.
+            #     assert np.array_equal(layer_image, combined), "Sublayers are not correct."
+
+            # Save the sublayers.
+            for sublayer, sublayer_path in zip(sublayers, layer_paths):
+                cv2.imwrite(sublayer_path, sublayer)
+                self.logger.debug("Sublayer %s saved.", sublayer_path)
+
+            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.
@@ -455,7 +561,8 @@ class Texture(Component):
 
         images = [
             cv2.resize(
-                cv2.imread(layer.path(self._weights_dir), cv2.IMREAD_UNCHANGED), preview_size
+                cv2.imread(layer.get_preview_or_path(self._weights_dir), cv2.IMREAD_UNCHANGED),
+                preview_size,
             )
             for layer in active_layers
         ]

maps4fs-0.9.94.dist-info/LICENSE.md

@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for describing the origin of the Work and
+      reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2024 [iwatkot](https://github.com/iwatkot)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

{maps4fs-0.9.92.dist-info → maps4fs-0.9.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.9.92
+Version: 0.9.94
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-0.9.92.dist-info → maps4fs-0.9.94.dist-info}/RECORD

@@ -4,18 +4,18 @@ maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk
 maps4fs/generator/background.py,sha256=AP-Z3F-4I9achvA9xsaXAAoA6IHtmPLxb1RkUsVYdbg,14036
 maps4fs/generator/component.py,sha256=ZEDjChPnvqAsgnBu2f2YBOlwGOlfax4VaAYBcJerLIQ,10684
 maps4fs/generator/config.py,sha256=ZO5BWDU-S3p0-ndKDSFa8Oin3YcYy0iH8B4lqEA_07Q,4275
-maps4fs/generator/dem.py,sha256=7UnIUnXbN3OVMSHKgrFcyzWYCMgk6vIg1-ehrNn4ek8,17042
+maps4fs/generator/dem.py,sha256=2hqkNfJpMJ3rNUK5Mi1OoWzMaaDfycwr7Okb19PyF4M,17142
 maps4fs/generator/game.py,sha256=94HjPNOyy6XSSOnBp-uxrkBglKyC-X3ULIrrucfdlKw,6825
 maps4fs/generator/i3d.py,sha256=UuQiQRusPQ2f6PvGKxJ_UZeXsx3uG15efmy8Ysnm3F8,3597
-maps4fs/generator/map.py,sha256=_LQe54KLfS_4M462UiiNSqKyUroqnQ8inwXZIZDP9a0,4487
+maps4fs/generator/map.py,sha256=tJqe4r4Y8Z8ARUJtFc_8xAQjta8sL_lKdbI89vrljVM,4668
 maps4fs/generator/path_steps.py,sha256=yeN6hmOD8O2LMozUf4HcQMIy8WJ5sHF5pGQT_s2FfOw,3147
 maps4fs/generator/qgis.py,sha256=R5Iv3ovyLXkhAL5Oy41u3ZLNOSEbc1byLetzPootO7o,6091
-maps4fs/generator/texture.py,sha256=CwaXZfAG4e3D3YR7yVR2MC677EHpbUWTboCS3G6jkhk,17723
+maps4fs/generator/texture.py,sha256=SBWZRXq7CdSZh2e8PMW57J56-kqwRvrl_jCPxtOkpR8,22316
 maps4fs/generator/tile.py,sha256=3vmfjQiPiiUZKPuIo5tg2rOKkgcP1NRVkMGK-Vo10-A,2138
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/toolbox/dem.py,sha256=53KVZ6IKIlK642eYFSRDAC8l2HL9IEUpQNYkkTC56uU,3510
-maps4fs-0.9.92.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
-maps4fs-0.9.92.dist-info/METADATA,sha256=wQTqG8ZcfeJYv4IYn9vIor9WtK36JnxPFAbjzTV-Tqw,25194
-maps4fs-0.9.92.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-0.9.92.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-0.9.92.dist-info/RECORD,,
+maps4fs-0.9.94.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-0.9.94.dist-info/METADATA,sha256=n6Lg89YSNXIdJYftItLEW-zHWvQ44gLam6SSKlG50nc,25194
+maps4fs-0.9.94.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-0.9.94.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-0.9.94.dist-info/RECORD,,

maps4fs-0.9.92.dist-info/LICENSE.md

@@ -1,21 +0,0 @@
-# MIT License
-
-Copyright © [2024] [iwatkot]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.