Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Cherry pick expression filters #11428

Merged
merged 1 commit into from
Mar 9, 2018
Merged

Cherry pick expression filters #11428

merged 1 commit into from
Mar 9, 2018

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Mar 9, 2018

Cherry pick of #11251

cc @lucaswoj

* WIP

* WIP

* WIP

* Remove Filter::operator()(const Feature&)

* WIP

* WIP

* WIP

* WIP

* Hook up expression filter evaluator

* Replace `shared_ptr` with &reference

* Fill in implementation of `void operator()(const ExpressionFilter&)`

* Fix failing tests

* Switch back to a shared_ptr per chat with @anandthakker

* Fix benchmark compilation

* Shot in the dark to fix CI

* Shot in the dark to fix CI (part 2)

* Shot in the dark to fix CI (part 3)

* In src/mbgl/style/conversion/filter.cpp, add a port of isExpressionFilter and use it to decide in Converter<Filter>::operator() whether to parse the incoming JSON as an ExpressionFilter or one of the legacy filter types

* Remove bool Filter::operator()(const GeometryTileFeature&) const

*  Ensure the map zoom is passed into filtering operations wherever applicable

* Add expression filter tests

* Addressed PR feedback

* Implement `NSPredicate *operator()(mbgl::style::ExpressionFilter filter)`

* Fix formatting& nit
@tobrun tobrun added the Core The cross-platform C++ core, aka mbgl label Mar 9, 2018
@tobrun tobrun self-assigned this Mar 9, 2018
@tobrun tobrun requested a review from LukasPaczos March 9, 2018 09:47
@tobrun tobrun merged commit 8a3deab into release-boba Mar 9, 2018
@tobrun tobrun deleted the cp-filter-expression branch March 9, 2018 10:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Core The cross-platform C++ core, aka mbgl
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants