7 files changed, 24 insertions, 46 deletions
diff --git a/ios/MapboxGL.podspec b/ios/MapboxGL.podspec
index 0da0081dbe..67bcc95710 100644
--- a/ios/MapboxGL.podspec
+++ b/ios/MapboxGL.podspec
@@ -1,15 +1,16 @@
 Pod::Spec.new do |m|
 
   m.name    = 'MapboxGL'
-  m.version = '0.2.23'
+  m.version = '0.3.1'
 
   m.summary          = 'Open source vector map solution for iOS with full styling capabilities.'
   m.description      = 'Open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.'
-  m.homepage         = 'https://www.mapbox.com/blog/mapbox-gl/'
+  m.homepage         = 'https://www.mapbox.com/mapbox-gl-ios/'
   m.license          = 'BSD'
   m.author           = { 'Mapbox' => 'mobile@mapbox.com' }
   m.screenshot       = 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png'
   m.social_media_url = 'https://twitter.com/mapbox'
+  m.documentation_url = 'https://www.mapbox.com/mapbox-gl-ios'
 
   m.source = {
     :http => "http://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-gl-ios-#{m.version.to_s}.zip",
diff --git a/ios/README.md b/ios/README.md
index 169da5ff89..4c387f322f 100644
--- a/ios/README.md
+++ b/ios/README.md
@@ -3,3 +3,5 @@
 An open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.
 
 For more information, check out [our online overview](https://www.mapbox.com/mapbox-gl-ios/). 
+
+![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png)
diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m
index 39868b174f..b09235a278 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/ios/app/MBXAppDelegate.m
@@ -1,8 +1,6 @@
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
 #import <mbgl/ios/MapboxGL.h>
-#import <mbgl/ios/MGLAccountManager.h>
-#import <mbgl/ios/MGLMapboxEvents.h>
 
 @implementation MBXAppDelegate
 
@@ -32,26 +30,4 @@
     return YES;
 }
 
-/**
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    // Example of how to resume Metrics Collection
-    
-    // Reasons for needing to resume:
-    // 1. In UIBackground and app starts listening for Location Updates where it previously had not been listening.
-    // 2. App is entering foreground where it had called pauseMetricsCollection.
-    [MGLMapboxEvents resumeMetricsCollection];
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    // Example of how to pause Metrics Collection
-    
-    // Reason for needing to pause:
-    // 1. Either entering or already in UIBackground and app stops listening for Location Updates
-    // via any CLLocationManager instance it may have.
-    [MGLMapboxEvents pauseMetricsCollection];
-}
-*/
-
 @end
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index eb77a2ec80..9ccda7ac6d 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -83,10 +83,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     [self restoreState:nil];
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)saveState:(NSNotification *)notification
+- (void)saveState:(__unused NSNotification *)notification
 {
     if (self.mapView && settings)
     {
@@ -101,7 +98,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-- (void)restoreState:(NSNotification *)notification
+- (void)restoreState:(__unused NSNotification *)notification
 {
     if (self.mapView && settings) {
         settings->load();
@@ -113,8 +110,6 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-#pragma clang diagnostic pop
-
 - (NSUInteger)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskAll;
@@ -277,17 +272,14 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
 #pragma mark - MGLMapViewDelegate
 
-- (BOOL)mapView:(MGLMapView *)mapView annotationCanShowCallout:(id <MGLAnnotation>)annotation
+- (BOOL)mapView:(__unused MGLMapView *)mapView annotationCanShowCallout:(__unused id <MGLAnnotation>)annotation
 {
     return YES;
 }
 
-- (void)mapView:(MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated
+- (void)mapView:(__unused MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(__unused BOOL)animated
 {
     UIImage *newButtonImage;
     
@@ -310,6 +302,4 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }];
 }
 
-#pragma clang diagnostic pop
-
 @end
diff --git a/ios/app/app-info.plist b/ios/app/app-info.plist
index fd03e73241..85afe3e7a2 100644
--- a/ios/app/app-info.plist
+++ b/ios/app/app-info.plist
@@ -47,5 +47,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>MGLMetricsTestServerURL</key>
+	<string>https://cloudfront-staging.tilestream.net</string>
 </dict>
 </plist>
diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm
index 1876a0c546..dfd3b254a3 100644
--- a/ios/benchmark/MBXBenchViewController.mm
+++ b/ios/benchmark/MBXBenchViewController.mm
@@ -1,12 +1,23 @@
 #import "MBXBenchViewController.h"
 
 #import <mbgl/ios/MGLMapView.h>
-#import <mbgl/ios/private/MGLMapView_Private.h>
 
 #include "locations.hpp"
 
 #include <chrono>
 
+@interface MGLMapView (MBXBenchmarkAdditions)
+
+#pragma mark - Debugging
+
+/** Triggers another render pass even when it is not necessary. */
+- (void)invalidate;
+
+/** Returns whether the map view is currently loading or processing any assets required to render the map */
+- (BOOL)isFullyLoaded;
+
+@end
+
 @interface MBXBenchViewController () <MGLMapViewDelegate>
 
 @property (nonatomic) MGLMapView *mapView;
@@ -77,11 +88,8 @@ static const int benchmarkDuration = 200; // frames
     }
 }
 
-- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered
+- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(__unused BOOL)fullyRendered
 {
-    (void)mapView;
-    (void)fullyRendered;
-
     if (state == State::Benchmarking)
     {
         frames++;
diff --git a/ios/benchmark/fo/benchmark-ios.gypi b/ios/benchmark/fo/benchmark-ios.gypi
index ff004add53..0a3440d5cd 100644
--- a/ios/benchmark/fo/benchmark-ios.gypi
+++ b/ios/benchmark/fo/benchmark-ios.gypi
@@ -26,7 +26,6 @@
 
       'sources': [
         './main.m',
-        '../../include/mbgl/ios/MGLMapView_private.h',
         './MBXBenchAppDelegate.h',
         './MBXBenchAppDelegate.m',
         './MBXBenchViewController.h',