Support legacy bbox param on /history as well

[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 f63cee25045af6fd0c2762275fb4a271675c9ba0..04f7c0731e613e03849963548eb2fd7e894d774a 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -9,7 +9,8 @@ OSM.History = function(map) {
     .on("mouseout", "[data-changeset]", function () {
       unHighlightChangeset($(this).data("changeset").id);
     })
-    .on("click", "[data-changeset]", function () {
+    .on("click", "[data-changeset]", function (e) {
+      e.preventDefault();
       clickChangeset($(this).data("changeset").id);
     });
 
@@ -29,7 +30,7 @@ OSM.History = function(map) {
   };
 
   function highlightChangeset(id) {
-    group.getLayer(id).setStyle({fillOpacity: 0.5});
+    group.getLayer(id).setStyle({fillOpacity: 0.3});
     $("#changeset_" + id).addClass("selected");
   }
 
@@ -39,15 +40,21 @@ OSM.History = function(map) {
   }
 
   function clickChangeset(id) {
-    OSM.route($("#changeset_" + id).find(".changeset_id").attr("href"));
+    OSM.router.route($("#changeset_" + id).find(".changeset_id").attr("href"));
   }
 
   function loadData() {
+    var data = {list: '1'};
+
+    if (window.location.pathname === '/history') {
+      data.bbox = map.getBounds().wrap().toBBoxString();
+    }
+
     $.ajax({
       url: window.location.pathname,
       method: "GET",
-      data: {bbox: map.getBounds().toBBoxString()},
-      success: function(html) {
+      data: data,
+      success: function(html, status, xhr) {
         $('#sidebar_content .changesets').html(html);
         updateMap();
       }
@@ -91,33 +98,39 @@ OSM.History = function(map) {
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
         rect = L.rectangle(changeset.bounds,
-          {weight: 2, color: "#ee9900", fillColor: "#ffff55", fillOpacity: 0});
+          {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0});
       rect.id = changeset.id;
       rect.addTo(group);
     }
+
+    if (window.location.pathname !== '/history') {
+      var bounds = group.getBounds();
+      if (bounds.isValid()) map.fitBounds(bounds);
+    }
   }
 
   page.pushstate = page.popstate = function(path) {
     $("#history_tab").addClass("current");
-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $("#sidebar_content").load(path, page.load);
+    OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function() {
-    map
-      .on("moveend", loadData)
-      .addLayer(group);
+    map.addLayer(group);
+
+    if (window.location.pathname === '/history') {
+      map.on("moveend", loadData)
+    }
 
     loadData();
   };
 
   page.unload = function() {
-    map
-      .off("moveend", loadData)
-      .removeLayer(group);
+    map.removeLayer(group);
+
+    if (window.location.pathname === '/history') {
+      map.off("moveend", loadData)
+    }
 
-    group.clearLayers();
     $("#history_tab").removeClass("current");
   };