maps4fs 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

maps4fs/generator/grle.py

@@ -116,6 +116,11 @@ class GRLE(Component):
 
         self.logger.info("Found %s fields in textures info layer.", len(fields))
 
+        farmyards: list[list[tuple[int, int]]] | None = textures_info_layer.get("farmyards")
+        if farmyards and self.map.grle_settings.add_farmyards:
+            fields.extend(farmyards)
+            self.logger.info("Found %s farmyards in textures info layer.", len(farmyards))
+
         info_layer_farmlands_path = os.path.join(
             self.game.weights_dir_path(self.map_directory), "infoLayer_farmlands.png"
         )

maps4fs/generator/i3d.py

@@ -184,6 +184,10 @@ class I3d(Component):
 
         if shapes_node is not None and scene_node is not None:
             node_id = SPLINES_NODE_ID_STARTING_VALUE
+            user_attributes_node = root.find(".//UserAttributes")
+            if user_attributes_node is None:
+                self.logger.warning("UserAttributes node not found in I3D file.")
+                return
 
             for road_id, road in enumerate(roads_polylines, start=1):
                 # Add to scene node
@@ -254,6 +258,25 @@ class I3d(Component):
 
                 shapes_node.append(nurbs_curve_node)
 
+                # Add UserAttributes to the shape node.
+                # <UserAttribute nodeId="5000">
+                # <Attribute name="maxSpeedScale" type="integer" value="1"/>
+                # <Attribute name="speedLimit" type="integer" value="100"/>
+                # </UserAttribute>
+
+                user_attribute_node = ET.Element("UserAttribute")
+                user_attribute_node.set("nodeId", str(node_id))
+
+                attributes = [
+                    ("maxSpeedScale", "integer", "1"),
+                    ("speedLimit", "integer", "100"),
+                ]
+
+                for name, attr_type, value in attributes:
+                    user_attribute_node.append(I3d.create_attribute_node(name, attr_type, value))
+
+                user_attributes_node.append(user_attribute_node)  # type: ignore
+
                 node_id += 1
 
             tree.write(splines_i3d_path)  # type: ignore

maps4fs/generator/map.py

@@ -47,6 +47,19 @@ class SettingsModel(BaseModel):
 
         return settings
 
+    @classmethod
+    def all_settings(cls) -> list[SettingsModel]:
+        """Get all settings of the current class and its subclasses.
+
+        Returns:
+            list[SettingsModel]: List with settings of the current class and its subclasses.
+        """
+        settings = []
+        for subclass in cls.__subclasses__():
+            settings.append(subclass())
+
+        return settings
+
 
 class DEMSettings(SettingsModel):
     """Represents the advanced settings for DEM component.
@@ -89,10 +102,13 @@ class GRLESettings(SettingsModel):
     Attributes:
         farmland_margin (int): margin around the farmland.
         random_plants (bool): generate random plants on the map or use the default one.
+        add_farmyards (bool): If True, regions of frarmyards will be added to the map
+            without corresponding fields.
     """
 
     farmland_margin: int = 0
     random_plants: bool = True
+    add_farmyards: bool = False
 
 
 class I3DSettings(SettingsModel):
@@ -114,7 +130,7 @@ class TextureSettings(SettingsModel):
         skip_drains (bool): skip drains generation.
     """
 
-    dissolve: bool = True
+    dissolve: bool = False
     fields_padding: int = 0
     skip_drains: bool = False
 
@@ -127,7 +143,7 @@ class SplineSettings(SettingsModel):
             existing points.
     """
 
-    spline_density: int = 4
+    spline_density: int = 2
 
 
 # pylint: disable=R0913, R0902, R0914
@@ -205,6 +221,25 @@ class Map:
         os.makedirs(self.map_directory, exist_ok=True)
         self.logger.debug("Map directory created: %s", self.map_directory)
 
+        settings = [
+            dem_settings,
+            background_settings,
+            grle_settings,
+            i3d_settings,
+            texture_settings,
+            spline_settings,
+        ]
+
+        settings_json = {}
+
+        for setting in settings:
+            settings_json[setting.__class__.__name__] = setting.model_dump()
+
+        save_path = os.path.join(self.map_directory, "generation_settings.json")
+
+        with open(save_path, "w", encoding="utf-8") as file:
+            json.dump(settings_json, file, indent=4)
+
         self.texture_custom_schema = kwargs.get("texture_custom_schema", None)
         if self.texture_custom_schema:
             save_path = os.path.join(self.map_directory, "texture_custom_schema.json")

maps4fs/generator/texture.py

@@ -45,6 +45,9 @@ class Texture(Component):
             exclude_weight (bool): Flag to exclude weight from the texture.
             priority (int | None): Priority of the layer.
             info_layer (str | None): Name of the corresnponding info layer.
