Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into...

[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 d98179d8ad03bdd0e14509688a8d38d6a75d19f2..9babb6e3225689d6854a783620324c20d9d69dfd 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,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);
       }
     });
@@ -126,7 +147,7 @@ OSM.History = function(map) {
     map.addLayer(group);
 
     if (window.location.pathname === '/history') {
-      map.on("moveend", update)
+      map.on("moveend", update);
     }
 
     update();