Skip to content
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

Check destination bounds in isCurrent tiles on zoom transitions #228

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check destination bounds in isCurrent tiles on zoom transitions #228

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
24 changes: 18 additions & 6 deletions src/Leaflet.VectorGrid.Protobuf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,21 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({

_getSubdomain: L.TileLayer.prototype._getSubdomain,

_isCurrentTile : function(coords, tileBounds) {
_isCurrentTile: function(coords) {

if (!this._map) {
return true;
}

var zoom = this._map._animatingZoom ? this._map._animateToZoom : this._map._zoom;
var center = this._map._animatingZoom ? this._map._animateToCenter : this._map.getCenter();
var currentZoom = zoom === coords.z;
var destinationBounds = this._getViewBounds(center, zoom);

var tileBounds = this._tileCoordsToBounds(coords);
var currentBounds = this._map.getBounds().overlaps(tileBounds);
var currentBounds = destinationBounds.overlaps(tileBounds);

return currentZoom && currentBounds;

},

_getVectorTilePromise: function(coords, tileBounds) {
Expand All @@ -118,7 +119,7 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({
data['-y'] = invertedY;
}

if (!this._isCurrentTile(coords, tileBounds)) {
if (!this._isCurrentTile(coords)) {
return Promise.resolve({layers:[]});
}

Expand All @@ -128,7 +129,7 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({

if (!response.ok || !this._isCurrentTile(coords)) {
return {layers:[]};
}
}

return response.blob().then( function (blob) {

Expand Down Expand Up @@ -162,7 +163,18 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({

return json;
});
}
},

_getViewBounds: function (center, zoom) {
var projectedCenter = this._map.project(center, zoom);
var size = this._map.getSize();
var swPoint = L.point(projectedCenter.x - size.x / 2, projectedCenter.y - size.y / 2);
var nePoint = L.point(projectedCenter.x + size.x / 2, projectedCenter.y + size.y / 2);
var sw = this._map.unproject(swPoint, zoom);
var ne = this._map.unproject(nePoint, zoom);

return L.latLngBounds(sw, ne);
},
});


Expand Down
34 changes: 16 additions & 18 deletions src/Leaflet.VectorGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ L.VectorGrid = L.GridLayer.extend({
var tileSize = this.getTileSize();
var renderer = this.options.rendererFactory(coords, tileSize, this.options);

var tileBounds = this._tileCoordsToBounds(coords);

var vectorTilePromise = this._getVectorTilePromise(coords, tileBounds);
var vectorTilePromise = this._getVectorTilePromise(coords);

if (storeFeatures) {
this._vectorTiles[this._tileCoordsToKey(coords)] = renderer;
Expand All @@ -83,16 +81,16 @@ L.VectorGrid = L.GridLayer.extend({
for (var layerName in vectorTile.layers) {
this._dataLayerNames[layerName] = true;
var layer = vectorTile.layers[layerName];

var pxPerExtent = this.getTileSize().divideBy(layer.extent);

var layerStyle = this.options.vectorTileLayerStyles[ layerName ] ||
L.Path.prototype.options;

for (var i = 0; i < layer.features.length; i++) {
var feat = layer.features[i];
var id;

if (this.options.filter instanceof Function &&
!this.options.filter(feat.properties, coords.z)) {
continue;
Expand All @@ -110,31 +108,31 @@ L.VectorGrid = L.GridLayer.extend({
}
}
}

if (styleOptions instanceof Function) {
styleOptions = styleOptions(feat.properties, coords.z);
}

if (!(styleOptions instanceof Array)) {
styleOptions = [styleOptions];
}

if (!styleOptions.length) {
continue;
}

var featureLayer = this._createLayer(feat, pxPerExtent);

for (var j = 0; j < styleOptions.length; j++) {
var style = L.extend({}, L.Path.prototype.options, styleOptions[j]);
featureLayer.render(renderer, style);
renderer._addPath(featureLayer);
}

if (this.options.interactive) {
featureLayer.makeInteractive();
}

if (storeFeatures) {
// multiple features may share the same id, add them
// to an array of features
Expand All @@ -148,15 +146,15 @@ L.VectorGrid = L.GridLayer.extend({
});
}
}

}

}

if (this._map != null) {
renderer.addTo(this._map);
}

L.Util.requestAnimFrame(done.bind(coords, null, null));

}.bind(this));
Expand Down