Skip to content

Refactor usages of deprecated goog.structs.Map methods #628

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
shicks wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Refactor usages of deprecated goog.structs.Map methods #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion javascript/src/floattileoverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ee.FloatTileOverlay =

/** @return {number} The number of tiles successfully loaded. */
getLoadedFloatTilesCount() {
return this.floatTiles_.getCount();
return this.floatTiles_.size;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions javascript/src/layers/abstractoverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
this.opacity = opacity;
this.tilesById.forEach(function(tile) {
goog.style.setOpacity(tile.div, this.opacity);
}, this);
}.bind(this));
}

/**
Expand Down Expand Up @@ -201,7 +201,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
*/
releaseTile(tileDiv) {
var tile = this.tilesById.get(tileDiv.id);
this.tilesById.remove(tileDiv.id);
this.tilesById.delete(tileDiv.id);
if (tile) {
tile.abort();
goog.dispose(tile);
Expand Down Expand Up @@ -283,7 +283,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
* @private
*/
getTileCountForStatus_(status) {
return goog.array.count(this.tilesById.getValues(), function(tile) {
return goog.array.count([...this.tilesById.values()], function(tile) {
return tile.getStatus() == status;
});
}
Expand Down
6 changes: 3 additions & 3 deletions javascript/src/maptilemanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {
* @return {number} The number of requests in flight or pending send.
*/
getOutstandingCount() {
return this.requests_.getCount();
return this.requests_.size;
}

/**
Expand Down Expand Up @@ -160,7 +160,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {
* @private
*/
releaseRequest_(request) {
this.requests_.remove(request.getId());
this.requests_.delete(request.getId());
if (request.getImageLoader()) {
this.releaseObject_(request.getToken());
request.getImageLoader().dispose();
Expand Down Expand Up @@ -189,7 +189,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {

// Call dispose on each request.
var requests = this.requests_;
goog.array.forEach(requests.getValues(), function(value) {
goog.array.forEach([...requests.values()], function(value) {
value.dispose();
});
requests.clear();
Expand Down
Loading