maps4fs 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

maps4fs/generator/dem.py

@@ -41,7 +41,7 @@ class DEM(Component):
         self.multiplier = self.kwargs.get("multiplier", DEFAULT_MULTIPLIER)
         self.blur_radius = self.kwargs.get("blur_radius", DEFAULT_BLUR_RADIUS)
         self.logger.debug(
-            "DEM multiplier is %s, blur radius is %s.", self.multiplier, self.blur_radius
+            "DEM value multiplier is %s, blur radius is %s.", self.multiplier, self.blur_radius
         )
 
     # pylint: disable=no-member
@@ -50,10 +50,10 @@ class DEM(Component):
         saves to map directory."""
         north, south, east, west = self.bbox
 
-        dem_height = self.map_height * self.game.dem_multipliyer + 1
-        dem_width = self.map_width * self.game.dem_multipliyer + 1
+        dem_height = int((self.map_height / 2) * self.game.dem_multipliyer + 1)
+        dem_width = int((self.map_width / 2) * self.game.dem_multipliyer + 1)
         self.logger.debug(
-            "DEM multiplier is %s, DEM height is %s, DEM width is %s.",
+            "DEM size multiplier is %s, DEM height is %s, DEM width is %s.",
             self.game.dem_multipliyer,
             dem_height,
             dem_width,
@@ -129,6 +129,12 @@ class DEM(Component):
         cv2.imwrite(self._dem_path, resampled_data)
         self.logger.debug("DEM data was saved to %s.", self._dem_path)
 
+        if self.game.additional_dem_name is not None:
+            dem_directory = os.path.dirname(self._dem_path)
+            additional_dem_path = os.path.join(dem_directory, self.game.additional_dem_name)
+            shutil.copyfile(self._dem_path, additional_dem_path)
+            self.logger.debug("Additional DEM data was copied to %s.", additional_dem_path)
+
     def _tile_info(self, lat: float, lon: float) -> tuple[str, str]:
         """Returns latitude band and tile name for SRTM tile from coordinates.
 
@@ -218,6 +224,9 @@ class DEM(Component):
             str: Path to the preview image.
         """
         rgb_dem_path = self._dem_path.replace(".png", "_grayscale.png")
+
+        self.logger.debug("Creating grayscale preview of DEM data in %s.", rgb_dem_path)
+
         dem_data = cv2.imread(self._dem_path, cv2.IMREAD_GRAYSCALE)
         dem_data_rgb = cv2.cvtColor(dem_data, cv2.COLOR_GRAY2RGB)
         cv2.imwrite(rgb_dem_path, dem_data_rgb)
@@ -232,12 +241,17 @@ class DEM(Component):
         """
 
         colored_dem_path = self._dem_path.replace(".png", "_colored.png")
+
+        self.logger.debug("Creating colored preview of DEM data in %s.", colored_dem_path)
+
         dem_data = cv2.imread(self._dem_path, cv2.IMREAD_GRAYSCALE)
 
-        # Normalize the DEM data to the range [0, 255]
-        # dem_data_normalized = cv2.normalize(dem_data, None, 0, 255, cv2.NORM_MINMAX)
+        # Create an empty array with the same shape and type as dem_data
+        dem_data_normalized = np.empty_like(dem_data)
 
-        dem_data_colored = cv2.applyColorMap(dem_data, cv2.COLORMAP_JET)
+        # Normalize the DEM data to the range [0, 255]
+        cv2.normalize(dem_data, dem_data_normalized, 0, 255, cv2.NORM_MINMAX)
+        dem_data_colored = cv2.applyColorMap(dem_data_normalized, cv2.COLORMAP_JET)
 
         cv2.imwrite(colored_dem_path, dem_data_colored)
         return colored_dem_path
@@ -248,4 +262,5 @@ class DEM(Component):
         Returns:
             list[str]: List of preview images.
         """
+        self.logger.debug("Starting DEM previews generation.")
         return [self.grayscale_preview(), self.colored_preview()]

maps4fs/generator/game.py

@@ -30,6 +30,7 @@ class Game:
 
     code: str | None = None
     dem_multipliyer: int = 1
+    _additional_dem_name: str | None = None
     _map_template_path: str | None = None
     _texture_schema: str | None = None
 
@@ -102,6 +103,24 @@ class Game:
         """
         raise NotImplementedError
 
