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

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 24fe5171e50968d2b3f6e78e567974375d0e5843..0b60778d63493666ab4a63b8e7f493b06e735d91 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -21,10 +21,16 @@ $(document).ready(function () {
     return false;
   }
 
-  var map = createMap("small_map", {
-    layerControl: false,
-    panZoomControl: false,
-    attributionControl: false
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#small_map").on("resized", function () {
+    map.invalidateSize();
   });
 
   var params = $("#small_map").data();
@@ -33,7 +39,12 @@ $(document).ready(function () {
                               [params.maxlat, params.maxlon]);
 
     map.fitBounds(bbox);
-    addBoxToMap(bbox);
+
+    L.rectangle(bbox, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);
 
     $("#loading").hide();
     $("#browse_map .geolink").show();
@@ -74,7 +85,7 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, {
+    addObjectToMap(object, map, {
       zoom: true, 
       callback: function(extent) {
         $("#loading").hide();