Add SotM ads

[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 9900935701f6511155ad78c322538e087a357255..8591e260a10b830480ffd5a963ed11db2a52877b 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 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) {
@@ -184,13 +189,13 @@ function getMapBaseLayer() {
 }
 
 function getMapLayers() {
+  var layerConfig = "";
   for (var i = 0; i < layers.length; i++) {
     if (map.hasLayer(layers[i].layer)) {
-      return layers[i].layerCode;
+      layerConfig += layers[i].layerCode;
     }
   }
-
-  return "";
+  return layerConfig;
 }
 
 function setMapLayers(layerConfig) {