Cancel any existing object load before starting a new one

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 9900935701f6511155ad78c322538e087a357255..48fd35d0e7e4e0eaa19fdaf2072d35c921d1c0e4 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -50,6 +50,7 @@ L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
 
 var map;
 var objectLayer;
 
 var map;
 var objectLayer;

+var objectLoader;

 
 var layers = [
   {
 
 var layers = [
   {


@@ -129,11 +130,15 @@ function getUserIcon(url) {
 }
 
 function addObjectToMap(object, zoom, callback) {
 }
 
 function addObjectToMap(object, zoom, callback) {

+  if (objectLoader) {
+    objectLoader.abort();
+  }
+

   if (objectLayer) {
     map.removeLayer(objectLayer);
   }
 
   if (objectLayer) {
     map.removeLayer(objectLayer);
   }
 

-  $.ajax({
+  objectLoader = $.ajax({

     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {
     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {