diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-09 10:41:27 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-09 17:26:13 +0200 |
commit | d36958997b7db19d9d5e9ec8e5ea06210a598502 (patch) | |
tree | fde1d3e0c244233cb1cea5bb278c8238a48cda4b /src/mbgl/text | |
parent | b6b077d73aa63160b0860fd24e144f80f428ff1d (diff) | |
download | qtlocation-mapboxgl-d36958997b7db19d9d5e9ec8e5ea06210a598502.tar.gz |
[core] Add unit test for getAnchors and remove unused field
Diffstat (limited to 'src/mbgl/text')
-rw-r--r-- | src/mbgl/text/get_anchors.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/text/get_anchors.cpp b/src/mbgl/text/get_anchors.cpp index a2401a020a..714bc79fea 100644 --- a/src/mbgl/text/get_anchors.cpp +++ b/src/mbgl/text/get_anchors.cpp @@ -61,7 +61,7 @@ static Anchors resample(const GeometryCoordinates& line, if (x >= 0 && x < util::EXTENT && y >= 0 && y < util::EXTENT && markedDistance - halfLabelLength >= 0.0f && markedDistance + halfLabelLength <= lineLength) { - Anchor anchor(::round(x), ::round(y), angle, 0.5f, i); + Anchor anchor(::round(x), ::round(y), angle, i); if (!angleWindowSize || checkMaxAngle(line, anchor, labelLength, angleWindowSize, maxAngle)) { anchors.push_back(anchor); @@ -160,9 +160,9 @@ optional<Anchor> getCenterAnchor(const GeometryCoordinates& line, float t = (centerDistance - prevDistance) / segmentDistance, x = util::interpolate(float(a.x), float(b.x), t), y = util::interpolate(float(a.y), float(b.y), t); - - Anchor anchor(::round(x), ::round(y), util::angle_to(b, a), 0.5f, i); - + + Anchor anchor(::round(x), ::round(y), util::angle_to(b, a), i); + if (!angleWindowSize || checkMaxAngle(line, anchor, labelLength, angleWindowSize, maxAngle)) { return anchor; } |