From 126a987aa8b2d95b90b0970fba7d4e6df1cfaac0 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 22 Nov 2024 01:18:55 +0300
Subject: [PATCH] Move layer definitions to yml

---
 app/assets/javascripts/leaflet.map.js | 102 +-------------------------
 app/assets/javascripts/osm.js.erb     |   2 +
 config/layers.yml                     |  72 ++++++++++++++++++
 3 files changed, 75 insertions(+), 101 deletions(-)
 create mode 100644 config/layers.yml

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index d053a81ce..78f43b73a 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -15,109 +15,9 @@ L.OSM.Map = L.Map.extend({
   initialize: function (id, options) {
     L.Map.prototype.initialize.call(this, id, options);
 
-    const layerDefinitions = [
-      {
-        leafletOsmId: "Mapnik",
-        code: "M",
-        keyId: "mapnik",
-        nameId: "standard",
-        credit: {
-          id: "make_a_donation",
-          href: "https://supporting.openstreetmap.org",
-          donate: true
-        }
-      },
-      {
-        leafletOsmId: "CyclOSM",
-        code: "Y",
-        keyId: "cyclosm",
-        nameId: "cyclosm",
-        credit: {
-          id: "cyclosm_credit",
-          children: {
-            cyclosm_link: {
-              id: "cyclosm_name",
-              href: "https://www.cyclosm.org"
-            },
-            osm_france_link: {
-              id: "osm_france",
-              href: "https://openstreetmap.fr/"
-            }
-          }
-        }
-      },
-      {
-        leafletOsmId: "CycleMap",
-        code: "C",
-        keyId: "cyclemap",
-        nameId: "cycle_map",
-        apiKeyId: "THUNDERFOREST_KEY",
-        credit: {
-          id: "thunderforest_credit",
-          children: {
-            thunderforest_link: {
-              id: "andy_allan",
-              href: "https://www.thunderforest.com/"
-            }
-          }
-        }
-      },
-      {
-        leafletOsmId: "TransportMap",
-        code: "T",
-        keyId: "transportmap",
-        nameId: "transport_map",
-        apiKeyId: "THUNDERFOREST_KEY",
-        credit: {
-          id: "thunderforest_credit",
-          children: {
-            thunderforest_link: {
-              id: "andy_allan",
-              href: "https://www.thunderforest.com/"
-            }
-          }
-        }
-      },
-      {
-        leafletOsmId: "TracestrackTopo",
-        code: "P",
-        keyId: "tracestracktopo",
-        nameId: "tracestracktop_topo",
-        apiKeyId: "TRACESTRACK_KEY",
-        credit: {
-          id: "tracestrack_credit",
-          children: {
-            tracestrack_link: {
-              id: "tracestrack",
-              href: "https://www.tracestrack.com/"
-            }
-          }
-        }
-      },
-      {
-        leafletOsmId: "HOT",
-        code: "H",
-        keyId: "hot",
-        nameId: "hot",
-        credit: {
-          id: "hotosm_credit",
-          children: {
-            hotosm_link: {
-              id: "hotosm_name",
-              href: "https://www.hotosm.org/"
-            },
-            osm_france_link: {
-              id: "osm_france",
-              href: "https://openstreetmap.fr/"
-            }
-          }
-        }
-      }
-    ];
-
     this.baseLayers = [];
 
-    for (const layerDefinition of layerDefinitions) {
+    for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
       if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
 
       const layerOptions = {
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index e08528f84..e9c09c79f 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 layers.yml
 //= depend_on key.yml
 //= require qs/dist/qs
 
@@ -30,6 +31,7 @@ OSM = {
   TRACESTRACK_KEY:         <%= Settings.tracestrack_key.to_json %>,
 <% end %>
 
+  LAYER_DEFINITIONS:       <%= YAML.load_file(Rails.root.join("config/layers.yml")).to_json %>,
   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 %>,
diff --git a/config/layers.yml b/config/layers.yml
new file mode 100644
index 000000000..3b5bc944f
--- /dev/null
+++ b/config/layers.yml
@@ -0,0 +1,72 @@
+- leafletOsmId: "Mapnik"
+  code: "M"
+  keyId: "mapnik"
+  nameId: "standard"
+  credit:
+    id: "make_a_donation"
+    href: "https://supporting.openstreetmap.org"
+    donate: true
+
+- leafletOsmId: "CyclOSM"
+  code: "Y"
+  keyId: "cyclosm"
+  nameId: "cyclosm"
+  credit:
+    id: "cyclosm_credit"
+    children:
+      cyclosm_link:
+        id: "cyclosm_name"
+        href: "https://www.cyclosm.org"
+      osm_france_link:
+        id: "osm_france"
+        href: "https://openstreetmap.fr/"
+
+- leafletOsmId: "CycleMap"
+  code: "C"
+  keyId: "cyclemap"
+  nameId: "cycle_map"
+  apiKeyId: "THUNDERFOREST_KEY"
+  credit:
+    id: "thunderforest_credit"
+    children:
+      thunderforest_link:
+        id: "andy_allan"
+        href: "https://www.thunderforest.com/"
+
+- leafletOsmId: "TransportMap"
+  code: "T"
+  keyId: "transportmap"
+  nameId: "transport_map"
+  apiKeyId: "THUNDERFOREST_KEY"
+  credit:
+    id: "thunderforest_credit"
+    children:
+      thunderforest_link:
+        id: "andy_allan"
+        href: "https://www.thunderforest.com/"
+
+- leafletOsmId: "TracestrackTopo"
+  code: "P"
+  keyId: "tracestracktopo"
+  nameId: "tracestracktop_topo"
+  apiKeyId: "TRACESTRACK_KEY"
+  credit:
+    id: "tracestrack_credit"
+    children:
+      tracestrack_link:
+        id: "tracestrack"
+        href: "https://www.tracestrack.com/"
+
+- leafletOsmId: "HOT"
+  code: "H"
+  keyId: "hot"
+  nameId: "hot"
+  credit:
+    id: "hotosm_credit"
+    children:
+      hotosm_link:
+        id: "hotosm_name"
+        href: "https://www.hotosm.org/"
+      osm_france_link:
+        id: "osm_france"
+        href: "https://openstreetmap.fr/"
-- 
2.39.5