v2.0.0

.circleci/config.yml

@@ -22,12 +22,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - check-size:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
       - collect-stats:
           requires:
             - build
@@ -157,6 +151,10 @@ jobs:
       - run: yarn run build-style-spec
       - run: yarn run build-flow-types
       - run: yarn run test-build
+      - run:
+          name: Check bundle size
+          command: |
+            node build/check-bundle-size.js
       - deploy:
           name: Trigger memory metrics when merging to main
           command: |
@@ -174,17 +172,6 @@ jobs:
           paths:
             - dist
 
-  check-size:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: .
-      - run:
-          name: Check bundle size
-          command: |
-            node build/check-bundle-size.js "dist/mapbox-gl.js" "JS"
-            node build/check-bundle-size.js "dist/mapbox-gl.css" "CSS"
-
   collect-stats:
     <<: *defaults
     steps:
@@ -217,7 +204,10 @@ jobs:
     steps:
       - attach_workspace:
           at: .
+      - run: yarn run build-token
       - run: yarn run test-render
+      - store_test_results:
+          path: test/integration/render-tests
       - store_artifacts:
           path: "test/integration/render-tests/index.html"
 

CHANGELOG.md

@@ -1,3 +1,38 @@
+## 2.0.0
+
+### ⚠️ Breaking changes
+
+- **mapbox-gl-js is no longer under the 3-Clause BSD license. By upgrading to this release, you are agreeing to [Mapbox terms of service](https://www.mapbox.com/legal/tos/).** Refer to LICENSE.txt for the new licensing terms and details. For questions, contact our team at [https://support.mapbox.com](https://support.mapbox.com).
+- Beginning with v2.0.0, a billable map load occurs whenever a Map object is initialized. Before updating an existing implementation from v1.x.x to v2.x.x, please review the pricing documentation to estimate expected costs.
+- Deprecate Internet Explorer 11, no longer supported from this release. ([#8283](https://github.com/mapbox/mapbox-gl-js/issues/8283), [#6391](https://github.com/mapbox/mapbox-gl-js/issues/6391))
+- Support for unlocked pitch up to 85°. The  default `maxPitch` is increased from 60° to 85° which can result in viewing above the horizon line. By default, this area will be drawn transparent but a new sky layer can be added to the map in order to fill this space. The legacy behavior can be achieved by simply adding `maxPitch: 60` to the map options when instantiating your map.
+
+### ✨ Features and improvements
+
+- Add 3D terrain feature. All layer types and markers can now be extruded using the new `terrain` root level style-spec property or with the function `map.setTerrain()`. ([#1489](https://github.com/mapbox/mapbox-gl-js/issues/1489))
+- Add support for unlocked pitch up to 85° (previously 60°). ([#3731](https://github.com/mapbox/mapbox-gl-js/issues/3731))
+- Add a new sky layer acting as an infinite background above the horizon line. This layer can be used from the style-spec and has two types: `atmospheric` and `gradient`.
+- Add a free form camera API, allowing for more complex camera manipulation in 3D, accessible using `map.getFreeCameraOptions()` and `map.setFreeCameraOptions()`.
+- Improve performance by adopting a two-phase tile loading strategy, prioritizing rendering of non-symbol layers first.
+- Improve performance by avoiding parsing vector tiles that were already aborted.
+- Improve performance by adopting a preemptive shader compilation strategy. ([#9384](https://github.com/mapbox/mapbox-gl-js/issues/9384))
+- Improve performance by disabling fade-in animation for symbols and raster tiles on initial map load.
+- Improve performance by defaulting to 2 workers on all platforms. ([#3153](https://github.com/mapbox/mapbox-gl-js/issues/3153))
+- Improve performance by loading tiles on the main thread at initial map load.
+- Improve performance by using better worker task scheduling.
+
+### 🐞 Bug fixes
+
+- Avoid reloading `raster` and `raster-dem` tiles when the RTLTextPlugin loads.
+- Add runtime evaluation of label collision boxes for more accurate symbol placement at fractional zoom levels and tilted views.
+- Fix tile cache size for terrain DEM sources.
+- Prevent holding on to DEM memory on the worker.
+- Reduce memory used by `fill-extrusion`s.
+
+### 🛠️ Workflow
+
+- Run render tests in browser.
+
 ## 1.13.0
 
 ### ✨ Features and improvements

CONTRIBUTING.md

@@ -111,7 +111,7 @@ See [`bench/README.md`](./bench/README.md).
 * We use [`assert`](https://nodejs.org/api/assert.html) to check invariants that are not likely to be caused by user error. These `assert` statements are stripped out of production builds.
 * We use the following ES6 features:
   * `let`/`const`
-  * `for...of` loops (for arraylike iteration only, i.e. what is supported by [Bublé's `dangerousForOf` transform](https://buble.surge.sh/guide/#dangerous-transforms))
+  * `for...of` loops
   * Arrow functions
   * Classes
   * Template strings
@@ -120,8 +120,7 @@ See [`bench/README.md`](./bench/README.md).
   * Rest parameters
   * Destructuring
   * Modules
-* The following ES6 features are not to be used, in order to maintain support for IE 11 and older mobile browsers. This may change in the future.
-  * Spread (`...`) operator (because it requires Object.assign)
+  * Spread (`...`) operator
   * Iterators and generators
   * "Library" features such as `Map`, `Set`, `array.find`, etc.
 

LICENSE.txt

@@ -1,18 +1,42 @@
+mapbox-gl-js v2.0
+
+Mapbox Web SDK
+
 Copyright (c) 2020, Mapbox
 
 All rights reserved.
 
+Mapbox gl-js version 2.0 or higher (“Mapbox Web SDK”) must be used according to
+the Mapbox Terms of Service. This license allows developers with a current active
+Mapbox account to use and modify the Mapbox Web SDK. Developers may modify the
+Mapbox Web SDK code so long as the modifications do not change or interfere with
+marked portions of the code related to billing, accounting, and anonymized data
+collection. The Mapbox Web SDK only sends anonymized usage data, which Mapbox uses
+for fixing bugs and errors, accounting, and generating aggregated anonymized
+statistics. This license terminates automatically if a user no longer has an
+active Mapbox account.
+
+For the full license terms, please see the Mapbox Terms of Service at
+https://www.mapbox.com/legal/tos/.
+
+-------------------------------------------------------------------------------
+
+Contains code from mapbox-gl-js v1.13 and earlier
+
+Version v1.13 of mapbox-gl-js and earlier are licensed under a BSD-3-Clause license
+
+Copyright (c) 2020, Mapbox
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of Mapbox GL JS nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Mapbox GL JS nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -23,33 +47,8 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
--------------------------------------------------------------------------------
-
-Contains code from glfx.js
-
-Copyright (C) 2011 by Evan Wallace
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 
@@ -82,3 +81,27 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+
+Contains code from glfx.js
+
+Copyright (C) 2011 by Evan Wallace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -28,7 +28,10 @@ native SDKs. For code and issues specific to the native SDKs, see the
 
 ## License
 
-Mapbox GL JS is licensed under the [3-Clause BSD license](./LICENSE.txt).
-The licenses of its dependencies are tracked via [FOSSA](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-js):
+Copyright © 2020 Mapbox
 
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-js.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-js?ref=badge_large)
+All rights reserved.
+
+Mapbox gl-js version 2.0 or higher (“Mapbox Web SDK”) must be used according to the Mapbox Terms of Service. This license allows developers with a current active Mapbox account to use and modify the Mapbox Web SDK. Developers may modify the Mapbox Web SDK code so long as the modifications do not change or interfere with marked portions of the code related to billing, accounting, and anonymized data collection. The Mapbox Web SDK only sends anonymized usage data, which Mapbox uses for fixing bugs and errors, accounting, and generating aggregated anonymized statistics. This license terminates automatically if a user no longer has an active Mapbox account.
+
+For the full license terms, please see the [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/).

bench/benchmarks/symbol_layout.js

@@ -38,7 +38,8 @@ export default class SymbolLayout extends Layout {
                                             tileResult.iconMap,
                                             tileResult.imageAtlas.iconPositions,
                                             false,
-                                            tileResult.tileID.canonical);
+                                            tileResult.tileID.canonical,
+                                            tileResult.tileZoom);
                     }
                 }
             });

bench/lib/tile_parser.js

@@ -116,12 +116,13 @@ export default class TileParser {
     parseTile(tile: {tileID: OverscaledTileID, buffer: ArrayBuffer}, returnDependencies?: boolean): Promise<?WorkerTileResult> {
         const workerTile = new WorkerTile({
             tileID: tile.tileID,
+            tileZoom: tile.tileID.overscaledZ,
             zoom: tile.tileID.overscaledZ,
             tileSize: 512,
             overscaling: 1,
             showCollisionBoxes: false,
             source: this.sourceID,
-            uid: '0',
+            uid: 0,
             maxZoom: 22,
             pixelRatio: 1,
             request: {url: ''},
@@ -130,7 +131,8 @@ export default class TileParser {
             cameraToCenterDistance: 0,
             cameraToTileDistance: 0,
             returnDependencies,
-            promoteId: undefined
+            promoteId: undefined,
+            isSymbolTile: false
         });
 
         const vectorTile = new VT.VectorTile(new Protobuf(tile.buffer));

bench/rollup_config_benchmarks.js

@@ -2,7 +2,6 @@ import fs from 'fs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import replace from 'rollup-plugin-replace';
 import {plugins} from '../build/rollup_plugins';
-import buble from 'rollup-plugin-buble';
 import resolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 
@@ -58,7 +57,6 @@ const viewConfig = {
         sourcemap: false
     },
     plugins: [
-        buble({transforms: {dangerousForOf: true}, objectAssign: true}),
         resolve({browser: true, preferBuiltins: false}),
         commonjs(),
         replace(replaceConfig)

build/banner.js

@@ -1,4 +1,4 @@
 import fs from 'fs';
 
 const version = JSON.parse(fs.readFileSync('package.json')).version;
-export default `/* Mapbox GL JS is licensed under the 3-Clause BSD License. Full text of license: https://github.com/mapbox/mapbox-gl-js/blob/v${version}/LICENSE.txt */`;
+export default `/* Mapbox GL JS is Copyright © 2020 Mapbox and subject to the Mapbox Terms of Service ((https://www.mapbox.com/legal/tos/). */`;