[core] Don't redo placement for zoom changes at low pitch.

Fixes issue #9996 Port of GL-JS #5284
2017-09-14 10:03:39 -07:00
parent 00dde25022
commit 975d6b1698
1 changed files with 3 additions and 3 deletions
--- 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 {