diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-06 14:48:47 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-09-07 17:56:38 +0200 |
| commit | 1845919c25e5ff8845183e1d3e1eeed0b2f09e0c (patch) | |
| tree | 030319d09f82e1d2a12e4379a9124c4c41954ff6 | |
| parent | 3d960c8136541f1f6d71409e23b8f56eee9dd1d0 (diff) | |
| download | qtlocation-mapboxgl-1845919c25e5ff8845183e1d3e1eeed0b2f09e0c.tar.gz | |
[core] change bool onRight to Side
| -rw-r--r-- | src/mbgl/util/merge_lines.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mbgl/util/merge_lines.cpp b/src/mbgl/util/merge_lines.cpp index ee930c113e..0f2a955e95 100644 --- a/src/mbgl/util/merge_lines.cpp +++ b/src/mbgl/util/merge_lines.cpp @@ -40,9 +40,14 @@ unsigned int mergeFromLeft(std::vector<SymbolFeature> &features, return index; } +enum class Side { + Left = false, + Right = true, +}; + size_t -getKey(const std::u32string& text, const GeometryCollection& geom, bool onRight) { - const GeometryCoordinate& coord = onRight ? geom[0].back() : geom[0].front(); +getKey(const std::u32string& text, const GeometryCollection& geom, Side side) { + const GeometryCoordinate& coord = side == Side::Right ? geom[0].back() : geom[0].front(); auto hash = std::hash<std::u32string>()(text); boost::hash_combine(hash, coord.x); @@ -63,8 +68,8 @@ void mergeLines(std::vector<SymbolFeature> &features) { continue; } - const auto leftKey = getKey(feature.label, geometry, false); - const auto rightKey = getKey(feature.label, geometry, true); + const auto leftKey = getKey(feature.label, geometry, Side::Left); + const auto rightKey = getKey(feature.label, geometry, Side::Right); const auto left = rightIndex.find(leftKey); const auto right = leftIndex.find(rightKey); @@ -79,7 +84,7 @@ void mergeLines(std::vector<SymbolFeature> &features) { leftIndex.erase(leftKey); rightIndex.erase(rightKey); - rightIndex[getKey(feature.label, features[i].geometry, true)] = i; + rightIndex[getKey(feature.label, features[i].geometry, Side::Right)] = i; } else if (left != rightIndex.end()) { // found mergeable line adjacent to the start of the current line, merge |