diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-03-06 19:42:15 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-09 11:57:33 -0700 |
| commit | 56bc3052ac7b4cf236f04120592f1adf1861750b (patch) | |
| tree | 6c0252cfe20df157af5ca6593f0b7f2ad4ba0c79 /src | |
| parent | e57703d711eee356878f358d7a3c1ad323d137c2 (diff) | |
| download | qtlocation-mapboxgl-56bc3052ac7b4cf236f04120592f1adf1861750b.tar.gz | |
refactor vars
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/vector_tile.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp index 4cb06e917c..5244d61a2f 100644 --- a/src/mbgl/map/vector_tile.cpp +++ b/src/mbgl/map/vector_tile.cpp @@ -47,18 +47,18 @@ GeometryCollection VectorTileFeature::nextGeometry() { GeometryCollection result; - pbf current_geometry_pbf = geometry_pbf.message(); - PBFGeometry current_geometry(current_geometry_pbf); - int32_t x, y; - while (geometry_pbf.next(4)) { // geometry + pbf current_geometry_pbf = geometry_pbf.message(); + PBFGeometry current_geometry(current_geometry_pbf); + PBFGeometry::command cmd; + int32_t x, y; + if (type == GeometryFeatureType::Point) { current_geometry.next(x, y); GeometryPoint point(x, y); result.emplace_back(GeometryPoint(x, y)); } else if (type == GeometryFeatureType::LineString) { GeometryLine line; - PBFGeometry::command cmd; while ((cmd = current_geometry.next(x, y)) != PBFGeometry::end) { if (cmd == PBFGeometry::move_to) { if (!line.empty()) { @@ -73,7 +73,6 @@ GeometryCollection VectorTileFeature::nextGeometry() { } } else if (type == GeometryFeatureType::Polygon) { GeometryLine line; - PBFGeometry::command cmd; while ((cmd = current_geometry.next(x, y)) != PBFGeometry::end) { if (cmd == PBFGeometry::move_to) { if (line.size()) { |