X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78f608b114c05f1147936a57b930831e28000c1a..d5356eb7d87b97d9562a035cf4ea70adbc5bef1b:/app/assets/javascripts/browse.js diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js index fb6d2d304..cde7c1276 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; }); @@ -43,14 +43,15 @@ $(document).ready(function () { }); var centre = bbox.getCenter(); - updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat); + updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat); } else if (params.type == "note") { - var centre = new OpenLayers.LonLat(params.lon, params.lat); + var object = {type: params.type, id: params.id}; + + map.setView([params.lat, params.lon], 16); - setMapCenter(centre, 16); - addMarkerToMap(centre); + L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map); - var bbox = unproj(map.getExtent()); + var bbox = map.getBounds(); $("#loading").hide(); $("#browse_map .geolink").show(); @@ -59,7 +60,10 @@ $(document).ready(function () { return remoteEditHandler(bbox); }); - updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top) + updatelinks(params.lon, params.lat, 16, null, + bbox.getWest(), bbox.getSouth(), + bbox.getEast(), bbox.getNorth(), + object); } else { $("#object_larger_map").hide(); $("#object_edit").hide(); @@ -90,10 +94,10 @@ $(document).ready(function () { updatelinks(centre.lng, centre.lat, 16, null, - extent.getWestLng(), - extent.getSouthLat(), - extent.getEastLng(), - extent.getNorthLat(), + extent.getWest(), + extent.getSouth(), + extent.getEast(), + extent.getNorth(), object); } else { $("#small_map").hide();