Allow specifying extra layer options in layers.yml

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index dc692a4a5d500f0ffbba724a8309769431e7efe8..35b958c7aaa097652ccebf1f392087c8a31801b7 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -29,7 +29,7 @@ L.OSM.layers = function (options) {
 
       map.whenReady(function () {
         var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
 
       map.whenReady(function () {
         var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })

-          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
+          .addLayer(new layer.constructor(layer.options));

 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 78f43b73a0b7d180eb9288664828db223059ecf2..f478f4351b58a644ab0b5b35015021b28abaf48c 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -20,17 +20,26 @@ L.OSM.Map = L.Map.extend({
     for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
       if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
 
     for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
       if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
 

-      const layerOptions = {
-        attribution: makeAttribution(layerDefinition.credit),
-        code: layerDefinition.code,
-        keyid: layerDefinition.keyId,
-        name: I18n.t(`javascripts.map.base.${layerDefinition.nameId}`)
-      };
-      if (layerDefinition.apiKeyId) {
-        layerOptions.apikey = OSM[layerDefinition.apiKeyId];
+      let layerConstructor = L.OSM.TileLayer;
+      const layerOptions = {};
+
+      for (const [property, value] of Object.entries(layerDefinition)) {
+        if (property === "credit") {
+          layerOptions.attribution = makeAttribution(value);
+        } else if (property === "keyId") {
+          layerOptions.keyid = value;
+        } else if (property === "nameId") {
+          layerOptions.name = I18n.t(`javascripts.map.base.${value}`);
+        } else if (property === "apiKeyId") {
+          layerOptions.apikey = OSM[value];
+        } else if (property === "leafletOsmId") {
+          layerConstructor = L.OSM[value];
+        } else {
+          layerOptions[property] = value;
+        }

       }
 
       }
 

-      const layer = new L.OSM[layerDefinition.leafletOsmId](layerOptions);
+      const layer = new layerConstructor(layerOptions);

       this.baseLayers.push(layer);
     }
 
       this.baseLayers.push(layer);
     }