maps4fs 1.3.4__py3-none-any.whl → 1.3.7__py3-none-any.whl

maps4fs/generator/background.py

@@ -476,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()

maps4fs/generator/i3d.py

@@ -54,7 +54,8 @@ class I3d(Component):
         """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."""
@@ -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"]
 

maps4fs/generator/map.py

@@ -71,13 +71,15 @@ 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
+# pylint: disable=R0913, R0902, R0914
 class Map:
     """Class used to generate map using all components.
 
@@ -97,11 +99,13 @@ class Map:
         rotation: int,
         map_directory: str,
         logger: Any = None,
+        custom_osm: str | None = None,
         dem_settings: DEMSettings = DEMSettings(),
         background_settings: BackgroundSettings = BackgroundSettings(),
         grle_settings: GRLESettings = GRLESettings(),
         i3d_settings: I3DSettings = I3DSettings(),
         texture_settings: TextureSettings = TextureSettings(),
+        **kwargs,
     ):
         if not logger:
             logger = Logger(to_stdout=True, to_file=False)
@@ -123,6 +127,9 @@ class Map:
 
         self.logger.info("Game was set to %s", game.code)
 
+        self.custom_osm = custom_osm
+        self.logger.info("Custom OSM file: %s", custom_osm)
+
         self.dem_settings = dem_settings
         self.logger.info("DEM settings: %s", dem_settings)
         self.background_settings = background_settings
@@ -137,6 +144,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)
@@ -167,6 +177,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)
 

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))
@@ -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
@@ -632,7 +635,10 @@ class Texture(Component):
         """
         is_fieds = info_layer == "fields"
         try:
-            objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
+            if self.map.custom_osm is not None:
+                objects = ox.features_from_xml(self.map.custom_osm, tags=tags)
+            else:
+                objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
         except Exception:  # pylint: disable=W0718
             self.logger.debug("Error fetching objects for tags: %s.", tags)
             return

{maps4fs-1.3.4.dist-info → maps4fs-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.3.4
+Version: 1.3.7
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -72,6 +72,7 @@ Requires-Dist: pympler
 🌲 Automatically generates forests 🆕<br>
 🌊 Automatically generates water planes 🆕<br>
 🌍 Based on real-world data from OpenStreetMap<br>
+🗺️ Supports [custom OSM maps](/docs/custom_osm.md)<br>
 🏞️ Generates height map using SRTM dataset<br>
 📦 Provides a ready-to-use map template for the Giants Editor<br>
 🚜 Supports Farming Simulator 22 and 25<br>
@@ -483,6 +484,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.
@@ -526,3 +529,4 @@ But also, I want to thank the people who helped me with the project in some way,
 - [BFernaesds](https://github.com/BFernaesds) - for the manual tests of the app.
 - [gamerdesigns](https://github.com/gamerdesigns) - for the manual tests of the app. 
 - [Tox3](https://github.com/Tox3) - for the manual tests of the app. 
+- [Lucandia](https://github.com/Lucandia) - for the awesome StreamLit [widget to preview STL files](https://github.com/Lucandia/streamlit_stl).

{maps4fs-1.3.4.dist-info → maps4fs-1.3.7.dist-info}/RECORD

@@ -1,21 +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=rywtqApQ0ijIaID59ThoXsWBsQfQBa-ch6Xw6zTuBCw,22298
+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=z8l_dxF8cd8OQT-mcI3lha_9o_lX-moxVFBOXg7aZt4,18232
-maps4fs/generator/map.py,sha256=Oa8nU_5y3LpGvPW0hqkVjUxKd-U7o2eOFm0SfncDnMo,8397
+maps4fs/generator/i3d.py,sha256=bW7FLAISFKCPUmad7ANz1loWI07oEZlEQOEL_tv0YmQ,18483
+maps4fs/generator/map.py,sha256=VEcsh-nvJ8kF1NevBwNS0tW5oiLP8gIF61ttz6XrOHc,8920
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/texture.py,sha256=2WoP54i0ppZdbnmD2Q-GllDPTxcz6zhczC1xoTHIS_A,27542
+maps4fs/generator/texture.py,sha256=PCQA2OVjTKrrMbheZ36pRAkGT8everovgvfMRwVWTFs,27894
 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.4.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.3.4.dist-info/METADATA,sha256=gso9NEiGJ4tRl1KYeG0nJ8Uxww3kUGTARbxP_45zzI0,30910
-maps4fs-1.3.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.3.4.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.3.4.dist-info/RECORD,,
+maps4fs-1.3.7.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.3.7.dist-info/METADATA,sha256=3yZGkkoXbOYdGYj9nANHuxY0uhT_8TNVSywkz_WhoS0,31286
+maps4fs-1.3.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.3.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.3.7.dist-info/RECORD,,