Merge remote-tracking branch 'osmlab/id-default'

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index c39e8382c6dc8d1ab445bfcf97770614cee3f0f5..11818a1712c513421221455c2c3f209c488b7c01 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -5,13 +5,9 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
-  $("#small_map").on("resized", function () {
-    map.invalidateSize();
-  });
-
   var params = $("#small_map").data();
   var object, bbox;
   if (params.type == "changeset") {
@@ -27,7 +23,7 @@ $(document).ready(function () {
     }).addTo(map);
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
@@ -45,16 +41,13 @@ $(document).ready(function () {
     bbox = map.getBounds();
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
     });
 
-    updatelinks(params, 16, null,
-                bbox.getWest(), bbox.getSouth(),
-                bbox.getEast(), bbox.getNorth(),
-                object);
+    updatelinks(params, 16, null, bbox, object);
   } else {
     $("#object_larger_map, #object_edit").hide();
 
@@ -64,11 +57,11 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, map, {
-      zoom: true, 
+    map.addObject(object, {
+      zoom: true,
       callback: function(extent) {
         $("#loading").hide();
-        $("#browse_map .geolink").show();
+        $("#browse_map .secondary-actions").show();
 
         if (extent) {
           $("a.bbox[data-editor=remote]").click(function () {
@@ -89,7 +82,4 @@ $(document).ready(function () {
       }
     });
   }
-
-  createMenu("area_edit", "area_edit_menu", "right");
-  createMenu("object_edit", "object_edit_menu", "right");
 });