diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-18 17:09:26 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-01 20:58:54 +0000 |
commit | f3fc87261c2f2db71ac9d63b680417836885da13 (patch) | |
tree | ac96b0dda727b5a262b664c121ae5579f9c0d645 /src/mbgl/text/check_max_angle.cpp | |
parent | 411a562061f404fa7174222f38a1a9a13a396fd9 (diff) | |
download | qtlocation-mapboxgl-f3fc87261c2f2db71ac9d63b680417836885da13.tar.gz |
[core] Coordinate is now GeometryCoordinate
Also introduced GeometryCoordinates (vector of GeometryCoordinate
items), to better cope with GeometryCollection.
Diffstat (limited to 'src/mbgl/text/check_max_angle.cpp')
-rw-r--r-- | src/mbgl/text/check_max_angle.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mbgl/text/check_max_angle.cpp b/src/mbgl/text/check_max_angle.cpp index bb32e4235e..4777f66a23 100644 --- a/src/mbgl/text/check_max_angle.cpp +++ b/src/mbgl/text/check_max_angle.cpp @@ -1,4 +1,7 @@ #include <mbgl/text/check_max_angle.hpp> +#include <mbgl/geometry/anchor.hpp> +#include <mbgl/util/math.hpp> + #include <queue> namespace mbgl{ @@ -10,14 +13,14 @@ struct Corner { float angleDelta; }; -bool checkMaxAngle(const std::vector<Coordinate> &line, Anchor &anchor, const float labelLength, +bool checkMaxAngle(const GeometryCoordinates &line, Anchor &anchor, const float labelLength, const float windowSize, const float maxAngle) { // horizontal labels always pass if (anchor.segment < 0) return true; - Coordinate anchorPoint = Coordinate{ (int16_t)anchor.x, (int16_t)anchor.y }; - Coordinate &p = anchorPoint; + GeometryCoordinate anchorPoint = { (int16_t)anchor.x, (int16_t)anchor.y }; + GeometryCoordinate &p = anchorPoint; int index = anchor.segment + 1; float anchorDistance = 0; |