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.

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

6768 overdraw fix #6803

Merged
merged 4 commits into from
Aug 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/source/vector_tile_source.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ class VectorTileSource extends Evented implements Source {
if (tile.aborted)
return callback(null);

if (err) {
if (err && err.status !== 404) {
return callback(err);
}

if (data && data.resourceTiming)
tile.resourceTiming = data.resourceTiming;

if (this.map._refreshExpiredTiles) tile.setExpiryData(data);
if (this.map._refreshExpiredTiles && data) tile.setExpiryData(data);
tile.loadVectorData(data, this.map.painter);

callback(null);
Expand Down
3 changes: 2 additions & 1 deletion test/ajax_stubs.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ export const getArrayBuffer = function({ url }, callback) {
cache[url] = {data: body};
callback(null, {data: body});
} else {
callback(error || new Error(response.statusCode));
if (!error) error = { status: +response.statusCode };
callback(error);
}
});
};
Expand Down
3 changes: 2 additions & 1 deletion test/ignores.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
"render-tests/projection/skew": "axonometric rendering in gl-js tbd",
"render-tests/regressions/mapbox-gl-js#3682": "skip - true",
"render-tests/runtime-styling/image-update-icon": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804",
"render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804"
"render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804",
"render-tests/mixed-zoom/z10-z11": "current behavior conflicts with https://github.com/mapbox/mapbox-gl-js/pull/6803. can be fixed when https://github.com/mapbox/api-maps/issues/1480 is done"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions test/integration/render-tests/sparse-tileset/overdraw/style.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"version": 8,
"metadata": {
"test": {
"height": 256
}
},
"center": [
13.418056,
52.499167
],
"zoom": 1,
"sources": {
"mapbox": {
"type": "vector",
"tiles": [
"local://tiles/sparse/{z}-{x}-{y}.mvt"
]
}
},
"layers": [
{
"id": "background-layer",
"type": "background",
"paint": {
"background-color": "forestgreen"
}
},
{
"id": "water-layer",
"source": "mapbox",
"source-layer": "water",
"type": "fill",
"paint": {
"fill-color": "blue"
}
}
]
}
Binary file added test/integration/tiles/sparse/0-0-0.mvt
Binary file not shown.