X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d84b81fd953e7a9965330c67f3e42701000fb19..fa339033e1f00f4f3e2b9c790c5100a863cf91ac:/app/assets/javascripts/browse.js?ds=sidebyside diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js index a5738e1ba..11818a171 100644 --- a/app/assets/javascripts/browse.js +++ b/app/assets/javascripts/browse.js @@ -1,36 +1,18 @@ $(document).ready(function () { - function remoteEditHandler(bbox, select) { - 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; }); - - if (select) { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select); - } else { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom); - } - - setTimeout(function () { - if (!loaded) alert(I18n.t('site.index.remote_failed')); - }, 1000); - return false; - } + var map = L.map("small_map", { + attributionControl: false, + zoomControl: false + }).addLayer(new L.OSM.Mapnik()); - var map = createMap("small_map", { - layerControl: false, - panZoomControl: false, - attributionControl: false - }); + L.OSM.zoom() + .addTo(map); var params = $("#small_map").data(); + var object, bbox; if (params.type == "changeset") { - var bbox = L.latLngBounds([params.minlat, params.minlon], - [params.maxlat, params.maxlon]); + bbox = L.latLngBounds([params.minlat, params.minlon], + [params.maxlat, params.maxlon]); map.fitBounds(bbox); @@ -41,49 +23,45 @@ $(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); }); - var centre = bbox.getCenter(); - updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat); + updatelinks(map.getCenter(), 16, null, [[params.minlat, params.minlon], + [params.maxlat, params.maxlon]]); } else if (params.type == "note") { - var object = {type: params.type, id: params.id}; + object = {type: params.type, id: params.id}; map.setView([params.lat, params.lon], 16); L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map); - var bbox = map.getBounds(); + 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.lon, params.lat, 16, null, - bbox.getWest(), bbox.getSouth(), - bbox.getEast(), bbox.getNorth(), - object); + updatelinks(params, 16, null, bbox, object); } else { - $("#object_larger_map").hide(); - $("#object_edit").hide(); + $("#object_larger_map, #object_edit").hide(); - var object = {type: params.type, id: params.id}; + object = {type: params.type, id: params.id}; if (!params.visible) { object.version = params.version - 1; } - addObjectToMap(object, { - 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 () { @@ -97,22 +75,11 @@ $(document).ready(function () { $("#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); + 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"); });