maps4fs 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

maps4fs/generator/background.py

@@ -15,7 +15,7 @@ from maps4fs.generator.dem import (
     DEFAULT_MULTIPLIER,
     DEFAULT_PLATEAU,
 )
-from maps4fs.generator.path_steps import DEFAULT_DISTANCE, PATH_FULL_NAME, get_steps
+from maps4fs.generator.path_steps import PATH_FULL_NAME, get_steps
 from maps4fs.generator.tile import Tile
 
 RESIZE_FACTOR = 1 / 4
@@ -242,119 +242,21 @@ class Background(Component):
 
         self.stl_preview_path = preview_path  # pylint: disable=attribute-defined-outside-init
 
+    # pylint: disable=no-member
     def previews(self) -> list[str]:
-        """Generates a preview by combining all tiles into one image.
-        NOTE: The map itself is not included in the preview, so it will be empty.
+        """Returns the path to the image of full tile and the path to the STL preview file.
 
         Returns:
-            list[str] -- A list of paths to the preview images."""
-
-        self.logger.info("Generating a preview image for the background DEM")
-
-        image_height = self.map_height + DEFAULT_DISTANCE * 2
-        image_width = self.map_width + DEFAULT_DISTANCE * 2
-        self.logger.debug("Full size of the preview image: %s x %s", image_width, image_height)
-
-        image = np.zeros((image_height, image_width), np.uint16)  # pylint: disable=no-member
-        self.logger.debug("Empty image created: %s", image.shape)
-
-        for tile in self.tiles:
-            # pylint: disable=no-member
-            if tile.code == PATH_FULL_NAME:
-                continue
-            tile_image = cv2.imread(tile.dem_path, cv2.IMREAD_UNCHANGED)
-
-            self.logger.debug(
-                "Tile %s image shape: %s, dtype: %s, max: %s, min: %s",
-                tile.code,
-                tile_image.shape,
-                tile_image.dtype,
-                tile_image.max(),
-                tile_image.min(),
-            )
-
-            tile_height, tile_width = tile_image.shape
-            self.logger.debug("Tile %s size: %s x %s", tile.code, tile_width, tile_height)
-
-            # Calculate the position based on the tile code
-            if tile.code == "N":
-                x = DEFAULT_DISTANCE
-                y = 0
-            elif tile.code == "NE":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = 0
-            elif tile.code == "E":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = DEFAULT_DISTANCE
-            elif tile.code == "SE":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "S":
-                x = DEFAULT_DISTANCE
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "SW":
-                x = 0
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "W":
-                x = 0
-                y = DEFAULT_DISTANCE
-            elif tile.code == "NW":
-                x = 0
-                y = 0
-
-            # pylint: disable=possibly-used-before-assignment
-            x2 = x + tile_width
-            y2 = y + tile_height
-
-            self.logger.debug(
-                "Tile %s position. X from %s to %s, Y from %s to %s", tile.code, x, x2, y, y2
+            list[str] -- A list of paths to the previews.
+        """
+        full_tile = next((tile for tile in self.tiles if tile.code == PATH_FULL_NAME), None)
+        if full_tile:
+            preview_path = os.path.join(self.previews_directory, "background_dem.png")
+            full_tile_image = cv2.imread(full_tile.dem_path, cv2.IMREAD_UNCHANGED)
+            full_tile_image = cv2.normalize(  # type: ignore
+                full_tile_image, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U
             )
