From bad4c96603ad50c7e8f51ab15e80d47f0220f62b Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Tue, 11 Nov 2014 14:59:01 -0800 Subject: [PATCH 1/6] "skip install" for lib Xcode targets for easier app archiving --- gyp/mbgl-core.gypi | 1 + gyp/mbgl-ios.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 46ff76274..022480350 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -37,6 +37,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_CFLAGS': [ '<@(cflags)' ], + 'SKIP_INSTALL': 'YES' }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index 5566ca3a3..dd1c9c0c2 100644 --- a/gyp/mbgl-ios.gypi +++ b/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': { From e0b4107595bdce3a544d2710af1ea9377503c85c Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Thu, 13 Nov 2014 11:47:06 -0800 Subject: [PATCH 2/6] pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581 --- gyp/install.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gyp/install.gypi b/gyp/install.gypi index df65d0457..7b8cf6220 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -22,6 +22,7 @@ 'conditions': [ ['OS == "linux"', { 'other_ldflags': [ + '<@(png_static_libs)', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] From 0547ae118424d68e60aeaa1911be53427afa9e4a Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Mon, 17 Nov 2014 11:53:58 -0800 Subject: [PATCH 3/6] add note about access token & where to find Linux binary --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 022377e99..75a648678 100644 --- a/README.md +++ b/README.md @@ -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 From b45b855b411b04e8d91df4e08a0e4e6b29cb8123 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Thu, 20 Nov 2014 13:08:04 -0500 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75a648678..998618f7b 100644 --- a/README.md +++ b/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 From aaa1e3a6f1a69749371f51bbe96a1908e4bf09e2 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Oct 2014 14:59:12 -0700 Subject: [PATCH 5/6] Remove rotation constraints This should be an iOS SDK option, not hard coded into low-level renderering. Fixes #458 --- include/mbgl/map/map.hpp | 1 - include/mbgl/map/transform.hpp | 1 - src/map/map.cpp | 4 ---- src/map/transform.cpp | 12 ------------ 4 files changed, 18 deletions(-) diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 43402fe2e..ad33865cd 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -115,7 +115,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 e3604edd8..a42b7aa10 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/src/map/map.cpp b/src/map/map.cpp index 6e9e47fd5..3daaa8798 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -551,10 +551,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 25aacd483..03e06f984 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 { From 545292b6f9d461d439972a204ff747f4902dd4d1 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 20 Nov 2014 15:29:10 -0800 Subject: [PATCH 6/6] Fix OS X build --- ios/mapbox-gl-cocoa | 2 +- scripts/travis_before_install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index f801f5b9f..c937adfca 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit f801f5b9fa9ca0e55c379f95295bc13338b19110 +Subproject commit c937adfcaee5c73b2b79dae6aa617102010ac0c9 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 2af2f7ae0..78c0799f6 100755 --- a/scripts/travis_before_install.sh +++ b/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