complement of https://github.com/mapbox/mapbox-gl-cocoa/pull/36

Makefile

@@ -78,9 +78,9 @@ xproj: config.gypi macosx/llmr-app.gyp clear_xcode_cache node
 	open ./build/macosx/llmr-app.xcodeproj
 
 # build iOS project for Xcode
-iproj: config.gypi ios/llmr-app.gyp clear_xcode_cache node
-	deps/run_gyp ios/llmr-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/ios/llmr-app.xcodeproj
+iproj: config.gypi ios/mapbox-gl-cocoa/app/llmr-app.gyp clear_xcode_cache node
+	deps/run_gyp ios/mapbox-gl-cocoa/app/llmr-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/ios/mapbox-gl-cocoa/app/llmr-app.xcodeproj
 
 # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
 lproj: config.gypi linux/llmr-app.gyp clear_xcode_cache node

ios/Info.plist

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.0.1</string>
-	<key>CFBundleSignature</key>
-	<string>LLMR</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2014 Mapbox</string>
-</dict>
-</plist>

ios/MBXAppDelegate.h

@@ -1,15 +0,0 @@
-//
-//  MBXAppDelegate.h
-//  ios
-//
-//  Created by Justin R. Miller on 1/27/14.
-//
-//
-
-#import <UIKit/UIKit.h>
-
-@interface MBXAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end

ios/MBXAppDelegate.m

@@ -1,24 +0,0 @@
-//
-//  MBXAppDelegate.m
-//  ios
-//
-//  Created by Justin R. Miller on 1/27/14.
-//
-//
-
-#import "MBXAppDelegate.h"
-
-#import "MBXViewController.h"
-
-@implementation MBXAppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    self.window.rootViewController = [MBXViewController new];
-    [self.window makeKeyAndVisible];
-
-    return YES;
-}
-
-@end

ios/MBXViewController.h

@@ -1,5 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface MBXViewController : UIViewController
-
-@end

ios/MBXViewController.mm

@@ -1,214 +0,0 @@
-#import "MBXViewController.h"
-
-#import "MGLMapView.h"
-
-#import "../common/settings_nsuserdefaults.hpp"
-
-#import <CoreLocation/CoreLocation.h>
-
-@interface MBXViewController () <CLLocationManagerDelegate>
-
-@property (nonatomic) MGLMapView *mapView;
-@property (nonatomic) BOOL debug;
-@property (nonatomic) UIView *palette;
-@property (nonatomic) CLLocationManager *locationManager;
-
-@end
-
-@implementation MBXViewController
-
-llmr::Settings_NSUserDefaults *settings = nullptr;
-
-#pragma mark - Setup
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(saveState:) name:UIApplicationDidEnterBackgroundNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(restoreState:) name:UIApplicationWillEnterForegroundNotification object:nil];
-    }
-
-    return self;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
-    self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [self.view addSubview:self.mapView];
-
-    self.mapView.viewControllerForLayoutGuides = self;
-
-    settings = new llmr::Settings_NSUserDefaults();
-    [self restoreState:nil];
-
-    [self setupDebugUI];
-
-    self.locationManager = [CLLocationManager new];
-    self.locationManager.delegate = self;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)saveState:(NSNotification *)notification
-{
-    if (self.mapView && settings)
-    {
-        settings->longitude = self.mapView.centerCoordinate.longitude;
-        settings->latitude = self.mapView.centerCoordinate.latitude;
-        settings->zoom = self.mapView.zoomLevel;
-        settings->angle = self.mapView.direction;
-        settings->debug = self.mapView.isDebugActive;
-        settings->save();
-    }
-}
-
-- (void)restoreState:(NSNotification *)notification
-{
-    if (self.mapView && settings) {
-        settings->load();
-        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(settings->latitude, settings->longitude) zoomLevel:settings->zoom animated:NO];
-        self.mapView.direction = settings->angle;
-        [self.mapView setDebugActive:settings->debug];
-    }
-}
-
-#pragma clang diagnostic pop
-
-- (void)setupDebugUI
-{
-    UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapGesture:)];
-    singleTap.numberOfTapsRequired = 1;
-    [self.mapView addGestureRecognizer:singleTap];
-
-    NSArray *selectorNames = @[ @"unrotate", @"resetPosition", @"toggleDebug", @"toggleStyle", @"locateUser" ];
-    CGFloat buttonSize  = 40;
-    CGFloat bufferSize  = 20;
-    CGFloat alpha       = 0.75;
-    CGFloat paletteWidth  = buttonSize + (2 * bufferSize);
-    CGFloat paletteHeight = [selectorNames count] * (buttonSize + bufferSize) + bufferSize;
-    self.palette = [[UIView alloc] initWithFrame:CGRectMake(self.view.bounds.size.width - paletteWidth,
-                                                            (self.view.bounds.size.height - paletteHeight) / 2,
-                                                            paletteWidth,
-                                                            paletteHeight)];
-    self.palette.backgroundColor = [UIColor colorWithWhite:0 alpha:alpha];
-    self.palette.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
-    self.palette.layer.cornerRadius = bufferSize;
-    [self.view addSubview:self.palette];
-    for (NSString *selectorName in selectorNames)
-    {
-        UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-        button.frame = CGRectMake(bufferSize,
-                                  ([selectorNames indexOfObject:selectorName] * (buttonSize + bufferSize)) + bufferSize,
-                                  buttonSize,
-                                  buttonSize);
-        [button setImage:[UIImage imageNamed:[selectorName stringByAppendingString:@".png"]] forState:UIControlStateNormal];
-        [button addTarget:self action:NSSelectorFromString(selectorName) forControlEvents:UIControlEventTouchUpInside];
-        [self.palette addSubview:button];
-    }
-}
-
-- (NSUInteger)supportedInterfaceOrientations
-{
-    return UIInterfaceOrientationMaskAll;
-}
-
-#pragma mark - Debugging UI
-
-- (void)handleSingleTapGesture:(UITapGestureRecognizer *)singleTap
-{
-    if (singleTap.state == UIGestureRecognizerStateEnded)
-    {
-        [self togglePalette];
-    }
-}
-
-- (void)togglePalette
-{
-    if (self.palette.alpha < 1)
-    {
-        self.palette.userInteractionEnabled = YES;
-
-        [UIView animateWithDuration:0.25 animations:^(void)
-        {
-            self.palette.alpha = 1;
-        }];
-    }
-    else
-    {
-        self.palette.userInteractionEnabled = NO;
-
-        [UIView animateWithDuration:0.25 animations:^(void)
-        {
-            self.palette.alpha = 0;
-        }];
-    }
-}
-
-- (void)unrotate
-{
-    [self.mapView resetNorth];
-}
-
-- (void)resetPosition
-{
-    [self.mapView resetPosition];
-}
-
-- (void)toggleDebug
-{
-    [self.mapView toggleDebug];
-
-    self.debug = ! self.debug;
-}
-
-- (void)toggleStyle
-{
-    [self.mapView toggleStyle];
-}
-
-- (void)locateUser
-{
-    [self.locationManager startUpdatingLocation];
-}
-
-#pragma mark - Destruction
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-
-    if (settings)
-    {
-        [self saveState:nil];
-        delete settings;
-        settings = nullptr;
-    }
-}
-
-#pragma mark - User location
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations
-{
-    CLLocation *latestLocation = locations.lastObject;
-
-    if ([latestLocation distanceFromLocation:[[CLLocation alloc] initWithLatitude:self.mapView.centerCoordinate.latitude longitude:self.mapView.centerCoordinate.longitude]] > 100)
-    {
-        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(latestLocation.coordinate.latitude, latestLocation.coordinate.longitude) zoomLevel:17 animated:YES];
-    }
-
-    [self.locationManager stopUpdatingLocation];
-}
-
-#pragma clang diagnostic pop
-
-@end

