diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-01-22 16:43:05 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-01-22 16:43:05 +0100 |
commit | 0f74a4bc90e1d4d69b50a443aa9f1ed42d071d4d (patch) | |
tree | d9894ef4a93a3a722b7b0e7215c33eb32ac25e52 /src/map/tile.cpp | |
parent | 7983b968d74a395b29dff01246fe0ee9d6d8149e (diff) | |
download | qtlocation-mapboxgl-0f74a4bc90e1d4d69b50a443aa9f1ed42d071d4d.tar.gz |
fill drawing
Diffstat (limited to 'src/map/tile.cpp')
-rw-r--r-- | src/map/tile.cpp | 140 |
1 files changed, 129 insertions, 11 deletions
diff --git a/src/map/tile.cpp b/src/map/tile.cpp index fb21f9d408..1d4a660ac5 100644 --- a/src/map/tile.cpp +++ b/src/map/tile.cpp @@ -78,6 +78,8 @@ void Tile::cancel() { } bool Tile::parse() { + std::lock_guard<std::mutex> lock(mtx); + if (state == obsolete) { return false; } @@ -95,10 +97,18 @@ bool Tile::parse() { tile.skip(); } } - } catch(const pbf::exception& ex) { + } catch (const pbf::exception& ex) { + fprintf(stderr, "[%p] parsing tile [%d/%d/%d]... failed: %s\n", this, id.z, id.x, id.y, ex.what()); + cancel(); + return false; + } catch (const Tile::exception& ex) { fprintf(stderr, "[%p] parsing tile [%d/%d/%d]... failed: %s\n", this, id.z, id.x, id.y, ex.what()); cancel(); return false; + } catch (const std::exception& ex) { + fprintf(stderr, "[%p] general exception [%d/%d/%d]... failed: %s\n", this, id.z, id.x, id.y, ex.what()); + cancel(); + return false; } if (state == obsolete) { @@ -107,15 +117,28 @@ bool Tile::parse() { state = ready; } + // int i = 0; + // for (const fill_index& index : fillIndices) { + // fprintf(stderr, "[%p] %d: vertex % 8d / % 8d\n", this, i, index.vertex_start, index.vertex_length); + // fprintf(stderr, "[%p] %d: elements % 8d / % 8d\n", this, i, index.elements_start, index.elements_length); + // i++; + // } + return true; } void Tile::parseLayer(const uint8_t *data, uint32_t bytes) { pbf layer(data, bytes); std::string name; + + uint32_t vertex_start = fillBuffer.vertex_length(); + uint32_t elements_start = fillBuffer.elements_length(); + fillIndices.emplace_back(vertex_start, elements_start); + while (layer.next()) { if (layer.tag == 1) { name = layer.string(); + fillIndices.back().name = name; } else if (layer.tag == 2) { uint32_t bytes = (uint32_t)layer.varint(); parseFeature(layer.data, bytes); @@ -126,8 +149,21 @@ void Tile::parseLayer(const uint8_t *data, uint32_t bytes) { } } + +enum geom_type { + Unknown = 0, + Point = 1, + LineString = 2, + Polygon = 3 +}; + + void Tile::parseFeature(const uint8_t *data, uint32_t bytes) { pbf feature(data, bytes); + + geom_type type = Unknown; + pbf geom; + while (feature.next()) { if (feature.tag == 1) { /*uint32_t id =*/ feature.varint(); @@ -138,27 +174,109 @@ void Tile::parseFeature(const uint8_t *data, uint32_t bytes) { /*uint32_t value =*/ feature.varint(); } } else if (feature.tag == 3) { - /*uint32_t type =*/ feature.varint(); + type = (geom_type)feature.varint(); } else if (feature.tag == 4) { - uint32_t bytes = (uint32_t)feature.varint(); - loadGeometry(feature.data, bytes); - feature.skipBytes(bytes); + geom = feature.message(); } else { feature.skip(); } } + + if (geom) { + if (type == LineString) { + addLineGeometry(geom); + } else if (type == Polygon) { + addFillGeometry(geom); + } + } } -void Tile::loadGeometry(const uint8_t *data, uint32_t bytes) { - geometry geometry(data, bytes); +void Tile::addFillGeometry(pbf& geom) { + + std::vector<std::vector<std::pair<int16_t, int16_t>>> lines; + + { + std::vector<std::pair<int16_t, int16_t>> line; + Geometry::command cmd; + int32_t x, y; + Geometry geometry(geom); + while ((cmd = geometry.next(x, y)) != Geometry::end) { + if (cmd == Geometry::move_to) { + if (line.size()) { + lines.push_back(line); + line.clear(); + } + } + line.emplace_back(x, y); + } + if (line.size()) { + lines.push_back(line); + } + } + + for (const std::vector<std::pair<int16_t, int16_t>>& line : lines) { + uint32_t vertex_start = fillBuffer.vertex_length(); - geometry::command cmd; + fillBuffer.addDegenerate(); + for (const std::pair<int16_t, int16_t>& coord : line) { + fillBuffer.addCoordinate(coord.first, coord.second); + } + + uint32_t vertex_end = fillBuffer.vertex_length(); + + if (vertex_end - vertex_start > 65535) { + throw geometry_too_long_exception(); + } + + if (!fillIndices.size()) { + // Create a new index because there is none yet. + throw std::runtime_error("no index yet"); + } + + fill_index& index = fillIndices.back(); + if (!index.groups.size()) { + throw std::runtime_error("no group yet"); + } + + uint32_t vertex_count = vertex_end - vertex_start; + index.length += vertex_count; + + if (index.groups.back().vertex_length + vertex_count > 65535) { + // Move to a new group because the old one can't hold the geometry. + index.groups.emplace_back(); + } + + fill_index::group& group = index.groups.back(); + + // We're generating triangle fans, so we always start with the first + // coordinate in this polygon. + // The first valid index that is not a degenerate. + uint16_t firstIndex = group.vertex_length + 1; + + assert(firstIndex + vertex_count - 1 < 65536); + + uint32_t elements_start = fillBuffer.elements_length(); + + for (uint32_t i = 2; i < vertex_count; i++) { + fillBuffer.addElements(firstIndex, firstIndex + i - 1, firstIndex + i); + } + + uint32_t elements_end = fillBuffer.elements_length(); + uint32_t elements_count = elements_end - elements_start; + group.vertex_length += vertex_count; + group.elements_length += elements_count; + } +} + +void Tile::addLineGeometry(pbf& geom) { + Geometry geometry(geom); + + Geometry::command cmd; int32_t x, y; - while ((cmd = geometry.next(x, y)) != geometry::end) { - if (cmd == geometry::move_to) { + while ((cmd = geometry.next(x, y)) != Geometry::end) { + if (cmd == Geometry::move_to) { lineVertex.addDegenerate(); } - lineVertex.addCoordinate(x, y); } } |