[Maps] fix layer sorting issue with hidden layers at map load #76007
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
nreese
added
release_note:fix
[Deprecated-Use Team:Presentation]Team:Geo
|
Pinging @elastic/kibana-gis (Team:Geo) |
|
@elasticmachine merge upstream |
thomasneirynck
approved these changes
Aug 27, 2020
| @@ -128,7 +128,8 @@ export function syncLayerOrder(mbMap: MbMap, spatialFiltersLayer: ILayer, layerL | |||
| if (!isLayerInOrder(mbMap, mapLayer, LAYER_CLASS.LABEL, beneathMbLayerId)) { | |||
| moveMapLayer(mbMap, mbLayers, mapLayer, LAYER_CLASS.LABEL, beneathMbLayerId); | |||
| } | |||
| beneathMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, LAYER_CLASS.LABEL); | |||
| const bottomMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, LAYER_CLASS.LABEL); | |||
| if (bottomMbLayerId) beneathMbLayerId = bottomMbLayerId; | |||
There was a problem hiding this comment.
this is really subtle. Do you mind adding a comment?
e.g.
When the corresponding bottom mb-layer cannot be found, - e.g. when the kibana-layer is invisible and has not synced with mapbox - retain the previous "beneath"-layer
There was a problem hiding this comment.
I commented the unit test to capture the subtleness of the edge case. Do you think more commenting is needed?
|
Tested locally, works fine, thanks for the quick fix! 🎉 |
💚 Build SucceededBuild metricsasync chunks size
History
To update your PR or re-run it, just comment with: |
nreese
added a commit
to nreese/kibana
that referenced
this pull request
Aug 27, 2020
…or a layer (elastic#76007) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
nreese
added a commit
to nreese/kibana
that referenced
this pull request
Aug 27, 2020
…or a layer (elastic#76007) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
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.
fixes #75997
#69444 introduced a regression where hidden layers on map load could cause the sorting to place layers above the hidden layer beneath other layers. This occurred because
beneathMbLayerIdwould be set to undefined when there were no mapbox layers for a layer. This PR resolves the issue by only advancingbeneathMbLayerIdif a mapbox layer could be found for the layer.