ios/llmr-app.gyp

@@ -1,70 +0,0 @@
-{
-  'includes': [
-    '../common.gypi',
-    '../config.gypi'
-  ],
-  'targets': [
-    {
-        "target_name": "iosapp",
-        "product_name": "Mapbox GL",
-        "type": "executable",
-        "sources": [
-            "./main.m",
-            "./MBXAppDelegate.h",
-            "./MBXAppDelegate.m",
-            "./MBXViewController.h",
-            "./MBXViewController.mm",
-            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "*.h")',
-            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "*.m")',
-            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "*.mm")',
-            "../common/settings_nsuserdefaults.hpp",
-            "../common/settings_nsuserdefaults.mm",
-            "../common/foundation_request.h",
-            "../common/foundation_request.mm",
-        ],
-        'product_extension': 'app',
-        'mac_bundle': 1,
-        'mac_bundle_resources': [
-          '<!@(find img -type f)',
-          '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa/Resources -type f)',
-          '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js'
-        ],
-        'link_settings': {
-          'libraries': [
-            '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
-            '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework',
-            '$(SDKROOT)/System/Library/Frameworks/GLKit.framework',
-            '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework',
-            '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework'
-          ],
-        },
-        'xcode_settings': {
-          'SDKROOT': 'iphoneos',
-          'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos'],
-          'ARCHS': [ "armv7", "armv7s", "arm64", "i386" ],
-          'INFOPLIST_FILE': 'Info.plist',
-          'CLANG_CXX_LIBRARY': 'libc++',
-          'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
-          'IPHONEOS_DEPLOYMENT_TARGET':'7.0',
-          'TARGETED_DEVICE_FAMILY': '1,2',
-          'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-          'CLANG_ENABLE_OBJC_ARC': 'YES'
-        },
-        'configurations': {
-          'Debug': {
-            'xcode_settings': {
-              'CODE_SIGN_IDENTITY': 'iPhone Developer',
-            }
-          },
-          'Release': {
-            'xcode_settings': {
-              'CODE_SIGN_IDENTITY': 'iPhone Distribution',
-            }
-          }
-        },
-        "dependencies": [
-            "../llmr.gyp:llmr-ios"
-        ]
-    }
-  ]
-}

ios/main.m

@@ -1,18 +0,0 @@
-//
-//  main.m
-//  ios
-//
-//  Created by Justin R. Miller on 1/27/14.
-//
-//
-
-#import <UIKit/UIKit.h>
-
-#import "MBXAppDelegate.h"
-
-int main(int argc, char * argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([MBXAppDelegate class]));
-    }
-}

macosx/ATTRIBUTION

@@ -1 +0,0 @@
-Icon from http://dryicons.com/icon/architecture-blueprint-icons-set/map/