[core] Pass-by-const ref in GeometryTileFeature::getProperties()

7 files changed, 7 insertions, 7 deletions

diff --git a/src/mbgl/layout/symbol_feature.hpp b/src/mbgl/layout/symbol_feature.hpp
index e16dd0b2f3..0773c48d39 100644
--- a/src/mbgl/layout/symbol_feature.hpp
+++ b/src/mbgl/layout/symbol_feature.hpp
@@ -15,10 +15,10 @@ public:
         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(); };
+    const PropertyMap& getProperties() const override { return feature->getProperties(); };
     FeatureIdentifier getID() const override { return feature->getID(); };
     GeometryCollection getGeometries() const override { return geometry; };
 
diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp
index 1e5b1581d2..bb03bcc2e5 100644
--- a/src/mbgl/style/expression/expression.cpp
+++ b/src/mbgl/style/expression/expression.cpp
@@ -15,7 +15,7 @@ public:
     FeatureType getType() const override  {
         return apply_visitor(ToFeatureType(), feature.geometry);
     }
-    PropertyMap getProperties() const override { return feature.properties; }
+    const PropertyMap& getProperties() const override { return feature.properties; }
     FeatureIdentifier getID() const override { return feature.id; }
     GeometryCollection getGeometries() const override { return {}; }
     optional<mbgl::Value> getValue(const std::string& key) const override {
diff --git a/src/mbgl/tile/geojson_tile_data.hpp b/src/mbgl/tile/geojson_tile_data.hpp
index 3605af9690..70a985db47 100644
--- a/src/mbgl/tile/geojson_tile_data.hpp
+++ b/src/mbgl/tile/geojson_tile_data.hpp
@@ -17,7 +17,7 @@ public:
         return apply_visitor(ToFeatureType(), feature.geometry);
     }
 
-    PropertyMap getProperties() const override {
+    const PropertyMap& getProperties() const override {
         return feature.properties;
     }
 
diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp
index 6ce67a532e..3913615465 100644
--- a/src/mbgl/tile/geometry_tile_data.hpp
+++ b/src/mbgl/tile/geometry_tile_data.hpp
@@ -42,7 +42,7 @@ public:
     virtual ~GeometryTileFeature() = default;
     virtual FeatureType getType() const = 0;
     virtual optional<Value> getValue(const std::string& key) const = 0;
-    virtual PropertyMap getProperties() const { return PropertyMap(); }
+    virtual const PropertyMap& getProperties() const { static PropertyMap empty; return empty; }
     virtual FeatureIdentifier getID() const { return NullValue {}; }
     virtual GeometryCollection getGeometries() const = 0;
 };
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index 2d47515e0f..305f8e7dcf 100644
--- a/src/mbgl/tile/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -26,7 +26,7 @@ optional<Value> VectorTileFeature::getValue(const std::string& key) const {
     return value->is<NullValue>() ? nullopt : std::move(value);
 }
 
-std::unordered_map<std::string, Value> VectorTileFeature::getProperties() const {
+const PropertyMap& VectorTileFeature::getProperties() const {
     return feature.getProperties();
 }
 
diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp
index 7c95121a37..7a169ac44c 100644
--- a/src/mbgl/tile/vector_tile_data.hpp
+++ b/src/mbgl/tile/vector_tile_data.hpp
@@ -15,7 +15,7 @@ public:
 
     FeatureType getType() const override;
     optional<Value> getValue(const std::string& key) const override;
-    std::unordered_map<std::string, Value> getProperties() const override;
+    const PropertyMap& getProperties() const override;
     FeatureIdentifier getID() const override;
     GeometryCollection getGeometries() const override;
 
diff --git a/vendor/vector-tile b/vendor/vector-tile
-Subproject 5084dba54d2245980ffeac27ecbe47d2dd73a9d
+Subproject 995a2c2c542d38f4729761139ad0bd820348c1a