X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47a75be1c724bd450cf34da94863f62cb5d8b545..c75d725893c78175f27af02804e69e181df47ad7:/app/assets/javascripts/browse.js diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js index f911783b5..24fe5171e 100644 --- a/app/assets/javascripts/browse.js +++ b/app/assets/javascripts/browse.js @@ -1,9 +1,9 @@ $(document).ready(function () { function remoteEditHandler(bbox, select) { - var left = bbox.getWestLng() - 0.0001; - var top = bbox.getNorthLat() + 0.0001; - var right = bbox.getEastLng() + 0.0001; - var bottom = bbox.getSouthLat() - 0.0001; + var left = bbox.getWest() - 0.0001; + var top = bbox.getNorth() + 0.0001; + var right = bbox.getEast() + 0.0001; + var bottom = bbox.getSouth() - 0.0001; var loaded = false; $("#linkloader").load(function () { loaded = true; }); @@ -60,9 +60,9 @@ $(document).ready(function () { return remoteEditHandler(bbox); }); - updatelinks(params.lon, params.lat, 16, null, - bbox.getWestLng(), bbox.getSouthLat(), - bbox.getEastLng(), bbox.getNorthLat(), + updatelinks(params.lon, params.lat, 16, null, + bbox.getWest(), bbox.getSouth(), + bbox.getEast(), bbox.getNorth(), object); } else { $("#object_larger_map").hide(); @@ -74,33 +74,36 @@ $(document).ready(function () { object.version = params.version - 1; } - addObjectToMap(object, true, function(extent) { - $("#loading").hide(); - $("#browse_map .geolink").show(); - - if (extent) { - $("a.bbox[data-editor=remote]").click(function () { - return remoteEditHandler(extent); - }); - - $("a.object[data-editor=remote]").click(function () { - return remoteEditHandler(extent, params.type + params.id); - }); - - $("#object_larger_map").show(); - $("#object_edit").show(); - - var centre = extent.getCenter(); - updatelinks(centre.lng, - centre.lat, - 16, null, - extent.getWestLng(), - extent.getSouthLat(), - extent.getEastLng(), - extent.getNorthLat(), - object); - } else { - $("#small_map").hide(); + addObjectToMap(object, { + zoom: true, + callback: function(extent) { + $("#loading").hide(); + $("#browse_map .geolink").show(); + + if (extent) { + $("a.bbox[data-editor=remote]").click(function () { + return remoteEditHandler(extent); + }); + + $("a.object[data-editor=remote]").click(function () { + return remoteEditHandler(extent, params.type + params.id); + }); + + $("#object_larger_map").show(); + $("#object_edit").show(); + + var centre = extent.getCenter(); + updatelinks(centre.lng, + centre.lat, + 16, null, + extent.getWest(), + extent.getSouth(), + extent.getEast(), + extent.getNorth(), + object); + } else { + $("#small_map").hide(); + } } }); }