maps4fs 2.8.9__py3-none-any.whl → 2.9.37__py3-none-any.whl

maps4fs/generator/monitor.py

@@ -0,0 +1,118 @@
+"""Module for performance monitoring during map generation."""
+
+import functools
+import threading
+import uuid
+from collections import defaultdict
+from contextlib import contextmanager
+from time import perf_counter
+from typing import Callable, Generator
+
+from maps4fs.generator.utils import Singleton
+from maps4fs.logger import Logger
+
+logger = Logger(name="MAPS4FS_MONITOR")
+
+_local = threading.local()
+
+
+def get_current_session() -> str | None:
+    """Get the current session name from thread-local storage."""
+    return getattr(_local, "current_session", None)
+
+
+@contextmanager
+def performance_session(session_id: str | None = None) -> Generator[str, None, None]:
+    """Context manager for performance monitoring session.
+
+    Arguments:
+        session_id (str, optional): Custom session ID. If None, generates UUID.
+    """
+    if session_id is None:
+        session_id = str(uuid.uuid4())
+
+    _local.current_session = session_id
+
+    try:
+        yield session_id
+    finally:
+        _local.current_session = None
+
+
+class PerformanceMonitor(metaclass=Singleton):
+    """Singleton class for monitoring performance metrics."""
+
+    def __init__(self) -> None:
+        self.sessions: dict[str, dict[str, dict[str, float]]] = defaultdict(
+            lambda: defaultdict(lambda: defaultdict(float))
+        )
+
+    def add_record(self, session: str, component: str, function: str, time_taken: float) -> None:
+        """Add a performance record.
+
+        Arguments:
+            session (str): The session name.
+            component (str): The component/class name.
+            function (str): The function/method name.
+            time_taken (float): Time taken in seconds.
+        """
+        self.sessions[session][component][function] += time_taken
+
+    def get_session_json(self, session: str) -> dict[str, dict[str, float]]:
+        """Get performance data for a session in JSON-serializable format.
+
+        Arguments:
+            session (str): The session name.
+
+        Returns:
+            dict[str, dict[str, float]]: Performance data.
+        """
+        return self.sessions.get(session, {})
+
+
+def monitor_performance(func: Callable) -> Callable:
+    """Decorator to monitor performance of methods/functions.
+
+    Arguments:
+        func (callable) -- The function to be monitored.
+
+    Returns:
+        callable -- The wrapped function with performance monitoring.
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        if args and hasattr(args[0], "__class__"):
+            class_name = args[0].__class__.__name__
+        elif args and hasattr(args[0], "__name__"):
+            class_name = args[0].__name__
+        elif "." in func.__qualname__:
+            class_name = func.__qualname__.split(".")[0]
+        else:
+            class_name = None
+
+        function_name = func.__name__
+
+        start = perf_counter()
+        result = func(*args, **kwargs)
+        end = perf_counter()
+        time_taken = round(end - start, 5)
+
+        session_name = get_current_session()
+
+        try:
+            if session_name and time_taken > 0.001 and class_name:
+                PerformanceMonitor().add_record(session_name, class_name, function_name, time_taken)
+                logger.debug(
+                    "[PERFORMANCE] %s | %s | %s | %s",
+                    session_name,
+                    class_name,
+                    function_name,
+                    time_taken,
+                )
+        except Exception:
+            pass
+
+        return result
+
+    return wrapper

maps4fs/generator/settings.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import re
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, NamedTuple
+from typing import TYPE_CHECKING, Any, Literal, NamedTuple
 
 from pydantic import BaseModel, ConfigDict
 
@@ -279,6 +279,21 @@ class SatelliteSettings(SettingsModel):
     zoom_level: int = 16
 
 
+class BuildingSettings(SettingsModel):
+    """Represents the advanced settings for building component.
+
+    Attributes:
+        generate_buildings (bool): generate buildings on the map.
+        region (Literal["auto", "all", "EU", "US"]): region for the buildings.
+        tolerance_factor (float): tolerance factor representing allowed dimension difference
+            between OSM building footprint and the building model footprint.
+    """
+
+    generate_buildings: bool = True
+    region: Literal["auto", "all", "EU", "US"] = "auto"
+    tolerance_factor: float = 0.3
+
+
 class GenerationSettings(BaseModel):
     """Represents the settings for the map generation process."""
 
@@ -288,6 +303,7 @@ class GenerationSettings(BaseModel):
     i3d_settings: I3DSettings = I3DSettings()
     texture_settings: TextureSettings = TextureSettings()
     satellite_settings: SatelliteSettings = SatelliteSettings()
+    building_settings: BuildingSettings = BuildingSettings()
 
     def to_json(self) -> dict[str, Any]:
         """Convert the GenerationSettings instance to JSON format.
