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

[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 3fcc2f79054faeaa05840971500b388613e9e6c8..38d0b249ac23cecfd89363207785035f7dd30043 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -38,12 +38,12 @@ OSM.History = function(map) {
   };
 
   function highlightChangeset(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) {
     $("#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");
   }
 
     $("#changeset_" + id).removeClass("selected");
   }
 


@@ -89,39 +89,30 @@ OSM.History = function(map) {
     });
   }
 
     });
   }
 

-  function updateMap() {
+  var changesets = [];
+
+  function updateBounds() {

     group.clearLayers();
 
     group.clearLayers();
 

-    var changesets = [];
-
-    $("[data-changeset]").each(function () {
-      var changeset = $(this).data('changeset');
-      if (changeset.bbox) {
-        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);
-        }
+    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 (yGap < minYGap) {
-          minProjection.y += ((minYGap - yGap) / 2);
-          maxProjection.y -= ((minYGap - yGap) / 2);
-        }
-
-        var minUnProjection = map.unproject(minProjection),
-            maxUnProjection = map.unproject(maxProjection),
-            bounds = [minUnProjection,
-                      maxUnProjection];
+      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) {
     });
 
     changesets.sort(function (a, b) {


@@ -131,10 +122,20 @@ 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: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0});
+          {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0});

       rect.id = changeset.id;
       rect.addTo(group);
     }
       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') {
       var bounds = group.getBounds();
 
     if (window.location.pathname !== '/history') {
       var bounds = group.getBounds();


@@ -154,6 +155,8 @@ OSM.History = function(map) {
       map.on("moveend", update);
     }
 
       map.on("moveend", update);
     }
 

+    map.on("zoomend", updateBounds);
+

     update();
   };
 
     update();
   };