From d6419ca7916a6f396d1908b9078bec4410c6339c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 16 Jan 2020 10:29:17 -0500 Subject: [PATCH] Move OSM tile fetch callback to a named function --- modules/services/osm.js | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/modules/services/osm.js b/modules/services/osm.js index 336e131ec..082a84ea5 100644 --- a/modules/services/osm.js +++ b/modules/services/osm.js @@ -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 + } + } },