Skip to content

layer is loading? #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sttawm wants to merge 2 commits into
base: data()
Choose a base branch
from
Open

layer is loading? #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8c57df
add a 'loading' event to a layer
sttawm Jul 17, 2015
6ef639f
fix missing semicolon
sttawm Jul 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/Layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ ms.layer = function(load, unload) {
// flush the cache, clearing no-longer-needed tiles
cache.flush();

checkIsLoading();

// dispatch the move event
layer.dispatch({type: "move"});
}
Expand All @@ -265,6 +267,17 @@ ms.layer = function(load, unload) {
}
}

var checkIsLoading = (function() {
var wasLoading;
return function() {
var isLoading = layer.isLoading();
if (isLoading !== wasLoading) {
wasLoading = isLoading;
layer.dispatch({type: "loading", loading: isLoading});
}
};
})();

layer.map = function(x) {
if (!arguments.length) return map;
if (map) {
Expand Down Expand Up @@ -308,6 +321,16 @@ ms.layer = function(load, unload) {
return layer;
};

layer.isLoading = function() {
var tiles = cache.locks();
for (key in tiles) {
var tile = tiles[key];
if (!tile.ready)
return true;
}
return false;
};

layer.transform = function(x) {
if (!arguments.length) return transform;
transform = x;
Expand Down Expand Up @@ -336,7 +359,7 @@ ms.layer = function(load, unload) {
};

layer.dispatch = ms.dispatch(layer);
layer.on("load", cleanup);
layer.on("load", cleanup).on("load", checkIsLoading);

return layer;
};
Expand Down