diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-09-14 10:03:39 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-09-14 10:03:39 -0700 |
| commit | 8aa47e5ca97c9ff980c495644d1d912951aa48ba (patch) | |
| tree | d0c3febb2bdbcacdbfc4b54e95569e5242de8f42 | |
| parent | c795d96bfb980f8b60b9295b5182b2ee90893149 (diff) | |
| download | qtlocation-mapboxgl-upstream/cloer_9996.tar.gz | |
[core] Don't redo placement for zoom changes at low pitch.upstream/cloer_9996
Fixes issue #9996
Port of GL-JS #5284
| -rw-r--r-- | src/mbgl/text/placement_config.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/placement_config.hpp b/src/mbgl/text/placement_config.hpp index 1e1279341d..48b24b5f41 100644 --- a/src/mbgl/text/placement_config.hpp +++ b/src/mbgl/text/placement_config.hpp @@ -13,9 +13,9 @@ public: bool operator==(const PlacementConfig& rhs) const { return angle == rhs.angle && pitch == rhs.pitch && - cameraToCenterDistance == rhs.cameraToCenterDistance && - (pitch * util::RAD2DEG < 25 || cameraToTileDistance == rhs.cameraToTileDistance) && - debug == rhs.debug; + debug == rhs.debug && + ((pitch * util::RAD2DEG < 25) || + (cameraToCenterDistance == rhs.cameraToCenterDistance && cameraToTileDistance == rhs.cameraToTileDistance)); } bool operator!=(const PlacementConfig& rhs) const { |