summaryrefslogtreecommitdiff
path: root/include/mbgl
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl')
-rw-r--r--include/mbgl/renderer/renderer.hpp9
-rw-r--r--include/mbgl/util/geojson.hpp2
2 files changed, 10 insertions, 1 deletions
diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp
index 798928087a..644dd0fcf9 100644
--- a/include/mbgl/renderer/renderer.hpp
+++ b/include/mbgl/renderer/renderer.hpp
@@ -4,7 +4,7 @@
#include <mbgl/renderer/mode.hpp>
#include <mbgl/annotation/annotation.hpp>
#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geo.hpp>
+#include <mbgl/util/geojson.hpp>
#include <functional>
#include <memory>
@@ -44,6 +44,13 @@ public:
AnnotationIDs queryShapeAnnotations(const ScreenBox& box) const;
AnnotationIDs getAnnotationIDs(const std::vector<Feature>&) const;
+ // Feature extension query
+ FeatureExtensionValue queryFeatureExtensions(const std::string& sourceID,
+ const Feature& feature,
+ const std::string& extension,
+ const std::string& extensionField,
+ const optional<std::map<std::string, Value>>& args = {}) const;
+
// Debug
void dumpDebugLogs();
diff --git a/include/mbgl/util/geojson.hpp b/include/mbgl/util/geojson.hpp
index b4e789a3ac..2a6569be49 100644
--- a/include/mbgl/util/geojson.hpp
+++ b/include/mbgl/util/geojson.hpp
@@ -1,10 +1,12 @@
#pragma once
#include <mapbox/geojson.hpp>
+#include <mbgl/util/feature.hpp>
namespace mbgl {
using GeoJSON = mapbox::geojson::geojson;
using FeatureCollection = mapbox::geojson::feature_collection;
+using FeatureExtensionValue = mapbox::util::variant<Value, FeatureCollection>;
} // namespace mbgl