diff --git a/VERSION b/VERSION index 77e48ce..51b4bee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1193 \ No newline at end of file +1194 \ No newline at end of file diff --git a/backend/static/index.html b/backend/static/index.html index 64c06bb..7734054 100644 --- a/backend/static/index.html +++ b/backend/static/index.html @@ -86,14 +86,14 @@ Ban Yaro - + - - - - - + + + + + @@ -617,11 +617,11 @@ - - - - - + + + + + @@ -631,7 +631,7 @@ - + diff --git a/backend/static/js/app.js b/backend/static/js/app.js index 5a04117..a478b18 100644 --- a/backend/static/js/app.js +++ b/backend/static/js/app.js @@ -3,7 +3,7 @@ Router, State-Management, Navigation, Initialisierung. ============================================================ */ -const APP_VER = '1193'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen +const APP_VER = '1194'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen 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_VERSION = APP_VERSION; diff --git a/backend/static/js/map-gl-style.js b/backend/static/js/map-gl-style.js index 53d82bc..839192c 100644 --- a/backend/static/js/map-gl-style.js +++ b/backend/static/js/map-gl-style.js @@ -12,14 +12,16 @@ light: { bg: '#f2efe8', land: '#cbe3a8', park: '#aedd88', water: '#7fbbe8', forest: '#74b356', grass: '#cdeaa6', wetland: '#9ed2bc', farmland: '#e7eecb', sand: '#efe6c8', parkLine: '#4e9a3a', - road: '#ffffff', roadCasing: '#cdbfa9', building: '#e6d8bf', + road: '#ffffff', roadMotorway: '#e89aa0', roadTrunk: '#efb188', roadPrimary: '#f4cf92', roadSecondary: '#efe79c', + roadCasing: '#cdbfa9', building: '#e6d8bf', buildingLine: '#cdbb9c', boundary: '#a06ec0', path: '#b08160', rail: '#9a9aa2', label: '#2a2823', roadLabel: '#574f43', waterLabel: '#2f6aa0', poiLabel: '#4a4236', labelHalo: 'rgba(255,255,255,0.95)', }, dark: { bg: '#1a1d21', land: '#252e1d', park: '#2c3c1f', water: '#163242', forest: '#33501f', grass: '#26361a', wetland: '#264039', farmland: '#222b18', sand: '#332f1f', parkLine: '#3f6e2a', - road: '#444a52', roadCasing: '#23282d', building: '#2a2f35', + road: '#444a52', roadMotorway: '#70454b', roadTrunk: '#6e533c', roadPrimary: '#6b5e3a', roadSecondary: '#565232', + roadCasing: '#23282d', building: '#2a2f35', buildingLine: '#373d44', boundary: '#8a63a0', path: '#6b5d52', rail: '#5e5e68', label: '#e2e5e9', roadLabel: '#a6acb3', waterLabel: '#7db0dd', poiLabel: '#c3b9a8', labelHalo: 'rgba(0,0,0,0.85)', }, @@ -73,7 +75,8 @@ // Straßen-Füllung. { id: 'roads', type: 'line', source: 'by', 'source-layer': 'transportation', filter: ['!', ['in', ['get', 'class'], ['literal', ['path', 'track', 'ferry', 'rail', 'transit', 'aerialway']]]], - paint: { 'line-color': t.road, + paint: { 'line-color': ['match', ['get', 'class'], + 'motorway', t.roadMotorway, 'trunk', t.roadTrunk, 'primary', t.roadPrimary, 'secondary', t.roadSecondary, t.road], 'line-width': ['interpolate', ['linear'], ['zoom'], 6, ['match', ['get', 'class'], ['motorway', 'trunk'], 1.4, 0.4], 12, ['match', ['get', 'class'], ['motorway', 'trunk', 'primary'], 2.4, 1.1], @@ -111,6 +114,16 @@ layout: { 'text-field': ['coalesce', ['get', 'name:de'], ['get', 'name']], 'text-font': FONT_BOLD, 'symbol-placement': 'line', 'text-size': 11 }, paint: { 'text-color': t.roadLabel, 'text-halo-color': t.labelHalo, 'text-halo-width': 1.2 } }, + // Straßennummern (A9, B304, ST2078) entlang großer Straßen. + { id: 'road-refs', type: 'symbol', source: 'by', 'source-layer': 'transportation_name', minzoom: 8, + filter: ['all', ['has', 'ref'], ['in', ['get', 'class'], ['literal', ['motorway', 'trunk', 'primary', 'secondary', 'tertiary']]]], + layout: { + 'text-field': ['get', 'ref'], 'text-font': FONT_BOLD, 'text-size': 11, + 'symbol-placement': 'line', 'symbol-spacing': 350, 'text-max-angle': 20, + 'text-rotation-alignment': 'viewport', 'text-pitch-alignment': 'viewport', + }, + paint: { 'text-color': t.label, 'text-halo-color': t.labelHalo, 'text-halo-width': 2.5 } }, + // POI-Namen (Kinderspielplatz, Schule, …) ab Z15 — Kollisionserkennung verhindert Überladung. { id: 'poi-labels', type: 'symbol', source: 'by', 'source-layer': 'poi', minzoom: 15, layout: { diff --git a/backend/static/landing.html b/backend/static/landing.html index 2e00817..02c3442 100644 --- a/backend/static/landing.html +++ b/backend/static/landing.html @@ -4,7 +4,7 @@ - + Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz diff --git a/backend/static/sw.js b/backend/static/sw.js index f3ffe63..b9f2659 100644 --- a/backend/static/sw.js +++ b/backend/static/sw.js @@ -4,7 +4,7 @@ ============================================================ */ // ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab -const VER = '1193'; +const VER = '1194'; const CACHE_VERSION = `by-v${VER}`; const CACHE_STATIC = `${CACHE_VERSION}-static`; const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten