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 876aeb193d46924a670ee0175cf8881964ddcc02..c4f75848279f29e931ac37f6beb43ae0c2cc43d9 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -61,38 +61,54 @@ $(document).ready(function () {
         opacity: 0.7
       });
 
         opacity: 0.7
       });
 

-      marker.addTo(noteLayer).bindPopup(popupContent);
+      marker.addTo(noteLayer).bindPopup(popupContent, popupOptions());

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

 
 

-        notes = {};
+      noteLoader = $.ajax({
+        url: url,
+        success: function (json) {
+          var oldNotes = notes;

 
 

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

 
 

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

 
 

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

 
 

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

         }
         }

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

   };
 
   };
 

+  function popupOptions() {
+    var mapSize = map.getSize();
+
+    return { maxHeight: mapSize.y * 2 / 3, autoPanPadding: new L.Point(60, 40) };
+  }
+

   function createPopupContent(marker, properties) {
     var content = $(JST["templates/notes/show"]({ note: properties }));
 
   function createPopupContent(marker, properties) {
     var content = $(JST["templates/notes/show"]({ note: properties }));
 


@@ -158,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(), {


@@ -173,7 +191,7 @@ $(document).ready(function () {
       createNote(marker, e.target.form, $(e.target).data("url"));
     });
 
       createNote(marker, e.target.form, $(e.target).data("url"));
     });
 

-    marker.addTo(noteLayer).bindPopup(popupContent[0]).openPopup();
+    marker.addTo(noteLayer).bindPopup(popupContent[0], popupOptions()).openPopup();

 
     $(".leaflet-popup-close-button").on("click.close", function (e) {
       map.removeLayer(marker);
 
     $(".leaflet-popup-close-button").on("click.close", function (e) {
       map.removeLayer(marker);