Rename return values of getMapBaseLayerId() to layerId

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index f89ae0c3d96ff05ae496f8e309c6cd12c2544dfd..090583ced1ed65923900643c9c95016e71581b95 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -34,13 +34,13 @@ L.OSM.key = function (options) {
     }
 
     function update() {
-      var layer = map.getMapBaseLayerId(),
+      var layerId = map.getMapBaseLayerId(),
           zoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
         var data = $(this).data();
         $(this).toggle(
-          layer === data.layer &&
+          layerId === data.layer &&
           (!data.zoomMin || zoom >= data.zoomMin) &&
           (!data.zoomMax || zoom <= data.zoomMax)
         );

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 40ba020e6c36ac0ac82cd6367a934cf9cf24897d..f0d2781098224d31bab521e66eb1a931373d09f2 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -410,15 +410,15 @@ L.OSM.share = function (options) {
       $("#mapnik_image_width").text(mapWidth);
       $("#mapnik_image_height").text(mapHeight);
 
-      const layer = map.getMapBaseLayerId();
+      const layerId = map.getMapBaseLayerId();
       const layerKeys = new Map([
         ["mapnik", "standard"],
         ["cyclemap", "cycle_map"],
         ["transportmap", "transport_map"]
       ]);
 
-      $("#mapnik_image_layer").text(layerKeys.has(layer) ? I18n.t(`javascripts.map.base.${layerKeys.get(layer)}`) : "");
-      $("#map_format").val(layer);
+      $("#mapnik_image_layer").text(layerKeys.has(layerId) ? I18n.t(`javascripts.map.base.${layerKeys.get(layerId)}`) : "");
+      $("#map_format").val(layerId);
 
       $("#map_zoom").val(map.getZoom());
       $("#mapnik_lon").val(map.getCenter().lng);