Deploy b852318

route/gps_extractor.py

@@ -10,7 +10,7 @@ import subprocess
 _ISO6709 = re.compile(rb"([+-]\d{1,2}(?:\.\d+)?)([+-]\d{1,3}(?:\.\d+)?)([+-]\d+(?:\.\d+)?)?(?:CRS[^/]*)?/")
 
 
-def _result(lat, lon, alt=None, source=""):
+def _result(lat, lon, alt=None, source="", accuracy=None):
     try:
         lat, lon = float(lat), float(lon)
     except (TypeError, ValueError):
@@ -24,6 +24,13 @@ def _result(lat, lon, alt=None, source=""):
             out["alt"] = round(float(alt), 1)
         except (TypeError, ValueError):
             pass
+    if accuracy is not None:
+        try:
+            a = float(accuracy)
+            if 0 < a < 100000:
+                out["accuracy_m"] = round(a, 1)
+        except (TypeError, ValueError):
+            pass
     return out
 
 
@@ -59,7 +66,8 @@ def from_image(path):
         alt = None
         if 6 in gps:
             alt = _ratio(gps[6]) * (-1 if gps.get(5) in (1, b"\x01") else 1)
-        return _result(lat, lon, alt, "exif")
+        acc = _ratio(gps[31]) if 31 in gps else None      # GPSHPositioningError (metres)
+        return _result(lat, lon, alt, "exif", acc)
     except Exception:
         return {"found": False}
 
@@ -80,12 +88,17 @@ def from_video(path):
                              capture_output=True, timeout=30).stdout
         info = json.loads(out or b"{}")
         tag_sets = [info.get("format", {}).get("tags", {})] + [s.get("tags", {}) for s in info.get("streams", [])]
+        acc = None
+        for tags in tag_sets:
+            for k, v in (tags or {}).items():
+                if "location.accuracy.horizontal" in k.lower():
+                    acc = v
         for tags in tag_sets:
             for k, v in (tags or {}).items():
                 if "location" in k.lower() or k.lower().endswith("xyz"):
                     p = _parse_iso6709(str(v))
                     if p:
-                        return _result(*p, source="video-tag")
+                        return _result(*p, source="video-tag", accuracy=acc)
     except Exception:
         pass
     # Fallback: scan the start and end of the file for the location atom.

templates/ts-gps.js

@@ -108,6 +108,8 @@
     pop.innerHTML =
       '<div style="font-weight:700;margin-bottom:2px">' + T('الموقع المضمَّن في الملف', 'Location embedded in the file') + '</div>' +
       '<div class="coords">' + g.lat.toFixed(6) + ', ' + g.lon.toFixed(6) + '</div>' +
+      (g.accuracy_m != null ? '<div style="text-align:center;font-weight:700;color:#86efac">' + T('دقة الموقع: ', 'Accuracy: ') + '<span dir="ltr">± ' + g.accuracy_m + ' m</span></div>' :
+        '<div style="text-align:center;opacity:.6;font-size:11px">' + T('لم يحفظ الجهاز نصف قطر الدقة', 'The device did not store an accuracy radius') + '</div>') +
       (g.alt != null ? '<div style="text-align:center;opacity:.75">' + T('الارتفاع: ', 'Altitude: ') + '<span dir="ltr">' + g.alt + ' m</span></div>' : '') +
       '<a class="primary" target="_blank" rel="noopener" href="' + g.maps_url + '">' + T('فتح في خرائط Google', 'Open in Google Maps') + '</a>' +
       '<a target="_blank" rel="noopener" href="https://maps.apple.com/?ll=' + g.lat + ',' + g.lon + '&q=' + g.lat + ',' + g.lon + '">' + T('فتح في خرائط Apple', 'Open in Apple Maps') + '</a>' +