mirror of
https://github.com/zvx-echo6/central.git
synced 2026-06-10 20:04:43 +02:00
ed9b6b53be
PR #3 of the v0.7.x GUI rework arc. Makes the /events Leaflet map readable and intentional. Production code; central-gui restart only (no adapter change). - Fit-to-results default: the map now fits the actual event distribution on load (previously disabled -> fixed global zoom-4). Empty result set falls back to the CONUS setView (no crash). Re-fits after each HTMX swap, but only when the map-filter toggle is OFF (when ON the viewport drives the bbox, so re-fitting would fight/loop the filter). - leaflet.markercluster (1.5.3, via CDN): point markers cluster into numbered badges (disableClusteringAtZoom=9, showCoverageOnHover=false, spiderfyOnMaxZoom=true). markercluster supports point markers only, so polygons/lines render in a separate un-clustered featureGroup; fit unions both. - Map-filter toggle ("Filter table by map view"), default OFF. When off the table shows all filter-matching events regardless of map zoom; the backend ignores region_* unless map_filter is set (guards bookmarked URLs too). URL carries map_filter=1 only when on (hidden input disabled otherwise). - Per-event_type marker shape (derived event_type = first category segment): circle = quake/hydro/space (points), square = fire (areas), triangle = wx (NWS alerts/warnings), star = disaster (GDACS/EONET). Rendered as divIcon + CSS clip-path; point markers switched from circleMarker to L.marker(divIcon) (also required for markercluster compatibility). - Per-severity opacity: critical(4)=1.0, high(3)=0.85, moderate(2)=0.7, low(1)=0.5, unknown(0/NULL)=0.4. Needed adding severity to the _fetch_events SELECT + event dict (row.get for mock-tolerance) + a data-severity row attr. Adds 4 tests (map_filter gating on/off, bbox reaches query only when on, severity in SELECT); updates test_events_bbox_guard for the new toggle contract. Full suite: 662 passed, 1 skipped (central and unprivileged zvx). Vanilla JS + HTMX + Leaflet/markercluster; CSS functional-only (polish deferred). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
"""Bug 2 (v0.7.0): out-of-range map bbox must not reach the SQL envelope.
|
|
|
|
Leaflet returns longitudes outside [-180, 180] when the map is panned past the
|
|
dateline at low zoom (e.g. east=411.3281, west=-608.2031). The map JS now
|
|
normalizes/omits those, but _parse_events_params also defends in depth: a
|
|
degenerate or out-of-range region is treated as "no bbox" rather than erroring
|
|
or building a bogus ST_MakeEnvelope that silently matches the wrong rows.
|
|
"""
|
|
from central.gui.routes import _parse_events_params
|
|
|
|
|
|
def _params(**kw):
|
|
base = {"limit": "50"}
|
|
base.update(kw)
|
|
return base
|
|
|
|
|
|
def test_out_of_range_bbox_is_dropped_not_errored():
|
|
"""The exact pan-past-dateline artifact from the bug report -> no bbox."""
|
|
parsed, error = _parse_events_params(_params(
|
|
region_north="42.0", region_south="31.0",
|
|
region_east="411.3281", region_west="-608.2031",
|
|
))
|
|
assert error is None
|
|
assert parsed is not None
|
|
assert parsed["bbox"] is None
|
|
|
|
|
|
def test_valid_bbox_is_preserved():
|
|
# v0.7.2: a bbox is only honored when the map-filter toggle is on.
|
|
parsed, error = _parse_events_params(_params(
|
|
region_north="42.0", region_south="31.0",
|
|
region_east="-102.0", region_west="-124.5", map_filter="1",
|
|
))
|
|
assert error is None
|
|
assert parsed["bbox"] == {
|
|
"north": 42.0, "south": 31.0, "east": -102.0, "west": -124.5,
|
|
}
|
|
|
|
|
|
def test_inverted_bbox_is_dropped():
|
|
"""west >= east (a wrapped dateline-straddle) is degenerate -> no bbox."""
|
|
parsed, error = _parse_events_params(_params(
|
|
region_north="42.0", region_south="31.0",
|
|
region_east="-124.5", region_west="-102.0",
|
|
))
|
|
assert error is None
|
|
assert parsed["bbox"] is None
|