@@ -302,6 +318,7 @@ class GenerationSettings(BaseModel):
             "I3DSettings": self.i3d_settings.model_dump(),
             "TextureSettings": self.texture_settings.model_dump(),
             "SatelliteSettings": self.satellite_settings.model_dump(),
+            "BuildingSettings": self.building_settings.model_dump(),
         }
 
     @classmethod

maps4fs/generator/statistics.py

@@ -80,3 +80,13 @@ def send_survey(data: dict[str, Any]) -> None:
     """
     endpoint = f"{STATS_HOST}/receive_survey"
     post(endpoint, data)
+
+
+def send_performance_report(data: dict[str, Any]) -> None:
+    """Send performance report to the statistics server.
+
+    Arguments:
+        data (dict[str, Any]): The performance report data to send.
+    """
+    endpoint = f"{STATS_HOST}/receive_performance_report"
+    post(endpoint, data)

maps4fs/generator/utils.py

@@ -4,7 +4,7 @@ import json
 import os
 import shutil
 from datetime import datetime
-from typing import Any
+from typing import Any, Literal
 from xml.etree import ElementTree as ET
 
 import osmnx as ox
@@ -122,6 +122,20 @@ def get_country_by_coordinates(coordinates: tuple[float, float]) -> str:
     return "Unknown"
 
 
+def get_region_by_coordinates(coordinates: tuple[float, float]) -> Literal["EU", "US"]:
+    """Get region (EU or US) by coordinates.
+
+    Arguments:
+        coordinates (tuple[float, float]): Latitude and longitude.
+
+    Returns:
+        Literal["EU", "US"]: Region code.
+    """
+    country = get_country_by_coordinates(coordinates)
+    # If country is not US, assume EU for simplicity.
+    return "US" if country == "United States" else "EU"
+
+
 def get_timestamp() -> str:
     """Get current underscore-separated timestamp.
 
@@ -158,3 +172,14 @@ def dump_json(filename: str, directory: str, data: dict[Any, Any] | Any | None)
     save_path = os.path.join(directory, filename)
     with open(save_path, "w", encoding="utf-8") as file:
         json.dump(data, file, indent=4)
+
+
+class Singleton(type):
+    """A metaclass for creating singleton classes."""
+
+    _instances: dict[Any, Any] = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super().__call__(*args, **kwargs)
+        return cls._instances[cls]

maps4fs/logger.py

@@ -14,8 +14,9 @@ class Logger(logging.Logger):
         self,
         level: Literal["DEBUG", "INFO", "WARNING", "ERROR"] = "INFO",
         to_stdout: bool = True,
+        **kwargs,
     ):
-        super().__init__(LOGGER_NAME)
+        super().__init__(kwargs.pop("name", LOGGER_NAME))
         self.setLevel(level)
         self.stdout_handler = logging.StreamHandler(sys.stdout)
         formatter = "%(name)s | %(levelname)s | %(asctime)s | %(message)s"

{maps4fs-2.8.9.dist-info → maps4fs-2.9.37.dist-info}/METADATA

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.8.9
+Version: 2.9.37
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
-License: GNU Affero General Public License v3.0
+License-Expression: CC-BY-NC-4.0
 Project-URL: Homepage, https://github.com/iwatkot/maps4fs
 Project-URL: Repository, https://github.com/iwatkot/maps4fs
 Keywords: farmingsimulator,fs,farmingsimulator22,farmingsimulator25,fs22,fs25
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
@@ -76,6 +75,7 @@ Dynamic: license-file
 🚜 **Farming Simulator 22 & 25** - Generate maps for both game versions<br>
 🗺️ **Flexible Map Sizes** - 2x2, 4x4, 8x8, 16x16 km + custom sizes<br>
 ✂️ **Map Scaling & Rotation** - Perfect positioning and sizing control<br>
+🏘️ **Adding buildings** - Automatic building placement system<br>
 
 🌍 **Real-World Foundation** - Built from OpenStreetMap and satellite data<br>
 🏞️ **Accurate Terrain** - SRTM elevation data with custom DTM support<br>
@@ -86,7 +86,9 @@ Dynamic: license-file
 🌲 **Natural Forests** - Tree placement with customizable density<br>
 🌊 **Water Systems** - Rivers, lakes, and water planes<br>
 🌿 **Decorative Foliage** - Realistic vegetation and grass areas<br>
+🏘️ **Intelligent Building Placement** - Automatic building placement in appropriate areas<br>
 
+🚧 **3D Road Generation** - Automatic road mesh creation with custom textures<br>
 🚧 **Complete Spline Networks** - Roads and infrastructure<br>
 🔷 **Background Terrain** - 3D *.obj files for surrounding landscape<br>
 📦 **Giants Editor Ready** - Import and start building immediately<br>
