More refactoring of map js

[rails.git] / app / assets / javascripts / map.js.erb

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);
     }