From f3746e0fc44152bbee343da54a75a97b3c8feae8 Mon Sep 17 00:00:00 2001
From: Martin Rubli <martin@rubli.info>
Date: Mon, 18 Dec 2023 23:11:59 +0100
Subject: [PATCH] layouts: map: Make unique ID unique on page, not only
 shortcut parent

The SHORTCODE.Ordinal method "returns the zero-based ordinal of the shortcode in
relation to its parent." (https://gohugo.io/methods/shortcode/ordinal/)

This is a problem if the same shortcode is used on the different page through
different paths, e.g. once on the page itself and once by a partial (e.g. a
header or footer).

Instead of just using the .Ordinal by itself, use a hash of the parent file
_and_ the ordinal, which gives us a properly unique identifier.
---
 layouts/shortcodes/leaflet-elevation-profile.html | 2 +-
 layouts/shortcodes/leaflet-layer.html             | 2 +-
 layouts/shortcodes/leaflet-map.html               | 2 +-
 layouts/shortcodes/leaflet-marker.html            | 2 +-
 layouts/shortcodes/leaflet-scale.html             | 2 +-
 layouts/shortcodes/leaflet-track.html             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/layouts/shortcodes/leaflet-elevation-profile.html b/layouts/shortcodes/leaflet-elevation-profile.html
index a2a8980..7f1780a 100644
--- a/layouts/shortcodes/leaflet-elevation-profile.html
+++ b/layouts/shortcodes/leaflet-elevation-profile.html
@@ -2,7 +2,7 @@
 {{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
 {{ end }}
 
-{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+{{ $uniqueMapId := (printf "%s:%d" .Page.File.UniqueID .Parent.Ordinal) | md5 | safeJS }}
 
 <script>
 	map_options_{{ $uniqueMapId }}.heightgraph = {
diff --git a/layouts/shortcodes/leaflet-layer.html b/layouts/shortcodes/leaflet-layer.html
index 002ddcf..2a1e8e9 100644
--- a/layouts/shortcodes/leaflet-layer.html
+++ b/layouts/shortcodes/leaflet-layer.html
@@ -6,7 +6,7 @@
 {{ errorf "%s: missing 'id' parameter: %s" .Name .Position }}
 {{ end }}
 
-{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+{{ $uniqueMapId := (printf "%s:%d" .Page.File.UniqueID .Parent.Ordinal) | md5 | safeJS }}
 
 {{ $id := .Get "id" }}
 <script>
diff --git a/layouts/shortcodes/leaflet-map.html b/layouts/shortcodes/leaflet-map.html
index 451cb82..b8e2829 100644
--- a/layouts/shortcodes/leaflet-map.html
+++ b/layouts/shortcodes/leaflet-map.html
@@ -119,7 +119,7 @@ Elevation profile options:
 
 */}}
 
-{{ $uniqueId := .Ordinal | safeJS }}
+{{ $uniqueId := (printf "%s:%d" .Page.File.UniqueID .Ordinal) | md5 | safeJS }}
 
 <div id="map_container_{{ $uniqueId }}" class="map-container" style="width: {{ .Get "width" | default "auto" }}; height: {{ .Get "height" | default "50vh" }};">
 	<div id="map_{{ $uniqueId }}" class="map"></div>
diff --git a/layouts/shortcodes/leaflet-marker.html b/layouts/shortcodes/leaflet-marker.html
index b47a7e4..9d39bca 100644
--- a/layouts/shortcodes/leaflet-marker.html
+++ b/layouts/shortcodes/leaflet-marker.html
@@ -9,7 +9,7 @@
 {{ errorf "%s: missing 'lon' parameter: %s" .Name .Position }}
 {{ end }}
 
-{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+{{ $uniqueMapId := (printf "%s:%d" .Page.File.UniqueID .Parent.Ordinal) | md5 | safeJS }}
 
 <script>
 	map_options_{{ $uniqueMapId }}.markers.push({ lat: {{ .Get "lat" }}, lon: {{ .Get "lon" }} })
diff --git a/layouts/shortcodes/leaflet-scale.html b/layouts/shortcodes/leaflet-scale.html
index dbff56d..f2bb582 100644
--- a/layouts/shortcodes/leaflet-scale.html
+++ b/layouts/shortcodes/leaflet-scale.html
@@ -2,7 +2,7 @@
 {{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
 {{ end }}
 
-{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+{{ $uniqueMapId := (printf "%s:%d" .Page.File.UniqueID .Parent.Ordinal) | md5 | safeJS }}
 
 <script>
 	map_options_{{ $uniqueMapId }}.scale = {
diff --git a/layouts/shortcodes/leaflet-track.html b/layouts/shortcodes/leaflet-track.html
index 09f37b4..6fc8372 100644
--- a/layouts/shortcodes/leaflet-track.html
+++ b/layouts/shortcodes/leaflet-track.html
@@ -6,7 +6,7 @@
 {{ errorf "%s: missing 'path' parameter: %s" .Name .Position }}
 {{ end }}
 
-{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+{{ $uniqueMapId := (printf "%s:%d" .Page.File.UniqueID .Parent.Ordinal) | md5 | safeJS }}
 
 <script>
 	map_options_{{ $uniqueMapId }}.tracks.push({{ .Get "path" }})