Merge remote-tracking branch 'upstream/pull/2296'

[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 9babb6e3225689d6854a783620324c20d9d69dfd..80fb68444f6469ee4e41e03d2f09654a337dfe12 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -1,6 +1,6 @@
 //= require jquery.simulate
 
-OSM.History = function(map) {
+OSM.History = function (map) {
   var page = {};
 
   $("#sidebar_content")
@@ -13,13 +13,15 @@ OSM.History = function(map) {
     })
     .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;
-      });
+      $(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()
@@ -33,17 +35,17 @@ OSM.History = function(map) {
       clickChangeset(e.layer.id, e);
     });
 
-  group.getLayerId = function(layer) {
+  group.getLayerId = function (layer) {
     return layer.id;
   };
 
   function highlightChangeset(id) {
-    group.getLayer(id).setStyle({fillOpacity: 0.3});
+    group.getLayer(id).setStyle({ fillOpacity: 0.3, color: "#FF6600", weight: 3 });
     $("#changeset_" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {
-    group.getLayer(id).setStyle({fillOpacity: 0});
+    group.getLayer(id).setStyle({ fillOpacity: 0, color: "#FF9500", weight: 2 });
     $("#changeset_" + id).removeClass("selected");
   }
 
@@ -52,9 +54,9 @@ OSM.History = function(map) {
   }
 
   function update() {
-    var data = {list: '1'};
+    var data = { list: "1" };
 
-    if (window.location.pathname === '/history') {
+    if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();
     }
 
@@ -62,16 +64,16 @@ OSM.History = function(map) {
       url: window.location.pathname,
       method: "GET",
       data: data,
-      success: function(html) {
-        $('#sidebar_content .changesets').html(html);
+      success: function (html) {
+        $("#sidebar_content .changesets").html(html);
         updateMap();
       }
     });
 
-    var feedLink = $('link[type="application/atom+xml"]'),
-      feedHref = feedLink.attr('href').split('?')[0];
+    var feedLink = $("link[type=\"application/atom+xml\"]"),
+        feedHref = feedLink.attr("href").split("?")[0];
 
-    feedLink.attr('href', feedHref + '?bbox=' + data.bbox);
+    feedLink.attr("href", feedHref + "?bbox=" + data.bbox);
   }
 
   function loadMore(e) {
@@ -83,41 +85,36 @@ OSM.History = function(map) {
     $(this).hide();
     div.find(".loader").show();
 
-    $.get($(this).attr("href"), function(data) {
+    $.get($(this).attr("href"), function (data) {
       div.replaceWith(data);
       updateMap();
     });
   }
 
-  function updateMap() {
-    group.clearLayers();
-
-    var changesets = [];
-
-    $("[data-changeset]").each(function () {
-      var changeset = $(this).data('changeset');
-      if (changeset.bbox) {
-        var latWidth = changeset.bbox.maxlat - changeset.bbox.minlat,
-            lonWidth = changeset.bbox.maxlon - changeset.bbox.minlon,
-            minLatWidth = 0.0004,
-            minLonWidth = 0.0008;
+  var changesets = [];
 
-        var bounds = [[changeset.bbox.minlat, changeset.bbox.minlon],
-                      [changeset.bbox.maxlat, changeset.bbox.maxlon]];
+  function updateBounds() {
+    group.clearLayers();
 
-        if (latWidth < minLatWidth) {
-          bounds[0][0] -= ((minLatWidth - latWidth) / 2);
-          bounds[1][0] += ((minLatWidth - latWidth) / 2);
-        }
+    changesets.forEach(function (changeset) {
+      var bottomLeft = map.project(L.latLng(changeset.bbox.minlat, changeset.bbox.minlon)),
+          topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
+          width = topRight.x - bottomLeft.x,
+          height = bottomLeft.y - topRight.y,
+          minSize = 20; // Min width/height of changeset in pixels
 
-        if (lonWidth < minLonWidth) {
-          bounds[0][1] -= ((minLonWidth - lonWidth) / 2);
-          bounds[1][1] += ((minLonWidth - lonWidth) / 2);
-        }
+      if (width < minSize) {
+        bottomLeft.x -= ((minSize - width) / 2);
+        topRight.x += ((minSize - width) / 2);
+      }
 
-        changeset.bounds = L.latLngBounds(bounds);
-        changesets.push(changeset);
+      if (height < minSize) {
+        bottomLeft.y += ((minSize - height) / 2);
+        topRight.y -= ((minSize - height) / 2);
       }
+
+      changeset.bounds = L.latLngBounds(map.unproject(bottomLeft),
+                                        map.unproject(topRight));
     });
 
     changesets.sort(function (a, b) {
@@ -126,34 +123,46 @@ OSM.History = function(map) {
 
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
-        rect = L.rectangle(changeset.bounds,
-          {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0});
+          rect = L.rectangle(changeset.bounds,
+                             { weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0 });
       rect.id = changeset.id;
       rect.addTo(group);
     }
+  }
+
+  function updateMap() {
+    changesets = $("[data-changeset]").map(function (index, element) {
+      return $(element).data("changeset");
+    }).get().filter(function (changeset) {
+      return changeset.bbox;
+    });
+
+    updateBounds();
 
-    if (window.location.pathname !== '/history') {
+    if (window.location.pathname !== "/history") {
       var bounds = group.getBounds();
       if (bounds.isValid()) map.fitBounds(bounds);
     }
   }
 
-  page.pushstate = page.popstate = function(path) {
+  page.pushstate = page.popstate = function (path) {
     $("#history_tab").addClass("current");
     OSM.loadSidebarContent(path, page.load);
   };
 
-  page.load = function() {
+  page.load = function () {
     map.addLayer(group);
 
-    if (window.location.pathname === '/history') {
+    if (window.location.pathname === "/history") {
       map.on("moveend", update);
     }
 
+    map.on("zoomend", updateBounds);
+
     update();
   };
 
-  page.unload = function() {
+  page.unload = function () {
     map.removeLayer(group);
     map.off("moveend", update);