CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better spinner event management

Browse Source 
re: https://github.com/openstreetmap/iD/pull/5107#issuecomment-401617938
This commit is contained in:
Bryan Housel
2018-07-01 12:48:51 -04:00
parent f3d31f3075
commit 487ec9d837
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/osm.js
+9 -3
View File
@@ -665,7 +665,7 @@ export default {
s / 2 - projection.translate()[1]
];
// what tiles cover the view
// what tiles cover the view?
var tiler = d3_geoTile()
.scaleExtent([tilezoom, tilezoom])
.scale(s)
@@ -685,6 +685,8 @@ export default {
};
});
// remove inflight requests that no longer cover the view..
var hadRequests = !_isEmpty(cache.inflight);
_filter(cache.inflight, function(v, i) {
var wanted = _find(tiles, function(tile) { return i === tile.id; });
if (!wanted) {
@@ -693,12 +695,16 @@ export default {
return !wanted;
}).map(abortRequest);
if (hadRequests && !loadingNotes && _isEmpty(cache.inflight)) {
dispatch.call('loaded'); // stop the spinner
}
// issue new requests..
tiles.forEach(function(tile) {
var id = tile.id;
if (cache.loaded[id] || cache.inflight[id]) return;
if (!loadingNotes && _isEmpty(cache.inflight)) {
dispatch.call('loading'); // start the spinner
dispatch.call('loading'); // start the spinner
}
cache.inflight[id] = that.loadFromAPI(
@@ -717,7 +723,7 @@ export default {
callback(err, _extend({ data: parsed }, tile));
}
if (_isEmpty(cache.inflight)) {
dispatch.call('loaded'); // stop the spinner
dispatch.call('loaded'); // stop the spinner
}
}