-
-            # pylint: disable=possibly-used-before-assignment
-            image[y:y2, x:x2] = tile_image
-
-        # Save image to the map directory.
-        preview_path = os.path.join(self.previews_directory, "background_dem.png")
-
-        # pylint: disable=no-member
-        image = cv2.normalize(image, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)  # type: ignore
-        image = cv2.cvtColor(image, cv2.COLOR_GRAY2BGR)  # type: ignore
-        cv2.imwrite(preview_path, image)
-
-        return [preview_path, self.stl_preview_path]
-
-
-# Creates tiles around the map.
-# The one on corners 2048x2048, on sides and in the middle map_size x 2048.
-# So 2048 is a distance FROM the edge of the map, but the other size depends on the map size.
-# But for corner tiles it's always 2048.
-
-# In the beginning we have coordinates of the central point of the map and it's size.
-# We need to calculate the coordinates of central points all 8 tiles around the map.
-
-# Latitude is a vertical line, Longitude is a horizontal line.
-
-#                         2048
-#                     |         |
-# ____________________|_________|___
-# |         |         |         |
-# |    NW   |    N    |    NE   |    2048
-# |_________|_________|_________|___
-# |         |         |         |
-# |    W    |    C    |    E    |
-# |_________|_________|_________|
-# |         |         |         |
-# |    SW   |    S    |    SE   |
-# |_________|_________|_________|
-#
-# N = C map_height / 2 + 1024; N_width = map_width; N_height = 2048
-# NW = N - map_width / 2 - 1024; NW_width = 2048; NW_height = 2048
-# and so on...
-
-# lat, lon = 45.28565000315636, 20.237121355049904
-# dst = 1024
-
-# # N
-# destination = distance(meters=dst).destination((lat, lon), 0)
-# lat, lon = destination.latitude, destination.longitude
-# print(lat, lon)
+            full_tile_image = cv2.cvtColor(full_tile_image, cv2.COLOR_GRAY2BGR)
+            cv2.imwrite(preview_path, full_tile_image)
+            return [preview_path, self.stl_preview_path]
+        return [self.stl_preview_path]

maps4fs/generator/component.py

@@ -184,10 +184,10 @@ class Component:
         height_distance = height_distance or int(self.map_height / 2)
         width_distance = width_distance or int(self.map_width / 2)
 
