OSINT Monitor Layer + Erdbeben in Katastrophen zusammengefuehrt

MONITOR LAYER (neu): - Neuer Top-Layer "OSINT Monitor" im Panel - Zeigt geoparsete Standorte aus Monitor-Lagen auf dem Globus - Farbkodiert: rot=Hauptgeschehen, orange=Reaktionen, blau=Beteiligte - Labels mit Ortsname + Artikelanzahl bei Zoom - 2min Refresh, GeoJSON vom Monitor Public API KATASTROPHEN (erweitert): - Erdbeben-Layer in Katastrophen integriert (kein separater Toggle mehr) - Laedt NASA EONET + USGS parallel - Erdbeben als farbige Punkte (rot=frisch, gelb=alt) mit M-Label - Katastrophen-Toggle zeigt jetzt alles: Waldbraende, Vulkane, Stuerme, Fluten UND Erdbeben
2026-03-24 13:11:34 +01:00
Commit 68387f89fd
--- a/src/data_monitor.py
+++ b/src/data_monitor.py
@@ -0,0 +1,46 @@
+"""Monitor-Feed: OSINT-Daten aus dem AegisSight Monitor."""
+import logging
+import os
+import time
+
+import httpx
+from fastapi import APIRouter, Query
+
+logger = logging.getLogger("globe.monitor")
+router = APIRouter()
+
+_MONITOR_URL = os.getenv("MONITOR_API_URL", "https://monitor.aegis-sight.de/api/public")
+_MONITOR_KEY = os.getenv("MONITOR_API_KEY", "")
+
+_cache: dict[str, tuple] = {}
+
+
+@router.get("/monitor-feed")
+async def get_monitor_feed(incident_id: int = Query(None)):
+    """Holt OSINT-Daten vom AegisSight Monitor."""
+    cache_key = f"monitor:{incident_id or 'all'}"
+    if cache_key in _cache and time.time() - _cache[cache_key][0] < 120:
+        return _cache[cache_key][1]
+
+    params = {}
+    if incident_id:
+        params["incident_id"] = incident_id
+
+    try:
+        async with httpx.AsyncClient(timeout=15) as client:
+            r = await client.get(
+                f"{_MONITOR_URL}/globe-feed",
+                params=params,
+                headers={"X-API-Key": _MONITOR_KEY},
+            )
+            r.raise_for_status()
+            data = r.json()
+            _cache[cache_key] = (time.time(), data)
+            logger.info(f"Monitor-Feed: {len(data.get('features', []))} Locations, "
+                       f"{len(data.get('incidents', []))} Lagen")
+            return data
+    except Exception as e:
+        logger.warning(f"Monitor-Feed Fehler: {e}")
+        if cache_key in _cache:
+            return _cache[cache_key][1]
+        return {"type": "FeatureCollection", "features": [], "incidents": []}
--- a/src/main.py
+++ b/src/main.py
@@ -33,6 +33,7 @@ from data_quakes import router as quakes_router
 from data_gdelt import router as gdelt_router
 from data_satellites import router as satellites_router
 from data_disasters import router as disasters_router
+from data_monitor import router as monitor_router

 # Alle Daten-APIs hinter Auth
 app.include_router(flights_router, prefix="/api", dependencies=[Depends(get_current_user)])