+    def weights_dir_path(self, map_directory: str) -> str:
+        """Returns the path to the weights directory.
+
+        Arguments:
+            map_directory (str): The path to the map directory.
+
+        Returns:
+            str: The path to the weights directory."""
+        raise NotImplementedError
+
+    @property
+    def additional_dem_name(self) -> str | None:
+        """Returns the name of the additional DEM file.
+
+        Returns:
+            str | None: The name of the additional DEM file."""
+        return self._additional_dem_name
+
 
 class FS22(Game):
     """Class used to define the game version FS22."""
@@ -120,12 +139,23 @@ class FS22(Game):
             str: The path to the DEM file."""
         return os.path.join(map_directory, "maps", "map", "data", "map_dem.png")
 
+    def weights_dir_path(self, map_directory: str) -> str:
+        """Returns the path to the weights directory.
+
+        Arguments:
+            map_directory (str): The path to the map directory.
+
+        Returns:
+            str: The path to the weights directory."""
+        return os.path.join(map_directory, "maps", "map", "data")
+
 
 class FS25(Game):
     """Class used to define the game version FS25."""
 
     code = "FS25"
     dem_multipliyer: int = 2
+    _additional_dem_name = "unprocessedHeightMap.png"
     _map_template_path = os.path.join(working_directory, "data", "fs25-map-template.zip")
     _texture_schema = os.path.join(working_directory, "data", "fs25-texture-schema.json")
 
@@ -137,4 +167,25 @@ class FS25(Game):
 
         Returns:
             str: The path to the DEM file."""
-        return os.path.join(map_directory, "maps", "map", "data", "dem.png")
+        return os.path.join(map_directory, "mapUS", "data", "dem.png")
+
+    def map_xml_path(self, map_directory: str) -> str:
+        """Returns the path to the map.xml file.
+
+        Arguments:
+            map_directory (str): The path to the map directory.
+
+        Returns:
+            str: The path to the map.xml file.
+        """
+        return os.path.join(map_directory, "mapUS", "mapUS.xml")
+
+    def weights_dir_path(self, map_directory: str) -> str:
+        """Returns the path to the weights directory.
+
+        Arguments:
+            map_directory (str): The path to the map directory.
+
+        Returns:
+            str: The path to the weights directory."""
+        return os.path.join(map_directory, "mapUS", "data")

maps4fs/generator/map.py

@@ -91,7 +91,14 @@ class Map:
         """
         previews = []
         for component in self.components:
-            previews.extend(component.previews())
+            try:
+                previews.extend(component.previews())
+            except Exception as e:  # pylint: disable=W0718
+                self.logger.error(
+                    "Error getting previews for component %s: %s",
+                    component.__class__.__name__,
+                    e,
+                )
         return previews
 
     def pack(self, archive_name: str) -> str:

maps4fs/generator/texture.py

@@ -56,12 +56,14 @@ class Texture(Component):
             tags: dict[str, str | list[str] | bool] | None = None,
             width: int | None = None,
             color: tuple[int, int, int] | list[int] | None = None,
+            exclude_weight: bool = False,
         ):
             self.name = name
             self.count = count
             self.tags = tags
             self.width = width
             self.color = color if color else (255, 255, 255)
+            self.exclude_weight = exclude_weight
 
         def to_json(self) -> dict[str, str | list[str] | bool]:  # type: ignore
             """Returns dictionary with layer data.
@@ -74,6 +76,7 @@ class Texture(Component):
                 "tags": self.tags,
                 "width": self.width,
                 "color": list(self.color),
+                "exclude_weight": self.exclude_weight,
             }
 
             data = {k: v for k, v in data.items() if v is not None}
