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 /platform/default/mbgl/tile/default_tile_feature.hpp | |
| parent | a4f2fe4209ef6961662fb53ee5c29cafacd2a303 (diff) | |
| download | qtlocation-mapboxgl-f31386385952f42e0468c7d7a0ab0a066f0bf803.tar.gz | |
[core] Remove optional from GeometryTileFeature::getValue()upstream/geometrytilefeature-getvalue-no-optional
Diffstat (limited to 'platform/default/mbgl/tile/default_tile_feature.hpp')
| -rw-r--r-- | platform/default/mbgl/tile/default_tile_feature.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/platform/default/mbgl/tile/default_tile_feature.hpp b/platform/default/mbgl/tile/default_tile_feature.hpp index 9183fd583a..417bb8c637 100644 --- a/platform/default/mbgl/tile/default_tile_feature.hpp +++ b/platform/default/mbgl/tile/default_tile_feature.hpp @@ -29,13 +29,17 @@ public: return id; } - optional<Value> getValue(const std::string& key) const override { - return properties.count(key) ? properties.at(key) : optional<Value>(); + Value getValue(const std::string& key) const override { + return properties.count(key) ? properties.at(key) : NullValue(); } GeometryCollection getGeometries() const override { return geometry; } + + const PropertyMap& getProperties() const override { + return properties; + } }; } // namespace mbgl |