X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e7ef10d4289501a04045e01ecf7fe9202c09eb4f..31c44617660dd6a483f1dbe9d407c6ae9915692a:/app/assets/javascripts/index/history.js

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index cb1f6f8d5..3fcc2f790 100644
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -62,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();
       }
@@ -97,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);
       }
     });