maps4fs 1.8.247__py3-none-any.whl → 1.8.249__py3-none-any.whl

maps4fs/generator/dtm/__init__.py

@@ -22,4 +22,5 @@ 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.thuringia import ThuringiaProvider
 from maps4fs.generator.dtm.usgs_wcs import USGSWCSProvider

maps4fs/generator/dtm/dtm.py

@@ -404,17 +404,31 @@ class DTMProvider(ABC):
 
         Returns:
             str: Path to the unzipped file.
+
+        Raises:
+            FileNotFoundError: If no .img or .tif file is found in the zip file
         """
         file_path = os.path.join(output_path, file_name)
         img_file_name = file_name.replace(".zip", ".img")
+        tif_file_name = file_name.replace(".zip", ".tif")
         img_file_path = os.path.join(output_path, img_file_name)
-        if not os.path.exists(img_file_path):
-            with ZipFile(file_path, "r") as f_in:
-                f_in.extract(img_file_name, output_path)
-            self.logger.debug("Unzipped file %s to %s", file_name, img_file_name)
-        else:
+        tif_file_path = os.path.join(output_path, tif_file_name)
+        if os.path.exists(img_file_path):
             self.logger.debug("File already exists: %s", img_file_name)
-        return img_file_path
+            return img_file_path
+        if os.path.exists(tif_file_path):
+            self.logger.debug("File already exists: %s", tif_file_name)
+            return tif_file_path
+        with ZipFile(file_path, "r") as f_in:
+            if img_file_name in f_in.namelist():
+                f_in.extract(img_file_name, output_path)
+                self.logger.debug("Unzipped file %s to %s", file_name, img_file_name)
+                return img_file_path
+            if tif_file_name in f_in.namelist():
+                f_in.extract(tif_file_name, output_path)
+                self.logger.debug("Unzipped file %s to %s", file_name, tif_file_name)
+                return tif_file_path
+        raise FileNotFoundError("No .img or .tif file found in the zip file.")
 
     def reproject_geotiff(self, input_tiff: str) -> str:
         """Reproject a GeoTIFF file to a new coordinate reference system (CRS).

maps4fs/generator/dtm/thuringia.py

@@ -0,0 +1,60 @@
+"""This module contains provider of Thuringia data."""
+
+import os
+from maps4fs.generator.dtm import utils
+from maps4fs.generator.dtm.dtm import DTMProvider
+
+class ThuringiaProvider(DTMProvider):
+    """Provider of Thuringia data.
+    Data is provided by the Kompetenzzentrum Geodateninfrastruktur Thüringen (© GDI-Th) and available
+    at https://geoportal.thueringen.de/gdi-th/download-offene-geodaten/download-hoehendaten under BY 2.0 license.
+    """
+    _code = "thuringia"
+    _name = "Thüringen DGM1"
+    _region = "DE"
+    _icon = "🇩🇪󠁥󠁢󠁹󠁿"
+    _resolution = 1
+    _author = "[H4rdB4se](https://github.com/H4rdB4se)"
+    _is_community = True
+    _instructions = None
+    _extents = [(51.5997, 50.2070, 12.69674, 9.8548)]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.tiff_path = os.path.join(self._tile_directory, "tiffs")
+        os.makedirs(self.tiff_path, exist_ok=True)
+
+    def download_tiles(self) -> list[str]:
+        bbox = self.get_bbox()
+        west, east, north, south = utils.transform_bbox(bbox, "EPSG:25832")
+        download_urls = self.get_download_urls(north, south, east, west)
+        all_tif_files = self.download_tif_files(download_urls, self.tiff_path)
+        return all_tif_files
+
+    @staticmethod
+    def get_first_n_digits(value: float, digits: int) -> int:
+        """Get the first n digits of a number."""
+        return int(str(value)[:digits])
+
+    def get_download_urls(self, north: float, south: float, east: float, west: float) -> list[str]:
+        """Calculate all possible tiles within the bounding box.
+
+        Args:
+            north (float): Northern boundary.
+            south (float): Southern boundary.
+            east (float): Eastern boundary.
+            west (float): Western boundary.
+
+        Returns:
+            list: List of tile names.
+        """
+        urls = []
+        lat = self.get_first_n_digits(south, 4)
+        while lat <= self.get_first_n_digits(north, 4):
+            lon = self.get_first_n_digits(west, 3)
+            while lon <= self.get_first_n_digits(east, 3):
+                tile_url = f"https://geoportal.geoportal-th.de/hoehendaten/DGM/dgm_2020-2025/dgm1_32_{lon}_{lat}_1_th_2020-2025.zip"
+                urls.append(tile_url)
+                lon += 1
+            lat += 1
+        return urls

