maps4fs 1.1.0__py3-none-any.whl → 1.1.6__py3-none-any.whl

maps4fs/generator/background.py

@@ -43,6 +43,7 @@ class Background(Component):
     def preprocess(self) -> None:
         """Registers the DEMs for the background terrain."""
         self.light_version = self.kwargs.get("light_version", False)
+        self.stl_preview_path: str | None = None
 
         if self.rotation:
             self.logger.debug("Rotation is enabled: %s.", self.rotation)
@@ -335,7 +336,8 @@ class Background(Component):
                 cv2.imwrite(background_dem_preview_path, background_dem_preview_image)
                 preview_paths.append(background_dem_preview_path)
 
-        preview_paths.append(self.stl_preview_path)
+        if self.stl_preview_path:
+            preview_paths.append(self.stl_preview_path)
 
         return preview_paths
 

maps4fs/generator/component.py

@@ -356,6 +356,7 @@ class Component:
             offset = (self.map_size / 2) - (self.map_rotated_size / 2)
             self.logger.debug("Translating the polygon by %s", offset)
             polygon = translate(polygon, xoff=offset, yoff=offset)
+            self.logger.debug("Rotated and translated polygon.")
 
         if margin:
             polygon = polygon.buffer(margin, join_style="mitre")
@@ -367,12 +368,16 @@ class Component:
 
         # Intersect the polygon with the bounds to fit it within the map
         fitted_polygon = polygon.intersection(bounds)
+        self.logger.debug("Fitted the polygon into the bounds: %s", bounds)
 
         if not isinstance(fitted_polygon, Polygon):
             raise ValueError("The fitted polygon is not a valid polygon.")
 
         # Return the fitted polygon points
-        return list(fitted_polygon.exterior.coords)
+        as_list = list(fitted_polygon.exterior.coords)
+        if not as_list:
+            raise ValueError("The fitted polygon has no points.")
+        return as_list
 
     def get_infolayer_path(self, layer_name: str) -> str | None:
         """Returns the path to the info layer file.

maps4fs/generator/game.py

@@ -31,7 +31,7 @@ class Game:
     """
 
     code: str | None = None
-    dem_multipliyer: int = 1
+    dem_multipliyer: int = 2
     _additional_dem_name: str | None = None
     _map_template_path: str | None = None
     _texture_schema: str | None = None

maps4fs/generator/grle.py

@@ -108,6 +108,10 @@ class GRLE(Component):
             self.game.weights_dir_path(self.map_directory), "infoLayer_farmlands.png"
         )
 
+        self.logger.info(
+            "Adding farmlands to the InfoLayer PNG file: %s.", info_layer_farmlands_path
+        )
+
         if not os.path.isfile(info_layer_farmlands_path):
             self.logger.warning("InfoLayer PNG file %s not found.", info_layer_farmlands_path)
             return
@@ -139,12 +143,19 @@ class GRLE(Component):
                 )
                 continue
 
+            self.logger.debug("Fitted field %s contains %s points.", farmland_id, len(fitted_field))
+
             field_np = np.array(fitted_field, np.int32)
             field_np = field_np.reshape((-1, 1, 2))
 
+            self.logger.debug(
+                "Created a numpy array and reshaped it. Number of points: %s", len(field_np)
+            )
+
             # Infolayer image is 1/2 of the size of the map image, that's why we need to divide
             # the coordinates by 2.
             field_np = field_np // 2
+            self.logger.debug("Divided the coordinates by 2.")
 
             # pylint: disable=no-member
             try:

maps4fs/generator/i3d.py

@@ -9,6 +9,7 @@ from xml.etree import ElementTree as ET
 from maps4fs.generator.component import Component
 
 DEFAULT_HEIGHT_SCALE = 2000
+DISPLACEMENT_LAYER_SIZE_FOR_BIG_MAPS = 32768
 DEFAULT_MAX_LOD_DISTANCE = 10000
 DEFAULT_MAX_LOD_OCCLUDER_DISTANCE = 10000
 NODE_ID_STARTING_VALUE = 500
@@ -84,6 +85,15 @@ class I3d(Component):
 
                 self.logger.debug("TerrainTransformGroup element updated in I3D file.")
 
