diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-07-16 18:21:41 -0700 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-07-16 18:21:41 -0700 |
commit | 791245857908da570fe1ca65af106e8e7297ef93 (patch) | |
tree | 09b245bd77d90fbb9ac1bc98f28fb515a081ee10 | |
parent | 3353c6c8b8fcd666b469ba266edc3dcb5d93ddf3 (diff) | |
download | qtlocation-mapboxgl-upstream/12264-serialize-legacy-filter.tar.gz |
Use Filter::serialize() in QMapboxGL::getFilter()upstream/12264-serialize-legacy-filter
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 9 |
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); } |