summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-05-18 18:15:15 -0500
committerBrad Leege <bleege@gmail.com>2015-05-18 18:15:15 -0500
commitfa34b5396482faa66af0a38d24d724db026d722c (patch)
tree2770b40174454f6868fb4d40e65301b97cbfff68
parent14c62744c759d2326e757d6977d7380a40d75e6f (diff)
downloadqtlocation-mapboxgl-fa34b5396482faa66af0a38d24d724db026d722c.tar.gz
#1396 - Refactoring Metrics Test Server URL configuration to be drive via Info.plist
-rw-r--r--ios/app/app-info.plist2
-rw-r--r--platform/ios/MGLMapboxEvents.m8
m---------test/suite0
3 files changed, 9 insertions, 1 deletions
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/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index 5663e3f1c0..98bfe21cfe 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -14,7 +14,7 @@
#include <sys/sysctl.h>
static NSString *const MGLMapboxEventsUserAgent = @"MapboxEventsiOS/1.0";
-static NSString *const MGLMapboxEventsAPIBase = @"https://api.tiles.mapbox.com";
+static NSString *MGLMapboxEventsAPIBase = @"https://api.tiles.mapbox.com";
NSString *const MGLEventTypeMapLoad = @"map.load";
NSString *const MGLEventTypeMapTap = @"map.click";
@@ -230,6 +230,12 @@ const NSTimeInterval MGLFlushInterval = 60;
// Configure Events Infrastructure
// ===============================
+ // Check for TEST Metrics URL
+ NSString *testURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLMetricsTestServerURL"];
+ if (testURL != nil) {
+ MGLMapboxEventsAPIBase = testURL;
+ }
+
_paused = YES;
[self resumeMetricsCollection];
NSBundle *resourceBundle = [NSBundle bundleWithPath:[NSBundle mgl_resourceBundlePath]];
diff --git a/test/suite b/test/suite
-Subproject d4fb3445252aa7d0666bf563634d2007cb573c0
+Subproject fe4b1ff3717b1b67b82391f004db6c163806d08