maps4fs 1.8.190__tar.gz → 1.8.191__tar.gz

{maps4fs-1.8.190 → maps4fs-1.8.191}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.190
+Version: 1.8.191
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.190 → maps4fs-1.8.191}/maps4fs/__init__.py

@@ -1,7 +1,7 @@
 # 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 import USGSProvider, USGSProviderSettings
+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

maps4fs-1.8.191/maps4fs/generator/dtm/usgs_wcs.py

@@ -0,0 +1,35 @@
+"""This module contains provider of USGS data."""
+
+from maps4fs.generator.dtm.base.wcs import WCSProvider
+from maps4fs.generator.dtm.dtm import DTMProvider
+
+
+class USGSWCSProvider(WCSProvider, DTMProvider):
+    """Provider of USGS data."""
+
+    _code = "usgs_wcs"
+    _name = "USGS"
+    _region = "USA"
+    _icon = "🇺🇸"
+    _resolution = "1-90"
+    _author = "[kbrandwijk](https://github.com/kbrandwijk)"
+    _is_community = True
+    _instructions = None
+    _is_base = False
+    _extents = (50.0, 17.0, -64.0, -162.0)
+
+    _url = "https://elevation.nationalmap.gov/arcgis/services/3DEPElevation/ImageServer/WCSServer"
+    _wcs_version = "1.0.0"
+    _source_crs = "EPSG:3857"
+    _tile_size = 1000
+    _is_multipart = False
+
+    def get_wcs_parameters(self, tile):
+        return {
+            "identifier": "DEP3Elevation",
+            "bbox": (tile[1], tile[0], tile[3], tile[2]),
+            "crs": "EPSG:3857",
+            "width": 1000,
+            "height": 1000,
+            "format": "GeoTIFF",
+        }

{maps4fs-1.8.190 → maps4fs-1.8.191}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.190
+Version: 1.8.191
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.190 → maps4fs-1.8.191}/maps4fs.egg-info/SOURCES.txt

@@ -51,7 +51,7 @@ maps4fs/generator/dtm/scotland.py
 maps4fs/generator/dtm/spain.py
 maps4fs/generator/dtm/srtm.py
 maps4fs/generator/dtm/switzerland.py
-maps4fs/generator/dtm/usgs.py
+maps4fs/generator/dtm/usgs_wcs.py
 maps4fs/generator/dtm/utils.py
 maps4fs/generator/dtm/base/wcs.py
 maps4fs/generator/dtm/base/wms.py

{maps4fs-1.8.190 → maps4fs-1.8.191}/pyproject.toml

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

maps4fs-1.8.190/maps4fs/generator/dtm/usgs.py

@@ -1,90 +0,0 @@
-"""This module contains provider of USGS data."""
-
-import os
-from datetime import datetime
-
-import numpy as np
-import requests
-
-from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
-
-
-class USGSProviderSettings(DTMProviderSettings):
-    """Settings for the USGS provider."""
-
-    dataset: tuple | str = (
-        "Digital Elevation Model (DEM) 1 meter",
-        "Alaska IFSAR 5 meter DEM",
-        "National Elevation Dataset (NED) 1/9 arc-second",
-        "National Elevation Dataset (NED) 1/3 arc-second",
-        "National Elevation Dataset (NED) 1 arc-second",
-        "National Elevation Dataset (NED) Alaska 2 arc-second",
-        "Original Product Resolution (OPR) Digital Elevation Model (DEM)",
-    )
-
-
-class USGSProvider(DTMProvider):
-    """Provider of USGS."""
-
-    _code = "USGS"
-    _name = "USGS"
-    _region = "USA"
-    _icon = "🇺🇸"
-    _resolution = "variable"
-    _data: np.ndarray | None = None
-    _settings = USGSProviderSettings
-    _author = "[ZenJakey](https://github.com/ZenJakey)"
-    _contributors = "[kbrandwijk](https://github.com/kbrandwijk)"
-    _is_community = True
-    _instructions = None
-    _extents = (50.0, 17.0, -64.0, -162.0)
-
-    _url = "https://tnmaccess.nationalmap.gov/api/v1/products?prodFormats=GeoTIFF,IMG"
-
-    def download_tiles(self):
-        download_urls = self.get_download_urls()
-        all_tif_files = self.download_tif_files(download_urls, self.shared_tiff_path)
-        return all_tif_files
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-        self.shared_tiff_path = os.path.join(self._tile_directory, "shared")
-        os.makedirs(self.shared_tiff_path, exist_ok=True)
-        self.output_path = os.path.join(self._tile_directory, f"timestamp_{timestamp}")
-        os.makedirs(self.output_path, exist_ok=True)
-
-    def get_download_urls(self) -> list[str]:
-        """Get download URLs of the GeoTIFF files from the USGS API.
-
-        Returns:
-            list: List of download URLs.
-        """
-        assert self.url is not None
-
-        urls = []
-        try:
-            # Make the GET request
-            (north, south, east, west) = self.get_bbox()
-            response = requests.get(
-                self.url
-                + f"&datasets={self.user_settings.dataset}"  # type: ignore
-                + f"&bbox={west},{north},{east},{south}",
-                timeout=60,
-            )
-            self.logger.debug("Getting file locations from USGS...")
-
-            # Check if the request was successful (HTTP status code 200)
-            if response.status_code == 200:
-                # Parse the JSON response
-                json_data = response.json()
-                items = json_data["items"]
-                for item in items:
-                    urls.append(item["downloadURL"])
-                # self.download_tif_files(urls)
-            else:
-                self.logger.error("Failed to get data. HTTP Status Code: %s", response.status_code)
-        except requests.exceptions.RequestException as e:
-            self.logger.error("Failed to get data. Error: %s", e)
-        self.logger.debug("Received %s urls", len(urls))
-        return urls