Converted to dot notation - fixes jshint

[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 8103f047ed5d054e29c0a65fb27c2654150a965b..3fcc2f79054faeaa05840971500b388613e9e6c8 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,29 @@ 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 minProjection = map.project(L.latLng(changeset.bbox.minlat, changeset.bbox.minlon)),
+            maxProjection = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
+            xGap = maxProjection.x - minProjection.x,
+            yGap = minProjection.y - maxProjection.y,
+            minXGap = 40,  // Min width/height of changeset in pixels
+            minYGap = 40;
+
+        if (xGap < minXGap) {
+          minProjection.x -= ((minXGap - xGap) / 2);
+          maxProjection.x += ((minXGap - xGap) / 2);
+        }
+
+        if (yGap < minYGap) {
+          minProjection.y += ((minYGap - yGap) / 2);
+          maxProjection.y -= ((minYGap - yGap) / 2);
+        }
+
+        var minUnProjection = map.unproject(minProjection),
+            maxUnProjection = map.unproject(maxProjection),
+            bounds = [minUnProjection,
+                      maxUnProjection];
+
+        changeset.bounds = L.latLngBounds(bounds);
         changesets.push(changeset);
       }
     });