From 4e24850e131f27d39e1135e28a748ed1bb93eb49 Mon Sep 17 00:00:00 2001 From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com> Date: Mon, 19 Jan 2026 17:12:28 +0000 Subject: [PATCH] Restructure maplibre requiring hierarchy --- app/assets/javascripts/dashboard.js | 3 --- app/assets/javascripts/diary_entry.js | 3 --- app/assets/javascripts/maplibre/map.js | 6 ++++++ .../javascripts/{maplibre.map.js => maplibre/styles.js} | 3 --- app/assets/javascripts/user.js | 3 --- 5 files changed, 6 insertions(+), 12 deletions(-) rename app/assets/javascripts/{maplibre.map.js => maplibre/styles.js} (82%) diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 45aab874e..1b6dec678 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -1,7 +1,4 @@ -//= require maplibre.map //= require maplibre/map -//= require maplibre/controls -//= require maplibre/dom_util $(function () { let map; diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js index e033265aa..90471d77b 100644 --- a/app/assets/javascripts/diary_entry.js +++ b/app/assets/javascripts/diary_entry.js @@ -1,7 +1,4 @@ -//= require maplibre.map //= require maplibre/map -//= require maplibre/controls -//= require maplibre/dom_util $(function () { let marker, map; diff --git a/app/assets/javascripts/maplibre/map.js b/app/assets/javascripts/maplibre/map.js index 79cafdcb4..09b302508 100644 --- a/app/assets/javascripts/maplibre/map.js +++ b/app/assets/javascripts/maplibre/map.js @@ -1,3 +1,9 @@ +//= require maplibre-gl/dist/maplibre-gl +//= require maplibre.i18n +//= require maplibre/controls +//= require maplibre/dom_util +//= require maplibre/styles + OSM.MapLibre.Map = class extends maplibregl.Map { constructor({ allowRotation, ...options } = {}) { const rotationOptions = {}; diff --git a/app/assets/javascripts/maplibre.map.js b/app/assets/javascripts/maplibre/styles.js similarity index 82% rename from app/assets/javascripts/maplibre.map.js rename to app/assets/javascripts/maplibre/styles.js index 1b8e9af43..b938c7bb2 100644 --- a/app/assets/javascripts/maplibre.map.js +++ b/app/assets/javascripts/maplibre/styles.js @@ -1,6 +1,3 @@ -//= require maplibre-gl/dist/maplibre-gl -//= require maplibre.i18n - OSM.MapLibre.Styles.Mapnik = { version: 8, sources: { diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index a10846de7..8fcde7c1b 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -1,7 +1,4 @@ -//= require maplibre.map //= require maplibre/map -//= require maplibre/controls -//= require maplibre/dom_util //= require ./home_location_name-endpoint $(function () { -- 2.39.5