biscuit

commit 76228bc045a9205c4aeec0908eacc17a2a4e40ab
parent 39f687d6f5901b642287b82a8a4fa5c23625e752
Author: Daniel Barlow <dan@telent.net>
Date:   Mon,  2 Jun 2025 21:35:55 +0100

parse way name as well as points

Diffstat:
M
pkgs/maps/main.fnl
 | 
6
+++---
M
pkgs/maps/tiles.fnl
 | 
14
+++++++++-----

2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pkgs/maps/main.fnl b/pkgs/maps/main.fnl
@@ -113,7 +113,7 @@ label.readout {
       (g:fill)
 
       (each [_ line (pairs lines)]
-        (case line
+        (case line.points
           [[sx sy] & more]
           (do
             (g:save)
@@ -128,8 +128,8 @@ label.readout {
             (g:stroke)
             (g:restore))))
 
-            (each [_ line (pairs lines)]
-        (case line
+      (each [_ line (pairs lines)]
+        (case line.points
           [[sx sy] & more]
           (do
             (g:save)
diff --git a/pkgs/maps/tiles.fnl b/pkgs/maps/tiles.fnl
@@ -69,11 +69,15 @@
         (tset
          lines
          e.id
-         (icollect [_ nd (ipairs e.nodes)]
-           (let [node (. nodes nd)
-                 (tx ty) (latlon->tile node.lat node.lon zoom)]
-             ;;(print e.tags.name e.id e.name node.lat node.lon)
-             [ tx ty  ])))))
+         {
+          :name (?. e :tags :name)
+          :points
+          (icollect [_ nd (ipairs e.nodes)]
+            (let [node (. nodes nd)
+                  (tx ty) (latlon->tile node.lat node.lon zoom)]
+              ;;(print e.tags.name e.id e.name node.lat node.lon)
+              [ tx ty  ]))
+          })))
     lines))