Merge remote-tracking branch 'origin/master' into feature/custom-vector-source

1 files changed, 14 insertions, 2 deletions

diff --git a/src/mbgl/layout/symbol_feature.hpp b/src/mbgl/layout/symbol_feature.hpp
index 5dd61d9156..f4dc1680bc 100644
--- a/src/mbgl/layout/symbol_feature.hpp
+++ b/src/mbgl/layout/symbol_feature.hpp
@@ -3,13 +3,25 @@
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/util/optional.hpp>
 
+#include <array>
 #include <string>
 
 namespace mbgl {
 
-class SymbolFeature {
+class SymbolFeature : public GeometryTileFeature {
 public:
-    FeatureType type;
+    SymbolFeature(std::unique_ptr<GeometryTileFeature> feature_) :
+        feature(std::move(feature_)),
+        geometry(feature->getGeometries()) // we need a mutable copy of the geometry for mergeLines()
+    {}
+    
+    FeatureType getType() const override { return feature->getType(); }
+    optional<Value> getValue(const std::string& key) const override { return feature->getValue(key); };
+    std::unordered_map<std::string,Value> getProperties() const override { return feature->getProperties(); };
+    optional<FeatureIdentifier> getID() const override { return feature->getID(); };
+    GeometryCollection getGeometries() const override { return geometry; };
+
+    std::unique_ptr<GeometryTileFeature> feature;
     GeometryCollection geometry;
     optional<std::u16string> text;
     optional<std::string> icon;