+            usage (str | None): Usage of the layer.
+            background (bool): Flag to determine if the layer is a background.
+            invisible (bool): Flag to determine if the layer is invisible.
 
         Attributes:
             name (str): Name of the layer.
@@ -65,6 +68,7 @@ class Texture(Component):
             info_layer: str | None = None,
             usage: str | None = None,
             background: bool = False,
+            invisible: bool = False,
         ):
             self.name = name
             self.count = count
@@ -76,6 +80,7 @@ class Texture(Component):
             self.info_layer = info_layer
             self.usage = usage
             self.background = background
+            self.invisible = invisible
 
         def to_json(self) -> dict[str, str | list[str] | bool]:  # type: ignore
             """Returns dictionary with layer data.
@@ -93,6 +98,7 @@ class Texture(Component):
                 "info_layer": self.info_layer,
                 "usage": self.usage,
                 "background": self.background,
+                "invisible": self.invisible,
             }
 
             data = {k: v for k, v in data.items() if v is not None}
@@ -301,6 +307,7 @@ class Texture(Component):
             "bbox",
             "map_height",
             "map_width",
+            "rotation",
             "minimum_x",
             "minimum_y",
             "maximum_x",
@@ -416,7 +423,8 @@ class Texture(Component):
                     info_layer_data[layer.info_layer].append(
                         self.np_to_polygon_points(polygon)  # type: ignore
                     )
-                cv2.fillPoly(layer_image, [polygon], color=255)  # type: ignore
+                if not layer.invisible:
+                    cv2.fillPoly(layer_image, [polygon], color=255)  # type: ignore
 
             if layer.info_layer == "roads":
                 for linestring in self.objects_generator(
@@ -705,7 +713,11 @@ class Texture(Component):
             Generator[np.ndarray, None, None]: Numpy array of polygon points.
         """
         for _, obj in objects_utm.iterrows():
-            polygon = self._to_polygon(obj, width)
+            try:
+                polygon = self._to_polygon(obj, width)
+            except Exception as e:  # pylint: disable=W0703
+                self.logger.warning("Error converting object to polygon: %s.", e)
+                continue
             if polygon is None:
                 continue
 

