maps4fs 1.9.52__py3-none-any.whl → 1.9.54__py3-none-any.whl

maps4fs/generator/component/i3d.py

@@ -119,6 +119,12 @@ class I3d(XMLComponent):
         tree = self.get_tree(splines_i3d_path)
 
         roads_polylines = self.get_infolayer_data(Parameters.TEXTURES, Parameters.ROADS_POLYLINES)
+
+        if self.map.spline_settings.field_splines:
+            fields_polygons = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
+            if isinstance(roads_polylines, list) and isinstance(fields_polygons, list):
+                roads_polylines.extend(fields_polygons)
+
         if not roads_polylines:
             self.logger.warning("Roads polylines data not found in textures info layer.")
             return
@@ -152,8 +158,14 @@ class I3d(XMLComponent):
 
         node_id = SPLINES_NODE_ID_STARTING_VALUE
         for road_id, road_info in enumerate(roads_polylines, start=1):
-            points = road_info.get("points")
-            tags = road_info.get("tags")
+            if isinstance(road_info, dict):
+                points = road_info.get("points")
+                tags = road_info.get("tags")
+                is_field = False
+            else:
+                points = road_info
+                tags = "field"
+                is_field = True
 
             try:
                 fitted_road = self.fit_object_into_bounds(
@@ -208,15 +220,16 @@ class I3d(XMLComponent):
 
                 shapes_node.append(nurbs_curve_node)
 
-                user_attribute_node = self.get_user_attribute_node(
-                    node_id,
-                    attributes=[
-                        ("maxSpeedScale", "integer", "1"),
-                        ("speedLimit", "integer", "100"),
-                    ],
-                )
+                if not is_field:
+                    user_attribute_node = self.get_user_attribute_node(
+                        node_id,
+                        attributes=[
+                            ("maxSpeedScale", "integer", "1"),
+                            ("speedLimit", "integer", "100"),
+                        ],
+                    )
 
-                user_attributes_node.append(user_attribute_node)
+                    user_attributes_node.append(user_attribute_node)
                 node_id += 1
 
         tree.write(splines_i3d_path)  # type: ignore

maps4fs/generator/map.py

@@ -92,6 +92,7 @@ class Map:
                 "dtm_provider": dtm_provider.name(),
                 "custom_osm": bool(custom_osm),
                 "is_public": kwargs.get("is_public", False),
+                "api_request": kwargs.get("api_request", False),
             }
             send_main_settings(main_settings)
         except Exception as e:

maps4fs/generator/settings.py

@@ -227,6 +227,7 @@ class SplineSettings(SettingsModel):
 
     spline_density: int = 2
     add_reversed_splines: bool = False
+    field_splines: bool = False
 
 
 class SatelliteSettings(SettingsModel):

{maps4fs-1.9.52.dist-info → maps4fs-1.9.54.dist-info}/METADATA

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

{maps4fs-1.9.52.dist-info → maps4fs-1.9.54.dist-info}/RECORD

@@ -2,16 +2,16 @@ maps4fs/__init__.py,sha256=EGvLVoRpSt4jITswsGbe1ISVmGAZAMQJcBmTwtyuVxI,335
 maps4fs/logger.py,sha256=WDfR14hxqy8b6xtwL6YIu2LGzFO1sbt0LxMgfsDTOkA,865
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/game.py,sha256=g8lMHuuRRmJLSDsQTAMv8p_-qntYMiZKnAqn7ru96i0,11645
-maps4fs/generator/map.py,sha256=7-nx27M-VwTocPor8BCkkpthYBJYe_B-pe5_Dcsijaw,13899
+maps4fs/generator/map.py,sha256=3q9S4tYWeRaYO_ENLD_80towAEnIVn11_9mXNsqN6eg,13964
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=E_M47X2QhbBqgiNraBDQd62lAQlNWHYLq30HQ59_4k4,7490
+maps4fs/generator/settings.py,sha256=e_wAJy69QoEmYgXOsoNc1Hp115FNcLQBzrrv-o8Pzd8,7522
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
 maps4fs/generator/component/background.py,sha256=AfbgNUai3tvpMe8lYmfiaM1n51ssunECy4gRglihumU,24032
 maps4fs/generator/component/config.py,sha256=IP530sapLofFskSnBEB96G0aUSd6Sno0G9ET3ca0ZOQ,3696
 maps4fs/generator/component/dem.py,sha256=Bvm3ViA6PpR7RXRAHBj5rgYB9PWy55Qj6PhTMv6dJRI,11953
 maps4fs/generator/component/grle.py,sha256=ao3-4B4QUVl0XgOmYAj9L48KGaZtCZRTB1BqYgdAJIc,19613
-maps4fs/generator/component/i3d.py,sha256=xTiZYQRahYBsVALxmnsBygzTHJLE54ucXvHK8LWCYAs,23914
+maps4fs/generator/component/i3d.py,sha256=1NlcK-7TmnF6zYa-Gi6whAwK2z6HPmWert7MLbzJiqI,24471
 maps4fs/generator/component/layer.py,sha256=-br4gAGcGeBNb3ldch9XFEK0lhXqb1IbArhFB5Owu54,6186
 maps4fs/generator/component/satellite.py,sha256=47V9aPbv7k-2C-PsoXd33EO92yavFzB6_MRCd7fLP6k,5042
 maps4fs/generator/component/texture.py,sha256=Nc_oOHX3b4vJm8FnNOn3W4EQGFkW0zW0rGzO_0nTJMM,33392
@@ -54,8 +54,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RB0pHuRyfnDuqYtO2gUypfPm4G5cYRFdT2W-DG49zy0,2427
 maps4fs/toolbox/custom_osm.py,sha256=fjVSl9Ztc8_q0DxgNkhM7tE0Y-XpX8xcGGW-Tunp0R8,2518
 maps4fs/toolbox/dem.py,sha256=mbn3ZqMRhhYmzgssm2CGvg6aa89MUBOJPq6QyE54OLY,4191
-maps4fs-1.9.52.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.9.52.dist-info/METADATA,sha256=7LZ_NrNnL3aTXeS1AGEMhOx_pISOVGMihcJpUc4bFcI,49397
-maps4fs-1.9.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-1.9.52.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.9.52.dist-info/RECORD,,
+maps4fs-1.9.54.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.9.54.dist-info/METADATA,sha256=GjTIUeYYs-VHnduS-CmoBq8jYPvysEREcVZ-r3feHvs,49397
+maps4fs-1.9.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-1.9.54.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.9.54.dist-info/RECORD,,