Replace no-op style filter expressions #62
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
zmiao
reviewed
Jul 26, 2024
test/styleToFilter.test.js
Outdated
Comment on lines
133
to
138
| [ | ||
| "case", | ||
| [">=", ["distance-from-center"], 1], | ||
| true, | ||
| [">=", ["pitch"], 45] | ||
| ], |
There was a problem hiding this comment.
If we change the expression a little to be:
[
"case",
[">=", ["distance-from-center"], 1],
false,
[">=", ["pitch"], 45]
],
The case expression will return false, excluding the feature. Therefore, we probably need to aggressively set the entire case expression to ['literal', true].
zmiao
reviewed
Jul 29, 2024
lib/styleToFilters.js
Outdated
| @@ -33,15 +33,15 @@ function styleToFilters(style) { | |||
| if (styleMin < layers[layerName].minzoom) layers[layerName].minzoom = styleMin; | |||
| if (styleMax > layers[layerName].maxzoom) layers[layerName].maxzoom = styleMax; | |||
| // Modify filter | |||
| if (layers[layerName].filters === true || !style.layers[i].filter) { | |||
| if (layers[layerName].filters === true || !style.layers[i].filter || isNoOpFilter(style.layers[i].filter)) { | |||
There was a problem hiding this comment.
this would be too aggressive, so for such case:
"filter": [
"all",
[
"case",
["<=", ["pitch"], 45],
true,
["<=", ["distance-from-center"], 1]
],
["match", ["get", "type"], ["Toll booth"], true, false]
],
we would want to replace it with:
"filter": [
"all",
[
"literal",
true
],
["match", ["get", "type"], ["Toll booth"], true, false]
],
instead of just ['literal', true]
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This PR adds a "pre-filter" that removes no-op style filter expressions as
['pitch'],['distance-from-center']by replacing them with an expression that always evaluates to true.