From 857e9179b870203f1411bb6f9599ab676b77d5cf Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 24 Nov 2023 16:38:38 +0300 Subject: [PATCH] Read layers with available map key from config/key.yml --- app/assets/javascripts/leaflet.key.js | 2 +- app/assets/javascripts/osm.js.erb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js index 6a3400d34..bcd5839cd 100644 --- a/app/assets/javascripts/leaflet.key.js +++ b/app/assets/javascripts/leaflet.key.js @@ -24,7 +24,7 @@ L.OSM.key = function (options) { } function updateButton() { - var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1; + var disabled = OSM.LAYERS_WITH_MAP_KEY.indexOf(map.getMapBaseLayerId()) === -1; button .toggleClass("disabled", disabled) .attr("data-bs-original-title", diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 0a0f5c67a..2e33438db 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,5 +1,6 @@ //= depend_on settings.yml //= depend_on settings.local.yml +//= depend_on key.yml //= require qs/dist/qs OSM = { @@ -29,6 +30,8 @@ OSM = { TRACESTRACK_KEY: <%= Settings.tracestrack_key.to_json %>, <% end %> + LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>, + MARKER_GREEN: <%= image_path("marker-green.png").to_json %>, MARKER_RED: <%= image_path("marker-red.png").to_json %>, -- 2.45.1