Skip to content

Add error handling to fetching tiles #291

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

Add error handling to fetching tiles #291

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
15 changes: 10 additions & 5 deletions src/Leaflet.VectorGrid.Protobuf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({
var currentZoom = zoom === coords.z;

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

return currentZoom && currentBounds;

Expand Down Expand Up @@ -127,20 +127,23 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({
return fetch(tileUrl, this.options.fetchOptions).then(function(response){

if (!response.ok || !this._isCurrentTile(coords)) {
return {layers:[]};
}
throw new Error('Failed to fetch tile: HTTP response ' + response.status +
' ' + response.statusText);
}

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

var reader = new FileReader();
return new Promise(function(resolve){
return new Promise(function(resolve, reject){
reader.addEventListener("loadend", function() {
// reader.result contains the contents of blob as a typed array
// blob.type === 'application/x-protobuf'
var pbf = new Pbf( reader.result );
return resolve(new VectorTile( pbf ));

});
reader.addEventListener("error", reject);
reader.addEventListener("abort", reject);
reader.readAsArrayBuffer(blob);
});
});
Expand All @@ -161,6 +164,8 @@ L.VectorGrid.Protobuf = L.VectorGrid.extend({
}

return json;
}).catch(function (err) {
console.log(err);
});
}
});
Expand Down
140 changes: 69 additions & 71 deletions src/Leaflet.VectorGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +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 tileBounds = this._tileCoordsToBounds(coords);

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

Expand All @@ -76,87 +76,85 @@ L.VectorGrid = L.GridLayer.extend({
renderer._features = {};
}

vectorTilePromise.then( function renderTile(vectorTile) {

if (vectorTile.layers && vectorTile.layers.length !== 0) {

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;
}
vectorTilePromise.then(function renderTile(vectorTile) {
if (!vectorTile) {
this.fire('tileerror');
return;
}
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;
}

var styleOptions = layerStyle;
if (storeFeatures) {
id = this.options.getFeatureId(feat);
var styleOverride = this._overriddenStyles[id];
if (styleOverride) {
if (styleOverride[layerName]) {
styleOptions = styleOverride[layerName];
} else {
styleOptions = styleOverride;
}
var styleOptions = layerStyle;
if (storeFeatures) {
id = this.options.getFeatureId(feat);
var styleOverride = this._overriddenStyles[id];
if (styleOverride) {
if (styleOverride[layerName]) {
styleOptions = styleOverride[layerName];
} else {
styleOptions = styleOverride;
}
}

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
if (!renderer._features[id]) {
renderer._features[id] = [];
}
}

renderer._features[id].push({
layerName: layerName,
feature: featureLayer
});
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
if (!renderer._features[id]) {
renderer._features[id] = [];
}

renderer._features[id].push({
layerName: layerName,
feature: featureLayer
});
}

}

}

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

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

}.bind(this));
Expand Down