More refactoring of map js

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index c459b77a5a1b2532c6421d7d1167ad29d48e0e11..02b54a8ed22daa4d882fcb2f1beab37397ed00cf 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -34,9 +34,10 @@ $(document).ready(function () {
   });
 
   var params = $("#small_map").data();
+  var object, bbox;
   if (params.type == "changeset") {
-    var bbox = L.latLngBounds([params.minlat, params.minlon],
-                              [params.maxlat, params.maxlon]);
+    bbox = L.latLngBounds([params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]);
 
     map.fitBounds(bbox);
 
@@ -55,13 +56,13 @@ $(document).ready(function () {
 
     updatelinks(map.getCenter(), 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
   } else if (params.type == "note") {
-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};
 
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
 
-    var bbox = map.getBounds();
+    bbox = map.getBounds();
 
     $("#loading").hide();
     $("#browse_map .geolink").show();
@@ -75,10 +76,9 @@ $(document).ready(function () {
                 bbox.getEast(), bbox.getNorth(),
                 object);
   } else {
-    $("#object_larger_map").hide();
-    $("#object_edit").hide();
+    $("#object_larger_map, #object_edit").hide();
 
-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};
 
     if (!params.visible) {
       object.version = params.version - 1;

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index a7e9f6f5040b549f966e67ab5215b10ad636ae0a..1882fe4f48e1c509cca88c88cc6b01a488fe019a 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -59,13 +59,8 @@ function getUserIcon(url) {
 }
 
 function addObjectToMap(object, map, options) {
-  if (objectLoader) {
-    objectLoader.abort();
-  }
-
-  if (objectLayer) {
-    map.removeLayer(objectLayer);
-  }
+  if (objectLoader) objectLoader.abort();
+  if (objectLayer) map.removeLayer(objectLayer);
 
   objectLoader = $.ajax({
     url: OSM.apiUrl(object),
@@ -93,15 +88,8 @@ function addObjectToMap(object, map, options) {
 
       objectLayer.addData(xml);
 
-      var bounds = objectLayer.getBounds();
-
-      if (options.zoom) {
-        map.fitBounds(bounds);
-      }
-
-      if (options.callback) {
-        options.callback(bounds);
-      }
+      if (options.zoom) map.fitBounds(objectLayer.getBounds());
+      if (options.callback) options.callback(objectLayer.getBounds());
 
       objectLayer.addTo(map);
     }