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

Merge pull request #1164 from mapbox/1164-parsing-speed-regression

Browse Source 
Fix tile parsing performance regression
This commit is contained in:
Konstantin Käfer
2015-04-01 12:24:53 +02:00
parent 3d9b441c8b 2beb836a07
commit a0cbe920d8
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/mbgl/map/vector_tile.cpp
View File

@@ -35,26 +35,7 @@ VectorTileFeature::VectorTileFeature(pbf feature_pbf, const VectorTileLayer& lay
if (feature_pbf.tag == 1) { // id
id = feature_pbf.varint<uint64_t>();
} else if (feature_pbf.tag == 2) { // tags
// tags are packed varints. They should have an even length.
pbf tags = feature_pbf.message();
while (tags) {
uint32_t tag_key = tags.varint();
if (layer.keys.size() <= tag_key) {
throw std::runtime_error("feature referenced out of range key");
}
if (!tags) {
throw std::runtime_error("uneven number of feature tag ids");
}
uint32_t tag_val = tags.varint();
if (layer.values.size() <= tag_val) {
throw std::runtime_error("feature referenced out of range value");
}
properties.emplace(tag_key, tag_val);
}
tags_pbf = feature_pbf.message();
} else if (feature_pbf.tag == 3) { // type
type = (FeatureType)feature_pbf.varint();
} else if (feature_pbf.tag == 4) { // geometry
@@ -70,11 +51,30 @@ mapbox::util::optional<Value> VectorTileFeature::getValue(const std::string& key
if (keyIter == layer.keys.end()) {
return mapbox::util::optional<Value>();
}
auto propIter = properties.find(keyIter->second);
if (propIter == properties.end()) {
return mapbox::util::optional<Value>();
pbf tags = tags_pbf;
while (tags) {
uint32_t tag_key = tags.varint();
if (layer.keys.size() <= tag_key) {
throw std::runtime_error("feature referenced out of range key");
}
if (!tags) {
throw std::runtime_error("uneven number of feature tag ids");
}
uint32_t tag_val = tags.varint();
if (layer.values.size() <= tag_val) {
throw std::runtime_error("feature referenced out of range value");
}
if (tag_key == keyIter->second) {
return layer.values[tag_val];
}
}
return layer.values[propIter->second];
return mapbox::util::optional<Value>();
}
GeometryCollection VectorTileFeature::getGeometries() const {

2
src/mbgl/map/vector_tile.hpp
View File

@@ -22,7 +22,7 @@ private:
const VectorTileLayer& layer;
uint64_t id = 0;
FeatureType type = FeatureType::Unknown;
std::unordered_map<uint32_t, uint32_t> properties;
pbf tags_pbf;
pbf geometry_pbf;
};