From 7e59575f1bddac7307228f1e3a515482f78fa845 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 29 Jan 2026 19:19:02 +0100
Subject: [PATCH] Don't import maplibre more than necessary

---
 app/assets/javascripts/application.js        | 2 ++
 app/assets/javascripts/leaflet.maplibre.js   | 1 -
 app/assets/javascripts/leaflet.maptiler.js   | 1 -
 app/assets/javascripts/leaflet.shortbread.js | 2 --
 app/assets/javascripts/maplibre/map.js       | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index df2b33b79..499faa6a1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -7,6 +7,8 @@
 //= require osm
 //= require leaflet/dist/leaflet-src
 //= require leaflet.osm
+//= require maplibre-gl/dist/maplibre-gl
+//= require leaflet.maplibre
 //= require leaflet.shortbread
 //= require i18n
 //= require leaflet.maptiler
diff --git a/app/assets/javascripts/leaflet.maplibre.js b/app/assets/javascripts/leaflet.maplibre.js
index 26aaa2ffe..38b7f7d50 100644
--- a/app/assets/javascripts/leaflet.maplibre.js
+++ b/app/assets/javascripts/leaflet.maplibre.js
@@ -1,4 +1,3 @@
-//= require maplibre-gl
 //= require @maplibre/maplibre-gl-leaflet
 
 maplibregl.setRTLTextPlugin(OSM.RTL_TEXT_PLUGIN, true);
diff --git a/app/assets/javascripts/leaflet.maptiler.js b/app/assets/javascripts/leaflet.maptiler.js
index 71f4e5f58..3dfdf4b08 100644
--- a/app/assets/javascripts/leaflet.maptiler.js
+++ b/app/assets/javascripts/leaflet.maptiler.js
@@ -1,4 +1,3 @@
-//= require leaflet.maplibre
 //= require maplibre/i18n
 //= require @maptiler/maplibre-gl-omt-language
 
diff --git a/app/assets/javascripts/leaflet.shortbread.js b/app/assets/javascripts/leaflet.shortbread.js
index 6298b9625..b7b316130 100644
--- a/app/assets/javascripts/leaflet.shortbread.js
+++ b/app/assets/javascripts/leaflet.shortbread.js
@@ -1,5 +1,3 @@
-//= require leaflet.maplibre
-
 L.OSM.Shortbread = L.OSM.MaplibreGL.extend({
   onAdd: function (map) {
     L.OSM.MaplibreGL.prototype.onAdd.call(this, map);
diff --git a/app/assets/javascripts/maplibre/map.js b/app/assets/javascripts/maplibre/map.js
index ceb5539b3..3b729fb8e 100644
--- a/app/assets/javascripts/maplibre/map.js
+++ b/app/assets/javascripts/maplibre/map.js
@@ -1,4 +1,3 @@
-//= require maplibre-gl/dist/maplibre-gl
 //= require maplibre/controls
 //= require maplibre/dom_util
 //= require maplibre/styles
-- 
2.39.5