@@ -100,9 +103,9 @@ class Texture(Component):
             Returns:
                 str: Path to the texture.
             """
-            if self.name == "waterPuddle":
-                return os.path.join(weights_directory, "waterPuddle_weight.png")
-            return os.path.join(weights_directory, f"{self.name}01_weight.png")
+            idx = "01" if self.count > 0 else ""
+            weight_postfix = "_weight" if not self.exclude_weight else ""
+            return os.path.join(weights_directory, f"{self.name}{idx}{weight_postfix}.png")
 
     def preprocess(self) -> None:
         if not os.path.isfile(self.game.texture_schema):
@@ -117,8 +120,10 @@ class Texture(Component):
         self.layers = [self.Layer.from_json(layer) for layer in layers_schema]
         self.logger.info("Loaded %s layers.", len(self.layers))
 
-        self._weights_dir = os.path.join(self.map_directory, "maps", "map", "data")
+        self._weights_dir = self.game.weights_dir_path(self.map_directory)
+        self.logger.debug("Weights directory: %s.", self._weights_dir)
         self.info_save_path = os.path.join(self.map_directory, "generation_info.json")
+        self.logger.debug("Generation info save path: %s.", self.info_save_path)
 
     def process(self):
         self._prepare_weights()
@@ -192,25 +197,24 @@ class Texture(Component):
         self.logger.debug("Starting preparing weights from %s layers.", len(self.layers))
 
         for layer in self.layers:
-            self._generate_weights(layer.name, layer.count)
+            self._generate_weights(layer)
         self.logger.debug("Prepared weights for %s layers.", len(self.layers))
 
-    def _generate_weights(self, texture_name: str, layer_numbers: int) -> None:
+    def _generate_weights(self, layer: Layer) -> None:
         """Generates weight files for textures. Each file is a numpy array of zeros and
             dtype uint8 (0-255).
 
         Args:
