Add queryRenderedFeatures method for qt

pointrlabs · Jul 25, 2022 · 6f9a8a3 · 6f9a8a3
1 parent 8a1039e
commit 6f9a8a3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/platform/qt/include/QMapLibreGL/map.hpp b/platform/qt/include/QMapLibreGL/map.hpp
@@ -174,6 +174,8 @@ class Q_MAPLIBREGL_EXPORT Map : public QObject
 
     const QVector<QPair<QString, QString>> &defaultStyles() const;
 
+    std::vector<Feature> queryRenderedFeatures(const Coordinate &point, QVector<QString> layerIds);
+
 public slots:
     void render();
     void connectionEstablished();

diff --git a/platform/qt/src/map.cpp b/platform/qt/src/map.cpp
@@ -1316,6 +1316,19 @@ const QVector<QPair<QString, QString>> &Map::defaultStyles() const
     return d_ptr->defaultStyles;
 }
 
+std::vector<Feature> Map::queryRenderedFeatures(const Coordinate &point, QVector<QString> layerIds){
+    std::vector<std::string> stdLayerIds;
+    for(const auto &layerId: layerIds){
+        stdLayerIds.push_back(layerId.toStdString());
+    }
+    auto features = d_ptr->queryRenderedFeatures({point.first, point.second}, mbgl::RenderedQueryOptions(stdLayerIds,{}));
+    std::vector<Feature> qtFeatures;
+    for(const auto &feature: features){
+        qtFeatures.push_back(GeoJSON::toFeature(feature));
+    }
+    return qtFeatures;
+}
+
 /*!
     \fn void QMapLibreGL::Map::needsRendering()
 
@@ -1540,4 +1553,9 @@ bool MapPrivate::setProperty(const PropertySetter& setter, const QString& layer,
     return true;
 }
 
+std::vector<mbgl::Feature> MapPrivate::queryRenderedFeatures(const mbgl::ScreenCoordinate& point, const mbgl::RenderedQueryOptions& options) const{
+    return m_mapRenderer->queryRenderedFeatures(point, options);
+}
+
+
 } // namespace QMapLibreGL
diff --git a/platform/qt/src/map_p.hpp b/platform/qt/src/map_p.hpp
@@ -41,6 +41,8 @@ class MapPrivate : public QObject, public mbgl::RendererFrontend
     using PropertySetter = mbgl::optional<mbgl::style::conversion::Error> (mbgl::style::Layer::*)(const std::string&, const mbgl::style::conversion::Convertible&);
     bool setProperty(const PropertySetter& setter, const QString& layer, const QString& name, const QVariant& value);
 
+    std::vector<mbgl::Feature> queryRenderedFeatures(const mbgl::ScreenCoordinate& point, const mbgl::RenderedQueryOptions& options = {}) const;
+
     mbgl::EdgeInsets margins;
     std::unique_ptr<mbgl::Map> mapObj{};
     QVector<QPair<QString, QString>> defaultStyles;

diff --git a/platform/qt/src/utils/map_renderer.cpp b/platform/qt/src/utils/map_renderer.cpp
@@ -64,6 +64,11 @@ void MapRenderer::updateParameters(std::shared_ptr<mbgl::UpdateParameters> newPa
     m_updateParameters = std::move(newParameters);
 }
 
+std::vector<mbgl::Feature> MapRenderer::queryRenderedFeatures(const mbgl::ScreenCoordinate& point, const mbgl::RenderedQueryOptions& options) const
+{
+    return m_renderer->queryRenderedFeatures(point,options);
+}
+
 void MapRenderer::updateFramebuffer(quint32 fbo, const mbgl::Size &size)
 {
     MBGL_VERIFY_THREAD(tid);

diff --git a/platform/qt/src/utils/map_renderer.hpp b/platform/qt/src/utils/map_renderer.hpp
@@ -38,6 +38,8 @@ class MapRenderer : public QObject
     // Thread-safe, called by the Frontend
     void updateParameters(std::shared_ptr<mbgl::UpdateParameters>);
 
+    std::vector<mbgl::Feature> queryRenderedFeatures(const mbgl::ScreenCoordinate& point, const mbgl::RenderedQueryOptions& options = {}) const;
+
 signals:
     void needsRendering();