Merge branch 'release-ios-v3.6.0-android-v5.1.0' into merge_mapbox_v5_1

* release-ios-v3.6.0-android-v5.1.0: (395 commits)
  [android] - correct source changed map event javadoc (mapbox#9243)
  [ios, macos] Fix MGLSphericalPosition.radial misleading type.
  [android] - run MapboxMap invocations to ui thread for instrumentation tests (mapbox#9198)
  [android] - update changelog for v5.1.0-beta.4 (mapbox#9232)
  Cherry picks to release branch (mapbox#9230)
  [android] - update components with camera values when animating (mapbox#9174)
  Custom location source fix (mapbox#9142)
  [android] - invalidating MyLocationView bearing when not following position (mapbox#9212)
  [android] - option to disable camera animation while following position (mapbox#9210)
  [android] - remove conversion from pixels to dp (mapbox#9205)
  fix mapbox#8300 flyTo for close points
  [android] - keep location tracking mode after screen rotation (mapbox#9187)
  [android] - dealing with infinite camera move callbacks (mapbox#9177) (mapbox#9194)
  [android] - only invoke callback if fling scrolling animation isn't going to be ignored. (mapbox#9192)
  [android] - validate if gestures should execute (mapbox#9173)
  [ios] Make annotation view rotation alignment configurable (mapbox#9147)
  [core] Make TransformState LatLngBounds optional
  add null check in custom location engine activity to prevent null pointer exception (mapbox#9159)
  [android] Cherry picking 9133 (mapbox#9145)
  [ios] Update pods spec for iOS v3.6.0-beta.2
  ...

# Conflicts:
#	Makefile
#	cmake/core-files.cmake
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/proguard-rules.pro
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
#	platform/android/config.cmake
#	platform/android/src/map/camera_position.cpp
#	platform/android/src/native_map_view.cpp
#	platform/android/src/native_map_view.hpp
#	platform/qt/src/qmapboxgl_p.hpp
#	src/mbgl/renderer/painter_line.cpp
#	src/mbgl/sprite/sprite_atlas.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/sprite/sprite_parser.cpp
#	src/mbgl/sprite/sprite_parser.hpp
#	src/mbgl/style/layers/line_layer_impl.cpp
#	src/mbgl/style/layers/line_layer_impl.hpp
#	src/mbgl/style/style.cpp
#	src/mbgl/style/style.hpp
#	test/map/transform.test.cpp
#	test/sprite/sprite_atlas.test.cpp
#	test/style/style.test.cpp

.topissuesrc

@@ -0,0 +1,17 @@
+{
+ "labels": {
+ "release blocker": 25,
+ "beta blocker": 20,
+ "crash": 5,
+ "build": 5,
+ "bug": 2
+ },
+ "reactions": {
+ "+1": 1,
+ "-1": -1,
+ "laugh": 1,
+ "hooray": 1,
+ "confused": 1,
+ "heart": 1
+ }
+}

.travis.yml

@@ -81,15 +81,19 @@ matrix:
  - git fetch origin master:refs/remotes/origin/master
  - make check
 
- # EGL - Node - Clang 3.9 - Debug
+ # EGL - Node v4 - Clang 3.9 - Release
  - os: linux
  sudo: required
  dist: trusty
  language: node
- compiler: "egl-node4-clang39-debug"
- env: BUILDTYPE=Debug _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1
+ compiler: "egl-node4-clang39-release"
+ env: BUILDTYPE=Release _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1
  addons: *clang39
  before_script:
+ # fglrx causes the GLX extension to be unavailable
+ - sudo apt-get purge -qq fglrx
+ - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
+ - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
  - mapbox_install_logbt
  - mapbox_start_xvfb
  - mapbox_export_mesa_library_path
@@ -101,15 +105,44 @@ matrix:
  after_script:
  - ccache --show-stats
  - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
+ after_success:
+ - ./platform/node/scripts/after_success.sh
  after_failure:
  - aws s3 cp . s3://mapbox/mapbox-gl-native/render-tests/$TRAVIS_JOB_NUMBER --recursive --exclude "*" --include "*.trace"
 
- # EGL - Node - Clang 3.9 - Release
+ # EGL - Node v6 - Clang 3.9 - Debug
  - os: linux
  sudo: required
  dist: trusty
  language: node
- compiler: "egl-node4-clang39-release"
+ compiler: "egl-node6-clang39-debug"
+ env: BUILDTYPE=Debug _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1
+ addons: *clang39
+ before_script:
+ - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
+ - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
+ - mapbox_install_logbt
+ - mapbox_start_xvfb
+ - mapbox_export_mesa_library_path
+ script:
+ - nvm install 6
+ - nvm use 6
+ - make node
+ - ./logbt -- $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node
+ after_script:
+ - ccache --show-stats
+ - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
+ after_success:
+ - ./platform/node/scripts/after_success.sh
+ after_failure:
+ - aws s3 cp . s3://mapbox/mapbox-gl-native/render-tests/$TRAVIS_JOB_NUMBER --recursive --exclude "*" --include "*.trace"
+
+ # EGL - Node v6 - Clang 3.9 - Release
+ - os: linux
+ sudo: required
+ dist: trusty
+ language: node
+ compiler: "egl-node6-clang39-release"
  env: BUILDTYPE=Release _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1
  addons: *clang39
  before_script:
@@ -121,8 +154,8 @@ matrix:
  - mapbox_start_xvfb
  - mapbox_export_mesa_library_path
  script:
- - nvm install 4
- - nvm use 4
+ - nvm install 6
+ - nvm use 6
  - make node
  - ./logbt -- $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node
  after_script:
@@ -166,7 +199,7 @@ matrix:
  dist: trusty
  language: cpp
  compiler: "qt4-gcc5-release"
- env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_QT_4=1
+ env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5
  addons: *qt4
  before_script:
  - mapbox_start_xvfb

.tx/config

@@ -1,25 +1,45 @@
 [main]
 host = https://www.transifex.com
-lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
-type = STRINGS
 minimum_perc = 80
 
 [mapbox-gl-native.foundationstrings-darwin]
+file_filter = platform/darwin/resources/<lang>.lproj/Foundation.strings
+lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
 source_file = platform/darwin/resources/Base.lproj/Foundation.strings
 source_lang = en
-file_filter = platform/darwin/resources/<lang>.lproj/Foundation.strings
+type = STRINGS
 
 [mapbox-gl-native.localizablestrings-ios]
+file_filter = platform/ios/resources/<lang>.lproj/Localizable.strings
+lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
 source_file = platform/ios/resources/Base.lproj/Localizable.strings
 source_lang = en
-file_filter = platform/ios/resources/<lang>.lproj/Localizable.strings
+type = STRINGS
+
+[mapbox-gl-native.localizablestringsdict-ios]
+file_filter = platform/ios/resources/<lang>.lproj/Localizable.stringsdict
+lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
+source_file = platform/ios/resources/en.lproj/Localizable.stringsdict
+source_lang = en
+type = STRINGSDICT
 
 [mapbox-gl-native.localizablestrings-macos]
+file_filter = platform/macos/sdk/<lang>.lproj/Localizable.strings
+lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
 source_file = platform/macos/sdk/Base.lproj/Localizable.strings
 source_lang = en
-file_filter = platform/macos/sdk/<lang>.lproj/Localizable.strings
+type = STRINGS
 
 [mapbox-gl-native.rootstrings-ios]
+file_filter = platform/ios/framework/Settings.bundle/<lang>.lproj/Root.strings
+lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant
 source_file = platform/ios/framework/Settings.bundle/Base.lproj/Root.strings
 source_lang = en
-file_filter = platform/ios/framework/Settings.bundle/<lang>.lproj/Root.strings
+type = STRINGS
+
+[mapbox-gl-native.stringsxml-android]
+file_filter = platform/android/MapboxGLAndroidSDK/src/main/res/values-<lang>/strings.xml
+source_file = platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CMakeLists.txt

@@ -12,6 +12,9 @@ option(WITH_EGL "Use EGL backend" OFF)
 
 if(WITH_CXX11ABI)
  set(MASON_CXXABI_SUFFIX -cxx11abi)
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
+else()
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
 endif()
 
 if(WITH_OSMESA AND WITH_EGL)
@@ -40,6 +43,7 @@ set_source_files_properties(src/mbgl/util/version.cpp PROPERTIES COMPILE_DEFINIT
 
 mason_use(geometry VERSION 0.9.0 HEADER_ONLY)
 mason_use(variant VERSION 1.1.4 HEADER_ONLY)
+mason_use(any VERSION 8fef1e9 HEADER_ONLY)
 mason_use(unique_resource VERSION cba309e HEADER_ONLY)
 mason_use(rapidjson VERSION 1.1.0 HEADER_ONLY)
 mason_use(boost VERSION 1.62.0 HEADER_ONLY)
@@ -51,6 +55,7 @@ mason_use(protozero VERSION 1.4.2 HEADER_ONLY)
 mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY)
 mason_use(geojson VERSION 0.4.0 HEADER_ONLY)
 mason_use(polylabel VERSION 1.0.2 HEADER_ONLY)
+mason_use(wagyu VERSION 0.4.1 HEADER_ONLY)
 
 add_definitions(-DRAPIDJSON_HAS_STDSTRING=1)
 
@@ -61,7 +66,7 @@ endif(WITH_COVERAGE)
 
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -ftemplate-depth=1024 -Wall -Wextra -Wshadow -Werror -Wno-variadic-macros -Wno-unknown-pragmas")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -ftemplate-depth=1024 -Wall -Wextra -Wshadow -Wnon-virtual-dtor -Werror -Wno-variadic-macros -Wno-unknown-pragmas")
 if(APPLE)
  # -Wno-error=unused-command-line-argument is required due to https://llvm.org/bugs/show_bug.cgi?id=7798
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
@@ -77,6 +82,8 @@ if(NOT EXISTS ${CMAKE_SOURCE_DIR}/platform/${MBGL_PLATFORM}/config.cmake)
  message(ERROR "Can't find config.cmake file for platform ${MBGL_PLATFORM}")
 endif()
 
+include(cmake/loop-uv.cmake)
+
 include(platform/${MBGL_PLATFORM}/config.cmake)
 
 include(cmake/core-files.cmake)
@@ -107,3 +114,9 @@ endif()
 if(COMMAND mbgl_platform_node)
  include(cmake/node.cmake)
 endif()
+
+if(CMAKE_GENERATOR STREQUAL "Xcode")
+ write_xcconfig_target_properties(
+ mbgl-core
+ )
+endif()