rene/banyaro
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MapLibre-Port 3b+3c: Wetter + GPS-Aufzeichnung für GL entgaten

Browse source 
3b Wetter: engine-neutrale Helfer (_wxAddRaster→raster-source unter den Markern, _mapOnMove,
   _wxAddTempMarker→maplibregl.Marker). _toggleRadar/_loadRadar/_toggleTemp/_loadTempLabels gebrancht.
3c GPS: _recTrackGL (geojson line-source), _updateRecMarker (maplibregl.Marker), _recCleanupMap.
   _updateRecMap/_startRecording-Resume/Cleanup gebrancht, Gates entfernt. panTo [lng,lat] für GL.
This commit is contained in:
rene 2026-06-05 11:19:40 +02:00
parent 9c959dd632
commit 425f99effb
6 changed files with 124 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1187 1188

24
backend/static/index.html
View file

@ -86,14 +86,14 @@
<title>Ban Yaro</title> <title>Ban Yaro</title>
<!-- Theme + theme-color Statusleiste vor CSS setzen --> <!-- Theme + theme-color Statusleiste vor CSS setzen -->
<script src="/js/boot-early.js?v=1187"></script> <script src="/js/boot-early.js?v=1188"></script>
<!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung --> <!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung -->
<link rel="stylesheet" href="/css/design-system.css?v=1187"> <link rel="stylesheet" href="/css/design-system.css?v=1188">
<link rel="stylesheet" href="/css/layout.css?v=1187"> <link rel="stylesheet" href="/css/layout.css?v=1188">
<link rel="stylesheet" href="/css/components.css?v=1187"> <link rel="stylesheet" href="/css/components.css?v=1188">
<link rel="stylesheet" href="/css/utilities.css?v=1187"> <link rel="stylesheet" href="/css/utilities.css?v=1188">
<link rel="stylesheet" href="/css/lists.css?v=1187"> <link rel="stylesheet" href="/css/lists.css?v=1188">
</head> </head>
<body> <body>
@ -617,11 +617,11 @@
<div id="modal-container"></div> <div id="modal-container"></div>
<!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features --> <!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features -->
<script src="/js/api.js?v=1187"></script> <script src="/js/api.js?v=1188"></script>
<script src="/js/ui.js?v=1187"></script> <script src="/js/ui.js?v=1188"></script>
<script src="/js/app.js?v=1187"></script> <script src="/js/app.js?v=1188"></script>
<script src="/js/worlds.js?v=1187"></script> <script src="/js/worlds.js?v=1188"></script>
<script src="/js/offline-indicator.js?v=1187"></script> <script src="/js/offline-indicator.js?v=1188"></script>
<!-- Feature-Seiten werden lazy geladen --> <!-- Feature-Seiten werden lazy geladen -->
@ -631,7 +631,7 @@
<!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) --> <!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) -->
<script src="/js/boot.js?v=1187"></script> <script src="/js/boot.js?v=1188"></script>
</body> </body>

2
backend/static/js/app.js
View file

@ -3,7 +3,7 @@
Router, State-Management, Navigation, Initialisierung. Router, State-Management, Navigation, Initialisierung.
============================================================ */ ============================================================ */
const APP_VER = '1187'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen const APP_VER = '1188'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
const APP_VERSION = '1.6.0'; // ← semantische Version, wird bei make release gesetzt const APP_VERSION = '1.6.0'; // ← semantische Version, wird bei make release gesetzt
window.APP_VER = APP_VER; // global verfügbar für andere Module (z.B. offline-indicator) window.APP_VER = APP_VER; // global verfügbar für andere Module (z.B. offline-indicator)
window.APP_VERSION = APP_VERSION; window.APP_VERSION = APP_VERSION;

163
backend/static/js/pages/map.js
View file

