@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/ReadableMapToValue.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.utils;
-
-import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.mapbox.bindgen.Value;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class ReadableMapToValue {
-    static Value convert(Dynamic dynamic) {
-        switch (dynamic.getType()) {
-            case Map:
-                return Value.valueOf(convert(dynamic.asMap()));
-            case Array:
-                return Value.valueOf(convert(dynamic.asArray()));
-            case String:
-                return Value.valueOf(dynamic.asString());
-            case Number:
-                return Value.valueOf(dynamic.asDouble());
-            case Boolean:
-                return Value.valueOf(dynamic.asBoolean());
-            case Null:
-                return Value.nullValue();
-        }
-        return null;
-    }
-
-    static List<Value> convert(ReadableArray array) {
-        ArrayList<Value> list = new ArrayList<>();
-        for (int i = 0; i < array.size(); ++i) {
-            list.add(convert(array.getDynamic(i)));
-        }
-        return list;
-    }
-
-    public static HashMap<String, Value> convert(ReadableMap map) {
-        HashMap<String, Value> result = new HashMap<>();
-        for (Iterator<Map.Entry<String, Object>> it = map.getEntryIterator(); it.hasNext(); ) {
-            Map.Entry<String, Object> entry = it.next();
-
-            String key = entry.getKey();
-            result.put(key, convert(map.getDynamic(key)));
-        }
-        return result;
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/ResourceUtils.java

@@ -1,26 +0,0 @@
-package com.mapbox.rctmgl.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import androidx.core.content.ContextCompat;
-
-public class ResourceUtils {
-    public static Drawable getDrawableByName(Context context, String resourceName) {
-        if (context == null || resourceName == null || resourceName.isEmpty()) {
-            return null;
-        }
-
-        Resources resources = context.getResources();
-        if (resources == null) {
-            return null;
-        }
-
-        final int resID = resources.getIdentifier(resourceName, "drawable", context.getPackageName());
-        if (resID == 0) {
-            return null;
-        }
-        
-        return ContextCompat.getDrawable(context, resID);
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/CoordinateBounds.kt

@@ -1,17 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.mapbox.maps.CoordinateBounds
-import com.mapbox.rctmgl.utils.GeoJSONUtils
-import com.mapbox.rctmgl.utils.LatLng
-
-fun CoordinateBounds.toReadableArray() : ReadableArray {
-    val array = Arguments.createArray()
-    val ne = northeast
-    val sw = southwest
-
-    array.pushArray(GeoJSONUtils.fromLatLng(LatLng(ne.latitude(), ne.longitude())));
-    array.pushArray(GeoJSONUtils.fromLatLng(LatLng(sw.latitude(), sw.longitude())));
-    return array
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/FeatureCollection.kt

@@ -1,10 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.mapbox.geojson.FeatureCollection
-import com.mapbox.geojson.GeometryCollection
-
-fun FeatureCollection.toGeometryCollection(): GeometryCollection {
-    return GeometryCollection.fromGeometries(
-        this.features()!!.map { it.geometry() !! }
-    )
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/Geometry.kt

@@ -1,22 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.mapbox.geojson.BoundingBox
-import com.mapbox.geojson.Geometry
-import com.mapbox.geojson.Polygon
-import com.mapbox.turf.TurfMeasurement
-import org.json.JSONObject
-
-fun Geometry.toJSONObject(): JSONObject? {
-    return JSONObject(this.toJson())
-}
-
-fun Geometry.calculateBoundingBox(): BoundingBox {
-    val storedBBox = bbox()
-    if (storedBBox != null) {
-        return storedBBox
-    }
-    val bbox = TurfMeasurement.bbox(this)
-    return BoundingBox.fromLngLats(
-        bbox[0], bbox[1], bbox[2], bbox[3]
-    )
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/JSONObject.kt

@@ -1,78 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
-import com.mapbox.bindgen.Value
-import com.mapbox.geojson.Geometry
-import com.mapbox.geojson.Polygon
-import com.mapbox.rctmgl.utils.Logger
-import org.json.JSONArray
-import org.json.JSONObject
-
-fun JSONObject.toGeometry(): Geometry? {
-    when (this.optString("type")) {
-        "polygon", "Polygon" -> return Polygon.fromJson(this.toString())
-        else -> {
-            Logger.w("JSONObject", "Unexpected geometry: ${this.toString()}")
-            return null
-        }
-    }
-}
-
-fun JSONObject.toMapboxValue(): Value {
-    return Value.fromJson(this.toString()).value!!
-}
-
-fun JSONObject.toWritableMap(): WritableMap? {
-    val result = Arguments.createMap()
-    val iterator = keys()
-    while (iterator.hasNext()) {
-        val key = iterator.next()
-        val value = get(key)
-        if (value is JSONObject) {
-            result.putMap(key, value.toReadableMap());
-        } else if (value is JSONArray) {
-            result.putArray(key, value.toReadableArray());
-        } else if (value is  Boolean) {
-            result.putBoolean(key, value);
-        } else if (value is  Int) {
-            result.putInt(key, value);
-        } else if (value is  Double) {
-            result.putDouble(key, value);
-        } else if (value is String)  {
-            result.putString(key, value);
-        } else {
-            result.putString(key, value.toString());
-        }
-    }
-    return result
-}
-
-fun JSONObject.toReadableMap(): ReadableMap? {
-    return toWritableMap()
-}
-
-fun JSONArray.toReadableArray(): ReadableArray? {
-    val result = Arguments.createArray()
-    for (i in 0 until length()) {
-        val value: Any = get(i)
-        if (value is JSONObject) {
-            result.pushMap(value.toReadableMap())
-        } else if (value is JSONArray) {
-            result.pushArray(value.toReadableArray())
-        } else if (value is Boolean) {
-            result.pushBoolean(value)
-        } else if (value is Int) {
-            result.pushInt(value)
-        } else if (value is Double) {
-            result.pushDouble(value)
-        } else if (value is String) {
-            result.pushString(value)
-        } else {
-            result.pushString(value.toString())
-        }
-    }
-    return result
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/Point.kt

@@ -1,17 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.WritableNativeArray
-import com.mapbox.geojson.Point
-import com.mapbox.rctmgl.utils.Logger
-
-fun Point.toReadableArray() : ReadableArray {
-    val array = WritableNativeArray()
-    array.pushDouble(this.longitude())
-    array.pushDouble(this.latitude())
-    return array
-}
-
-fun Point.toDoubleArray() : DoubleArray {
-    return doubleArrayOf(this.longitude(), this.latitude())
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/ReadableArray.kt

@@ -1,38 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import android.graphics.RectF
-import com.facebook.react.bridge.ReadableArray
-import com.mapbox.geojson.Point
-import com.mapbox.maps.ScreenCoordinate
-import com.mapbox.rctmgl.utils.Logger
-import java.lang.Float.min
-import java.lang.Float.max
-
-fun ReadableArray.toCoordinate() : Point {
-    if (this.size() != 2) {
-        Logger.e("ReadableArray.toCoordinate","Cannot convert $this to point, 2 coordinates are required")
-    }
-    return Point.fromLngLat(
-        getDouble(0),
-        getDouble(1)
-    )
-}
-
-fun ReadableArray.toScreenCoordinate() : ScreenCoordinate {
-    if (this.size() != 2) {
-        Logger.e("ReadableArray.toCoordinate","Cannot convert $this to point, 2 coordinates are required")
-    }
-    return ScreenCoordinate(getDouble(0), getDouble(1))
-}
-
-fun ReadableArray.toRectF() : RectF? {
-    if (size() != 4) {
-        return null;
-    }
-    return RectF(
-        min(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        min(getDouble(0).toFloat(), getDouble(2).toFloat()),
-        max(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        max(getDouble(0).toFloat(), getDouble(2).toFloat())
-    )
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/ReadableMap.kt

@@ -1,11 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.facebook.react.bridge.ReadableMap
-
-fun ReadableMap.forEach(action: (String, Any) -> Unit) {
-    val iterator = this.entryIterator
-    while (iterator.hasNext()) {
-        val next = iterator.next()
-        action(next.key, next.value)
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/Value.kt

@@ -1,9 +0,0 @@
-package com.mapbox.rctmgl.utils.extensions
-
-import com.mapbox.bindgen.Value
-import org.json.JSONObject
-
-fun Value.toJSONObject(): JSONObject? {
-    val jsonString = this.toJson()
-    return JSONObject(jsonString)
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/utils/writeableMapArrayOf.kt

@@ -1,41 +0,0 @@
-package com.mapbox.rctmgl.utils
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableArray
-import com.facebook.react.bridge.WritableMap
-
-fun writableMapOf(vararg values: Pair<String, *>): WritableMap {
-    val map = Arguments.createMap()
-    for ((key, value) in values) {
-        when (value) {
-            null -> map.putNull(key)
-            is Boolean -> map.putBoolean(key, value)
-            is Double -> map.putDouble(key, value)
-            is Int -> map.putInt(key, value)
-            is Long -> map.putInt(key, value.toInt())
-            is String -> map.putString(key, value)
-            is WritableMap -> map.putMap(key, value)
-            is WritableArray -> map.putArray(key, value)
-            else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name} for key [$key]")
-        }
-    }
-    return map
-}
-
-fun writableArrayOf(vararg values: Any): WritableArray {
-    val array = Arguments.createArray()
-    for (value in values) {
-        when (value) {
-            null -> array.pushNull()
-            is Boolean -> array.pushBoolean(value)
-            is Double -> array.pushDouble(value)
-            is Int -> array.pushInt(value)
-            is Long -> array.pushInt(value.toInt())
-            is String -> array.pushString(value)
-            is WritableMap -> array.pushMap(value)
-            is WritableArray -> array.pushArray(value)
-            else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name}")
-        }
-    }
-    return array
-}

package/ios/RCTMGL/CameraMode.h

@@ -1,18 +0,0 @@
-//
-//  CameraMode.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/6/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface CameraMode : NSObject
-
-extern int const RCT_MAPBOX_CAMERA_MODE_FLIGHT;
-extern int const RCT_MAPBOX_CAMERA_MODE_EASE;
-extern int const RCT_MAPBOX_CAMERA_MODE_LINEAR;
-extern int const RCT_MAPBOX_CAMERA_MODE_NONE;
-
-@end

package/ios/RCTMGL/CameraMode.m

@@ -1,18 +0,0 @@
-//
-//  CameraMode.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/6/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "CameraMode.h"
-
-@implementation CameraMode
-
-int const RCT_MAPBOX_CAMERA_MODE_FLIGHT = 1;
-int const RCT_MAPBOX_CAMERA_MODE_EASE = 2;
-int const RCT_MAPBOX_CAMERA_MODE_LINEAR = 3;
-int const RCT_MAPBOX_CAMERA_MODE_NONE = 4;
-
-@end

package/ios/RCTMGL/CameraStop.h

@@ -1,26 +0,0 @@
-//
-//  CameraStop.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/5/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-@import Mapbox;
-#import "RCTMGLCamera.h"
-
-@interface CameraStop : NSObject
-
-@property (nonatomic, strong) NSNumber *pitch;
-@property (nonatomic, strong) NSNumber *heading;
-@property (nonatomic, strong) NSNumber *zoom;
-@property (nonatomic, strong) NSNumber *mode;
-@property (nonatomic, assign) NSTimeInterval duration;
-
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, assign) MGLCoordinateBounds bounds;
-@property (nonatomic, assign) UIEdgeInsets padding;
-
-+ (CameraStop*)fromDictionary:(NSDictionary*)args;
-
-@end

package/ios/RCTMGL/CameraStop.m

@@ -1,83 +0,0 @@
-//
-//  CameraStop.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/5/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "CameraStop.h"
-#import "CameraMode.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLCamera.h"
-
-@implementation CameraStop
-
-- (void)setMode:(NSNumber *)mode
-{
-    int modeInt = [mode intValue];
-    
-    if (modeInt == RCT_MAPBOX_CAMERA_MODE_FLIGHT) {
-        _mode = [NSNumber numberWithInt:modeInt];
-    } else if (modeInt == RCT_MAPBOX_CAMERA_MODE_NONE) {
-        _mode = [NSNumber numberWithInt:modeInt];
-    } else if (modeInt == RCT_MAPBOX_CAMERA_MODE_LINEAR) {
-        _mode = [NSNumber numberWithInt:modeInt];
-    } else {
-        _mode = [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE];
-    }
-}
-
--(id)init {
-     if (self = [super init])  {
-         self.coordinate = kCLLocationCoordinate2DInvalid;
-         self.bounds = MGLCoordinateBoundsMake(kCLLocationCoordinate2DInvalid, kCLLocationCoordinate2DInvalid);
-     }
-     return self;
-}
-
-
-+ (CameraStop*)fromDictionary:(NSDictionary *)args
-{
-    CameraStop *stop = [[CameraStop alloc] init];
-    
-    if (args[@"pitch"]) {
-        stop.pitch = args[@"pitch"];
-    }
-    
-    if (args[@"heading"]) {
-        stop.heading = args[@"heading"];
-    }
-
-    if (args[@"centerCoordinate"]) {
-        stop.coordinate = [RCTMGLUtils fromFeature:args[@"centerCoordinate"]];
-    }
-    
-    if (args[@"zoom"]) {
-        stop.zoom = args[@"zoom"];
-    }
-    
-    if (args[@"mode"]) {
-        stop.mode = args[@"mode"];
-    }
-    
-    if (args[@"bounds"]) {
-        stop.bounds = [RCTMGLUtils fromFeatureCollection:args[@"bounds"]];
-    }
-    
-    CGFloat paddingTop = args[@"paddingTop"] ? [args[@"paddingTop"] floatValue] : 0.0;
-    CGFloat paddingRight = args[@"paddingRight"] ? [args[@"paddingRight"] floatValue] : 0.0;
-    CGFloat paddingBottom = args[@"paddingBottom"] ? [args[@"paddingBottom"] floatValue] : 0.0;
-    CGFloat paddingLeft = args[@"paddingLeft"] ? [args[@"paddingLeft"] floatValue] : 0.0;
-    stop.padding = UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight);
-    
-    NSTimeInterval duration = 2.0;
-    if (args[@"duration"]) {
-        duration = [RCTMGLUtils fromMS:args[@"duration"]];
-    }
-    stop.duration = duration;
-    
-    return stop;
-}
-
-@end

package/ios/RCTMGL/CameraUpdateItem.h

@@ -1,18 +0,0 @@
-//
-//  CameraUpdateItem.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/6/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "CameraStop.h"
-#import "RCTMGLMapView.h"
-
-@interface CameraUpdateItem : NSObject
-
-@property (nonatomic, strong) CameraStop* _Nonnull cameraStop;
-
-- (void)execute:(RCTMGLMapView* _Nonnull)mapView withCompletionHandler:(nullable void (^)(void))completionHandler;
-
-@end

package/ios/RCTMGL/CameraUpdateItem.m

@@ -1,178 +0,0 @@
-//
-//  CameraUpdateItem.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/6/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "CameraUpdateItem.h"
-#import "CameraMode.h"
-
-
-@interface MGLMapView(FlyToWithPadding)
-- (void)_flyToCamera:(MGLMapCamera *)camera edgePadding:(UIEdgeInsets)insets withDuration:(NSTimeInterval)duration peakAltitude:(CLLocationDistance)peakAltitude completionHandler:(nullable void (^)(void))completion;
-@end
-
-@interface RCTMGLCameraWithPadding : MGLMapCamera
-
-@property (nonatomic) MGLMapCamera* _Nonnull camera;
-@property (nonatomic) UIEdgeInsets boundsPadding;
-
-@end
-
-@implementation RCTMGLCameraWithPadding
-
-@end
-
-@implementation CameraUpdateItem
-
-- (void)execute:(RCTMGLMapView *)mapView withCompletionHandler:(void (^)(void))completionHandler
-{
-    if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT]) {
-        [self _flyToCamera:mapView withCompletionHandler:completionHandler];
-    } else if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE]) {
-        [self _moveCamera:mapView animated:YES ease:YES withCompletionHandler:completionHandler];
-    } else if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_LINEAR]) {
-        [self _moveCamera:mapView animated:YES ease:NO withCompletionHandler:completionHandler];
-    } else {
-        [self _moveCamera:mapView animated:NO ease:NO withCompletionHandler:completionHandler];
-    }
-}
-
-- (void)_flyToCamera:(RCTMGLMapView*)mapView withCompletionHandler:(void (^)(void))completionHandler
-{
-    RCTMGLCameraWithPadding *nextCamera = [self _makeCamera:mapView];
-
-    if ([mapView respondsToSelector:@selector(_flyToCamera:edgePadding:withDuration:peakAltitude:completionHandler:)]) {
-        [mapView
-           _flyToCamera:nextCamera.camera
-           edgePadding:nextCamera.boundsPadding
-           withDuration:_cameraStop.duration
-           peakAltitude:-1
-           completionHandler:completionHandler];
-    } else {
-        [mapView
-           flyToCamera:nextCamera.camera
-           withDuration:_cameraStop.duration
-           completionHandler:completionHandler];
-    }
-}
-
-- (void)_moveCamera:(RCTMGLMapView*)mapView animated:(BOOL)animated ease:(BOOL)ease withCompletionHandler:(void (^)(void))completionHandler
-{
-        RCTMGLCameraWithPadding *nextCamera = [self _makeCamera:mapView];
-        NSString *easeFunctionName = ease ? kCAMediaTimingFunctionEaseInEaseOut : kCAMediaTimingFunctionLinear;
-
-        [mapView setCamera:nextCamera.camera
-                 withDuration:animated ? _cameraStop.duration : 0
-                 animationTimingFunction:[CAMediaTimingFunction functionWithName:easeFunctionName]
-                 edgePadding:nextCamera.boundsPadding
-                 completionHandler:completionHandler];
-}
-
-- (RCTMGLCameraWithPadding*)_makeCamera:(RCTMGLMapView*)mapView
-{
-    MGLMapCamera *nextCamera = [mapView.camera copy];
-
-    UIEdgeInsets padding = [self _clippedPadding:_cameraStop.padding forView:mapView];
-    if (padding.top <= 0 && padding.bottom <= 0) {
-      // If all padding properties are 0 in the update, and the bounds and centerCoordinate do not
-      // change, the padding doesn't change either. This seems to be a bug in the iOS SDK.
-      padding.top = 1.0;
-      padding.bottom = 1.0;
-    }
-  
-    bool hasSetAltitude = false;
-    
-    if ([self _isCoordValid:_cameraStop.coordinate]) {
-        MGLCoordinateBounds boundsFromCoord = { .sw =  _cameraStop.coordinate, .ne =  _cameraStop.coordinate };
-        MGLMapCamera *boundsCamera = [mapView
-            camera:nextCamera
-            fittingCoordinateBounds:boundsFromCoord
-            edgePadding: padding];
-        nextCamera.centerCoordinate = boundsCamera.centerCoordinate;
-    } else if ([self _areBoundsValid:_cameraStop.bounds]) {
-        MGLMapCamera *boundsCamera = [mapView
-            camera:nextCamera
-            fittingCoordinateBounds:_cameraStop.bounds
-            edgePadding: padding];
-        nextCamera.centerCoordinate = boundsCamera.centerCoordinate;
-        nextCamera.altitude = boundsCamera.altitude;
-        hasSetAltitude = true;
-    }
-  
-    if (_cameraStop.pitch != nil) {
-      nextCamera.pitch = [_cameraStop.pitch floatValue];
-    }
-    
-    if (_cameraStop.heading != nil) {
-      nextCamera.heading = [_cameraStop.heading floatValue];
-    }
-    
-    if (_cameraStop.zoom != nil && hasSetAltitude == false) {
-      nextCamera.altitude = [mapView
-           altitudeFromZoom:[_cameraStop.zoom doubleValue]
-           atLatitude:nextCamera.centerCoordinate.latitude
-           atPitch:nextCamera.pitch];
-    }
-  
-    RCTMGLCameraWithPadding* cameraWithPadding = [[RCTMGLCameraWithPadding alloc] init];
-    cameraWithPadding.camera = nextCamera;
-    cameraWithPadding.boundsPadding = padding;
-    return cameraWithPadding;
-}
-
-- (UIEdgeInsets)_clippedPadding:(UIEdgeInsets)padding forView:(RCTMGLMapView*)mapView
-{
-    UIEdgeInsets result = padding;
-    if ((padding.top + padding.bottom) >= mapView.frame.size.height) {
-        double totalPadding = padding.top + padding.bottom;
-        double extra = totalPadding - mapView.frame.size.height + 1.0;
-        result.top -= (padding.top * extra) / totalPadding;
-        result.bottom -= (padding.bottom * extra) / totalPadding;
-    }
-    if ((padding.left + padding.right) >= mapView.frame.size.width) {
-        double totalPadding = padding.left + padding.right;
-        double extra = totalPadding - mapView.frame.size.width + 1.0;
-        result.left -= (padding.left * extra) / totalPadding;
-        result.right -= (padding.right * extra) / totalPadding;
-    }
-    return result;
-}
-
-- (BOOL)_areBoundsValid:(MGLCoordinateBounds)bounds {
-    BOOL isValid = CLLocationCoordinate2DIsValid(bounds.ne) && CLLocationCoordinate2DIsValid(bounds.sw);
-    
-    if (!isValid) {
-        return NO;
-    }
-    
-    CLLocationCoordinate2D ne = bounds.ne;
-    CLLocationCoordinate2D sw = bounds.sw;
-    return [self _isCoordValid:ne] && [self _isCoordValid:sw];
-}
-
-- (BOOL)_isCoordValid:(CLLocationCoordinate2D)coord
-{
-    BOOL isValid = CLLocationCoordinate2DIsValid(coord);
-    
-    if (!isValid) {
-        return NO;
-    }
-    
-    return YES;
-}
-
-- (BOOL)_hasCenterCoordAndZoom
-{
-    BOOL isValid = CLLocationCoordinate2DIsValid(_cameraStop.coordinate) && _cameraStop.zoom != nil;
-    
-    if (!isValid) {
-        return NO;
-    }
-    
-    return [self _isCoordValid:_cameraStop.coordinate];
-}
-
-@end