From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Apr 2019 10:12:50 +0000 (+0100)
Subject: Avoid error when there is no layer with a keyid
X-Git-Tag: live~2624
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/784d4ca03d1c8916c94dd8528c54c60ce4b0967a

Avoid error when there is no layer with a keyid

Fixes #2215
---

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 0cee211ce..1f161ceea 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -96,11 +96,11 @@ L.OSM.Map = L.Map.extend({
   },
 
   getMapBaseLayerId: function () {
-    var baseLayer;
+    var baseLayerId;
     this.eachLayer(function (layer) {
-      if (layer.options && layer.options.keyid) baseLayer = layer;
+      if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
     });
-    return baseLayer.options.keyid;
+    return baseLayerId;
   },
 
   getUrl: function (marker) {