From abeee2087c151ccc492b2aff60b54dc6f8ec9fd1 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 8 Jul 2016 15:28:56 +0300 Subject: [PATCH] [Qt] Added add/remove style source method --- platform/qt/include/qmapboxgl.hpp | 3 +++ platform/qt/src/qmapboxgl.cpp | 21 +++++++++++++++++++++ platform/qt/src/qt_geojson.hpp | 14 ++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 platform/qt/src/qt_geojson.hpp diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index e1dcbfff1..e95dc8455 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -199,6 +199,9 @@ public: void setMargins(const QMargins &margins); QMargins margins() const; + void addSource(const QString& sourceID, const QVariant& value); + void removeSource(const QString& sourceID); + void addCustomLayer(const QString &id, QMapbox::CustomLayerInitializeFunction, QMapbox::CustomLayerRenderFunction, diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 2a1cfd6f5..71264faed 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -1,6 +1,7 @@ #include "qmapboxgl_p.hpp" #include "qt_conversion.hpp" +#include "qt_geojson.hpp" #include #include @@ -8,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -619,6 +621,25 @@ QMargins QMapboxGL::margins() const ); } +void QMapboxGL::addSource(const QString& sourceID, const QVariant& value) +{ + using namespace mbgl::style; + using namespace mbgl::style::conversion; + + Result> source = convert>(value, sourceID.toStdString()); + if (!source) { + qWarning() << "Unable to add source:" << source.error().message; + return; + } + + d_ptr->mapObj->addSource(std::move(*source)); +} + +void QMapboxGL::removeSource(const QString& sourceID) +{ + d_ptr->mapObj->removeSource(sourceID.toStdString()); +} + void QMapboxGL::addCustomLayer(const QString &id, QMapbox::CustomLayerInitializeFunction initFn, QMapbox::CustomLayerRenderFunction renderFn, diff --git a/platform/qt/src/qt_geojson.hpp b/platform/qt/src/qt_geojson.hpp new file mode 100644 index 000000000..cc0b15a6c --- /dev/null +++ b/platform/qt/src/qt_geojson.hpp @@ -0,0 +1,14 @@ +#include + +namespace mbgl { +namespace style { +namespace conversion { + +template <> +Result convertGeoJSON(const QVariant&) { + return Error { "not implemented" }; +} + +} // namespace conversion +} // namespace style +} // namespace mbgl