Merge branch 'master' into mbgl-config

gyp/mbgl-headless.gypi

@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-headless',
       'product_name': 'mbgl-headless',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'include_dirs': [
         '../include',
       ],

gyp/mbgl-ios.gypi

@@ -28,6 +28,7 @@
     { 'target_name': 'mbgl-ios',
       'product_name': 'mbgl-ios',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include',

gyp/mbgl-linux.gypi

@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-linux',
       'product_name': 'mbgl-linux',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include'

gyp/mbgl-osx.gypi

@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-osx',
       'product_name': 'mbgl-osx',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include',

gyp/mbgl.gypi

@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl',
       'product_name': 'mbgl',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'dependencies': [
           'shaders',

include/mbgl/map/transform.hpp

@@ -91,7 +91,6 @@ private:
     TransformState final;
 
     // Limit the amount of zooming possible on the map.
-    // TODO: make these modifiable from outside.
     const double min_scale = std::pow(2, 0);
     const double max_scale = std::pow(2, 18);