PyPI - maps4fs - Versions diffs - 2.0.2__tar.gz → 2.0.4__tar.gz - Mend

maps4fs 2.0.2tar.gz → 2.0.4tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

{maps4fs-2.0.2 → maps4fs-2.0.4}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.0.2
+Version: 2.0.4
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -26,10 +26,11 @@ 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).
-⚠️ Some components are deprecated and there are major changes in the project structure.
+⚠️ Some components are deprecated, and there are major changes in the project structure.
 <p align="center">
@@ -37,7 +38,9 @@ Dynamic: license-file
 <a href="https://github.com/iwatkot/maps4fsui">maps4fs UI</a> •
 <a href="https://github.com/iwatkot/maps4fsapi">maps4fs API</a> •
 <a href="https://github.com/iwatkot/maps4fsstats">maps4fs Stats</a> •
-<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a>
+<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a><br>
+<a href="https://github.com/iwatkot/pygmdl">pygmdl</a> •
+<a href="https://github.com/iwatkot/pydtmdl">pydtmdl</a>
 </p>
 <div align="center" markdown>
@@ -49,6 +52,7 @@ Dynamic: license-file
   <a href="#Quick-Start">Quick Start</a> •
   <a href="#Overview">Overview</a> •
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
+  <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
@@ -65,7 +69,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>
@@ -73,12 +76,11 @@ Dynamic: license-file
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/releases)
 [![PyPI - Version](https://img.shields.io/pypi/v/maps4fs)](https://pypi.org/project/maps4fs)
 [![Docker Pulls](https://img.shields.io/docker/pulls/iwatkot/maps4fs)](https://hub.docker.com/repository/docker/iwatkot/maps4fs/general)
-[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)
-[![Maintainability](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/maintainability)](https://codeclimate.com/github/iwatkot/maps4fs/maintainability)<br>
+[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)<br>
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/maps4fs)](https://pypi.org/project/maps4fs)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
 [![Build Status](https://github.com/iwatkot/maps4fs/actions/workflows/checks.yml/badge.svg)](https://github.com/iwatkot/maps4fs/actions)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/test_coverage)](https://codeclimate.com/github/iwatkot/maps4fs/test_coverage)
+[![codecov](https://codecov.io/gh/iwatkot/maps4fs/graph/badge.svg?token=NSKPFSKJXI)](https://codecov.io/gh/iwatkot/maps4fs)
 [![GitHub Repo stars](https://img.shields.io/github/stars/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/stargazers)<br>
 </div>
@@ -87,7 +89,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>
@@ -130,10 +132,7 @@ Dynamic: license-file
 <img width="480" src="https://github.com/user-attachments/assets/4d1fa879-5d60-438b-a84e-16883bcef0ec"><br>
 🌽 Automatic farmlands generation based on the fields.<br><br>
-📹 WIP: Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
-📹 A complete step-by-step video tutorial is here!
-<a href="https://www.youtube.com/watch?v=Nl_aqXJ5nAk" target="_blank"><img src="https://github.com/user-attachments/assets/4845e030-0e73-47ab-a5a3-430308913060"/></a>
+📹 Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
 <p align="center"><i>How to Generate a Map for Farming Simulator 25 and 22 from a real place using maps4FS.</i></p>
@@ -149,7 +148,7 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 **Option 1:** Open the [maps4fs](https://maps4fs.xyz) and generate a map template in a few clicks.<br>
-![Basic WebUI](https://github.com/user-attachments/assets/52f499cc-f28a-4da3-abef-0e818abe8dbe)
+![Basic WebUI](https://github.com/iwatkot/maps4fs/releases/download/2.0.0/maps4fs_wui.png)
 ### 😎 For advanced users
@@ -362,7 +361,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,46 +710,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) |
-| 🏴󠁧󠁢󠁷󠁬󠁳󠁿󠁧󠁢󠁷󠁬󠁳󠁿 Wales                           | 1 meter      | [garnwenshared](https://github.com/garnshared) |
-| 🇩🇪 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.2 → maps4fs-2.0.4}/README.md RENAMED Viewed

@@ -1,5 +1,5 @@
 ⚠️ Learn more about the 2.0 changes in the [migration guide](docs/migration.md).
-⚠️ Some components are deprecated and there are major changes in the project structure.
+⚠️ Some components are deprecated, and there are major changes in the project structure.
 <p align="center">
@@ -7,7 +7,9 @@
 <a href="https://github.com/iwatkot/maps4fsui">maps4fs UI</a> •
 <a href="https://github.com/iwatkot/maps4fsapi">maps4fs API</a> •
 <a href="https://github.com/iwatkot/maps4fsstats">maps4fs Stats</a> •
-<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a>
+<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a><br>
+<a href="https://github.com/iwatkot/pygmdl">pygmdl</a> •
+<a href="https://github.com/iwatkot/pydtmdl">pydtmdl</a>
 </p>
 <div align="center" markdown>
@@ -19,6 +21,7 @@
   <a href="#Quick-Start">Quick Start</a> •
   <a href="#Overview">Overview</a> •
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
+  <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
@@ -35,7 +38,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>
@@ -43,12 +45,11 @@
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/releases)
 [![PyPI - Version](https://img.shields.io/pypi/v/maps4fs)](https://pypi.org/project/maps4fs)
 [![Docker Pulls](https://img.shields.io/docker/pulls/iwatkot/maps4fs)](https://hub.docker.com/repository/docker/iwatkot/maps4fs/general)
-[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)
-[![Maintainability](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/maintainability)](https://codeclimate.com/github/iwatkot/maps4fs/maintainability)<br>
+[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)<br>
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/maps4fs)](https://pypi.org/project/maps4fs)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
 [![Build Status](https://github.com/iwatkot/maps4fs/actions/workflows/checks.yml/badge.svg)](https://github.com/iwatkot/maps4fs/actions)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/test_coverage)](https://codeclimate.com/github/iwatkot/maps4fs/test_coverage)
+[![codecov](https://codecov.io/gh/iwatkot/maps4fs/graph/badge.svg?token=NSKPFSKJXI)](https://codecov.io/gh/iwatkot/maps4fs)
 [![GitHub Repo stars](https://img.shields.io/github/stars/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/stargazers)<br>
 </div>
@@ -57,7 +58,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>
@@ -100,10 +101,7 @@
 <img width="480" src="https://github.com/user-attachments/assets/4d1fa879-5d60-438b-a84e-16883bcef0ec"><br>
 🌽 Automatic farmlands generation based on the fields.<br><br>
-📹 WIP: Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
-📹 A complete step-by-step video tutorial is here!
-<a href="https://www.youtube.com/watch?v=Nl_aqXJ5nAk" target="_blank"><img src="https://github.com/user-attachments/assets/4845e030-0e73-47ab-a5a3-430308913060"/></a>
+📹 Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
 <p align="center"><i>How to Generate a Map for Farming Simulator 25 and 22 from a real place using maps4FS.</i></p>
@@ -119,7 +117,7 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 **Option 1:** Open the [maps4fs](https://maps4fs.xyz) and generate a map template in a few clicks.<br>
-![Basic WebUI](https://github.com/user-attachments/assets/52f499cc-f28a-4da3-abef-0e818abe8dbe)
+![Basic WebUI](https://github.com/iwatkot/maps4fs/releases/download/2.0.0/maps4fs_wui.png)
 ### 😎 For advanced users
@@ -332,7 +330,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,46 +679,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) |
-| 🏴󠁧󠁢󠁷󠁬󠁳󠁿󠁧󠁢󠁷󠁬󠁳󠁿 Wales                           | 1 meter      | [garnwenshared](https://github.com/garnshared) |
-| 🇩🇪 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.2 → maps4fs-2.0.4}/maps4fs/__init__.py RENAMED Viewed

@@ -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.2 → maps4fs-2.0.4}/maps4fs/generator/component/dem.py RENAMED Viewed

@@ -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] = {}

{maps4fs-2.0.2 → maps4fs-2.0.4}/maps4fs/generator/map.py RENAMED Viewed

@@ -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.2 → maps4fs-2.0.4}/maps4fs.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.0.2
+Version: 2.0.4
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -26,10 +26,11 @@ 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).
-⚠️ Some components are deprecated and there are major changes in the project structure.
+⚠️ Some components are deprecated, and there are major changes in the project structure.
 <p align="center">
@@ -37,7 +38,9 @@ Dynamic: license-file
 <a href="https://github.com/iwatkot/maps4fsui">maps4fs UI</a> •
 <a href="https://github.com/iwatkot/maps4fsapi">maps4fs API</a> •
 <a href="https://github.com/iwatkot/maps4fsstats">maps4fs Stats</a> •
-<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a>
+<a href="https://github.com/iwatkot/maps4fsbot">maps4fs Bot</a><br>
+<a href="https://github.com/iwatkot/pygmdl">pygmdl</a> •
+<a href="https://github.com/iwatkot/pydtmdl">pydtmdl</a>
 </p>
 <div align="center" markdown>
@@ -49,6 +52,7 @@ Dynamic: license-file
   <a href="#Quick-Start">Quick Start</a> •
   <a href="#Overview">Overview</a> •
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
+  <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
@@ -65,7 +69,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>
@@ -73,12 +76,11 @@ Dynamic: license-file
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/releases)
 [![PyPI - Version](https://img.shields.io/pypi/v/maps4fs)](https://pypi.org/project/maps4fs)
 [![Docker Pulls](https://img.shields.io/docker/pulls/iwatkot/maps4fs)](https://hub.docker.com/repository/docker/iwatkot/maps4fs/general)
-[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)
-[![Maintainability](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/maintainability)](https://codeclimate.com/github/iwatkot/maps4fs/maintainability)<br>
+[![GitHub issues](https://img.shields.io/github/issues/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/issues)<br>
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/maps4fs)](https://pypi.org/project/maps4fs)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
 [![Build Status](https://github.com/iwatkot/maps4fs/actions/workflows/checks.yml/badge.svg)](https://github.com/iwatkot/maps4fs/actions)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/b922fd0a7188d37e61de/test_coverage)](https://codeclimate.com/github/iwatkot/maps4fs/test_coverage)
+[![codecov](https://codecov.io/gh/iwatkot/maps4fs/graph/badge.svg?token=NSKPFSKJXI)](https://codecov.io/gh/iwatkot/maps4fs)
 [![GitHub Repo stars](https://img.shields.io/github/stars/iwatkot/maps4fs)](https://github.com/iwatkot/maps4fs/stargazers)<br>
 </div>
@@ -87,7 +89,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>
@@ -130,10 +132,7 @@ Dynamic: license-file
 <img width="480" src="https://github.com/user-attachments/assets/4d1fa879-5d60-438b-a84e-16883bcef0ec"><br>
 🌽 Automatic farmlands generation based on the fields.<br><br>
-📹 WIP: Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
-📹 A complete step-by-step video tutorial is here!
-<a href="https://www.youtube.com/watch?v=Nl_aqXJ5nAk" target="_blank"><img src="https://github.com/user-attachments/assets/4845e030-0e73-47ab-a5a3-430308913060"/></a>
+📹 Check out the complete playlist of video turorials on [YouTube](https://www.youtube.com/watch?v=hPbJZ0HoiDE&list=PLug0g7UYHX8D1Jik6NkJjQhdxqS-NOtB9). 🆕<br>
 <p align="center"><i>How to Generate a Map for Farming Simulator 25 and 22 from a real place using maps4FS.</i></p>
@@ -149,7 +148,7 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 **Option 1:** Open the [maps4fs](https://maps4fs.xyz) and generate a map template in a few clicks.<br>
-![Basic WebUI](https://github.com/user-attachments/assets/52f499cc-f28a-4da3-abef-0e818abe8dbe)
+![Basic WebUI](https://github.com/iwatkot/maps4fs/releases/download/2.0.0/maps4fs_wui.png)
 ### 😎 For advanced users
@@ -362,7 +361,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,46 +710,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) |
-| 🏴󠁧󠁢󠁷󠁬󠁳󠁿󠁧󠁢󠁷󠁬󠁳󠁿 Wales                           | 1 meter      | [garnwenshared](https://github.com/garnshared) |
-| 🇩🇪 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.4/maps4fs.egg-info/SOURCES.txt ADDED Viewed

@@ -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.2 → maps4fs-2.0.4}/maps4fs.egg-info/requires.txt RENAMED Viewed

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

{maps4fs-2.0.2 → maps4fs-2.0.4}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "maps4fs"
-version = "2.0.2"
+version = "2.0.4"
 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.2/maps4fs/generator/dtm/__init__.py DELETED Viewed

@@ -1,27 +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
-from maps4fs.generator.dtm.wales import WalesProvider

maps4fs 2.0.2__tar.gz → 2.0.4__tar.gz

maps4fs 2.0.2tar.gz → 2.0.4tar.gz