Clean up some of the map JS, reduce scope of globals

[rails.git] / app / assets / javascripts / changeset.js

diff --git a/app/assets/javascripts/changeset.js b/app/assets/javascripts/changeset.js
index 152b3b4f77f4636f470ff216cf397ecef660a6df..7f21ae7440d1386b78269299e22b023621adf307 100644 (file)
--- a/app/assets/javascripts/changeset.js
+++ b/app/assets/javascripts/changeset.js
@@ -1,6 +1,18 @@
 $(document).ready(function () {
   var changesets = [], rects = {};
-  var map = createMap("changeset_list_map");
+
+  var map = L.map("changeset_list_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#changeset_list_map").on("resized", function () {
+    map.invalidateSize();
+  });
+
   var group = L.featureGroup().addTo(map);
 
   $("[data-changeset]").each(function () {
@@ -27,12 +39,12 @@ $(document).ready(function () {
 
   function highlightChangeset(id) {
     rects[id].setStyle({fillOpacity: 0.5});
-    $("#tr-changeset-" + id).addClass("selected");
+    $("#changeset_" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {
     rects[id].setStyle({fillOpacity: 0});
-    $("#tr-changeset-" + id).removeClass("selected");
+    $("#changeset_" + id).removeClass("selected");
   }
 
   group.on({
@@ -53,6 +65,14 @@ $(document).ready(function () {
     }
   });
 
+  $(window).scroll(function() {
+        if ($(window).scrollTop() > $('.content-heading').outerHeight() + $('#top-bar').outerHeight() ) {
+            $('#changeset_list_map_wrapper').addClass('scrolled');
+        } else {
+            $('#changeset_list_map_wrapper').removeClass('scrolled');
+        }
+  });
+
   var params = OSM.mapParams();
   if (params.bbox) {
     map.fitBounds([[params.minlat, params.minlon],