diff options
| -rw-r--r-- | CONTRIBUTING.md | 11 | ||||
| -rw-r--r-- | INSTALL.md | 347 | ||||
| -rw-r--r-- | README.md | 280 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 2 | ||||
| -rw-r--r-- | include/mbgl/ios/MGLOverlay.h | 2 | ||||
| -rw-r--r-- | include/mbgl/ios/Mapbox.h (renamed from include/mbgl/ios/MapboxGL.h) | 0 | ||||
| -rw-r--r-- | ios/FAQ.md | 49 | ||||
| -rw-r--r-- | ios/Mapbox-iOS-SDK.podspec (renamed from ios/MapboxGL.podspec) | 7 | ||||
| -rw-r--r-- | ios/app/MBXAppDelegate.m | 2 | ||||
| -rw-r--r-- | ios/app/MBXViewController.mm | 2 | ||||
| -rw-r--r-- | ios/app/README.md | 3 | ||||
| -rwxr-xr-x | ios/docs/install_docs.sh | 2 | ||||
| -rw-r--r-- | ios/docs/pod-README.md (renamed from ios/README.md) | 2 | ||||
| -rw-r--r-- | platform/darwin/asset_root.mm | 2 | ||||
| -rw-r--r-- | platform/ios/MGLMapView.mm | 6 | ||||
| -rw-r--r-- | platform/ios/NSBundle+MGLAdditions.m | 2 | ||||
| -rwxr-xr-x | scripts/ios/package.sh | 6 | ||||
| -rw-r--r-- | test/ios/KIFTestActor+MapboxGL.m | 2 | ||||
| -rw-r--r-- | test/ios/MGLTAppDelegate.m | 2 | ||||
| -rw-r--r-- | test/ios/MGLTViewController.m | 2 | ||||
| -rw-r--r-- | test/ios/MapViewTests.m | 2 | ||||
| -rw-r--r-- | test/ios/MetricsTests.m | 2 | ||||
| -rw-r--r-- | test/ios/ios-tests.xcodeproj/project.pbxproj | 16 |
23 files changed, 400 insertions, 351 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..3348bf9029 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# Contributing + +If you have a usage question for a product built on Mapbox GL (such as Mapbox Mobile toolkits like our SDKs), please visit https://www.mapbox.com/help/. + +If you want to contribute code: + +1. Please familiarize yourself with the [install process](INSTALL.md). + +1. Ensure that the [existing issues](https://github.com/mapbox/mapbox-gl-native/issues?utf8=✓&q=) don't already cover your question or contribution. + +1. Pull requests gladly accepted. diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000000..73d6f5d5e8 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,347 @@ +# Install + +This document describes the process for setting up Mapbox GL for development _on the framework itself_. + +# Depends + + - Modern C++ compiler that supports `-std=c++14` (clang++ 3.5 or later or g++-4.9 or later) + - [Boost headers](http://boost.org/) + - [`zlib`](http://www.zlib.net/) + - [`libpng`](http://www.libpng.org/pub/png/libpng.html) + - [`libuv 0.10+`](https://github.com/joyent/libuv) + - [`glfw 3.1+`](http://www.glfw.org/) + - [`libcurl`](http://curl.haxx.se/libcurl/) (depends on OpenSSL; Linux only) + - Apple Command Line Tools (for build on OS X; available at [Apple Developer](https://developer.apple.com/downloads)) + - `pkg-config` (for build only) + - [Homebrew](http://brew.sh) (for building on OS X) + - [xcpretty](https://github.com/supermarin/xcpretty) (for building on OS X) + - [Cask](http://caskroom.io/) (for building Android on OS X) + - Python 2.x (for build only) + +# Build instructions + +We try to link to as many system-provided libraries as possible. When these are unavailable or too outdated, we run a thin build-script layer called [Mason](https://github.com/mapbox/mason) to automate builds, and load precompiled binary packages when possible. + +Be sure to pull down all submodules first: + + git submodule init + git submodule update + +## OS X + +This process gives you either a native OS X windowed app or a Linux desktop app with a map view for development purposes, built on an OS X host system. + +### Build + +ImageMagick is required for tests. It's recommended to install it with [Homebrew](http://brew.sh/) via `brew install imagemagick`. + +To create projects, you can run: + +- `make xproj`: Creates an Xcode project with OS X-specific handlers for HTTP downloads and settings storage. It uses [GLFW](http://www.glfw.org) for window handling. +- `make lproj`: Creates an Xcode project with platform-independent handlers for downloads and settings storage. This is what is also being built on Linux. +- `make osx run-osx`: Builds and runs the OS X application on the command line with `xcodebuild`. +- `make linux run-linux`: Builds and runs the Linux application with `make`. + +Note that you can't have more than one project in Xcode open at a time since the static library project is shared across the OS X, Linux and iOS project. + +### Test + +- `make test-*` Builds and runs all tests. You can specify individual tests by replacing * with their name. + +### Usage + +- Press `S` to cycle through bundled styles +- Press `X` to reset the transform +- Press `N` to reset north +- Press `Tab` to toggle debug information +- Press `C` to toggle symbol collision debug boxes +- Press `Esc` to quit +- Press `1` through `6` to add increasing numbers of point annotations for testing + +### Target + +OS X 10.9+ + + +## iOS (Test App) + +This process gives you a native iOS app for simulator or device which compiles the source to GL within it for fastest turnaround time during development. Normal, production use of the library is via a precompiled binary linked into the app target. + +Developing for iOS implies an OS X host system. + +### Build + +If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app. If you don't have an Apple Developer account, change the destination from "My Mac" to a simulator such as "iPhone 6" before you run and build the app. + +### Test + +You can run `make itest` to run the included integration tests. Requires `gem install xcpretty`. If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `test/ios/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target. + +### Usage + +- Pan to move +- Pinch to zoom +- Use two fingers to rotate +- Double-tap to zoom in one level +- Two-finger single-tap to zoom out one level +- Double-tap, long-pressing the second, then pan up and down to "quick zoom" (iPhone only, meant for one-handed use) +- Use the debug menu to add test annotations, reset position, and toggle debug info. + +## iOS (Your App) + +**If you want a production version of this project, use [Mapbox Mobile](http://mapbox.com/mobile).** + +This section is for people contributing to Mapbox GL directly in the context of their own app. + +### Build + +1. Install [appledoc](http://appledoc.gentlebytes.com/appledoc/) 2.2v963 for API docs generation (only this exact version works right now ([#2117](https://github.com/mapbox/mapbox-gl-native/issues/2117)). + + ``` + curl -L -o appledoc.zip https://github.com/tomaz/appledoc/releases/download/v2.2-963/appledoc.zip + unzip appledoc.zip + cp appledoc /usr/local/bin + cp -Rf Templates/ ~/.appledoc + ``` + +1. Run `make ipackage`. The packaging script will produce the statically-linked `libMapbox.a`, `Mapbox.bundle` for resources, a `Headers` folder, and a `Docs` folder with HTML API documentation. + +### Test + +In the context of your own app, you can now either: + +#### CocoaPods + +Currently, until [#1437](https://github.com/mapbox/mapbox-gl-native/issues/1437) is completed, to install a _development version_ of Mapbox GL using CocoaPods you will need to build it from source manually per above. + +1. Zip up the build product. + + cd build/ios/pkg/static + ZIP=mapbox-gl-ios.zip + rm -f ../${ZIP} + zip -r ../${ZIP} * + +1. Modify a custom `Mapbox-iOS-SDK.podspec` to download this zip file. + + {...} + + m.source = { + :http => "http://{...}/mapbox-gl-ios.zip", + :flatten => true + } + + {...} + +1. Update your app's `Podfile` to point to the `Mapbox-iOS-SDK.podspec`. + + pod 'Mapbox-iOS-SDK', :podspec => 'http://{...}/Mapbox-iOS-SDK.podspec' + +1. Run `pod update` to grab the newly-built library. + +#### Binary + +1. Built from source manually per above. + +1. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that: + + - `Headers` is in your *Header Search Paths* (`HEADER_SEARCH_PATHS`) build setting. + - `Mapbox.bundle` is in your target's *Copy Bundle Resources* build phase. + - `libMapbox.a` is in your target's *Link Binary With Libraries* build phase. + +1. Add the following Cocoa framework dependencies to your target's *Link Binary With Libraries* build phase: + + - `CoreTelephony.framework` + - `GLKit.framework` + - `ImageIO.framework` + - `MobileCoreServices.framework` + - `QuartzCore.framework` + - `SystemConfiguration.framework` + - `libc++.dylib` + - `libsqlite3.dylib` + - `libz.dylib` + +1. Add `-ObjC` to your target's "Other Linker Flags" build setting (`OTHER_LDFLAGS`). + +### Target + +Devices: iPhone 4S and above (5, 5c, 5s, 6, 6 Plus), iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2), iPod touch 5th gen and above + +iOS: 7.0+ + + +## Linux + +We are using Ubuntu for development. While the software should work on other distributions as well, we are not providing explicit build instructions here. + +This process gives you a Linux desktop app built on a Linux host system. + +### Build + +Install GCC 4.9+ if you are running Ubuntu 14.04 or older. Alternatively, you can also use [Clang 3.5+](http://llvm.org/apt/). + + sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test + sudo apt-get update + sudo apt-get install gcc-4.9 g++-4.9 + export CXX=g++-4.9 + +Ensure you have git and other build essentials: + + sudo apt-get install curl git build-essential zlib1g-dev automake \ + libtool xutils-dev make cmake pkg-config python-pip \ + libcurl4-openssl-dev libpng-dev libsqlite3-dev \ + libllvm3.4 + +Install glfw3 dependencies: + + sudo apt-get install libxi-dev libglu1-mesa-dev x11proto-randr-dev \ + x11proto-xext-dev libxrandr-dev \ + x11proto-xf86vidmode-dev libxxf86vm-dev \ + libxcursor-dev libxinerama-dev + +Then, you can then proceed to build the library: + + git submodule update --init + make linux + +Set an access token as described below, and then run: + + make run-linux + +### Test + +- `make test-*` Builds and runs all tests. You can specify individual tests by replacing * with their name. + +### Usage + +- Press `S` to cycle through bundled styles +- Press `X` to reset the transform +- Press `N` to reset north +- Press `Tab` to toggle debug information +- Press `C` to toggle symbol collision debug boxes +- Press `Esc` to quit +- Press `1` through `6` to add increasing numbers of point annotations for testing + +### Target + +Ubuntu + + +## Android + +### Build (Linux Host) + +Install a few build dependencies: + + apt-get install -y make git build-essential automake \ + libtool make cmake pkg-config lib32stdc++6 lib32z1 + +Install Oracle JDK 7 (requires license agreement) from http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html + + export JAVA_HOME="/dir/to/jdk1.7.0_71" + +Install the [Android NDK Revision 10e](https://developer.android.com/tools/sdk/ndk/index.html). + + export ANDROID_NDK_PATH="/dir/to/android-ndk-r10e" + +Install the Android SDK. We recommend doing this by way of [Android Studio](https://developer.android.com/sdk/installing/studio.html). + + export ANDROID_HOME="/dir/to/android-sdk-linux" + +Run: + + make android + +You can then open `android/java` in Android Studio via "Import Non-Android Studio Project". + +### Build (OS X Host) + +Install Oracle JDK 7+: + + brew cask install java + +Install the [Android NDK Revision 10e](https://developer.android.com/tools/sdk/ndk/index.html) for 64-bit OS X: + + brew install android-ndk + +This will also install the dependency `android-sdk`. + +Install [Android Studio](https://developer.android.com/sdk/installing/studio.html): + + brew cask install android-studio + android + +By default, the SDK will be installed to `/usr/local/opt/android-sdk`. If you open Android Studio at this point, you may get an error message telling you that it can't find a JVM, it's because you installed a custom Java VM from Oracle. Follow [these instructions](http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released) to start Android Studio. You'll wind up setting these environment variables in your .bash_profile or similar: + + echo "export ANDROID_HOME=`brew --prefix android-sdk`" >> .bash_profile + echo "export ANDROID_NDK_PATH=`brew --cellar android-ndk`/r10e" >> .bash_profile + # Replace <path to JDK> with something like /Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk + echo "export JAVA_HOME=<path to JDK>" >> .bash_profile + echo "export STUDIO_JDK=$JAVA_HOME" >> .bash_profile + +Run: + + make android + open -a Android\ Studio + +You can then open `android/java` in Android Studio via "Import Non-Android Studio Project". + +### Setting up Android emulator + +If you want to run the test app in the emulator, we recommend the x86 build because it will run a lot faster. + +First ensure you have an `MAPBOX_ACCESS_TOKEN` environment variable set, as described below. Then, create an x86 build: + + ANDROID_ABI=x86 make android + +In Android Studio, create an x86 AVD (Android Virtual Device): + +- Open AVD Manager via the Tools menu -> Android -> AVD Manager +- Click "Create Virtual Device" at the bottom on AVD Manager window +- Select one of the device profiles, for example the Nexus 4 +- Click "Next" +- Select a Lollipop or Kitkat release with ABI of x86. If the line is greyed out click Download to download the OS files. +- Click "Next" +- Under "Emulated Performance" check "Host GPU" and uncheck "Store a snapshot for faster startup" +- Click "Finish" +- Close the AVD Manager + +Now when you run or debug the Android project you will see a window "Choose Device". Select your new AVD from drop down under "Launch emulator". If you select "Use same device for future launches" Android Studio will remember the selection and not ask again. + +### Running on a hardware device + +First read the [Google documentation](http://developer.android.com/tools/device.html) to set up your device and your OS to connect to the device. + +When you plug your device in and then run or debug the Android project you will see a window "Choose Device". Choose your device from the "Choose a running device" list. + +If your device does not show up, you have not set it up properly. Double check the [Google documentation](http://developer.android.com/tools/device.html). + +### Target + +Devices running Android 4.0+ (API level 14+). + + +# Troubleshooting + +To trigger a complete rebuild, run `make clean` and then start over generating the Xcode projects or `Makefile` as described above. + +If you are having trouble getting the dependencies right, you can blow away the `mason_packages` directory, or run `make distclean`. This means the `Makefile` and configure script will automatically install the dependencies again on the next try. + +On OS X, you can also try clearing the Xcode cache with `make clear_xcode_cache`. + +# Mapbox API access tokens + +The demo applications use Mapbox vector tiles, which **require a Mapbox account and API access token**. Obtain an access token on the [Mapbox account page](https://www.mapbox.com/account/apps/). + +For iOS and OS X use of the demo apps in Xcode, setup the access token by editing the scheme for the application target, then adding an environment variable with the name `MAPBOX_ACCESS_TOKEN`. + + + + + +For Linux, set the environment variable `MAPBOX_ACCESS_TOKEN` to your token. + +For Android, gradle will take the value of `MAPBOX_ACCESS_TOKEN` and save it to `android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt` where the app will read it from. + +# Style + +Default styles in the JSON-based [styling format](https://github.com/mapbox/mapbox-gl-style-spec) are included at `./styles` as a submodule. See the [styles project](https://github.com/mapbox/mapbox-gl-styles) to report problems or to contribute to these styles. @@ -1,276 +1,18 @@ -[](https://travis-ci.org/mapbox/mapbox-gl-native/builds) - -An OpenGL renderer for [Mapbox Vector Tiles](https://www.mapbox.com/blog/vector-tiles), consisting of a C++ library for OS X and Linux and SDK bindings for iOS and Android. - -# Depends - - - Modern C++ compiler that supports `-std=c++14` (clang++ 3.5 or later or g++-4.9 or later) - - [Boost headers](http://boost.org/) - - [`zlib`](http://www.zlib.net/) - - [`libpng`](http://www.libpng.org/pub/png/libpng.html) - - [`libuv 0.10+`](https://github.com/joyent/libuv) - - [`glfw 3.1+`](http://www.glfw.org/) - - [`libcurl`](http://curl.haxx.se/libcurl/) (depends on OpenSSL; Linux only) - - Apple Command Line Tools (for build on OS X; available at [Apple Developer](https://developer.apple.com/downloads)) - - `pkg-config` (for build only) - - [Homebrew](http://brew.sh) (for building on OS X) - - [xcpretty](https://github.com/supermarin/xcpretty) (for building on OS X) - - [Cask](http://caskroom.io/) (for building Android on OS X) - - Python 2.x (for build only) - -# Build instructions - -We try to link to as many system-provided libraries as possible. When these are unavailable or too outdated, we run a thin build-script layer called [Mason](https://github.com/mapbox/mason) to automate builds, and load precompiled binary packages when possible. - -Be sure to pull down all submodules first: - - git submodule init - git submodule update - -## OS X - -ImageMagick is required for tests. It's recommended to install it with [Homebrew](http://brew.sh/) via `brew install imagemagick`. - -To create projects, you can run: - -- `make xproj`: Creates an Xcode project with OS X-specific handlers for HTTP downloads and settings storage. It uses [GLFW](http://www.glfw.org) for window handling. -- `make lproj`: Creates an Xcode project with platform-independent handlers for downloads and settings storage. This is what is also being built on Linux. -- `make osx run-osx`: Builds and runs the OS X application on the command line with `xcodebuild`. -- `make linux run-linux`: Builds and runs the Linux application with `make`. -- `make test-*` Builds and runs all tests. You can specify individual tests by replacing * with their name. - -Note that you can't have more than one project in Xcode open at a time since they the static library project is shared across the OS X, Linux and iOS project. - -Target OS X: 10.9+ - - -## iOS - -### Use - -#### CocoaPods - -[CocoaPods](https://cocoapods.org) is preferred. Put the following in your `Podfile`: - -```ruby -use_frameworks! -pod 'MapboxGL' -``` - -#### Manually - -1. Install [appledoc](http://appledoc.gentlebytes.com/appledoc/) 2.2v963 for API docs generation (only this exact version works). - - ``` - curl -L -o appledoc.zip https://github.com/tomaz/appledoc/releases/download/v2.2-963/appledoc.zip - unzip appledoc.zip - cp appledoc /usr/local/bin - cp -Rf Templates/ ~/.appledoc - ``` - -1. Run `make ipackage`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, a `Headers` folder, and a `Docs` folder with HTML API documentation. -1. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that: - - `Headers` is in your *Header Search Paths* (`HEADER_SEARCH_PATHS`) build setting. - - `MapboxGL.bundle` is in your target's *Copy Bundle Resources* build phase. - - `libMapboxGL.a` is in your target's *Link Binary With Libraries* build phase. -1. Add the following Cocoa framework dependencies to your target's *Link Binary With Libraries* build phase: - - `CoreTelephony.framework` - - `GLKit.framework` - - `ImageIO.framework` - - `MobileCoreServices.framework` - - `QuartzCore.framework` - - `SystemConfiguration.framework` - - `libc++.dylib` - - `libsqlite3.dylib` - - `libz.dylib` -1. Add `-ObjC` to your target's "Other Linker Flags" build setting (`OTHER_LDFLAGS`). -1. [Set the Mapbox API access token](#mapbox-api-access-tokens). -1. `#import "MapboxGL.h"` - -### Development - -If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app. If you don't have an Apple Developer account, change the destination from "My Mac" to a simulator such as "iPhone 6" before you run and build the app. - -#### Testing -You can run `make itest` to run the included integration tests. Requires `gem install xcpretty`. If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `test/ios/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target. - -Target devices: iPhone 4S and above (5, 5c, 5s, 6, 6 Plus) and iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2). - -Target iOS: 7.0 through latest 8.x. - - -## Linux - -We are using Ubuntu for development. While the software should work on other distributions as well, we are not providing explicit build instructions here. - -Install GCC 4.9+ if you are running Ubuntu 14.04 or older. Alternatively, you can also use [Clang 3.5+](http://llvm.org/apt/). - - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get update - sudo apt-get install gcc-4.9 g++-4.9 - export CXX=g++-4.9 - -Ensure you have git and other build essentials: - - sudo apt-get install curl git build-essential zlib1g-dev automake \ - libtool xutils-dev make cmake pkg-config python-pip \ - libcurl4-openssl-dev libpng-dev libsqlite3-dev \ - libllvm3.4 - -Install glfw3 dependencies: - - sudo apt-get install libxi-dev libglu1-mesa-dev x11proto-randr-dev \ - x11proto-xext-dev libxrandr-dev \ - x11proto-xf86vidmode-dev libxxf86vm-dev \ - libxcursor-dev libxinerama-dev - -Then, you can then proceed to build the library: - - git submodule update --init - make linux - -Set an access token as described below, and then run: - - make run-linux - -## Android - -Target devices: All Android devices on Android 4.0 or newer (API level >= 14). - -### On Linux - -Install a few build dependencies: - - apt-get install -y make git build-essential automake \ - libtool make cmake pkg-config lib32stdc++6 lib32z1 +# Mapbox GL (Native) -Install Oracle JDK 7 (requires license agreement) from http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html - - export JAVA_HOME="/dir/to/jdk1.7.0_71" - -Install the [Android NDK Revision 10e](https://developer.android.com/tools/sdk/ndk/index.html). - - export ANDROID_NDK_PATH="/dir/to/android-ndk-r10e" - -Install the Android SDK. We recommend doing this by way of [Android Studio](https://developer.android.com/sdk/installing/studio.html). - - export ANDROID_HOME="/dir/to/android-sdk-linux" - -Run: - - make android - -You can then open `android/java` in Android Studio via "Import Non-Android Studio Project". - -### On OS X - -Install Oracle JDK 7+: - - brew cask install java - -Install the [Android NDK Revision 10e](https://developer.android.com/tools/sdk/ndk/index.html) for 64-bit OS X: - - brew install android-ndk - -This will also install the dependency `android-sdk`. - -Install [Android Studio](https://developer.android.com/sdk/installing/studio.html): - - brew cask install android-studio - android - -By default, the SDK will be installed to `/usr/local/opt/android-sdk`. If you open Android Studio at this point, you may get an error message telling you that it can't find a JVM, it's because you installed a custom Java VM from Oracle. Follow [these instructions](http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released) to start Android Studio. You'll wind up setting these environment variables in your .bash_profile or similar: - - echo "export ANDROID_HOME=`brew --prefix android-sdk`" >> .bash_profile - echo "export ANDROID_NDK_PATH=`brew --cellar android-ndk`/r10e" >> .bash_profile - # Replace <path to JDK> with something like /Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk - echo "export JAVA_HOME=<path to JDK>" >> .bash_profile - echo "export STUDIO_JDK=$JAVA_HOME" >> .bash_profile - -Run: - - make android - open -a Android\ Studio - -You can then open `android/java` in Android Studio via "Import Non-Android Studio Project". - -### Setting up Android emulator - -If you want to run the test app in the emulator, we recommend the x86 build because it will run a lot faster. - -First ensure you have an `MAPBOX_ACCESS_TOKEN` environment variable set, as described below. Then, create an x86 build: - - ANDROID_ABI=x86 make android - -In Android Studio, create an x86 AVD (Android Virtual Device): -- Open AVD Manager via the Tools menu -> Android -> AVD Manager -- Click "Create Virtual Device" at the bottom on AVD Manager window -- Select one of the device profiles, for example the Nexus 4 -- Click "Next" -- Select a Lollipop or Kitkat release with ABI of x86. If the line is greyed out click Download to download the OS files. -- Click "Next" -- Under "Emulated Performance" check "Host GPU" and uncheck "Store a snapshot for faster startup" -- Click "Finish" -- Close the AVD Manager - -Now when you run or debug the Android project you will see a window "Choose Device". Select your new AVD from drop down under "Launch emulator". If you select "Use same device for future launches" Android Studio will remember the selection and not ask again. - -### Running on a hardware device - -First read the [Google documentation](http://developer.android.com/tools/device.html) to set up your device and your OS to connect to the device. - -When you plug your device in and then run or debug the Android project you will see a window "Choose Device". Choose your device from the "Choose a running device" list. - -If your device does not show you have not set it up properly, double check the [Google documentation](http://developer.android.com/tools/device.html). - -# Troubleshooting - -To trigger a complete rebuild, run `make clean` and then start over generating the Xcode projects or Makefiles as described above. - -If you are having trouble getting the dependencies right, you can blow away the `mason_packages` directory, or run `make distclean`. This means the Makefile and configure script will automatically install the dependencies again on the next try. - -On OS X, you can also try clearing the Xcode cache with `make clear_xcode_cache`. - -# Mapbox API access tokens - -The demo applications use Mapbox vector tiles, which **require a Mapbox account and API access token**. Obtain an access token on the [Mapbox account page](https://www.mapbox.com/account/apps/). - -For iOS and OS X use of the demo apps in Xcode, setup the access token by editing the scheme for the application target, then adding an environment variable with the name `MAPBOX_ACCESS_TOKEN`. - - - - - -For Linux, set the environment variable `MAPBOX_ACCESS_TOKEN` to your token. - -For Android, gradle will take the value of `MAPBOX_ACCESS_TOKEN` and save it to `android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt` where the app will read it from. - -# Style - -Some styles in JSON format are included at `./styles`. See the [style spec](https://github.com/mapbox/mapbox-gl-style-spec) for more details. - -# Usage +[](https://travis-ci.org/mapbox/mapbox-gl-native/builds) -## Desktop +An OpenGL ES-based renderer for [Mapbox Vector Tiles](https://www.mapbox.com/blog/vector-tiles), consisting of a C++ library for OS X and Linux and SDK bindings for iOS and Android. -- Press `S` to cycle through bundled styles -- Press `X` to reset the transform -- Press `N` to reset north -- Press `Tab` to toggle debug information -- Press `C` to toggle symbol collision debug boxes -- Press `Esc` to quit -- Press `1` through `6` to add increasing numbers of point annotations for testing +**This repository is for development on Mapbox GL itself.** -## Mobile +If you want to use products _based on_ Mapbox GL, check out: -- Pan to move -- Pinch to zoom -- Use two fingers to rotate -- Double-tap to zoom in one level -- Two-finger single-tap to zoom out one level -- Double-tap, long-pressing the second, then pan up and down to "quick zoom" (iPhone only, meant for one-handed use) -- Use the debug menu to add test annotations, reset position, and toggle debug info. +- [Mapbox Mobile](http://mapbox.com/mobile) — iOS and Android native development libraries for vector maps in apps +- [`node-mapbox-gl-native`](https://github.com/mapbox/node-mapbox-gl-native) — Node.js library for vector map rendering +- [`react-native-mapbox-gl`](https://github.com/mapbox/react-native-mapbox-gl`) — React Native library for vector maps in apps +- [`qmapboxgl`](https://github.com/tmpsantos/qmapboxgl) — Qt library for vector map rendering -# Other notes +-- -Under early development, this project was called LLMR (Low-Level Map Renderer), in case you see any lingering references to it. +See [`INSTALL.md`](./INSTALL.md) for development setup and install instructions, including dependencies. diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 481e0b2bbd..0f709d6949 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -17,7 +17,7 @@ '../platform/darwin/image.mm', '../platform/darwin/nsthread.mm', '../platform/darwin/reachability.m', - '../include/mbgl/ios/MapboxGL.h', + '../include/mbgl/ios/Mapbox.h', '../platform/ios/MGLMapboxEvents.h', '../platform/ios/MGLMapboxEvents.m', '../include/mbgl/ios/MGLMapView.h', diff --git a/include/mbgl/ios/MGLOverlay.h b/include/mbgl/ios/MGLOverlay.h index 104a5e608b..eee362d57b 100644 --- a/include/mbgl/ios/MGLOverlay.h +++ b/include/mbgl/ios/MGLOverlay.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN /** The `MGLOverlay` protocol defines a specific type of annotation that represents both a point and an area on a map. Overlay objects are essentially data objects that contain the geographic data needed to represent the map area. For example, overlays can take the form of common shapes such as rectangles and circles. They can also describe polygons and other complex shapes. * -* You use overlays to layer more sophisticated content on top of a map view. For example, you could use an overlay to show the boundaries of a national park or trace a bus route along city streets. Mapbox GL defines several concrete classes that conform to this protocol and define standard shapes. +* You use overlays to layer more sophisticated content on top of a map view. For example, you could use an overlay to show the boundaries of a national park or trace a bus route along city streets. The Mapbox iOS SDK defines several concrete classes that conform to this protocol and define standard shapes. * * Because overlays are also annotations, they have similar usage pattern to annotations. When added to a map view using the `addOverlay:` method, that view detects whenever the overlay’s defined region intersects the visible portion of the map. At that point, the map view asks its delegate to provide a special overlay view to draw the visual representation of the overlay. If you add an overlay to a map view as an annotation instead, it is treated as an annotation with a single point. */ @protocol MGLOverlay <MGLAnnotation> diff --git a/include/mbgl/ios/MapboxGL.h b/include/mbgl/ios/Mapbox.h index 401a62e82e..401a62e82e 100644 --- a/include/mbgl/ios/MapboxGL.h +++ b/include/mbgl/ios/Mapbox.h diff --git a/ios/FAQ.md b/ios/FAQ.md deleted file mode 100644 index 19ae74fdba..0000000000 --- a/ios/FAQ.md +++ /dev/null @@ -1,49 +0,0 @@ -# Mapbox GL for iOS FAQ - -Mapbox GL is a completely new renderer technology which will eventually replace and/or merge Mapbox's existing iOS toolsets, the [Mapbox iOS SDK](http://www.mapbox.com/mapbox-ios-sdk/) and [MBXMapKit](https://www.mapbox.com/mbxmapkit/). This FAQ shares our current plans for that migration. The plans are subject to change as Mapbox GL matures, but we wanted to both clarify our thinking as well as set expectations for where things are headed. - -### When will Mapbox GL be released? - -The library is [open source](https://github.com/mapbox/mapbox-gl-native) right now, but an official, production-recommended release will come later in 2015. - -### What iOS versions will be supported? - -Mapbox GL currently supports iOS 7 and later. This will continue to be the case. MBXMapKit also supports iOS 7 and greater, but this does mean that moving from the iOS SDK will leave behind iOS 5 and 6. - -### Will the API be similar to the Mapbox iOS SDK/MBXMapKit/MapKit? - -Yes. We are shooting for bringing the Mapbox GL API in line with Apple's MapKit for the easiest transition ability. - -MBXMapKit is already an add-on to MapKit, so Apple's `MKMapView` API is used directly. - -The Mapbox iOS SDK is "workalike", since it descends from an [upstream open source project](https://github.com/Alpstein/route-me) that predates Apple's own MapKit. It uses similar concepts like annotations (with the difference that the map view delegate provides `CALayer` instances instead of `UIView`, the intention being that Mapbox GL will support `UIView`), similar API for managing the map view center, bounds, and zoom levels, and an `RMUserLocation` API that is very much like `MKUserLocation`. But the Mapbox iOS SDK also features unique APIs like extensible tile sources, offline caching, UTFGrid interactivity, and point annotation clustering. - -### Will the iOS SDK's extra APIs make it over to Mapbox GL? - -The intention is yes. This includes: - -#### Tile sources - -The SDK uses the `RMTileSource` protocol to allow for extensible remote and local raster tile sources, as well as custom on-the-fly raster tile generation. We are planning to build a transitional API in Mapbox GL that acts as a wrapper to `RMTileSource` so that existing sources can be used to plug into the main Mapbox GL source API. - -#### Offline caching - -Both the Mapbox iOS SDK and MBXMapKit feature robust support for offline caching of raster tiles and the SDK features support for [MBTiles](http://mbtiles.org) tile sources. - -We're likely going to take a similar approach to both performance caching and offline maps as is done with the `0.3.0` release of MBXMapKit. That is, `NSURLCache` will be used for performance caching and specific, separate offline map database management will be used for fetching areas of map tiles. This is a cleaner design than exists in the SDK, which combines performance and offline caches and has a non-intuitive configuration API. - -We will likely also port over MBTiles support to Mapbox GL. - -#### UTFGrid interactivity - -[UTFGrid](https://github.com/mapbox/utfgrid-spec) is a technology for enabling interactive features in raster tiles. Support for the technology is provided in the Mapbox iOS SDK with categories in `RMInteractiveSource` in combination with either `RMMapboxSource` or `RMMBTilesSource`. - -Mapbox GL obsoletes this sort of pixel-based interactivity since the source data used for rendering can be queried on-device, so we are unlikely to port UTFGrid over to GL. - -#### Annotation clustering - -We're planning on adding support for point clustering to Mapbox GL and it will likely have a similar API to the SDK's. Clustering will happen on an individual style layer level. The performance for clustering, as well as annotations in general, will hopefully be better than in the SDK, since it will be done with direct OpenGL rendering instead of Core Animation layers. - -### What will the migration path look like? - -Ideally, the migration will be pretty lightweight because of the APIs supported above. There may be slight syntax changes, but they likely won't be more than would be expected from something like Mapbox iOS SDK version `1.x` to a hypothetical `2.x`. diff --git a/ios/MapboxGL.podspec b/ios/Mapbox-iOS-SDK.podspec index 296b6ca212..7b30444c96 100644 --- a/ios/MapboxGL.podspec +++ b/ios/Mapbox-iOS-SDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - m.name = 'MapboxGL' + m.name = 'Mapbox-iOS-SDK' m.version = '0.5.4-symbols' m.summary = 'Open source vector map solution for iOS with full styling capabilities.' @@ -24,8 +24,9 @@ Pod::Spec.new do |m| m.preserve_paths = '**' m.source_files = 'Headers/*.h', 'MGLDummy.m' - m.resource_bundle = { 'MapboxGL' => 'MapboxGL.bundle/*' } - m.vendored_library = 'libMapboxGL.a' + m.resource_bundle = { 'Mapbox' => 'Mapbox.bundle/*' } + m.vendored_library = 'libMapbox.a' + m.module_name = 'Mapbox' m.frameworks = 'CoreLocation', 'CoreTelephony', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration' m.libraries = 'c++', 'sqlite3', 'z' diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m index b09235a278..bca039739a 100644 --- a/ios/app/MBXAppDelegate.m +++ b/ios/app/MBXAppDelegate.m @@ -1,6 +1,6 @@ #import "MBXAppDelegate.h" #import "MBXViewController.h" -#import <mbgl/ios/MapboxGL.h> +#import <mbgl/ios/Mapbox.h> @implementation MBXAppDelegate diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index d260f5cabb..f5ec262bf4 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -1,6 +1,6 @@ #import "MBXViewController.h" -#import <mbgl/ios/MapboxGL.h> +#import <mbgl/ios/Mapbox.h> #import <mbgl/platform/darwin/settings_nsuserdefaults.hpp> diff --git a/ios/app/README.md b/ios/app/README.md deleted file mode 100644 index 325670f1ea..0000000000 --- a/ios/app/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This is the app for use in the development of Mapbox GL for iOS. - -If you want to run this app, head up to [`mapbox-gl-native`](https://github.com/mapbox/mapbox-gl-native) and follow the iOS installation instructions there.
\ No newline at end of file diff --git a/ios/docs/install_docs.sh b/ios/docs/install_docs.sh index 1a5f97a8d3..9af3368c11 100755 --- a/ios/docs/install_docs.sh +++ b/ios/docs/install_docs.sh @@ -26,7 +26,7 @@ perl \ /tmp/mbgl/ios/*.h appledoc \ --output ${OUTPUT} \ - --project-name "Mapbox GL for iOS ${VERSION}" \ + --project-name "Mapbox iOS SDK ${VERSION}" \ --project-company Mapbox \ --create-docset \ --company-id com.mapbox \ diff --git a/ios/README.md b/ios/docs/pod-README.md index 545cd51080..7ffbf3b2c0 100644 --- a/ios/README.md +++ b/ios/docs/pod-README.md @@ -1,4 +1,4 @@ -# Mapbox GL for iOS +# Mapbox iOS SDK An open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings. diff --git a/platform/darwin/asset_root.mm b/platform/darwin/asset_root.mm index 4dc6b58dc2..f47f5d36d1 100644 --- a/platform/darwin/asset_root.mm +++ b/platform/darwin/asset_root.mm @@ -14,7 +14,7 @@ namespace platform { // Returns the path to the root folder of the application. const std::string &assetRoot() { static const std::string root = []() -> std::string { - NSString *path = [[NSBundle bundleForClass:[MGLApplicationRootBundleCanary class]] pathForResource:@"MapboxGL" ofType:@"bundle"]; + NSString *path = [[NSBundle bundleForClass:[MGLApplicationRootBundleCanary class]] pathForResource:@"Mapbox" ofType:@"bundle"]; if (!path) { path = [[[NSBundle mainBundle] resourceURL] path]; } diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 6b826ab0db..391763b945 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -20,7 +20,7 @@ #include <mbgl/util/constants.hpp> #include <mbgl/util/image.hpp> -#import "MapboxGL.h" +#import "Mapbox.h" #import "NSBundle+MGLAdditions.h" #import "NSString+MGLAdditions.h" @@ -278,7 +278,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) [self addSubview:_attributionButton]; _attributionButtonConstraints = [NSMutableArray array]; - _attributionSheet = [[UIActionSheet alloc] initWithTitle:@"Mapbox GL for iOS" + _attributionSheet = [[UIActionSheet alloc] initWithTitle:@"Mapbox for iOS" delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil @@ -2768,7 +2768,7 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) if (!path) { [NSException raise:@"Resource not found" format: - @"The resource named “%@” could not be found in the Mapbox GL resource bundle.", name]; + @"The resource named “%@” could not be found in the Mapbox resource bundle.", name]; } return path; diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/NSBundle+MGLAdditions.m index b0ecf4656e..d8ba7dacc4 100644 --- a/platform/ios/NSBundle+MGLAdditions.m +++ b/platform/ios/NSBundle+MGLAdditions.m @@ -6,7 +6,7 @@ + (NSString *)mgl_resourceBundlePath { - NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"MapboxGL" ofType:@"bundle"]; + NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"Mapbox" ofType:@"bundle"]; if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle mainBundle] bundlePath]; diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 449cf5c258..56bd325ebf 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -4,7 +4,7 @@ set -e set -o pipefail set -u -NAME=MapboxGL +NAME=Mapbox OUTPUT=build/ios/pkg IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` LIBUV_VERSION=0.10.28 @@ -115,7 +115,7 @@ DOCS_VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed rm -rf /tmp/mbgl mkdir -p /tmp/mbgl/ README=/tmp/mbgl/README.md -cat ios/README.md > ${README} +cat ios/docs/pod-README.md > ${README} echo >> ${README} echo -n "#" >> ${README} cat CHANGELOG.md >> ${README} @@ -127,7 +127,7 @@ perl \ /tmp/mbgl/Headers/*.h appledoc \ --output ${DOCS_OUTPUT} \ - --project-name "Mapbox GL for iOS ${DOCS_VERSION}" \ + --project-name "Mapbox iOS SDK ${DOCS_VERSION}" \ --project-company Mapbox \ --create-html \ --no-create-docset \ diff --git a/test/ios/KIFTestActor+MapboxGL.m b/test/ios/KIFTestActor+MapboxGL.m index 330adfdc28..6ebd248448 100644 --- a/test/ios/KIFTestActor+MapboxGL.m +++ b/test/ios/KIFTestActor+MapboxGL.m @@ -1,6 +1,6 @@ #import "KIFTestActor+MapboxGL.h" -#import "MapboxGL.h" +#import "Mapbox.h" #import <KIF/UIApplication-KIFAdditions.h> diff --git a/test/ios/MGLTAppDelegate.m b/test/ios/MGLTAppDelegate.m index 3fa68b6da1..ba49f96d22 100644 --- a/test/ios/MGLTAppDelegate.m +++ b/test/ios/MGLTAppDelegate.m @@ -1,6 +1,6 @@ #import "MGLTAppDelegate.h" #import "MGLTViewController.h" -#import "MapboxGL.h" +#import "Mapbox.h" @implementation MGLTAppDelegate diff --git a/test/ios/MGLTViewController.m b/test/ios/MGLTViewController.m index e3357616f8..01a053f50d 100644 --- a/test/ios/MGLTViewController.m +++ b/test/ios/MGLTViewController.m @@ -1,5 +1,5 @@ #import "MGLTViewController.h" -#import "MapboxGL.h" +#import "Mapbox.h" @implementation MGLTViewController { diff --git a/test/ios/MapViewTests.m b/test/ios/MapViewTests.m index 82360db231..fadbbae601 100644 --- a/test/ios/MapViewTests.m +++ b/test/ios/MapViewTests.m @@ -3,7 +3,7 @@ #import "KIFTestActor+MapboxGL.h" -#import "MapboxGL.h" +#import "Mapbox.h" #import "MGLTViewController.h" #import "LocationMocker/LocationMocker.h" diff --git a/test/ios/MetricsTests.m b/test/ios/MetricsTests.m index ea72db9402..cd02c2d52b 100644 --- a/test/ios/MetricsTests.m +++ b/test/ios/MetricsTests.m @@ -5,7 +5,7 @@ #import <KIF/KIF.h> #import <OCMock/OCMock.h> -#import "MapboxGL.h" +#import "Mapbox.h" #import "OHHTTPStubs.h" const NSUInteger MGLMaximumEventsPerFlush = 20; diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj index 30494412e7..6408372430 100644 --- a/test/ios/ios-tests.xcodeproj/project.pbxproj +++ b/test/ios/ios-tests.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ DD043366196DBBE000E6F39D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DD043365196DBBE000E6F39D /* main.m */; }; DD0580E81ACB628200B112C9 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0580E71ACB628200B112C9 /* IOKit.framework */; }; DD0581041ACB661200B112C9 /* Headers in Resources */ = {isa = PBXBuildFile; fileRef = DD0581031ACB661200B112C9 /* Headers */; }; - DD0581061ACB661C00B112C9 /* MapboxGL.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD0581051ACB661C00B112C9 /* MapboxGL.bundle */; }; - DD0581081ACB663200B112C9 /* libMapboxGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0581071ACB663200B112C9 /* libMapboxGL.a */; }; DD0E6F671B01806600DC035A /* MetricsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F661B01806600DC035A /* MetricsTests.m */; }; DD0E6F841B0190E200DC035A /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E6F701B0190E200DC035A /* libOCMock.a */; }; DD0E6F981B01B68E00DC035A /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F8E1B01B68E00DC035A /* OHHTTPStubs.m */; }; @@ -38,6 +36,8 @@ DDBD016C196DC4740033959E /* MapViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DDBD0168196DC4740033959E /* MapViewTests.m */; }; DDBD016D196DC4740033959E /* KIFTestActor+MapboxGL.m in Sources */ = {isa = PBXBuildFile; fileRef = DDBD016A196DC4740033959E /* KIFTestActor+MapboxGL.m */; }; DDBD016E196DC4A10033959E /* libKIF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDBD0144196DC3AE0033959E /* libKIF.a */; }; + DDC5C7BC1B84D62B00E1EA6B /* libMapbox.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC5C7BA1B84D62B00E1EA6B /* libMapbox.a */; }; + DDC5C7BD1B84D62B00E1EA6B /* Mapbox.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DDC5C7BB1B84D62B00E1EA6B /* Mapbox.bundle */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -105,8 +105,6 @@ DD0580E71ACB628200B112C9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; }; DD0580EF1ACB62BE00B112C9 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DD0581031ACB661200B112C9 /* Headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Headers; path = ../../build/ios/pkg/static/Headers; sourceTree = SOURCE_ROOT; }; - DD0581051ACB661C00B112C9 /* MapboxGL.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MapboxGL.bundle; path = ../../build/ios/pkg/static/MapboxGL.bundle; sourceTree = SOURCE_ROOT; }; - DD0581071ACB663200B112C9 /* libMapboxGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMapboxGL.a; path = ../../build/ios/pkg/static/libMapboxGL.a; sourceTree = SOURCE_ROOT; }; DD0E6F661B01806600DC035A /* MetricsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MetricsTests.m; sourceTree = SOURCE_ROOT; }; DD0E6F701B0190E200DC035A /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = OCMock/libOCMock.a; sourceTree = SOURCE_ROOT; }; DD0E6F721B0190E200DC035A /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = "<group>"; }; @@ -144,6 +142,8 @@ DDBD0168196DC4740033959E /* MapViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewTests.m; sourceTree = SOURCE_ROOT; }; DDBD016A196DC4740033959E /* KIFTestActor+MapboxGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KIFTestActor+MapboxGL.m"; sourceTree = SOURCE_ROOT; }; DDBD016B196DC4740033959E /* KIFTestActor+MapboxGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KIFTestActor+MapboxGL.h"; sourceTree = SOURCE_ROOT; }; + DDC5C7BA1B84D62B00E1EA6B /* libMapbox.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMapbox.a; path = ../../../build/ios/pkg/static/libMapbox.a; sourceTree = "<group>"; }; + DDC5C7BB1B84D62B00E1EA6B /* Mapbox.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Mapbox.bundle; path = ../../../build/ios/pkg/static/Mapbox.bundle; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -155,8 +155,8 @@ DD41CE171ACB5DE700FA7979 /* GLKit.framework in Frameworks */, DD41CE151ACB5DE000FA7979 /* ImageIO.framework in Frameworks */, DD41CE131ACB5DDA00FA7979 /* MobileCoreServices.framework in Frameworks */, + DDC5C7BC1B84D62B00E1EA6B /* libMapbox.a in Frameworks */, DD41CE0B1ACB5DC400FA7979 /* SystemConfiguration.framework in Frameworks */, - DD0581081ACB663200B112C9 /* libMapboxGL.a in Frameworks */, DD41CE0D1ACB5DCB00FA7979 /* libc++.dylib in Frameworks */, DD41CE0F1ACB5DD000FA7979 /* libsqlite3.dylib in Frameworks */, DD41CE111ACB5DD500FA7979 /* libz.dylib in Frameworks */, @@ -300,8 +300,8 @@ children = ( DD0581031ACB661200B112C9 /* Headers */, DACAD7111B08719F009119DC /* MGLMapboxEvents.h */, - DD0581071ACB663200B112C9 /* libMapboxGL.a */, - DD0581051ACB661C00B112C9 /* MapboxGL.bundle */, + DDC5C7BA1B84D62B00E1EA6B /* libMapbox.a */, + DDC5C7BB1B84D62B00E1EA6B /* Mapbox.bundle */, ); name = "GL Library"; sourceTree = "<group>"; @@ -474,7 +474,7 @@ files = ( 96567A311B0E8BB900D78776 /* Images.xcassets in Resources */, DD0581041ACB661200B112C9 /* Headers in Resources */, - DD0581061ACB661C00B112C9 /* MapboxGL.bundle in Resources */, + DDC5C7BD1B84D62B00E1EA6B /* Mapbox.bundle in Resources */, 96567A231B0E84CD00D78776 /* LaunchScreen.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; |