maps4fs 1.8.196__py3-none-any.whl → 1.8.197__py3-none-any.whl

maps4fs/__init__.py

@@ -1,38 +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.dtm.srtm import SRTM30Provider, SRTM30ProviderSettings
-from maps4fs.generator.dtm.usgs_wcs import USGSWCSProvider
-from maps4fs.generator.dtm.nrw import NRWProvider
-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.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.mv import MecklenburgVorpommernProvider
-from maps4fs.generator.dtm.baden import BadenWurttembergProvider
-from maps4fs.generator.dtm.arctic import ArcticProvider
-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

maps4fs/generator/component/__init__.py

@@ -1 +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/generator/dtm/__init__.py

@@ -0,0 +1,24 @@
+# pylint: disable=missing-module-docstring
+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.canada import CanadaProvider
+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.flanders import FlandersProvider
+from maps4fs.generator.dtm.france import FranceProvider
+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.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.sachsenanhalt import SachsenAnhaltProvider
+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/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/generator/dtm/srtm.py

@@ -9,11 +9,7 @@ import shutil
 
 import requests
 
-from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
-
-
-class SRTM30ProviderSettings(DTMProviderSettings):
-    """Settings for SRTM 30m provider."""
+from maps4fs.generator.dtm.dtm import DTMProvider
 
 
 class SRTM30Provider(DTMProvider):
@@ -29,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/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.196.dist-info → maps4fs-1.8.197.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.196
+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.196.dist-info → maps4fs-1.8.197.dist-info}/RECORD

@@ -1,12 +1,12 @@
-maps4fs/__init__.py,sha256=9StBkLgyOqEwZ4tQ0AQJ9LaEMhR0_tr3FtZxZKKa8FQ,1780
+maps4fs/__init__.py,sha256=EGvLVoRpSt4jITswsGbe1ISVmGAZAMQJcBmTwtyuVxI,335
 maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/dem.py,sha256=qHYkVtph5NXo2fRfRoYwKGzpnx-6-TIRg1rNg0EmtDU,11740
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
-maps4fs/generator/map.py,sha256=BV7OTrv3zHud6DbTGpm3TU5JNWJlKgRhZUGfs_wxntw,11513
+maps4fs/generator/map.py,sha256=FA9ZLpVMS2RLRDgWZdOo-kLzqMUBza3EZ_89-Gfw_s4,11193
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=ZHwLn1ObdOuhyUTzQTYvyDs7YZ0SbVLgTSpoeUtqi0c,6708
-maps4fs/generator/component/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
 maps4fs/generator/component/background.py,sha256=47hQskCT-RfubhJKd9vHDqZOj2lwkYROY1ob5v79b54,18767
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=nDA6vjjfWFL0Hkz6aso1aLIwuksbxzZw9syNax1bD04,19134
@@ -19,14 +19,14 @@ maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZ
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
 maps4fs/generator/component/base/component_mesh.py,sha256=43JY8X0ugIWAJq5y11vTJM9UfbL7SSugj8LkdPmni10,8871
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
-maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maps4fs/generator/dtm/__init__.py,sha256=hzKESJm2QhIQnPKxTYCFohpvRWOmLfXZfEnrMbntp1s,1392
 maps4fs/generator/dtm/arctic.py,sha256=LSivLLjtd6TJUaPYvgSYQ4KalMTaY58zFvwivSh45uM,2587
 maps4fs/generator/dtm/baden.py,sha256=PQTMEPm9hrO3nKbv_DXA9oNYnGK_0ei41Q_DhtethX0,1041
 maps4fs/generator/dtm/bavaria.py,sha256=nH2wTxiIdQgKotauTqD-zztwFgfZzIdym2sjmSqfujM,4295
 maps4fs/generator/dtm/canada.py,sha256=XJ_za2LDV9PEV7hmjPnzdwPbpr6ezAR73-HDVaTuKPk,1290
 maps4fs/generator/dtm/czech.py,sha256=sT0gwbtEnizVNcZeL7kyDdwmKvB3w8m6UgJR7ZTk1to,1058
 maps4fs/generator/dtm/denmark.py,sha256=JFuBRrCJTMXe_vdO3gRCwsnZ3nZOp_Y6671Kq8aXRGM,1591
-maps4fs/generator/dtm/dtm.py,sha256=DSBtk-i1lF_GWGYttmD2LWfmPhx8WzrUROrAULE2RHQ,16937
+maps4fs/generator/dtm/dtm.py,sha256=QGsA-JysmOXFdZa7RsaXwmB4aGK0gys0DZUG6AIBT30,17476
 maps4fs/generator/dtm/england.py,sha256=3URUm7uLH_RYXcQdDW3Vt09GWKAE8RAy1ZFJB94kXOA,1124
 maps4fs/generator/dtm/finland.py,sha256=VpXpvCgzbyKA6VGSa7ikSzE4B-cLfR1_2zOHvS8delc,1870
 maps4fs/generator/dtm/flanders.py,sha256=LltmowbS84_DaBHAS9XYoJPMunX6sWGy6zaVACHj5Ro,1039
@@ -41,7 +41,7 @@ maps4fs/generator/dtm/rema.py,sha256=arLE12yE92EWmWysNUTtdEzwcNiCBtEBmnfnryOriRY
 maps4fs/generator/dtm/sachsenanhalt.py,sha256=UvLrQVxJX30BqtNbKZyR6EJc-vS5fLyanh6fntjYj2k,1144
 maps4fs/generator/dtm/scotland.py,sha256=kUGPNjn3mQPOU9sgK3k-uwumPG2wrRFLaDMyPMh06Jw,4819
 maps4fs/generator/dtm/spain.py,sha256=A5QScsrd_bkVlf2n9ZfXBL9z_YoXpLsm_5FWs-5nd_o,1021
-maps4fs/generator/dtm/srtm.py,sha256=ob6AUuEn3G3G9kdqTA2VhT335N65RRBJsqAfHuw0gA8,4502
+maps4fs/generator/dtm/srtm.py,sha256=zeQovZCC6AKzdKAxypKQFuIn1mi2c9EUpRjaA4jSVVs,4346
 maps4fs/generator/dtm/switzerland.py,sha256=Jn3qYVEps_K6cH-9rMfB_zoXMxhzWQKPnlKkSE-TehE,3549
 maps4fs/generator/dtm/usgs_wcs.py,sha256=X8VxdhyH0-EciGE_X-KgrAM6sVLTGssYIhtebOj8MPI,1021
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
@@ -51,8 +51,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RclEqxEWLbMxuEkkegQP8jybzugwQ1_R3rdfDe0s21U,2104
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.196.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.196.dist-info/METADATA,sha256=USTOzehJX2zyRoY5EDKAZbmnaPYHkl-6ZVXdvt5ckvs,45000
-maps4fs-1.8.196.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.196.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.196.dist-info/RECORD,,
+maps4fs-1.8.197.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.197.dist-info/METADATA,sha256=fswQduWDANskTQxoORkgeZrJdZku9uPBSP7sB8uTDB8,44904
+maps4fs-1.8.197.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.197.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.197.dist-info/RECORD,,