X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/de5a225a95125db1a66d6dfbaa3a790db9719c18..dc931c4ac47b340c9a2a8d855fa57a290e838260:/app/assets/javascripts/browse.js?ds=sidebyside diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js index 2d9c4b46f..565af41af 100644 --- a/app/assets/javascripts/browse.js +++ b/app/assets/javascripts/browse.js @@ -8,10 +8,6 @@ $(document).ready(function () { 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,13 +57,14 @@ $(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(); - if (extent) { + if (extent && extent.isValid()) { + $("#browse_map .secondary-actions").show(); + $("a.bbox[data-editor=remote]").click(function () { return remoteEditHandler(extent); }); @@ -83,13 +77,8 @@ $(document).ready(function () { $("#object_edit").show(); updatelinks(map.getCenter(), 16, null, extent, object); - } else { - $("#small_map").hide(); } } }); } - - createMenu("area_edit", "area_edit_menu", "right"); - createMenu("object_edit", "object_edit_menu", "right"); });