-        north, south, _, _ = ox.utils_geo.bbox_from_point(
+        west, south, _, _ = ox.utils_geo.bbox_from_point(  # type: ignore
             coordinates, dist=height_distance, project_utm=project_utm
         )
-        _, _, east, west = ox.utils_geo.bbox_from_point(
+        _, _, east, north = ox.utils_geo.bbox_from_point(  # type: ignore
             coordinates, dist=width_distance, project_utm=project_utm
         )
         bbox = north, south, east, west

maps4fs/generator/dem.py

@@ -319,7 +319,7 @@ class DEM(Component):
     def _save_empty_dem(self, dem_output_resolution: tuple[int, int]) -> None:
         """Saves empty DEM file filled with zeros."""
         dem_data = np.zeros(dem_output_resolution, dtype="uint16")
-        cv2.imwrite(self._dem_path, dem_data)  # pylint: disable=no-member
+        cv2.imwrite(self._dem_path, dem_data)
         self.logger.warning("DEM data filled with zeros and saved to %s.", self._dem_path)
 
     def grayscale_preview(self) -> str:
@@ -329,7 +329,6 @@ class DEM(Component):
         Returns:
             str: Path to the preview image.
         """
-        # rgb_dem_path = self._dem_path.replace(".png", "_grayscale.png")
         grayscale_dem_path = os.path.join(self.previews_directory, "dem_grayscale.png")
 
         self.logger.debug("Creating grayscale preview of DEM data in %s.", grayscale_dem_path)
@@ -346,8 +345,6 @@ class DEM(Component):
         Returns:
             list[str]: List with a single path to the DEM file
         """
-
-        # colored_dem_path = self._dem_path.replace(".png", "_colored.png")
         colored_dem_path = os.path.join(self.previews_directory, "dem_colored.png")
 
         self.logger.debug("Creating colored preview of DEM data in %s.", colored_dem_path)

maps4fs/generator/texture.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import json
 import os
-import warnings
 from collections import defaultdict
 from typing import Any, Callable, Generator, Optional
 
@@ -540,14 +539,12 @@ class Texture(Component):
             Generator[np.ndarray, None, None]: Numpy array of polygon points.
         """
         try:
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", DeprecationWarning)
-                objects = ox.features_from_bbox(bbox=self.bbox, tags=tags)
+            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)
             return
-        objects_utm = ox.project_gdf(objects, to_latlong=False)
+        objects_utm = ox.projection.project_gdf(objects, to_latlong=False)
         self.logger.debug("Fetched %s elements for tags: %s.", len(objects_utm), tags)
 
         for _, obj in objects_utm.iterrows():
@@ -610,6 +607,7 @@ class Texture(Component):
             merged.dtype,
         )
         preview_path = os.path.join(self.previews_directory, "textures_osm.png")
-        cv2.imwrite(preview_path, merged)  # pylint: disable=no-member
+
+        cv2.imwrite(preview_path, merged)  # type: ignore
         self.logger.info("Preview saved to %s.", preview_path)
         return preview_path

{maps4fs-1.0.0.dist-info → maps4fs-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.0.0
+Version: 1.0.2
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: opencv-python
-Requires-Dist: osmnx<2.0.0
+Requires-Dist: osmnx>=2.0.0
 Requires-Dist: rasterio
 Requires-Dist: folium
 Requires-Dist: geopy

{maps4fs-1.0.0.dist-info → maps4fs-1.0.2.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=h6zyqMc51eOD8_Jbe8eP9DJFy27-XItzIOVEThQKFdk,14011
-maps4fs/generator/component.py,sha256=gtb_p_cHfRgOQwCLCxmQPNObuipqvmGaGAct7KUxAtI,11053
+maps4fs/generator/background.py,sha256=VGzKELm6W1k3NFA8akaDWlw20kcyiK68j705jDroGoM,10517
+maps4fs/generator/component.py,sha256=swOocaEOP3XtZgHfgDJ0ROALWoLgCJwMq8ubl0d2WrI,11085
 maps4fs/generator/config.py,sha256=qomeSaHNgSYvRyPbGkyDjgAxU1jUMND8wESuy9uXcV4,4280
-maps4fs/generator/dem.py,sha256=aU0syr7pu81hd6oVn1rjQoDsDAYJro-58i1STTUz3jw,17167
+maps4fs/generator/dem.py,sha256=_VbQ5M7xGCtG27EHKzKkjIxMR58ghfbu7H89txNw5gg,16987
 maps4fs/generator/game.py,sha256=3Y65K-XQDKxfMRSrjsmE8qX0tQSd0aDzMUT6yGIhzXg,7450
 maps4fs/generator/grle.py,sha256=kyFiGu-2aXrLVB_8GeXlGvG5ULwlSVuqU1yfpt_0br4,3134
 maps4fs/generator/i3d.py,sha256=nlmI8SdzzKMOGQRvoZp7Pxo6lzm1jneoYNoL24v84zw,14281
 maps4fs/generator/map.py,sha256=1EJfq5928xbV7v9vBBuoC3VpD5gC1SMDBTQ7geH6yaA,4678
 maps4fs/generator/path_steps.py,sha256=yeN6hmOD8O2LMozUf4HcQMIy8WJ5sHF5pGQT_s2FfOw,3147
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/texture.py,sha256=uSuqJyZom861_BO-3aUqU8_OkroExmN25PsRBjdddkw,23799
+maps4fs/generator/texture.py,sha256=FnCagiGyeCb_lIqOTHgHISZo17A_E9kHqGeUhqz_iZY,23670
 maps4fs/generator/tile.py,sha256=_UZ-iHGPghUfpYcG0OboquNczpZ1FaCVYpBgNLd72eo,2160
 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.0.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.0.0.dist-info/METADATA,sha256=x6wxcTW4FKrS_F7hrak7CcnB8aXCQ06MPkeR18YpjCM,26085
-maps4fs-1.0.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.0.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.0.0.dist-info/RECORD,,
+maps4fs-1.0.2.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.0.2.dist-info/METADATA,sha256=q04E_4Lu70zOHE_U0wz56CpzNtw_XyuxF4JqL5wwf94,26086
+maps4fs-1.0.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.0.2.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.0.2.dist-info/RECORD,,