Calculate bounding box when deleting relations

[rails.git] / app / assets / javascripts / index / history.js

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index db342cc24cf846ef30ddf1da48f96be1d6f08bc1..6274c135feb9b5c5f19455901cfc78148d8a420c 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -11,10 +11,15 @@ OSM.History = function(map) {
     .on("mouseout", "[data-changeset]", function () {
       unHighlightChangeset($(this).data("changeset").id);
     })
     .on("mouseout", "[data-changeset]", function () {
       unHighlightChangeset($(this).data("changeset").id);
     })

-    .on("click", "[data-changeset]", function (e) {
-      if (!$(e.target).is('a')) {
-        clickChangeset($(this).data("changeset").id, e);
-      }
+    .on("mousedown", "[data-changeset]", function () {
+      var moved = false;
+      $(this).one("click", function (e) {
+        if (!moved && !$(e.target).is('a')) {
+          clickChangeset($(this).data("changeset").id, e);
+        }
+      }).one("mousemove", function () {
+        moved = true;
+      });

     });
 
   var group = L.featureGroup()
     });
 
   var group = L.featureGroup()


@@ -46,7 +51,7 @@ OSM.History = function(map) {
     $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 
     $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 

-  function loadData() {
+  function update() {

     var data = {list: '1'};
 
     if (window.location.pathname === '/history') {
     var data = {list: '1'};
 
     if (window.location.pathname === '/history') {


@@ -57,11 +62,16 @@ OSM.History = function(map) {
       url: window.location.pathname,
       method: "GET",
       data: data,
       url: window.location.pathname,
       method: "GET",
       data: data,

-      success: function(html, status, xhr) {
+      success: function(html) {

         $('#sidebar_content .changesets').html(html);
         updateMap();
       }
     });
         $('#sidebar_content .changesets').html(html);
         updateMap();
       }
     });

+
+    var feedLink = $('link[type="application/atom+xml"]'),
+      feedHref = feedLink.attr('href').split('?')[0];
+
+    feedLink.attr('href', feedHref + '?bbox=' + data.bbox);

   }
 
   function loadMore(e) {
   }
 
   function loadMore(e) {


@@ -79,19 +89,30 @@ OSM.History = function(map) {
     });
   }
 
     });
   }
 

-  function updateMap() {
+  var changesets = [];
+
+  function updateBounds() {

     group.clearLayers();
 
     group.clearLayers();
 

-    var changesets = [];
+    changesets.forEach(function(changeset) {
+      var bottomLeft = map.project(L.latLng(changeset.bbox.minlat, changeset.bbox.minlon)),
+          topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
+          width = topRight.x - bottomLeft.x,
+          height = bottomLeft.y - topRight.y,
+          minSize = 20;  // Min width/height of changeset in pixels

 
 

-    $("[data-changeset]").each(function () {
-      var changeset = $(this).data('changeset');
-      if (changeset.bbox) {
-        changeset.bounds = L.latLngBounds(
-          [changeset.bbox.minlat, changeset.bbox.minlon],
-          [changeset.bbox.maxlat, changeset.bbox.maxlon]);
-        changesets.push(changeset);
+      if (width < minSize) {
+        bottomLeft.x -= ((minSize - width) / 2);
+        topRight.x += ((minSize - width) / 2);

       }
       }

+
+      if (height < minSize) {
+        bottomLeft.y += ((minSize - height) / 2);
+        topRight.y -= ((minSize - height) / 2);
+      }
+
+      changeset.bounds = L.latLngBounds(map.unproject(bottomLeft),
+                                        map.unproject(topRight));

     });
 
     changesets.sort(function (a, b) {
     });
 
     changesets.sort(function (a, b) {


@@ -105,6 +126,16 @@ OSM.History = function(map) {
       rect.id = changeset.id;
       rect.addTo(group);
     }
       rect.id = changeset.id;
       rect.addTo(group);
     }

+  }
+
+  function updateMap() {
+    changesets = $("[data-changeset]").map(function (index,element) {
+      return $(element).data('changeset');
+    }).get().filter(function (changeset) {
+      return changeset.bbox;
+    });
+
+    updateBounds();

 
     if (window.location.pathname !== '/history') {
       var bounds = group.getBounds();
 
     if (window.location.pathname !== '/history') {
       var bounds = group.getBounds();


@@ -121,18 +152,17 @@ OSM.History = function(map) {
     map.addLayer(group);
 
     if (window.location.pathname === '/history') {
     map.addLayer(group);
 
     if (window.location.pathname === '/history') {

-      map.on("moveend", loadData)
+      map.on("moveend", update);

     }
 
     }
 

-    loadData();
+    map.on("zoomend", updateBounds);
+
+    update();

   };
 
   page.unload = function() {
     map.removeLayer(group);
   };
 
   page.unload = function() {
     map.removeLayer(group);

-
-    if (window.location.pathname === '/history') {
-      map.off("moveend", loadData)
-    }
+    map.off("moveend", update);

 
     $("#history_tab").removeClass("current");
   };
 
     $("#history_tab").removeClass("current");
   };