maps4fs 1.8.247__tar.gz → 1.8.249__tar.gz

{maps4fs-1.8.247 → maps4fs-1.8.249}/PKG-INFO

@@ -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 → maps4fs-1.8.249}/README.md

@@ -700,6 +700,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 → maps4fs-1.8.249}/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-1.8.247 → maps4fs-1.8.249}/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-1.8.249/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 → maps4fs-1.8.249}/maps4fs.egg-info/PKG-INFO

@@ -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 → maps4fs-1.8.249}/maps4fs.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ maps4fs/generator/dtm/scotland.py
 maps4fs/generator/dtm/spain.py
 maps4fs/generator/dtm/srtm.py
 maps4fs/generator/dtm/switzerland.py
+maps4fs/generator/dtm/thuringia.py
 maps4fs/generator/dtm/usgs_wcs.py
 maps4fs/generator/dtm/utils.py
 maps4fs/generator/dtm/base/wcs.py

{maps4fs-1.8.247 → maps4fs-1.8.249}/pyproject.toml

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