[ios] animate scale bar

mapbox · Apr 13, 2017 · c6fa267 · c6fa267
1 parent 724cda5
commit c6fa267
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
@@ -4,6 +4,8 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 
 ## master
 
+* Added a scale bar to MGLMapView that indicates the scale of the map. ([#7631](https://github.com/mapbox/mapbox-gl-native/pull/7631))
+
 ### Styles
 
 * MGLSymbolStyleLayer’s `iconImageName`, `iconScale`, `textFontSize`, `textOffset`, and `textRotation` properties can now be set to a source or composite function. ([#8544](https://github.com/mapbox/mapbox-gl-native/pull/8544), [#8590](https://github.com/mapbox/mapbox-gl-native/pull/8590), [#8592](https://github.com/mapbox/mapbox-gl-native/pull/8592), [#8593](https://github.com/mapbox/mapbox-gl-native/pull/8593))

diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
@@ -227,7 +227,7 @@ IB_DESIGNABLE
 
 /**
  A control indicating the scale of the map. The scale bar is positioned in the
- upper-left corner.
+ upper-left corner. The scale bar is hidden by default.
  */
 @property (nonatomic, readonly) UIView *scaleBar;
 

diff --git a/platform/ios/src/MGLScaleBar.mm b/platform/ios/src/MGLScaleBar.mm
@@ -235,7 +235,13 @@ - (void)updateVisibility {
     ? MGLMetricTable[count-1].distance
     : MGLImperialTable[count-1].distance;
 
-    self.alpha = maximumDistance > allowedDistance ? 0 : 1;
+    CGFloat alpha = maximumDistance > allowedDistance ? .0f : 1.0f;
+
+    if(self.alpha != alpha) {
+        [UIView animateWithDuration:.2f delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+            self.alpha = alpha;
+        } completion:nil];
+    }
 }
 
 - (void)setRow:(MGLRow)row {