[ios] chip

5 files changed, 69 insertions, 16 deletions

diff --git a/platform/ios/app/MBXTestViewController.h b/platform/ios/app/MBXTestViewController.h
new file mode 100644
index 0000000000..b068462f24
--- /dev/null
+++ b/platform/ios/app/MBXTestViewController.h
@@ -0,0 +1,17 @@
+//
+//  MBXTestViewController.h
+//  iosapp
+//
+//  Created by Jordan on 4/17/19.
+//  Copyright © 2019 Mapbox. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MBXTestViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/platform/ios/app/MBXTestViewController.m b/platform/ios/app/MBXTestViewController.m
new file mode 100644
index 0000000000..9083fe164b
--- /dev/null
+++ b/platform/ios/app/MBXTestViewController.m
@@ -0,0 +1,27 @@
+//
+//  MBXTestViewController.m
+//  iosapp
+//
+//  Created by Jordan on 4/17/19.
+//  Copyright © 2019 Mapbox. All rights reserved.
+//
+
+#import "MBXTestViewController.h"
+
+@interface MBXTestViewController ()
+
+@end
+
+@implementation MBXTestViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (IBAction)dismissVC:(id)sender {
+    NSLog(@"BYEEEEE");
+    [self dismissViewControllerAnimated:NO completion:nil];
+}
+
+@end
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index a1dd2d81be..f421266d44 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -294,7 +294,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         }
     }
     [self.mapView addGestureRecognizer:singleTap];
-    
+    [self.mapView removeAnnotations:self.mapView.annotations];
     // Display a secondary map on any connected external display.
     // https://developer.apple.com/documentation/uikit/windows_and_screens/displaying_content_on_a_connected_screen?language=objc
     self.helperWindows = [NSMutableArray array];
diff --git a/platform/ios/app/Main.storyboard b/platform/ios/app/Main.storyboard
index 22dda1d937..9acd874a85 100644
--- a/platform/ios/app/Main.storyboard
+++ b/platform/ios/app/Main.storyboard
@@ -466,10 +466,10 @@
             </objects>
             <point key="canvasLocation" x="2073" y="1082"/>
         </scene>
-        <!--View Controller-->
+        <!--Test View Controller-->
         <scene sceneID="CA1-w0-WrG">
             <objects>
-                <viewController storyboardIdentifier="TestViewContraller" modalPresentationStyle="overCurrentContext" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GJx-bG-Csz" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="TestViewContraller" modalPresentationStyle="overCurrentContext" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GJx-bG-Csz" customClass="MBXTestViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="lfe-Lv-9UZ">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -477,33 +477,35 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ebb-JT-aem">
                                 <rect key="frame" x="67" y="225" width="241" height="237"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uwx-u1-cIQ">
-                                        <rect key="frame" x="66" y="84" width="109" height="68"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uwx-u1-cIQ">
+                                        <rect key="frame" x="66" y="109" width="109" height="36"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <state key="normal" title="GO BACK        ">
                                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="titleShadowColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
                                         <connections>
-                                            <action selector="dismissVC:" destination="Mkp-39-rGL" eventType="touchUpInside" id="CLv-FL-ZC5"/>
-                                            <segue destination="PSe-Ot-7Ff" kind="show" id="Y1W-H4-LaP"/>
+                                            <action selector="dismissVC:" destination="GJx-bG-Csz" eventType="touchUpInside" id="RW1-bw-3Jm"/>
+                                            <action selector="dismissVC:" destination="Mkp-39-rGL" eventType="touchUpInside" id="bfi-qP-4VL"/>
                                         </connections>
                                     </button>
                                 </subviews>
                                 <color key="backgroundColor" red="0.7713280857" green="0.154259277" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerX" secondItem="Ebb-JT-aem" secondAttribute="centerX" id="kf5-XQ-IKQ"/>
-                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerY" secondItem="Ebb-JT-aem" secondAttribute="centerY" id="zDh-sq-na8"/>
+                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerY" secondItem="Ebb-JT-aem" secondAttribute="centerY" constant="8.5" id="4we-wY-elJ"/>
+                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="top" secondItem="Ebb-JT-aem" secondAttribute="top" constant="109" id="Snn-Ni-gaq"/>
+                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerX" secondItem="Ebb-JT-aem" secondAttribute="centerX" id="b2Y-Mo-bRc"/>
+                                    <constraint firstItem="Uwx-u1-cIQ" firstAttribute="leading" secondItem="Ebb-JT-aem" secondAttribute="leading" constant="66" id="mOc-Gv-MYH"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="Ebb-JT-aem" firstAttribute="top" secondItem="fqA-v0-5jT" secondAttribute="top" constant="205" id="45n-9z-nv8"/>
-                            <constraint firstItem="Ebb-JT-aem" firstAttribute="leading" secondItem="fqA-v0-5jT" secondAttribute="leading" constant="67" id="RDZ-Cn-F9L"/>
-                            <constraint firstItem="Ebb-JT-aem" firstAttribute="centerX" secondItem="fqA-v0-5jT" secondAttribute="centerX" id="nGy-4p-ZoI"/>
-                            <constraint firstItem="Ebb-JT-aem" firstAttribute="centerY" secondItem="fqA-v0-5jT" secondAttribute="centerY" id="qFA-1a-taz"/>
+                            <constraint firstItem="Ebb-JT-aem" firstAttribute="leading" secondItem="fqA-v0-5jT" secondAttribute="leading" constant="67" id="1xa-vy-dQT"/>
+                            <constraint firstItem="Ebb-JT-aem" firstAttribute="top" secondItem="fqA-v0-5jT" secondAttribute="top" constant="205" id="4cg-Uy-IYx"/>
+                            <constraint firstItem="Ebb-JT-aem" firstAttribute="centerX" secondItem="lfe-Lv-9UZ" secondAttribute="centerX" id="8wP-QZ-7Hy"/>
+                            <constraint firstItem="fqA-v0-5jT" firstAttribute="bottom" secondItem="Ebb-JT-aem" secondAttribute="bottom" constant="205" id="AER-B5-Jtz"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="fqA-v0-5jT"/>
                     </view>
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 42e30b1417..0c836efb88 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -421,6 +421,7 @@
 		96F3F73C1F57124B003E2D2C /* MGLUserLocationHeadingIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */; };
 		9C188C4F2242C95A0022FA55 /* MMEDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BBC1FE05D6E00C1BD0D /* MMEDate.m */; };
 		9C188C502242C96F0022FA55 /* MMEDate.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC51FE05D6F00C1BD0D /* MMEDate.h */; };
