thermograph/frontend/static/mappicker.js

224 lines
9.7 KiB
JavaScript
Raw Normal View History

// Shared modal "location picker". Every view's Find button opens this overlay:
// a search box + a Leaflet map. Searching a place jumps the map (and a matching
// result selects it immediately); tapping anywhere on the map drops a pin the user
// can fine-tune before confirming. Picking closes the overlay and hands the chosen
// lat/lon back to the page via the onPick callback.
//
2026-07-11 20:28:33 +00:00
// Leaflet stays a classic script (global L), loaded before the page modules. The
// map itself is created lazily the first time the picker opens (and reused after),
// so pages that never open it pay nothing.
import { uv } from "./account.js";
2026-07-11 20:28:33 +00:00
let overlay, mapEl, map, marker, pin = null, onPickCb = null, pinIcon = null;
let searchForm, searchInput, sugEl, confirmBtn, hintEl;
let sugSeq = 0, sugTimer = 0, sugAbort = null;
2026-07-11 20:28:33 +00:00
export const PIN_ICON = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z"/><circle cx="12" cy="10" r="3"/></svg>`;
2026-07-11 20:28:33 +00:00
function build() {
overlay = document.createElement("div");
overlay.className = "mp-overlay";
overlay.hidden = true;
overlay.innerHTML = `
<div class="mp-modal" role="dialog" aria-modal="true" aria-label="Pick a location">
<div class="mp-head">
<h2>Find a location</h2>
<button type="button" class="mp-close" aria-label="Close">&times;</button>
</div>
<form class="mp-search" autocomplete="off">
<input type="text" placeholder="Search for a place…" autocomplete="off" />
<button type="submit">Search</button>
<ul class="mp-sug" hidden></ul>
</form>
<div class="mp-map"></div>
<div class="mp-foot">
<span class="mp-hint">Search above, or tap the map to drop a pin.</span>
<button type="button" class="mp-confirm" disabled>Use this location</button>
</div>
</div>`;
document.body.appendChild(overlay);
2026-07-11 20:28:33 +00:00
mapEl = overlay.querySelector(".mp-map");
searchForm = overlay.querySelector(".mp-search");
searchInput = searchForm.querySelector("input");
sugEl = overlay.querySelector(".mp-sug");
confirmBtn = overlay.querySelector(".mp-confirm");
hintEl = overlay.querySelector(".mp-hint");
2026-07-11 20:28:33 +00:00
overlay.querySelector(".mp-close").onclick = close;
// Tapping the dimmed backdrop (outside the modal) closes the picker.
overlay.addEventListener("pointerdown", (e) => { if (e.target === overlay) close(); });
confirmBtn.onclick = () => finish(pin);
2026-07-11 20:28:33 +00:00
// Live suggestions (top 5, single-letter-typo tolerant) as the user types:
// debounced so a fast typist doesn't fire a request per keystroke, aborted
// + sequence-guarded so a slow stale response can't overwrite a newer list.
async function fetchSug(q) {
const seq = ++sugSeq;
if (sugAbort) sugAbort.abort();
sugAbort = new AbortController();
try {
const res = await fetch(uv(`suggest?q=${encodeURIComponent(q)}`),
{ signal: sugAbort.signal, credentials: "include" });
2026-07-11 20:28:33 +00:00
const d = await res.json();
if (seq === sugSeq) renderSug(d.results || []);
} catch (err) { /* aborted, or offline — the map stays the fallback way to pick */ }
}
2026-07-11 20:28:33 +00:00
searchInput.addEventListener("input", () => {
clearTimeout(sugTimer);
// The old list stays visible until fresh results land, but its highlight
// must go — Enter mid-typing shouldn't pick a suggestion for the shorter
// query the list still reflects.
const stale = sugEl.querySelector("li.active");
if (stale) stale.classList.remove("active");
const q = searchInput.value.trim();
if (q.length < 2) { sugEl.hidden = true; return; }
sugTimer = setTimeout(() => fetchSug(q), 250);
});
// Arrow keys walk the list (Enter picks via the submit handler below);
// Escape dismisses the list before the overlay's Escape-to-close kicks in.
searchInput.addEventListener("keydown", (e) => {
if (e.key === "Escape" && !sugEl.hidden) {
sugEl.hidden = true;
e.stopPropagation();
return;
}
if (sugEl.hidden || (e.key !== "ArrowDown" && e.key !== "ArrowUp")) return;
const items = [...sugEl.children];
if (!items.length) return;
e.preventDefault();
const cur = items.findIndex((li) => li.classList.contains("active"));
const next = e.key === "ArrowDown"
? (cur + 1) % items.length
: (cur <= 0 ? items.length - 1 : cur - 1);
setActiveSug(items, next);
items[next].scrollIntoView({ block: "nearest" });
});
searchForm.addEventListener("submit", (e) => {
e.preventDefault();
clearTimeout(sugTimer);
// Enter picks the highlighted suggestion when the list is up; otherwise
// it searches immediately (no debounce wait).
const active = sugEl.hidden ? null : sugEl.querySelector("li.active");
if (active) { active.click(); return; }
const q = searchInput.value.trim();
if (q) fetchSug(q);
});
// Hide the suggestions when tapping elsewhere in the modal (but not the map,
// which has its own tap handler).
overlay.addEventListener("pointerdown", (e) => {
if (!e.target.closest(".mp-search")) sugEl.hidden = true;
}, true);
document.addEventListener("keydown", (e) => {
if (overlay && !overlay.hidden && e.key === "Escape") close();
});
}
2026-07-11 20:28:33 +00:00
function setActiveSug(items, idx) {
items.forEach((li, i) => li.classList.toggle("active", i === idx));
}
Typo-tolerant location search suggestions (#33) Add /api/v2/suggest and wire the location picker's search box to it as a debounced type-ahead: top-5 place suggestions that tolerate a single-letter typo (substituted, missing, or extra letter, or two adjacent letters swapped) anywhere in the query, including the first character. - backend/places.py: local place index built from a GeoNames cities dump (downloaded once into data/geonames/, loaded in a background thread; the app boots and serves without it). Exact-prefix matches rank first by population, then names one edit away; a token vocabulary respells one mistyped word against known place-name tokens ("pest seattle" -> "west seattle") for retry against the upstream geocoder, which covers neighbourhood-level places the dump lacks. THERMOGRAPH_CITIES picks the dump (default cities1000). - /suggest blends local and upstream results by population with an exactness boost, so "Seatle" (a Cumbrian hamlet) can't outrank Seattle when the query is one edit from the city, while "munchen" still surfaces Munich via upstream (the index only knows English names). Upstream lookups are memoized and skipped entirely when the index answers convincingly. - mappicker.js: debounced (250ms) live suggestions with abort + sequence guards against stale responses, arrow-key navigation, Enter-picks-highlight, Escape dismissing the list before closing the overlay. Submit goes through the same typo-tolerant endpoint. - climate.geocode results now carry population (used for ranking).
2026-07-11 15:36:14 +00:00
2026-07-11 20:28:33 +00:00
function renderSug(list) {
const shown = list;
sugEl.innerHTML = "";
if (!shown.length) { sugEl.hidden = true; return; }
shown.forEach((r) => {
const li = document.createElement("li");
li.innerHTML = `${r.name}<span class="sub">, ${[r.admin1, r.country].filter(Boolean).join(", ")}</span>`;
2026-07-11 20:28:33 +00:00
// A picked search result is an unambiguous choice — drop the pin, recenter,
// and select it right away (the map is there for manual/fine picks).
li.onclick = () => {
sugEl.hidden = true;
searchInput.value = r.name;
setPin(r.lat, r.lon, 10);
finish({ lat: r.lat, lon: r.lon });
};
// Keep one highlight: hovering moves it off whatever the arrows chose.
li.addEventListener("pointerenter", () =>
setActiveSug([...sugEl.children], [...sugEl.children].indexOf(li)));
sugEl.appendChild(li);
});
// Pre-highlight the top match so Enter picks it straight away.
setActiveSug([...sugEl.children], 0);
sugEl.hidden = false;
}
2026-07-11 20:28:33 +00:00
function setPin(lat, lon, zoom) {
pin = { lat, lon };
if (marker) marker.setLatLng([lat, lon]);
else marker = L.marker([lat, lon], pinIcon ? { icon: pinIcon } : undefined).addTo(map);
map.setView([lat, lon], zoom || map.getZoom());
confirmBtn.disabled = false;
hintEl.textContent = "Pin set. Confirm below, or tap elsewhere to move it.";
2026-07-11 20:28:33 +00:00
}
2026-07-11 20:28:33 +00:00
function finish(p) {
if (!p) return;
const cb = onPickCb;
close();
if (cb) cb(p.lat, p.lon);
}
2026-07-11 20:28:33 +00:00
export function open(cur, onPick) {
if (!overlay) build();
onPickCb = onPick;
pin = null;
confirmBtn.disabled = true;
// Cancel any in-flight/pending suggestion fetch from the previous open so
// a late response can't pop a stale list over the fresh empty box.
clearTimeout(sugTimer);
sugSeq++;
sugEl.hidden = true;
searchInput.value = "";
hintEl.textContent = "Search above, or tap the map to drop a pin.";
overlay.hidden = false;
2026-07-11 20:28:33 +00:00
if (!map) {
map = L.map(mapEl, { worldCopyJump: true, zoomControl: true }).setView([25, 0], 2);
// Colorful CARTO "Voyager" basemap (no key needed), split into two raster
// layers so road weight and label size can be tuned independently:
// • the label-free base is requested one zoom lower and drawn at 512px
// (tileSize 512 + zoomOffset -1) so roads read bold and prominent;
// • the labels-only layer is drawn on top at its natural size, keeping city
// names small and crisp rather than scaled up with the roads.
// @2x keeps both sharp; a darken/saturate filter (style.css, .mp-base only)
// deepens the roads while leaving the label text at full contrast.
const CARTO = "https://{s}.basemaps.cartocdn.com/rastertiles";
const ATTRIB = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> &copy; <a href="https://carto.com/attributions">CARTO</a>';
L.tileLayer(`${CARTO}/voyager_nolabels/{z}/{x}/{y}@2x.png`, {
subdomains: "abcd", maxZoom: 20, tileSize: 512, zoomOffset: -1,
className: "mp-base", attribution: ATTRIB,
}).addTo(map);
L.tileLayer(`${CARTO}/voyager_only_labels/{z}/{x}/{y}@2x.png`, {
subdomains: "abcd", maxZoom: 20, className: "mp-labels",
}).addTo(map);
// Branded accent teardrop pin (the same glyph the Find button uses), styled
// in style.css — replaces Leaflet's default blue raster marker.
pinIcon = L.divIcon({
className: "mp-pin", html: PIN_ICON, iconSize: [32, 32], iconAnchor: [16, 30],
});
map.on("click", (e) => setPin(e.latlng.lat, e.latlng.lng));
}
2026-07-11 20:28:33 +00:00
// Leaflet measures the container on creation; it's zero-sized while hidden, so
// recalc once the modal is actually visible and (if reopening on a known spot)
// drop a pin there as the starting point.
setTimeout(() => {
map.invalidateSize();
if (cur && cur.lat != null && cur.lon != null) setPin(cur.lat, cur.lon, 10);
searchInput.focus();
}, 60);
}
2026-07-11 20:28:33 +00:00
function close() { if (overlay) overlay.hidden = true; }
Extract shared.js: one home for tier colors, scales, formatters, helpers (#47) The page scripts each re-declared the shared presentation layer — the tier color table existed in four places (app.js, calendar.js, day.js, style.css) and the scale label tables in three (plus legend.html's own drifting copy), alongside per-page copies of the dryness ramp, formatters, ord, todayISO, esc, the weather icons/summary, month helpers and the 2-year range chunker. ~240 duplicated lines deleted (net -236 with the new module included). - frontend/shared.js (IIFE, extends window.Thermograph): tier colors read from style.css's :root custom properties at load — the CSS is now the single source of truth; the JS map exists only because inline-SVG work (chart + PNG export) needs literal values, with hex fallbacks for a missing stylesheet. Plus SCALE_TEMP/SCALE_RAIN, drynessColor, fmt*, ord, todayISO, esc, placeLabel, month/chunk date helpers, clickOpensPicker, and the weatherType summary (dsr-aware; the day page just omits dsr). - nav.js: wrapped in an IIFE — its ~15 top-level functions were globals in the shared classic-script scope, and a leaked locHash collided with page destructuring (caught by the browser smoke, not by node --check). locHash is now exported and used by all 8 former hand-built hash sites. - mappicker.js: initFindButton/setFindLabel replace the Find-button block each page rebuilt. - legend.html renders its scales from the shared tables, so the guide can no longer drift from what the app shows. Verified: node --check on all JS; 108 backend tests; headless-Chromium smoke over all five pages against live data — no console/page errors, legend rows 9/9, weekly 7 cards + colored chart/key/table + metric toggle, calendar grid + key + metric switch, day 7 ladders + weather icon, compare seeded rank card.
2026-07-11 20:21:48 +00:00
2026-07-11 20:28:33 +00:00
// Wire a page's Find/Add button: pin icon + label, and open the picker on
// click seeded with the page's current spot. `setFindLabel` swaps the label
// (e.g. "Find a location" → "Change location") keeping the icon markup.
export function initFindButton(btn, label, getCurrent, onPick) {
setFindLabel(btn, label);
btn.addEventListener("click", () => open(getCurrent(), onPick));
}
export function setFindLabel(btn, label) {
btn.innerHTML = `${PIN_ICON} <span>${label}</span>`;
}