cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More refactoring of map js

Browse source
This commit is contained in:
Tom MacWright 2013-06-10 14:10:18 -07:00 • committed by John Firebaugh
parent b9a19ab23a
commit 7c06f2b47e
2 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/map.js.erb
View file

@ -59,13 +59,8 @@ function getUserIcon(url) {
}
function addObjectToMap(object, map, options) {
if (objectLoader) {
objectLoader.abort();
}
if (objectLayer) {
map.removeLayer(objectLayer);
}
if (objectLoader) objectLoader.abort();
if (objectLayer) map.removeLayer(objectLayer);
objectLoader = $.ajax({
url: OSM.apiUrl(object),
@ -93,15 +88,8 @@ function addObjectToMap(object, map, options) {
objectLayer.addData(xml);
var bounds = objectLayer.getBounds();
if (options.zoom) {
map.fitBounds(bounds);
}
if (options.callback) {
options.callback(bounds);
}
if (options.zoom) map.fitBounds(objectLayer.getBounds());
if (options.callback) options.callback(objectLayer.getBounds());
objectLayer.addTo(map);
}