+		A408133E2267EABD00002AED /* MBXTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A408133D2267EABD00002AED /* MBXTestViewController.m */; };
 		A4F3FB1D2254865900A30170 /* missing_icon.json in Resources */ = {isa = PBXBuildFile; fileRef = A4F3FB1C2254865900A30170 /* missing_icon.json */; };
 		AC1B0916221CA14D00DB56C8 /* CLLocationManager+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = AC1B0914221CA14500DB56C8 /* CLLocationManager+MMEMobileEvents.h */; };
 		AC1B0917221CA14D00DB56C8 /* CLLocationManager+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = AC1B0914221CA14500DB56C8 /* CLLocationManager+MMEMobileEvents.h */; };
@@ -1080,6 +1081,8 @@
 		96ED34DD22374C0900E9FCA9 /* MGLMapViewDirectionTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLMapViewDirectionTests.mm; sourceTree = "<group>"; };
 		96F017292118FBAE00892778 /* MGLMapView_Experimental.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLMapView_Experimental.h; sourceTree = "<group>"; };
 		96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLUserLocationHeadingIndicator.h; sourceTree = "<group>"; };
+		A408133C2267EABD00002AED /* MBXTestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXTestViewController.h; sourceTree = "<group>"; };
+		A408133D2267EABD00002AED /* MBXTestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBXTestViewController.m; sourceTree = "<group>"; };
 		A4F3FB1C2254865900A30170 /* missing_icon.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = missing_icon.json; sourceTree = "<group>"; };
 		AC1B0914221CA14500DB56C8 /* CLLocationManager+MMEMobileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CLLocationManager+MMEMobileEvents.h"; path = "../vendor/mapbox-events-ios/MapboxMobileEvents/CLLocationManager+MMEMobileEvents.h"; sourceTree = "<group>"; };
 		AC1B0915221CA14C00DB56C8 /* CLLocationManager+MMEMobileEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CLLocationManager+MMEMobileEvents.m"; path = "../vendor/mapbox-events-ios/MapboxMobileEvents/CLLocationManager+MMEMobileEvents.m"; sourceTree = "<group>"; };
@@ -1848,6 +1851,8 @@
 				6FA9341621EF372100AA9CA8 /* MBXOrnamentsViewController.h */,
 				6FA9341521EF372100AA9CA8 /* MBXOrnamentsViewController.m */,
 				DA821D051CCC6D59007508D4 /* Main.storyboard */,
+				A408133C2267EABD00002AED /* MBXTestViewController.h */,
+				A408133D2267EABD00002AED /* MBXTestViewController.m */,
 				DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */,
 				DA1DC99E1CB6E088006E619F /* Assets.xcassets */,
 				DA1DC95E1CB6C1C2006E619F /* Info.plist */,
@@ -2776,6 +2781,7 @@
 					};
 					DA1DC9491CB6C1C2006E619F = {
 						CreatedOnToolsVersion = 7.3;
+						DevelopmentTeam = GJZR2MEM28;
 						LastSwiftMigration = 0820;
 					};
 					DA2E88501CC036F400F24E7B = {
@@ -2977,6 +2983,7 @@
 				DA1DC9991CB6E054006E619F /* MBXAppDelegate.m in Sources */,
 				6FA9341721EF372100AA9CA8 /* MBXOrnamentsViewController.m in Sources */,
 				DA1DC96B1CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m in Sources */,
+				A408133E2267EABD00002AED /* MBXTestViewController.m in Sources */,
 				DA1DC96A1CB6C6B7006E619F /* MBXCustomCalloutView.m in Sources */,
 				927FBCFC1F4DAA8300F8BF1F /* MBXSnapshotsViewController.m in Sources */,
 				DA1DC99B1CB6E064006E619F /* MBXViewController.m in Sources */,
@@ -3675,7 +3682,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = GJZR2MEM28;
 				INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL;
@@ -4002,7 +4009,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = GJZR2MEM28;
 				INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL;
@@ -4014,7 +4021,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = GJZR2MEM28;
 				INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL;