maps4fs 1.6.7__py3-none-any.whl → 1.6.9__py3-none-any.whl

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
-from maps4fs.generator.dtm.usgs import USGS1mProvider
+from maps4fs.generator.dtm.usgs import USGSProvider
 from maps4fs.generator.game import Game
 from maps4fs.generator.map import Map
 from maps4fs.generator.settings import (

maps4fs/generator/dtm/dtm.py

@@ -4,6 +4,7 @@ and specific settings for downloading and processing the data."""
 
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import os
 from typing import TYPE_CHECKING, Type
 
@@ -23,19 +24,22 @@ class DTMProviderSettings(BaseModel):
     """Base class for DTM provider settings models."""
 
 
-class DTMProvider:
+# pylint: disable=too-many-public-methods
+class DTMProvider(ABC):
     """Base class for DTM providers."""
 
     _code: str | None = None
     _name: str | None = None
     _region: str | None = None
     _icon: str | None = None
-    _resolution: float | None = None
+    _resolution: float | str | None = None
 
     _url: str | None = None
 
     _author: str | None = None
+    _contributors: str | None = None
     _is_community: bool = False
+    _is_base: bool = False
     _settings: Type[DTMProviderSettings] | None = None
 
     _instructions: str | None = None
@@ -120,6 +124,24 @@ class DTMProvider:
         """
         return cls._author
 
+    @classmethod
+    def contributors(cls) -> str | None:
+        """Contributors of the provider.
+
+        Returns:
+            str: Contributors of the provider.
+        """
+        return cls._contributors
+
+    @classmethod
+    def is_base(cls) -> bool:
+        """Is the provider a base provider.
+
+        Returns:
+            bool: True if the provider is a base provider, False otherwise.
+        """
+        return cls._is_base
+
     @classmethod
     def is_community(cls) -> bool:
         """Is the provider a community-driven project.
@@ -190,7 +212,8 @@ class DTMProvider:
         """
         providers = {}
         for provider in cls.__subclasses__():
-            providers[provider._code] = provider.description()  # pylint: disable=W0212
+            if not provider.is_base():
+                providers[provider._code] = provider.description()  # pylint: disable=W0212
         return providers  # type: ignore
 
     def download_tile(self, output_path: str, **kwargs) -> bool:
@@ -235,6 +258,7 @@ class DTMProvider:
         """
         raise NotImplementedError
 
+    @abstractmethod
     def get_numpy(self) -> np.ndarray:
         """Get numpy array of the tile.
         Resulting array must be 16 bit (signed or unsigned) integer and it should be already

maps4fs/generator/dtm/usgs.py

@@ -1,37 +1,47 @@
-"""This module contains provider of USGS 1m data."""
+"""This module contains provider of USGS data."""
 
 import os
 from datetime import datetime
+from zipfile import ZipFile
 
 import numpy as np
-import rasterio  # type: ignore
+import rasterio
 import requests
-from rasterio._warp import Resampling  # type: ignore # pylint: disable=E0611
-from rasterio.merge import merge  # type: ignore
-from rasterio.warp import calculate_default_transform, reproject  # type: ignore
-from rasterio.windows import from_bounds  # type: ignore
+from rasterio.enums import Resampling
+from rasterio.merge import merge
+from rasterio.warp import calculate_default_transform, reproject
+from rasterio.windows import from_bounds
 
 from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
 
 
-class USGS1mProviderSettings(DTMProviderSettings):
-    """Settings for the USGS 1m provider."""
+class USGSProviderSettings(DTMProviderSettings):
+    """Settings for the USGS provider."""
 
     max_local_elevation: int = 255
+    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)',
+    )
 
 
-# pylint: disable=W0223
-class USGS1mProvider(DTMProvider):
+class USGSProvider(DTMProvider):
     """Provider of USGS."""
 
-    _code = "USGS1m"
-    _name = "USGS 1m"
+    _code = "USGS"
+    _name = "USGS"
     _region = "USA"
     _icon = "🇺🇸"
-    _resolution = 1
+    _resolution = 'variable'
     _data: np.ndarray | None = None
