From c5b261ecb909d46eed9363b743e9835d4c37b945 Mon Sep 17 00:00:00 2001
From: ethanhawkes-gif <ethan@signalry.ai>
Date: Mon, 17 Aug 2026 03:53:25 +0000
Subject: [PATCH 1/2] fix(situation): make live-GPS unit overlay toggleable in
 the layer control

The EOC map draws units through two independent layers: the status-
coloured roster layer (unitMarkers, the 'Units (EOC)' checkbox) and the
real-time GPS overlay from unit-tracking.js. UnitTracking.init() adds its
layer group straight to the map and situation.php never registered it in
the Leaflet layer control, so unchecking 'Units (EOC)' only hid the green
roster markers -- the orange live-GPS markers (coloured by unit.color)
stayed on screen with no way to turn them off.

Register the tracking group as its own toggleable overlay ('Units --
live GPS', default on so nothing changes unless the operator toggles it)
and register it with MapLayerPrefs for per-user persistence like the
other overlays. Reported by cbyrdmo on a live volunteer fire/EMS EOC
deployment (openises/TicketsCAD#71).

Adds tests/test_gh71_live_gps_layer_toggle.php (static guards, matching
tests/test_situation_map_fixes.php). New: 6/6, existing situation suite:
34/34, php -l clean.
---
 situation.php                             | 22 +++++++
 tests/test_gh71_live_gps_layer_toggle.php | 72 +++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 tests/test_gh71_live_gps_layer_toggle.php

diff --git a/situation.php b/situation.php
index 1e85110..eca0b15 100644
--- a/situation.php
+++ b/situation.php
@@ -2049,6 +2049,28 @@ function init() {
                 }
             });
             tracker.start();
+
+            // GH #71 follow-up (cbyrdmo, 2026-08-17) — the live-GPS tracking
+            // overlay was added straight to the map (UnitTracking.init does
+            // L.layerGroup().addTo(map)) and never registered in the layer
+            // control. The "Units (EOC)" checkbox only governs the status-
+            // coloured EOC roster layer (unitMarkers), so switching units off
+            // left the live-GPS markers on screen — drawn in each unit's
+            // configured tracking colour (e.g. orange) rather than the green
+            // status colour — and operators read that as "units won't turn
+            // off." Register the tracking group as its own toggleable overlay
+            // (default on, unchanged) so it can be hidden, and persist that
+            // choice per-user like the other overlays.
+            if (sitLayersControl && typeof tracker.getLayerGroup === 'function') {
+                var liveGpsLayer = tracker.getLayerGroup();
+                if (liveGpsLayer) {
+                    sitLayersControl.addOverlay(liveGpsLayer,
+                        '<span style="color:#fd7e14">&#9679;</span> Units — live GPS');
+                    if (window.MapLayerPrefs && window.MapLayerPrefs.register) {
+                        window.MapLayerPrefs.register(map, 'units_live', liveGpsLayer);
+                    }
+                }
+            }
         }
 
         // Fallback polling every 15s for incidents (SSE handles real-time when available)
