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

[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 4f03de06dc35b95070d78f8e5c55d24d30aca8dc..80fb68444f6469ee4e41e03d2f09654a337dfe12 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -1,6 +1,6 @@
 //= require jquery.simulate
 
 //= require jquery.simulate
 

-OSM.History = function(map) {
+OSM.History = function (map) {

   var page = {};
 
   $("#sidebar_content")
   var page = {};
 
   $("#sidebar_content")


@@ -13,13 +13,15 @@ OSM.History = function(map) {
     })
     .on("mousedown", "[data-changeset]", function () {
       var moved = false;
     })
     .on("mousedown", "[data-changeset]", function () {
       var moved = false;

-      $(this).one("click", function (e) {
-        if (!moved && !$(e.target).is("a")) {
-          clickChangeset($(this).data("changeset").id, e);
-        }
-      }).one("mousemove", function () {
-        moved = true;
-      });
+      $(this)
+        .one("click", function (e) {
+          if (!moved && !$(e.target).is("a")) {
+            clickChangeset($(this).data("changeset").id, e);
+          }
+        })
+        .one("mousemove", function () {
+          moved = true;
+        });

     });
 
   var group = L.featureGroup()
     });
 
   var group = L.featureGroup()


@@ -33,17 +35,17 @@ OSM.History = function(map) {
       clickChangeset(e.layer.id, e);
     });
 
       clickChangeset(e.layer.id, e);
     });
 

-  group.getLayerId = function(layer) {
+  group.getLayerId = function (layer) {

     return layer.id;
   };
 
   function highlightChangeset(id) {
     return layer.id;
   };
 
   function highlightChangeset(id) {

-    group.getLayer(id).setStyle({fillOpacity: 0.3, color: "#FF6600", weight: 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, color: "#FF9500", weight: 2});
+    group.getLayer(id).setStyle({ fillOpacity: 0, color: "#FF9500", weight: 2 });

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


@@ -52,7 +54,7 @@ OSM.History = function(map) {
   }
 
   function update() {
   }
 
   function update() {

-    var data = {list: "1"};
+    var data = { list: "1" };

 
     if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();
 
     if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();


@@ -62,14 +64,14 @@ OSM.History = function(map) {
       url: window.location.pathname,
       method: "GET",
       data: data,
       url: window.location.pathname,
       method: "GET",
       data: data,

-      success: function(html) {
+      success: function (html) {

         $("#sidebar_content .changesets").html(html);
         updateMap();
       }
     });
 
     var feedLink = $("link[type=\"application/atom+xml\"]"),
         $("#sidebar_content .changesets").html(html);
         updateMap();
       }
     });
 
     var feedLink = $("link[type=\"application/atom+xml\"]"),

-      feedHref = feedLink.attr("href").split("?")[0];
+        feedHref = feedLink.attr("href").split("?")[0];

 
     feedLink.attr("href", feedHref + "?bbox=" + data.bbox);
   }
 
     feedLink.attr("href", feedHref + "?bbox=" + data.bbox);
   }


@@ -83,7 +85,7 @@ OSM.History = function(map) {
     $(this).hide();
     div.find(".loader").show();
 
     $(this).hide();
     div.find(".loader").show();
 

-    $.get($(this).attr("href"), function(data) {
+    $.get($(this).attr("href"), function (data) {

       div.replaceWith(data);
       updateMap();
     });
       div.replaceWith(data);
       updateMap();
     });


@@ -94,12 +96,12 @@ OSM.History = function(map) {
   function updateBounds() {
     group.clearLayers();
 
   function updateBounds() {
     group.clearLayers();
 

-    changesets.forEach(function(changeset) {
+    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,
       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
+          minSize = 20; // Min width/height of changeset in pixels

 
       if (width < minSize) {
         bottomLeft.x -= ((minSize - width) / 2);
 
       if (width < minSize) {
         bottomLeft.x -= ((minSize - width) / 2);


@@ -121,15 +123,15 @@ OSM.History = function(map) {
 
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
 
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],

-        rect = L.rectangle(changeset.bounds,
-          {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0});
+          rect = L.rectangle(changeset.bounds,
+                             { weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0 });

       rect.id = changeset.id;
       rect.addTo(group);
     }
   }
 
   function updateMap() {
       rect.id = changeset.id;
       rect.addTo(group);
     }
   }
 
   function updateMap() {

-    changesets = $("[data-changeset]").map(function (index,element) {
+    changesets = $("[data-changeset]").map(function (index, element) {

       return $(element).data("changeset");
     }).get().filter(function (changeset) {
       return changeset.bbox;
       return $(element).data("changeset");
     }).get().filter(function (changeset) {
       return changeset.bbox;


@@ -143,12 +145,12 @@ OSM.History = function(map) {
     }
   }
 
     }
   }
 

-  page.pushstate = page.popstate = function(path) {
+  page.pushstate = page.popstate = function (path) {

     $("#history_tab").addClass("current");
     OSM.loadSidebarContent(path, page.load);
   };
 
     $("#history_tab").addClass("current");
     OSM.loadSidebarContent(path, page.load);
   };
 

-  page.load = function() {
+  page.load = function () {

     map.addLayer(group);
 
     if (window.location.pathname === "/history") {
     map.addLayer(group);
 
     if (window.location.pathname === "/history") {


@@ -160,7 +162,7 @@ OSM.History = function(map) {
     update();
   };
 
     update();
   };
 

-  page.unload = function() {
+  page.unload = function () {

     map.removeLayer(group);
     map.off("moveend", update);
 
     map.removeLayer(group);
     map.off("moveend", update);