maps4fs 1.0.7__py3-none-any.whl → 1.0.8__py3-none-any.whl

maps4fs/generator/background.py

@@ -184,6 +184,7 @@ class Background(Component):
             dem_data = cv2.imread(tile.dem_path, cv2.IMREAD_UNCHANGED)  # pylint: disable=no-member
             self.plane_from_np(tile.code, dem_data, save_path)  # type: ignore
 
+    # pylint: disable=too-many-locals
     def cutout(self, dem_path: str) -> str:
         """Cuts out the center of the DEM (the actual map) and saves it as a separate file.
 
@@ -205,20 +206,40 @@ class Background(Component):
 
         output_size = self.map_height + 1
 
-        # pylint: disable=no-member
-        dem_data = cv2.resize(dem_data, (output_size, output_size), interpolation=cv2.INTER_LINEAR)
-
         main_dem_path = self.game.dem_file_path(self.map_directory)
+        dem_directory = os.path.dirname(main_dem_path)
 
         try:
             os.remove(main_dem_path)
         except FileNotFoundError:
             pass
 
-        cv2.imwrite(main_dem_path, dem_data)  # pylint: disable=no-member
-        self.logger.info("DEM cutout saved: %s", main_dem_path)
+        # pylint: disable=no-member
+        resized_dem_data = cv2.resize(
+            dem_data, (output_size, output_size), interpolation=cv2.INTER_LINEAR
+        )
+
+        # Giant Editor contains a bug for large maps, where the DEM should not match
+        # the UnitsPerPixel value. For example, for map 8192x8192, without bug
+        # the DEM image should be 8193x8193, but it does not work, so we need to
+        # resize the DEM to 4097x4097.
+        if self.map_height > 4096:
+            correct_dem_path = os.path.join(dem_directory, "correct_dem.png")
+            save_path = correct_dem_path
+
+            output_size = self.map_height // 2 + 1
+            bugged_dem_data = cv2.resize(
+                dem_data, (output_size, output_size), interpolation=cv2.INTER_LINEAR
+            )
+            # pylint: disable=no-member
+            cv2.imwrite(main_dem_path, bugged_dem_data)
+        else:
+            save_path = main_dem_path
+
+        cv2.imwrite(save_path, resized_dem_data)  # pylint: disable=no-member
+        self.logger.info("DEM cutout saved: %s", save_path)
 
-        return main_dem_path
+        return save_path
 
     # pylint: disable=too-many-locals
     def plane_from_np(self, tile_code: str, dem_data: np.ndarray, save_path: str) -> None:

maps4fs/generator/i3d.py

@@ -34,6 +34,8 @@ class I3d(Component):
     def preprocess(self) -> None:
         """Gets the path to the map I3D file from the game instance and saves it to the instance
         attribute. If the game does not support I3D files, the attribute is set to None."""
+        self.auto_process = self.kwargs.get("auto_process", False)
+
         try:
             self._map_i3d_path = self.game.i3d_file_path(self.map_directory)
             self.logger.debug("Map I3D path: %s.", self._map_i3d_path)
@@ -69,22 +71,16 @@ class I3d(Component):
         root = tree.getroot()
         for map_elem in root.iter("Scene"):
             for terrain_elem in map_elem.iter("TerrainTransformGroup"):
-                terrain_elem.set("heightScale", str(DEFAULT_HEIGHT_SCALE))
-                self.logger.debug(
-                    "heightScale attribute set to %s in TerrainTransformGroup element.",
-                    DEFAULT_HEIGHT_SCALE,
-                )
-                terrain_elem.set("maxLODDistance", str(DEFAULT_MAX_LOD_DISTANCE))
-                self.logger.debug(
-                    "maxLODDistance attribute set to %s in TerrainTransformGroup element.",
-                    DEFAULT_MAX_LOD_DISTANCE,
-                )
-
-                terrain_elem.set("occMaxLODDistance", str(DEFAULT_MAX_LOD_OCCLUDER_DISTANCE))
-                self.logger.debug(
-                    "occMaxLODDistance attribute set to %s in TerrainTransformGroup element.",
-                    DEFAULT_MAX_LOD_OCCLUDER_DISTANCE,
-                )
+                if self.auto_process:
+                    terrain_elem.set("heightScale", str(DEFAULT_HEIGHT_SCALE))
+                    self.logger.debug(
+                        "heightScale attribute set to %s in TerrainTransformGroup element.",
+                        DEFAULT_HEIGHT_SCALE,
+                    )
+                else:
+                    self.logger.debug(
+                        "Auto process is disabled, skipping the heightScale attribute update."
+                    )
 
                 self.logger.debug("TerrainTransformGroup element updated in I3D file.")
 

maps4fs/generator/texture.py

@@ -159,6 +159,7 @@ class Texture(Component):
 
     def preprocess(self) -> None:
         self.light_version = self.kwargs.get("light_version", False)
+        self.fields_padding = self.kwargs.get("fields_padding", 0)
         self.logger.debug("Light version: %s.", self.light_version)
 
         if not os.path.isfile(self.game.texture_schema):
@@ -476,7 +477,9 @@ class Texture(Component):
         pairs = list(zip(xs, ys))
         return np.array(pairs, dtype=np.int32).reshape((-1, 1, 2))
 
-    def _to_polygon(self, obj: pd.core.series.Series, width: int | None) -> np.ndarray | None:
+    def _to_polygon(
+        self, obj: pd.core.series.Series, width: int | None
+    ) -> shapely.geometry.polygon.Polygon:
         """Converts OSM object to numpy array of polygon points.
 
         Arguments:
