summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsheem Mamoowala <asheem.mamoowala@mapbox.com>2018-07-16 18:21:41 -0700
committerAsheem Mamoowala <asheem.mamoowala@mapbox.com>2018-07-23 09:12:26 -0700
commit7c585244ab9ea0de514246fe335d19f1257ca164 (patch)
tree878ded463a86d9ef9e4ffa7d565b98d6354a6198
parent1d8664a2ae3822ba4d45973640c0068c65a237e7 (diff)
downloadqtlocation-mapboxgl-7c585244ab9ea0de514246fe335d19f1257ca164.tar.gz
Use Filter::serialize() in QMapboxGL::getFilter()
-rw-r--r--platform/qt/src/qmapboxgl.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index cfc64488b7..09479581bb 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -1615,8 +1615,6 @@ QVariant QVariantFromValue(const mbgl::Value &value) {
\layer, if any.
Filter value types are described in the {https://www.mapbox.com/mapbox-gl-js/style-spec/#types}{Mapbox style specification}.
-
- This function only supports expression-based filters.
*/
QVariant QMapboxGL::getFilter(const QString &layer) const {
using namespace mbgl::style;
@@ -1645,12 +1643,7 @@ QVariant QMapboxGL::getFilter(const QString &layer) const {
return QVariant();
}
- if (!filter_.expression) {
- qWarning() << "getFilter only supports expression-based filters";
- return QVariant();
- }
-
- auto serialized = (**filter_.expression).serialize();
+ auto serialized = filter_.serialize();
return QVariantFromValue(serialized);
}