[GSDESCARTE-7] Handle errors in layer loading process #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tkohr
force-pushed
the
GSDESCARTE-7-error-handling
branch
from
56dddd3
to
54c2f29
Compare
fgravin
requested changes
Dec 14, 2020
| if (allReady) { | ||
| for (let i = 0; i < layerStates.length; i++) { | ||
| context.drawImage(layerStates[i][1], 0, 0); | ||
| if (layerStates[i][2] && layerStates[i][2].length > 0) { |
There was a problem hiding this comment.
use explicit variable
const canvasImage = layerStates[i][1]
const errors = layerStates[i][2]| @@ -45,33 +45,42 @@ export function createJob(spec) { | |||
| .pipe( | |||
| switchMap((layerStates) => { | |||
| const allReady = layerStates.every(([progress]) => progress === 1); | |||
|
|
|||
| let errors = []; | |||
| return { | ||
| ...job, | ||
| progress, | ||
| imageBlob, | ||
| status: progress === 1 ? 'finished' : 'ongoing', | ||
| errors: errors, |
There was a problem hiding this comment.
Suggested change
| errors: errors, | |
| errors, |
| const width = rootFrameState.size[0]; | ||
| const height = rootFrameState.size[1]; | ||
| const context = createCanvasContext2D(width, height); | ||
| context.canvas.style = {}; | ||
| let frameState; | ||
| let layer; | ||
| let renderer; | ||
| let errors = []; |
|
|
||
| const update$ = interval(500); | ||
| let errorTile$ = new BehaviorSubject(); | ||
| let errorWMS$ = new BehaviorSubject(); |
| xhr.addEventListener('loadend', function () { | ||
| var data = this.response; | ||
|
|
||
| if (this.status === 0 || this.status >= 400) { |
| if (debug) { | ||
| createErrorTile(image, tileSize, this.status); | ||
| } | ||
| errorTile$.next({ origin: tile.key, tile: tile, error: this.status }); |
There was a problem hiding this comment.
not sure we need the size or the tile ..
| if (debug) { | ||
| createErrorTile(image, tileSize, this.status); | ||
| } | ||
| errorTile$.next({ origin: tile.key, tile: tile, error: this.status }); |
There was a problem hiding this comment.
origin should be the tile url, not the key
Comment on lines
-103
to
+148
| return update$.pipe( | ||
| startWith(true), | ||
| let updateWhile$ = update$.pipe( | ||
| startWith(0), | ||
| takeWhile(() => { | ||
| frameState.tileQueue.reprioritize(); | ||
| frameState.tileQueue.loadMoreTiles(12, 4); | ||
| return frameState.tileQueue.getTilesLoading(); | ||
| }, true), | ||
| map(() => { | ||
| }, true) | ||
| ); | ||
|
|
||
| return combineLatest(updateWhile$, errorTile$).pipe( | ||
| map((status) => { | ||
| let error = status[1]; | ||
| // abort tile rendering if no pink error tiles are drawn | ||
| if (error && !debug) { | ||
| error.tile.setState(TileState.ERROR); | ||
| } | ||
| // check if error is not already present from previous interval | ||
| if (errors[errors.length - 1] !== error) { | ||
| // check if error comes from same source | ||
| if (source.key_ === error.tile.key) { | ||
| errors.push(error); | ||
| } | ||
| } | ||
|
|
| } | ||
| }), | ||
| throttleTime(500, undefined, { leading: true, trailing: true }) | ||
| ); | ||
| } | ||
|
|
||
| function createErrorTile(image, tileSize, errorCode) { |
|
continued in #16 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR ascends (tile/image loading errors) into job status (by layer and tile) and allows to activate a
debugmode per layer to render erroneous tiles pink.Can be tested with erroneous layers, e.g. copying test data into demo directory and using larger extent:
TODOs:
debugparam in layer specdebug: false