Compare commits
5 commits
0967623342
...
0d976b90b7
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d976b90b7 | |||
| fc55943e90 | |||
| f4f597edf8 | |||
| 448066567d | |||
| 2042a3f513 |
11 changed files with 161 additions and 52 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
1242
|
1247
|
||||||
|
|
@ -371,6 +371,7 @@ app.mount("/css", StaticFiles(directory=f"{STATIC_DIR}/css"), name="css")
|
||||||
app.mount("/js", StaticFiles(directory=f"{STATIC_DIR}/js"), name="js")
|
app.mount("/js", StaticFiles(directory=f"{STATIC_DIR}/js"), name="js")
|
||||||
app.mount("/icons", StaticFiles(directory=f"{STATIC_DIR}/icons"), name="icons")
|
app.mount("/icons", StaticFiles(directory=f"{STATIC_DIR}/icons"), name="icons")
|
||||||
app.mount("/img", StaticFiles(directory=f"{STATIC_DIR}/img"), name="img")
|
app.mount("/img", StaticFiles(directory=f"{STATIC_DIR}/img"), name="img")
|
||||||
|
app.mount("/sounds", StaticFiles(directory=f"{STATIC_DIR}/sounds"), name="sounds") # Yaro-Navi-Sounds
|
||||||
|
|
||||||
# Selbst-gehostete Vektor-Tiles (.pmtiles) — liegen im data-Volume, NICHT im Image.
|
# Selbst-gehostete Vektor-Tiles (.pmtiles) — liegen im data-Volume, NICHT im Image.
|
||||||
# WICHTIG: Starlettes StaticFiles/FileResponse liefert hinter unserer BaseHTTPMiddleware
|
# WICHTIG: Starlettes StaticFiles/FileResponse liefert hinter unserer BaseHTTPMiddleware
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,31 @@ def _simplify_track(track: list, max_pts: int = 40) -> list:
|
||||||
return [track[round(i * step)] for i in range(max_pts)]
|
return [track[round(i * step)] for i in range(max_pts)]
|
||||||
|
|
||||||
|
|
||||||
|
def _decode_polyline3d(encoded: str) -> list:
|
||||||
|
"""ORS-Polyline MIT Elevation: Tripel (lat, lon, ele), Präzision 1e5/1e5/1e2.
|
||||||
|
Das polyline-Paket kann nur 2D — es würde die Höhen-Deltas als nächste
|
||||||
|
Koordinate fehlinterpretieren und Müll liefern."""
|
||||||
|
coords, idx, lat, lon, ele = [], 0, 0, 0, 0
|
||||||
|
n = len(encoded)
|
||||||
|
while idx < n:
|
||||||
|
deltas = []
|
||||||
|
for _ in range(3):
|
||||||
|
result, shift = 0, 0
|
||||||
|
while True:
|
||||||
|
b = ord(encoded[idx]) - 63
|
||||||
|
idx += 1
|
||||||
|
result |= (b & 0x1F) << shift
|
||||||
|
shift += 5
|
||||||
|
if b < 0x20:
|
||||||
|
break
|
||||||
|
deltas.append(~(result >> 1) if result & 1 else result >> 1)
|
||||||
|
lat += deltas[0]
|
||||||
|
lon += deltas[1]
|
||||||
|
ele += deltas[2]
|
||||||
|
coords.append((lat / 1e5, lon / 1e5, ele / 1e2))
|
||||||
|
return coords
|
||||||
|
|
||||||
|
|
||||||
def _parse(row) -> dict:
|
def _parse(row) -> dict:
|
||||||
d = dict(row)
|
d = dict(row)
|
||||||
if isinstance(d.get('gps_track'), str):
|
if isinstance(d.get('gps_track'), str):
|
||||||
|
|
@ -249,6 +274,7 @@ async def suggest_route(data: SuggestRequest, user=Depends(get_current_user)):
|
||||||
},
|
},
|
||||||
"units": "m",
|
"units": "m",
|
||||||
"geometry": True,
|
"geometry": True,
|
||||||
|
"elevation": True, # Anstieg/Abstieg für ehrliche Schwierigkeit (René 2026-06-06)
|
||||||
"instructions": False,
|
"instructions": False,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -282,16 +308,20 @@ async def suggest_route(data: SuggestRequest, user=Depends(get_current_user)):
|
||||||
except (KeyError, IndexError) as exc:
|
except (KeyError, IndexError) as exc:
|
||||||
raise HTTPException(502, f"Unerwartete ORS-Antwort: {exc}")
|
raise HTTPException(502, f"Unerwartete ORS-Antwort: {exc}")
|
||||||
|
|
||||||
# encoded polyline → [[lat, lon], ...]
|
# encoded polyline → Track. ACHTUNG: mit elevation=True codiert ORS 3D
|
||||||
points = _polyline.decode(geometry)
|
# (lat, lon, ele) — der Standard-2D-Decoder würde Müll liefern.
|
||||||
gps_track = [{"lat": p[0], "lon": p[1]} for p in points]
|
points = _decode_polyline3d(geometry)
|
||||||
|
gps_track = [{"lat": p[0], "lon": p[1], "alt": round(p[2])} for p in points]
|
||||||
|
|
||||||
distanz_km = round(distanz_m / 1000, 2)
|
distanz_km = round(distanz_m / 1000, 2)
|
||||||
dauer_min = max(1, round(dauer_s / 60))
|
dauer_min = max(1, round(dauer_s / 60))
|
||||||
|
ascent_m = round(summary.get("ascent", 0))
|
||||||
|
|
||||||
if distanz_km < 3:
|
# Schwierigkeit aus Distanz UND Höhenmetern (René 2026-06-06) — vorher nur km:
|
||||||
|
# eine flache 6-km-Runde ist nicht „anspruchsvoll", 3 km steil bergauf nicht „leicht".
|
||||||
|
if distanz_km < 4 and ascent_m < 50:
|
||||||
schwierigkeit = "leicht"
|
schwierigkeit = "leicht"
|
||||||
elif distanz_km <= 5:
|
elif distanz_km <= 7 and ascent_m < 150:
|
||||||
schwierigkeit = "mittel"
|
schwierigkeit = "mittel"
|
||||||
else:
|
else:
|
||||||
schwierigkeit = "anspruchsvoll"
|
schwierigkeit = "anspruchsvoll"
|
||||||
|
|
@ -319,6 +349,7 @@ async def suggest_route(data: SuggestRequest, user=Depends(get_current_user)):
|
||||||
"gps_track": gps_track,
|
"gps_track": gps_track,
|
||||||
"distanz_km": distanz_km,
|
"distanz_km": distanz_km,
|
||||||
"dauer_min": dauer_min,
|
"dauer_min": dauer_min,
|
||||||
|
"hoehenmeter": ascent_m,
|
||||||
"schwierigkeit": schwierigkeit,
|
"schwierigkeit": schwierigkeit,
|
||||||
"weekly_remaining": weekly_remaining,
|
"weekly_remaining": weekly_remaining,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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=1242"></script>
|
<script src="/js/boot-early.js?v=1247"></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=1242">
|
<link rel="stylesheet" href="/css/design-system.css?v=1247">
|
||||||
<link rel="stylesheet" href="/css/layout.css?v=1242">
|
<link rel="stylesheet" href="/css/layout.css?v=1247">
|
||||||
<link rel="stylesheet" href="/css/components.css?v=1242">
|
<link rel="stylesheet" href="/css/components.css?v=1247">
|
||||||
<link rel="stylesheet" href="/css/utilities.css?v=1242">
|
<link rel="stylesheet" href="/css/utilities.css?v=1247">
|
||||||
<link rel="stylesheet" href="/css/lists.css?v=1242">
|
<link rel="stylesheet" href="/css/lists.css?v=1247">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
@ -612,11 +612,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=1242"></script>
|
<script src="/js/api.js?v=1247"></script>
|
||||||
<script src="/js/ui.js?v=1242"></script>
|
<script src="/js/ui.js?v=1247"></script>
|
||||||
<script src="/js/app.js?v=1242"></script>
|
<script src="/js/app.js?v=1247"></script>
|
||||||
<script src="/js/worlds.js?v=1242"></script>
|
<script src="/js/worlds.js?v=1247"></script>
|
||||||
<script src="/js/offline-indicator.js?v=1242"></script>
|
<script src="/js/offline-indicator.js?v=1247"></script>
|
||||||
|
|
||||||
<!-- Feature-Seiten werden lazy geladen -->
|
<!-- Feature-Seiten werden lazy geladen -->
|
||||||
|
|
||||||
|
|
@ -626,7 +626,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=1242"></script>
|
<script src="/js/boot.js?v=1247"></script>
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Router, State-Management, Navigation, Initialisierung.
|
Router, State-Management, Navigation, Initialisierung.
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const APP_VER = '1242'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
const APP_VER = '1247'; // ← 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;
|
||||||
|
|
|
||||||
|
|
@ -167,6 +167,7 @@ window.Page_map = (() => {
|
||||||
await _loadLeaflet();
|
await _loadLeaflet();
|
||||||
_initMap(); // Leaflet-Raster (Default), sofort mit Deutschland-Mitte starten
|
_initMap(); // Leaflet-Raster (Default), sofort mit Deutschland-Mitte starten
|
||||||
}
|
}
|
||||||
|
_ensureFollowBtn(); // Crosshair-Button (Karte folgt Standort, wie in Routen)
|
||||||
_startLocationTracking();
|
_startLocationTracking();
|
||||||
_loadAll();
|
_loadAll();
|
||||||
_offerResume(); // unterbrochene Aufzeichnung anbieten
|
_offerResume(); // unterbrochene Aufzeichnung anbieten
|
||||||
|
|
@ -368,6 +369,7 @@ window.Page_map = (() => {
|
||||||
// Follow-Mode (René 2026-06-08): Karte wandert ab jetzt mit dem Standort;
|
// Follow-Mode (René 2026-06-08): Karte wandert ab jetzt mit dem Standort;
|
||||||
// manuelles Verschieben beendet das Folgen (dragstart-Listener im Map-Init).
|
// manuelles Verschieben beendet das Folgen (dragstart-Listener im Map-Init).
|
||||||
_followGps = true;
|
_followGps = true;
|
||||||
|
_updateFollowBtn();
|
||||||
UI.toast.info('Karte folgt deinem Standort — zum Beenden Karte verschieben.');
|
UI.toast.info('Karte folgt deinem Standort — zum Beenden Karte verschieben.');
|
||||||
} else {
|
} else {
|
||||||
UI.toast.error('Standort noch nicht verfügbar.');
|
UI.toast.error('Standort noch nicht verfügbar.');
|
||||||
|
|
@ -788,8 +790,8 @@ window.Page_map = (() => {
|
||||||
setTimeout(() => _map.invalidateSize(), 600);
|
setTimeout(() => _map.invalidateSize(), 600);
|
||||||
window.addEventListener('resize', () => _map.invalidateSize());
|
window.addEventListener('resize', () => _map.invalidateSize());
|
||||||
|
|
||||||
_map.on('moveend zoomend', () => { _autoRetryCount = 0; _updateZoomDisplay(); _scheduleOsmLoad(); });
|
_map.on('moveend zoomend', () => { _autoRetryCount = 0; _updateZoomDisplay(); _scheduleOsmLoad(true); });
|
||||||
_map.on('dragstart', () => { _followGps = false; }); // manuelles Verschieben beendet Follow
|
_map.on('dragstart', () => { _followGps = false; _updateFollowBtn(); }); // manuelles Verschieben beendet Follow
|
||||||
setTimeout(() => { _updateZoomDisplay(); _scheduleOsmLoad(); }, 800);
|
setTimeout(() => { _updateZoomDisplay(); _scheduleOsmLoad(); }, 800);
|
||||||
|
|
||||||
// Fadenkreuz-Animation beim Kartenverschieben
|
// Fadenkreuz-Animation beim Kartenverschieben
|
||||||
|
|
@ -825,6 +827,39 @@ window.Page_map = (() => {
|
||||||
try { return !!(window.BY && BY.offlineTiles()); } catch (e) { return false; }
|
try { return !!(window.BY && BY.offlineTiles()); } catch (e) { return false; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
// Follow-Button auf der Karte (Wunsch René 2026-06-06: „wie in Routen") —
|
||||||
|
// Crosshair links unter den Zoom-Reglern (unterhalb des Offline-Puls-Icons).
|
||||||
|
// Ein Tipp = zentrieren + folgen; Karte ziehen = Folgen pausiert (Button grau).
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
function _updateFollowBtn() {
|
||||||
|
const b = document.getElementById('map-follow-btn');
|
||||||
|
if (b) b.style.color = _followGps ? 'var(--c-primary)' : 'var(--c-text-secondary, #9ca3af)';
|
||||||
|
}
|
||||||
|
function _ensureFollowBtn() {
|
||||||
|
const host = document.getElementById('central-map');
|
||||||
|
if (!host || document.getElementById('map-follow-btn')) { _updateFollowBtn(); return; }
|
||||||
|
const b = document.createElement('button');
|
||||||
|
b.id = 'map-follow-btn';
|
||||||
|
b.type = 'button';
|
||||||
|
b.title = 'Karte folgt deinem Standort';
|
||||||
|
// FIXED + safe-area wie das Offline-Puls-Icon (+110px) — Crosshair sitzt in der
|
||||||
|
// Lücke ZWISCHEN Zoom-Reglern und Offline-Icon (René 2026-06-06).
|
||||||
|
b.style.cssText = 'position:fixed;left:10px;top:calc(env(safe-area-inset-top, 0px) + 70px);'
|
||||||
|
+ 'z-index:500;width:36px;height:36px;border-radius:50%;border:none;'
|
||||||
|
+ 'background:var(--c-surface,#fff);box-shadow:0 2px 8px rgba(0,0,0,.3);'
|
||||||
|
+ 'display:flex;align-items:center;justify-content:center;cursor:pointer';
|
||||||
|
b.innerHTML = `<svg class="ph-icon" aria-hidden="true" style="width:20px;height:20px"><use href="/icons/phosphor.svg#crosshair"></use></svg>`;
|
||||||
|
b.addEventListener('click', () => {
|
||||||
|
if (!_userPos) { UI.toast.error('Standort noch nicht verfügbar.'); return; }
|
||||||
|
_followGps = true;
|
||||||
|
_mapSetView(_userPos.lat, _userPos.lon, Math.max(14, Math.round(_mapGetZoom())));
|
||||||
|
_updateFollowBtn();
|
||||||
|
});
|
||||||
|
host.appendChild(b);
|
||||||
|
_updateFollowBtn();
|
||||||
|
}
|
||||||
|
|
||||||
function loadMapLibre() {
|
function loadMapLibre() {
|
||||||
if (_maplibreLoaded) return Promise.resolve();
|
if (_maplibreLoaded) return Promise.resolve();
|
||||||
const v = '?v=' + (window.APP_VER || '');
|
const v = '?v=' + (window.APP_VER || '');
|
||||||
|
|
@ -961,13 +996,13 @@ window.Page_map = (() => {
|
||||||
_scheduleOsmLoad();
|
_scheduleOsmLoad();
|
||||||
});
|
});
|
||||||
_map.on('moveend', () => {
|
_map.on('moveend', () => {
|
||||||
_autoRetryCount = 0; _updateZoomDisplay(); _scheduleOsmLoad();
|
_autoRetryCount = 0; _updateZoomDisplay(); _scheduleOsmLoad(true);
|
||||||
document.getElementById('map-crosshair')?.classList.remove('dragging');
|
document.getElementById('map-crosshair')?.classList.remove('dragging');
|
||||||
});
|
});
|
||||||
_map.on('movestart', () => {
|
_map.on('movestart', () => {
|
||||||
document.getElementById('map-crosshair')?.classList.add('dragging');
|
document.getElementById('map-crosshair')?.classList.add('dragging');
|
||||||
});
|
});
|
||||||
_map.on('dragstart', () => { _followGps = false; }); // manuelles Verschieben beendet Follow
|
_map.on('dragstart', () => { _followGps = false; _updateFollowBtn(); }); // manuelles Verschieben beendet Follow
|
||||||
|
|
||||||
window.addEventListener('resize', _mapResize);
|
window.addEventListener('resize', _mapResize);
|
||||||
setTimeout(_mapResize, 100);
|
setTimeout(_mapResize, 100);
|
||||||
|
|
@ -1434,9 +1469,34 @@ window.Page_map = (() => {
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
// OSM-Layer laden
|
// OSM-Layer laden
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
function _scheduleOsmLoad() {
|
// Bewegungs-Gate (René 2026-06-06): Der Follow-Mode pannt alle paar Sekunden →
|
||||||
|
// jedes moveend triggerte den Scanner LAUFEND. Scans aus Kartenbewegung laufen
|
||||||
|
// erst, wenn sich das Zentrum ≥ 20 % der Viewport-Breite bewegt hat oder der
|
||||||
|
// Zoom wechselt. Alle anderen Trigger (Marker gespeichert, Layer-Toggle, Retry,
|
||||||
|
// Init) scannen weiter ungebremst (fromMove=false).
|
||||||
|
let _lastScanCenter = null, _lastScanZoom = null;
|
||||||
|
function _viewChangedEnough() {
|
||||||
|
try {
|
||||||
|
const zoom = Math.round(_mapGetZoom());
|
||||||
|
if (_lastScanZoom !== zoom) return true;
|
||||||
|
if (!_lastScanCenter) return true;
|
||||||
|
const c = _map.getCenter();
|
||||||
|
const b = _map.getBounds();
|
||||||
|
const viewM = _haversineRec(b.getSouth(), b.getWest(), b.getSouth(), b.getEast());
|
||||||
|
const movedM = _haversineRec(_lastScanCenter.lat, _lastScanCenter.lng, c.lat, c.lng);
|
||||||
|
return movedM >= viewM * 0.2;
|
||||||
|
} catch (e) { return true; }
|
||||||
|
}
|
||||||
|
function _scheduleOsmLoad(fromMove = false) {
|
||||||
clearTimeout(_overpassTimer);
|
clearTimeout(_overpassTimer);
|
||||||
_overpassTimer = setTimeout(_loadOsmLayers, 600);
|
_overpassTimer = setTimeout(() => {
|
||||||
|
if (fromMove && !_viewChangedEnough()) return;
|
||||||
|
try {
|
||||||
|
_lastScanCenter = _map.getCenter();
|
||||||
|
_lastScanZoom = Math.round(_mapGetZoom());
|
||||||
|
} catch (e) {}
|
||||||
|
_loadOsmLayers();
|
||||||
|
}, 600);
|
||||||
}
|
}
|
||||||
|
|
||||||
// OSM-Marker-Zählung (ohne eigene Orte), engine-neutral.
|
// OSM-Marker-Zählung (ohne eigene Orte), engine-neutral.
|
||||||
|
|
@ -2618,6 +2678,7 @@ window.Page_map = (() => {
|
||||||
|
|
||||||
_recTimerInt = setInterval(_updateRecStatus, 1000);
|
_recTimerInt = setInterval(_updateRecStatus, 1000);
|
||||||
_followGps = true; // Aufzeichnung startet im Follow-Mode (Drag pausiert, Standort-Button reaktiviert)
|
_followGps = true; // Aufzeichnung startet im Follow-Mode (Drag pausiert, Standort-Button reaktiviert)
|
||||||
|
_updateFollowBtn();
|
||||||
|
|
||||||
_recWatchId = navigator.geolocation.watchPosition(
|
_recWatchId = navigator.geolocation.watchPosition(
|
||||||
pos => {
|
pos => {
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,9 @@ window.Page_routes = (() => {
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
const NavSound = (() => {
|
const NavSound = (() => {
|
||||||
let ctx = null;
|
let ctx = null;
|
||||||
let files = null; // { wuff, klaeffen } HTMLAudio | leer = Synthese
|
let bufs = null; // { wuff, klaeffen } AudioBuffer | leer = Synthese.
|
||||||
|
// HTMLAudio+preload taugt NICHT (iOS lädt lazy, canplaythrough feuert nie →
|
||||||
|
// es blieb beim Game-Boy-Sound, René 2026-06-06) → fetch + decodeAudioData.
|
||||||
const enabled = () => { try { return localStorage.getItem('by_nav_sound') !== '0'; } catch (e) { return true; } };
|
const enabled = () => { try { return localStorage.getItem('by_nav_sound') !== '0'; } catch (e) { return true; } };
|
||||||
|
|
||||||
function _ctx() {
|
function _ctx() {
|
||||||
|
|
@ -85,6 +87,17 @@ window.Page_routes = (() => {
|
||||||
if (ctx.state === 'suspended') ctx.resume().catch(() => {});
|
if (ctx.state === 'suspended') ctx.resume().catch(() => {});
|
||||||
return ctx;
|
return ctx;
|
||||||
}
|
}
|
||||||
|
function _loadBufs() {
|
||||||
|
if (bufs !== null) return;
|
||||||
|
bufs = {};
|
||||||
|
['wuff', 'klaeffen'].forEach(name => {
|
||||||
|
fetch(`/sounds/${name}.mp3`)
|
||||||
|
.then(r => { if (!r.ok) throw new Error(String(r.status)); return r.arrayBuffer(); })
|
||||||
|
.then(ab => _ctx().decodeAudioData(ab))
|
||||||
|
.then(b => { bufs[name] = b; })
|
||||||
|
.catch(() => {}); // 404/Decode-Fehler → Synthese bleibt
|
||||||
|
});
|
||||||
|
}
|
||||||
// Ein synthetischer „Wuff": Sägezahn-Sweep durch Tiefpass, kurzer Attack, schneller Decay.
|
// Ein synthetischer „Wuff": Sägezahn-Sweep durch Tiefpass, kurzer Attack, schneller Decay.
|
||||||
function _wuff(at, pitch = 1) {
|
function _wuff(at, pitch = 1) {
|
||||||
const c = _ctx(), t = c.currentTime + at;
|
const c = _ctx(), t = c.currentTime + at;
|
||||||
|
|
@ -101,19 +114,23 @@ window.Page_routes = (() => {
|
||||||
}
|
}
|
||||||
function _barks(n, pitch, gap) {
|
function _barks(n, pitch, gap) {
|
||||||
if (!enabled()) return;
|
if (!enabled()) return;
|
||||||
const sample = files && (pitch > 1.3 ? files.klaeffen : files.wuff);
|
try {
|
||||||
if (sample) { // echte Aufnahme: n-mal hintereinander
|
const buf = bufs && (pitch > 1.3 ? bufs.klaeffen : bufs.wuff);
|
||||||
let i = 0;
|
if (buf) { // echte Aufnahme (Schäferhund, /sounds/*.mp3)
|
||||||
const play = () => {
|
// klaeffen.mp3 ist bereits eine ~2,8-s-Bell-SEQUENZ → nur 1× abspielen;
|
||||||
if (i++ >= n) return;
|
// wuff.mp3 ist ein einzelner Beller → n-mal mit Pause.
|
||||||
sample.currentTime = 0;
|
const c = _ctx();
|
||||||
sample.play().catch(() => {});
|
const reps = buf === bufs.klaeffen ? 1 : n;
|
||||||
setTimeout(play, gap * 1000 + 200);
|
for (let i = 0; i < reps; i++) {
|
||||||
};
|
const s = c.createBufferSource();
|
||||||
play();
|
s.buffer = buf;
|
||||||
return;
|
s.connect(c.destination);
|
||||||
}
|
s.start(c.currentTime + i * (buf.duration + 0.22));
|
||||||
try { for (let i = 0; i < n; i++) _wuff(i * gap, pitch); } catch (e) {}
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (let i = 0; i < n; i++) _wuff(i * gap, pitch); // Fallback: Synthese
|
||||||
|
} catch (e) {}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
enabled,
|
enabled,
|
||||||
|
|
@ -123,16 +140,7 @@ window.Page_routes = (() => {
|
||||||
const b = c.createBuffer(1, 1, 22050), s = c.createBufferSource();
|
const b = c.createBuffer(1, 1, 22050), s = c.createBufferSource();
|
||||||
s.buffer = b; s.connect(c.destination); s.start(0);
|
s.buffer = b; s.connect(c.destination); s.start(0);
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
// Echte Samples einmalig anfragen (404 → Synthese bleibt)
|
_loadBufs(); // echte Samples laden (404 → Synthese bleibt)
|
||||||
if (files === null) {
|
|
||||||
files = {};
|
|
||||||
['wuff', 'klaeffen'].forEach(name => {
|
|
||||||
const a = new Audio(`/sounds/${name}.mp3`);
|
|
||||||
a.preload = 'auto';
|
|
||||||
a.addEventListener('canplaythrough', () => { files[name] = a; }, { once: true });
|
|
||||||
a.addEventListener('error', () => {}, { once: true });
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
links() { _barks(2, 1.0, 0.30); }, // 2× Wuff
|
links() { _barks(2, 1.0, 0.30); }, // 2× Wuff
|
||||||
rechts() { _barks(1, 1.0, 0.30); }, // 1× Wuff
|
rechts() { _barks(1, 1.0, 0.30); }, // 1× Wuff
|
||||||
|
|
@ -672,6 +680,9 @@ window.Page_routes = (() => {
|
||||||
<span style="${_pillStyle('rgba(107,114,128,0.10)','#9ca3af','rgba(107,114,128,0.30)')}">
|
<span style="${_pillStyle('rgba(107,114,128,0.10)','#9ca3af','rgba(107,114,128,0.30)')}">
|
||||||
${UI.icon('timer')} ${UI.escape(durStr)}
|
${UI.icon('timer')} ${UI.escape(durStr)}
|
||||||
</span>
|
</span>
|
||||||
|
${result.hoehenmeter != null ? `<span style="${_pillStyle('rgba(107,114,128,0.10)','#9ca3af','rgba(107,114,128,0.30)')}">
|
||||||
|
${UI.icon('trend-up')} ${result.hoehenmeter} hm
|
||||||
|
</span>` : ''}
|
||||||
${diffLabel ? `<span style="${_pillStyle(
|
${diffLabel ? `<span style="${_pillStyle(
|
||||||
{leicht:'rgba(22,163,74,0.10)',mittel:'rgba(234,179,8,0.10)',anspruchsvoll:'rgba(220,38,38,0.10)'}[result.schwierigkeit]||'rgba(107,114,128,0.10)',
|
{leicht:'rgba(22,163,74,0.10)',mittel:'rgba(234,179,8,0.10)',anspruchsvoll:'rgba(220,38,38,0.10)'}[result.schwierigkeit]||'rgba(107,114,128,0.10)',
|
||||||
{leicht:'#4ade80',mittel:'#facc15',anspruchsvoll:'#f87171'}[result.schwierigkeit]||'#9ca3af',
|
{leicht:'#4ade80',mittel:'#facc15',anspruchsvoll:'#f87171'}[result.schwierigkeit]||'#9ca3af',
|
||||||
|
|
@ -2192,7 +2203,9 @@ window.Page_routes = (() => {
|
||||||
const btn = e.currentTarget;
|
const btn = e.currentTarget;
|
||||||
btn.style.color = on ? 'var(--c-primary)' : 'var(--c-text-secondary)';
|
btn.style.color = on ? 'var(--c-primary)' : 'var(--c-text-secondary)';
|
||||||
btn.querySelector('use')?.setAttribute('href', `/icons/phosphor.svg#${on ? 'speaker-high' : 'speaker-none'}`);
|
btn.querySelector('use')?.setAttribute('href', `/icons/phosphor.svg#${on ? 'speaker-high' : 'speaker-none'}`);
|
||||||
if (on) { NavSound.unlock(); NavSound.rechts(); }
|
// Probe-Wuff leicht verzögert: gibt fetch+decodeAudioData beim ERSTEN
|
||||||
|
// Einschalten die Chance, das echte Sample zu laden (sonst Synthese-Fallback).
|
||||||
|
if (on) { NavSound.unlock(); setTimeout(() => NavSound.rechts(), 450); }
|
||||||
UI.toast.info(on
|
UI.toast.info(on
|
||||||
? 'Navi-Sounds an: 2× Wuff = links, 1× Wuff = rechts, Kläffen = falscher Weg 🐕'
|
? 'Navi-Sounds an: 2× Wuff = links, 1× Wuff = rechts, Kläffen = falscher Weg 🐕'
|
||||||
: 'Navi-Sounds aus.');
|
: 'Navi-Sounds aus.');
|
||||||
|
|
|
||||||
|
|
@ -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=1242"></script>
|
<script src="/js/landing-init.js?v=1247"></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">
|
||||||
|
|
|
||||||
BIN
backend/static/sounds/klaeffen.mp3
Normal file
BIN
backend/static/sounds/klaeffen.mp3
Normal file
Binary file not shown.
BIN
backend/static/sounds/wuff.mp3
Normal file
BIN
backend/static/sounds/wuff.mp3
Normal file
Binary file not shown.
|
|
@ -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 = '1242';
|
const VER = '1247';
|
||||||
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
|
||||||
|
|
@ -32,6 +32,9 @@ const PRIORITY_PAGES = [
|
||||||
'/js/map-offline.js',
|
'/js/map-offline.js',
|
||||||
'/js/map-gl-markers.js',
|
'/js/map-gl-markers.js',
|
||||||
'/js/map-gl-mini.js',
|
'/js/map-gl-mini.js',
|
||||||
|
// Yaro-Navi-Sounds — müssen auch im Funkloch bellen (zusammen ~40 KB)
|
||||||
|
'/sounds/wuff.mp3',
|
||||||
|
'/sounds/klaeffen.mp3',
|
||||||
];
|
];
|
||||||
|
|
||||||
// index.html wird NICHT pre-gecacht (immer Network-First)
|
// index.html wird NICHT pre-gecacht (immer Network-First)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue