maps4fs 2.0.7__py3-none-any.whl → 2.0.9__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -542,41 +542,28 @@ class Background(MeshComponent, ImageComponent):
         It creates polygons from the polylines, fits them into the map bounds, and generates a mesh.
         """
         self.logger.debug("Starting line-based water generation...")
-
-        water_polylines = self.get_infolayer_data(Parameters.BACKGROUND, Parameters.WATER_POLYLINES)
+        water_polygons = self.get_infolayer_data(Parameters.BACKGROUND, Parameters.WATER)
         self.logger.debug(
-            "Found %s water polylines in background info layer.", len(water_polylines)  # type: ignore
+            "Found %s water polygons in background info layer.", len(water_polygons)  # type: ignore
         )
-        if not water_polylines:
-            self.logger.warning("No water polylines found in background info layer.")
+        if not water_polygons:
+            self.logger.warning("No water polygons found in background info layer.")
             return
 
         polygons: list[shapely.Polygon] = []
-        for polyline in water_polylines:
-            points = polyline["points"]
-            width = polyline["width"]
-            if not points or len(points) < 2:
-                self.logger.warning("Skipping polyline with insufficient points: %s", polyline)
+        for polygon_points in water_polygons:
+            if not polygon_points or len(polygon_points) < 2:
+                self.logger.warning("Skipping polygon with insufficient points...")
                 continue
 
-            # Create a shapely LineString from the points
-            line = shapely.geometry.LineString(points)
-            # Create a buffer around the line to create a polygon
-            if width <= 0:
-                self.logger.warning("Skipping polyline with non-positive width: %s", polyline)
-                continue
+            polygon = shapely.Polygon(polygon_points)
 
-            polygon = line.buffer(
-                width + Parameters.WATER_ADD_WIDTH, cap_style=shapely.geometry.CAP_STYLE.square
-            )
-            if polygon.is_empty:
-                self.logger.warning("Skipping empty polygon created from polyline: %s", polyline)
+            if polygon.is_empty or not polygon.is_valid:
+                self.logger.warning("Skipping empty or invalid polygon...")
                 continue
 
-            # Ensure the polygon is valid and not empty
-            if not polygon.is_valid:
-                self.logger.warning("Invalid polygon created from polyline, skipping: %s", polyline)
-                continue
+            # Make Polygon a little bit bigger to hide under the terrain when creating water planes.
+            polygon = polygon.buffer(Parameters.WATER_ADD_WIDTH, resolution=4)
 
             polygons.append(polygon)
 

maps4fs/generator/settings.py

@@ -19,6 +19,7 @@ class Parameters:
     FOREST = "forest"
     ROADS_POLYLINES = "roads_polylines"
     WATER_POLYLINES = "water_polylines"
+    WATER = "water"
     FARMYARDS = "farmyards"
 
     PREVIEW_MAXIMUM_SIZE = 2048

{maps4fs-2.0.7.dist-info → maps4fs-2.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.0.7
+Version: 2.0.9
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.0.7.dist-info → maps4fs-2.0.9.dist-info}/RECORD

@@ -4,10 +4,10 @@ maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk
 maps4fs/generator/game.py,sha256=g8lMHuuRRmJLSDsQTAMv8p_-qntYMiZKnAqn7ru96i0,11645
 maps4fs/generator/map.py,sha256=x_NjUwKkDnh2cC61QpTfX88mFHAkQG1sxVwZckoV0mE,16357
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=CRXpUi_ftZP9N6FckVnnXPzQKfShP_5zaDy2mhKgaR4,7524
+maps4fs/generator/settings.py,sha256=iEazY2goQlyYgJA6-jhCvDOh7EZ4bDzBDGocJ5K3cjc,7544
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=etQ3woLLfLA4_SYMtUcSRy6aGYKtJAROKFEXr9SHTcE,30019
+maps4fs/generator/component/background.py,sha256=wqTgndTfRIGlLMpMXqJMw_6eVdH1JtMei46ZIXlT9X4,29480
 maps4fs/generator/component/config.py,sha256=IP530sapLofFskSnBEB96G0aUSd6Sno0G9ET3ca0ZOQ,3696
 maps4fs/generator/component/dem.py,sha256=SH_2Zu5O4dhWtZeOkCwzDF4RU04XhTdpGFYaRYJkdjc,11905
 maps4fs/generator/component/grle.py,sha256=8K32pC_ar9CR6p0EhCe2X--wEoIxFzJCPcN9ydHQ1LE,19747
@@ -20,8 +20,8 @@ maps4fs/generator/component/base/component.py,sha256=Vgmdsn1ZC37EwWi4Va4uYVt0RnF
 maps4fs/generator/component/base/component_image.py,sha256=2NYJgCU8deHl7O2FYFYk38WKZVJygFoc2gjBXwH6vjM,5970
 maps4fs/generator/component/base/component_mesh.py,sha256=lZuF-9hzDYodL4Ub4RgvFjsozxTPZJrOaLQmlNTrZ7I,9074
 maps4fs/generator/component/base/component_xml.py,sha256=V9pGUvHh6UF6BP0qFARqDq9vquoAgq1zJqhOgBoeS_Y,3983
-maps4fs-2.0.7.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-2.0.7.dist-info/METADATA,sha256=9jqulAtUcyYRpILh0AZOCt8ZsIhIhJ2Dln9N-E3p0Fc,44135
-maps4fs-2.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.0.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.0.7.dist-info/RECORD,,
+maps4fs-2.0.9.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-2.0.9.dist-info/METADATA,sha256=JhBYuvnO_3NuZlvzWafXt94qffCQPdO5GXotONW69PE,44135
+maps4fs-2.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.0.9.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.0.9.dist-info/RECORD,,