-            texture_name (str): Name of the texture.
-            layer_numbers (int): Number of layers in the texture.
+            layer (Layer): Layer with textures and tags.
         """
         size = (self.map_height, self.map_width)
-        postfix = "_weight.png"
-        if layer_numbers == 0:
-            filepaths = [os.path.join(self._weights_dir, texture_name + postfix)]
+        postfix = "_weight.png" if not layer.exclude_weight else ".png"
+        if layer.count == 0:
+            filepaths = [os.path.join(self._weights_dir, layer.name + postfix)]
         else:
             filepaths = [
-                os.path.join(self._weights_dir, texture_name + str(i).zfill(2) + postfix)
-                for i in range(1, layer_numbers + 1)
+                os.path.join(self._weights_dir, layer.name + str(i).zfill(2) + postfix)
+                for i in range(1, layer.count + 1)
             ]
 
         for filepath in filepaths:
@@ -403,13 +407,16 @@ class Texture(Component):
             preview_size,
         )
 
+        active_layers = [layer for layer in self.layers if layer.tags is not None]
+        self.logger.debug("Following layers have tag textures: %s.", len(active_layers))
+
         images = [
             cv2.resize(
                 cv2.imread(layer.path(self._weights_dir), cv2.IMREAD_UNCHANGED), preview_size
             )
-            for layer in self.layers
+            for layer in active_layers
         ]
-        colors = [layer.color for layer in self.layers]
+        colors = [layer.color for layer in active_layers]
         color_images = []
         for img, color in zip(images, colors):
             color_img = np.zeros((img.shape[0], img.shape[1], 3), dtype=np.uint8)

{maps4fs-0.7.3.dist-info → maps4fs-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.7.3
+Version: 0.7.5
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -47,9 +47,7 @@ Requires-Dist: tqdm
 🌍 Based on real-world data from OpenStreetMap<br>
 🏞️ Generates height using SRTM dataset<br>
 📦 Provides a ready-to-use map template for the Giants Editor<br>
-🚜 Supports Farming Simulator 22 and 25*<br>
-
-\* changes in the library are ready, waiting for the Giants to release the Giants Editor v10. Meanwhile the option to generate a map for FS25 is disabled.
+🚜 Supports Farming Simulator 22 and 25<br>
 
 ## Quick Start
 There are several ways to use the tool. You obviously need the **first one**, but you can choose any of the others depending on your needs.<br>
@@ -172,13 +170,14 @@ The map will be saved in the `map_directory` directory.
 The project is based on the [OpenStreetMap](https://www.openstreetmap.org/) data. So, refer to [this page](https://wiki.openstreetmap.org/wiki/Map_Features) to understand the list below.
 - "building": True
 - "highway": ["motorway", "trunk", "primary"]
-- "highway": ["secondary", "tertiary", "road"]
+- "highway": ["secondary", "tertiary", "road", "service"]
 - "highway": ["unclassified", "residential", "track"]
-- "natural": "grassland"
+- "natural": ["grassland", "scrub"]
 - "landuse": "farmland"
 - "natural": ["water"]
 - "waterway": True
 - "natural": ["wood", "tree_row"]
+- "railway": True
 
 The list will be updated as the project develops.
 

maps4fs-0.7.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+maps4fs/__init__.py,sha256=da4jmND2Ths9AffnkAKgzLHNkvKFOc_l21gJisPXqWY,155
+maps4fs/logger.py,sha256=CneeHxQywjNUJXqQrUUSeiDxu95FfrfyK_Si1v0gMZ8,1477
+maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/component.py,sha256=BU_HNNyKXuEBohQJRTlXmNdSNrjolwX-ZzqqSSuzTrE,3463
+maps4fs/generator/config.py,sha256=luDYXkKjgOM4-Mft4mHDPP6v-DVIUyWZAMAsCKyvaoY,2108
+maps4fs/generator/dem.py,sha256=5DyQtAceWfL3ciIkovFx21X1gcBVyhWUmI3tJo-3DKE,10553
+maps4fs/generator/game.py,sha256=dfbLyu1yqbHkBWmJu1uANCX-84vkdlvqR6hA6JCiIsE,6107
+maps4fs/generator/map.py,sha256=zLIFAjjz-Y7u_FG-UjYoGiqBreLwuverkYY8Er9L_Qg,3796
+maps4fs/generator/texture.py,sha256=cEXQOLJ5Iq_Nb0C9OmU-9PR-E_5cgM1Q62kG49G3VNg,16019
+maps4fs-0.7.5.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
+maps4fs-0.7.5.dist-info/METADATA,sha256=wJSatoEwVhXxQxUmlfoBJ4LZ5BI83Pt5SBqboyzVCog,11844
+maps4fs-0.7.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-0.7.5.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-0.7.5.dist-info/RECORD,,

{maps4fs-0.7.3.dist-info → maps4fs-0.7.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

maps4fs-0.7.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-maps4fs/__init__.py,sha256=da4jmND2Ths9AffnkAKgzLHNkvKFOc_l21gJisPXqWY,155
-maps4fs/logger.py,sha256=CneeHxQywjNUJXqQrUUSeiDxu95FfrfyK_Si1v0gMZ8,1477
-maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/component.py,sha256=BU_HNNyKXuEBohQJRTlXmNdSNrjolwX-ZzqqSSuzTrE,3463
-maps4fs/generator/config.py,sha256=luDYXkKjgOM4-Mft4mHDPP6v-DVIUyWZAMAsCKyvaoY,2108
-maps4fs/generator/dem.py,sha256=EJBXHZ0_G9nXZ-b1PmR9mjIdXjbKlYEUv-4IDGJPmdc,9779
-maps4fs/generator/game.py,sha256=IyXjNEC5epJmDdqjsrl4wKL85T1F23km73pUkBiuDWU,4468
-maps4fs/generator/map.py,sha256=Oyu45ONmSluidaUErsU6n28pqI-XYx1eVfPT9FurCTE,3522
-maps4fs/generator/texture.py,sha256=W2tMkCxyD7qesSuutPJ3N5InDza2Dzi5_yzewSl9e-E,15615
-maps4fs-0.7.3.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
-maps4fs-0.7.3.dist-info/METADATA,sha256=LimQqtHMDbvCq_hUNZg8ZmxHSIk-g8G6DRJ7Etu8F7E,11961
-maps4fs-0.7.3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-maps4fs-0.7.3.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-0.7.3.dist-info/RECORD,,