maps4fs 0.9.98__tar.gz → 1.0.3__tar.gz

{maps4fs-0.9.98 → maps4fs-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.9.98
+Version: 1.0.3
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: opencv-python
-Requires-Dist: osmnx<2.0.0
+Requires-Dist: osmnx>=2.0.0
 Requires-Dist: rasterio
 Requires-Dist: folium
 Requires-Dist: geopy
@@ -31,8 +31,10 @@ Requires-Dist: pympler
 <p align="center">
   <a href="#Quick-Start">Quick Start</a> •
   <a href="#Overview">Overview</a> • 
-  <a href="#How-To-Run">How-To-Run</a> •
+  <a href="#Step-by-step">Create a map in 10 steps</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> •
   <a href="#Modder-Toolbox">Modder Toolbox</a><br>
   <a href="#Supported-objects">Supported objects</a> •
   <a href="#Generation-info">Generation info</a> •
@@ -68,6 +70,7 @@ Requires-Dist: pympler
 🔷 Generates *.obj files for background terrain based on the real-world height map<br>
 📄 Generates scripts to download high-resolution satellite images from [QGIS](https://qgis.org/download/) in one click<br>
 🧰 Modder Toolbox to help you with various of tasks 🆕<br>
+🌾 Automatically generates fields 🆕<br>
 
 <p align="center">
 <img src="https://github.com/user-attachments/assets/cf8f5752-9c69-4018-bead-290f59ba6976"><br>
@@ -76,6 +79,8 @@ Requires-Dist: pympler
 🛰️ Realistic background terrain objects with satellite images.<br><br>
 <img src="https://github.com/user-attachments/assets/80e5923c-22c7-4dc0-8906-680902511f3a"><br>
 🗒️ True-to-life blueprints for fast and precise modding.<br><br>
+<img width="480" src="https://github.com/user-attachments/assets/1a8802d2-6a3b-4bfa-af2b-7c09478e199b"><br>
+🌾 Field generation with one click.<br><br>
 <img src="https://github.com/user-attachments/assets/cce45575-c917-4a1b-bdc0-6368e32ccdff"><br>
 📏 Almost any possible map sizes.
 </p>
@@ -84,6 +89,13 @@ Requires-Dist: pympler
 There are several ways to use the tool. You obviously need the **first one**, but you can choose any of the others depending on your needs.<br>
 ### 🚜 For most users
 **Option 1:** open the [maps4fs](https://maps4fs.streamlit.app) on StreamLit and generate a map template in a few clicks.<br>
+<i>Note, that StreamLit community hosting has some limitations, such as:  <br>
+1. Maximum map size is 4096x4096 meters.  <br>
+2. Advanced settings are disabled.  <br>
+3. Texure dissolving is disabled (they will look worse).  </i><br>
+
+If you run the application locally, you won't have any of these limitations and will be able to generate maps of any size with any settings you want and nice looking textures.<br>
+So, jump to [Docker version](#option-2-docker-version) to launch the tool with one command and get the full experience.<br>
 
 ![Basic WebUI](https://github.com/user-attachments/assets/52f499cc-f28a-4da3-abef-0e818abe8dbe)
 
@@ -126,6 +138,9 @@ Parameters:
 - coordinates: 45.15, 19.71
 - size: 16 x 16 km
 
+## Step by step
+Don't know where to start? Don't worry, just follow this [step-by-step guide](docs/step_by_step.md) to create your first map in 10 simple steps.<br>
+
 ## How-To-Run
 
 You'll find detailed instructions on how to run the project below. But if you prefer video tutorials, here's one for you:
@@ -133,14 +148,22 @@ You'll find detailed instructions on how to run the project below. But if you pr
 <i>Video tutorial: How to generate a Farming Simulator 22 map from real-world data.</i>
 
 ### Option 1: StreamLit
-🟢 Recommended for all users, you don't need to install anything.<br>
+🟢 Recommended for all users.
+🛠️ Don't need to install anything.  
+🗺️ Supported map sizes: 2x2, 4x4 km.  
+⚙️ Advanced settings: disabled.  
+🖼️ Texture dissolving: disabled.  
 Using the [StreamLit](https://maps4fs.streamlit.app) version of the tool is the easiest way to generate a map template. Just open the link and follow the instructions.
 Note: due to CPU and RAM limitations of the hosting, the generation may take some time. If you need faster processing, use the [Docker version](#option-2-docker-version).<br>
 
 Using it is easy and doesn't require any guides. Enjoy!
 
 ### Option 2: Docker version
-🟠 Recommended for users who want faster processing, very simple installation.<br>
+🟠 Recommended for users who want bigger maps, fast generation, nice looking textures and advanced settings.  
+🛠️ Launch with one single command.  
+🗺️ Supported map sizes: 2x2, 4x4, 8x8, 16x16 km and any custom size.  
+⚙️ Advanced settings: enabled.   
+🖼️ Texture dissolving: enabled.  
 You can launch the project with minimalistic UI in your browser using Docker. Follow these steps:
 
 1. Install [Docker](https://docs.docker.com/get-docker/) for your OS.
@@ -153,7 +176,10 @@ docker run -d -p 8501:8501 iwatkot/maps4fs
 5. When the map is generated click on the `Download` button to get the map.
 
 ### Option 3: Python package
-🔴 Recommended for developers.<br>
+🔴 Recommended for developers.  
+🗺️ Supported map sizes: 2x2, 4x4, 8x8, 16x16 km and any custom size.  
+⚙️ Advanced settings: enabled.   
+🖼️ Texture dissolving: enabled.  
 You can use the Python package to generate maps. Follow these steps:
 
 1. Install the package from PyPI:
@@ -202,12 +228,15 @@ The map will be saved in the `map_directory` directory.
 ## Modder Toolbox
 The tool now has a Modder Toolbox, which is a set of tools to help you with various tasks. You can open the toolbox by switching to the `🧰 Modder Toolbox` tab in the StreamLit app.<br>
 
-![Modder Toolbox](https://github.com/user-attachments/assets/18f169e9-1a5b-474c-b488-6becfffadcea)
+![Modder Toolbox](https://github.com/user-attachments/assets/dffb252f-f5c0-4021-9d45-31e5bccc0d9b)
 
 ### Tool categories
 Tools are divided into categories, which are listed below.
 #### Textures and DEM
-- **GeoTIFF windowing** - allows you to upload your GeoTIFF file and select the region of interest to extract it from the image.
+- **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 the height map using it.
+
+#### Background terrain
+- **Convert image to obj model** - allows you to convert the image to the obj model. You can use this tool to create the background terrain for your map. It can be extremely useful if you have access to the sources of high-resolution DEM data and want to create the background terrain using it.
 
 ## Supported objects
 The project is based on the [OpenStreetMap](https://www.openstreetmap.org/) data. So, refer to [this page](https://wiki.openstreetmap.org/wiki/Map_Features) to understand the list below.
@@ -376,7 +405,7 @@ Let's have a closer look at the fields:
 
 ## Background terrain
 The tool now supports the generation of the background terrain. If you don't know what it is, here's a brief explanation. The background terrain is the world around the map. It's important to create it, because if you don't, the map will look like it's floating in the void. The background terrain is a simple plane which can (and should) be texture to look fine.<br>
-So, the tool generates the background terrain in the form of the 8 tiles, which surround the map. The tiles are named as the cardinal points, e.g. "N", "NE", "E" and so on. All those tiles will be saved in the `objects/tiles` directory with corresponding names: `N.obj`, `NE.obj`, `E.obj` and so on.<br>
+So, the tool generates the background terrain in the form of the 8 tiles, which surround the map. The tiles are named as the cardinal points, e.g. "N", "NE", "E" and so on. All those tiles will be saved in the `background` directory with corresponding names: `N.obj`, `NE.obj`, `E.obj` and so on.<br>
 If you don't want to work with separate tiles, the tool also generates the `FULL.obj` file, which includes everything around the map and the map itself. It may be a convinient approach to work with one file, one texture and then just cut the map from it.<br>
 
 ![Complete background terrain in Blender](https://github.com/user-attachments/assets/7266b8f1-bfa2-4c14-a740-1c84b1030a66)

{maps4fs-0.9.98 → maps4fs-1.0.3}/README.md

@@ -6,8 +6,10 @@
 <p align="center">
   <a href="#Quick-Start">Quick Start</a> •
   <a href="#Overview">Overview</a> • 
-  <a href="#How-To-Run">How-To-Run</a> •
+  <a href="#Step-by-step">Create a map in 10 steps</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> •
   <a href="#Modder-Toolbox">Modder Toolbox</a><br>
   <a href="#Supported-objects">Supported objects</a> •
   <a href="#Generation-info">Generation info</a> •
@@ -43,6 +45,7 @@
 🔷 Generates *.obj files for background terrain based on the real-world height map<br>
 📄 Generates scripts to download high-resolution satellite images from [QGIS](https://qgis.org/download/) in one click<br>
 🧰 Modder Toolbox to help you with various of tasks 🆕<br>
+🌾 Automatically generates fields 🆕<br>
 
 <p align="center">
 <img src="https://github.com/user-attachments/assets/cf8f5752-9c69-4018-bead-290f59ba6976"><br>
@@ -51,6 +54,8 @@
 🛰️ Realistic background terrain objects with satellite images.<br><br>
 <img src="https://github.com/user-attachments/assets/80e5923c-22c7-4dc0-8906-680902511f3a"><br>
 🗒️ True-to-life blueprints for fast and precise modding.<br><br>
+<img width="480" src="https://github.com/user-attachments/assets/1a8802d2-6a3b-4bfa-af2b-7c09478e199b"><br>
+🌾 Field generation with one click.<br><br>
 <img src="https://github.com/user-attachments/assets/cce45575-c917-4a1b-bdc0-6368e32ccdff"><br>
 📏 Almost any possible map sizes.
 </p>
@@ -59,6 +64,13 @@
 There are several ways to use the tool. You obviously need the **first one**, but you can choose any of the others depending on your needs.<br>
 ### 🚜 For most users
 **Option 1:** open the [maps4fs](https://maps4fs.streamlit.app) on StreamLit and generate a map template in a few clicks.<br>
+<i>Note, that StreamLit community hosting has some limitations, such as:  <br>
+1. Maximum map size is 4096x4096 meters.  <br>
+2. Advanced settings are disabled.  <br>
+3. Texure dissolving is disabled (they will look worse).  </i><br>
+
+If you run the application locally, you won't have any of these limitations and will be able to generate maps of any size with any settings you want and nice looking textures.<br>
+So, jump to [Docker version](#option-2-docker-version) to launch the tool with one command and get the full experience.<br>
 
 ![Basic WebUI](https://github.com/user-attachments/assets/52f499cc-f28a-4da3-abef-0e818abe8dbe)
 
@@ -101,6 +113,9 @@ Parameters:
 - coordinates: 45.15, 19.71
 - size: 16 x 16 km
 
+## Step by step
+Don't know where to start? Don't worry, just follow this [step-by-step guide](docs/step_by_step.md) to create your first map in 10 simple steps.<br>
+
 ## How-To-Run
 
 You'll find detailed instructions on how to run the project below. But if you prefer video tutorials, here's one for you:
@@ -108,14 +123,22 @@ You'll find detailed instructions on how to run the project below. But if you pr
 <i>Video tutorial: How to generate a Farming Simulator 22 map from real-world data.</i>
 
 ### Option 1: StreamLit
-🟢 Recommended for all users, you don't need to install anything.<br>
+🟢 Recommended for all users.
+🛠️ Don't need to install anything.  
+🗺️ Supported map sizes: 2x2, 4x4 km.  
+⚙️ Advanced settings: disabled.  
+🖼️ Texture dissolving: disabled.  
 Using the [StreamLit](https://maps4fs.streamlit.app) version of the tool is the easiest way to generate a map template. Just open the link and follow the instructions.
 Note: due to CPU and RAM limitations of the hosting, the generation may take some time. If you need faster processing, use the [Docker version](#option-2-docker-version).<br>
 
 Using it is easy and doesn't require any guides. Enjoy!
 
 ### Option 2: Docker version
-🟠 Recommended for users who want faster processing, very simple installation.<br>
+🟠 Recommended for users who want bigger maps, fast generation, nice looking textures and advanced settings.  
+🛠️ Launch with one single command.  
+🗺️ Supported map sizes: 2x2, 4x4, 8x8, 16x16 km and any custom size.  
+⚙️ Advanced settings: enabled.   
+🖼️ Texture dissolving: enabled.  
 You can launch the project with minimalistic UI in your browser using Docker. Follow these steps:
 
 1. Install [Docker](https://docs.docker.com/get-docker/) for your OS.
@@ -128,7 +151,10 @@ docker run -d -p 8501:8501 iwatkot/maps4fs
 5. When the map is generated click on the `Download` button to get the map.
 
 ### Option 3: Python package
-🔴 Recommended for developers.<br>
+🔴 Recommended for developers.  
+🗺️ Supported map sizes: 2x2, 4x4, 8x8, 16x16 km and any custom size.  
+⚙️ Advanced settings: enabled.   
+🖼️ Texture dissolving: enabled.  
 You can use the Python package to generate maps. Follow these steps:
 
 1. Install the package from PyPI:
@@ -177,12 +203,15 @@ The map will be saved in the `map_directory` directory.
 ## Modder Toolbox
 The tool now has a Modder Toolbox, which is a set of tools to help you with various tasks. You can open the toolbox by switching to the `🧰 Modder Toolbox` tab in the StreamLit app.<br>
 
-![Modder Toolbox](https://github.com/user-attachments/assets/18f169e9-1a5b-474c-b488-6becfffadcea)
+![Modder Toolbox](https://github.com/user-attachments/assets/dffb252f-f5c0-4021-9d45-31e5bccc0d9b)
 
 ### Tool categories
 Tools are divided into categories, which are listed below.
 #### Textures and DEM
-- **GeoTIFF windowing** - allows you to upload your GeoTIFF file and select the region of interest to extract it from the image.
+- **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 the height map using it.
+
+#### Background terrain
+- **Convert image to obj model** - allows you to convert the image to the obj model. You can use this tool to create the background terrain for your map. It can be extremely useful if you have access to the sources of high-resolution DEM data and want to create the background terrain using it.
 
 ## Supported objects
 The project is based on the [OpenStreetMap](https://www.openstreetmap.org/) data. So, refer to [this page](https://wiki.openstreetmap.org/wiki/Map_Features) to understand the list below.
@@ -351,7 +380,7 @@ Let's have a closer look at the fields:
 
 ## Background terrain
 The tool now supports the generation of the background terrain. If you don't know what it is, here's a brief explanation. The background terrain is the world around the map. It's important to create it, because if you don't, the map will look like it's floating in the void. The background terrain is a simple plane which can (and should) be texture to look fine.<br>
-So, the tool generates the background terrain in the form of the 8 tiles, which surround the map. The tiles are named as the cardinal points, e.g. "N", "NE", "E" and so on. All those tiles will be saved in the `objects/tiles` directory with corresponding names: `N.obj`, `NE.obj`, `E.obj` and so on.<br>
+So, the tool generates the background terrain in the form of the 8 tiles, which surround the map. The tiles are named as the cardinal points, e.g. "N", "NE", "E" and so on. All those tiles will be saved in the `background` directory with corresponding names: `N.obj`, `NE.obj`, `E.obj` and so on.<br>
 If you don't want to work with separate tiles, the tool also generates the `FULL.obj` file, which includes everything around the map and the map itself. It may be a convinient approach to work with one file, one texture and then just cut the map from it.<br>
 
 ![Complete background terrain in Blender](https://github.com/user-attachments/assets/7266b8f1-bfa2-4c14-a740-1c84b1030a66)

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/background.py

@@ -15,7 +15,7 @@ from maps4fs.generator.dem import (
     DEFAULT_MULTIPLIER,
     DEFAULT_PLATEAU,
 )
-from maps4fs.generator.path_steps import DEFAULT_DISTANCE, PATH_FULL_NAME, get_steps
+from maps4fs.generator.path_steps import PATH_FULL_NAME, get_steps
 from maps4fs.generator.tile import Tile
 
 RESIZE_FACTOR = 1 / 4
@@ -143,7 +143,7 @@ class Background(Component):
                 self.logger.warning("DEM file not found, generation will be stopped: %s", dem_path)
                 return
 
-            self.logger.info("DEM file for tile %s found: %s", tile.code, dem_path)
+            self.logger.debug("DEM file for tile %s found: %s", tile.code, dem_path)
 
             base_directory = os.path.dirname(dem_path)
             save_path = os.path.join(base_directory, f"{tile.code}.obj")
@@ -164,7 +164,6 @@ class Background(Component):
         if tile_code == PATH_FULL_NAME:
             resize_factor = FULL_RESIZE_FACTOR
             simplify_factor = FULL_SIMPLIFY_FACTOR
-            self.logger.info("Generating a full map obj file")
         else:
             resize_factor = RESIZE_FACTOR
             simplify_factor = SIMPLIFY_FACTOR
@@ -242,119 +241,21 @@ class Background(Component):
 
         self.stl_preview_path = preview_path  # pylint: disable=attribute-defined-outside-init
 
+    # pylint: disable=no-member
     def previews(self) -> list[str]:
-        """Generates a preview by combining all tiles into one image.
-        NOTE: The map itself is not included in the preview, so it will be empty.
+        """Returns the path to the image of full tile and the path to the STL preview file.
 
         Returns:
-            list[str] -- A list of paths to the preview images."""
-
-        self.logger.info("Generating a preview image for the background DEM")
-
-        image_height = self.map_height + DEFAULT_DISTANCE * 2
-        image_width = self.map_width + DEFAULT_DISTANCE * 2
-        self.logger.debug("Full size of the preview image: %s x %s", image_width, image_height)
-
-        image = np.zeros((image_height, image_width), np.uint16)  # pylint: disable=no-member
-        self.logger.debug("Empty image created: %s", image.shape)
-
-        for tile in self.tiles:
-            # pylint: disable=no-member
-            if tile.code == PATH_FULL_NAME:
-                continue
-            tile_image = cv2.imread(tile.dem_path, cv2.IMREAD_UNCHANGED)
-
-            self.logger.debug(
-                "Tile %s image shape: %s, dtype: %s, max: %s, min: %s",
-                tile.code,
-                tile_image.shape,
-                tile_image.dtype,
-                tile_image.max(),
-                tile_image.min(),
-            )
-
-            tile_height, tile_width = tile_image.shape
-            self.logger.debug("Tile %s size: %s x %s", tile.code, tile_width, tile_height)
-
-            # Calculate the position based on the tile code
-            if tile.code == "N":
-                x = DEFAULT_DISTANCE
-                y = 0
-            elif tile.code == "NE":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = 0
-            elif tile.code == "E":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = DEFAULT_DISTANCE
-            elif tile.code == "SE":
-                x = self.map_width + DEFAULT_DISTANCE
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "S":
-                x = DEFAULT_DISTANCE
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "SW":
-                x = 0
-                y = self.map_height + DEFAULT_DISTANCE
-            elif tile.code == "W":
-                x = 0
-                y = DEFAULT_DISTANCE
-            elif tile.code == "NW":
-                x = 0
-                y = 0
-
-            # pylint: disable=possibly-used-before-assignment
-            x2 = x + tile_width
-            y2 = y + tile_height
-
-            self.logger.debug(
-                "Tile %s position. X from %s to %s, Y from %s to %s", tile.code, x, x2, y, y2
+            list[str] -- A list of paths to the previews.
+        """
+        full_tile = next((tile for tile in self.tiles if tile.code == PATH_FULL_NAME), None)
+        if full_tile:
+            preview_path = os.path.join(self.previews_directory, "background_dem.png")
+            full_tile_image = cv2.imread(full_tile.dem_path, cv2.IMREAD_UNCHANGED)
+            full_tile_image = cv2.normalize(  # type: ignore
+                full_tile_image, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U
             )
-
-            # pylint: disable=possibly-used-before-assignment
-            image[y:y2, x:x2] = tile_image
-
-        # Save image to the map directory.
-        preview_path = os.path.join(self.previews_directory, "background_dem.png")
-
-        # pylint: disable=no-member
-        image = cv2.normalize(image, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)  # type: ignore
-        image = cv2.cvtColor(image, cv2.COLOR_GRAY2BGR)  # type: ignore
-        cv2.imwrite(preview_path, image)
-
-        return [preview_path, self.stl_preview_path]
-
-
-# Creates tiles around the map.
-# The one on corners 2048x2048, on sides and in the middle map_size x 2048.
-# So 2048 is a distance FROM the edge of the map, but the other size depends on the map size.
-# But for corner tiles it's always 2048.
-
-# In the beginning we have coordinates of the central point of the map and it's size.
-# We need to calculate the coordinates of central points all 8 tiles around the map.
-
-# Latitude is a vertical line, Longitude is a horizontal line.
-
-#                         2048
-#                     |         |
-# ____________________|_________|___
-# |         |         |         |
-# |    NW   |    N    |    NE   |    2048
-# |_________|_________|_________|___
-# |         |         |         |
-# |    W    |    C    |    E    |
-# |_________|_________|_________|
-# |         |         |         |
-# |    SW   |    S    |    SE   |
-# |_________|_________|_________|
-#
-# N = C map_height / 2 + 1024; N_width = map_width; N_height = 2048
-# NW = N - map_width / 2 - 1024; NW_width = 2048; NW_height = 2048
-# and so on...
-
-# lat, lon = 45.28565000315636, 20.237121355049904
-# dst = 1024
-
-# # N
-# destination = distance(meters=dst).destination((lat, lon), 0)
-# lat, lon = destination.latitude, destination.longitude
-# print(lat, lon)
+            full_tile_image = cv2.cvtColor(full_tile_image, cv2.COLOR_GRAY2BGR)
+            cv2.imwrite(preview_path, full_tile_image)
+            return [preview_path, self.stl_preview_path]
+        return [self.stl_preview_path]

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/component.py

@@ -50,6 +50,7 @@ class Component:
 
         os.makedirs(self.previews_directory, exist_ok=True)
         os.makedirs(self.scripts_directory, exist_ok=True)
+        os.makedirs(self.info_layers_directory, exist_ok=True)
 
         self.save_bbox()
         self.preprocess()
@@ -87,6 +88,15 @@ class Component:
         """
         return os.path.join(self.map_directory, "previews")
 
+    @property
+    def info_layers_directory(self) -> str:
+        """The directory where the info layers are stored.
+
+        Returns:
+            str: The directory where the info layers are stored.
+        """
+        return os.path.join(self.map_directory, "info_layers")
+
     @property
     def scripts_directory(self) -> str:
         """The directory where the scripts are stored.
@@ -174,10 +184,10 @@ class Component:
         height_distance = height_distance or int(self.map_height / 2)
         width_distance = width_distance or int(self.map_width / 2)
 
-        north, south, _, _ = ox.utils_geo.bbox_from_point(
+        west, south, _, _ = ox.utils_geo.bbox_from_point(  # type: ignore
             coordinates, dist=height_distance, project_utm=project_utm
         )
-        _, _, east, west = ox.utils_geo.bbox_from_point(
+        _, _, east, north = ox.utils_geo.bbox_from_point(  # type: ignore
             coordinates, dist=width_distance, project_utm=project_utm
         )
         bbox = north, south, east, west

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/config.py

@@ -36,7 +36,7 @@ class Config(Component):
             self.logger.warning("Map XML file not found: %s.", self._map_xml_path)
             return
         tree = ET.parse(self._map_xml_path)
-        self.logger.debug("Map XML file loaded from: %s.", self._map_xml_path)
+        self.logger.info("Map XML file loaded from: %s.", self._map_xml_path)
         root = tree.getroot()
         for map_elem in root.iter("map"):
             map_elem.set("width", str(self.map_width))

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/dem.py

@@ -103,7 +103,7 @@ class DEM(Component):
         north, south, east, west = self.bbox
 
         dem_output_resolution = self.get_output_resolution()
-        self.logger.debug("DEM output resolution: %s.", dem_output_resolution)
+        self.logger.info("DEM output resolution: %s.", dem_output_resolution)
 
         tile_path = self._srtm_tile()
         if not tile_path:
@@ -223,7 +223,7 @@ class DEM(Component):
             )
 
         cv2.imwrite(self._dem_path, resampled_data)
-        self.logger.debug("DEM data was saved to %s.", self._dem_path)
+        self.logger.info("DEM data was saved to %s.", self._dem_path)
 
         if self.game.additional_dem_name is not None:
             self.make_copy(self.game.additional_dem_name)
@@ -239,7 +239,7 @@ class DEM(Component):
         additional_dem_path = os.path.join(dem_directory, dem_name)
 
         shutil.copyfile(self._dem_path, additional_dem_path)
-        self.logger.debug("Additional DEM data was copied to %s.", additional_dem_path)
+        self.logger.info("Additional DEM data was copied to %s.", additional_dem_path)
 
     def _tile_info(self, lat: float, lon: float) -> tuple[str, str]:
         """Returns latitude band and tile name for SRTM tile from coordinates.
@@ -260,7 +260,7 @@ class DEM(Component):
         else:
             tile_name = f"{latitude_band}E{abs(tile_longitude):03d}"
 
-        self.logger.debug(
+        self.logger.info(
             "Detected tile name: %s for coordinates: lat %s, lon %s.", tile_name, lat, lon
         )
         return latitude_band, tile_name
@@ -319,7 +319,7 @@ class DEM(Component):
     def _save_empty_dem(self, dem_output_resolution: tuple[int, int]) -> None:
         """Saves empty DEM file filled with zeros."""
         dem_data = np.zeros(dem_output_resolution, dtype="uint16")
-        cv2.imwrite(self._dem_path, dem_data)  # pylint: disable=no-member
+        cv2.imwrite(self._dem_path, dem_data)
         self.logger.warning("DEM data filled with zeros and saved to %s.", self._dem_path)
 
     def grayscale_preview(self) -> str:
@@ -329,7 +329,6 @@ class DEM(Component):
         Returns:
             str: Path to the preview image.
         """
-        # rgb_dem_path = self._dem_path.replace(".png", "_grayscale.png")
         grayscale_dem_path = os.path.join(self.previews_directory, "dem_grayscale.png")
 
         self.logger.debug("Creating grayscale preview of DEM data in %s.", grayscale_dem_path)
@@ -346,8 +345,6 @@ class DEM(Component):
         Returns:
             list[str]: List with a single path to the DEM file
         """
-
-        # colored_dem_path = self._dem_path.replace(".png", "_colored.png")
         colored_dem_path = os.path.join(self.previews_directory, "dem_colored.png")
 
         self.logger.debug("Creating colored preview of DEM data in %s.", colored_dem_path)
@@ -424,14 +421,18 @@ class DEM(Component):
 
         scaling_factor = self._get_scaling_factor(max_dev)
         adjusted_max_height = int(65535 * scaling_factor)
-        self.logger.debug(
-            f"Maximum deviation: {max_dev}. Scaling factor: {scaling_factor}. "
-            f"Adjusted max height: {adjusted_max_height}."
+        self.logger.info(
+            "Maximum deviation: %s. Scaling factor: %s. Adjusted max height: %s.",
+            max_dev,
+            scaling_factor,
+            adjusted_max_height,
         )
         normalized_data = (
             (data - data.min()) / (data.max() - data.min()) * adjusted_max_height
         ).astype("uint16")
         self.logger.debug(
-            f"DEM data was normalized to {normalized_data.min()} - {normalized_data.max()}."
+            "DEM data was normalized to %s - %s.",
+            normalized_data.min(),
+            normalized_data.max(),
         )
         return normalized_data

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/game.py

@@ -38,7 +38,8 @@ class Game:
     _texture_schema: str | None = None
     _grle_schema: str | None = None
 
-    components = [Config, Texture, GRLE, DEM, I3d, Background]
+    # Order matters! Some components depend on others.
+    components = [Texture, I3d, DEM, Config, GRLE, Background]
 
     def __init__(self, map_template_path: str | None = None):
         if map_template_path:

{maps4fs-0.9.98 → maps4fs-1.0.3}/maps4fs/generator/grle.py

@@ -61,7 +61,7 @@ class GRLE(Component):
                 info_layer_data = np.zeros((height, width), dtype=data_type)
                 print(info_layer_data.shape)
                 cv2.imwrite(file_path, info_layer_data)  # pylint: disable=no-member
-                self.logger.info("InfoLayer PNG file %s created.", file_path)
+                self.logger.debug("InfoLayer PNG file %s created.", file_path)
             else:
                 self.logger.warning("Invalid InfoLayer schema: %s.", info_layer)