Merge branch 'master' into notes

[rails.git] / app / assets / javascripts / index / notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 154c6026df47f279cf3d92eab7bba7f8f1daaa7d..c4f75848279f29e931ac37f6beb43ae0c2cc43d9 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -67,36 +67,46 @@ $(document).ready(function () {
     return marker;
   }
 
     return marker;
   }
 

+  var noteLoader;
+

   function loadNotes() {
     var bounds = map.getBounds();
   function loadNotes() {
     var bounds = map.getBounds();

-    var url = "/api/" + OSM.API_VERSION + "/notes.json?bbox=" + bounds.toBBOX();
+    var size = bounds.getSize();

 
 

-    $.ajax({
-      url: url,
-      success: function (json) {
-        var oldNotes = notes;
+    if (size <= OSM.MAX_NOTE_REQUEST_AREA) {
+      var url = "/api/" + OSM.API_VERSION + "/notes.json?bbox=" + bounds.toBBOX();
+
+      if (noteLoader) noteLoader.abort();
+
+      noteLoader = $.ajax({
+        url: url,
+        success: function (json) {
+          var oldNotes = notes;
+
+          notes = {};

 
 

-        notes = {};
+          json.features.forEach(function (feature) {
+            var marker = oldNotes[feature.properties.id];

 
 

-        json.features.forEach(function (feature) {
-          var marker = oldNotes[feature.properties.id];
+            delete oldNotes[feature.properties.id];

 
 

-          delete oldNotes[feature.properties.id];
+            notes[feature.properties.id] = updateMarker(marker, feature);
+          });

 
 

-          notes[feature.properties.id] = updateMarker(marker, feature);
-        });
+          for (id in oldNotes) {
+            noteLayer.removeLayer(oldNotes[id]);
+          }

 
 

-        for (id in oldNotes) {
-          noteLayer.removeLayer(oldNotes[id]);
+          noteLoader = null;

         }
         }

-      }
-    });
+      });
+    }

   };
 
   function popupOptions() {
     var mapSize = map.getSize();
 
   };
 
   function popupOptions() {
     var mapSize = map.getSize();
 

-    return { maxHeight: mapSize.y * 2 / 3 };
+    return { maxHeight: mapSize.y * 2 / 3, autoPanPadding: new L.Point(60, 40) };

   }
 
   function createPopupContent(marker, properties) {
   }
 
   function createPopupContent(marker, properties) {


@@ -164,6 +174,8 @@ $(document).ready(function () {
   $("#createnoteanchor").click(function (e) {
     e.preventDefault();
 
   $("#createnoteanchor").click(function (e) {
     e.preventDefault();
 

+    if ($(e.target).hasClass("disabled")) return;
+

     map.addLayer(noteLayer);
 
     var marker = L.marker(map.getCenter(), {
     map.addLayer(noteLayer);
 
     var marker = L.marker(map.getCenter(), {