-    _settings = USGS1mProviderSettings
+    _settings = USGSProviderSettings
     _author = "[ZenJakey](https://github.com/ZenJakey)"
+    _contributors = "[kbrandwijk](https://github.com/kbrandwijk)"
     _is_community = True
     _instructions = (
         "ℹ️ Set the max local elevation to approx the local max elevation for your area in"
@@ -40,8 +50,8 @@ class USGS1mProvider(DTMProvider):
     )
 
     _url = (
-        "https://tnmaccess.nationalmap.gov/api/v1/products?prodFormats=GeoTIFF,IMG&prodExtents="
-        "10000 x 10000 meter&datasets=Digital Elevation Model (DEM) 1 meter&polygon="
+        "https://tnmaccess.nationalmap.gov/api/v1/products?prodFormats=GeoTIFF,IMG"
+
     )
 
     def __init__(self, *args, **kwargs):
@@ -64,7 +74,8 @@ class USGS1mProvider(DTMProvider):
             (north, south, east, west) = self.get_bbox()
             response = requests.get(  # pylint: disable=W3101
                 self.url  # type: ignore
-                + f"{west} {south},{east} {south},{east} {north},{west} {north},{west} {south}&="
+                + f"&datasets={self.user_settings.dataset}"  # type: ignore
+                + f"&bbox={west},{north},{east},{south}"
             )
             self.logger.debug("Getting file locations from USGS...")
 
@@ -75,7 +86,7 @@ class USGS1mProvider(DTMProvider):
                 items = json_data["items"]
                 for item in items:
                     urls.append(item["downloadURL"])
-                self.download_tif_files(urls)
+                # 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:
@@ -108,12 +119,24 @@ class USGS1mProvider(DTMProvider):
                         for chunk in response.iter_content(chunk_size=8192):  # Download in chunks
                             file.write(chunk)
                     self.logger.info("File downloaded successfully: %s", file_path)
+                    if file_name.endswith('.zip'):
+                        with ZipFile(file_path, "r") as f_in:
+                            f_in.extract(file_name.replace('.zip', '.img'), self.shared_tiff_path)
+                        tif_files.append(file_path.replace('.zip', '.img'))
+                    else:
+                        tif_files.append(file_path)
                 except requests.exceptions.RequestException as e:
                     self.logger.error("Failed to download file: %s", e)
             else:
                 self.logger.debug("File already exists: %s", file_name)
+                if file_name.endswith('.zip'):
+                    if not os.path.exists(file_path.replace('.zip', '.img')):
+                        with ZipFile(file_path, "r") as f_in:
+                            f_in.extract(file_name.replace('.zip', '.img'), self.shared_tiff_path)
+                    tif_files.append(file_path.replace('.zip', '.img'))
+                else:
+                    tif_files.append(file_path)
 
-            tif_files.append(file_path)
         return tif_files
 
     def merge_geotiff(self, input_files: list[str], output_file: str) -> None:

maps4fs/generator/map.py

@@ -146,6 +146,7 @@ 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-1.6.7.dist-info → maps4fs-1.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.6.7
+Version: 1.6.9
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -255,6 +255,10 @@ The tool now has a Modder Toolbox, which is a set of tools to help you with vari
 
 ### Tool Categories
 Tools are divided into categories, which are listed below.
+
+#### For custom schemas
+- **Tree Schema Editor** - allows you to view all the supported trees models and select the ones you need on your map. After it, you should click the Show updated schema button and copy the JSON schema to the clipboard. Then you can use it in the Expert settings to generate the map with the selected trees.
+
 #### For Textures and DEM
 - **GeoTIFF windowing** - allows you to upload your GeoTIFF file and select the region of interest to extract it from the image. It's useful when you have high-resolution DEM data and want to create a height map using it.
 
