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

Fixes issue #9996 Port of GL-JS #5284
mapbox · Sep 14, 2017 · 8aa47e5 · 8aa47e5
1 parent c795d96
commit 8aa47e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/mbgl/text/placement_config.hpp b/src/mbgl/text/placement_config.hpp
@@ -13,9 +13,9 @@ class PlacementConfig {
  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 {