CHANGES:

- FunkMan: proper dependency added
- Mission: /convert reworked
- Utils: dd_to_mgrs(), mgrs_to_dd() dd_to_dmm(), dms_to_dd() added, dd_to_dms() reworked
- LotAtc: Windows 2016 server version check added.

Author: karel26

core/utils/dcs.py

@@ -7,11 +7,16 @@
 import stat
 import sys
 
+# import the correct mgrs library
+if sys.version_info < (3, 13):
+    import mgrs
+else:
+    from mgrs import LLtoUTM, encode, UTMtoLL, decode
+
 from contextlib import suppress
 from core.const import SAVED_GAMES
 from core.data.node import Node
 from core.utils.helper import alternate_parse_settings
-from pathlib import Path
 from typing import Optional
 
 __all__ = [
@@ -20,6 +25,10 @@
     "desanitize",
     "is_desanitized",
     "dd_to_dms",
+    "dd_to_dmm",
+    "dms_to_dd",
+    "dd_to_mgrs",
+    "mgrs_to_dd",
     "get_active_runways",
     "create_writable_mission",
     "get_orig_file",
@@ -133,11 +142,173 @@ def is_desanitized(node: Node) -> bool:
     return True
 
 
-def dd_to_dms(dd):
-    frac, degrees = math.modf(dd)
-    frac, minutes = math.modf(frac * 60)
-    frac, seconds = math.modf(frac * 60)
-    return degrees, minutes, seconds, frac
+def dd_to_dms(dd: float, precision: int = 3) -> tuple[int, int, int, int]:
+    """
+    Convert a decimal‑degree value into a DMS tuple.
+
+    Parameters
+    ----------
+    dd       : float
+        Latitude or longitude in decimal degrees.
+    precision: int, optional
+        Number of decimal places for the seconds fraction.
+        The function returns the fraction as an *integer*:
+        `precision = 2`  →  hundredths of a second (0‑99)
+        `precision = 3`  →  milliseconds   (0‑999) – default.
+
+    Returns
+    -------
+    tuple[int, int, int, int]
+        (degrees, minutes, seconds, fraction)
+        All four components are integers.  The sign of the value is
+        stored only in the *degrees* component.
+
+    Examples
+    --------
+    >>> dd_to_dms(49.001234)
+    (49, 0, 0, 78)           # 78 × 10⁻³ s = 0.078s
+    >>> dd_to_dms(-49.999999, precision=2)
+    (-49, 59, 59, 99)        # -49°59'59.99″
+    """
+    # --- 1️⃣  sign & absolute value ------------------------------------
+    sign = 1 if dd >= 0 else -1
+    dd_abs = abs(dd)
+
+    # --- 2️⃣  whole degrees & remaining fraction ------------------------
+    deg, frac = divmod(dd_abs, 1)          # deg  → float, frac → 0‑1
+    deg = int(deg)                         # int degrees
+
+    # --- 3️⃣  minutes ----------------------------------------------------
+    minu, frac = divmod(frac * 60, 1)       # minu  → int, frac  → 0‑1
+    minu = int(minu)
+
+    # --- 4️⃣  seconds ---------------------------------------------------
+    sec, frac = divmod(frac * 60, 1)        # sec   → int, frac  → 0‑1
+    sec = int(sec)
+
+    # --- 5️⃣  fractional seconds (as an integer) -----------------------
+    frac_units = 10 ** precision          # 100→2decimals, 1000→3decimals…
+    frac_int = int(round(frac * frac_units))
+
+    # --- 6️⃣  carry‑over (rounding may produce 60′/60″) -----------------
+    if frac_int >= frac_units:          # e.g. 0.999… rounds to 1.0s
+        sec += 1
+        frac_int = 0
+
+    if sec >= 60:
+        minu += 1
+        sec = 0
+
+    if minu >= 60:
+        deg += 1
+        minu = 0
+
+    # --- 7️⃣  apply sign to the degrees component -----------------------
+    deg *= sign
+
+    return deg, minu, sec, frac_int
+
+
+def dd_to_dmm(lat: float, lon: float, prec: int = 2) -> str:
+    """
+    Convert a lat/lon pair (in decimal degrees) into a DMM string:
+
+        N 38°53.217' E 122°24.300'
+
+    """
+    eps = 1e-9                    # tolerance for floating‑point rounding
+
+    def _fmt(val: float, is_lat: bool) -> str:
+        sign = 1 if val >= 0 else -1
+        dir_ = ('N' if is_lat else 'E') if sign == 1 else ('S' if is_lat else 'W')
+        abs_val = abs(val)
+
+        deg  = int(math.floor(abs_val))
+        mins_raw = (abs_val - deg) * 60
+
+        # ---- Normalise minutes ----
+        mins = round(mins_raw, prec)            # round to desired precision first
+        if mins >= 60 - eps:                    # minute overflow → carry to next degree
+            deg += 1
+            mins = 0.0
+
+        return f'{dir_} {deg}°{mins:0{prec+3}.{prec}f}\''
+        # format: e.g. "E 10°00.00'"
+
+    return f'{_fmt(lat, True)} {_fmt(lon, False)}'
+
+
+_dms_re = re.compile(
+    r"""^\s*
+    (?P<dir>[NSEW])?                     # optional direction letter
+    (?P<deg>\d{2})\s*                    # 2‑digit degrees
+    (?P<min>\d{2})\s*                    # 2‑digit minutes
+    (?P<sec>\d{2}(?:\.\d+)?)\s*          # 2‑digit seconds (decimal optional)
+    $""",
+    re.IGNORECASE | re.VERBOSE,
+)
+
+
+def dms_to_dd(dms: str) -> float:
+    """
+    Convert a compact DMS string (e.g. 'N382623.45') to decimal degrees.
+
+    Parameters
+    ----------
+    dms : str
+        Compact or “classic” DMS representation.
+
+    Returns
+    -------
+    float
+        Positive for North / East, negative for South / West.
+
+    Raises
+    ------
+    ValueError
+        If the string cannot be parsed.
+    """
+    match = _dms_re.match(dms)
+    if not match:
+        raise ValueError(f"Invalid compact DMS: {dms!r}")
+
+    # Pull out the numeric parts
+    deg   = float(match.group("deg"))
+    minu  = float(match.group("min"))
+    sec   = float(match.group("sec"))
+
+    # DMS → DD formula
+    dd = deg + minu / 60.0 + sec / 3600.0
+
+    # Decide the sign
+    direction = match.group("dir")
+    if direction:
+        direction = direction.upper()
+        sign = -1 if direction in ("S", "W") else 1
+    else:
+        sign = 1
+        if dms.lstrip().startswith("-"):
+            sign = -1
+
+    return sign * dd
+
+
+def dd_to_mgrs(lat: float, lon: float, prec: int = 5) -> str:
+    if sys.version_info < (3, 13):
+        mgrs_converter = mgrs.MGRS()
+        return mgrs_converter.toMGRS(lat, lon, MGRSPrecision=prec)
+    else:
+        ll_coords = LLtoUTM(lat, lon)
+        return encode(ll_coords, 5)
+
+
+def mgrs_to_dd(value: str) -> tuple[float, float]:
+    if sys.version_info < (3, 13):
+        mgrs_converter = mgrs.MGRS()
+        return mgrs_converter.toLatLon(value, inDegrees=True)
+    else:
+        ll_coords = UTMtoLL(decode(value))
+        return ll_coords['lat'], ll_coords['lon']
 
 
 def get_active_runways(runways, wind):

extensions/lotatc/extension.py

@@ -7,6 +7,7 @@
 import json
 import luadata
 import os
+import platform
 import re
 import shutil
 import ssl
@@ -17,7 +18,7 @@
 from core import Extension, utils, Server, ServiceRegistry, get_translation, InstallException
 from discord.ext import tasks
 from extensions.srs import SRS
-from packaging import version as ver
+from packaging.version import parse
 from services.bot import BotService
 from services.servicebus import ServiceBus
 from typing import Optional, cast
@@ -49,6 +50,12 @@ class LotAtc(Extension, FileSystemEventHandler):
     def __init__(self, server: Server, config: dict):
         self.home = os.path.join(server.instance.home, 'Mods', 'Services', 'LotAtc')
         super().__init__(server, config)
+        # check version incompatibility
+        if parse(self.version) >= parse('2.5.0') and sys.platform == 'win32':
+            winver = platform.win32_ver()
+            if winver[1] == '10.0.14393' and 'Server' in winver[3]:
+                raise InstallException("LotAtc 2.5+ does not run on Windows Server 2016 anymore!")
+
         self.observer: Optional[Observer] = None
         self.bus = ServiceRegistry.get(ServiceBus)
         self.gcis = {
@@ -217,7 +224,7 @@ def is_running(self) -> bool:
     def get_inst_version(self) -> tuple[str, str]:
         path = os.path.join(self.get_inst_path(), 'server')
         versions = os.listdir(path)
-        major_version = max(versions, key=ver.parse)
+        major_version = max(versions, key=parse)
         path = os.path.join(path, major_version, 'Mods', 'services', 'LotAtc', 'bin')
         version = utils.get_windows_version(os.path.join(path, 'LotAtc.dll'))
         return major_version, version

plugins/funkman/commands.py

@@ -21,11 +21,6 @@ def read_locals(self) -> dict:
             raise PluginInstallationError(self.plugin_name,
                                           f"Can't find {self.node.config_dir}/plugins/funkman.yaml, "
                                           f"please create one!")
-        path = config.get(DEFAULT_TAG, {}).get('install')
-        if not path or not os.path.exists(path):
-            raise PluginInstallationError(self.plugin_name,
-                                          f"FunkMan install path is not set correctly in the DEFAULT-section of "
-                                          f"your {self.plugin_name}.yaml! FunkMan will not work.")
         return config
 
     async def install(self) -> bool:

plugins/funkman/listener.py

@@ -1,10 +1,11 @@
 import asyncio
 import discord
-import sys
 import uuid
 import matplotlib.figure
 
 from core import EventListener, Server, event, Player, PersistentReport, Channel, get_translation
+from funkman.funkplot.funkplot import FunkPlot
+from funkman.utils.utils import _GetVal
 from io import BytesIO
 from matplotlib import pyplot as plt
 from typing import Literal, TYPE_CHECKING
@@ -22,17 +23,13 @@ class FunkManEventListener(EventListener["FunkMan"]):
     def __init__(self, plugin: "FunkMan"):
         super().__init__(plugin)
         self.config = self.get_config()
-        path = self.config.get('install')
-        sys.path.append(path)
-        from funkman.utils.utils import _GetVal
         self.funkplot = None
         self._GetVal = _GetVal
         self.lock = asyncio.Lock()
 
     async def get_funkplot(self):
         async with self.lock:
             if not self.funkplot:
-                from funkman.funkplot.funkplot import FunkPlot
                 self.funkplot = FunkPlot(ImagePath=self.config['IMAGEPATH'])
             return self.funkplot
 

plugins/greenieboard/listener.py

@@ -4,9 +4,9 @@
 import psycopg
 import re
 import string
-import sys
 
 from core import EventListener, Server, Player, Channel, Side, PersistentReport, event, get_translation, utils
+from funkman.funkplot.funkplot import FunkPlot
 from matplotlib import pyplot as plt
 from pathlib import Path
 from plugins.creditsystem.player import CreditPlayer
@@ -39,13 +39,6 @@ def __init__(self, plugin: "GreenieBoard"):
         super().__init__(plugin)
         config = self.get_config()
         if 'FunkMan' in config:
-            path = config['FunkMan']['install']
-            if not os.path.exists(path):
-                self.log.error(f"FunkMan install path is not correct in your {self.plugin_name}.yaml! "
-                               f"FunkMan will not work.")
-                return
-            sys.path.append(path)
-            from funkman.funkplot.funkplot import FunkPlot
             self.funkplot = FunkPlot(ImagePath=config['FunkMan']['IMAGEPATH'])
         else:
             self.funkplot = None