Disable map key on non-default layers

[rails.git] / app / assets / javascripts / changeset.js

diff --git a/app/assets/javascripts/changeset.js b/app/assets/javascripts/changeset.js
index 7f21ae7440d1386b78269299e22b023621adf307..d9c09bab49ee5a288d200eadad22978a2837a9e5 100644 (file)
--- a/app/assets/javascripts/changeset.js
+++ b/app/assets/javascripts/changeset.js
@@ -6,13 +6,9 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
-  $("#changeset_list_map").on("resized", function () {
-    map.invalidateSize();
-  });
-
   var group = L.featureGroup().addTo(map);
 
   $("[data-changeset]").each(function () {
@@ -73,11 +69,5 @@ $(document).ready(function () {
         }
   });
 
-  var params = OSM.mapParams();
-  if (params.bbox) {
-    map.fitBounds([[params.minlat, params.minlon],
-                   [params.maxlat, params.maxlon]]);
-  } else {
-    map.fitBounds(group.getBounds());
-  }
+  map.fitBounds(OSM.mapParams().bounds || group.getBounds());
 });