Merge branch 'master' into image-readers

README.md

@@ -68,7 +68,7 @@ Install GCC 4.8+ if you are running Ubuntu 13.10 or older. Alternatively, you ca
 
 Ensure you have git and other build essentials:
 
-    sudo apt-get install git build-essential zlib1g-dev automake \
+    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
 
@@ -103,6 +103,8 @@ Or proceed to building the debug application with:
 
 	make linux
 
+Be sure to setup an access token per below before running `build/Release/mapbox-gl`. 
+
 
 # Troubleshooting
 

gyp/install.gypi

@@ -22,6 +22,7 @@
             'conditions': [
               ['OS == "linux"', {
                   'other_ldflags': [
+                      '<@(png_static_libs)',
                       '<@(glfw3_static_libs)',
                       '<@(glfw3_ldflags)',
                   ]

gyp/mbgl-core.gypi

@@ -37,6 +37,7 @@
           'xcode_settings': {
             'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
             'OTHER_CFLAGS': [ '<@(cflags)' ],
+            'SKIP_INSTALL': 'YES'
           },
         }, {
           'cflags_cc': [ '<@(cflags_cc)' ],

gyp/mbgl-ios.gypi

@@ -12,6 +12,7 @@
           'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
           'CLANG_ENABLE_OBJC_ARC': 'YES',
           'CODE_SIGN_IDENTITY': 'iPhone Developer',
+          'SKIP_INSTALL': 'YES'
         },
         'configurations': {
           'Release': {

include/mbgl/map/map.hpp

@@ -115,7 +115,6 @@ public:
     void resetNorth();
     void startRotating();
     void stopRotating();
-    bool canRotate();
 
     // Debug
     void setDebug(bool value);

include/mbgl/map/transform.hpp

@@ -51,7 +51,6 @@ public:
     double getAngle() const;
     void startRotating();
     void stopRotating();
-    bool canRotate();
 
     // Transitions
     bool needsTransition() const;

scripts/travis_before_install.sh

@@ -42,7 +42,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     # install OS X dependencies
     #
     mapbox_time "install_build_tools" \
-    brew install autoconf automake libtool makedepend cmake pkg-config node git boost
+    brew install makedepend git
 
     mapbox_time "install_awscli" \
     sudo pip install awscli

src/map/map.cpp

@@ -551,10 +551,6 @@ void Map::stopRotating() {
     update();
 }
 
-bool Map::canRotate() {
-    return transform.canRotate();
-}
-
 
 #pragma mark - Toggles
 

src/map/transform.cpp

@@ -14,7 +14,6 @@ using namespace mbgl;
 
 const double D2R = M_PI / 180.0;
 const double M2PI = 2 * M_PI;
-const double MIN_ROTATE_SCALE = 8;
 
 Transform::Transform(View &view_)
     : view(view_)
@@ -37,7 +36,6 @@ bool Transform::resize(const uint16_t w, const uint16_t h, const float ratio,
         current.pixelRatio = final.pixelRatio = ratio;
         current.framebuffer[0] = final.framebuffer[0] = fb_w;
         current.framebuffer[1] = final.framebuffer[1] = fb_h;
-        if (!canRotate() && current.angle) _setAngle(0);
         constrain(current.scale, current.y);
 
         view.notify_map_change(MapChangeRegionDidChange);
@@ -286,9 +284,6 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl
 
     constrain(final.scale, final.y);
 
-    // Undo rotation at low zooms.
-    if (!canRotate() && current.angle) _setAngle(0);
-
     if (duration == 0) {
         current.scale = final.scale;
         current.x = final.x;
@@ -398,9 +393,6 @@ void Transform::_setAngle(double new_angle, const timestamp duration) {
 
     final.angle = new_angle;
 
-    // Prevent rotation at low zooms.
-    if (!canRotate()) final.angle = 0;
-
     if (duration == 0) {
         current.angle = final.angle;
     } else {
@@ -449,10 +441,6 @@ void Transform::_clearRotating() {
     }
 }
 
-bool Transform::canRotate() {
-    return (current.scale > MIN_ROTATE_SCALE);
-}
-
 #pragma mark - Transition
 
 bool Transform::needsTransition() const {