@ -426,7 +426,6 @@ window.Page_map = (() => {
let _tempDebounce = null; let _tempDebounce = null;
async function _toggleRadar() { async function _toggleRadar() {
if (_engineGL) { UI.toast.info('Regenradar im neuen Karten-Modus in Kürze.'); return; }
if (!App.hasPro(_appState?.user)) { if (!App.hasPro(_appState?.user)) {
UI.toast.info('Regenradar ist ein Pro-Feature.'); UI.toast.info('Regenradar ist ein Pro-Feature.');
return; return;
@ -434,7 +433,7 @@ window.Page_map = (() => {
const btn = document.getElementById('map-radar-btn'); const btn = document.getElementById('map-radar-btn');
if (_radarActive) { if (_radarActive) {
_radarActive = false; _radarActive = false;
if (_radarLayer) { _map.removeLayer(_radarLayer); _radarLayer = null; } if (_radarLayer) { _wxRemoveRaster(_radarLayer); _radarLayer = null; }
clearInterval(_radarTimer); clearInterval(_radarTimer);
btn?.classList.remove('active'); btn?.classList.remove('active');
return; return;
@ -447,7 +446,6 @@ window.Page_map = (() => {
} }
async function _toggleTemp() { async function _toggleTemp() {
if (_engineGL) { UI.toast.info('Temperatur-Layer im neuen Karten-Modus in Kürze.'); return; }
if (!App.hasPro(_appState?.user)) { if (!App.hasPro(_appState?.user)) {
UI.toast.info('Temperatur-Layer ist ein Pro-Feature.'); UI.toast.info('Temperatur-Layer ist ein Pro-Feature.');
return; return;
@ -455,11 +453,11 @@ window.Page_map = (() => {
const btn = document.getElementById('map-temp-btn'); const btn = document.getElementById('map-temp-btn');
if (_tempActive) { if (_tempActive) {
_tempActive = false; _tempActive = false;
if (_tempLayer) { _map.removeLayer(_tempLayer); _tempLayer = null; } if (_tempLayer) { _wxRemoveRaster(_tempLayer); _tempLayer = null; }
_tempMarkers.forEach(m => _map.removeLayer(m)); _tempMarkers.forEach(m => m.remove());
_tempMarkers = []; _tempMarkers = [];
clearTimeout(_tempDebounce); clearTimeout(_tempDebounce);
_map.off('moveend zoomend', _debounceTempLabels); _mapOffMove(_debounceTempLabels);
document.getElementById('map-temp-legend')?.remove(); document.getElementById('map-temp-legend')?.remove();
btn?.classList.remove('active'); btn?.classList.remove('active');
return; return;
@ -468,16 +466,9 @@ window.Page_map = (() => {
btn?.classList.add('active'); btn?.classList.add('active');
try { try {
const cfg = await API.get('/weather/layer-tiles?layer=temp_new'); const cfg = await API.get('/weather/layer-tiles?layer=temp_new');
_tempLayer = window.L.tileLayer(cfg.url, { _tempLayer = _wxAddRaster('temp', cfg.url, 1.0, cfg.maxNativeZoom ?? 18);
opacity: 1.0,
tileSize: 256,
zIndex: 290,
maxNativeZoom: cfg.maxNativeZoom ?? 18,
maxZoom: 18,
attribution: 'Temp © <a href="https://openweathermap.org">OpenWeatherMap</a>',
}).addTo(_map);
_showTempLegend(); _showTempLegend();
_map.on('moveend zoomend', _debounceTempLabels); _mapOnMove(_debounceTempLabels);
await _loadTempLabels(); await _loadTempLabels();
} catch { } catch {
_tempActive = false; _tempActive = false;
@ -527,24 +518,17 @@ window.Page_map = (() => {
)); ));
// Alte Marker entfernen // Alte Marker entfernen
_tempMarkers.forEach(m => _map.removeLayer(m)); _tempMarkers.forEach(m => m.remove());
_tempMarkers = []; _tempMarkers = [];
results.filter(Boolean).forEach(({ lat, lon, t }) => { results.filter(Boolean).forEach(({ lat, lon, t }) => {
if (t == null) return; if (t == null) return;
const temp = Math.round(t); const temp = Math.round(t);
const color = _tempColor(temp); const color = _tempColor(temp);
const icon = window.L.divIcon({ const html = `<div style="background:${color};color:#fff;font-size:12px;font-weight:800;
className: '',
html: `<div style="background:${color};color:#fff;font-size:12px;font-weight:800;
padding:2px 6px;border-radius:10px;white-space:nowrap; padding:2px 6px;border-radius:10px;white-space:nowrap;
box-shadow:0 1px 4px rgba(0,0,0,0.5);text-shadow:0 1px 2px rgba(0,0,0,0.4)">${temp}°</div>`, box-shadow:0 1px 4px rgba(0,0,0,0.5);text-shadow:0 1px 2px rgba(0,0,0,0.4)">${temp}°</div>`;
iconSize: null, _tempMarkers.push(_wxAddTempMarker(lat, lon, html));
iconAnchor: [20, 10],
});
const m = window.L.marker([lat, lon], { icon, zIndexOffset: 500, interactive: false });
m.addTo(_map);
_tempMarkers.push(m);
}); });
} }
@ -582,15 +566,8 @@ window.Page_map = (() => {
if (!frames.length) return; if (!frames.length) return;
const latest = frames[frames.length - 1].path; const latest = frames[frames.length - 1].path;
const url = `https://tilecache.rainviewer.com${latest}/256/{z}/{x}/{y}/4/1_1.png`; const url = `https://tilecache.rainviewer.com${latest}/256/{z}/{x}/{y}/4/1_1.png`;
if (_radarLayer) _map.removeLayer(_radarLayer); if (_radarLayer) _wxRemoveRaster(_radarLayer);
_radarLayer = window.L.tileLayer(url, { _radarLayer = _wxAddRaster('radar', url, 0.7, 7);
opacity: 0.7,
tileSize: 256,
zIndex: 300,
maxNativeZoom: 7,
maxZoom: 18,
attribution: 'Radar © <a href="https://rainviewer.com">RainViewer</a>',
}).addTo(_map);
} catch { /* still */ } } catch { /* still */ }
} }
@ -737,6 +714,45 @@ window.Page_map = (() => {
return { north: n + dLat, south: s - dLat, east: e + dLon, west: w - dLon }; return { north: n + dLat, south: s - dLat, east: e + dLon, west: w - dLon };
} }
// ---- Engine-neutrale Wetter-Helfer (Raster-Overlay + Move-Listener + Temp-Marker) ----
// Raster-Overlay (Radar/Temp). handle = Leaflet-Layer | GL-Layer-ID-String.
function _wxAddRaster(key, url, opacity, maxNativeZoom) {
if (_engineGL) {
const id = 'wx-' + key;
_wxRemoveRaster(id);
_map.addSource(id, { type: 'raster', tiles: [url], tileSize: 256, maxzoom: maxNativeZoom || 18 });
// Unter die POI-Marker/Cluster einfügen (sonst verdeckt das Overlay die Marker).
let beforeId;
const _ls = (_map.getStyle().layers || []);
for (let i = 0; i < _ls.length; i++) { if (/^(cl-|clsym-|pt-|danger)/.test(_ls[i].id)) { beforeId = _ls[i].id; break; } }
_map.addLayer({ id: id, type: 'raster', source: id, paint: { 'raster-opacity': opacity } }, beforeId);
return id;
}
return window.L.tileLayer(url, { opacity: opacity, tileSize: 256, maxNativeZoom: maxNativeZoom || 18, maxZoom: 18 }).addTo(_map);
}
function _wxRemoveRaster(handle) {
if (!handle || !_map) return;
if (typeof handle === 'string') {
if (_map.getLayer(handle)) _map.removeLayer(handle);
if (_map.getSource(handle)) _map.removeSource(handle);
} else if (handle.remove) {
handle.remove();
}
}
function _mapOnMove(fn) { if (_engineGL) _map.on('moveend', fn); else _map.on('moveend zoomend', fn); }
function _mapOffMove(fn) { if (_engineGL) _map.off('moveend', fn); else _map.off('moveend zoomend', fn); }
// Temp-Pill an lat/lon. html = der innere Pill-<div>. Beide Engines: .remove() vorhanden.
function _wxAddTempMarker(lat, lon, html) {
if (_engineGL) {
const wrap = document.createElement('div');
wrap.innerHTML = html; wrap.style.pointerEvents = 'none';
return new maplibregl.Marker({ element: wrap.firstElementChild || wrap, anchor: 'center' })
.setLngLat([lon, lat]).addTo(_map);
}
const icon = window.L.divIcon({ className: '', html: html, iconSize: null, iconAnchor: [20, 10] });
return window.L.marker([lat, lon], { icon: icon, zIndexOffset: 500, interactive: false }).addTo(_map);
}
function _initMapGL() { function _initMapGL() {
const el = document.getElementById('central-map'); const el = document.getElementById('central-map');
if (!el || !window.maplibregl || _map) return; if (!el || !window.maplibregl || _map) return;
@ -2123,7 +2139,6 @@ window.Page_map = (() => {
// GPS-Aufzeichnung // GPS-Aufzeichnung
// ---------------------------------------------------------- // ----------------------------------------------------------
function _toggleRecording() { function _toggleRecording() {
if (_engineGL && !_recActive) { UI.toast.info('GPS-Aufzeichnung im neuen Karten-Modus in Kürze.'); return; }
if (!_recActive) _startRecording(); if (!_recActive) _startRecording();
else _stopRecording(); else _stopRecording();
} }
@ -2167,7 +2182,6 @@ window.Page_map = (() => {
} }
async function _startRecording(resume) { async function _startRecording(resume) {
if (_engineGL) { if (!resume) UI.toast.info('GPS-Aufzeichnung im neuen Karten-Modus in Kürze.'); return; }
if (!_appState.user) { if (!_appState.user) {
UI.toast.warning('Bitte zuerst anmelden.'); UI.toast.warning('Bitte zuerst anmelden.');
App.navigate('settings'); App.navigate('settings');
@ -2226,11 +2240,17 @@ window.Page_map = (() => {
); );
// Fortgesetzte Aufzeichnung: bestehenden Track sofort einzeichnen // Fortgesetzte Aufzeichnung: bestehenden Track sofort einzeichnen
if (resume && _recTrack.length && _map && window.L) { if (resume && _recTrack.length && _map) {
_recPolyline = L.polyline(_recTrack.map(p => [p.lat, p.lon]), { color: '#EF4444', weight: 5, opacity: 0.9 }).addTo(_map);
const last = _recTrack[_recTrack.length - 1]; const last = _recTrack[_recTrack.length - 1];
_recMarker = L.circleMarker([last.lat, last.lon], { radius: 8, color: '#EF4444', fillColor: '#fff', fillOpacity: 1, weight: 3 }).addTo(_map); if (_engineGL) {
_map.panTo([last.lat, last.lon]); _recTrackGL();
_updateRecMarker(last.lat, last.lon);
_map.panTo([last.lon, last.lat]);
} else if (window.L) {
_recPolyline = L.polyline(_recTrack.map(p => [p.lat, p.lon]), { color: '#EF4444', weight: 5, opacity: 0.9 }).addTo(_map);
_updateRecMarker(last.lat, last.lon);
_map.panTo([last.lat, last.lon]);
}
_updateRecStatus(); _updateRecStatus();
} }
_persistRec(true); _persistRec(true);
@ -2282,21 +2302,57 @@ window.Page_map = (() => {
return 2 * R * Math.asin(Math.sqrt(a)); return 2 * R * Math.asin(Math.sqrt(a));
} }
// GL: Track-Linie aus dem vollen _recTrack (geojson line source) setzen.
function _recTrackGL() {
const geo = { type: 'Feature', geometry: { type: 'LineString', coordinates: _recTrack.map(p => [p.lon, p.lat]) } };
if (!_map.getSource('rectrack')) {
_map.addSource('rectrack', { type: 'geojson', data: geo });
_map.addLayer({ id: 'rectrack', type: 'line', source: 'rectrack',
layout: { 'line-cap': 'round', 'line-join': 'round' },
paint: { 'line-color': '#EF4444', 'line-width': 5, 'line-opacity': 0.9 } });
} else {
_map.getSource('rectrack').setData(geo);
}
}
function _updateRecMarker(lat, lon) {
if (_engineGL) {
if (!_recMarker) {
const d = document.createElement('div');
d.style.cssText = 'width:16px;height:16px;border-radius:50%;background:#fff;border:3px solid #EF4444;box-shadow:0 1px 4px rgba(0,0,0,.4)';
_recMarker = new maplibregl.Marker({ element: d, anchor: 'center' }).setLngLat([lon, lat]).addTo(_map);
} else { _recMarker.setLngLat([lon, lat]); }
} else {
if (!_recMarker) {
_recMarker = L.circleMarker([lat, lon], { radius: 8, color: '#EF4444', fillColor: '#fff', fillOpacity: 1, weight: 3 }).addTo(_map);
} else { _recMarker.setLatLng([lat, lon]); }
}
}
// Track + Marker entfernen (engine-neutral).
function _recCleanupMap() {
if (_engineGL && _map) {
if (_map.getLayer && _map.getLayer('rectrack')) _map.removeLayer('rectrack');
if (_map.getSource && _map.getSource('rectrack')) _map.removeSource('rectrack');
} else if (_recPolyline) { _recPolyline.remove(); }
_recPolyline = null;
if (_recMarker) { _recMarker.remove(); _recMarker = null; }
}
function _updateRecMap(lat, lon) { function _updateRecMap(lat, lon) {
if (!_map || !window.L) return; if (!_map) return;
if (_engineGL) {
_recTrackGL();
_updateRecMarker(lat, lon);
_map.panTo([lon, lat]); // MapLibre: [lng,lat]
return;
}
if (!window.L) return;
const ll = [lat, lon]; const ll = [lat, lon];
if (!_recPolyline) { if (!_recPolyline) {
_recPolyline = L.polyline([ll], { color: '#EF4444', weight: 5, opacity: 0.9 }).addTo(_map); _recPolyline = L.polyline([ll], { color: '#EF4444', weight: 5, opacity: 0.9 }).addTo(_map);
} else { } else {
_recPolyline.addLatLng(ll); _recPolyline.addLatLng(ll);
} }
if (!_recMarker) { _updateRecMarker(lat, lon);
_recMarker = L.circleMarker(ll, {
radius: 8, color: '#EF4444', fillColor: '#fff', fillOpacity: 1, weight: 3,
}).addTo(_map);
} else {
_recMarker.setLatLng(ll);
}
_map.panTo(ll); _map.panTo(ll);
} }
@ -2333,8 +2389,7 @@ window.Page_map = (() => {
if (_recTrack.length < 2) { if (_recTrack.length < 2) {
UI.toast.warning('Zu wenige GPS-Punkte — bitte etwas länger laufen.'); UI.toast.warning('Zu wenige GPS-Punkte — bitte etwas länger laufen.');
if (_recPolyline) { _recPolyline.remove(); _recPolyline = null; } _recCleanupMap();
if (_recMarker) { _recMarker.remove(); _recMarker = null; }
_recDone(); _recDone();
return; return;
} }
@ -2468,8 +2523,7 @@ window.Page_map = (() => {
document.getElementById('rms-discard')?.addEventListener('click', () => { document.getElementById('rms-discard')?.addEventListener('click', () => {
UI.modal.close(); UI.modal.close();
if (_recPolyline) { _recPolyline.remove(); _recPolyline = null; } _recCleanupMap();
if (_recMarker) { _recMarker.remove(); _recMarker = null; }
_recDone(); _recDone();
}); });
@ -2506,8 +2560,7 @@ window.Page_map = (() => {
dog_ids: dogIds.length ? dogIds : null, dog_ids: dogIds.length ? dogIds : null,
}); });
UI.modal.close(); UI.modal.close();
if (_recPolyline) { _recPolyline.remove(); _recPolyline = null; } _recCleanupMap();
if (_recMarker) { _recMarker.remove(); _recMarker = null; }
_recDone(); _recDone();
if (saved.is_valid === false) { if (saved.is_valid === false) {
UI.toast.warning(`Route „${saved.name}" gespeichert — wird nicht für Statistiken gewertet (Geschwindigkeit zu hoch).`); UI.toast.warning(`Route „${saved.name}" gespeichert — wird nicht für Statistiken gewertet (Geschwindigkeit zu hoch).`);

2
backend/static/landing.html
View file

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="color-scheme" content="light dark"> <meta name="color-scheme" content="light dark">
<script src="/js/landing-init.js?v=1187"></script> <script src="/js/landing-init.js?v=1188"></script>
<title>Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz</title> <title>Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz</title>
<meta name="description" content="Ban Yaro: Die kostenlose All-in-One Hunde-App für DACH. Tagebuch, Giftköder-Alarm, Training mit KI, Forum, Wurfbörse, Stammbaum, Inzucht-Check — DSGVO-konform, offline-fähig, ohne App Store."> <meta name="description" content="Ban Yaro: Die kostenlose All-in-One Hunde-App für DACH. Tagebuch, Giftköder-Alarm, Training mit KI, Forum, Wurfbörse, Stammbaum, Inzucht-Check — DSGVO-konform, offline-fähig, ohne App Store.">
<meta name="keywords" content="Hunde App, Hunde Community, Wurfbörse, Züchter, Welpen kaufen, Stammbaum Hund, Inzuchtkoeffizient, Hundezucht, Impfpass Hund, Giftköder Alarm, Gassi Community, Hundetraining App, Hunde Forum, Hunde KI, Hundefilm Datenbank, Welpen Marktplatz"> <meta name="keywords" content="Hunde App, Hunde Community, Wurfbörse, Züchter, Welpen kaufen, Stammbaum Hund, Inzuchtkoeffizient, Hundezucht, Impfpass Hund, Giftköder Alarm, Gassi Community, Hundetraining App, Hunde Forum, Hunde KI, Hundefilm Datenbank, Welpen Marktplatz">

2
backend/static/sw.js
View file

@ -4,7 +4,7 @@
============================================================ */ ============================================================ */
// ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab // ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab
const VER = '1187'; const VER = '1188';
const CACHE_VERSION = `by-v${VER}`; const CACHE_VERSION = `by-v${VER}`;
const CACHE_STATIC = `${CACHE_VERSION}-static`; const CACHE_STATIC = `${CACHE_VERSION}-static`;
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten