From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Nov 2018 14:50:14 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2009'
X-Git-Tag: live~3334
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/efd50cd529990069dc1ca95f66ec6f61471fe29d?hp=-c

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

efd50cd529990069dc1ca95f66ec6f61471fe29d
diff --combined app/assets/javascripts/index/history.js
index 6274c135f,0b98237d8..38d0b249a
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@@ -38,12 -38,12 +38,12 @@@ OSM.History = function(map) 
    };
  
    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");
    }
  
@@@ -89,30 -89,19 +89,30 @@@
      });
    }
  
 -  function updateMap() {
 +  var changesets = [];
 +
 +  function updateBounds() {
      group.clearLayers();
  
 -    var changesets = [];
 +    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 (width < minSize) {
 +        bottomLeft.x -= ((minSize - width) / 2);
 +        topRight.x += ((minSize - width) / 2);
 +      }
  
 -    $("[data-changeset]").each(function () {
 -      var changeset = $(this).data('changeset');
 -      if (changeset.bbox) {
 -        changeset.bounds = L.latLngBounds(
 -          [changeset.bbox.minlat, changeset.bbox.minlon],
 -          [changeset.bbox.maxlat, changeset.bbox.maxlon]);
 -        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) {
@@@ -122,20 -111,10 +122,20 @@@
      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);
      }
 +  }
 +
 +  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();
@@@ -155,8 -134,6 +155,8 @@@
        map.on("moveend", update);
      }
  
 +    map.on("zoomend", updateBounds);
 +
      update();
    };