@sailingrotevista/rotevista-dash 2.0.13 → 2.0.15

package/app.js

@@ -42,6 +42,9 @@ let socket, renderInterval, simInterval;
 let lastAvgUIUpdate = 0, audioCtx = null, lastAlarmTime = 0;
 let curAwaRot = 0, curTwaRot = 0, curTrackRot = 0, curTwdRoseRot = 0;
 
+// Variabili di stato per filtri e trend
+let smoothedLeeway = 0;
+let rotationTrend = 0;
 let pressTimer, isFocusActive = false, blockNextClick = false;
 
 const graphModes = {
@@ -137,8 +140,41 @@ function processIncomingData(path, val) {
 }
 
 // ==========================================================================
-// 5. MOTORE RENDERING PRINCIPALE
+// 5. MOTORE RENDERING PRINCIPALE E TREND
 // ==========================================================================
+
+// Calcolo Trend del Vento (Definita prima del loop per evitare ReferenceError)
+function updateWindTrend() {
+    const longAvg = getCircularAverageFromBuffer(store.longBuf.twd, 60000, false);
+    const shortAvg = getCircularAverageFromBuffer(store.longBuf.twd, 15000, false);
+
+    if (!longAvg || !shortAvg) return;
+
+    let diff = (shortAvg.val - longAvg.val + 540) % 360 - 180;
+    
+    // Smoothing del trend per evitare scatti
+    rotationTrend = (rotationTrend * 0.95) + (diff * 0.05);
+
+    // Seleziona sia i pallini della bussola che del gauge centrale
+    const cwDots = [document.getElementById('trend-dot-cw'), document.getElementById('trend-gauge-cw')];
+    const ccwDots = [document.getElementById('trend-dot-ccw'), document.getElementById('trend-gauge-ccw')];
+
+    // Soglia: il vento deve ruotare di almeno 1.5 gradi di media per attivarsi
+    if (Math.abs(rotationTrend) > 1.5) {
+        if (rotationTrend > 0) { // Orario
+            cwDots.forEach(el => el && el.classList.add('is-trending'));
+            ccwDots.forEach(el => el && el.classList.remove('is-trending'));
+        } else { // Antiorario
+            ccwDots.forEach(el => el && el.classList.add('is-trending'));
+            cwDots.forEach(el => el && el.classList.remove('is-trending'));
+        }
+    } else {
+        // Vento stabile, spegni tutti i pallini
+        cwDots.forEach(el => el && el.classList.remove('is-trending'));
+        ccwDots.forEach(el => el && el.classList.remove('is-trending'));
+    }
+}
+
 function startDisplayLoop() {
     renderInterval = setInterval(() => {
         const now = Date.now();
@@ -149,7 +185,7 @@ function startDisplayLoop() {
         let curSog = 0; if (store.raw["navigation.speedOverGround"] !== undefined) { curSog = msToKts(store.raw["navigation.speedOverGround"]); ui.sog.innerText = curSog.toFixed(1); manageHistory('sog', curSog); }
         if (store.raw["environment.depth.belowTransducer"] !== undefined) { const d = store.raw["environment.depth.belowTransducer"]; ui.depth.innerText = d.toFixed(1); checkDepthAlarm(d); manageHistory('depth', d); }
         
-        // --- 1. RENDERING TWS CON COLORE DINAMICO (BIANCO -> ARANCIO -> ROSSO) ---
+        // --- 1. RENDERING TWS CON COLORE DINAMICO ---
         if (store.raw["environment.wind.speedTrue"] !== undefined) {
             const twsKts = msToKts(store.raw["environment.wind.speedTrue"]);
             ui.tws.innerText = twsKts.toFixed(1);
@@ -167,12 +203,23 @@ function startDisplayLoop() {
         const smTwa = getCircularAverageFromBuffer(store.smoothBuf.twa, CONFIG.averages.smoothWindow, true);
         if (smTwa) { curTwaRot = getShortestRotation(curTwaRot, smTwa.val); ui.twa.setAttribute('transform', `rotate(${curTwaRot}, 200, 200)`); }
 
-        if (store.raw["navigation.courseOverGroundTrue"] && store.raw["navigation.headingTrue"]) {
-            let drift = (radToDeg(store.raw["navigation.courseOverGroundTrue"]) - radToDeg(store.raw["navigation.headingTrue"]) + 360) % 360;
-            if (curSog < CONFIG.averages.minSpeed) drift = 0;
-            curTrackRot = getShortestRotation(curTrackRot, drift); ui.track.setAttribute('transform', `rotate(${curTrackRot}, 200, 200)`);
-            let ds = drift > 180 ? drift - 360 : drift; updateLeewayDisplay(Math.max(-20, Math.min(20, ds)));
-        } else updateLeewayDisplay(0);
+        // --- CALCOLO E SMUSSAMENTO LEEWAY ---
+        if (store.raw["navigation.courseOverGroundTrue"] !== undefined && store.raw["navigation.headingTrue"] !== undefined) {
+            let rawDrift = (radToDeg(store.raw["navigation.courseOverGroundTrue"]) - radToDeg(store.raw["navigation.headingTrue"]) + 360) % 360;
+            if (rawDrift > 180) rawDrift -= 360;
+
+            if (curSog < CONFIG.averages.minSpeed) {
+                smoothedLeeway = 0;
+            } else {
+                smoothedLeeway = (smoothedLeeway * 0.9) + (rawDrift * 0.1);
+            }
+
+            curTrackRot = getShortestRotation(curTrackRot, smoothedLeeway);
+            ui.track.setAttribute('transform', `rotate(${curTrackRot}, 200, 200)`);
+            updateLeewayDisplay(Math.max(-20, Math.min(20, smoothedLeeway)));
+        } else {
+            updateLeewayDisplay(0);
+        }
 
         // --- 2. RENDERING MEDIE E BUSSOLA TATTICA ---
         if (now - lastAvgUIUpdate > 3000) {
@@ -182,14 +229,29 @@ function startDisplayLoop() {
                 twObj = getCircularAverageFromBuffer(store.longBuf.twa, CONFIG.averages.longWindow, true),
                 twdObj = getCircularAverageFromBuffer(store.longBuf.twd, CONFIG.averages.longWindow, false);
 
-            const upUI = (el, obj) => {
-                if (!obj) { el.innerHTML = "---&deg;"; el.classList.remove('unstable-data'); }
-                else {
-                    el.innerHTML = `${obj.val.toString().padStart(3, '0')}&deg;`;
-                    if (obj.stable || curSog < CONFIG.averages.minSpeed) el.classList.remove('unstable-data'); else el.classList.add('unstable-data');
+            const upUI = (el, obj, isCompass = false) => {
+                if (!obj || obj.val === null) {
+                    el.innerHTML = "---&deg;";
+                    el.classList.remove('unstable-data');
+                } else {
+                    let val = Math.round(obj.val);
+                    let displayVal;
+
+                    if (isCompass) displayVal = ((val + 360) % 360).toString().padStart(3, '0');
+                    else displayVal = val.toString();
+
+                    el.innerHTML = `${displayVal}&deg;`;
+                    
+                    if (obj.stable || curSog < CONFIG.averages.minSpeed) el.classList.remove('unstable-data');
+                    else el.classList.add('unstable-data');
                 }
             };
-            upUI(ui.hdg, hObj); upUI(ui.cog, cObj); upUI(ui.awaAvg, awObj); upUI(ui.twaAvg, twObj); upUI(ui.twdAvg, twdObj);
+            
+            upUI(ui.hdg,    hObj,   true);
+            upUI(ui.cog,    cObj,   true);
+            upUI(ui.awaAvg, awObj,  false);
+            upUI(ui.twaAvg, twObj,  false);
+            upUI(ui.twdAvg, twdObj, true);
             
             if (hObj && twObj && hObj.val !== null) {
                 let tA = twObj.val * 2; ui.tackHdg.innerHTML = `${Math.round((hObj.val - tA + 360) % 360).toString().padStart(3, '0')}&deg;`;
@@ -201,6 +263,8 @@ function startDisplayLoop() {
 
             // Rotazione Bussola Tattica e Colore Sincronizzato
             if (twdObj && hObj) {
+                updateWindTrend(); // Aggiorna i pallini
+                
                 curTwdRoseRot = getShortestRotation(curTwdRoseRot, twdObj.val);
                 ui.twdArrow.setAttribute('transform', `rotate(${curTwdRoseRot}, 20, 20)`);
                 ui.twdBoat.setAttribute('transform', `rotate(${hObj.val}, 20, 20)`);
@@ -338,16 +402,14 @@ function toggleFocusMode(type, element) {
 // ==========================================================================
 if (ui.hotspot) {
     let pressTimer;
-    const HOLD_DURATION = 1000; // 1 secondo di pressione per attivare Night Mode
+    const HOLD_DURATION = 1000;
 
     ui.hotspot.addEventListener('pointerdown', (e) => {
-        // Avvia il timer al tocco
         pressTimer = setTimeout(() => {
             document.body.classList.toggle('night-mode');
-            // Feedback visivo immediato al cambio modalità
             ui.hotspot.style.opacity = "0.5";
             setTimeout(() => ui.hotspot.style.opacity = "1", 200);
-            pressTimer = null; // Reset per evitare che il click scatti dopo
+            pressTimer = null;
         }, HOLD_DURATION);
     });
 
@@ -355,7 +417,6 @@ if (ui.hotspot) {
         if (pressTimer) {
             clearTimeout(pressTimer);
             pressTimer = null;
-            // Se arriviamo qui, è stato un click rapido -> Fullscreen
             const doc = document.documentElement;
             const isF = document.fullscreenElement || document.webkitFullscreenElement;
             if (!isF) {
@@ -382,7 +443,9 @@ window.addEventListener('load', init);
 function checkDepthAlarm(m) { ui.depth.classList.remove('alarm-warning', 'alarm-danger'); if (m < CONFIG.alarms.depthDanger) { ui.depth.classList.add('alarm-danger'); playBingBing(); } else if (m < CONFIG.alarms.depthWarning) ui.depth.classList.add('alarm-warning'); }
 function playBingBing() { if (!audioCtx) return; const n = Date.now(); if (n - lastAlarmTime < 3000) return; lastAlarmTime = n; function b(f, s) { const o = audioCtx.createOscillator(); const g = audioCtx.createGain(); o.connect(g); g.connect(audioCtx.destination); o.frequency.value = f; g.gain.setValueAtTime(0.1, s); g.gain.exponentialRampToValueAtTime(0.01, s + 0.4); o.start(s); o.stop(s + 0.5); } b(880, audioCtx.currentTime); b(880, audioCtx.currentTime + 0.6); }
 
-// Simulatore su Depth (3 click rapidi)
+// ==========================================================================
+// 9. MOTORE SIMULAZIONE DINAMICA E AVVIO (3 Click su Depth)
+// ==========================================================================
 ui.depth.closest('.data-box').addEventListener('click', (function() {
     let dC = 0, lC = 0;
     return function() {
@@ -393,7 +456,7 @@ ui.depth.closest('.data-box').addEventListener('click', (function() {
             simulationMode = !simulationMode;
             if (simulationMode) {
                 if (socket) socket.close();
-                startDynamicSimulation(); // Chiama la nuova funzione
+                startDynamicSimulation();
             } else {
                 location.reload();
             }
@@ -402,46 +465,62 @@ ui.depth.closest('.data-box').addEventListener('click', (function() {
     };
 })());
 
-// ==========================================================================
-// 9. MOTORE SIMULAZIONE DINAMICA
-// ==========================================================================
 function startDynamicSimulation() {
     ui.status.innerText = "SIM ATTIVO";
-    
-    // Parametri base iniziali
-    let baseTws = 60, baseDepth = 12, baseHdg = 45;
-    
+
+    let sim = {
+        hdg: Math.random() * 360,
+        tws: 12,
+        twd: Math.random() * 360,
+        depth: 12,
+        stw: 5,
+        leeway: 0,
+        startTime: Date.now()
+    };
+
     simInterval = setInterval(() => {
-        // T rappresenta il progresso nel ciclo di 10 minuti (da 0 a 1)
-        const t = (Date.now() % 600000) / 600000;
-        const radT = t * 2 * Math.PI;
-
-        // Oscillazioni fluide (Sinusoidali)
-        const tws = baseTws + Math.sin(radT) * 5;      // Oscilla +- 5 kts
-        const depth = baseDepth + Math.sin(radT) * 3;  // Oscilla +- 3 m
-        const twa = 40 + Math.sin(radT * 2) * 10;      // Oscilla angolo +- 10°
-
-        // Calcoli Vettoriali (Nautica)
-        const stw = Math.min(tws * 0.7, 8); // Velocità barca legata al vento
-        const twaRad = degToRad(twa);
-        
-        // AWS = radq(stw² + tws² + 2*stw*tws*cos(twa))
-        const aws = Math.sqrt(Math.pow(stw, 2) + Math.pow(tws, 2) + 2 * stw * tws * Math.cos(twaRad));
-        // AWA = atan2(tws*sin(twa), stw + tws*cos(twa))
-        const awa = radToDeg(Math.atan2(tws * Math.sin(twaRad), stw + tws * Math.cos(twaRad)));
-        
-        // Calcolo Leeway (Scarroccio): più forte il vento, più scarroccia
-        const leeway = (tws > 5) ? Math.sin(twaRad) * (tws * 0.2) : 0;
+        const elapsed = (Date.now() - sim.startTime) / 1000;
+
+        // Vento: Rotazione lenta + Salto netto a 120s
+        if (elapsed > 120 && elapsed < 121) sim.twd = Math.random() * 360;
+        sim.twd = (sim.twd + (Math.sin(elapsed / 20) * 0.5) + 360) % 360;
+
+        // Raffica
+        const inGust = (elapsed % 40) < 5;
+        const targetTws = (inGust ? 18 : 10) + Math.sin(elapsed / 10) * 2;
+        sim.tws += (targetTws - sim.tws) * 0.05;
 
-        // Invio dati al sistema
-        processIncomingData("environment.wind.speedTrue", ktsToMs(tws));
-        processIncomingData("environment.wind.angleTrueWater", degToRad(twa));
+        // Barca segue il vento pigramente
+        sim.hdg = (sim.hdg + (Math.random() - 0.5) * 1 + 360) % 360;
+
+        let twaRel = (sim.twd - sim.hdg + 360) % 360;
+        if (twaRel > 180) twaRel -= 360;
+        
+        // Polare smussata
+        let targetStw = 3 + (4 * Math.sin((Math.abs(twaRel) - 45) * Math.PI / 125));
+        sim.stw += (Math.max(3, Math.min(8, targetStw)) - sim.stw) * 0.05;
+
+        // Leeway smussato
+        const rawLeeway = Math.sin(degToRad(twaRel)) * 4;
+        sim.leeway += (rawLeeway - sim.leeway) * 0.05;
+
+        // Vettori Reali
+        const cog = (sim.hdg - sim.leeway + 360) % 360;
+        const twaRad = degToRad(twaRel);
+        const aws = Math.sqrt(Math.pow(sim.stw, 2) + Math.pow(sim.tws, 2) + 2 * sim.stw * sim.tws * Math.cos(twaRad));
+        const awa = radToDeg(Math.atan2(sim.tws * Math.sin(twaRad), sim.stw + sim.tws * Math.cos(twaRad)));
+
+        // Invio Dati (Con tutto il set necessario per la UI)
+        processIncomingData("environment.wind.speedTrue", ktsToMs(sim.tws));
+        processIncomingData("environment.wind.directionTrue", degToRad(sim.twd));
+        processIncomingData("environment.wind.angleTrueWater", degToRad(twaRel));
         processIncomingData("environment.wind.speedApparent", ktsToMs(aws));
         processIncomingData("environment.wind.angleApparent", degToRad(awa));
-        processIncomingData("environment.depth.belowTransducer", depth);
-        processIncomingData("navigation.headingTrue", degToRad(baseHdg));
-        processIncomingData("navigation.speedThroughWater", ktsToMs(stw));
-        processIncomingData("navigation.courseOverGroundTrue", degToRad(baseHdg + leeway));
+        processIncomingData("environment.depth.belowTransducer", sim.depth);
+        processIncomingData("navigation.headingTrue", degToRad(sim.hdg));
+        processIncomingData("navigation.speedThroughWater", ktsToMs(sim.stw));
+        processIncomingData("navigation.speedOverGround", ktsToMs(sim.stw));
+        processIncomingData("navigation.courseOverGroundTrue", degToRad(cog));
+
     }, 1000);
 }
-

package/index.html

@@ -179,6 +179,8 @@
                 <g id="twa-pointer" transform="rotate(0, 200, 200)" opacity="0.85">
                     <path d="M200,90 L206,98 L200,125 L194,98 Z" fill="#ffff00" stroke="#000" stroke-width="0.8" />
                     <text x="200" y="104" fill="#000" font-size="8" font-weight="900" text-anchor="middle" font-family="Arial Black">T</text>
+                    <circle id="trend-gauge-cw"  cx="215" cy="110" r="4" fill="#ff0000" opacity="0" />
+                    <circle id="trend-gauge-ccw" cx="185" cy="110" r="4" fill="#00ff00" opacity="0" />
                 </g>
                 
                 <!-- Barra LEEWAY / SCARROCCIO Inferiore -->
@@ -282,7 +284,6 @@
                                                 <path d="M 20,17 L 17,26 L 20,24.5 L 23,26 Z" fill="white" opacity="0.2" />
                                             </g>
 
-                                            <!-- 2. INDICATORE VENTO: Ruota con il TWD (id: twd-arrow) -->
                                             <g id="twd-arrow" transform="rotate(0, 20, 20)">
                                                 <path id="twd-wind-chevron" d="M 17,5 L 20,7.5 L 23,5"
                                                       fill="none"
@@ -290,6 +291,8 @@
                                                       stroke-width="2.2"
                                                       stroke-linecap="round"
                                                       stroke-linejoin="round" />
+                                                <circle id="trend-dot-cw" cx="24" cy="7.5" r="1.5" fill="#ff0000" />
+                                                <circle id="trend-dot-ccw" cx="16" cy="7.5" r="1.5" fill="#00ff00" />
                                             </g>
                                         </svg>
                     <span class="value value-large" id="twd-avg">---&deg;</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailingrotevista/rotevista-dash",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "Public Wind Dashboard with navigation and course aids",
   "main": "index.js",
   "publishConfig": {

package/style.css

@@ -77,7 +77,7 @@ body {
 .data-box {
     position: relative;
     border-bottom: 1px solid #222;
-    padding: 8px 12px;
+    padding: 4px 8px;
     display: flex;
     flex-direction: column;
     width: 100%;
@@ -91,9 +91,18 @@ body {
 .left-panel .data-box { align-items: flex-start; text-align: left; }
 .right-panel .data-box { align-items: flex-end; text-align: right; }
 
-/* Altezze Proporzionali: 25% dell'altezza per i grafici, 16.6% per i MEAN/TACK */
-.data-box:nth-child(1), .data-box:nth-child(2) { height: 25vh; }
-.data-box:nth-child(3), .data-box:nth-child(4), .data-box:nth-child(5) { height: 16.666vh; }
+.side-panel {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    gap: 2px;
+}
+
+.data-box {
+    flex: 1 1 0px; /* Ogni box si divide lo spazio equamente, ma può ridursi se serve */
+    min-height: 0; /* Fondamentale per permettere al grafico di non eccedere */
+    padding: 2px 4px; /* Ancora più compatto */
+}
 
 /* ==========================================================================
    3. TACTICAL FOCUS MODE (AUTO-EXPANDING SPLIT)
@@ -208,20 +217,20 @@ body {
 .graph-wrapper {
     position: relative; width: 100%; flex-grow: 1; min-height: 0; margin-top: 4px;
     display: flex; align-items: stretch; background: rgba(255, 255, 255, 0.03);
-    border-radius: 4px; gap: 2px;
+    border-radius: 4px; gap: 0px !important;
 }
 
 /* Spostamento verso il centro per eliminare spazi neri morti */
 .left-panel .graph-wrapper { margin-right: -6px; }
 .right-panel .graph-wrapper { margin-left: -6px; }
 
-.sparkline { flex-grow: 1; height: 100%; background: transparent !important; display: block; }
+.sparkline { flex-grow: 1; height: 100%; width: 100% !important; background: transparent !important; display: block; }
 .sparkline path, .sparkline line { stroke-width: 1px !important; transition: all 0.3s ease; }
 
 .scale-labels {
     display: flex; flex-direction: column; justify-content: space-between;
-    font-size: 10px; color: #777; font-weight: bold; min-width: 18px;
-    height: 100%; line-height: 1; padding: 2px 0;
+    font-size: 10px; color: #777; font-weight: bold; min-width: 12px;
+    height: 100%; line-height: 1; padding: 0 px 0; border: none !important;
 }
 
 /* Simmetria: le scale numeriche "guardano" sempre il quadrante centrale */
@@ -452,3 +461,20 @@ body.night-mode {
     fill: #ff3333 !important;
     opacity: 0.4 !important;
 }
+
+/* Definiamo il lampeggio */
+@keyframes blink-trend {
+    0%, 100% { opacity: 1; }
+    50% { opacity: 0; }
+}
+
+/* Stile base dei pallini */
+#trend-dot-cw, #trend-dot-ccw, #trend-gauge-cw, #trend-gauge-ccw {
+    opacity: 0.3;
+    transition: opacity 0.3s ease;
+}
+
+/* Quando attivi la classe, forziamo l'animazione */
+.is-trending {
+    animation: blink-trend 1s infinite !important;
+}