@@ -484,7 +487,7 @@ class Texture(Component):
             width (int | None): Width of the polygon in meters.
 
         Returns:
-            np.ndarray | None: Numpy array of polygon points.
+            shapely.geometry.polygon.Polygon: Polygon geometry.
         """
         geometry = obj["geometry"]
         geometry_type = geometry.geom_type
@@ -498,7 +501,7 @@ class Texture(Component):
         self,
         geometry: shapely.geometry.linestring.LineString | shapely.geometry.point.Point,
         width: int | None,
-    ) -> np.ndarray:
+    ) -> shapely.geometry.polygon.Polygon:
         """Converts LineString or Point geometry to numpy array of polygon points.
 
         Arguments:
@@ -507,10 +510,23 @@ class Texture(Component):
             width (int | None): Width of the polygon in meters.
 
         Returns:
-            np.ndarray: Numpy array of polygon points.
+            shapely.geometry.polygon.Polygon: Polygon geometry.
         """
         polygon = geometry.buffer(width)
-        return self._to_np(polygon)
+        return polygon
+
+    def _skip(
+        self, geometry: shapely.geometry.polygon.Polygon, *args, **kwargs
+    ) -> shapely.geometry.polygon.Polygon:
+        """Returns the same geometry.
+
+        Arguments:
+            geometry (shapely.geometry.polygon.Polygon): Polygon geometry.
+
+        Returns:
+            shapely.geometry.polygon.Polygon: Polygon geometry.
+        """
+        return geometry
 
     def _converters(
         self, geom_type: str
@@ -523,7 +539,7 @@ class Texture(Component):
         Returns:
             Callable[[shapely.geometry, int | None], np.ndarray]: Converter function.
         """
