Merge branch 'master' of https://github.com/mapbox/mapbox-gl-js into …

…remove-flicker

restore expected.png

.circleci/config.yml

@@ -225,3 +225,10 @@ jobs:
             upload mapbox-gl.js.map application/octet-stream
             upload mapbox-gl-dev.js application/javascript
             upload mapbox-gl.css    text/css
+
+            upload mapbox-gl-unminified.js     application/javascript
+            upload mapbox-gl-unminified.js.map application/octet-stream
+            upload mapbox-gl-csp.js            application/javascript
+            upload mapbox-gl-csp.js.map        application/octet-stream
+            upload mapbox-gl-csp-worker.js     application/javascript
+            upload mapbox-gl-csp-worker.js.map application/octet-stream

.eslintrc

@@ -51,7 +51,7 @@
     }],
     "no-unused-vars": ["error", {"argsIgnorePattern": "^_$"}],
     "no-warning-comments": "error",
-    "object-curly-spacing": "off",
+    "object-curly-spacing": ["error", "never"],
     "prefer-arrow-callback": "error",
     "prefer-const": ["error", {"destructuring": "all"}],
     "prefer-template": "error",
@@ -70,6 +70,9 @@
       "FunctionExpression": {
         "parameters": "off"
       }
+    }],
+    "no-multiple-empty-lines": [ "error", { 
+        "max": 1
     }]
   },
   "globals": {

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,8 +2,6 @@
 
 <!-- Thanks for the PR! Feel free to add or remove items from the checklist. -->
 
-<!-- If your PR affects documentation relevant to the currently released version, please use `publisher-production` as the base branch. See https://github.com/mapbox/mapbox-gl-js/blob/master/docs/README.md#committing-and-publishing-documentation -->
-
  - [ ] briefly describe the changes in this PR
  - [ ] write tests for all new functionality
  - [ ] document any changes to public APIs

CHANGELOG.md

@@ -1,3 +1,39 @@
+## 1.2.1
+
+## 🐞 Bug fixes
+
+* Fix bug in `NavigationControl` compass button that prevented it from rotating with the map ([#8605](https://github.com/mapbox/mapbox-gl-js/pull/8605))
+* Fix rendering of `collisionBox` when `text-translate` or `icon-translate` is enabled  ([#8659](https://github.com/mapbox/mapbox-gl-js/pull/8659))
+
+## 1.2.0
+
+## Features and improvements
+* Add `*-sort-key` layout property for circle, fill, and line layers, to dictate which features appear above others within a single layer([#8467](https://github.com/mapbox/mapbox-gl-js/pull/8467))
+* Add ability to instantiate maps with specific access tokens ([#8364](https://github.com/mapbox/mapbox-gl-js/pull/8364))
+* Accommodate `prefers-reduced-motion` settings in browser ([#8494](https://github.com/mapbox/mapbox-gl-js/pull/8494))
+* Add Map `visualizePitch` option that tilts the compass as the map pitches ([#8208](https://github.com/mapbox/mapbox-gl-js/issues/8208), fixed by [#8296](https://github.com/mapbox/mapbox-gl-js/pull/8296)) (h/t [pakastin](https://github.com/pakastin))
+* Make source options take precedence over TileJSON ([#8232](https://github.com/mapbox/mapbox-gl-js/pull/8232)) (h/t [jingsam](https://github.com/jingsam))
+* Make requirements for text offset properties more precise ([#8418](https://github.com/mapbox/mapbox-gl-js/pull/8418))
+* Expose `convertFilter` API in the style specification ([#8493](https://github.com/mapbox/mapbox-gl-js/pull/8493)
+
+## Bug fixes
+* Fix changes to `text-variable-anchor`, such that previous anchor positions would take precedence only if they are present in the updated array (considered a bug fix, but is technically a breaking change from previous behavior) ([#8473](https://github.com/mapbox/mapbox-gl-js/pull/8473))
+* Fix rendering of opaque pass layers over heatmap and fill-extrusion layers ([#8440](https://github.com/mapbox/mapbox-gl-js/pull/8440))
+* Fix rendering of extraneous vertical line in vector tiles ([#8477](https://github.com/mapbox/mapbox-gl-js/issues/8477), fixed by [#8479](https://github.com/mapbox/mapbox-gl-js/pull/8479))
+* Turn off 'move' event listeners when removing a marker ([#8465](https://github.com/mapbox/mapbox-gl-js/pull/8465))
+* Fix class toggling on navigation control for IE ([#8495](https://github.com/mapbox/mapbox-gl-js/pull/8495)) (h/t [cs09g](https://github.com/cs09g))
+* Fix background rotation hovering on geolocate control ([#8367](https://github.com/mapbox/mapbox-gl-js/pull/8367)) (h/t [GuillaumeGomez](https://github.com/GuillaumeGomez))
+* Fix error in click events on markers where `startPos` is not defined ([#8462](https://github.com/mapbox/mapbox-gl-js/pull/8462)) (h/t [@msbarry](https://github.com/msbarry))
+* Fix malformed urls when using custom `baseAPIURL` of a certain form ([#8466](https://github.com/mapbox/mapbox-gl-js/pull/8466))
+
+## 1.1.1
+
+## 🐞 Bug fixes
+
+* Fix unbounded memory growth caused by failure to cancel requests to the cache ([#8472](https://github.com/mapbox/mapbox-gl-js/pull/8472))
+* Fix unbounded memory growth caused by failure to cancel requests in IE ([#8481](https://github.com/mapbox/mapbox-gl-js/issues/8481))
+* Fix performance of getting tiles from the cache ([#8489](https://github.com/mapbox/mapbox-gl-js/pull/8449))
+
 ## 1.1.0
 
 ## ✨ Minor features and improvements
@@ -30,7 +66,8 @@
 * Fix location dot shadow not displaying ([#8119](https://github.com/mapbox/mapbox-gl-js/pull/8119)) (h/t [bravecow](https://github.com/bravecow))
 * Fix docs dev dependencies being mistakenly installed as package dependencies ([#8121](https://github.com/mapbox/mapbox-gl-js/pull/8121)) (h/t [bravecow](https://github.com/bravecow))
 * Various typo fixes ([#8230](https://github.com/mapbox/mapbox-gl-js/pull/8230), h/t [erictheise](https://github.com/erictheise)) ([#8236](https://github.com/mapbox/mapbox-gl-js/pull/8236), h/t [fredj](https://github.com/fredj))
-
+* Fix geolocate button CSS ([#8367](https://github.com/mapbox/mapbox-gl-js/pull/8367), h/t [GuillaumeGomez](https://github.com/GuillaumeGomez))
+* Fix caching for Mapbox tiles ([#8389](https://github.com/mapbox/mapbox-gl-js/pull/8389))
 
 ## 1.0.0
 
@@ -51,6 +88,12 @@ When (and only when) loading tiles from a Mapbox API with a Mapbox access token
 
 For further information on the pricing changes, you can read our [blog post](https://blog.mapbox.com/new-pricing-46b7c26166e7) and check out our new [pricing page](https://www.mapbox.com/pricing), which has a price calculator. As always, you can also contact our team at [https://support.mapbox.com](https://support.mapbox.com).
 
+## 0.54.1
+
+### Bug fixes
+
+- Fix unbounded memory growth caused by failure to cancel requests in IE ([#8481](https://github.com/mapbox/mapbox-gl-js/issues/8481))
+
 ## 0.54.0
 
 ### Breaking changes

CONTRIBUTING.md

@@ -137,7 +137,7 @@ The conventions for module exports are:
 
 ## Documentation Conventions
 
-See [`docs/README.md`](https://github.com/mapbox/mapbox-gl-js/blob/master/docs/README.md).
+See [`README.md`](https://github.com/mapbox/mapbox-gl-js-docs/blob/publisher-production/README.md) from [`mapbox-gl-js-docs`](https://github.com/mapbox/mapbox-gl-js-docs/).
 
 ### Github Issue Labels
 

README.md

@@ -1,4 +1,4 @@
-[<img width="400" alt="Mapbox" src="docs/pages/assets/logo.png">](https://www.mapbox.com/)
+[<img width="400" alt="Mapbox" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-js-docs/publisher-production/docs/pages/assets/logo.png">](https://www.mapbox.com/)
 
 **Mapbox GL JS** is a JavaScript library for interactive, customizable vector maps on the web. It takes map styles that conform to the
 [Mapbox Style Specification](https://docs.mapbox.com/mapbox-gl-js/style-spec/), applies them to vector tiles that
@@ -24,7 +24,7 @@ native SDKs. For code and issues specific to the native SDKs, see the
 - [Open source styles](https://github.com/mapbox/mapbox-gl-styles)
 - [Contributor documentation](https://github.com/mapbox/mapbox-gl-js/blob/master/CONTRIBUTING.md)
 
-[<img width="981" alt="Mapbox GL gallery" src="docs/pages/assets/gallery.png">](https://www.mapbox.com/gallery/)
+[<img width="981" alt="Mapbox GL gallery" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-js-docs/publisher-production/docs/pages/assets/gallery.png">](https://www.mapbox.com/gallery/)
 
 ## License
 

bench/benchmarks/expressions.js

@@ -4,8 +4,8 @@ import Benchmark from '../lib/benchmark';
 
 import spec from '../../src/style-spec/reference/latest';
 import convertFunction from '../../src/style-spec/function/convert';
-import { isFunction, createFunction } from '../../src/style-spec/function';
-import { createPropertyExpression } from '../../src/style-spec/expression';
+import {isFunction, createFunction} from '../../src/style-spec/function';
+import {createPropertyExpression} from '../../src/style-spec/expression';
 import fetchStyle from '../lib/fetch_style';
 
 import type {StyleSpecification} from '../../src/style-spec/types';

bench/benchmarks/filter_evaluate.js

@@ -1,6 +1,6 @@
 
 import Benchmark from '../lib/benchmark';
-import { VectorTile } from '@mapbox/vector-tile';
+import {VectorTile} from '@mapbox/vector-tile';
 import Pbf from 'pbf';
 import createFilter from '../../src/style-spec/feature_filter';
 import filters from '../data/filters.json';
@@ -30,7 +30,7 @@ export default class FilterEvaluate extends Benchmark {
                         }
                     }
 
-                    this.layers.push({ features, filters: layerFilters });
+                    this.layers.push({features, filters: layerFilters});
                 }
             });
     }

bench/benchmarks/layout.js

@@ -4,7 +4,7 @@ import type {StyleSpecification} from '../../src/style-spec/types';
 import Benchmark from '../lib/benchmark';
 import fetchStyle from '../lib/fetch_style';
 import TileParser from '../lib/tile_parser';
-import { OverscaledTileID } from '../../src/source/tile_id';
+import {OverscaledTileID} from '../../src/source/tile_id';
 
 export default class Layout extends Benchmark {
     tiles: Array<{tileID: OverscaledTileID, buffer: ArrayBuffer}>;

bench/benchmarks/layout_dds.js

@@ -2,7 +2,7 @@
 
 import Benchmark from '../lib/benchmark';
 import TileParser from '../lib/tile_parser';
-import { OverscaledTileID } from '../../src/source/tile_id';
+import {OverscaledTileID} from '../../src/source/tile_id';
 
 const LAYER_COUNT = 2;
 
@@ -18,7 +18,7 @@ export default class LayoutDDS extends Benchmark {
         const styleJSON = {
             "version": 8,
             "sources": {
-                "mapbox": { "type": "vector", "url": "mapbox://mapbox.mapbox-streets-v7" }
+                "mapbox": {"type": "vector", "url": "mapbox://mapbox.mapbox-streets-v7"}
             },
             "layers": []
         };

bench/benchmarks/paint_states.js

@@ -62,7 +62,7 @@ export default class PaintStates extends Benchmark {
         this.map._sourcesDirty = true;
         this.map._render();
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.setFeatureState({ source: 'land', id: i }, { bench: true });
+            this.map.setFeatureState({source: 'land', id: i}, {bench: true});
         }
         this.map._render();
     }

bench/benchmarks/remove_paint_state.js

@@ -72,10 +72,10 @@ export class PropertyLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.setFeatureState({ source: 'land', id: i }, { bench: true });
+            this.map.setFeatureState({source: 'land', id: i}, {bench: true});
         }
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.removeFeatureState({ source: 'land', id: i }, 'bench');
+            this.map.removeFeatureState({source: 'land', id: i}, 'bench');
         }
         this.map._render();
 
@@ -86,10 +86,10 @@ export class FeatureLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.setFeatureState({ source: 'land', id: i }, { bench: true });
+            this.map.setFeatureState({source: 'land', id: i}, {bench: true});
         }
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.removeFeatureState({ source: 'land', id: i });
+            this.map.removeFeatureState({source: 'land', id: i});
         }
         this.map._render();
 
@@ -100,10 +100,10 @@ export class SourceLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.setFeatureState({ source: 'land', id: i }, { bench: true });
+            this.map.setFeatureState({source: 'land', id: i}, {bench: true});
         }
         for (let i = 0; i < this.numFeatures; i += 50) {
-            this.map.removeFeatureState({ source: 'land', id: i });
+            this.map.removeFeatureState({source: 'land', id: i});
         }
         this.map._render();
 

bench/benchmarks/symbol_layout.js

@@ -2,8 +2,8 @@
 
 import Layout from './layout';
 import SymbolBucket from '../../src/data/bucket/symbol_bucket';
-import { performSymbolLayout } from '../../src/symbol/symbol_layout';
-import { OverscaledTileID } from '../../src/source/tile_id';
+import {performSymbolLayout} from '../../src/symbol/symbol_layout';
+import {OverscaledTileID} from '../../src/source/tile_id';
 
 export default class SymbolLayout extends Layout {
     parsedTiles: Array<any>;

bench/benchmarks/worker_transfer.js

@@ -4,9 +4,9 @@ import type {StyleSpecification} from '../../src/style-spec/types';
 import Benchmark from '../lib/benchmark';
 import fetchStyle from '../lib/fetch_style';
 import TileParser from '../lib/tile_parser';
-import { OverscaledTileID } from '../../src/source/tile_id';
-import { serialize, deserialize } from '../../src/util/web_worker_transfer';
-import { values } from '../../src/util/util';
+import {OverscaledTileID} from '../../src/source/tile_id';
+import {serialize, deserialize} from '../../src/util/web_worker_transfer';
+import {values} from '../../src/util/util';
 
 export default class WorkerTransfer extends Benchmark {
     parser: TileParser;

bench/benchmarks_view.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import * as d3 from 'd3';
-import { kde, probabilitiesOfSuperiority, summaryStatistics, regression } from './lib/statistics';
+import {kde, probabilitiesOfSuperiority, summaryStatistics, regression} from './lib/statistics';
 
 const versionColor = d3.scaleOrdinal(['#1b9e77', '#7570b3', '#d95f02']);
 const formatSample = d3.format(".3r");
@@ -224,12 +224,12 @@ class StatisticsPlot extends React.Component {
                                     strokeWidth={bandwidth}
                                     strokeOpacity={1} />
                                 <use href="#up-arrow" // mean
-                                    style={{ stroke: color, fill: color, fillOpacity: 0.4 }}
+                                    style={{stroke: color, fill: color, fillOpacity: 0.4}}
                                     transform={mean >= tMax ? 'translate(-10, 0)' : `translate(-5, ${t(mean)}) rotate(90)`}
                                     x={0}
                                     y={0} />
                                 <use href="#up-arrow" // trimmed mean
-                                    style={{ stroke: color, fill: color }}
+                                    style={{stroke: color, fill: color}}
                                     transform={`translate(-5, ${t(trimmedMean)}) rotate(90)`}
                                     x={0}
                                     y={0} />
@@ -275,7 +275,7 @@ class StatisticsPlot extends React.Component {
     }
 
     componentDidMount() {
-        this.setState({ width: this.ref.clientWidth });
+        this.setState({width: this.ref.clientWidth});
     }
 }
 
@@ -342,7 +342,7 @@ class RegressionPlot extends React.Component {
     }
 
     componentDidMount() {
-        this.setState({ width: this.ref.clientWidth });
+        this.setState({width: this.ref.clientWidth});
     }
 }
 

bench/lib/fetch_style.js

@@ -1,7 +1,7 @@
 // @flow
 
 import type {StyleSpecification} from '../../src/style-spec/types';
-import { RequestManager } from '../../src/util/mapbox';
+import {RequestManager} from '../../src/util/mapbox';
 
 const requestManager = new RequestManager();