maps4fs 1.8.211__py3-none-any.whl → 1.8.213__py3-none-any.whl

maps4fs/generator/component/i3d.py

@@ -149,13 +149,13 @@ class I3d(XMLComponent):
             return
 
         node_id = SPLINES_NODE_ID_STARTING_VALUE
-        for road_id, road in enumerate(roads_polylines, start=1):
-            # Add to scene node
-            # <Shape name="spline01_CSV" translation="0 0 0" nodeId="11" shapeId="11"/>
+        for road_id, road_info in enumerate(roads_polylines, start=1):
+            points = road_info.get("points")
+            tags = road_info.get("tags")
 
             try:
                 fitted_road = self.fit_object_into_bounds(
-                    linestring_points=road, angle=self.rotation
+                    linestring_points=points, angle=self.rotation
                 )
             except ValueError as e:
                 self.logger.debug(
@@ -168,52 +168,58 @@ class I3d(XMLComponent):
             fitted_road = self.interpolate_points(
                 fitted_road, num_points=self.map.spline_settings.spline_density
             )
+            fitted_roads = [(fitted_road, "original")]
 
-            spline_name = f"spline{road_id}"
+            if self.map.spline_settings.add_reversed_splines:
+                reversed_fitted_road = fitted_road[::-1]
+                fitted_roads.append((reversed_fitted_road, "reversed"))
 
-            data = {
-                "name": spline_name,
-                "translation": "0 0 0",
-                "nodeId": str(node_id),
-                "shapeId": str(node_id),
-            }
+            for fitted_road, direction in fitted_roads:
+                spline_name = f"spline_{road_id}_{direction}_{tags}"
 
-            scene_node.append(self.create_element("Shape", data))
+                data = {
+                    "name": spline_name,
+                    "translation": "0 0 0",
+                    "nodeId": str(node_id),
+                    "shapeId": str(node_id),
+                }
 
-            road_ccs = [self.top_left_coordinates_to_center(point) for point in fitted_road]
+                scene_node.append(self.create_element("Shape", data))
 
-            data = {
-                "name": spline_name,
-                "shapeId": str(node_id),
-                "degree": "3",
-                "form": "open",
-            }
-            nurbs_curve_node = self.create_element("NurbsCurve", data)
+                road_ccs = [self.top_left_coordinates_to_center(point) for point in fitted_road]
 
-            for point_ccs, point in zip(road_ccs, fitted_road):
-                cx, cy = point_ccs
-                x, y = point
+                data = {
+                    "name": spline_name,
+                    "shapeId": str(node_id),
+                    "degree": "3",
+                    "form": "open",
+                }
+                nurbs_curve_node = self.create_element("NurbsCurve", data)
 
-                x = max(0, min(int(x), dem_x_size - 1))
-                y = max(0, min(int(y), dem_y_size - 1))
+                for point_ccs, point in zip(road_ccs, fitted_road):
+                    cx, cy = point_ccs
+                    x, y = point
 
-                z = not_resized_dem[y, x]
-                z *= self.get_z_scaling_factor()
+                    x = max(0, min(int(x), dem_x_size - 1))
+                    y = max(0, min(int(y), dem_y_size - 1))
 
-                nurbs_curve_node.append(self.create_element("cv", {"c": f"{cx}, {z}, {cy}"}))
+                    z = not_resized_dem[y, x]
+                    z *= self.get_z_scaling_factor()
 
-            shapes_node.append(nurbs_curve_node)
+                    nurbs_curve_node.append(self.create_element("cv", {"c": f"{cx}, {z}, {cy}"}))
 
-            user_attribute_node = self.get_user_attribute_node(
-                node_id,
-                attributes=[
-                    ("maxSpeedScale", "integer", "1"),
-                    ("speedLimit", "integer", "100"),
-                ],
-            )
+                shapes_node.append(nurbs_curve_node)
 
-            user_attributes_node.append(user_attribute_node)
-            node_id += 1
+                user_attribute_node = self.get_user_attribute_node(
+                    node_id,
+                    attributes=[
+                        ("maxSpeedScale", "integer", "1"),
+                        ("speedLimit", "integer", "100"),
+                    ],
+                )
+
+                user_attributes_node.append(user_attribute_node)
+                node_id += 1
 
         tree.write(splines_i3d_path)  # type: ignore
         self.logger.debug("Splines I3D file saved to: %s.", splines_i3d_path)

maps4fs/generator/component/texture.py

@@ -402,7 +402,11 @@ class Texture(ImageComponent):
             for linestring in self.objects_generator(
                 layer.tags, layer.width, layer.info_layer, yield_linestrings=True
             ):
-                info_layer_data[f"{layer.info_layer}_polylines"].append(linestring)  # type: ignore
+                linestring_entry = {
+                    "points": linestring,
+                    "tags": str(layer.tags),
+                }
+                info_layer_data[f"{layer.info_layer}_polylines"].append(linestring_entry)  # type: ignore
 
     def dissolve(self) -> None:
         """Dissolves textures of the layers with tags into sublayers for them to look more

maps4fs/generator/settings.py

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

{maps4fs-1.8.211.dist-info → maps4fs-1.8.213.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.211
+Version: 1.8.213
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -645,6 +645,7 @@ You can also apply some advanced settings to the map generation process.<br>
 ### Splines Advanced settings
 
 - Splines density - number of points, which will be added (interpolate) between each pair of existing points. The higher the value, the denser the spline will be. It can smooth the splines, but high values can in opposite make the splines look unnatural.
+- Add reversed splines - if enabled, the tool will add the reversed copies of the splines. It can be useful if you want to have the splines on both directions. By default, it's set to False.
 
 ### Satellite Advanced settings
 

{maps4fs-1.8.211.dist-info → maps4fs-1.8.213.dist-info}/RECORD

@@ -5,15 +5,15 @@ maps4fs/generator/dem.py,sha256=Nyz64BWM---Vpy1mi8bbhHEfd2Wc2rWw9UqHraqXDJ8,1177
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
 maps4fs/generator/map.py,sha256=1mbnOWXVEDeFHWDBBDX9ugzRtrGBQYrJ5ruKmPUsMe8,11136
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=ZHwLn1ObdOuhyUTzQTYvyDs7YZ0SbVLgTSpoeUtqi0c,6708
+maps4fs/generator/settings.py,sha256=wscbtbJ8shuLshUE1RSiNXkPGY_SkGQ9qa0v0NHj_aQ,6747
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
 maps4fs/generator/component/background.py,sha256=ppxK2RheCYrLRnBkLeZUst6Ciopo9Z_zUyjS-n8YwGE,18794
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=kCx00SJdYEDr0tcHFvHC99928e9Eke2t_LwNxkqfvBg,18984
-maps4fs/generator/component/i3d.py,sha256=z2ZkflA5E8FrHcGleXSVKZRWvkqclz_Yh_qxJI86enE,19685
+maps4fs/generator/component/i3d.py,sha256=YaIzTJcsCtfKA14oxlhljS-dqgMf392KOd4altvFPZM,20117
 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=UXVzNht5ETO9-wI9cZ-ojXTgkr227B2CDZ5VwXMm_Bc,30818
+maps4fs/generator/component/texture.py,sha256=GWOE7w2maydB2LDku-YEC1w1oc8kcnnZ1SPTL6b82H8,30966
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZwYyqoDZM7aI1RHw8,21273
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
@@ -52,8 +52,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.211.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.211.dist-info/METADATA,sha256=sgf8q9pnxL8u908MqfLBE3AyVRGyxI8h4WwXNH_g0rs,45409
-maps4fs-1.8.211.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.211.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.211.dist-info/RECORD,,
+maps4fs-1.8.213.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.213.dist-info/METADATA,sha256=U9UdGBlile35wbqnAIHpHeYIHnQYDfLoSqd-p7nNil8,45600
+maps4fs-1.8.213.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.213.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.213.dist-info/RECORD,,