Fix fallback conditional for filter validation #11475
Merged
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
mourner
reviewed
Feb 8, 2022
SnailBones
approved these changes
Mar 9, 2022
There was a problem hiding this comment.
Looks good to me!
Just one thought: your changes to validate_filter.js are going to trigger a merge conflict with #11529, which also makes a change addressing the readability of that line. So perhaps consider reverting that change to simplify merging?
SnailBones
approved these changes
Mar 9, 2022
| @@ -13,7 +13,7 @@ export default function validateFilter(options) { | |||
| return validateExpression(extend({}, options, { | |||
| expressionContext: 'filter', | |||
| // We default to a layerType of `fill` because that points to a non-dynamic filter definition within the style-spec. | |||
| valueSpec: options.styleSpec[`filter_${layerType || 'fill'}`] | |||
| valueSpec: options.styleSpec[`filter_${layerType}`] || options.styleSpec[`filter_fill`] | |||
There was a problem hiding this comment.
Nice improvement to readability! But I think that this change will have a conflict with the different approach @stepankuzmin is taking here.
Maybe consider reverting this to skip resolving the merge conflict?
Suggested change
| valueSpec: options.styleSpec[`filter_${layerType}`] || options.styleSpec[`filter_fill`] | |
| valueSpec: options.styleSpec[`filter_${layerType || 'fill'}`] |
There was a problem hiding this comment.
Thanks for pointing that out @SnailBones I reverted this change
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.
Launch Checklist
filter_${layerType}is undefinedmapbox-gl-jschangelog:<changelog>Fix a bug that prevented some filters from being validated properly</changelog>