maps4fs 1.8.198__tar.gz → 1.8.200__tar.gz

{maps4fs-1.8.198 → maps4fs-1.8.200}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.198
+Version: 1.8.200
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -714,6 +714,8 @@ In addition to SRTM 30m, which provides global coverage, the map above highlight
 | 🇩🇰 Denmark                         | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇭 Switzerland                     | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇿 Czech Republic                  | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇱🇹 Lithuania                       | 1 meter      | [Tox3](https://github.com/Tox3) |
+
 
 ## Special thanks
 

{maps4fs-1.8.198 → maps4fs-1.8.200}/README.md

@@ -684,6 +684,8 @@ In addition to SRTM 30m, which provides global coverage, the map above highlight
 | 🇩🇰 Denmark                         | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇭 Switzerland                     | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇿 Czech Republic                  | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇱🇹 Lithuania                       | 1 meter      | [Tox3](https://github.com/Tox3) |
+
 
 ## Special thanks
 

{maps4fs-1.8.198 → maps4fs-1.8.200}/maps4fs/__init__.py

@@ -5,4 +5,4 @@ import maps4fs.generator.settings as settings
 from maps4fs.generator.dtm.dtm import DTMProvider
 from maps4fs.generator.game import Game
 from maps4fs.generator.map import Map
-from maps4fs.logger import Logger
+from maps4fs.logger import Logger

{maps4fs-1.8.198 → maps4fs-1.8.200}/maps4fs/generator/dtm/__init__.py

@@ -11,6 +11,7 @@ from maps4fs.generator.dtm.flanders import FlandersProvider
 from maps4fs.generator.dtm.france import FranceProvider
 from maps4fs.generator.dtm.hessen import HessenProvider
 from maps4fs.generator.dtm.italy import ItalyProvider
+from maps4fs.generator.dtm.lithuania import LithuaniaProvider
 from maps4fs.generator.dtm.mv import MecklenburgVorpommernProvider
 from maps4fs.generator.dtm.niedersachsen import NiedersachsenProvider
 from maps4fs.generator.dtm.norway import NorwayProvider

{maps4fs-1.8.198 → maps4fs-1.8.200}/maps4fs/generator/dtm/dtm.py

@@ -249,10 +249,16 @@ class DTMProvider(ABC):
         return None
 
     @classmethod
-    def get_valid_provider_descriptions(cls, lat_lon: tuple[float, float]) -> dict[str, str]:
+    def get_valid_provider_descriptions(
+        cls, lat_lon: tuple[float, float], default_code: str = "srtm30"
+    ) -> dict[str, str]:
         """Get descriptions of all providers, where keys are provider codes and
         values are provider descriptions.
 
+        Arguments:
+            lat_lon (tuple): Latitude and longitude of the center point.
+            default_code (str): Default provider code.
+
         Returns:
             dict: Provider descriptions.
         """
@@ -262,6 +268,10 @@ class DTMProvider(ABC):
                 code = provider.code()
                 if code is not None:
                     providers[code] = provider.description()
+
+        # Sort the dictionary, to make sure that the default provider is the first one.
+        providers = dict(sorted(providers.items(), key=lambda item: item[0] != default_code))
+
         return providers
 
     @classmethod

maps4fs-1.8.200/maps4fs/generator/dtm/lithuania.py

@@ -0,0 +1,49 @@
+"""This module contains provider of Lithuania data."""
+
+from typing import List
+import requests
+from maps4fs.generator.dtm.dtm import DTMProvider
+from maps4fs.generator.dtm.utils import tile_bbox
+
+class LithuaniaProvider(DTMProvider):
+    _code = "lithuania"
+    _name = "Lithuania"
+    _region = "LT"
+    _icon = "🇱🇹"
+    _resolution = 1.0
+    _author = "[Tox3](https://github.com/Tox3)"
+    _is_community = True
+    _is_base = False
+    _extents = (56.4501789128452, 53.8901567283941, 26.8198345671209, 20.9312456789123)
+    _max_tile_size = 4096
+    _url = "https://utility.arcgis.com/usrsvcs/servers/fef66dec83c14b0295180ecafa662aa0/rest/services/DTM_LT2020/ImageServer/exportImage"
+
+    def download_tiles(self) -> List[str]:
+        """Download DTM tiles for Lithuania."""
+        bbox = self.get_bbox()
+        grid_size = max(1, self.size // self._max_tile_size)
+        tile_size = (self.size / grid_size) / 111000  # Convert to degrees
+        
+        raw_tiles = tile_bbox(bbox, tile_size)
+        # Fix coordinate swapping from utils.tile_bbox
+        tiles = [(t[1], t[3], t[0], t[2]) for t in raw_tiles]  # Reorder N,S,E,W correctly
+        
+        download_urls = []
+        for i, (north, south, east, west) in enumerate(tiles):
+            params = {
+                'f': 'json',
+                'bbox': f"{west},{south},{east},{north}",
+                'bboxSR': '4326',
+                'imageSR': '3346',
+                'format': 'tiff',
+                'pixelType': 'F32',
+                'size': f"{self._max_tile_size},{self._max_tile_size}"
+            }
+            
+            response = requests.get(self.url, params=params, verify=False, timeout=60)
+            data = response.json()
+            if 'href' not in data:
+                raise RuntimeError(f"No image URL in response for tile {i}")
+            download_urls.append(data['href'])
+
+        return self.download_tif_files(download_urls, self._tile_directory)

{maps4fs-1.8.198 → maps4fs-1.8.200}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.198
+Version: 1.8.200
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -714,6 +714,8 @@ In addition to SRTM 30m, which provides global coverage, the map above highlight
 | 🇩🇰 Denmark                         | 0.4 meter    | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇭 Switzerland                     | 0.5-2 meter  | [kbrandwijk](https://github.com/kbrandwijk) |
 | 🇨🇿 Czech Republic                  | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
+| 🇱🇹 Lithuania                       | 1 meter      | [Tox3](https://github.com/Tox3) |
+
 
 ## Special thanks
 

{maps4fs-1.8.198 → maps4fs-1.8.200}/maps4fs.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ maps4fs/generator/dtm/flanders.py
 maps4fs/generator/dtm/france.py
 maps4fs/generator/dtm/hessen.py
 maps4fs/generator/dtm/italy.py
+maps4fs/generator/dtm/lithuania.py
 maps4fs/generator/dtm/mv.py
 maps4fs/generator/dtm/niedersachsen.py
 maps4fs/generator/dtm/norway.py

{maps4fs-1.8.198 → maps4fs-1.8.200}/pyproject.toml

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