maps4fs 1.8.195__tar.gz → 1.8.197__tar.gz

{maps4fs-1.8.195 → maps4fs-1.8.197}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.195
+Version: 1.8.197
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -263,8 +263,7 @@ import maps4fs as mfs
 game_code = "fs25"
 game = mfs.Game.from_code(game_code)
 
-dtm_provider = mfs.SRTM30Provider
-dtm_provider_settings = mfs.SRTM30ProviderSettings(easy_mode=True, power_factor=0)
+dtm_provider = mfs.dtm.SRTM30Provider
 
 lat, lon = 45.28, 20.23
 coordinates = (lat, lon)
@@ -277,7 +276,7 @@ os.makedirs(map_directory, exist_ok=True)
 mp = mfs.Map(
     game,
     dtm_provider,
-    dtm_provider_settings,
+    None,
     coordinates,
     size,
     rotation,

{maps4fs-1.8.195 → maps4fs-1.8.197}/README.md

@@ -233,8 +233,7 @@ import maps4fs as mfs
 game_code = "fs25"
 game = mfs.Game.from_code(game_code)
 
-dtm_provider = mfs.SRTM30Provider
-dtm_provider_settings = mfs.SRTM30ProviderSettings(easy_mode=True, power_factor=0)
+dtm_provider = mfs.dtm.SRTM30Provider
 
 lat, lon = 45.28, 20.23
 coordinates = (lat, lon)
@@ -247,7 +246,7 @@ os.makedirs(map_directory, exist_ok=True)
 mp = mfs.Map(
     game,
     dtm_provider,
-    dtm_provider_settings,
+    None,
     coordinates,
     size,
     rotation,

maps4fs-1.8.197/maps4fs/__init__.py

@@ -0,0 +1,8 @@
+# pylint: disable=missing-module-docstring
+import maps4fs.generator.component as component
+import maps4fs.generator.dtm as dtm
+import maps4fs.generator.settings as settings
+from maps4fs.generator.dtm.dtm import DTMProvider
+from maps4fs.generator.game import Game
+from maps4fs.generator.map import Map
+from maps4fs.logger import Logger

maps4fs-1.8.197/maps4fs/generator/component/__init__.py

@@ -0,0 +1,9 @@
+# pylint: disable=missing-module-docstring
+from maps4fs.generator.component.background import Background
+from maps4fs.generator.component.base.component import Component
+from maps4fs.generator.component.config import Config
+from maps4fs.generator.component.grle import GRLE
+from maps4fs.generator.component.i3d import I3d
+from maps4fs.generator.component.layer import Layer
+from maps4fs.generator.component.satellite import Satellite
+from maps4fs.generator.component.texture import Texture

{maps4fs-1.8.195/maps4fs → maps4fs-1.8.197/maps4fs/generator/dtm}/__init__.py

@@ -1,38 +1,24 @@
 # pylint: disable=missing-module-docstring
-from maps4fs.generator.dtm.dtm import DTMProvider
-from maps4fs.generator.dtm.srtm import SRTM30Provider, SRTM30ProviderSettings
-from maps4fs.generator.dtm.usgs_wcs import USGSWCSProvider
-from maps4fs.generator.dtm.nrw import NRWProvider
+from maps4fs.generator.dtm.arctic import ArcticProvider
+from maps4fs.generator.dtm.baden import BadenWurttembergProvider
 from maps4fs.generator.dtm.bavaria import BavariaProvider
-from maps4fs.generator.dtm.niedersachsen import NiedersachsenProvider
-from maps4fs.generator.dtm.hessen import HessenProvider
-from maps4fs.generator.dtm.england import England1MProvider
 from maps4fs.generator.dtm.canada import CanadaProvider
-from maps4fs.generator.dtm.scotland import ScotlandProvider
+from maps4fs.generator.dtm.czech import CzechProvider
+from maps4fs.generator.dtm.denmark import DenmarkProvider
+from maps4fs.generator.dtm.england import England1MProvider
 from maps4fs.generator.dtm.finland import FinlandProvider
-from maps4fs.generator.dtm.italy import ItalyProvider
 from maps4fs.generator.dtm.flanders import FlandersProvider
-from maps4fs.generator.dtm.spain import SpainProvider
 from maps4fs.generator.dtm.france import FranceProvider
-from maps4fs.generator.dtm.norway import NorwayProvider
-from maps4fs.generator.dtm.denmark import DenmarkProvider
-from maps4fs.generator.dtm.switzerland import SwitzerlandProvider
+from maps4fs.generator.dtm.hessen import HessenProvider
+from maps4fs.generator.dtm.italy import ItalyProvider
 from maps4fs.generator.dtm.mv import MecklenburgVorpommernProvider
-from maps4fs.generator.dtm.baden import BadenWurttembergProvider
-from maps4fs.generator.dtm.arctic import ArcticProvider
+from maps4fs.generator.dtm.niedersachsen import NiedersachsenProvider
+from maps4fs.generator.dtm.norway import NorwayProvider
+from maps4fs.generator.dtm.nrw import NRWProvider
 from maps4fs.generator.dtm.rema import REMAProvider
-from maps4fs.generator.dtm.czech import CzechProvider
 from maps4fs.generator.dtm.sachsenanhalt import SachsenAnhaltProvider
-from maps4fs.generator.game import Game
-from maps4fs.generator.map import Map
-from maps4fs.generator.settings import (
-    BackgroundSettings,
-    DEMSettings,
-    GRLESettings,
-    I3DSettings,
-    SatelliteSettings,
-    SettingsModel,
-    SplineSettings,
-    TextureSettings,
-)
-from maps4fs.logger import Logger
+from maps4fs.generator.dtm.scotland import ScotlandProvider
+from maps4fs.generator.dtm.spain import SpainProvider
+from maps4fs.generator.dtm.srtm import SRTM30Provider
+from maps4fs.generator.dtm.switzerland import SwitzerlandProvider
+from maps4fs.generator.dtm.usgs_wcs import USGSWCSProvider

{maps4fs-1.8.195 → maps4fs-1.8.197}/maps4fs/generator/dtm/dtm.py

@@ -78,15 +78,28 @@ class DTMProvider(ABC):
 
     @classmethod
     def name(cls) -> str | None:
-        """Name of the provider."""
+        """Name of the provider.
+
+        Returns:
+            str: Provider name.
+        """
         return cls._name
 
+    @classmethod
+    def code(cls) -> str | None:
+        """Code of the provider.
+
+        Returns:
+            str: Provider code.
+        """
+        return cls._code
+
     @property
     def data_info(self) -> dict[str, int | str | float] | None:
         """Information about the DTM data.
 
         Returns:
-            dict: Information about the DTM data.
+            dict[str, int | str | float] | None: Information about the DTM data.
         """
         return self._data_info
 
@@ -95,7 +108,7 @@ class DTMProvider(ABC):
         """Set information about the DTM data.
 
         Arguments:
-            value (dict): Information about the DTM data.
+            value (dict[str, int | str | float] | None): Information about the DTM data.
         """
         self._data_info = value
 
@@ -104,7 +117,7 @@ class DTMProvider(ABC):
         """Coordinates of the center point of the DTM data.
 
         Returns:
-            tuple: Latitude and longitude of the center point.
+            tuple[float, float]: Coordinates of the center point of the DTM data.
         """
         return self._coordinates
 
@@ -119,11 +132,22 @@ class DTMProvider(ABC):
 
     @property
     def url(self) -> str | None:
-        """URL of the provider."""
+        """URL of the provider.
+
+        Returns:
+            str: URL of the provider or None if not defined.
+        """
         return self._url
 
     def formatted_url(self, **kwargs) -> str:
-        """Formatted URL of the provider."""
+        """Formatted URL of the provider.
+
+        Arguments:
+            **kwargs: Keyword arguments to format the URL.
+
+        Returns:
+            str: Formatted URL of the provider.
+        """
         if not self.url:
             raise ValueError("URL must be defined.")
         return self.url.format(**kwargs)
@@ -220,7 +244,7 @@ class DTMProvider(ABC):
             DTMProvider: Provider class or None if not found.
         """
         for provider in cls.__subclasses__():
-            if provider._code == code:  # pylint: disable=W0212
+            if provider.code() == code:
                 return provider
         return None
 
@@ -232,12 +256,13 @@ class DTMProvider(ABC):
         Returns:
             dict: Provider descriptions.
         """
-        providers = {}
+        providers: dict[str, str] = {}
         for provider in cls.__subclasses__():
-            # pylint: disable=W0212
-            if not provider._is_base and provider.inside_bounding_box(lat_lon):
-                providers[provider._code] = provider.description()  # pylint: disable=W0212
-        return providers  # type: ignore
+            if not provider.is_base() and provider.inside_bounding_box(lat_lon):
+                code = provider.code()
+                if code is not None:
+                    providers[code] = provider.description()
+        return providers
 
     @classmethod
     def inside_bounding_box(cls, lat_lon: tuple[float, float]) -> bool:

{maps4fs-1.8.195 → maps4fs-1.8.197}/maps4fs/generator/dtm/srtm.py

@@ -9,13 +9,7 @@ import shutil
 
 import requests
 
-from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
-
-
-class SRTM30ProviderSettings(DTMProviderSettings):
-    """Settings for SRTM 30m provider."""
-
-    test: int = 10
+from maps4fs.generator.dtm.dtm import DTMProvider
 
 
 class SRTM30Provider(DTMProvider):
@@ -31,8 +25,6 @@ class SRTM30Provider(DTMProvider):
 
     _author = "[iwatkot](https://github.com/iwatkot)"
 
-    _settings = SRTM30ProviderSettings
-
     _instructions = "ℹ️ Recommended settings:  \nDEM Settings -> Blur Radius: **35**"
 
     def __init__(self, *args, **kwargs):

{maps4fs-1.8.195 → maps4fs-1.8.197}/maps4fs/generator/map.py

@@ -7,10 +7,7 @@ import os
 import shutil
 from typing import Any, Generator
 
-from maps4fs.generator.component.background import Background
-from maps4fs.generator.component.base.component import Component
-from maps4fs.generator.component.layer import Layer
-from maps4fs.generator.component.texture import Texture
+from maps4fs.generator.component import Background, Component, Layer, Texture
 from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
 from maps4fs.generator.game import Game
 from maps4fs.generator.settings import (
@@ -26,7 +23,6 @@ from maps4fs.generator.settings import (
 from maps4fs.logger import Logger
 
 
-# pylint: disable=R0913, R0902, R0914
 class Map:
     """Class used to generate map using all components.
 
@@ -38,11 +34,11 @@ class Map:
         logger (Any): Logger instance
     """
 
-    def __init__(  # pylint: disable=R0917, R0915
+    def __init__(
         self,
         game: Game,
         dtm_provider: DTMProvider,
-        dtm_provider_settings: DTMProviderSettings,
+        dtm_provider_settings: DTMProviderSettings | None,
         coordinates: tuple[float, float],
         size: int,
         rotation: int,
@@ -199,7 +195,7 @@ class Map:
 
             try:
                 component.process()
-            except Exception as e:  # pylint: disable=W0718
+            except Exception as e:
                 self.logger.error(
                     "Error processing component %s: %s",
                     component.__class__.__name__,
@@ -209,7 +205,7 @@ class Map:
 
             try:
                 component.commit_generation_info()
-            except Exception as e:  # pylint: disable=W0718
+            except Exception as e:
                 self.logger.error(
                     "Error committing generation info for component %s: %s",
                     component.__class__.__name__,
@@ -287,7 +283,7 @@ class Map:
         for component in self.components:
             try:
                 previews.extend(component.previews())
-            except Exception as e:  # pylint: disable=W0718
+            except Exception as e:
                 self.logger.error(
                     "Error getting previews for component %s: %s",
                     component.__class__.__name__,
@@ -311,6 +307,6 @@ class Map:
             try:
                 shutil.rmtree(self.map_directory)
                 self.logger.debug("Map directory removed: %s", self.map_directory)
-            except Exception as e:  # pylint: disable=W0718
+            except Exception as e:
                 self.logger.debug("Error removing map directory %s: %s", self.map_directory, e)
         return archive_path

{maps4fs-1.8.195 → maps4fs-1.8.197}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.195
+Version: 1.8.197
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -263,8 +263,7 @@ import maps4fs as mfs
 game_code = "fs25"
 game = mfs.Game.from_code(game_code)
 
-dtm_provider = mfs.SRTM30Provider
-dtm_provider_settings = mfs.SRTM30ProviderSettings(easy_mode=True, power_factor=0)
+dtm_provider = mfs.dtm.SRTM30Provider
 
 lat, lon = 45.28, 20.23
 coordinates = (lat, lon)
@@ -277,7 +276,7 @@ os.makedirs(map_directory, exist_ok=True)
 mp = mfs.Map(
     game,
     dtm_provider,
-    dtm_provider_settings,
+    None,
     coordinates,
     size,
     rotation,

{maps4fs-1.8.195 → maps4fs-1.8.197}/pyproject.toml

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

{maps4fs-1.8.195 → maps4fs-1.8.197}/tests/test_generator.py

@@ -7,7 +7,6 @@ from time import time
 import cv2
 
 from maps4fs import DTMProvider, Map
-from maps4fs.generator.dtm.srtm import SRTM30ProviderSettings
 from maps4fs.generator.game import Game
 from maps4fs.generator.settings import (
     BackgroundSettings,
@@ -36,8 +35,6 @@ game_code_cases = ["FS25"]
 dtm_provider_code = "srtm30"
 dtm_provider = DTMProvider.get_provider_by_code(dtm_provider_code)
 
-dtm_settings = SRTM30ProviderSettings()
-
 
 background_settings = BackgroundSettings(
     generate_background=True,
@@ -98,7 +95,7 @@ def test_map():
             map = Map(
                 game=game,
                 dtm_provider=dtm_provider,
-                dtm_provider_settings=dtm_settings,
+                dtm_provider_settings=None,
                 background_settings=background_settings,
                 coordinates=coordinates,
                 size=height,
@@ -161,7 +158,7 @@ def test_map_preview():
     map = Map(
         game=game,
         dtm_provider=dtm_provider,
-        dtm_provider_settings=dtm_settings,
+        dtm_provider_settings=None,
         background_settings=background_settings,
         coordinates=case,
         size=height,
@@ -196,7 +193,7 @@ def test_map_pack():
     map = Map(
         game=game,
         dtm_provider=dtm_provider,
-        dtm_provider_settings=dtm_settings,
+        dtm_provider_settings=None,
         coordinates=case,
         size=height,
         rotation=30,

maps4fs-1.8.195/maps4fs/toolbox/__init__.py

@@ -1 +0,0 @@
-# pylint: disable=missing-module-docstring