@@ -41,6 +42,7 @@ app.include_router(quakes_router, prefix="/api", dependencies=[Depends(get_curre
 app.include_router(gdelt_router, prefix="/api", dependencies=[Depends(get_current_user)])
 app.include_router(satellites_router, prefix="/api", dependencies=[Depends(get_current_user)])
 app.include_router(disasters_router, prefix="/api", dependencies=[Depends(get_current_user)])
+app.include_router(monitor_router, prefix="/api", dependencies=[Depends(get_current_user)])

 # --- Static files ---
 static_dir = Path(__file__).parent.parent / "static"
--- a/static/css/globe.css
+++ b/static/css/globe.css
@@ -152,6 +152,7 @@ html, body { height: 100%; overflow: hidden; background: var(--bg-primary); colo


 /* === Neue Layer-Dots === */
+.dot-monitor { background: #ff2222; box-shadow: 0 0 4px rgba(255,34,34,0.5); }
 .dot-satellites { background: #ff4444; }
 .dot-disasters { background: #ff8800; }

--- a/static/index.html
+++ b/static/index.html
@@ -46,6 +46,14 @@
    <aside id="layer-panel" class="layer-panel">
        <h3 class="panel-title">LAYER</h3>
        <div class="panel-section">
+            <label class="layer-toggle">
+                <input type="checkbox" id="layer-monitor" title="OSINT-Daten aus dem AegisSight Monitor (geoparsete Nachrichtenstandorte)">
+                <span class="layer-dot dot-monitor"></span>
+                <span class="layer-name" title="Nachrichtenstandorte aus AegisSight Monitor Lagen">OSINT Monitor</span>
+                <span class="layer-count" id="count-monitor">-</span>
+            </label>
+            <div class="layer-loading" id="loading-monitor"></div>
+            <div class="layer-status" id="status-monitor"></div>
            <label class="layer-toggle">
                <input type="checkbox" id="layer-flights" title="Echtzeit-Flugverkehr weltweit (OpenSky Network, ~7.000 Flugzeuge, 15s Refresh)">
                <span class="layer-dot dot-flights"></span>
@@ -62,14 +70,7 @@
            </label>
            <div class="layer-loading" id="loading-ships"></div>
            <div class="layer-status" id="status-ships"></div>
-            <label class="layer-toggle">
-                <input type="checkbox" id="layer-quakes" title="Erdbeben M2.5+ der letzten 24h (USGS Earthquake Hazards, 5min Refresh)">
-                <span class="layer-dot dot-quakes"></span>
-                <span class="layer-name" title="Magnitude 2.5+, Farbe nach Alter (rot=frisch, gelb=aelter)">Erdbeben</span>
-                <span class="layer-count" id="count-quakes">-</span>
-            </label>
-            <div class="layer-loading" id="loading-quakes"></div>
-            <div class="layer-status" id="status-quakes"></div>
+
            <label class="layer-toggle">
                <input type="checkbox" id="layer-gdelt" title="Geokodierte Nachrichten der letzten 24h (GDELT Global Event Database)">
                <span class="layer-dot dot-gdelt"></span>
@@ -87,9 +88,9 @@
            <div class="layer-loading" id="loading-satellites"></div>
            <div class="layer-status" id="status-satellites"></div>
            <label class="layer-toggle">
-                <input type="checkbox" id="layer-disasters" title="Aktive Naturkatastrophen (NASA EONET: Waldbraende, Vulkane, Stuerme, Fluten)">
+                <input type="checkbox" id="layer-disasters" title="Naturkatastrophen + Erdbeben (NASA EONET + USGS: Waldbraende, Vulkane, Stuerme, Erdbeben M2.5+)">
                <span class="layer-dot dot-disasters"></span>
-                <span class="layer-name" title="Waldbraende, Vulkane, Stuerme, Fluten, Erdrutsche, Eisschmelze">Katastrophen</span>
+                <span class="layer-name" title="Waldbraende, Vulkane, Stuerme, Erdbeben, Fluten, Erdrutsche">Katastrophen</span>
                <span class="layer-count" id="count-disasters">-</span>
            </label>
            <div class="layer-loading" id="loading-disasters"></div>
@@ -144,6 +145,7 @@
    <script src="/static/js/layers/gdelt.js"></script>
    <script src="/static/js/layers/satellites.js"></script>
    <script src="/static/js/layers/disasters.js"></script>
+    <script src="/static/js/layers/monitor.js"></script>
    <script src="/static/js/layers/visualmodes.js"></script>
 </body>
 </html>
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -108,9 +108,9 @@ const Globe = {

    _setupLayerToggles() {
        var toggles = {
+            'layer-monitor': function(on) { on ? MonitorLayer.start(Globe.viewer) : MonitorLayer.stop(); },
            'layer-flights': function(on) { on ? FlightsLayer.start(Globe.viewer) : FlightsLayer.stop(); },
            'layer-ships': function(on) { on ? ShipsLayer.start(Globe.viewer) : ShipsLayer.stop(); },
-            'layer-quakes': function(on) { on ? QuakesLayer.start(Globe.viewer) : QuakesLayer.stop(); },
            'layer-gdelt': function(on) { on ? GdeltLayer.start(Globe.viewer) : GdeltLayer.stop(); },
            'layer-satellites': function(on) { on ? SatellitesLayer.start(Globe.viewer) : SatellitesLayer.stop(); },
            'layer-disasters': function(on) { on ? DisastersLayer.start(Globe.viewer) : DisastersLayer.stop(); },
@@ -136,6 +136,9 @@ const Globe = {
        if (typeof QuakesLayer !== 'undefined' && QuakesLayer._count > 0) {
            document.getElementById('count-quakes').textContent = QuakesLayer._count.toLocaleString('de-DE');
        }
+        if (typeof MonitorLayer !== 'undefined' && MonitorLayer._count > 0) {
+            document.getElementById('count-monitor').textContent = MonitorLayer._count.toLocaleString('de-DE');
+        }
        if (typeof SatellitesLayer !== 'undefined' && SatellitesLayer._count > 0) {
            document.getElementById('count-satellites').textContent = SatellitesLayer._count.toLocaleString('de-DE');
        }
--- a/static/js/layers/disasters.js
+++ b/static/js/layers/disasters.js
@@ -28,15 +28,41 @@ const DisastersLayer = {
        var loadEl = document.getElementById('loading-disasters');
        var statusEl = document.getElementById('status-disasters');
        if (loadEl) loadEl.classList.add('active');
-        if (statusEl) { statusEl.textContent = 'Lade Ereignisse...'; statusEl.classList.add('active'); }
-        fetch('/api/disasters')
+        if (statusEl) { statusEl.textContent = 'Lade Ereignisse + Erdbeben...'; statusEl.classList.add('active'); }
+        // Lade beides parallel: NASA EONET + USGS Erdbeben
+        Promise.all([
+            fetch('/api/disasters').then(function(r) { return r.json(); }).catch(function() { return {events:[]}; }),
+            fetch('/api/quakes').then(function(r) { return r.json(); }).catch(function() { return {features:[]}; }),
+        ])
+        .then(function(results) {
+            var eonetData = results[0];
+            var quakeData = results[1];
+            self._renderAll(eonetData, quakeData);
+            var total = (eonetData.events || []).length + (quakeData.features || []).length;
+            self._count = total;
+            if (statusEl) statusEl.textContent = total + ' Ereignisse';
+        })
+        .catch(function(e) { console.warn('Disasters error:', e); if (statusEl) statusEl.textContent = 'Fehler'; })
+        .finally(function() { if (loadEl) loadEl.classList.remove('active'); setTimeout(function() { if (statusEl) statusEl.classList.remove('active'); }, 5000); });
+    },
+
+    _renderAll(eonetData, quakeData) {
+        if (!this._dataSource) return;
+        this._dataSource.entities.removeAll();
+
+        // NASA EONET Events
+        var events = eonetData.events || [];
+        this._renderEonet(events);
+
+        // USGS Erdbeben
+        var quakes = quakeData.features || [];
+        this._renderQuakes(quakes);
+    },
+
+    _renderEonet(events) {
+        var self = this;
        .then(function(r) { return r.json(); })
-        .then(function(data) {
-            if (!self._dataSource) return;
-            self._dataSource.entities.removeAll();
-            var events = data.events || [];
-            self._count = events.length;
-            var icons = {
+        var icons = {
                'wildfires': { color: '#ff4400', symbol: '🔥', label: 'Waldbrand' },
                'volcanoes': { color: '#ff0000', symbol: '🌋', label: 'Vulkan' },
                'severeStorms': { color: '#aa44ff', symbol: '🌀', label: 'Sturm' },
@@ -78,9 +104,43 @@ const DisastersLayer = {
                        '</div>',
                });
            });
-            if (statusEl) statusEl.textContent = events.length + ' Ereignisse';
-        })
-        .catch(function(e) { console.warn('Disasters error:', e); if (statusEl) statusEl.textContent = 'Fehler'; })
-        .finally(function() { if (loadEl) loadEl.classList.remove('active'); setTimeout(function() { if (statusEl) statusEl.classList.remove('active'); }, 5000); });
+    },
+
+    _renderQuakes(features) {
+        var self = this;
+        var now = Date.now();
+        features.forEach(function(f) {
+            var c = f.geometry.coordinates;
+            var p = f.properties;
+            var mag = p.mag || 1;
+            var ageH = (now - p.time) / 3600000;
+            var color = ageH < 1 ? '#ff0000' : ageH < 6 ? '#ff6600' : ageH < 12 ? '#ffaa00' : '#ffdd00';
+            self._dataSource.entities.add({
+                position: Cesium.Cartesian3.fromDegrees(c[0], c[1], 0),
+                point: {
+                    pixelSize: Math.max(mag * 2.5, 4),
+                    color: Cesium.Color.fromCssColorString(color),
+                    outlineColor: Cesium.Color.fromCssColorString(color).withAlpha(0.4),
+                    outlineWidth: 2,
+                    heightReference: Cesium.HeightReference.NONE,
+                },
+                label: {
+                    text: 'M' + mag.toFixed(1),
+                    font: '10px monospace',
+                    fillColor: Cesium.Color.fromCssColorString(color),
+                    outlineColor: Cesium.Color.BLACK,
+                    outlineWidth: 2,
+                    style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+                    pixelOffset: new Cesium.Cartesian2(0, -12),
+                    scale: 0.7,
+                    distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000),
+                },
+                description: '<div style="font-family:monospace;font-size:13px;padding:8px">' +
+                    '<strong style="color:' + color + '">ERDBEBEN M' + mag.toFixed(1) + '</strong><br>' +
+                    '<span style="color:#e0e0e0">' + (p.place || '?') + '</span><br>' +
+                    '<span style="color:#888">Tiefe: ' + (c[2] || '?') + ' km | ' +
+                    new Date(p.time).toLocaleString('de-DE') + '</span></div>',
+            });
+        });
    },
 };
--- a/static/js/layers/monitor.js
+++ b/static/js/layers/monitor.js
@@ -0,0 +1,100 @@
+/**
+ * Monitor-Layer: OSINT-Daten aus dem AegisSight Monitor.
+ * Zeigt geoparsete Standorte aus Nachrichtenlagen auf dem Globus.
+ */
+const MonitorLayer = {
+    _viewer: null,
+    _points: null,
+    _labels: null,
+    _interval: null,
+    _count: 0,
+    _data: [],
+    _incidents: [],
+
+    start(viewer) {
+        if (this._points) return;
+        this._viewer = viewer;
+        this._points = viewer.scene.primitives.add(new Cesium.PointPrimitiveCollection());
+        this._labels = viewer.scene.primitives.add(new Cesium.LabelCollection());
+        this._fetch();
+        var self = this;
+        this._interval = setInterval(function() { self._fetch(); }, 120000); // 2min
+    },
+
+    stop() {
+        if (this._interval) { clearInterval(this._interval); this._interval = null; }
+        if (this._points && this._viewer) { this._viewer.scene.primitives.remove(this._points); this._points = null; }
+        if (this._labels && this._viewer) { this._viewer.scene.primitives.remove(this._labels); this._labels = null; }
+        this._count = 0; this._data = []; this._incidents = [];
+    },
+
+    _fetch() {
+        var self = this;
+        var loadEl = document.getElementById('loading-monitor');
+        var statusEl = document.getElementById('status-monitor');
+        if (loadEl) loadEl.classList.add('active');
+        if (statusEl) { statusEl.textContent = 'Lade Monitor-Daten...'; statusEl.classList.add('active'); }
+        fetch('/api/monitor-feed')
+        .then(function(r) { return r.json(); })
+        .then(function(data) {
+            self._data = data.features || [];
+            self._incidents = data.incidents || [];
+            self._count = self._data.length;
+            self._render();
+            if (statusEl) {
+                var incNames = self._incidents.map(function(i) { return i.title; }).join(', ');
+                statusEl.textContent = self._count + ' Orte' + (incNames ? ' (' + incNames.substring(0, 40) + ')' : '');
+            }
+        })
+        .catch(function(e) { console.warn('Monitor error:', e); if (statusEl) statusEl.textContent = 'Fehler'; })
+        .finally(function() { if (loadEl) loadEl.classList.remove('active'); setTimeout(function() { if (statusEl) statusEl.classList.remove('active'); }, 8000); });
+    },
+
+    _render() {
+        if (!this._points) return;
+        this._points.removeAll();
+        this._labels.removeAll();
+
+        var colors = {
+            'primary': Cesium.Color.fromCssColorString('#ff2222'),
+            'secondary': Cesium.Color.fromCssColorString('#ff8800'),
+            'tertiary': Cesium.Color.fromCssColorString('#4499ff'),
+            'mentioned': Cesium.Color.fromCssColorString('#888888'),
+        };
+
+        for (var i = 0; i < this._data.length; i++) {
+            var f = this._data[i];
+            var coords = f.geometry.coordinates;
+            var p = f.properties;
+            var cat = p.category || 'mentioned';
+            var color = colors[cat] || colors.mentioned;
+            var count = p.article_count || 1;
+            var size = Math.min(Math.max(Math.sqrt(count) * 2.5, 4), 14);
+
+            this._points.add({
+                position: Cesium.Cartesian3.fromDegrees(coords[0], coords[1], 1000),
+                pixelSize: size,
+                color: color,
+                outlineColor: Cesium.Color.WHITE.withAlpha(0.6),
+                outlineWidth: 1,
+            });
+
+            // Label mit Ortsname bei genug Artikeln
+            if (count >= 2) {
+                this._labels.add({
+                    position: Cesium.Cartesian3.fromDegrees(coords[0], coords[1], 1000),
+                    text: (p.name || '?') + ' (' + count + ')',
+                    font: '11px sans-serif',
+                    fillColor: color,
+                    outlineColor: Cesium.Color.BLACK,
+                    outlineWidth: 3,
+                    style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+                    pixelOffset: new Cesium.Cartesian2(0, -size - 6),
+                    scale: 0.8,
+                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                    distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 3000000),
+                });
+            }
+        }
+    },
+};