From 1845919c25e5ff8845183e1d3e1eeed0b2f09e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 6 Sep 2016 14:48:47 +0200 Subject: [PATCH] [core] change bool onRight to Side --- src/mbgl/util/merge_lines.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mbgl/util/merge_lines.cpp b/src/mbgl/util/merge_lines.cpp index ee930c113..0f2a955e9 100644 --- a/src/mbgl/util/merge_lines.cpp +++ b/src/mbgl/util/merge_lines.cpp @@ -40,9 +40,14 @@ unsigned int mergeFromLeft(std::vector &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()(text); boost::hash_combine(hash, coord.x); @@ -63,8 +68,8 @@ void mergeLines(std::vector &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 &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