CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-20 01:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move OSM tile fetch callback to a named function

Browse Source
This commit is contained in:
Quincy Morgan
2020-01-16 10:29:17 -05:00
parent 37351e0f50
commit d6419ca791
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/services/osm.js
View File

@@ -991,24 +991,26 @@ export default {
_tileCache.inflight[tile.id] = this.loadFromAPI(
path + tile.extent.toParam(),
function(err, parsed) {
delete _tileCache.inflight[tile.id];
if (!err) {
delete _tileCache.toLoad[tile.id];
_tileCache.loaded[tile.id] = true;
var bbox = tile.extent.bbox();
bbox.id = tile.id;
_tileCache.rtree.insert(bbox);
}
if (callback) {
callback(err, Object.assign({ data: parsed }, tile));
}
if (!hasInflightRequests(_tileCache)) {
dispatch.call('loaded'); // stop the spinner
}
},
tileCallback,
options
);
function tileCallback(err, parsed) {
delete _tileCache.inflight[tile.id];
if (!err) {
delete _tileCache.toLoad[tile.id];
_tileCache.loaded[tile.id] = true;
var bbox = tile.extent.bbox();
bbox.id = tile.id;
_tileCache.rtree.insert(bbox);
}
if (callback) {
callback(err, Object.assign({ data: parsed }, tile));
}
if (!hasInflightRequests(_tileCache)) {
dispatch.call('loaded'); // stop the spinner
}
}
},