rene
297bd22f96
NEUE BACKEND-MODULE:
math_utils.py
- haversine_km(lat1, lon1, lat2, lon2) — Distanz in km
- haversine_m(...) — Convenience-Wrapper in Metern
- bbox_deg_from_km(lat, radius_km) — Bounding-Box-Approximation
für SQL-Vorfilter (statt Haversine im Python-Loop)
config.py
- DB_PATH, MEDIA_DIR, BREEDER_DOCS_DIR, SCANINPUT_DIR
- API_TIMEOUT_SHORT (5s) / DEFAULT (10s) / LONG (30s)
- HTTP_USER_AGENT, HTTP_HEADERS
errors.py
- not_found(msg), forbidden(msg), bad_request(msg), unauthorized(msg)
- conflict(msg), too_many_requests(msg, retry_after), service_unavailable(msg)
- require_or_404(row, msg) — Convenience-Helper
UI.JS ERWEITERUNGEN:
UI.time erweitert:
- formatDate(d) → "15.03.2026"
- formatDateTime(d) → "15.03.2026, 14:30"
- weekday(d) → "Di"
- parseISO(str) → {year, month, day}
UI.text (neu):
- truncate(str, maxLen, ellipsis='…')
- slug(str) — URL-Slug aus String (mit DE-Umlauten)
UI.money (neu):
- format(value) → "12,34 €" (de-DE, EUR)
- formatWithSuffix(value, '/Jahr')
HAVERSINE-MIGRATION (13 Backend-Routen):
alerts.py, services.py, places.py, events.py, diary.py, playdate.py,
lost.py, poison.py, adoption.py, gassi_zeiten.py, sitting.py, routen.py,
walks.py
- Alle lokalen def _haversine/haversine_km entfernt
- Aufrufe ersetzt durch haversine_km/haversine_m je nach Einheit
- from math_utils import haversine_km|haversine_m in jeder Datei
Tests 19/19 grün.
Hinweis: Migrationen für MEDIA_DIR (19 Stellen), API-Timeouts (12),
Date-Formatter im Frontend (24) und UI.text.truncate (5) sind als
Folge-Sprints möglich. Helper sind verfügbar.
54 lines
2.1 KiB
Python
54 lines
2.1 KiB
Python
"""BAN YARO — Nearby Alerts (Giftköder + Vermisste Hunde)"""
|
|
from datetime import datetime
|
|
from fastapi import APIRouter, Depends
|
|
|
|
from database import db
|
|
from auth import get_current_user_optional as get_optional_user
|
|
from math_utils import haversine_m, bbox_deg_from_km
|
|
|
|
router = APIRouter()
|
|
|
|
_RADIUS_M = 20_000 # 20 km
|
|
_RADIUS_KM = _RADIUS_M / 1000.0
|
|
|
|
|
|
def _bbox(lat: float, lon: float, radius_km: float) -> tuple[float, float, float, float]:
|
|
"""Bounding-Box-Approximation für lat/lon innerhalb radius_km."""
|
|
lat_delta, lon_delta = bbox_deg_from_km(lat, radius_km)
|
|
return (lat - lat_delta, lat + lat_delta, lon - lon_delta, lon + lon_delta)
|
|
|
|
|
|
@router.get("")
|
|
async def nearby_alerts(lat: float, lon: float, user=Depends(get_optional_user)):
|
|
now = datetime.utcnow().isoformat()
|
|
lat_min, lat_max, lon_min, lon_max = _bbox(lat, lon, _RADIUS_KM)
|
|
with db() as conn:
|
|
# Bounding-Box-Vorfilter per SQL (billig) → reduziert die Kandidaten
|
|
# auf ~10 Einträge statt "alle". Die exakte Haversine-Prüfung passiert
|
|
# anschließend in Python.
|
|
poisons = conn.execute(
|
|
"""SELECT lat, lon FROM poison
|
|
WHERE geloest=0 AND expires_at > ?
|
|
AND lat BETWEEN ? AND ?
|
|
AND lon BETWEEN ? AND ?""",
|
|
(now, lat_min, lat_max, lon_min, lon_max)
|
|
).fetchall()
|
|
lost = conn.execute(
|
|
"""SELECT lat, lon FROM lost_dogs
|
|
WHERE is_active=1
|
|
AND lat BETWEEN ? AND ?
|
|
AND lon BETWEEN ? AND ?""",
|
|
(lat_min, lat_max, lon_min, lon_max)
|
|
).fetchall()
|
|
# Letzten Standort des Users für geo-basierte Push-Filter speichern
|
|
if user:
|
|
conn.execute(
|
|
"""UPDATE push_subscriptions SET last_lat=?, last_lon=?
|
|
WHERE user_id=?""",
|
|
(lat, lon, user["id"])
|
|
)
|
|
|
|
has_poison = any(haversine_m(lat, lon, r["lat"], r["lon"]) <= _RADIUS_M for r in poisons)
|
|
has_lost = any(haversine_m(lat, lon, r["lat"], r["lon"]) <= _RADIUS_M for r in lost)
|
|
|
|
return {"poison": has_poison, "lost": has_lost}
|