@@ -96,7 +98,7 @@ Dynamic: license-file
 📚 **Complete Documentation** - [Detailed guides](https://maps4fs.gitbook.io/docs) and video tutorials<br>
 
 <p align="center">
-<img src="https://github.com/iwatkot/maps4fsui/releases/download/0.0.2/mfstr.gif"><br>
+<img src="https://github.com/iwatkot/maps4fs/releases/download/2.9.34/mfsg.gif"><br>
 <i>Example of map generated with Maps4FS with no manual edits.</i>
 </p>
 

maps4fs-2.9.37.dist-info/RECORD

@@ -0,0 +1,32 @@
+maps4fs/__init__.py,sha256=5ixsCA5vgcIV0OrF9EJBm91Mmc_KfMiDRM-QyifMAvo,386
+maps4fs/logger.py,sha256=aZAa9glzgvH6ySVDLelSPTwHfWZtpGK5YBl-ufNUsPg,801
+maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/config.py,sha256=o_zRT8Nauy1djELsC867yD7GTs1fwz1OtZ2jE4w_7Ts,9797
+maps4fs/generator/game.py,sha256=B7-a9gEBIOKAmC2eAAnEx65Ghx6U-edvNvU4a3WmjIw,18513
+maps4fs/generator/map.py,sha256=kkyMETKteFhnWRgmcR8gjdNBQy4roQzcdlFw1nE5chE,16116
+maps4fs/generator/monitor.py,sha256=Yrc7rClpmJK53SRzrOYZNBlwJmb5l6TkW-laFbyBEno,3524
+maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
+maps4fs/generator/settings.py,sha256=jrrIILNRtIpj7hpLrQqLTIagTY8tdJlLZDEN1M4n3Yc,14116
+maps4fs/generator/statistics.py,sha256=ol0MTiehcCbQFfyYA7cKU-M4_cjiLCktnGbid4GYABU,2641
+maps4fs/generator/utils.py,sha256=qaHmS5I30OhDwd213bbctlplQQlX-qkHugyszXGmh0U,5587
+maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
+maps4fs/generator/component/background.py,sha256=3nzrIENqHVJiZzICqtMdgD-QbGS9125IeTCvO60y7jI,50155
+maps4fs/generator/component/building.py,sha256=VoLjj6mDT-4kVfwxXP-lD0r4vJVYszyWZtciVFwdkIk,27402
+maps4fs/generator/component/config.py,sha256=tI2RQaGIqBgJIi9KjYfMZZ8AWg_YVUm6KKsBHGV241g,31285
+maps4fs/generator/component/dem.py,sha256=vMVJtU2jAS-2lfB9JsqodZsrUvY1h5xr3Dh5qk6txwk,11895
+maps4fs/generator/component/grle.py,sha256=FAcGmG7yq0icOElRoO4QMsVisZMsNrLhfNSWvGKnOHg,29899
+maps4fs/generator/component/i3d.py,sha256=idOixc2UF6RSvQud9GCWmMuTcY1qKVuzijUHakSzWks,28952
+maps4fs/generator/component/layer.py,sha256=-pnKPlZFmsU-OmvG7EX-Nb55eETY0NTiYnnkCIRJuvY,7731
+maps4fs/generator/component/road.py,sha256=YHX3-GcRXEyy9UG5KpUwC75n0FEIysn9PJnC7-tiwkw,27850
+maps4fs/generator/component/satellite.py,sha256=1bPqd8JqAPqU0tEI9m-iuljMW9hXqlaCIxvq7kdpMY0,5219
+maps4fs/generator/component/texture.py,sha256=46eG1EUWqDEppdxkimgu_gCBcNf2KqvZXfkak3GO8EI,38584
+maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
+maps4fs/generator/component/base/component.py,sha256=-7H3donrH19f0_rivNyI3fgLsiZkntXfGywEx4tOnM4,23924
+maps4fs/generator/component/base/component_image.py,sha256=GXFkEFARNRkWkDiGSjvU4WX6f_8s6R1t2ZYqZflv1jk,9626
+maps4fs/generator/component/base/component_mesh.py,sha256=2wGe_-wAZVRljMKzzVJ8jdzIETWg7LjxGj8A3inH5eI,25550
+maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
+maps4fs-2.9.37.dist-info/licenses/LICENSE.md,sha256=LzOB2xtN1AlHJi4hqoEsBlYLfmfRyXCPC2417miYoBc,19579
+maps4fs-2.9.37.dist-info/METADATA,sha256=rJbXUF1gfOOgila4vS8faBTPMkZSKX0bxCxotgQl940,10204
+maps4fs-2.9.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.9.37.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.9.37.dist-info/RECORD,,