diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/mbgl/map/map.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/map/transform.hpp | 1 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 2 | ||||
| -rw-r--r-- | src/map/map.cpp | 4 | ||||
| -rw-r--r-- | src/map/transform.cpp | 12 |
6 files changed, 2 insertions, 20 deletions
@@ -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 diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index bf425cb595..0cb055b59c 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -122,7 +122,6 @@ public: void resetNorth(); void startRotating(); void stopRotating(); - bool canRotate(); // Debug void setDebug(bool value); diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp index e3604edd8b..a42b7aa106 100644 --- a/include/mbgl/map/transform.hpp +++ b/include/mbgl/map/transform.hpp @@ -51,7 +51,6 @@ public: double getAngle() const; void startRotating(); void stopRotating(); - bool canRotate(); // Transitions bool needsTransition() const; diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 6fc55bbb9c..dc7301e727 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -135,7 +135,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 diff --git a/src/map/map.cpp b/src/map/map.cpp index 3578914d68..f4760b1b97 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -652,10 +652,6 @@ void Map::stopRotating() { update(); } -bool Map::canRotate() { - return transform.canRotate(); -} - #pragma mark - Toggles diff --git a/src/map/transform.cpp b/src/map/transform.cpp index 25aacd4838..03e06f984b 100644 --- a/src/map/transform.cpp +++ b/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 { |