maps4fs 2.0.0__tar.gz → 2.0.3__tar.gz

{maps4fs-2.0.0 → maps4fs-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.0.0
+Version: 2.0.3
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -26,6 +26,7 @@ Requires-Dist: pygmdl
 Requires-Dist: owslib
 Requires-Dist: tqdm
 Requires-Dist: scipy
+Requires-Dist: pydtmdl
 Dynamic: license-file
 
 ⚠️ Learn more about the 2.0 changes in the [migration guide](docs/migration.md).  
@@ -65,7 +66,6 @@ Dynamic: license-file
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="docs/procedural_generation.md">Procedural Generation</a> •
-  <a href="#DTM-Providers">DTM Providers</a> •
   <a href="#Special-thanks">Special thanks</a>
 </p>
 
@@ -87,7 +87,7 @@ Dynamic: license-file
 🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
-🌐 Supports custom [DTM Providers](#DTM-Providers)<br>
+🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
 🌾 Automatically generates fields<br>
 🌽 Automatically generates farmlands<br>
 🌿 Automatically generates decorative foliage<br>
@@ -362,7 +362,7 @@ You can also specify any custom size of the map. Be aware that Giants Editor sup
 This setting can be useful if you want add some scaling to your map. For example, you can select a region of 3000 meters in real world and set the output size to 2048 meters. In this case, the map will be generated with a size of 2048x2048 meters, but it will contain the region of 3000x3000 meters in real world.
 
 ### DTM Provider
-DTM Provider is a source of the height map data. will find the list of available providers in the [DTM Providers](#dtm-providers) section. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
+DTM Provider is a source of the height map data. will find the list of available providers in the [pydtmdl](https://github.com/iwatkot/pydtmdl) repository. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
 **NOTE:** Some of the providers are community-developed and may not work properly. I do not provide any support for them. If you have any issues with them, please contact the provider's author.
 
 ### Map Rotation
@@ -711,45 +711,6 @@ To create a basic map, you only need the Giants Editor. But if you want to creat
 ➡️ Please, before creating an issue or asking some questions, check the [FAQ](docs/FAQ.md) section.<br>
 If you find a bug or have an idea for a new feature, please create an issue [here](https://github.com/iwatkot/maps4fs/issues) or contact me directly on [Telegram](https://t.me/iwatkot) or on Discord: `iwatkot`.
 
-## DTM Providers
-
-The generator supports adding the own DTM providers, please refer to the [DTM Providers](docs/dtm_providers.md) section to learn how to add the custom DTM provider.
-
-### Supported DTM providers
-
-![coverage map](https://github.com/user-attachments/assets/be5c5ce1-7318-4352-97eb-efba7ec587cd)
-
-In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
-
-| Provider Name                      | Resolution   | Developer                                   |
-| ---------------------------------- | ------------ | ------------------------------------------- |
-| 🌎 SRTM30                          | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
-| 🌎 ArcticDEM                       | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🌎 REMA Antarctica                 | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇺🇸 USGS                            | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
-| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                        | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Hessen, Germany                 | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Niedersachsen, Germany          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Bayern, Germany                 | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
-| 🇩🇪 Nordrhein-Westfalen, Germany    | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 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) |
-| 🇮🇹 Italy                           | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇳🇴 Norway                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇪🇸 Spain                           | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇮 Finland                         | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇰 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
 
 Of course, first of all, thanks to the direct [contributors](https://github.com/iwatkot/maps4fs/graphs/contributors) of the project.

{maps4fs-2.0.0 → maps4fs-2.0.3}/README.md

@@ -35,7 +35,6 @@
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="docs/procedural_generation.md">Procedural Generation</a> •
-  <a href="#DTM-Providers">DTM Providers</a> •
   <a href="#Special-thanks">Special thanks</a>
 </p>
 
@@ -57,7 +56,7 @@
 🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
-🌐 Supports custom [DTM Providers](#DTM-Providers)<br>
+🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
 🌾 Automatically generates fields<br>
 🌽 Automatically generates farmlands<br>
 🌿 Automatically generates decorative foliage<br>
@@ -332,7 +331,7 @@ You can also specify any custom size of the map. Be aware that Giants Editor sup
 This setting can be useful if you want add some scaling to your map. For example, you can select a region of 3000 meters in real world and set the output size to 2048 meters. In this case, the map will be generated with a size of 2048x2048 meters, but it will contain the region of 3000x3000 meters in real world.
 
 ### DTM Provider
-DTM Provider is a source of the height map data. will find the list of available providers in the [DTM Providers](#dtm-providers) section. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
+DTM Provider is a source of the height map data. will find the list of available providers in the [pydtmdl](https://github.com/iwatkot/pydtmdl) repository. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
 **NOTE:** Some of the providers are community-developed and may not work properly. I do not provide any support for them. If you have any issues with them, please contact the provider's author.
 
 ### Map Rotation
@@ -681,45 +680,6 @@ To create a basic map, you only need the Giants Editor. But if you want to creat
 ➡️ Please, before creating an issue or asking some questions, check the [FAQ](docs/FAQ.md) section.<br>
 If you find a bug or have an idea for a new feature, please create an issue [here](https://github.com/iwatkot/maps4fs/issues) or contact me directly on [Telegram](https://t.me/iwatkot) or on Discord: `iwatkot`.
 
-## DTM Providers
-
-The generator supports adding the own DTM providers, please refer to the [DTM Providers](docs/dtm_providers.md) section to learn how to add the custom DTM provider.
-
-### Supported DTM providers
-
-![coverage map](https://github.com/user-attachments/assets/be5c5ce1-7318-4352-97eb-efba7ec587cd)
-
-In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
-
-| Provider Name                      | Resolution   | Developer                                   |
-| ---------------------------------- | ------------ | ------------------------------------------- |
-| 🌎 SRTM30                          | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
-| 🌎 ArcticDEM                       | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🌎 REMA Antarctica                 | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇺🇸 USGS                            | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
-| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                        | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Hessen, Germany                 | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Niedersachsen, Germany          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Bayern, Germany                 | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
-| 🇩🇪 Nordrhein-Westfalen, Germany    | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 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) |
-| 🇮🇹 Italy                           | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇳🇴 Norway                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇪🇸 Spain                           | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇮 Finland                         | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇰 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
 
 Of course, first of all, thanks to the direct [contributors](https://github.com/iwatkot/maps4fs/graphs/contributors) of the project.

{maps4fs-2.0.0 → maps4fs-2.0.3}/maps4fs/__init__.py

@@ -1,8 +1,9 @@
 # pylint: disable=missing-module-docstring
+import pydtmdl.providers as dtm
+from pydtmdl import DTMProvider
+
 import maps4fs.generator.component as component
-import maps4fs.generator.dtm as dtm
 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

{maps4fs-2.0.0 → maps4fs-2.0.3}/maps4fs/generator/component/dem.py

@@ -5,12 +5,12 @@ from typing import Any
 
 import cv2
 import numpy as np
+from pydtmdl import DTMProvider
 
 # import rasterio  # type: ignore
 from pympler import asizeof  # type: ignore
 
 from maps4fs.generator.component.base.component_image import ImageComponent
-from maps4fs.generator.dtm.dtm import DTMProvider
 
 
 # pylint: disable=R0903, R0902
@@ -46,7 +46,6 @@ class DEM(ImageComponent):
             size=self.map_rotated_size,
             directory=self.temp_dir,
             logger=self.logger,
-            map=self.map,
         )
 
         self.info: dict[str, Any] = {}
@@ -159,7 +158,7 @@ class DEM(ImageComponent):
 
         self.update_info("original", data)
 
-        # Check if the data contains any non zero values, otherwise raise an error.
+        # Check if the data contains any non-zero values, otherwise raise an error.
         if not np.any(data):
             self.logger.error("DTM provider returned empty data.")
             raise ValueError("DTM provider returned empty data. Try using different DTM provider.")
@@ -275,7 +274,7 @@ class DEM(ImageComponent):
             np.ndarray: Multiplied DEM data.
         """
         multiplier = self.map.dem_settings.multiplier
-        if not multiplier != 1:
+        if multiplier == 1:
             return data
 
         multiplied_data = data * multiplier

{maps4fs-2.0.0 → maps4fs-2.0.3}/maps4fs/generator/map.py

@@ -11,9 +11,10 @@ from xml.etree import ElementTree as ET
 import osmnx as ox
 from geopy.geocoders import Nominatim
 from osmnx._errors import InsufficientResponseError
+from pydtmdl import DTMProvider
+from pydtmdl.base.dtm import DTMProviderSettings
 
 from maps4fs.generator.component import Background, Component, Layer, Texture
-from maps4fs.generator.dtm.dtm import DTMProvider, DTMProviderSettings
 from maps4fs.generator.game import FS25, Game
 from maps4fs.generator.settings import (
     BackgroundSettings,

{maps4fs-2.0.0 → maps4fs-2.0.3}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.0.0
+Version: 2.0.3
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -26,6 +26,7 @@ Requires-Dist: pygmdl
 Requires-Dist: owslib
 Requires-Dist: tqdm
 Requires-Dist: scipy
+Requires-Dist: pydtmdl
 Dynamic: license-file
 
 ⚠️ Learn more about the 2.0 changes in the [migration guide](docs/migration.md).  
@@ -65,7 +66,6 @@ Dynamic: license-file
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="docs/procedural_generation.md">Procedural Generation</a> •
-  <a href="#DTM-Providers">DTM Providers</a> •
   <a href="#Special-thanks">Special thanks</a>
 </p>
 
@@ -87,7 +87,7 @@ Dynamic: license-file
 🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
-🌐 Supports custom [DTM Providers](#DTM-Providers)<br>
+🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
 🌾 Automatically generates fields<br>
 🌽 Automatically generates farmlands<br>
 🌿 Automatically generates decorative foliage<br>
@@ -362,7 +362,7 @@ You can also specify any custom size of the map. Be aware that Giants Editor sup
 This setting can be useful if you want add some scaling to your map. For example, you can select a region of 3000 meters in real world and set the output size to 2048 meters. In this case, the map will be generated with a size of 2048x2048 meters, but it will contain the region of 3000x3000 meters in real world.
 
 ### DTM Provider
-DTM Provider is a source of the height map data. will find the list of available providers in the [DTM Providers](#dtm-providers) section. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
+DTM Provider is a source of the height map data. will find the list of available providers in the [pydtmdl](https://github.com/iwatkot/pydtmdl) repository. The default provider is `SRTM30Provider` which is available all aroung the globe, but the resolution is not very high. If you want to use a different provider, you can select it in the dropdown list. You will only see the providers that are available for the selected region. It's better to use the provider that has the highest resolution for the selected region.
 **NOTE:** Some of the providers are community-developed and may not work properly. I do not provide any support for them. If you have any issues with them, please contact the provider's author.
 
 ### Map Rotation
@@ -711,45 +711,6 @@ To create a basic map, you only need the Giants Editor. But if you want to creat
 ➡️ Please, before creating an issue or asking some questions, check the [FAQ](docs/FAQ.md) section.<br>
 If you find a bug or have an idea for a new feature, please create an issue [here](https://github.com/iwatkot/maps4fs/issues) or contact me directly on [Telegram](https://t.me/iwatkot) or on Discord: `iwatkot`.
 
-## DTM Providers
-
-The generator supports adding the own DTM providers, please refer to the [DTM Providers](docs/dtm_providers.md) section to learn how to add the custom DTM provider.
-
-### Supported DTM providers
-
-![coverage map](https://github.com/user-attachments/assets/be5c5ce1-7318-4352-97eb-efba7ec587cd)
-
-In addition to SRTM 30m, which provides global coverage, the map above highlights all countries and/or regions where higher resolution coverage is provided by one of the DTM providers.
-
-| Provider Name                      | Resolution   | Developer                                   |
-| ---------------------------------- | ------------ | ------------------------------------------- |
-| 🌎 SRTM30                          | 30 meters    | [iwatkot](https://github.com/iwatkot)       |
-| 🌎 ArcticDEM                       | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🌎 REMA Antarctica                 | 2 meters     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇺🇸 USGS                            | 1-90 meters  | [ZenJakey](https://github.com/ZenJakey)     |
-| 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England                         | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland                        | 0.25-1 meter | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Hessen, Germany                 | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Niedersachsen, Germany          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 Bayern, Germany                 | 1 meter      | [H4rdB4se](https://github.com/H4rdB4se)     |
-| 🇩🇪 Nordrhein-Westfalen, Germany    | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇪 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) |
-| 🇮🇹 Italy                           | 10 meter     | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇳🇴 Norway                          | 1 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇪🇸 Spain                           | 5 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇫🇮 Finland                         | 2 meter      | [kbrandwijk](https://github.com/kbrandwijk) |
-| 🇩🇰 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
 
 Of course, first of all, thanks to the direct [contributors](https://github.com/iwatkot/maps4fs/graphs/contributors) of the project.

maps4fs-2.0.3/maps4fs.egg-info/SOURCES.txt

@@ -0,0 +1,31 @@
+LICENSE.md
+README.md
+pyproject.toml
+maps4fs/__init__.py
+maps4fs/logger.py
+maps4fs.egg-info/PKG-INFO
+maps4fs.egg-info/SOURCES.txt
+maps4fs.egg-info/dependency_links.txt
+maps4fs.egg-info/requires.txt
+maps4fs.egg-info/top_level.txt
+maps4fs/generator/__init__.py
+maps4fs/generator/game.py
+maps4fs/generator/map.py
+maps4fs/generator/qgis.py
+maps4fs/generator/settings.py
+maps4fs/generator/statistics.py
+maps4fs/generator/component/__init__.py
+maps4fs/generator/component/background.py
+maps4fs/generator/component/config.py
+maps4fs/generator/component/dem.py
+maps4fs/generator/component/grle.py
+maps4fs/generator/component/i3d.py
+maps4fs/generator/component/layer.py
+maps4fs/generator/component/satellite.py
+maps4fs/generator/component/texture.py
+maps4fs/generator/component/base/__init__.py
+maps4fs/generator/component/base/component.py
+maps4fs/generator/component/base/component_image.py
+maps4fs/generator/component/base/component_mesh.py
+maps4fs/generator/component/base/component_xml.py
+tests/test_generator.py

{maps4fs-2.0.0 → maps4fs-2.0.3}/maps4fs.egg-info/requires.txt

@@ -11,3 +11,4 @@ pygmdl
 owslib
 tqdm
 scipy
+pydtmdl

{maps4fs-2.0.0 → maps4fs-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.0.0"
+version = "2.0.3"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "Apache License 2.0"}
@@ -30,6 +30,7 @@ dependencies = [
     "owslib",
     "tqdm",
     "scipy",
+    "pydtmdl",
 ]
 
 [project.urls]

maps4fs-2.0.0/maps4fs/generator/dtm/__init__.py

@@ -1,26 +0,0 @@
-# pylint: disable=missing-module-docstring
-from maps4fs.generator.dtm.arctic import ArcticProvider
-from maps4fs.generator.dtm.baden import BadenWurttembergProvider
-from maps4fs.generator.dtm.bavaria import BavariaProvider
-from maps4fs.generator.dtm.canada import CanadaProvider
-from maps4fs.generator.dtm.czech import CzechProvider
-from maps4fs.generator.dtm.denmark import DenmarkProvider
-from maps4fs.generator.dtm.england import England1MProvider
-from maps4fs.generator.dtm.finland import FinlandProvider
-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
-from maps4fs.generator.dtm.nrw import NRWProvider
-from maps4fs.generator.dtm.rema import REMAProvider
-from maps4fs.generator.dtm.sachsenanhalt import SachsenAnhaltProvider
-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-2.0.0/maps4fs/generator/dtm/arctic.py

@@ -1,74 +0,0 @@
-"""This module contains provider of Arctic data."""
-
-import os
-
-import requests
-
-from maps4fs.generator.dtm.dtm import DTMProvider
-
-
-class ArcticProvider(DTMProvider):
-    """Provider of Arctic data."""
-
-    _code = "arctic"
-    _name = "ArcticDEM"
-    _region = "Global"
-    _icon = "🌍"
-    _resolution = 2
-    _author = "[kbrandwijk](https://github.com/kbrandwijk)"
-    _is_community = True
-
-    _extents = [(83.98823036056658, 50.7492704708152, 179.99698443265999, -180)]
-
-    _instructions = (
-        "This provider source includes 2 meter DEM data for the entire Arctic region above 50 "
-        "degrees North. The tiles are very big, around 1 GB each, so downloading and processing "
-        "them can take a long time."
-    )
-
-    _url = "https://stac.pgc.umn.edu/api/v1/collections/arcticdem-mosaics-v4.1-2m/items"
-
-    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)
-        self.shared_tiff_path = os.path.join(self._tile_directory, "shared")
-        os.makedirs(self.shared_tiff_path, exist_ok=True)
-
-    def get_download_urls(self) -> list[str]:
-        """Get download URLs of the GeoTIFF files from the OGC API.
-
-        Returns:
-            list: List of download URLs.
-        """
-        urls = []
-
-        try:
-            # Make the GET request
-            north, south, east, west = self.get_bbox()
-            response = requests.get(  # pylint: disable=W3101
-                self.url,  # type: ignore
-                params={
-                    "bbox": f"{west},{south},{east},{north}",
-                    "limit": "100",
-                },
-                timeout=60,
-            )
-            self.logger.debug("Getting file locations from ArcticDEM OGC API...")
-
-            # 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["features"]
-                for item in items:
-                    urls.append(item["assets"]["dem"]["href"])
-            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

maps4fs-2.0.0/maps4fs/generator/dtm/baden.py

@@ -1,31 +0,0 @@
-"""This module contains provider of Baden-Württemberg data."""
-
-from maps4fs.generator.dtm.base.wcs import WCSProvider
-from maps4fs.generator.dtm.dtm import DTMProvider
-
-
-class BadenWurttembergProvider(WCSProvider, DTMProvider):
-    """Provider of Baden-Württemberg data."""
-
-    _code = "baden"
-    _name = "Baden-Württemberg"
-    _region = "DE"
-    _icon = "🇩🇪"
-    _resolution = "1"
-    _author = "[kbrandwijk](https://github.com/kbrandwijk)"
-    _is_community = True
-    _instructions = None
-    _is_base = False
-    _extents = [(49.79645444804715, 47.52877040346605, 10.54203149250156, 7.444081717803481)]
-
-    _url = "https://owsproxy.lgl-bw.de/owsproxy/wcs/WCS_INSP_BW_Hoehe_Coverage_DGM1"
-    _wcs_version = "2.0.1"
-    _source_crs = "EPSG:25832"
-    _tile_size = 1000
-
-    def get_wcs_parameters(self, tile):
-        return {
-            "identifier": ["EL.ElevationGridCoverage"],
-            "subsets": [("E", str(tile[1]), str(tile[3])), ("N", str(tile[0]), str(tile[2]))],
-            "format": "image/tiff",
-        }

maps4fs-2.0.0/maps4fs/generator/dtm/base/wcs.py

@@ -1,80 +0,0 @@
-"""This module contains the base WCS provider."""
-
-import os
-from abc import abstractmethod
-
-from owslib.wcs import WebCoverageService
-from tqdm import tqdm
-
-from maps4fs.generator.dtm import utils
-from maps4fs.generator.dtm.dtm import DTMProvider
-
-
-# pylint: disable=too-many-locals
-class WCSProvider(DTMProvider):
-    """Generic provider of WCS sources."""
-
-    _is_base = True
-    _wcs_version = "2.0.1"
-    _source_crs: str = "EPSG:4326"
-    _tile_size: float = 0.02
-
-    @abstractmethod
-    def get_wcs_parameters(self, tile: tuple[float, float, float, float]) -> dict:
-        """Get the parameters for the WCS request.
-
-        Arguments:
-            tile (tuple): The tile to download.
-
-        Returns:
-            dict: The parameters for the WCS request.
-        """
-
-    def get_wcs_instance_parameters(self) -> dict:
-        """Get the parameters for the WCS instance.
-
-        Returns:
-            dict: The parameters for the WCS instance.
-        """
-        return {
-            "url": self._url,
-            "version": self._wcs_version,
-            "timeout": 120,
-        }
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.shared_tiff_path = os.path.join(self._tile_directory, "shared")
-        os.makedirs(self.shared_tiff_path, exist_ok=True)
-
-    def download_tiles(self) -> list[str]:
-        bbox = self.get_bbox()
-        bbox = utils.transform_bbox(bbox, self._source_crs)
-        tiles = utils.tile_bbox(bbox, self._tile_size)
-
-        all_tif_files = self.download_all_tiles(tiles)
-        return all_tif_files
-
-    def download_all_tiles(self, tiles: list[tuple[float, float, float, float]]) -> list[str]:
-        """Download tiles from the NI provider.
-
-        Arguments:
-            tiles (list): List of tiles to download.
-
-        Returns:
-            list: List of paths to the downloaded GeoTIFF files.
-        """
-        all_tif_files = []
-        params = self.get_wcs_instance_parameters()
-        wcs = WebCoverageService(**params)
-
-        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
-            file_name = "_".join(map(str, tile)) + ".tif"
-            file_path = os.path.join(self.shared_tiff_path, file_name)
-            if not os.path.exists(file_path):
-                output = wcs.getCoverage(**self.get_wcs_parameters(tile))
-                with open(file_path, "wb") as f:
-                    f.write(output.read())
-
-            all_tif_files.append(file_path)
-        return all_tif_files

maps4fs-2.0.0/maps4fs/generator/dtm/base/wms.py

@@ -1,71 +0,0 @@
-"""This module contains the base WMS provider."""
-
-import os
-from abc import abstractmethod
-
-from owslib.wms import WebMapService
-from tqdm import tqdm
-
-from maps4fs.generator.dtm import utils
-from maps4fs.generator.dtm.dtm import DTMProvider
-
-
-# pylint: disable=too-many-locals
-class WMSProvider(DTMProvider):
-    """Generic provider of WMS sources."""
-
-    _is_base = True
-    _wms_version = "1.3.0"
-    _source_crs: str = "EPSG:4326"
-    _tile_size: float = 0.02
-
-    @abstractmethod
-    def get_wms_parameters(self, tile: tuple[float, float, float, float]) -> dict:
-        """Get the parameters for the WMS request.
-
-        Arguments:
-            tile (tuple): The tile to download.
-
-        Returns:
-            dict: The parameters for the WMS request.
-        """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.shared_tiff_path = os.path.join(self._tile_directory, "shared")
-        os.makedirs(self.shared_tiff_path, exist_ok=True)
-
-    def download_tiles(self) -> list[str]:
-        bbox = self.get_bbox()
-        bbox = utils.transform_bbox(bbox, self._source_crs)
-        tiles = utils.tile_bbox(bbox, self._tile_size)
-
-        all_tif_files = self.download_all_tiles(tiles)
-        return all_tif_files
-
-    def download_all_tiles(self, tiles: list[tuple[float, float, float, float]]) -> list[str]:
-        """Download tiles from the WMS provider.
-
-        Arguments:
-            tiles (list): List of tiles to download.
-
-        Returns:
-            list: List of paths to the downloaded GeoTIFF files.
-        """
-        all_tif_files = []
-        wms = WebMapService(
-            self._url,
-            version=self._wms_version,
-            # auth=Authentication(verify=False),
-            timeout=600,
-        )
-        for tile in tqdm(tiles, desc="Downloading tiles", unit="tile"):
-            file_name = "_".join(map(str, tile)) + ".tif"
-            file_path = os.path.join(self.shared_tiff_path, file_name)
-            if not os.path.exists(file_path):
-                output = wms.getmap(**self.get_wms_parameters(tile))
-                with open(file_path, "wb") as f:
-                    f.write(output.read())
-
-            all_tif_files.append(file_path)
-        return all_tif_files