| ${isSingle ? '' : (isExpanded ? '▼' : '▶')} |
@@ -1062,6 +1064,7 @@
${renderTimestampCell(p.latest)} |
${truncate(p.hash || '—', 8)} |
${groupSize ? groupSize + 'B' : '—'} |
+ ${groupHashBytes} |
${p.payload_type != null ? `${groupTypeName}` : '—'} |
${isSingle ? truncate(obsName(headerObserverId), 16) : truncate(obsName(headerObserverId), 10) + (p.observer_count > 1 ? ' +' + (p.observer_count - 1) : '')} |
${groupPathStr} |
@@ -1080,6 +1083,7 @@
const typeName = payloadTypeName(c.payload_type);
const typeClass = payloadTypeColor(c.payload_type);
const size = c.raw_hex ? Math.floor(c.raw_hex.length / 2) : 0;
+ const childHashBytes = ((parseInt(c.raw_hex?.slice(2, 4), 16) || 0) >> 6) + 1;
const childRegion = c.observer_id ? (observers.find(o => o.id === c.observer_id)?.iata || '') : '';
let childPath = [];
try { childPath = JSON.parse(c.path_json || '[]'); } catch {}
@@ -1089,6 +1093,7 @@
${renderTimestampCell(c.timestamp)} |
${truncate(c.hash || '', 8)} |
${size}B |
+ ${childHashBytes} |
${typeName} |
${truncate(obsName(c.observer_id), 16)} |
${childPathStr} |
@@ -1111,6 +1116,7 @@
const typeName = payloadTypeName(p.payload_type);
const typeClass = payloadTypeColor(p.payload_type);
const size = p.raw_hex ? Math.floor(p.raw_hex.length / 2) : 0;
+ const hashBytes = ((parseInt(p.raw_hex?.slice(2, 4), 16) || 0) >> 6) + 1;
const pathStr = renderPath(pathHops, p.observer_id); const detail = getDetailPreview(decoded);
return `
@@ -1118,6 +1124,7 @@
| ${renderTimestampCell(p.timestamp)} |
${truncate(p.hash || String(p.id), 8)} |
${size}B |
+ ${hashBytes} |
${typeName} |
${truncate(obsName(p.observer_id), 16)} |
${pathStr} |
diff --git a/public/style.css b/public/style.css
index eb446899..b0e2efc1 100644
--- a/public/style.css
+++ b/public/style.css
@@ -6,6 +6,7 @@
--nav-text: #ffffff;
--nav-text-muted: #cbd5e1;
--accent: #4a9eff;
+ --geo-filter-color: #3b82f6;
--status-green: #22c55e;
--status-yellow: #eab308;
--status-red: #ef4444;
@@ -1224,7 +1225,7 @@ button.ch-item.ch-item-encrypted .ch-badge { filter: grayscale(0.6); }
/* Hide low-value columns on mobile */
@media (max-width: 640px) {
- .col-region, .col-rpt, .col-size, .col-pubkey { display: none; }
+ .col-region, .col-rpt, .col-size, .col-hashsize, .col-pubkey { display: none; }
}
/* Clickable hop links */
@@ -1370,6 +1371,7 @@ tr[data-hops]:hover { background: rgba(59,130,246,0.1); }
.hide-col-observer .col-observer,
.hide-col-path .col-path,
.hide-col-rpt .col-rpt,
+.hide-col-hashsize .col-hashsize,
.hide-col-details .col-details { display: none; }
/* === Home page fixes === */
diff --git a/scripts/prune-nodes-outside-geo-filter.py b/scripts/prune-nodes-outside-geo-filter.py
new file mode 100644
index 00000000..6f34eb08
--- /dev/null
+++ b/scripts/prune-nodes-outside-geo-filter.py
@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+"""
+Delete nodes from the database that fall outside the configured geo_filter polygon + bufferKm.
+Nodes with no GPS coordinates are always kept.
+
+Usage:
+ python3 prune-nodes-outside-geo-filter.py [db_path] [--config config.json] [--dry-run]
+
+ db_path Path to meshcore.db (default: /app/data/meshcore.db)
+ --config PATH Path to config.json (default: /app/config.json)
+ --dry-run Show what would be deleted without making any changes
+"""
+
+import sqlite3
+import math
+import sys
+import json
+import os
+
+
+def point_in_polygon(lat, lon, polygon):
+ """Ray-casting algorithm."""
+ inside = False
+ n = len(polygon)
+ j = n - 1
+ for i in range(n):
+ yi, xi = polygon[i] # lat, lon
+ yj, xj = polygon[j]
+ if ((yi > lat) != (yj > lat)) and (lon < (xj - xi) * (lat - yi) / (yj - yi) + xi):
+ inside = not inside
+ j = i
+ return inside
+
+
+def dist_to_segment_km(lat, lon, a, b):
+ """Approximate distance (km) from point to line segment, using flat-earth projection."""
+ lat1, lon1 = a
+ lat2, lon2 = b
+ mid_lat = (lat1 + lat2) / 2.0
+ cos_lat = math.cos(math.radians(mid_lat))
+ km_per_deg_lat = 111.0
+ km_per_deg_lon = 111.0 * cos_lat
+
+ # Translate so point is at origin
+ ax = (lon1 - lon) * km_per_deg_lon
+ ay = (lat1 - lat) * km_per_deg_lat
+ bx = (lon2 - lon) * km_per_deg_lon
+ by = (lat2 - lat) * km_per_deg_lat
+
+ abx, aby = bx - ax, by - ay
+ ab_sq = abx * abx + aby * aby
+ if ab_sq == 0:
+ return math.sqrt(ax * ax + ay * ay)
+
+ t = max(0.0, min(1.0, -(ax * abx + ay * aby) / ab_sq))
+ px = ax + t * abx
+ py = ay + t * aby
+ return math.sqrt(px * px + py * py)
+
+
+def node_passes_filter(lat, lon, polygon, buffer_km):
+ """Return True if the node should be kept."""
+ if lat is None or lon is None:
+ return True
+ if lat == 0.0 and lon == 0.0:
+ return True # no GPS fix
+ if point_in_polygon(lat, lon, polygon):
+ return True
+ if buffer_km > 0:
+ n = len(polygon)
+ for i in range(n):
+ j = (i + 1) % n
+ if dist_to_segment_km(lat, lon, polygon[i], polygon[j]) <= buffer_km:
+ return True
+ return False
+
+
+def load_geo_filter(config_path):
+ """Load polygon and bufferKm from config.json geo_filter section."""
+ if not os.path.exists(config_path):
+ print(f"ERROR: config not found at {config_path}")
+ sys.exit(1)
+ with open(config_path) as f:
+ cfg = json.load(f)
+ gf = cfg.get('geo_filter')
+ if not gf:
+ print("ERROR: no geo_filter section found in config.json")
+ sys.exit(1)
+ polygon = gf.get('polygon', [])
+ if len(polygon) < 3:
+ print("ERROR: geo_filter.polygon must have at least 3 points")
+ sys.exit(1)
+ buffer_km = gf.get('bufferKm', 0.0)
+ print(f"Loaded geo_filter from {config_path}: {len(polygon)} points, bufferKm={buffer_km}")
+ return polygon, buffer_km
+
+
+def main():
+ args = sys.argv[1:]
+ dry_run = '--dry-run' in args
+ args = [a for a in args if a != '--dry-run']
+
+ config_path = '/app/config.json'
+ if '--config' in args:
+ idx = args.index('--config')
+ config_path = args[idx + 1]
+ args = args[:idx] + args[idx + 2:]
+
+ db_path = args[0] if args else '/app/data/meshcore.db'
+
+ polygon, buffer_km = load_geo_filter(config_path)
+
+ if not os.path.exists(db_path):
+ print(f"ERROR: database not found at {db_path}")
+ sys.exit(1)
+
+ conn = sqlite3.connect(db_path)
+ conn.row_factory = sqlite3.Row
+ cur = conn.cursor()
+
+ cur.execute('SELECT public_key, name, lat, lon FROM nodes ORDER BY name')
+ nodes = cur.fetchall()
+
+ keep, remove = [], []
+ for row in nodes:
+ lat = row['lat']
+ lon = row['lon']
+ if node_passes_filter(lat, lon, polygon, buffer_km):
+ keep.append(row)
+ else:
+ remove.append(row)
+
+ print(f"Total nodes in DB : {len(nodes)}")
+ print(f"Nodes to keep : {len(keep)}")
+ print(f"Nodes to delete : {len(remove)}")
+
+ if not remove:
+ print("\nNothing to delete.")
+ conn.close()
+ return
+
+ print("\nNodes that will be DELETED:")
+ for row in remove:
+ lat = row['lat'] or 0
+ lon = row['lon'] or 0
+ name = row['name'] or row['public_key'][:12]
+ print(f" {name:<30} lat={lat:.4f} lon={lon:.4f}")
+
+ if dry_run:
+ print("\n[dry-run] No changes made.")
+ conn.close()
+ return
+
+ confirm = input(f"\nDelete {len(remove)} nodes? Type 'yes' to confirm: ").strip()
+ if confirm.lower() != 'yes':
+ print("Aborted.")
+ conn.close()
+ return
+
+ pubkeys = [row['public_key'] for row in remove]
+ cur.executemany('DELETE FROM nodes WHERE public_key = ?', [(pk,) for pk in pubkeys])
+ conn.commit()
+ print(f"\nDeleted {cur.rowcount if cur.rowcount >= 0 else len(pubkeys)} nodes.")
+ conn.close()
+
+
+if __name__ == '__main__':
+ main()
diff --git a/tools/geofilter-builder.html b/tools/geofilter-builder.html
new file mode 100644
index 00000000..addb7e69
--- /dev/null
+++ b/tools/geofilter-builder.html
@@ -0,0 +1,153 @@
+
+
+
+
+
+GeoFilter Builder
+
+
+
+
+
+
+
+
+
+
+
+
+
Add at least 3 points to generate config…
+
+ 0 points
+
+
+