diff --git a/public/analytics.js b/public/analytics.js
index 32d9665d..49a7b909 100644
--- a/public/analytics.js
+++ b/public/analytics.js
@@ -1349,29 +1349,52 @@
       }
 
       // Top hops leaderboard
-      html += `<div class="analytics-section"><h3>🏆 Top 20 Longest Hops</h3><table class="data-table"><thead><tr><th>#</th><th>From</th><th>To</th><th>Distance (km)</th><th>Type</th><th>SNR</th><th>Packet</th></tr></thead><tbody>`;
+      html += `<div class="analytics-section"><h3>🏆 Top 20 Longest Hops</h3><table class="data-table"><thead><tr><th>#</th><th>From</th><th>To</th><th>Distance (km)</th><th>Type</th><th>SNR</th><th>Packet</th><th></th></tr></thead><tbody>`;
       const top20 = data.topHops.slice(0, 20);
       top20.forEach((h, i) => {
         const fromLink = h.fromPk ? `<a href="#/nodes/${encodeURIComponent(h.fromPk)}" class="analytics-link">${esc(h.fromName)}</a>` : esc(h.fromName || '?');
         const toLink = h.toPk ? `<a href="#/nodes/${encodeURIComponent(h.toPk)}" class="analytics-link">${esc(h.toName)}</a>` : esc(h.toName || '?');
         const snr = h.snr != null ? h.snr + ' dB' : '<span class="text-muted">—</span>';
         const pktLink = h.hash ? `<a href="#/packet/${encodeURIComponent(h.hash)}" class="analytics-link mono" style="font-size:0.85em">${esc(h.hash.slice(0, 12))}…</a>` : '—';
-        html += `<tr><td>${i+1}</td><td>${fromLink}</td><td>${toLink}</td><td><strong>${h.dist}</strong></td><td>${esc(h.type)}</td><td>${snr}</td><td>${pktLink}</td></tr>`;
+        const mapBtn = h.fromPk && h.toPk ? `<button class="btn-icon dist-map-hop" data-from="${esc(h.fromPk)}" data-to="${esc(h.toPk)}" title="View on map">🗺️</button>` : '';
+        html += `<tr><td>${i+1}</td><td>${fromLink}</td><td>${toLink}</td><td><strong>${h.dist}</strong></td><td>${esc(h.type)}</td><td>${snr}</td><td>${pktLink}</td><td>${mapBtn}</td></tr>`;
       });
       html += `</tbody></table></div>`;
 
       // Top paths
       if (data.topPaths.length) {
-        html += `<div class="analytics-section"><h3>🛤️ Top 10 Longest Multi-Hop Paths</h3><table class="data-table"><thead><tr><th>#</th><th>Total Distance (km)</th><th>Hops</th><th>Route</th><th>Packet</th></tr></thead><tbody>`;
+        html += `<div class="analytics-section"><h3>🛤️ Top 10 Longest Multi-Hop Paths</h3><table class="data-table"><thead><tr><th>#</th><th>Total Distance (km)</th><th>Hops</th><th>Route</th><th>Packet</th><th></th></tr></thead><tbody>`;
         data.topPaths.slice(0, 10).forEach((p, i) => {
           const route = p.hops.map(h => esc(h.fromName)).concat(esc(p.hops[p.hops.length-1].toName)).join(' → ');
           const pktLink = p.hash ? `<a href="#/packet/${encodeURIComponent(p.hash)}" class="analytics-link mono" style="font-size:0.85em">${esc(p.hash.slice(0, 12))}…</a>` : '—';
-          html += `<tr><td>${i+1}</td><td><strong>${p.totalDist}</strong></td><td>${p.hopCount}</td><td style="font-size:0.9em">${route}</td><td>${pktLink}</td></tr>`;
+          // Collect all unique pubkeys in path order
+          const pathPks = [];
+          p.hops.forEach(h => { if (h.fromPk && !pathPks.includes(h.fromPk)) pathPks.push(h.fromPk); });
+          if (p.hops.length && p.hops[p.hops.length-1].toPk) { const last = p.hops[p.hops.length-1].toPk; if (!pathPks.includes(last)) pathPks.push(last); }
+          const mapBtn = pathPks.length >= 2 ? `<button class="btn-icon dist-map-path" data-hops='${JSON.stringify(pathPks)}' title="View on map">🗺️</button>` : '';
+          html += `<tr><td>${i+1}</td><td><strong>${p.totalDist}</strong></td><td>${p.hopCount}</td><td style="font-size:0.9em">${route}</td><td>${pktLink}</td><td>${mapBtn}</td></tr>`;
         });
         html += `</tbody></table></div>`;
       }
 
       el.innerHTML = html;
+
+      // Wire up map buttons
+      el.querySelectorAll('.dist-map-hop').forEach(btn => {
+        btn.addEventListener('click', () => {
+          sessionStorage.setItem('map-route-hops', JSON.stringify({ hops: [btn.dataset.from, btn.dataset.to] }));
+          window.location.hash = '#/map?route=1';
+        });
+      });
+      el.querySelectorAll('.dist-map-path').forEach(btn => {
+        btn.addEventListener('click', () => {
+          try {
+            const hops = JSON.parse(btn.dataset.hops);
+            sessionStorage.setItem('map-route-hops', JSON.stringify({ hops }));
+            window.location.hash = '#/map?route=1';
+          } catch {}
+        });
+      });
     } catch (e) {
       el.innerHTML = `<div style="padding:40px;text-align:center;color:#ff6b6b">Failed to load distance analytics: ${esc(e.message)}</div>`;
     }
diff --git a/public/index.html b/public/index.html
index e5502570..fb7cd35f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -88,11 +88,11 @@
   <script src="channels.js?v=1774075538" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="nodes.js?v=1774354200" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="traces.js?v=1774350000" onerror="console.error('Failed to load:', this.src)"></script>
-  <script src="analytics.js?v=1774400200" onerror="console.error('Failed to load:', this.src)"></script>
+  <script src="analytics.js?v=1774400300" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="live.js?v=1774072222" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="observers.js?v=1774290000" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="observer-detail.js?v=1774028201" onerror="console.error('Failed to load:', this.src)"></script>
-  <script src="node-analytics.js?v=1774400200" onerror="console.error('Failed to load:', this.src)"></script>
+  <script src="node-analytics.js?v=1774400300" onerror="console.error('Failed to load:', this.src)"></script>
   <script src="perf.js?v=1773985649" onerror="console.error('Failed to load:', this.src)"></script>
 </body>
 </html>
diff --git a/server.js b/server.js
index 6ee8e02a..fdbd4130 100644
--- a/server.js
+++ b/server.js
@@ -1734,7 +1734,7 @@ app.get('/api/analytics/distance', (req, res) => {
       allHops.push(hop);
       catDists[type].push(dist);
       pathDist += dist;
-      pathHops.push({ fromName: a.name, toName: b.name, dist: hop.dist });
+      pathHops.push({ fromName: a.name, fromPk: a.public_key, toName: b.name, toPk: b.public_key, dist: hop.dist });
 
       if (hourBucket) {
         if (!distByHour[hourBucket]) distByHour[hourBucket] = [];