+        if self.map_size > 4096:
+            displacement_layer = terrain_elem.find(".//DisplacementLayer")  # pylint: disable=W0631
+
+            if displacement_layer is not None:
+                displacement_layer.set("size", str(DISPLACEMENT_LAYER_SIZE_FOR_BIG_MAPS))
+                self.logger.debug(
+                    "Map size is greater than 4096, DisplacementLayer size set to %s.",
+                )
+
         tree.write(self._map_i3d_path)  # type: ignore
         self.logger.info("Map I3D file saved to: %s.", self._map_i3d_path)
 
@@ -116,6 +126,7 @@ class I3d(Component):
             return
 
         self.logger.info("Found %s fields in textures info layer.", len(fields))
+        self.logger.debug("Starging to add fields to the I3D file.")
 
         root = tree.getroot()
         gameplay_node = root.find(".//TransformGroup[@name='gameplay']")

{maps4fs-1.1.0.dist-info → maps4fs-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.1.0
+Version: 1.1.6
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -35,6 +35,7 @@ Requires-Dist: pympler
   <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="docs/tips_and_hints.md">Tips and Hints</a> •
   <a href="#Modder-Toolbox">Modder Toolbox</a><br>
   <a href="#Supported-objects">Supported objects</a> •
   <a href="#Generation-info">Generation info</a> •
@@ -44,7 +45,8 @@ Requires-Dist: pympler
   <a href="#DDS-conversion">DDS conversion</a> •
   <a href="#For-advanced-users">For advanced users</a> •
   <a href="#Resources">Resources</a> •
-  <a href="#Bugs-and-feature-requests">Bugs and feature requests</a>
+  <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
+  <a href="#Special-thanks">Special thanks</a>
 </p>
 
 
@@ -78,17 +80,16 @@ Requires-Dist: pympler
 <p align="center">
 <img src="https://github.com/user-attachments/assets/cf8f5752-9c69-4018-bead-290f59ba6976"><br>
 🌎 Detailed terrain based on real-world data.<br><br>
-<img src="https://github.com/user-attachments/assets/7f238ab4-9ff4-4c6e-ba07-5796be012baa"><br>
-🛰️ Realistic background terrain objects with satellite images.<br><br>
+<img src="https://github.com/user-attachments/assets/dc40d0bb-c20b-411c-8833-9925d0389452"><br>
+🛰️ Realistic background terrain with satellite images.<br><br>
+<img src="https://github.com/user-attachments/assets/6e3c0e99-2cce-46ac-82db-5cb60bba7a30"><br>
+📐 Perfectly aligned background terrain.<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 width="480" src="https://github.com/user-attachments/assets/4d1fa879-5d60-438b-a84e-16883bcef0ec"><br>
 🌽 Automatic farmlands generation based on the fields.<br><br>
-<img src="https://github.com/user-attachments/assets/cce45575-c917-4a1b-bdc0-6368e32ccdff"><br>
-📏 Almost any possible map sizes.
-</p>
 
 📹 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>
@@ -111,7 +112,7 @@ So, jump to [Docker version](#option-2-docker-version) to launch the tool with o
 ### 😎 For advanced users
 **Option 2:** Run the Docker version in your browser. Launch the following command in your terminal:
 ```bash
-docker run -d -p 8501:8501 iwatkot/maps4fs
+docker run -d -p 8501:8501 --name maps4fs iwatkot/maps4fs
 ```
 And open [http://localhost:8501](http://localhost:8501) in your browser.<br>
 If you don't know how to use Docker, navigate to the [Docker version](#option-2-docker-version), it's really simple.<br>
@@ -174,7 +175,7 @@ You can launch the project with minimalistic UI in your browser using Docker. Fo
 1. Install [Docker](https://docs.docker.com/get-docker/) for your OS.
 2. Run the following command in your terminal:
 ```bash
-docker run -d -p 8501:8501 iwatkot/maps4fs
+docker run -d -p 8501:8501 --name maps4fs iwatkot/maps4fs
 ```
 3. Open your browser and go to [http://localhost:8501](http://localhost:8501).
 4. Fill in the required fields and click on the `Generate` button.
@@ -491,3 +492,13 @@ To create a basic map, you only need the Giants Editor. But if you want to creat
 ## Bugs and feature requests
 ➡️ 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`.
+
+## Special thanks
+
+Of course, first of all, thanks to the direct [contributors](https://github.com/iwatkot/maps4fs/graphs/contributors) of the project.  
+
+But also, I want to thank the people who helped me with the project in some way, even if they didn't contribute directly. Here's the list of them:
+
+- [Ka5tis](https://github.com/Ka5tis) - for investigating the issue with a "spiky terrain" and finding a solution - changing the `DisplacementLayer` size to a higher value.
+- [Kalderone](https://www.youtube.com/@Kalderone_FS22) - for useful feedback, suggestions, expert advice on the map-making process and highlihting some important settings in the Giants Editor.
+- [OneSunnySunday](https://www.artstation.com/onesunnysunday) - for expert advice on Blender, help in processing background terrain, and compiling detailed tutorials on how to prepare the OBJ files for use in Giants Editor.

{maps4fs-1.1.0.dist-info → maps4fs-1.1.6.dist-info}/RECORD

@@ -1,21 +1,21 @@
 maps4fs/__init__.py,sha256=da4jmND2Ths9AffnkAKgzLHNkvKFOc_l21gJisPXqWY,155
 maps4fs/logger.py,sha256=B-NEYpMjPAAqlV4VpfTi6nbBFnEABVtQOaYe6nMpidg,1489
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/background.py,sha256=wBFIT38GH3_JRWHnXjPXLr4k1KN_Cyag9LdIS3n3lts,15794
-maps4fs/generator/component.py,sha256=iYQgw2l_rvVpZ-VIhoZELdAe8rPVBwCVKwRsYejDCb0,17094
+maps4fs/generator/background.py,sha256=dnUkS1atEqqz_ryKkcfP_K9ZcwMHZVs97y-twZMpD44,15881
+maps4fs/generator/component.py,sha256=sihh2S35q0o38leEU-dpi0is6kYCuxXiWUISAtiQErM,17351
 maps4fs/generator/config.py,sha256=b7qY0luC-_WM_c72Ohtlf4FrB37X5cALInbestSdUsw,4382
 maps4fs/generator/dem.py,sha256=rc7ADzjvlZzStOqagsWW0Vrm9-X86aPpoR1RhBF_-OE,16025
-maps4fs/generator/game.py,sha256=H4msVHoDlJD5_9KoRvr3lCv2ZbLqJPqPDCEAEIDaCB4,7407
-maps4fs/generator/grle.py,sha256=HFOH07RZfkCkIpSj2VSMoBUjhmYDVCFWQQYd4tn6O5o,7162
-maps4fs/generator/i3d.py,sha256=GcGyawpE70yVjH9WdgpbNXESZoHYHmCKncl7pp5G1zo,11741
+maps4fs/generator/game.py,sha256=2oA77i9lyNYOlhtOZft6KiPTxgGJbX1Gam1TosMNLis,7407
+maps4fs/generator/grle.py,sha256=IVbvzF_azItxLE_ZxaM_suQflEZjJuMgHmv1En51G7A,7592
+maps4fs/generator/i3d.py,sha256=SzjAxYacbBQ030N2sHh9c-dhWoG3iADJqCrHBox6vWI,12268
 maps4fs/generator/map.py,sha256=7UqLjDZgoY6M0ZxX5Q4Rjee2UGWZ64a3tGyr8B24UO0,4863
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/texture.py,sha256=uSt563KomSVUndl25IgEIi0YuhBQbnhPIoQKa-4A3_E,26016
 maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/toolbox/background.py,sha256=9BXWNqs_n3HgqDiPztWylgYk_QM4YgBpe6_ZNQAWtSc,2154
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.1.0.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.1.0.dist-info/METADATA,sha256=DECQI5vTzd9ppdZZNkC-uRchalBX-bQakSIqrKjPkPQ,27907
-maps4fs-1.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.1.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.1.0.dist-info/RECORD,,
+maps4fs-1.1.6.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.1.6.dist-info/METADATA,sha256=W5x23vIOjkx-xxq4L0VIWVIA9pCgOniTQvbFqiTUVFs,28942
+maps4fs-1.1.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.1.6.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.1.6.dist-info/RECORD,,