{maps4fs-1.8.247.dist-info → maps4fs-1.8.249.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: maps4fs
-Version: 1.8.247
+Version: 1.8.249
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -27,6 +27,7 @@ Requires-Dist: pygmdl
 Requires-Dist: owslib
 Requires-Dist: tqdm
 Requires-Dist: scipy
+Dynamic: license-file
 
 <div align="center" markdown>
 <a href="https://discord.gg/Sj5QKKyE42">
@@ -730,6 +731,7 @@ In addition to SRTM 30m, which provides global coverage, the map above highlight
 | 🇩🇪 Mecklenburg-Vorpommern, Germany | 1-25 meter   | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇩🇪 Baden-Württemberg, Germany      | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇩🇪 Sachsen-Anhalt, Germany         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇩🇪 Thüringen, Germany              | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
 | 🇨🇦 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) |

{maps4fs-1.8.247.dist-info → maps4fs-1.8.249.dist-info}/RECORD

@@ -20,14 +20,14 @@ maps4fs/generator/component/base/component.py,sha256=CIR4Fjn9YfLU4y7nB_jOaz7PjGF
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
 maps4fs/generator/component/base/component_mesh.py,sha256=BsxS5NlUK2hLhksgCwSoMK-00GNAwK2fYGpgb3R4n1w,9396
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
-maps4fs/generator/dtm/__init__.py,sha256=VIWcZiMZ0UtnJl7rQL-PVHDivXbZVwrBWumjhTTnnKY,1454
+maps4fs/generator/dtm/__init__.py,sha256=CzK8ZdLU5Iv7DrwK5hIQ41zVsLRFgZO-IuRxf-NCVqg,1516
 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=d5ZSBw1Nz6iCAek4O5ioLIijNRaxGvHNlNlEpkqqUIE,17464
+maps4fs/generator/dtm/dtm.py,sha256=BkjVDig46dA7BHeViouCfcM-J4e40PjaVlD5xD_35GM,18211
 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
@@ -45,6 +45,7 @@ maps4fs/generator/dtm/scotland.py,sha256=kUGPNjn3mQPOU9sgK3k-uwumPG2wrRFLaDMyPMh
 maps4fs/generator/dtm/spain.py,sha256=A5QScsrd_bkVlf2n9ZfXBL9z_YoXpLsm_5FWs-5nd_o,1021
 maps4fs/generator/dtm/srtm.py,sha256=INn3Kpfmo2nLPCDko1sFk9_ZinWW3e8I9S-TX0fMHoY,4327
 maps4fs/generator/dtm/switzerland.py,sha256=Jn3qYVEps_K6cH-9rMfB_zoXMxhzWQKPnlKkSE-TehE,3549
+maps4fs/generator/dtm/thuringia.py,sha256=iiIGdEZPIQJ-8tcaTeqYTvNHFmM_hFwzos4J8SW55kA,2353
 maps4fs/generator/dtm/usgs_wcs.py,sha256=X8VxdhyH0-EciGE_X-KgrAM6sVLTGssYIhtebOj8MPI,1021
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
 maps4fs/generator/dtm/base/wcs.py,sha256=lQAp_gVz9_XUmtyobJkskiefQpuJH4o1Vwb3CSQ0lQA,2510
@@ -53,8 +54,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.247.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.247.dist-info/METADATA,sha256=zH2xHd_cCbDtGc2Am8LIduDJCOJ3l3wElz7k4ixLu78,47093
-maps4fs-1.8.247.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-maps4fs-1.8.247.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.247.dist-info/RECORD,,
+maps4fs-1.8.249.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.249.dist-info/METADATA,sha256=wbfG5XMKvfnVvRGq4vFWWV6VzEdw2-Fh1znbM3RIo7s,47222
+maps4fs-1.8.249.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+maps4fs-1.8.249.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.249.dist-info/RECORD,,

{maps4fs-1.8.247.dist-info → maps4fs-1.8.249.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any