tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Fix VectorTileFeature::getValue() semantics after geometry@v1.0.0

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2018-11-26 08:26:26 +02:00
parent f3b9a43b13
commit 82be3104cd
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mbgl/tile/vector_tile_data.cpp
View File

@@ -22,7 +22,8 @@ FeatureType VectorTileFeature::getType() const {
}
optional<Value> VectorTileFeature::getValue(const std::string& key) const {
return feature.getValue(key);
const optional<Value> value(feature.getValue(key));
return value->is<NullValue>() ? nullopt : std::move(value);
}
std::unordered_map<std::string, Value> VectorTileFeature::getProperties() const {

34
test/tile/vector_tile.test.cpp
View File

@@ -1,6 +1,7 @@
#include <mbgl/test/util.hpp>
#include <mbgl/test/fake_file_source.hpp>
#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/tile/vector_tile_data.hpp>
#include <mbgl/tile/tile_loader_impl.hpp>
#include <mbgl/util/default_thread_pool.hpp>
@@ -73,3 +74,36 @@ TEST(VectorTile, Issue8542) {
std::vector<Feature> result;
tile.querySourceFeatures(result, { { {"layer"} }, {} });
}
TEST(VectorTileData, ParseResults) {
VectorTileData data(std::make_shared<std::string>(util::read_file("test/fixtures/map/issue12432/0-0-0.mvt")));
std::vector<std::string> layerNames = data.layerNames();
ASSERT_EQ(layerNames.size(), 2u);
ASSERT_EQ(layerNames.at(0), "admin");
ASSERT_EQ(layerNames.at(1), "water");
ASSERT_FALSE(data.getLayer("invalid"));
std::unique_ptr<GeometryTileLayer> layer = data.getLayer("admin");
ASSERT_EQ(layer->getName(), "admin");
ASSERT_EQ(layer->featureCount(), 17154u);
try {
layer->getFeature(17154u);
ASSERT_TRUE(false) << "should throw: feature index is out of range.";
} catch (const std::out_of_range&) {
ASSERT_TRUE(true);
}
std::unique_ptr<GeometryTileFeature> feature = layer->getFeature(0u);
ASSERT_EQ(feature->getType(), mbgl::FeatureType::LineString);
ASSERT_TRUE(feature->getID().is<uint64_t>());
ASSERT_EQ(feature->getID().get<uint64_t>(), 1u);
std::unordered_map<std::string, Value> properties = feature->getProperties();
ASSERT_EQ(properties.size(), 3u);
ASSERT_EQ(properties.at("disputed"), *feature->getValue("disputed"));
ASSERT_EQ(feature->getValue("invalid"), nullopt);
}