From 0167884748d39530c8799c1ef8d7241060a7441c Mon Sep 17 00:00:00 2001
From: Ben Goldsworthy <admin@bengoldsworthy.net>
Date: Sun, 5 Jan 2025 17:28:42 +0100
Subject: [PATCH] move heatmap code into partial

---
 layouts/locations/list.html              | 41 +--------------------
 layouts/partials/cv/locations/heatmap.js | 47 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 layouts/partials/cv/locations/heatmap.js

diff --git a/layouts/locations/list.html b/layouts/locations/list.html
index cd93bb3..7bb3625 100644
--- a/layouts/locations/list.html
+++ b/layouts/locations/list.html
@@ -21,46 +21,7 @@
     <script src="/js/leaflet-fullscreen/leaflet.fullscreen.min.js"></script>
 
     <script>
-        var map = L.map('map', {
-            fullscreenControl: true
-        }).setView([55, -3], 3);
-
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            maxZoom: 19,
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-        }).addTo(map);
-
-        {{- $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}}
-
-        {{/*
-        {{- range .Site.AllPages -}}
-            {{- with .Params.locations -}}
-                {{- range . -}}
-                    {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
-                        L.marker([{{ .lat }}, {{ .lon }}]).addTo(map);
-                {{- end -}}
-                {{- end -}}
-            {{- end -}}
-        {{- end -}}
-        */}}
-
-        L.heatLayer(
-            [
-            {{- range .Site.AllPages -}}
-                {{- with .Params.locations -}}
-                    {{- range . -}}
-                        {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
-                            [ {{ .lat }}, {{ .lon }} ],
-                        {{- end -}}
-                    {{- end -}}
-                {{- end -}}
-            {{- end -}}
-            ],
-            {
-                minOpacity: 0.5,
-                gradient: {0.1: 'blue', 0.3: 'lime', 0.8: 'orange', 1: 'red'}
-            }
-        ).addTo(map);
+        {{- partial "cv/locations/heatmap.js" ( dict "all_pages" $.Site.AllPages ) -}}
     </script>
 {{ end }}
 
diff --git a/layouts/partials/cv/locations/heatmap.js b/layouts/partials/cv/locations/heatmap.js
new file mode 100644
index 0000000..1465b5a
--- /dev/null
+++ b/layouts/partials/cv/locations/heatmap.js
@@ -0,0 +1,47 @@
+/*
+    Recursively render an ordered or unordered list from a set of arbitrarily-
+    deeply-nested items.
+
+    @params all_pages  All site pages
+*/
+
+var map = L.map('map', {
+    fullscreenControl: true
+}).setView([55, -3], 3);
+
+L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+}).addTo(map);
+
+{{- $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}}
+
+{{/*
+{{- range .Site.AllPages -}}
+    {{- with .Params.locations -}}
+        {{- range . -}}
+            {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
+                L.marker([{{ .lat }}, {{ .lon }}]).addTo(map);
+        {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+*/}}
+
+L.heatLayer(
+    [
+    {{- range .all_pages -}}
+        {{- with .Params.locations -}}
+            {{- range . -}}
+                {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
+                    [ {{ .lat }}, {{ .lon }} ],
+                {{- end -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+    ],
+    {
+        minOpacity: 0.5,
+        gradient: {0.1: 'blue', 0.3: 'lime', 0.8: 'orange', 1: 'red'}
+    }
+).addTo(map);