maps4fs 1.8.173__tar.gz → 1.8.175__tar.gz

{maps4fs-1.8.173 → maps4fs-1.8.175}/PKG-INFO

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

{maps4fs-1.8.173 → maps4fs-1.8.175}/maps4fs/generator/component/base/component.py

@@ -73,12 +73,8 @@ class Component:
         self.preprocess()
 
     def preprocess(self) -> None:
-        """Prepares the component for processing. Must be implemented in the child class.
-
-        Raises:
-            NotImplementedError: If the method is not implemented in the child class.
-        """
-        raise NotImplementedError
+        """Prepares the component for processing. Must be implemented in the child class."""
+        return
 
     def process(self) -> None:
         """Launches the component processing. Must be implemented in the child class.

{maps4fs-1.8.173 → maps4fs-1.8.175}/maps4fs/generator/component/base/component_image.py

@@ -1,9 +1,12 @@
 """Base class for all components that primarily used to work with images."""
 
+import os
+
 import cv2
 import numpy as np
 
 from maps4fs.generator.component.base.component import Component
+from maps4fs.generator.settings import Parameters
 
 
 class ImageComponent(Component):
@@ -88,3 +91,28 @@ class ImageComponent(Component):
 
         image[mask] = image[mask] - subtract_by
         return image
+
+    @staticmethod
+    def resize_to_preview(image_path: str, save_path: str) -> None:
+        """Resizes an image to the preview size.
+
+        Arguments:
+            image_path (str): The path to the image.
+            save_path (str): The path to save the resized image.
+        """
+        if not os.path.isfile(image_path):
+            return
+
+        image = cv2.imread(image_path)
+        if image is None:
+            return
+
+        if (
+            image.shape[0] > Parameters.PREVIEW_MAXIMUM_SIZE
+            or image.shape[1] > Parameters.PREVIEW_MAXIMUM_SIZE
+        ):
+            image = cv2.resize(
+                image, (Parameters.PREVIEW_MAXIMUM_SIZE, Parameters.PREVIEW_MAXIMUM_SIZE)
+            )
+
+        cv2.imwrite(save_path, image)

maps4fs-1.8.175/maps4fs/generator/component/satellite.py

@@ -0,0 +1,135 @@
+"""This module contains the Satellite class for the maps4fs package to download satellite images
+for the map."""
+
+import os
+import shutil
+from typing import NamedTuple
+
+from pygmdl import save_image
+
+from maps4fs.generator.component.base.component_image import ImageComponent
+from maps4fs.generator.settings import Parameters
+
+
+class SatelliteImage(NamedTuple):
+    """Named tuple for the satellite image download task.
+
+    Attributes:
+        lat (float): The latitude of the center of the map.
+        lon (float): The longitude of the center of the map.
+        size (int): The size of the map in pixels.
+        output_path (str): The path where to save the image.
+        rotation (int): The rotation angle of the map.
+        zoom (int): The zoom level of the map.
+        copy_from (str | None): If saving should be skipped and the image should be copied from
+            another file.
+    """
+
+    lat: float
+    lon: float
+    size: int
+    output_path: str
+    rotation: int
+    zoom: int
+    copy_from: str | None = None
+
+
+class Satellite(ImageComponent):
+    """Component for to download satellite images for the map.
+
+    Arguments:
+        game (Game): The game instance for which the map is generated.
+        coordinates (tuple[float, float]): The latitude and longitude of the center of the map.
+        map_size (int): The size of the map in pixels.
+        map_rotated_size (int): The size of the map in pixels after rotation.
+        rotation (int): The rotation angle of the map.
+        map_directory (str): The directory where the map files are stored.
+        logger (Any, optional): The logger to use. Must have at least three basic methods: debug,
+            info, warning. If not provided, default logging will be used.
+    """
+
+    def process(self) -> None:
+        """Downloads the satellite images for the map."""
+        self.image_paths = []
+        if not self.map.satellite_settings.download_images:
+            self.logger.debug("Satellite images download is disabled.")
+            return
+
+        margin = self.map.satellite_settings.satellite_margin
+        overview_size = (self.map_size + margin) * 2
+        overwiew_path = os.path.join(self.satellite_directory, "satellite_overview.png")
+
+        background_size = self.map_size + (Parameters.BACKGROUND_DISTANCE + margin) * 2
+        background_path = os.path.join(self.satellite_directory, "satellite_background.png")
+
+        sizes = [overview_size, background_size]
+        self.image_paths = [overwiew_path, background_path]
+
+        tasks = self.get_tasks(sizes, self.image_paths)
+
+        for task in tasks:
+            try:
+                if task.copy_from and os.path.isfile(task.copy_from):
+                    shutil.copy(task.copy_from, task.output_path)
+                    continue
+
+                save_image(
+                    task.lat,
+                    task.lon,
+                    task.size,
+                    output_path=task.output_path,
+                    rotation=task.rotation,
+                    zoom=task.zoom,
+                    from_center=True,
+                    logger=self.logger,
+                )
+
+            except Exception as e:
+                self.logger.error(f"Failed to download satellite image: {e}")
+                continue
+
+    def get_tasks(self, sizes: list[int], save_paths: list[str]) -> list[SatelliteImage]:
+        """Prepares the tasks for downloading the satellite images.
+
+        Arguments:
+            sizes (list[int]): The sizes of the images to download.
+            save_paths (list[str]): The paths where to save the images.
+
+        Returns:
+            list[SatelliteImage]: The list of tasks for downloading the satellite images.
+        """
+        tasks: list[SatelliteImage] = []
+
+        for size, save_path in zip(sizes, save_paths):
+            # Check if in tasks there's already a task with the same size.
+            existing_task = next((t for t in tasks if t.size == size), None)
+            copy_from = existing_task.output_path if existing_task else None
+
+            lat, lon = self.coordinates
+            tasks.append(
+                SatelliteImage(
+                    lat=lat,
+                    lon=lon,
+                    size=size,
+                    output_path=save_path,
+                    rotation=self.rotation,
+                    zoom=self.map.satellite_settings.zoom_level,
+                    copy_from=copy_from,
+                )
+            )
+
+        return tasks
+
+    def previews(self) -> list[str]:
+        """Returns the paths to the preview images.
+
+        Returns:
+            list[str]: List of paths to the preview images.
+        """
+        previews = []
+        for image_path in self.image_paths:
+            preview_path = os.path.join(self.previews_directory, os.path.basename(image_path))
+            self.resize_to_preview(image_path, preview_path)
+            previews.append(preview_path)
+
+        return previews

{maps4fs-1.8.173 → maps4fs-1.8.175}/maps4fs/generator/game.py

@@ -10,7 +10,7 @@ from maps4fs.generator.component.background import Background
 from maps4fs.generator.component.config import Config
 from maps4fs.generator.component.grle import GRLE
 from maps4fs.generator.component.i3d import I3d
-from maps4fs.generator.satellite import Satellite
+from maps4fs.generator.component.satellite import Satellite
 from maps4fs.generator.texture import Texture
 
 working_directory = os.getcwd()

{maps4fs-1.8.173 → maps4fs-1.8.175}/maps4fs.egg-info/PKG-INFO

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

{maps4fs-1.8.173 → maps4fs-1.8.175}/maps4fs.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ maps4fs/generator/dem.py
 maps4fs/generator/game.py
 maps4fs/generator/map.py
 maps4fs/generator/qgis.py
-maps4fs/generator/satellite.py
 maps4fs/generator/settings.py
 maps4fs/generator/texture.py
 maps4fs/generator/component/__init__.py
@@ -21,6 +20,7 @@ maps4fs/generator/component/background.py
 maps4fs/generator/component/config.py
 maps4fs/generator/component/grle.py
 maps4fs/generator/component/i3d.py
+maps4fs/generator/component/satellite.py
 maps4fs/generator/component/base/__init__.py
 maps4fs/generator/component/base/component.py
 maps4fs/generator/component/base/component_image.py

{maps4fs-1.8.173 → maps4fs-1.8.175}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "1.8.173"
+version = "1.8.175"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "MIT License"}

maps4fs-1.8.173/maps4fs/generator/satellite.py

@@ -1,91 +0,0 @@
-"""This module contains the Satellite class for the maps4fs package to download satellite images
-for the map."""
-
-import os
-
-import cv2
-from pygmdl import save_image  # type: ignore
-
-from maps4fs.generator.component.base.component import Component
-from maps4fs.generator.settings import Parameters
-from maps4fs.generator.texture import PREVIEW_MAXIMUM_SIZE
-
-
-# pylint: disable=W0223
-class Satellite(Component):
-    """Component for to download satellite images for the map.
-
-    Arguments:
-        game (Game): The game instance for which the map is generated.
-        coordinates (tuple[float, float]): The latitude and longitude of the center of the map.
-        map_size (int): The size of the map in pixels.
-        map_rotated_size (int): The size of the map in pixels after rotation.
-        rotation (int): The rotation angle of the map.
-        map_directory (str): The directory where the map files are stored.
-        logger (Any, optional): The logger to use. Must have at least three basic methods: debug,
-            info, warning. If not provided, default logging will be used.
-    """
-
-    def preprocess(self) -> None:
-        """This component does not require any preprocessing."""
-        return
-
-    def process(self) -> None:
-        """Downloads the satellite images for the map."""
-        self.image_paths = []  # pylint: disable=W0201
-        if not self.map.satellite_settings.download_images:
-            self.logger.debug("Satellite images download is disabled.")
-            return
-
-        margin = self.map.satellite_settings.satellite_margin
-        overview_size = (self.map_size + margin) * 2
-        overwiew_path = os.path.join(self.satellite_directory, "satellite_overview.png")
-
-        background_size = self.map_size + (Parameters.BACKGROUND_DISTANCE + margin) * 2
-        background_path = os.path.join(self.satellite_directory, "satellite_background.png")
-
-        sizes = [overview_size, background_size]
-        self.image_paths = [overwiew_path, background_path]  # pylint: disable=W0201
-
-        for size, path in zip(sizes, self.image_paths):
-            try:
-                lat, lon = self.coordinates
-                zoom = self.map.satellite_settings.zoom_level
-                save_image(
-                    lat,
-                    lon,
-                    size,
-                    output_path=path,
-                    rotation=self.rotation,
-                    zoom=zoom,
-                    from_center=True,
-                    logger=self.logger,
-                )
-            except Exception as e:  # pylint: disable=W0718
-                self.logger.error(f"Failed to download satellite image: {e}")
-                continue
-
-    def previews(self) -> list[str]:
-        """Returns the paths to the preview images.
-
-        Returns:
-            list[str]: List of paths to the preview images.
-        """
-        previews = []
-        for image_path in self.image_paths:
-            if not os.path.isfile(image_path):
-                self.logger.warning(f"File {image_path} does not exist.")
-                continue
-            image = cv2.imread(image_path)
-            if image is None:
-                self.logger.warning(f"Failed to read image from {image_path}")
-                continue
-
-            if image.shape[0] > PREVIEW_MAXIMUM_SIZE or image.shape[1] > PREVIEW_MAXIMUM_SIZE:
-                image = cv2.resize(image, (PREVIEW_MAXIMUM_SIZE, PREVIEW_MAXIMUM_SIZE))
-
-            preview_path = os.path.join(self.previews_directory, os.path.basename(image_path))
-            cv2.imwrite(preview_path, image)
-            previews.append(preview_path)
-
-        return previews