maps4fs 1.8.175__py3-none-any.whl → 1.8.177__py3-none-any.whl

maps4fs/__init__.py

@@ -15,6 +15,7 @@ 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.game import Game
 from maps4fs.generator.map import Map
 from maps4fs.generator.settings import (

maps4fs/generator/component/i3d.py

@@ -15,8 +15,6 @@ from tqdm import tqdm
 from maps4fs.generator.component.base.component_xml import XMLComponent
 from maps4fs.generator.settings import Parameters
 
-MAP_SIZE_LIMIT_FOR_DISPLACEMENT_LAYER = 4096
-DISPLACEMENT_LAYER_SIZE_FOR_BIG_MAPS = 32768
 NODE_ID_STARTING_VALUE = 2000
 SPLINES_NODE_ID_STARTING_VALUE = 5000
 TREE_NODE_ID_STARTING_VALUE = 10000
@@ -103,11 +101,9 @@ class I3d(XMLComponent):
 
         self.get_and_update_element(root, sun_element_path, data)
 
-        if self.map_size > MAP_SIZE_LIMIT_FOR_DISPLACEMENT_LAYER:
-            displacement_layer_path = ".//Scene/TerrainTransformGroup/DisplacementLayer"
-            data = {"size": str(DISPLACEMENT_LAYER_SIZE_FOR_BIG_MAPS)}
-
-            self.get_and_update_element(root, displacement_layer_path, data)
+        displacement_layer_path = ".//Scene/TerrainTransformGroup/Layers/DisplacementLayer"
+        data = {"size": str(int(self.map_size * 8))}
+        self.get_and_update_element(root, displacement_layer_path, data)
 
         self.save_tree(tree)
 

maps4fs/generator/dtm/denmark.py

@@ -0,0 +1,47 @@
+"""This module contains provider of Denmark data."""
+
+from maps4fs.generator.dtm.base.wcs import WCSProvider
+from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
+
+
+class DenmarkProviderSettings(DTMProviderSettings):
+    """Settings for the Denmark provider."""
+
+    token: str = ""
+
+
+class DenmarkProvider(WCSProvider, DTMProvider):
+    """Provider of Denmark data."""
+
+    _code = "denmark"
+    _name = "Denmark"
+    _region = "DK"
+    _icon = "🇩🇰"
+    _resolution = 0.4
+    _author = "[kbrandwijk](https://github.com/kbrandwijk)"
+    _is_community = True
+    _is_base = False
+    _settings = DenmarkProviderSettings
+    _extents = (57.7690657013977, 54.4354651516217, 15.5979112056959, 8.00830949937517)
+
+    _instructions = (
+        "ℹ️ This provider requires an access token. See [here](https://confluence"
+        ".sdfi.dk/display/MYD/How+to+create+a+user) for more information on "
+        "how to create one, then enter it below in the settings field for token."
+    )
+
+    _url = "https://api.dataforsyningen.dk/dhm_wcs_DAF"
+    _wcs_version = "1.0.0"
+    _source_crs = "EPSG:25832"
+    _tile_size = 1000
+
+    def get_wcs_parameters(self, tile):
+        return {
+            "identifier": "dhm_terraen",
+            "bbox": (tile[1], tile[0], tile[3], tile[2]),
+            "crs": "EPSG:25832",
+            "width": 2500,
+            "height": 2500,
+            "format": "GTiff",
+            "token": self.user_settings.token,
+        }

maps4fs/generator/dtm/dtm.py

@@ -12,14 +12,13 @@ from zipfile import ZipFile
 import numpy as np
 import osmnx as ox  # type: ignore
 import rasterio  # type: ignore
+import requests
 from pydantic import BaseModel
 from rasterio.enums import Resampling
 from rasterio.merge import merge
 from rasterio.warp import calculate_default_transform, reproject
-import requests
 from tqdm import tqdm
 
-
 from maps4fs.logger import Logger
 
 if TYPE_CHECKING:
@@ -79,6 +78,11 @@ class DTMProvider(ABC):
 
         self._data_info: dict[str, int | str | float] | None = None
 
+    @classmethod
+    def name(cls) -> str | None:
+        """Name of the provider."""
+        return cls._name
+
     @property
     def data_info(self) -> dict[str, int | str | float] | None:
         """Information about the DTM data.

maps4fs/generator/map.py

@@ -77,10 +77,12 @@ class Map:
         self.coordinates = coordinates
         self.map_directory = map_directory
 
-        self.logger.info("Game was set to %s", game.code)
+        log_entry = ""
+        log_entry += f"Game was set to {game.code}. "
+        log_entry += f"DTM provider was set to {dtm_provider.name()}. "
 
         self.custom_osm = custom_osm
-        self.logger.info("Custom OSM file: %s", custom_osm)
+        log_entry += f"Custom OSM file: {custom_osm}. "
 
         # Make a copy of a custom osm file to the map directory, so it will be
         # included in the output archive.
@@ -90,30 +92,26 @@ class Map:
             self.logger.debug("Custom OSM file copied to %s", copy_path)
 
         self.dem_settings = dem_settings
-        self.logger.info("DEM settings: %s", dem_settings)
+        log_entry += f"DEM settings: {dem_settings}. "
         if self.dem_settings.water_depth > 0:
             # Make sure that the plateau value is >= water_depth
             self.dem_settings.plateau = max(
                 self.dem_settings.plateau, self.dem_settings.water_depth
             )
-            self.logger.info(
-                "Plateau value was set to %s to be >= water_depth value %s",
-                self.dem_settings.plateau,
-                self.dem_settings.water_depth,
-            )
 
         self.background_settings = background_settings
-        self.logger.info("Background settings: %s", background_settings)
+        log_entry += f"Background settings: {background_settings}. "
         self.grle_settings = grle_settings
-        self.logger.info("GRLE settings: %s", grle_settings)
+        log_entry += f"GRLE settings: {grle_settings}. "
         self.i3d_settings = i3d_settings
-        self.logger.info("I3D settings: %s", i3d_settings)
+        log_entry += f"I3D settings: {i3d_settings}. "
         self.texture_settings = texture_settings
-        self.logger.info("Texture settings: %s", texture_settings)
+        log_entry += f"Texture settings: {texture_settings}. "
         self.spline_settings = spline_settings
-        self.logger.info("Spline settings: %s", spline_settings)
+        log_entry += f"Spline settings: {spline_settings}. "
         self.satellite_settings = satellite_settings
 
+        self.logger.info(log_entry)
         os.makedirs(self.map_directory, exist_ok=True)
         self.logger.debug("Map directory created: %s", self.map_directory)
 
@@ -148,7 +146,6 @@ class Map:
 
         self.tree_custom_schema = kwargs.get("tree_custom_schema", None)
         if self.tree_custom_schema:
-            self.logger.info("Custom tree schema contains %s trees", len(self.tree_custom_schema))
             save_path = os.path.join(self.map_directory, "tree_custom_schema.json")
             with open(save_path, "w", encoding="utf-8") as file:
                 json.dump(self.tree_custom_schema, file, indent=4)

maps4fs/logger.py

@@ -16,7 +16,7 @@ class Logger(logging.Logger):
 
     def __init__(
         self,
-        level: Literal["DEBUG", "INFO", "WARNING", "ERROR"] = "ERROR",
+        level: Literal["DEBUG", "INFO", "WARNING", "ERROR"] = "INFO",
         to_stdout: bool = True,
         to_file: bool = True,
     ):

{maps4fs-1.8.175.dist-info → maps4fs-1.8.177.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.175
+Version: 1.8.177
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -682,13 +682,27 @@ The generator supports adding the own DTM providers, please refer to the [DTM Pr
 
 ### Supported DTM providers
 
-- [SRTM 30m](https://dwtkns.com/srtm30m/) - the 30 meters resolution DEM data from the SRTM mission for the whole world.
-- [USGS 1m](https://portal.opentopography.org/raster?opentopoID=OTNED.012021.4269.3) - the 1-meter resolution DEM data from the USGS for the USA. Developed by [ZenJakey](https://github.com/ZenJakey).
-- England 1m DTM. 1-meter resolution DEM data for England, UK. Developed by [kbrandwijk](https://github.com/kbrandwijk).
-- Hessen DGM1 - 1-meter resolution DEM data for Hessen, Germany. Developed by [kbrandwijk](https://github.com/kbrandwijk).
-- Niedersachsen DGM1 - 1-meter resolution DEM data for Lower Saxony, Germany. Developed by [kbrandwijk](https://github.com/kbrandwijk).
-- Bayern DGM1 - 1-meter resolution DEM data for Bavaria, Germany. Developed by [H4rdB4se](https://github.com/H4rdB4se).
-- Nordrhein-Westfalen DGM1 - 1-meter resolution DEM data for North Rhine-Westphalia, Germany. Developed by [kbrandwijk](https://github.com/kbrandwijk).
+![coverage map](https://github.com/user-attachments/assets/fc78e755-13e2-4187-b846-4de5cb407dbf)
+
+In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
+
+| Provider Name                   | Resolution   | Developer                                   |
+| ------------------------------- | ------------ | ------------------------------------------- |
+| 🌎 SRTM30                       | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
+| 🇺🇸 USGS                         | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
+| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                     | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Hessen, Germany              | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Niedersachsen, Germany       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Bayern, Germany              | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
+| 🇩🇪 Nordrhein-Westfalen, Germany | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇨🇦 Canada                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇧🇪 Flanders, Belgium            | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇷 France                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇮🇹 Italy                        | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇳🇴 Norway                       | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇪🇸 Spain                        | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇫🇮 Finland                      | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
 
 ## Special thanks
 

{maps4fs-1.8.175.dist-info → maps4fs-1.8.177.dist-info}/RECORD

@@ -1,9 +1,9 @@
-maps4fs/__init__.py,sha256=iq4GcHoQ-by-BK6CzDOfVcdDww6osyi9Wv6pKXub68U,1307
-maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
+maps4fs/__init__.py,sha256=Jq1Zp0vSkv-beVXfebt_0ELxlrV3ZJX4cT4oaCFda_0,1365
+maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/dem.py,sha256=oLN02bWNax73HzFsseRBOV47Azl_1L7qdrzuxHh4i_c,11886
 maps4fs/generator/game.py,sha256=FFAyckuTW6Ix5aRACXOj2eiA72xd3OMCcOARrMhS164,11025
-maps4fs/generator/map.py,sha256=c5GMhr5iTRdXvTXoBKyVYa2V1tocR3ZCc7D_hpU21k8,11523
+maps4fs/generator/map.py,sha256=N3lSIEmGQXSrOYXochHEib5djmxL5szFM2crT31Nwog,11312
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=cFlN-gK8QcySqyPtcGm-2fLnxQnlmC3Y9kQufJxwI3Y,6270
 maps4fs/generator/texture.py,sha256=_IfqIuxH4934VJXKtdABHa6ToPWk3T0xknvlu-rZ5Uc,36570
@@ -11,7 +11,7 @@ maps4fs/generator/component/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2
 maps4fs/generator/component/background.py,sha256=cBBp-ULrJzuNG9wfE_MaxzAn_mR24neqtL7WjxXEb3I,18749
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=aKMjVJNuKHJJ2gsXaH00bz10kWaIbbZXU_JbP-ZAGw4,18990
-maps4fs/generator/component/i3d.py,sha256=3x38yL-kSJ8ylBwICBb6wPYzRSky4gVj8XCk2jzYSeo,19861
+maps4fs/generator/component/i3d.py,sha256=z2ZkflA5E8FrHcGleXSVKZRWvkqclz_Yh_qxJI86enE,19685
 maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZwYyqoDZM7aI1RHw8,21273
@@ -21,7 +21,8 @@ maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnk
 maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maps4fs/generator/dtm/bavaria.py,sha256=7njrEvSCYAC8ZVyvS-_84iXHhWA0oHKrEqSzxdnZuGs,4293
 maps4fs/generator/dtm/canada.py,sha256=lYONwm6aNX5cjVggR3AiZZF9dlCDAWg0M8RMaObog8s,1288
-maps4fs/generator/dtm/dtm.py,sha256=L824mwmd_cNTujwWBsRg7RZLq9KEXf0-xIzKx8M3y1Q,16872
+maps4fs/generator/dtm/denmark.py,sha256=GMB9PPxXth6V1v3XuURVWVabJf4xlr158bKfeIIisek,1476
+maps4fs/generator/dtm/dtm.py,sha256=vZh3Z5grfQy0gvo-xAgXwkWExk1kW1pGVw2nk54hN-8,16983
 maps4fs/generator/dtm/england.py,sha256=YyCYwnNUJuBeeMNUozfKIj_yNjHpGeuH1Mz0NiAJL-U,1122
 maps4fs/generator/dtm/finland.py,sha256=Chi3-3sanLIYpipjtPpTu9tqnL3DYcnygSDCPm1s24c,1753
 maps4fs/generator/dtm/flanders.py,sha256=81pKkrM40SeOe1LSlcsTNXSmUNpofC4D454DG6WFSyA,1037
@@ -42,8 +43,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.175.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.175.dist-info/METADATA,sha256=sJC26EV7F8zHVh9EUwiFRvKN9BlrJuLYk5-QwfySD5c,42937
-maps4fs-1.8.175.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.175.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.175.dist-info/RECORD,,
+maps4fs-1.8.177.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.177.dist-info/METADATA,sha256=WtSUt8A9aunNM9Guy-u76Nbi1eVnlBXBl7YzKBRSmAA,44023
+maps4fs-1.8.177.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.177.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.177.dist-info/RECORD,,