summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-03-06 12:48:27 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-03-09 11:57:32 -0700
commit4d9c1a0f33019e688a58d673623a9e3e340993bd (patch)
tree5fb01b356874934df1186e421f17bb895f5191b2 /src
parent787cedb593663bbfe42bad6a938e5b3eb614e30c (diff)
downloadqtlocation-mapboxgl-4d9c1a0f33019e688a58d673623a9e3e340993bd.tar.gz
iterate through fresh copy of layer data
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/vector_tile.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp
index 338f2acaeb..5af24d6608 100644
--- a/src/mbgl/map/vector_tile.cpp
+++ b/src/mbgl/map/vector_tile.cpp
@@ -110,18 +110,18 @@ void VectorTile::logDebug() const {
VectorTileLayer::VectorTileLayer(pbf layer_pbf)
: feature_pbf(layer_pbf) {
- while (feature_pbf.next()) {
- if (feature_pbf.tag == 1) { // name
- name = feature_pbf.string();
- } else if (feature_pbf.tag == 3) { // keys
- keys.emplace_back(feature_pbf.string());
+ while (layer_pbf.next()) {
+ if (layer_pbf.tag == 1) { // name
+ name = layer_pbf.string();
+ } else if (layer_pbf.tag == 3) { // keys
+ keys.emplace_back(layer_pbf.string());
key_index.emplace(keys.back(), keys.size() - 1);
- } else if (feature_pbf.tag == 4) { // values
- values.emplace_back(std::move(parseValue(feature_pbf.message())));
- } else if (feature_pbf.tag == 5) { // extent
- extent = feature_pbf.varint();
+ } else if (layer_pbf.tag == 4) { // values
+ values.emplace_back(std::move(parseValue(layer_pbf.message())));
+ } else if (layer_pbf.tag == 5) { // extent
+ extent = layer_pbf.varint();
} else {
- feature_pbf.skip();
+ layer_pbf.skip();
}
}
}