{maps4fs-1.4.1.dist-info → maps4fs-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 1.4.1
+Version: 1.5.0
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -45,6 +45,7 @@ Requires-Dist: pydantic
   <a href="#Overview-image">Overview image</a><br>
   <a href="#DDS-conversion">DDS conversion</a> •
   <a href="#Advanced-settings">Advanced settings</a> •
+  <a href="#Expert-settings">Expert settings</a> •
   <a href="#Resources">Resources</a> •
   <a href="#Bugs-and-feature-requests">Bugs and feature requests</a><br>
   <a href="#Special-thanks">Special thanks</a>
@@ -256,18 +257,12 @@ Tools are divided into categories, which are listed below.
 
 ## Supported objects
 The project is based on the [OpenStreetMap](https://www.openstreetmap.org/) data. So, refer to [this page](https://wiki.openstreetmap.org/wiki/Map_Features) to understand the list below.
-- "building": True
-- "highway": ["motorway", "trunk", "primary"]
-- "highway": ["secondary", "tertiary", "road", "service"]
-- "highway": ["unclassified", "residential", "track"]
-- "natural": ["grassland", "scrub"]
-- "landuse": "farmland"
-- "natural": ["water"]
-- "waterway": True
-- "natural": ["wood", "tree_row"]
-- "railway": True
-
-The list will be updated as the project develops.
+
+You can find the active schemas here:
+- [FS25](/data/fs25-texture-schema.json)
+- [FS22](/data/fs22-texture-schema.json)
+
+Learn more how to work with the schema in the [Texture schema](#texture-schema) section. You can also use your own schema in the [Expert settings](#expert-settings) section.
 
 ## Generation info
 The script will generate the `generation_info.json` file in the `output` folder. It is split into different sections, which represent the components of the map generator. You may need this information to use some other tools and services to obtain additional data for your map.<br>
@@ -418,6 +413,10 @@ Let's have a closer look at the fields:
 - `priority` - the priority of the texture for overlapping. Textures with higher priorities will be drawn over the textures with lower priorities.
 ℹ️ The texture with 0 priority considers the base layer, which means that all empty areas will be filled with this texture.
 - `exclude_weight` - this is only used for the forestRockRoots texture from FS25. It just means that this texture has no `weight` postfix, that's all.
+- `usage` - the usage of the texture. Mainly used to group different textures by the purpose. For example, the `grass`, `forest`, `drain`.
+- `background` - set it to True for the textures, which should have impact on the Background Terrain, by default it's used to subtract the water depth from the DEM and background terrain.
+- `info_layer` - if the layer is saving some data in JSON format, this section will describe it's name in the JSON file. Used to find the needed JSON data, for example for fields it will be `fields` and as a value - list of polygon coordinates.
+- `invisible` - set it to True for the textures, which should not be drawn in the files, but only to save the data in the JSON file (related to the previous field).
 
 ## Background terrain
 The tool now supports the generation of the background terrain. If you don't know what it is, here's a brief explanation. The background terrain is the world around the map. It's important to create it because if you don't, the map will look like it's floating in the void. The background terrain is a simple plane that can (and should) be textured to look fine.<br>
@@ -474,44 +473,59 @@ You can also apply some advanced settings to the map generation process. Note th
 
 ### DEM Advanced settings
 
+- Auto process: the tool will automatically try to find suitable multiplier. As a result, the DEM image WILL not match real world values. If this option is disabled, you'll probably see completely black DEM image, but it's not empty. It's just you can't see the values of 16-bit image by eye, because they're too small. Learn more what's DEM image and how to work with it in [docs](docs/dem.md). By default, it's set to True.
+
 - Multiplier: the height of the map is multiplied by this value. So the DEM map is just a 16-bit grayscale image, which means that the maximum available value there is 65535, while the actual difference between the deepest and the highest point on Earth is about 20 km. Just note that this setting mostly does not matter, because you can always adjust it in the Giants Editor, learn more about the DEM file and the heightScale parameter in [docs](docs/dem.md). By default, it's set to 1.
 
 - Blur radius: the radius of the Gaussian blur filter applied to the DEM map. By default, it's set to 21. This filter just makes the DEM map smoother, so the height transitions will be more natural. You can set it to 1 to disable the filter, but it will result in a Minecraft-like map.
 
-- Plateau height: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
+- Plateau: this value will be added to each pixel of the DEM image, making it "higher". It's useful when you want to add some negative heights on the map, that appear to be in a "low" place. By default, it's set to 0.
 
 - Water depth: this value will be subtracted from each pixel of the DEM image, where water resources are located. Pay attention that it's not in meters, instead it in the pixel value of DEM, which is 16 bit image with possible values from 0 to 65535. When this value is set, the same value will be added to the plateau setting to avoid negative heights.
 
-### Texture Advanced settings
+### Background terrain Advanced settings
 
-- Fields padding - this value (in meters) will be applied to each field, making it smaller. It's useful when the fields are too close to each other and you want to make them smaller. By default, it's set to 0.
+- Generate background - if enabled, the obj files for the background terrain will be generated. You can turn it off if you already have those files or don't need them. By default, it's set to True.
 
-- Texture dissolving - if enabled, the values from one layer will be splitted between different layers of texture, making it look more natural. By default, it's set to True. Can be turned of for faster processing.
+- Generate water - if enabled, the water planes obj files will be generated. You can turn it off if you already have those files or don't need them. By default, it's set to True.
 
-- Skip drains - if enabled, the tool will not generate the drains and ditches on the map. By default, it's set to False. Use this if you don't need the drains on the map.
+- Resize factor - the factor by which the background terrain will be resized. It will be used as 1 / resize_factor while generating the models. Which means that the larger the value the more the terrain will be resized. The lowest value is 1, in this case background terrain will not be resized. Note, than low values will lead to long processing and enormous size of the obj files.
 
-### Farmlands Advanced settings
+### GRLE Advanced settings
 
 - Farmlands margin - this value (in meters) will be applied to each farmland, making it bigger. You can use the value to adjust how much the farmland should be bigger than the actual field. By default, it's set to 3.
 
-### Vegetation Advanced settings
+- Random plants - when adding decorative foliage, enabling this option will add different species of plants to the map. If unchecked only basic grass (smallDenseMix) will be added. Defaults to True.
 
-- 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.
+- Add Farmyards - if enabled, the tool will create farmlands from the regions that are marked as farmyards in the OSM data. Those farmlands will not have fields and also will not be drawn on textures. By default, it's turned off.
 
-- Random plants - when adding decorative foliage, enabling this option will add different species of plants to the map. If unchecked only basic grass (smallDenseMix) will be added. Defaults to True.
+### I3D Advanced settings
 
-### Background terrain 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.
 
-- Generate background - if enabled, the obj files for the background terrain will be generated. You can turn it off if you already have those files or don't need them. By default, it's set to True.
+### Texture Advanced settings
 
-- Generate water - if enabled, the water planes obj files will be generated. You can turn it off if you already have those files or don't need them. By default, it's set to True.
+- Dissolve - if enabled, the values from one layer will be splitted between different layers of texture, making it look more natural. Warning: it's a time-consuming process, recommended to enable it, when you generating the final version of the map, not some test versions.
 
-- Resize factor - the factor by which the background terrain will be resized. It will be used as 1 / resize_factor while generating the models. Which means that the larger the value the more the terrain will be resized. The lowest value is 1, in this case background terrain will not be resized. Note, than low values will lead to long processing and enormous size of the obj files.
+- Fields padding - this value (in meters) will be applied to each field, making it smaller. It's useful when the fields are too close to each other and you want to make them smaller. By default, it's set to 0.
+
+- Skip drains - if enabled, the tool will not generate the drains and ditches on the map. By default, it's set to False. Use this if you don't need the drains on the map.
 
 ## 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.
 
+## Expert Settings
+The tool also supports the expert settings. Do not use them until you read the documentation and understand what they do. Here's the list of the expert settings:
+
+- Enable debug logs - if enabled, the tool will print the debug logs to the console. It can be useful if you're using with a custom OSM map, have some issues with it and want to know what's wrong. 
+
+- Upload custom OSM file - you'll be able to upload your own OSM file. Before using it, carefully read the [Custom OSM](docs/custom_osm.md) documentation, otherwise, the tool will not work as expected.
+
+- Show raw configuration - you'll be able to change all the settings in a single JSON file. It's useful if you want to save the configuration and use it later, without changing the settings in the UI. Be extremely careful with this setting, because you can break the tool with incorrect settings.
+
+- Show schemas - you'll be able to edit or define your own texture or tree schemas. It's useful if you want to add some custom textures or trees to the map. Refer to the [Texture schema](#texture-schema) section to learn more about the schema structure. Any incorrect value here will lead to the completely broken map.
+
 ## Resources
 In this section, you'll find a list of the resources that you need to create a map for the Farming Simulator.<br>
 To create a basic map, you only need the Giants Editor. But if you want to create a background terrain - the world around the map, so it won't look like it's floating in the void - you also need Blender and the Blender Exporter Plugins. To create realistic textures for the background terrain, the QGIS is required to obtain high-resolution satellite images.<br>

{maps4fs-1.4.1.dist-info → maps4fs-1.5.0.dist-info}/RECORD

@@ -6,16 +6,16 @@ maps4fs/generator/component.py,sha256=58UQgdR-7KlWHTfwLesNNK76BTRsiVngRa6B64OKjh
 maps4fs/generator/config.py,sha256=0QmK052B8bxyHVhg3jzCORLfOBMMmqVfhhbqXKf6OMk,4383
 maps4fs/generator/dem.py,sha256=MZf3ZjawJ977TxqB1q9nNpvPZUNwfmm2EaJDtVU-eCU,15939
 maps4fs/generator/game.py,sha256=jjo7CTwHHSkRpeD_QgRXkhR_NxI09C4kMxz-nYOTM4A,7931
-maps4fs/generator/grle.py,sha256=onhZovvRtireDfw7wEOL0CZmOmoVzRPY-R4TlvbOUMI,17561
-maps4fs/generator/i3d.py,sha256=vbH7G0kDOGC6gbNDE-QYxMnKOMJ-vCGYdaKhWwci4ZU,23748
-maps4fs/generator/map.py,sha256=JwrlUdjyvSYB82HfseJ6w2-ZDFwplyfPCn84Z5awdCY,11721
+maps4fs/generator/grle.py,sha256=u8ZwSs313PIOkH_0B_O2tVTaZ-eYNkc30eKGtBxWzTM,17846
+maps4fs/generator/i3d.py,sha256=qeZYqfuhbhRPlSAuQHXaq6RmIO7314oMN68Ivebp1YQ,24786
+maps4fs/generator/map.py,sha256=jIdekpiymhHqKx4FaAwjtq3hMnRdKYo6TvJLX1fSD0k,12814
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/texture.py,sha256=fZN0soGWk8-f3GuQWiwJ2yQTsmL9fLWVlgqeLI6ePi4,30648
+maps4fs/generator/texture.py,sha256=sErusfv1AqQfP-veMrZ921Tz8DnGEhfB4ucggMmKrD4,31231
 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.4.1.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.4.1.dist-info/METADATA,sha256=GYS-0gCIT-DmBEL29mDjwQIcn-7t_XYYH05ObyMOQSc,32421
-maps4fs-1.4.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-1.4.1.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.4.1.dist-info/RECORD,,
+maps4fs-1.5.0.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.5.0.dist-info/METADATA,sha256=JZXcCZU91J0GD2q1YKooz_52UeA8DeCgbuv2zRrnTsQ,35026
+maps4fs-1.5.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-1.5.0.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.5.0.dist-info/RECORD,,