X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/77b4ff6ceb81a326b7ed3c80cf5d65ec2a2b18d5..420a7289a0b08eee091f6650c2e83166df3fbe69:/app/assets/javascripts/index/history.js

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index db342cc24..9babb6e32 100644
--- 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("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()
@@ -46,7 +51,7 @@ OSM.History = function(map) {
     $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 
-  function loadData() {
+  function update() {
     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,
-      success: function(html, status, xhr) {
+      success: function(html) {
         $('#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) {
@@ -87,9 +97,25 @@ OSM.History = function(map) {
     $("[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]);
+        var latWidth = changeset.bbox.maxlat - changeset.bbox.minlat,
+            lonWidth = changeset.bbox.maxlon - changeset.bbox.minlon,
+            minLatWidth = 0.0004,
+            minLonWidth = 0.0008;
+
+        var bounds = [[changeset.bbox.minlat, changeset.bbox.minlon],
+                      [changeset.bbox.maxlat, changeset.bbox.maxlon]];
+
+        if (latWidth < minLatWidth) {
+          bounds[0][0] -= ((minLatWidth - latWidth) / 2);
+          bounds[1][0] += ((minLatWidth - latWidth) / 2);
+        }
+
+        if (lonWidth < minLonWidth) {
+          bounds[0][1] -= ((minLonWidth - lonWidth) / 2);
+          bounds[1][1] += ((minLonWidth - lonWidth) / 2);
+        }
+
+        changeset.bounds = L.latLngBounds(bounds);
         changesets.push(changeset);
       }
     });
@@ -121,18 +147,15 @@ OSM.History = function(map) {
     map.addLayer(group);
 
     if (window.location.pathname === '/history') {
-      map.on("moveend", loadData)
+      map.on("moveend", update);
     }
 
-    loadData();
+    update();
   };
 
   page.unload = function() {
     map.removeLayer(group);
-
-    if (window.location.pathname === '/history') {
-      map.off("moveend", loadData)
-    }
+    map.off("moveend", update);
 
     $("#history_tab").removeClass("current");
   };