Changeset boundary is enlarged if it was on a single point

[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 dfec793f6494c6cf219f1b0c2bd8bf1526134913..71a94aef0d1ca014d446fa59c8a4ebeaa74c4038 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("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()
@@ -57,7 +62,7 @@ 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();
       }
@@ -92,9 +97,17 @@ OSM.History = function(map) {
     $("[data-changeset]").each(function () {
       var changeset = $(this).data('changeset');
       if (changeset.bbox) {
+        var latModifier = 0;
+        var lonModifier = 0;
+
+        if (changeset.bbox.minlat === changeset.bbox.maxlat || changeset.bbox.minlon === changeset.bbox.maxlon) {
+          latModifier = 0.0001;
+          lonModifier = 0.0002;
+        }
+
         changeset.bounds = L.latLngBounds(
-          [changeset.bbox.minlat, changeset.bbox.minlon],
-          [changeset.bbox.maxlat, changeset.bbox.maxlon]);
+          [changeset.bbox.minlat - latModifier, changeset.bbox.minlon - lonModifier],
+          [changeset.bbox.maxlat + latModifier, changeset.bbox.maxlon + lonModifier]);
         changesets.push(changeset);
       }
     });
@@ -126,7 +139,7 @@ OSM.History = function(map) {
     map.addLayer(group);
 
     if (window.location.pathname === '/history') {
-      map.on("moveend", update)
+      map.on("moveend", update);
     }
 
     update();
@@ -134,10 +147,7 @@ OSM.History = function(map) {
 
   page.unload = function() {
     map.removeLayer(group);
-
-    if (window.location.pathname === '/history') {
-      map.off("moveend", update)
-    }
+    map.off("moveend", update);
 
     $("#history_tab").removeClass("current");
   };