From: Tom Hughes <tom@compton.nu>
Date: Sat, 27 Apr 2013 10:15:32 +0000 (+0100)
Subject: Cancel any existing object load before starting a new one
X-Git-Tag: live~5047
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/899dab08f91e0b6b175105c4e419000f8649f91c

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 990093570..48fd35d0e 100644
--- 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 objectLoader;
 
 var layers = [
   {
@@ -129,11 +130,15 @@ function getUserIcon(url) {
 }
 
 function addObjectToMap(object, zoom, callback) {
+  if (objectLoader) {
+    objectLoader.abort();
+  }
+
   if (objectLayer) {
     map.removeLayer(objectLayer);
   }
 
-  $.ajax({
+  objectLoader = $.ajax({
     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {