Fix "in bounds" test in updateData

[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 75b02ec07066e1b484a2fa0d739e7bd0ad822cb8..cd012ee160275e896e73b6cdcc9dff263957f10d 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -43,10 +43,16 @@ OSM.History = function(map) {
   }
 
   function loadData() {
   }
 
   function loadData() {

+    var data = {};
+
+    if (window.location.pathname === '/history') {
+      data = {bbox: map.getBounds().wrap().toBBoxString()};
+    }
+

     $.ajax({
       url: window.location.pathname,
       method: "GET",
     $.ajax({
       url: window.location.pathname,
       method: "GET",

-      data: {bbox: map.getBounds().wrap().toBBoxString()},
+      data: data,

       success: function(html, status, xhr) {
         $('#sidebar_content .changesets').html(html);
         updateMap();
       success: function(html, status, xhr) {
         $('#sidebar_content .changesets').html(html);
         updateMap();


@@ -95,6 +101,11 @@ OSM.History = function(map) {
       rect.id = changeset.id;
       rect.addTo(group);
     }
       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) {
   }
 
   page.pushstate = page.popstate = function(path) {


@@ -103,19 +114,22 @@ OSM.History = function(map) {
   };
 
   page.load = function() {
   };
 
   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() {
 
     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");
   };
 
     $("#history_tab").removeClass("current");
   };