-        converters = {"Polygon": self._to_np, "LineString": self._sequence, "Point": self._sequence}
+        converters = {"Polygon": self._skip, "LineString": self._sequence, "Point": self._sequence}
         return converters.get(geom_type)  # type: ignore
 
     def polygons(
@@ -538,6 +554,7 @@ class Texture(Component):
         Yields:
             Generator[np.ndarray, None, None]: Numpy array of polygon points.
         """
+        is_fieds = "farmland" in tags.values()
         try:
             objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
         except Exception as e:  # pylint: disable=W0718
@@ -551,7 +568,17 @@ class Texture(Component):
             polygon = self._to_polygon(obj, width)
             if polygon is None:
                 continue
-            yield polygon
+
+            if is_fieds and self.fields_padding > 0:
+                padded_polygon = polygon.buffer(-self.fields_padding)
+
+                if not isinstance(padded_polygon, shapely.geometry.polygon.Polygon):
+                    self.logger.warning("The padding value is too high, field will not padded.")
+                else:
+                    polygon = padded_polygon
+
+            polygon_np = self._to_np(polygon)
+            yield polygon_np
 
     def previews(self) -> list[str]:
         """Invokes methods to generate previews. Returns list of paths to previews.

{maps4fs-1.0.7.dist-info → maps4fs-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.0.7
+Version: 1.0.8
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -452,20 +452,26 @@ The tool supports the custom size of the map. To use this feature select `Custom
 
 ⛔️ Do not use this feature, if you don't know what you're doing. In most cases, the Giants Editor will just crash on opening the file, because you need to enter specific values for the map size.<br><br>
 
-![Advanced settings](https://github.com/user-attachments/assets/e7406adf-6b82-41a0-838a-13dd8877bebf)
+![Advanced settings](https://github.com/user-attachments/assets/9e8e178a-58d9-4aa6-aefd-4ed53408701d)
 
 You can also apply some advanced settings to the map generation process. Note that they're ADVANCED, so you don't need to use them if you're not sure what they do.<br>
 
-Here's the list of the advanced settings:
+### DEM Advanced settings
 
-- DEM multiplier: the height of the map is multiplied by this value. So the DEM map is just a 16-bit grayscale image, which means that the maximum available value there is 65535, while the actual difference between the deepest and the highest point on Earth is about 20 km. Just note that this setting mostly does not matter, because you can always adjust it in the Giants Editor, learn more about the DEM file and the heightScale parameter in [docs](docs/dem.md). By default, it's set to 1.
+- Multiplier: the height of the map is multiplied by this value. So the DEM map is just a 16-bit grayscale image, which means that the maximum available value there is 65535, while the actual difference between the deepest and the highest point on Earth is about 20 km. Just note that this setting mostly does not matter, because you can always adjust it in the Giants Editor, learn more about the DEM file and the heightScale parameter in [docs](docs/dem.md). By default, it's set to 1.
 
-- DEM Blur radius: the radius of the Gaussian blur filter applied to the DEM map. By default, it's set to 21. This filter just makes the DEM map smoother, so the height transitions will be more natural. You can set it to 1 to disable the filter, but it will result in a Minecraft-like map.
+- Blur radius: the radius of the Gaussian blur filter applied to the DEM map. By default, it's set to 21. This filter just makes the DEM map smoother, so the height transitions will be more natural. You can set it to 1 to disable the filter, but it will result in a Minecraft-like map.
 
-- DEM Plateau height: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
+- Plateau height: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
+
+### Background Terrain Advanced settings
 
 - Background Terrain Generate only full tiles: if checked (by default) the small tiles (N, NE, E, and so on) will not be generated, only the full tile will be created. It's useful when you don't want to work with separate tiles, but with one big file. Since the new method of cutting the map from the background terrain added to the documentation, and now it's possible to perfectly align the map with the background terrain, this option will remain just as a legacy one.
 
+### Texture Advanced settings
+
+- Fields padding - this value (in meters) will be applied to each field, making it smaller. It's useful when the fields are too close to each other and you want to make them smaller. By default, it's set to 0.
+
 ## 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.0.7.dist-info → maps4fs-1.0.8.dist-info}/RECORD

@@ -1,23 +1,23 @@
 maps4fs/__init__.py,sha256=da4jmND2Ths9AffnkAKgzLHNkvKFOc_l21gJisPXqWY,155
 maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/background.py,sha256=99fcsEF05G8iZAxsEXnhL_sLQ1FaXfxABYc1j4ECw_c,13116
+maps4fs/generator/background.py,sha256=ogd5TmAWL5zhZtTCOH8YHGKqc0SGQqOsWuVg3AaZO0I,14015
 maps4fs/generator/component.py,sha256=swOocaEOP3XtZgHfgDJ0ROALWoLgCJwMq8ubl0d2WrI,11085
 maps4fs/generator/config.py,sha256=kspXIT2o-_28EU0RQsROHCjkgQdqQnvreAKP5QAC5Ws,4279
 maps4fs/generator/dem.py,sha256=cCJLE20-XKaQx5lwIFNEgmQ5kfhE24QmVrAyMVwsU_A,16459
 maps4fs/generator/game.py,sha256=4I6edxTeZf41Vgvx6BaucEflMEHomRRvdMZRJAPm0d4,7450
 maps4fs/generator/grle.py,sha256=qy1tGxDNCBql1dxYBwN2Iu0g4XFFPCDvlvx9bEUoXWM,3090
-maps4fs/generator/i3d.py,sha256=1z1SuFCg2lmfJl10CuhWstflm44hjL6ldQ7nwbMndZc,14219
+maps4fs/generator/i3d.py,sha256=0rZyVLQBn1R0orIOfVvZewGMVWR-mAoqwqa6vebypZQ,13952
 maps4fs/generator/map.py,sha256=gDZUZ2wimoeA8mHVOCnZvrIBeK7b99OIWFd_LjruqBc,4677
 maps4fs/generator/path_steps.py,sha256=twhoP0KOYWOpOJfYrSWPHygtIeM-r5cIlePg1SHVyHk,3589
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/texture.py,sha256=BZjJIHwGEQMoRULAhvTPyKx8k7jlot5voVk82_TsXgg,23668
+maps4fs/generator/texture.py,sha256=2c2x99xnqKZoXDB4fdQBESFMPMiGrbx_fADFTdx4ZGY,24638
 maps4fs/generator/tile.py,sha256=z1-xEVjgFNf2WzLkgwoGGq8nREJpjPljeC9lmb5xPKA,1997
 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.0.7.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.0.7.dist-info/METADATA,sha256=KMUvKfYQNMi4N8VOdoWM0cQ0ti4TjK7fYFtCphpCC4E,27580
-maps4fs-1.0.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.0.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.0.7.dist-info/RECORD,,
+maps4fs-1.0.8.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.0.8.dist-info/METADATA,sha256=IOBr8g1SaorXmDjL1DR33Lm431WpWb8j5PLCUfxXNUk,27836
+maps4fs-1.0.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.0.8.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.0.8.dist-info/RECORD,,