diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-30 14:31:37 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-01-14 10:45:49 -0400 |
commit | f31386385952f42e0468c7d7a0ab0a066f0bf803 (patch) | |
tree | 74432eaa3544daa5f749a315399249c1af30e718 /src/mbgl/style/expression/expression.cpp | |
parent | a4f2fe4209ef6961662fb53ee5c29cafacd2a303 (diff) | |
download | qtlocation-mapboxgl-upstream/geometrytilefeature-getvalue-no-optional.tar.gz |
[core] Remove optional from GeometryTileFeature::getValue()upstream/geometrytilefeature-getvalue-no-optional
Diffstat (limited to 'src/mbgl/style/expression/expression.cpp')
-rw-r--r-- | src/mbgl/style/expression/expression.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp index bb03bcc2e5..8b61aef7ca 100644 --- a/src/mbgl/style/expression/expression.cpp +++ b/src/mbgl/style/expression/expression.cpp @@ -2,6 +2,8 @@ #include <mbgl/style/expression/compound_expression.hpp> #include <mbgl/tile/geometry_tile_data.hpp> +#include <mbgl/util/feature.hpp> + namespace mbgl { namespace style { namespace expression { @@ -18,12 +20,8 @@ public: 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 { - auto it = feature.properties.find(key); - if (it != feature.properties.end()) { - return optional<mbgl::Value>(it->second); - } - return optional<mbgl::Value>(); + mbgl::Value getValue(const std::string& key) const override { + return feature.properties.count(key) ? feature.properties.at(key) : NullValue(); } }; |