diff --git a/tests/test_gh71_live_gps_layer_toggle.php b/tests/test_gh71_live_gps_layer_toggle.php
new file mode 100644
index 0000000..4fc4b43
--- /dev/null
+++ b/tests/test_gh71_live_gps_layer_toggle.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * GH #71 follow-up — live-GPS tracking overlay must be toggleable
+ * (cbyrdmo, 2026-08-17, from a live volunteer fire/EMS EOC deployment).
+ *
+ * Reported behavior: "If I disable units on the [layers] menu, the units
+ * still appear on the map. They are now orange instead of green." The popup
+ * on those markers reads "Unit — Last fix: Ns ago".
+ *
+ * Root cause: situation.php draws units through TWO independent layers.
+ *
+ *   1. unitMarkers  — the EOC roster layer, coloured by status
+ *      (Available/On Shift = green #198754, On Scene = orange, ...). This is
+ *      the one registered in the layer control as the "Units (EOC)" checkbox.
+ *
+ *   2. UnitTracking  — the real-time GPS overlay (assets/js/unit-tracking.js).
+ *      UnitTracking.init() does `L.layerGroup().addTo(map)` and hands the
+ *      group back via getLayerGroup(), but situation.php never registered it
+ *      in the layer control. Its markers are coloured by each unit's tracking
+ *      colour (unit.color, e.g. orange) and carry the "— Last fix:" tooltip.
+ *
+ * Because only layer #1 was behind the "Units (EOC)" checkbox, switching units
+ * off removed the green roster markers and left the orange live-GPS markers on
+ * screen with no control to hide them — exactly what the operator saw.
+ *
+ * Fix: register the tracking group as its own toggleable overlay (default on,
+ * so nothing changes for installs that leave it alone) and register it with
+ * MapLayerPrefs so the choice persists per user like every other overlay.
+ *
+ * Static guards over situation.php's inline JS (behavioral JS in a PHP file;
+ * no headless DOM here, matching tests/test_situation_map_fixes.php).
+ * Usage: php tests/test_gh71_live_gps_layer_toggle.php
+ */
+
+$base = realpath(__DIR__ . '/..');
+$passed = 0; $failed = 0;
+function t($label, $cond) { global $passed, $failed; echo ($cond ? "[PASS] " : "[FAIL] ") . $label . "\n"; $cond ? $passed++ : $failed++; }
+
+echo "=== GH #71 follow-up (live-GPS overlay toggle) ===\n\n";
+
+$s = @file_get_contents($base . '/situation.php');
+if ($s === false) { t('situation.php readable', false); echo "\n=== $passed passed, $failed failed ===\n"; exit(1); }
+
+// ── the tracking group is added to the layer control so it can be hidden ──
+// It must be sourced from the tracker itself (getLayerGroup), not a fresh
+// throwaway group, or the checkbox would toggle nothing.
+t("#71: the live-GPS tracker layer is registered in sitLayersControl via getLayerGroup()",
+    (bool) preg_match('/tracker\.getLayerGroup\(\)/', $s)
+        && (bool) preg_match('/sitLayersControl\.addOverlay\(\s*liveGpsLayer/', $s));
+
+t("#71: the new overlay carries a distinct 'Units — live GPS' label (not confusable with 'Units (EOC)')",
+    strpos($s, 'Units — live GPS') !== false);
+
+// ── the wiring is guarded so a build without the control/tracker is a no-op ──
+t("#71: registration is guarded on sitLayersControl AND tracker.getLayerGroup existing",
+    (bool) preg_match('/if\s*\(\s*sitLayersControl\s*&&\s*typeof\s+tracker\.getLayerGroup\s*===\s*[\'"]function[\'"]\s*\)/', $s));
+
+// ── per-user persistence parity with the other overlays ──
+t("#71: the live-GPS overlay is registered with MapLayerPrefs so its state persists per user",
+    (bool) preg_match('/MapLayerPrefs\.register\(\s*map\s*,\s*[\'"]units_live[\'"]\s*,\s*liveGpsLayer\s*\)/', $s));
+
+// ── regression: the existing EOC layer wiring is untouched ──
+t("#71 regression: unitMarkers is still registered as the 'Units (EOC)' overlay",
+    (bool) preg_match('/sitLayersControl\.addOverlay\(\s*unitMarkers/', $s)
+        && strpos($s, 'Units (EOC)') !== false);
+
+t("#71 regression: UnitTracking overlay is still added to the map (default-on unchanged)",
+    (bool) preg_match('/UnitTracking\.init\(map/', $s)
+        && (bool) preg_match('/tracker\.start\(\)/', $s));
+
+echo "\n=== $passed passed, $failed failed ===\n";
+exit($failed === 0 ? 0 : 1);

From 8f84a5202fc629ffc6ef710d38148cf0c7e6f731 Mon Sep 17 00:00:00 2001
From: Eric Osterberg <ejosterberg@gmail.com>
Date: Mon, 17 Aug 2026 00:23:24 -0500
Subject: [PATCH 2/2] Move the live-GPS legend dot off an inline style (CI fix)

The required "fresh install + test suite" check failed on
tests/test_ui_consistency_audit.php: the new "Units - live GPS"
overlay label used style="color:#fd7e14", which the project's
UI-consistency audit flags -- an inline hex colour can't be
overridden by a stylesheet without !important. The other four
legend dots on this page (Units (EOC), Facilities (EOC), Event
Zones, Weather Alerts) have the identical pattern and are
pre-existing, baselined debt; this one is new code, so the
audit is right to ask for better here rather than adding a fifth
exception.

Moved the colour into a new .sit-legend-live-gps CSS class in
situation.php's own <style> block and reference it via class=
instead of style=. Same visual result, passes the audit.
---
 situation.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/situation.php b/situation.php
index eca0b15..083c4d5 100644
--- a/situation.php
+++ b/situation.php
@@ -165,6 +165,13 @@
         }
         .sit-zone-label::before { display: none; }
 
+        /* GH #74 -- live-GPS layer-control legend dot. A CSS class rather
+           than an inline style="" so the colour can be overridden by a
+           stylesheet (the project's UI-consistency audit flags inline hex
+           colours specifically because no stylesheet can win against them
+           without !important; a class does not have that problem). */
+        .sit-legend-live-gps { color: #fd7e14; }
+
         /* Collapse toggle icon */
         .sit-toggle { cursor: pointer; user-select: none; }
         .sit-toggle .bi { transition: transform 0.2s; }
@@ -2065,7 +2072,7 @@ function init() {
                 var liveGpsLayer = tracker.getLayerGroup();
                 if (liveGpsLayer) {
                     sitLayersControl.addOverlay(liveGpsLayer,
-                        '<span style="color:#fd7e14">&#9679;</span> Units — live GPS');
+                        '<span class="sit-legend-live-gps">&#9679;</span> Units — live GPS');
                     if (window.MapLayerPrefs && window.MapLayerPrefs.register) {
                         window.MapLayerPrefs.register(map, 'units_live', liveGpsLayer);
                     }