From e4858b6a0270f6deb22ad2f97be658e9c510673c Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 8 Jan 2015 23:23:35 -0500 Subject: [PATCH 1/4] merge adjacent roads with same text for labelling js: https://github.com/mapbox/mapbox-gl-js/pull/683 --- src/mbgl/renderer/symbol_bucket.cpp | 62 +++++++++------- src/mbgl/renderer/symbol_bucket.hpp | 1 - src/mbgl/util/merge_lines.hpp | 110 ++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 26 deletions(-) create mode 100644 src/mbgl/util/merge_lines.hpp diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 0eadacec5..b0cfbf974 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -16,6 +16,7 @@ #include #include #include +#include namespace mbgl { @@ -145,7 +146,37 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress const FontStack &fontStack = glyphStore.getFontStack(properties.text.font); - for (const SymbolFeature &feature : features) { + std::vector>> geometries; + + for (unsigned int k = 0; k < features.size(); k++) { + const SymbolFeature &feature = features[k]; + + geometries.emplace_back(); + std::vector> &multiline = geometries.back(); + + // Decode all lines. + Geometry::command cmd; + bool first = true; + pbf geom(feature.geometry); + Geometry geometry(geom); + int32_t x, y; + while ((cmd = geometry.next(x, y)) != Geometry::end) { + if (first || cmd == Geometry::move_to) { + multiline.emplace_back(); + first = false; + } + multiline.back().emplace_back(x, y); + } + } + + if (properties.placement == PlacementType::Line) { + util::mergeLines(features, geometries); + } + + for (unsigned int k = 0; k < geometries.size(); k++) { + if (!geometries[k].size()) continue; + const SymbolFeature &feature = features[k]; + Shaping shaping; Rect image; GlyphPositions face; @@ -181,32 +212,13 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress // if either shaping or icon position is present, add the feature if (shaping.size() || image) { - addFeature(feature.geometry, shaping, face, image); - } - } -} - -void SymbolBucket::addFeature(const pbf &geom_pbf, const Shaping &shaping, - const GlyphPositions &face, const Rect &image) { - // Decode all lines. - std::vector line; - Geometry::command cmd; - - Coordinate coord; - pbf geom(geom_pbf); - Geometry geometry(geom); - int32_t x, y; - while ((cmd = geometry.next(x, y)) != Geometry::end) { - if (cmd == Geometry::move_to) { - if (!line.empty()) { - addFeature(line, shaping, face, image); - line.clear(); + std::vector> &multiline = geometries[k]; + for (const std::vector &line : multiline) { + if (line.size()) { + addFeature(line, shaping, face, image); + } } } - line.emplace_back(x, y); - } - if (line.size()) { - addFeature(line, shaping, face, image); } } diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index dd596b1a0..f90ff8999 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -77,7 +77,6 @@ private: std::vector processFeatures(const VectorTileLayer &layer, const FilterExpression &filter, GlyphStore &glyphStore, const Sprite &sprite); - void addFeature(const pbf &geom_pbf, const Shaping &shaping, const GlyphPositions &face, const Rect &image); void addFeature(const std::vector &line, const Shaping &shaping, const GlyphPositions &face, const Rect &image); diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/util/merge_lines.hpp new file mode 100644 index 000000000..433e0b276 --- /dev/null +++ b/src/mbgl/util/merge_lines.hpp @@ -0,0 +1,110 @@ +#ifndef MBGL_UTIL_MERGELINES +#define MBGL_UTIL_MERGELINES + +#include +#include +#include +#include +#include + + +#include +namespace mbgl { +namespace util { + +unsigned int mergeFromRight( + std::vector>> &geometries, + std::map &rightIndex, + std::map::iterator left, + std::string &rightKey, + std::vector> &geom) { + + unsigned int index = left->second; + rightIndex.erase(left); + rightIndex[rightKey] = index; + geometries[index][0].pop_back(); + geometries[index][0].insert(geometries[index][0].end(), geom[0].begin(), geom[0].end()); + geom[0].clear(); + return index; +} + +unsigned int mergeFromLeft( + std::vector>> &geometries, + std::map &leftIndex, + std::string &leftKey, + std::map::iterator right, + std::vector> &geom) { + + unsigned int index = right->second; + leftIndex.erase(right); + leftIndex[leftKey] = index; + geom[0].pop_back(); + geom[0].insert(geom[0].end(), geometries[index][0].begin(), geometries[index][0].end()); + geometries[index][0].clear(); + std::swap(geometries[index][0], geom[0]); + return index; +} + +std::string getKey(const std::u32string &text, const std::vector> &geom, bool onRight) { + const Coordinate &coord = onRight ? geom[0].back() : geom[0].front(); + std::ostringstream key; + for (const char32_t &c : text) { + key << (char)c; + } + key << ":" << coord.x << ":" << coord.y; + return key.str(); +} + + +void mergeLines(const std::vector &features, std::vector>> &geometries) { + + std::map leftIndex; + std::map rightIndex; + + if (features.size()) getKey(features[0].label, geometries[0], false); + + for (unsigned int k = 0; k < features.size(); k++) { + const SymbolFeature &feature = features[k]; + std::vector> &geometry = geometries[k]; + + if (!feature.label.length()) { + continue; + } + + std::string leftKey = getKey(feature.label, geometry, false); + std::string rightKey = getKey(feature.label, geometry, true); + + auto left = rightIndex.find(leftKey); + auto right = leftIndex.find(rightKey); + + if ((left != rightIndex.end()) && (right != leftIndex.end()) && (left->second != right->second)) { + // found lines with the same text adjacent to both ends of the current line, merge all three + unsigned int j = mergeFromLeft(geometries, leftIndex, leftKey, right, geometry); + unsigned int i = mergeFromRight(geometries, rightIndex, left, rightKey, geometries[j]); + + leftIndex.erase(leftIndex.find(leftKey)); + rightIndex.erase(rightIndex.find(rightKey)); + rightIndex[getKey(feature.label, geometries[i], true)] = i; + + } else if (left != rightIndex.end()) { + // found mergeable line adjacent to the start of the current line, merge + mergeFromRight(geometries, rightIndex, left, rightKey, geometry); + + } else if (right != leftIndex.end()) { + // found mergeable line adjacent to the end of the current line, merge + mergeFromLeft(geometries, leftIndex, leftKey, right, geometry); + + } else { + // no adjacent lines, add as a new item + leftIndex[leftKey] = k; + rightIndex[rightKey] = k; + } + + } + +} + +} // end namespace util +} // end namespace mbgl + +#endif From 5670fb397ffe7ce596d94a91ee5aaf5e2b348e9a Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 8 Jan 2015 23:50:12 -0500 Subject: [PATCH 2/4] get rid of separate vector for symbol geometries --- src/mbgl/renderer/symbol_bucket.cpp | 57 ++++++++++++----------------- src/mbgl/renderer/symbol_bucket.hpp | 2 +- src/mbgl/util/merge_lines.hpp | 33 ++++++++--------- 3 files changed, 40 insertions(+), 52 deletions(-) diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index b0cfbf974..c6a7c8c4e 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -86,11 +86,31 @@ std::vector SymbolBucket::processFeatures(const VectorTileLayer & } if (ft.label.length() || ft.sprite.length()) { - ft.geometry = feature.geometry; + + auto &multiline = ft.geometry; + + // Decode line + Geometry::command cmd; + pbf geom(feature.geometry); + Geometry geometry(geom); + bool first = true; + int32_t x, y; + while ((cmd = geometry.next(x, y)) != Geometry::end) { + if (first || cmd == Geometry::move_to) { + multiline.emplace_back(); + first = false; + } + multiline.back().emplace_back(x, y); + } + features.push_back(std::move(ft)); } } + if (properties.placement == PlacementType::Line) { + util::mergeLines(features); + } + glyphStore.waitForGlyphRanges(properties.text.font, ranges); sprite.waitUntilLoaded(); @@ -146,36 +166,8 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress const FontStack &fontStack = glyphStore.getFontStack(properties.text.font); - std::vector>> geometries; - - for (unsigned int k = 0; k < features.size(); k++) { - const SymbolFeature &feature = features[k]; - - geometries.emplace_back(); - std::vector> &multiline = geometries.back(); - - // Decode all lines. - Geometry::command cmd; - bool first = true; - pbf geom(feature.geometry); - Geometry geometry(geom); - int32_t x, y; - while ((cmd = geometry.next(x, y)) != Geometry::end) { - if (first || cmd == Geometry::move_to) { - multiline.emplace_back(); - first = false; - } - multiline.back().emplace_back(x, y); - } - } - - if (properties.placement == PlacementType::Line) { - util::mergeLines(features, geometries); - } - - for (unsigned int k = 0; k < geometries.size(); k++) { - if (!geometries[k].size()) continue; - const SymbolFeature &feature = features[k]; + for (const SymbolFeature &feature : features) { + if (!feature.geometry.size()) continue; Shaping shaping; Rect image; @@ -212,8 +204,7 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress // if either shaping or icon position is present, add the feature if (shaping.size() || image) { - std::vector> &multiline = geometries[k]; - for (const std::vector &line : multiline) { + for (const std::vector &line : feature.geometry) { if (line.size()) { addFeature(line, shaping, face, image); } diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index f90ff8999..bc148579f 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -30,7 +30,7 @@ class FontStack; class SymbolFeature { public: - pbf geometry; + std::vector> geometry; std::u32string label; std::string sprite; }; diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/util/merge_lines.hpp index 433e0b276..6e4c56125 100644 --- a/src/mbgl/util/merge_lines.hpp +++ b/src/mbgl/util/merge_lines.hpp @@ -8,12 +8,11 @@ #include -#include namespace mbgl { namespace util { unsigned int mergeFromRight( - std::vector>> &geometries, + std::vector &features, std::map &rightIndex, std::map::iterator left, std::string &rightKey, @@ -22,14 +21,14 @@ unsigned int mergeFromRight( unsigned int index = left->second; rightIndex.erase(left); rightIndex[rightKey] = index; - geometries[index][0].pop_back(); - geometries[index][0].insert(geometries[index][0].end(), geom[0].begin(), geom[0].end()); + features[index].geometry[0].pop_back(); + features[index].geometry[0].insert(features[index].geometry[0].end(), geom[0].begin(), geom[0].end()); geom[0].clear(); return index; } unsigned int mergeFromLeft( - std::vector>> &geometries, + std::vector &features, std::map &leftIndex, std::string &leftKey, std::map::iterator right, @@ -39,9 +38,9 @@ unsigned int mergeFromLeft( leftIndex.erase(right); leftIndex[leftKey] = index; geom[0].pop_back(); - geom[0].insert(geom[0].end(), geometries[index][0].begin(), geometries[index][0].end()); - geometries[index][0].clear(); - std::swap(geometries[index][0], geom[0]); + geom[0].insert(geom[0].end(), features[index].geometry[0].begin(), features[index].geometry[0].end()); + features[index].geometry[0].clear(); + std::swap(features[index].geometry[0], geom[0]); return index; } @@ -56,16 +55,14 @@ std::string getKey(const std::u32string &text, const std::vector &features, std::vector>> &geometries) { +void mergeLines(std::vector &features) { std::map leftIndex; std::map rightIndex; - - if (features.size()) getKey(features[0].label, geometries[0], false); for (unsigned int k = 0; k < features.size(); k++) { - const SymbolFeature &feature = features[k]; - std::vector> &geometry = geometries[k]; + SymbolFeature &feature = features[k]; + std::vector> &geometry = feature.geometry; if (!feature.label.length()) { continue; @@ -79,20 +76,20 @@ void mergeLines(const std::vector &features, std::vectorsecond != right->second)) { // found lines with the same text adjacent to both ends of the current line, merge all three - unsigned int j = mergeFromLeft(geometries, leftIndex, leftKey, right, geometry); - unsigned int i = mergeFromRight(geometries, rightIndex, left, rightKey, geometries[j]); + unsigned int j = mergeFromLeft(features, leftIndex, leftKey, right, geometry); + unsigned int i = mergeFromRight(features, rightIndex, left, rightKey, features[j].geometry); leftIndex.erase(leftIndex.find(leftKey)); rightIndex.erase(rightIndex.find(rightKey)); - rightIndex[getKey(feature.label, geometries[i], true)] = i; + rightIndex[getKey(feature.label, features[i].geometry, true)] = i; } else if (left != rightIndex.end()) { // found mergeable line adjacent to the start of the current line, merge - mergeFromRight(geometries, rightIndex, left, rightKey, geometry); + mergeFromRight(features, rightIndex, left, rightKey, geometry); } else if (right != leftIndex.end()) { // found mergeable line adjacent to the end of the current line, merge - mergeFromLeft(geometries, leftIndex, leftKey, right, geometry); + mergeFromLeft(features, leftIndex, leftKey, right, geometry); } else { // no adjacent lines, add as a new item From b54c0e24479c0b7b3d21cd30a24cc5b6fb2e2102 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Tue, 13 Jan 2015 22:26:37 -0500 Subject: [PATCH 3/4] simplify erase so you don't have to think about whether find might return an end() iterator (which is invalid for erase). --- src/mbgl/util/merge_lines.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/util/merge_lines.hpp index 6e4c56125..e0dd4c641 100644 --- a/src/mbgl/util/merge_lines.hpp +++ b/src/mbgl/util/merge_lines.hpp @@ -79,8 +79,8 @@ void mergeLines(std::vector &features) { unsigned int j = mergeFromLeft(features, leftIndex, leftKey, right, geometry); unsigned int i = mergeFromRight(features, rightIndex, left, rightKey, features[j].geometry); - leftIndex.erase(leftIndex.find(leftKey)); - rightIndex.erase(rightIndex.find(rightKey)); + leftIndex.erase(leftKey); + rightIndex.erase(rightKey); rightIndex[getKey(feature.label, features[i].geometry, true)] = i; } else if (left != rightIndex.end()) { From 4fbb7d614c93ac2d0146f2bf9c8e94fd2720b1ba Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Tue, 13 Jan 2015 22:29:28 -0500 Subject: [PATCH 4/4] port tests for mergeLines js: 867b7f4be01126663df609756049515a41e700d1 --- test/merge_lines.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++ test/test.gyp | 20 ++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 test/merge_lines.cpp diff --git a/test/merge_lines.cpp b/test/merge_lines.cpp new file mode 100644 index 000000000..3c887105f --- /dev/null +++ b/test/merge_lines.cpp @@ -0,0 +1,73 @@ +#include "gtest/gtest.h" + +#include + + +TEST(mergeLines, mergeLines) { + + std::u32string a = U"a"; + std::u32string b = U"b"; + + // merges lines with the same text + std::vector input1 = { + { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" }, + { {{{4, 0}, {5, 0}, {6, 0}}}, b, "" }, + { {{{8, 0}, {9, 0}}}, a, "" }, + { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" }, + { {{{6, 0}, {7, 0}, {8, 0}}}, a, "" }, + { {{{5, 0}, {6, 0}}}, a, "" } + }; + + std::vector expected1 = { + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}}}, a, "" }, + { {{{4, 0}, {5, 0}, {6, 0}}}, b, "" }, + { {{{5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}}}, a, "" }, + { {{}}, a, "" }, + { {{}}, a, "" }, + { {{}}, a, "" } + }; + + mbgl::util::mergeLines(input1); + + for (int i = 0; i < 6; i++) { + EXPECT_EQ(input1[i].geometry, expected1[i].geometry); + } + + // mergeLines handles merge from both ends + std::vector input2 = { + { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" }, + { {{{4, 0}, {5, 0}, {6, 0}}}, a, "" }, + { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" } + }; + + std::vector expected2 = { + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}}, a, "" }, + { {{}}, a, "" }, + { {{}}, a, "" } + }; + + mbgl::util::mergeLines(input2); + + for (int i = 0; i < 3; i++) { + EXPECT_EQ(input2[i].geometry, expected2[i].geometry); + } + + // mergeLines handles circular lines + std::vector input3 = { + { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" }, + { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" }, + { {{{4, 0}, {0, 0}}}, a, "" } + }; + + std::vector expected3 = { + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {0, 0}}}, a, "" }, + { {{}}, a, "" }, + { {{}}, a, "" } + }; + + mbgl::util::mergeLines(input3); + + for (int i = 0; i < 3; i++) { + EXPECT_EQ(input3[i].geometry, expected3[i].geometry); + } +} diff --git a/test/test.gyp b/test/test.gyp index e33cf3689..dd24f9084 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -167,6 +167,25 @@ }] ] }, + { 'target_name': 'merge_lines', + 'product_name': 'test_merge_lines', + 'type': 'executable', + 'sources': [ + './main.cpp', + './merge_lines.cpp', + ], + 'dependencies': [ + '../deps/gtest/gtest.gyp:gtest', + '../mapboxgl.gyp:mbgl-standalone', + ], + 'include_dirs': [ '../src' ], + 'conditions': [ + ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } + }, { + 'libraries': [ '<@(ldflags)' ], + }] + ] + }, { 'target_name': 'headless', 'product_name': 'test_headless', 'type': 'executable', @@ -236,6 +255,7 @@ 'variant', 'tile', 'functions', + 'merge_lines', 'headless', 'style_parser', 'comparisons',