@@ -594,3 +598,4 @@ But also, I want to thank the people who helped me with the project in some way,
 - [Lucandia](https://github.com/Lucandia) - for the awesome StreamLit [widget to preview STL files](https://github.com/Lucandia/streamlit_stl).
 - [H4rdB4se](https://github.com/H4rdB4se) - for investigating the issue with custom OSM files and finding a proper way to work with the files in JOSM.
 - [kbrandwijk](https://github.com/kbrandwijk) - for providing [awesome tool](https://github.com/Paint-a-Farm/satmap_downloader) to download the satellite images from the Google Maps and giving a permission to modify it and create a Python Package.
+- [Maaslandmods](https://github.com/Maaslandmods) - for the awesome idea to edit the tree schema in UI, images and code snippets on how to do it.

{maps4fs-1.6.7.dist-info → maps4fs-1.6.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maps4fs/__init__.py,sha256=WbT36EzJ_74GN0RUUrLIYECdSdtRiZaxKl17KUt7pjA,492
+maps4fs/__init__.py,sha256=LrWSsyWaU28Dzcs7sRycywO_LvM-j34UvtafyBhvdx4,490
 maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/background.py,sha256=tV4UXvtkNN-OSvv6ujp4jFWRU1xGBgEvSakVGZ1H4nc,24877
@@ -8,20 +8,20 @@ maps4fs/generator/dem.py,sha256=20gx0dzX0LyO6ipvDitst-BwGfcKogFqgQf9Q2qMH5U,1093
 maps4fs/generator/game.py,sha256=Nf5r2ubV4YVAVHGzJyhbF2GnOC0qV3HlHYIZBCWciHs,7992
 maps4fs/generator/grle.py,sha256=hcbVBJ4j_Zr2QvEVo2cYNh2jARVXp_X3onifBtp9Zxs,20922
 maps4fs/generator/i3d.py,sha256=pUyHKWKcw43xVCf3Y8iabtbQba05LYxMHi8vziGksIA,24843
-maps4fs/generator/map.py,sha256=P8wHrCLhLcv2W5zJmMGjpM1TAMR8c7yVFzm_n-5ZTHQ,10084
+maps4fs/generator/map.py,sha256=a50KQEr1XZKjS_WKXywGwh4OC3gyjY6M8FTc0eNcxpg,10183
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/satellite.py,sha256=_7RcuNmR1mjxEJWMDsjnzKUIqWxnGUn50XtjB7HmSPg,3661
 maps4fs/generator/settings.py,sha256=3ASf3hW1nkGt8_3IOvKIKNUd6XAHYTAA8FquuhpSUlU,5668
 maps4fs/generator/texture.py,sha256=gIXCHU1vT3evbkaXAV9gLUrgI1wH3xJLgWAtZgFruj0,34013
 maps4fs/generator/dtm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maps4fs/generator/dtm/dtm.py,sha256=azy-RWsc5PgenKDtgG0lrddMwWEw1hYzdng9V8zphMk,9167
+maps4fs/generator/dtm/dtm.py,sha256=nCQKQygARLxaz4HkREQQd0Yb03oKOf1Iav5_VoZsFWI,9819
 maps4fs/generator/dtm/srtm.py,sha256=2-pX6bWrJX6gr8IM7ueX6mm_PW7_UQ58MtdzDHae2OQ,9030
-maps4fs/generator/dtm/usgs.py,sha256=ZTi10RNDA3EBrsVg2ZoYrdN4uqiG1Jvk7FzdcKdgNkU,13408
+maps4fs/generator/dtm/usgs.py,sha256=hwVjoSNTNRU6hwnfwJ2d3rOdtOjadCmx2QESA2REn6s,14493
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.6.7.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.6.7.dist-info/METADATA,sha256=uNK0tEiWExntm4F61lyfM4q4qY-qw4naYg7iFE6Kb5M,38680
-maps4fs-1.6.7.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-maps4fs-1.6.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.6.7.dist-info/RECORD,,
+maps4fs-1.6.9.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.6.9.dist-info/METADATA,sha256=S88e8c-JM845kgEPu9QGWuFhNXYkU6yCqsSqq980np8,39160
+maps4fs-1.6.9.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+maps4fs-1.6.9.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.6.9.dist-info/RECORD,,