From 791245857908da570fe1ca65af106e8e7297ef93 Mon Sep 17 00:00:00 2001 From: Asheem Mamoowala Date: Mon, 16 Jul 2018 18:21:41 -0700 Subject: Use Filter::serialize() in QMapboxGL::getFilter() --- platform/qt/src/qmapboxgl.cpp | 9 +-------- 1 file changed, 1 insertion(+), 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); } -- cgit v1.2.1