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 f63cee25045af6fd0c2762275fb4a271675c9ba0..cd012ee160275e896e73b6cdcc9dff263957f10d 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -29,7 +29,7 @@ OSM.History = function(map) {
   };
 
   function highlightChangeset(id) {
   };
 
   function highlightChangeset(id) {

-    group.getLayer(id).setStyle({fillOpacity: 0.5});
+    group.getLayer(id).setStyle({fillOpacity: 0.3});

     $("#changeset_" + id).addClass("selected");
   }
 
     $("#changeset_" + id).addClass("selected");
   }
 


@@ -43,11 +43,17 @@ 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().toBBoxString()},
-      success: function(html) {
+      data: data,
+      success: function(html, status, xhr) {

         $('#sidebar_content .changesets').html(html);
         updateMap();
       }
         $('#sidebar_content .changesets').html(html);
         updateMap();
       }


@@ -91,33 +97,39 @@ OSM.History = function(map) {
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
         rect = L.rectangle(changeset.bounds,
     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);
     }
       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");
   }
 
   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() {
   };
 
   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");
   };