maps4fs 1.8.231__py3-none-any.whl → 1.8.232__py3-none-any.whl

maps4fs/generator/component/grle.py

@@ -13,6 +13,8 @@ from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.component.base.component_xml import XMLComponent
 from maps4fs.generator.settings import Parameters
 
+FARMLAND_ID_LIMIT = 254
+
 
 def plant_to_pixel_value(plant_name: str) -> int | None:
     """Returns the pixel value representation of the plant.
@@ -225,6 +227,13 @@ class GRLE(ImageComponent, XMLComponent):
 
             farmland_np = self.polygon_points_to_np(fitted_farmland, divide=2)
 
+            if farmland_id > FARMLAND_ID_LIMIT:
+                self.logger.warning(
+                    "Farmland ID limit reached. Skipping the rest of the farmlands. "
+                    "Giants Editor supports maximum 254 farmlands."
+                )
+                break
+
             try:
                 cv2.fillPoly(image, [farmland_np], (float(farmland_id),))
             except Exception as e:
@@ -246,6 +255,10 @@ class GRLE(ImageComponent, XMLComponent):
 
         self.save_tree(tree)
 
+        # Replace all the zero values on the info layer image with 255.
+        if self.map.grle_settings.fill_empty_farmlands:
+            image[image == 0] = 255
+
         cv2.imwrite(info_layer_farmlands_path, image)
 
         self.preview_paths["farmlands"] = info_layer_farmlands_path

maps4fs/generator/component/i3d.py

@@ -18,7 +18,6 @@ from maps4fs.generator.settings import Parameters
 NODE_ID_STARTING_VALUE = 2000
 SPLINES_NODE_ID_STARTING_VALUE = 5000
 TREE_NODE_ID_STARTING_VALUE = 10000
-TREES_DEFAULT_Z_VALUE = 400
 
 FIELDS_ATTRIBUTES = [
     ("angle", "integer", "0"),
@@ -132,17 +131,10 @@ class I3d(XMLComponent):
             self.logger.warning("Shapes or Scene node not found in I3D file.")
             return
 
-        # Read the not resized DEM to obtain Z values for spline points.
-        background_component = self.map.get_background_component()
-        if not background_component:
-            self.logger.warning("Background component not found.")
-            return
-
-        not_resized_dem = cv2.imread(background_component.not_resized_path, cv2.IMREAD_UNCHANGED)
+        not_resized_dem = self.get_not_resized_dem()
         if not_resized_dem is None:
             self.logger.warning("Not resized DEM not found.")
             return
-        dem_x_size, dem_y_size = not_resized_dem.shape
 
         user_attributes_node = root.find(".//UserAttributes")
         if user_attributes_node is None:
@@ -201,11 +193,7 @@ class I3d(XMLComponent):
                     cx, cy = point_ccs
                     x, y = point
 
-                    x = max(0, min(int(x), dem_x_size - 1))
-                    y = max(0, min(int(y), dem_y_size - 1))
-
-                    z = not_resized_dem[y, x]
-                    z *= self.get_z_scaling_factor()
+                    z = self.get_z_coordinate_from_dem(not_resized_dem, x, y)
 
                     nurbs_curve_node.append(self.create_element("cv", {"c": f"{cx}, {z}, {cy}"}))
 
@@ -471,31 +459,41 @@ class I3d(XMLComponent):
             "TransformGroup",
             {
                 "name": "trees",
-                "translation": f"0 {TREES_DEFAULT_Z_VALUE} 0",
+                "translation": "0 0 0",
                 "nodeId": str(node_id),
             },
         )
         node_id += 1
 
+        not_resized_dem = self.get_not_resized_dem()
+        if not_resized_dem is None:
+            self.logger.warning("Not resized DEM not found.")
+            return
+
         forest_image = cv2.imread(forest_image_path, cv2.IMREAD_UNCHANGED)
         for x, y in self.non_empty_pixels(forest_image, step=self.map.i3d_settings.forest_density):
-            xcs, ycs = self.top_left_coordinates_to_center((x, y))
-            node_id += 1
-
-            rotation = randint(-180, 180)
-            shifted_xcs, shifted_ycs = self.randomize_coordinates(
-                (xcs, ycs),
+            shifted_x, shifted_y = self.randomize_coordinates(
+                (x, y),
                 self.map.i3d_settings.forest_density,
                 self.map.i3d_settings.trees_relative_shift,
             )
 
+            shifted_x, shifted_y = int(shifted_x), int(shifted_y)
+
+            z = self.get_z_coordinate_from_dem(not_resized_dem, shifted_x, shifted_y)
+
+            xcs, ycs = self.top_left_coordinates_to_center((shifted_x, shifted_y))
+            node_id += 1
+
+            rotation = randint(-180, 180)
+
             random_tree = choice(tree_schema)
             tree_name = random_tree["name"]
             tree_id = random_tree["reference_id"]
 
             data = {
                 "name": tree_name,
-                "translation": f"{shifted_xcs} 0 {shifted_ycs}",
+                "translation": f"{xcs} {z} {ycs}",
                 "rotation": f"0 {rotation} 0",
                 "referenceId": str(tree_id),
                 "nodeId": str(node_id),
@@ -546,3 +544,43 @@ class I3d(XMLComponent):
             for x, value in enumerate(row[::step]):
                 if value > 0:
                     yield x * step, y * step
+
+    def get_not_resized_dem(self) -> np.ndarray | None:
+        """Reads the not resized DEM image from the background component.
+
+        Returns:
+            np.ndarray | None: The not resized DEM image or None if the image could not be read.
+        """
+        background_component = self.map.get_background_component()
+        if not background_component:
+            self.logger.warning("Background component not found.")
+            return None
+
+        if not background_component.not_resized_path:
+            self.logger.warning("Not resized DEM path not found.")
+            return None
+
+        not_resized_dem = cv2.imread(background_component.not_resized_path, cv2.IMREAD_UNCHANGED)
+
+        return not_resized_dem
+
+    def get_z_coordinate_from_dem(self, not_resized_dem: np.ndarray, x: int, y: int) -> float:
+        """Gets the Z coordinate from the DEM image for the given coordinates.
+
+        Arguments:
+            not_resized_dem (np.ndarray): The not resized DEM image.
+            x (int): The x coordinate.
+            y (int): The y coordinate.
+
+        Returns:
+            float: The Z coordinate.
+        """
+        dem_x_size, dem_y_size = not_resized_dem.shape
+
+        x = int(max(0, min(x, dem_x_size - 1)))
+        y = int(max(0, min(y, dem_y_size - 1)))
+
+        z = not_resized_dem[y, x]
+        z *= self.get_z_scaling_factor()
+
+        return z

maps4fs/generator/settings.py

@@ -175,6 +175,7 @@ class GRLESettings(SettingsModel):
     plants_island_vertex_count: int = 30
     plants_island_rounding_radius: int = 15
     plants_island_percent: int = 100
+    fill_empty_farmlands: bool = False
 
 
 class I3DSettings(SettingsModel):

{maps4fs-1.8.231.dist-info → maps4fs-1.8.232.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.231
+Version: 1.8.232
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -628,6 +628,8 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - Plants island percent - defines the relation between the map size and the number of islands of plants. For example, if set to 100% for map size of 2048 will be added 2048 islands of plants.
 
+- Fill empty farmlands - if enabled, the empty (zero value) pixels of the farmlands image will be replaces with the value of 255.
+
 ### I3D Advanced settings
 
 - Forest density - the density of the forest in meters. The lower the value, the lower the distance between the trees, which makes the forest denser. Note, that low values will lead to enormous number of trees, which may cause the Giants Editor to crash or lead to performance issues. By default, it's set to 10.

{maps4fs-1.8.231.dist-info → maps4fs-1.8.232.dist-info}/RECORD

@@ -5,13 +5,13 @@ maps4fs/generator/dem.py,sha256=a9B3tatj7pzvvdLIyLw7BA3JoDTibFczpqiXJnx054U,1286
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
 maps4fs/generator/map.py,sha256=Tn33S8e7a2guvpjr1_GCpYIQFAz-ekkEUAobS02i6Xo,12669
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=d3NaMpyFh-IZWtHV2UQMMqUfuPP76lv7mIN2d7mORqA,6747
+maps4fs/generator/settings.py,sha256=DJCG--Z__JBEc-fllWOvnb4roYuNFv7bSkAclUZV2gE,6786
 maps4fs/generator/statistics.py,sha256=JfhiGDZf2-VoWZbL-Kikzv4_DqerYwKcseccVL9qzXo,1783
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
 maps4fs/generator/component/background.py,sha256=7YkSFrbPHN_dTh4xB1lM60mloLJXOdXZw19T0Gs4x1k,18971
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
-maps4fs/generator/component/grle.py,sha256=kCx00SJdYEDr0tcHFvHC99928e9Eke2t_LwNxkqfvBg,18984
-maps4fs/generator/component/i3d.py,sha256=tUvN-nA0Zl-HMplvWJSuHI22aUSMZQqXMXYJFPnhnug,20146
+maps4fs/generator/component/grle.py,sha256=C6wpYQrJBVRb3vVbEAY5BYTRYU9BaefmoWCXoPrVn2A,19454
+maps4fs/generator/component/i3d.py,sha256=AKS3FS4pdsWR0GxCar1F9_jREfUH-7CqR7vxdiVmXao,21294
 maps4fs/generator/component/layer.py,sha256=QPcEzTv_8N9wYvHAZy8OezfATaVLG-YetSfCXf2lnFI,5892
 maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
 maps4fs/generator/component/texture.py,sha256=GWOE7w2maydB2LDku-YEC1w1oc8kcnnZ1SPTL6b82H8,30966
@@ -53,8 +53,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RclEqxEWLbMxuEkkegQP8jybzugwQ1_R3rdfDe0s21U,2104
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.231.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.231.dist-info/METADATA,sha256=MxaS-z4S5AOoI7BRem0WBnxWpK7JlvijIcopSntdkeU,45770
-maps4fs-1.8.231.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.231.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.231.dist-info/RECORD,,
+maps4fs-1.8.232.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.232.dist-info/METADATA,sha256=2R9A1R0ESS6QCB7LMcSpVUo6vSUOshtR7ZETKcVaVeI,45901
+maps4fs-1.8.232.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.232.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.232.dist-info/RECORD,,