From 8e8b07447f41e8804b93b8d1f479c24db922b9f4 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 23 Jul 2025 21:00:47 +0100
Subject: [PATCH] Use our custom attribution string for vector layers

Fixes #6220
Fixes #6229
---
 app/assets/javascripts/leaflet.maplibre.js   | 6 ++++++
 app/assets/javascripts/leaflet.maptiler.js   | 8 ++++----
 app/assets/javascripts/leaflet.shortbread.js | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/leaflet.maplibre.js b/app/assets/javascripts/leaflet.maplibre.js
index a28c32013..26aaa2ffe 100644
--- a/app/assets/javascripts/leaflet.maplibre.js
+++ b/app/assets/javascripts/leaflet.maplibre.js
@@ -2,3 +2,9 @@
 //= require @maplibre/maplibre-gl-leaflet
 
 maplibregl.setRTLTextPlugin(OSM.RTL_TEXT_PLUGIN, true);
+
+L.OSM.MaplibreGL = L.MaplibreGL.extend({
+  getAttribution: function () {
+    return this.options.attribution;
+  }
+});
diff --git a/app/assets/javascripts/leaflet.maptiler.js b/app/assets/javascripts/leaflet.maptiler.js
index 333a2576f..3b5572c20 100644
--- a/app/assets/javascripts/leaflet.maptiler.js
+++ b/app/assets/javascripts/leaflet.maptiler.js
@@ -1,9 +1,9 @@
 //= require leaflet.maplibre
 //= require @maptiler/maplibre-gl-omt-language
 
-L.OSM.OpenMapTiles = L.MaplibreGL.extend({
+L.OSM.OpenMapTiles = L.OSM.MaplibreGL.extend({
   initialize: function (options) {
-    L.MaplibreGL.prototype.initialize.call(this, {
+    L.OSM.MaplibreGL.prototype.initialize.call(this, {
       style:
         "https://api.maptiler.com/maps/openstreetmap/style.json?key=" +
         options.apikey,
@@ -11,7 +11,7 @@ L.OSM.OpenMapTiles = L.MaplibreGL.extend({
     });
   },
   onAdd: function (map) {
-    L.MaplibreGL.prototype.onAdd.call(this, map);
+    L.OSM.MaplibreGL.prototype.onAdd.call(this, map);
     const maplibreMap = this.getMaplibreMap();
     const supportedLanguages = maplibregl.Map.prototype.supportedLanguages;
     for (const preferredLanguage of OSM.preferred_languages) {
@@ -28,6 +28,6 @@ L.OSM.OpenMapTiles = L.MaplibreGL.extend({
     }
   },
   onRemove: function (map) {
-    L.MaplibreGL.prototype.onRemove.call(this, map);
+    L.OSM.MaplibreGL.prototype.onRemove.call(this, map);
   }
 });
diff --git a/app/assets/javascripts/leaflet.shortbread.js b/app/assets/javascripts/leaflet.shortbread.js
index 4bf406190..46826c074 100644
--- a/app/assets/javascripts/leaflet.shortbread.js
+++ b/app/assets/javascripts/leaflet.shortbread.js
@@ -1,8 +1,8 @@
 //= require leaflet.maplibre
 
-L.OSM.Shortbread = L.MaplibreGL.extend({
+L.OSM.Shortbread = L.OSM.MaplibreGL.extend({
   onAdd: function (map) {
-    L.MaplibreGL.prototype.onAdd.call(this, map);
+    L.OSM.MaplibreGL.prototype.onAdd.call(this, map);
     const styleURL = "https://vector.openstreetmap.org/demo/shortbread/" + this.options.styleName;
     this.getMaplibreMap().setStyle(styleURL, {
       transformStyle: (previousStyle, nextStyle) => ({
@@ -25,7 +25,7 @@ L.OSM.Shortbread = L.MaplibreGL.extend({
     });
   },
   onRemove: function (map) {
-    L.MaplibreGL.prototype.onRemove.call(this, map);
+    L.OSM.MaplibreGL.prototype.onRemove.call(this, map);
   }
 });
 
-- 
2.39.5