Add an interactive braille OpenStreetMap map of mesh nodes
New `map` tool (menu + `meshtools map` CLI) that plots the mesh's location-sharing nodes over a real OSM street basemap rendered as Unicode braille — streets, rivers, water, and place names — the mapscii idea, but able to plot our own nodes and live inside the TUI. - core/mvt.py: dependency-free MVT/protobuf vector-tile decoder. - core/geo.py: Web Mercator + a pannable/zoomable Viewport and tile math. - services/basemap.py: OpenFreeMap vector tiles (free, no API key), resolved from the versioned TileJSON, disk-cached, offline-safe (stdlib urllib only). - ui/mapcanvas.py: colored braille canvas (per-cell priority, line raster, polygon fill, collision-avoided labels), emits truecolor ANSI. - ui/map_render.py: compositor — basemap styling + node markers with names. - ui/map_screen.py: full-screen screen; wasd/arrows pan, =/- zoom, r reset, Esc/q exit; background tile loading. Offline falls back to nodes on a grid. - tools/map.py: interactive in the menu, one-shot static render on the CLI. Repeaters are prioritised over leaf nodes via advert type: threaded `node_type` through Observation/HeardNode and the persistence layer (schema v4->v5, with an idempotent migration adding observations.node_type). Added TuiSession.base_body_size() so a full-screen screen can size itself to the frame. Tests: tests/test_map.py (24) cover MVT decode against a real cached tile fixture, projection, the canvas, the compositor, offline behavior, and the interactive pan/zoom/reset logic. Full suite: 261 passing. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
a03dedb09c
commit
d652a4e012
14 files changed
+2233
-7
No files matched your search
@@ -10,7 +10,7 @@ from __future__ import annotations
|
||||
import sqlite3
|
||||
from pathlib import Path
|
||||
|
||||
SCHEMA_VERSION = 4
|
||||
SCHEMA_VERSION = 5
|
||||
|
||||
_SCHEMA = """
|
||||
CREATE TABLE IF NOT EXISTS schema_meta (
|
||||
@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS observations (
|
||||
node TEXT,
|
||||
name TEXT,
|
||||
kind TEXT NOT NULL DEFAULT 'advert',
|
||||
node_type INTEGER, -- advert type (repeater/chat/room/...), when carried
|
||||
snr REAL,
|
||||
rssi REAL,
|
||||
lat REAL,
|
||||
@@ -149,8 +150,8 @@ def _migrate(conn: sqlite3.Connection) -> None:
|
||||
added columns are created here too (not in ``_SCHEMA``), so ``executescript`` never
|
||||
references a column an older database hasn't grown yet.
|
||||
"""
|
||||
columns = {row["name"] for row in conn.execute("PRAGMA table_info(messages)")}
|
||||
if "channel_id" not in columns:
|
||||
message_cols = {row["name"] for row in conn.execute("PRAGMA table_info(messages)")}
|
||||
if "channel_id" not in message_cols:
|
||||
# v3 -> v4: channel history moved from being keyed by slot index to a
|
||||
# slot-independent channel identity. Existing rows are backfilled lazily at runtime
|
||||
# (see Repository.backfill_channel_ids) once the device's channels can be read.
|
||||
@@ -158,3 +159,9 @@ def _migrate(conn: sqlite3.Connection) -> None:
|
||||
conn.execute(
|
||||
"CREATE INDEX IF NOT EXISTS idx_messages_channel_id ON messages(channel_id)"
|
||||
)
|
||||
|
||||
observation_cols = {row["name"] for row in conn.execute("PRAGMA table_info(observations)")}
|
||||
if "node_type" not in observation_cols:
|
||||
# v4 -> v5: observations gained the transmitting node's advert type, so the map can
|
||||
# tell repeaters from leaf nodes. Older rows simply carry NULL (type unknown).
|
||||
conn.execute("ALTER TABLE observations ADD COLUMN node_type INTEGER")
|
||||
@@ -320,13 +320,14 @@ class Repository:
|
||||
"""
|
||||
self._conn.execute(
|
||||
"INSERT INTO observations "
|
||||
"(run_id, node, name, kind, snr, rssi, lat, lon, observed_at) "
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
"(run_id, node, name, kind, node_type, snr, rssi, lat, lon, observed_at) "
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
(
|
||||
run_id,
|
||||
obs.node,
|
||||
obs.name,
|
||||
obs.kind,
|
||||
obs.node_type,
|
||||
obs.snr,
|
||||
obs.rssi,
|
||||
obs.lat,
|
||||
@@ -361,7 +362,7 @@ class Repository:
|
||||
Returns:
|
||||
One :class:`HeardNode` per distinct node, ordered by most-recently heard.
|
||||
"""
|
||||
sql = "SELECT node, name, snr, rssi, lat, lon, observed_at FROM observations"
|
||||
sql = "SELECT node, name, node_type, snr, rssi, lat, lon, observed_at FROM observations"
|
||||
params: list[Any] = []
|
||||
if since is not None:
|
||||
sql += " WHERE observed_at >= ?"
|
||||
@@ -373,6 +374,7 @@ class Repository:
|
||||
obs = Observation(
|
||||
node=row["node"],
|
||||
name=row["name"],
|
||||
node_type=row["node_type"],
|
||||
snr=row["snr"],
|
||||
rssi=row["rssi"],
|
||||
lat=row["lat"],
|
||||
|
||||
Reference in new issue
Block a user