cherry picks from Master to Release-Erie (#9772)

* Cherry pick (mapbox/mapbox-gl-js#9757) to release-erie

* Cherry pick (mapbox/mapbox-gl-js#9753) to release-erie

* Cherry pick (mapbox/mapbox-gl-js#9749) to release-erie

* Cherry pick (mapbox/mapbox-gl-js#9748) to release-erie

package.json

@@ -33,7 +33,7 @@
     "potpack": "^1.0.1",
     "quickselect": "^2.0.0",
     "rw": "^1.3.3",
-    "supercluster": "^7.0.0",
+    "supercluster": "^7.1.0",
     "tinyqueue": "^2.0.3",
     "vt-pbf": "^3.1.1"
   },

rollup/bundle_prelude.js

@@ -14,6 +14,8 @@ if (!shared) {
     var sharedChunk = {};
     shared(sharedChunk);
     mapboxgl = chunk(sharedChunk);
-    mapboxgl.workerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+    if (typeof window !== 'undefined') {
+        mapboxgl.workerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+    }
 }
 }

src/data/load_geometry.js

@@ -10,14 +10,9 @@ import type Point from '@mapbox/point-geometry';
 // While visible coordinates are within [0, EXTENT], tiles may theoretically
 // contain cordinates within [-Infinity, Infinity]. Our range is limited by the
 // number of bits used to represent the coordinate.
-function createBounds(bits) {
-    return {
-        min: -1 * Math.pow(2, bits - 1),
-        max: Math.pow(2, bits - 1) - 1
-    };
-}
-
-const bounds = createBounds(15);
+const BITS = 15;
+const MAX = Math.pow(2, BITS - 1) - 1;
+const MIN = -MAX - 1;
 
 /**
  * Loads a geometry from a VectorTileFeature and scales it to the common extent
@@ -34,13 +29,16 @@ export default function loadGeometry(feature: VectorTileFeature): Array<Array<Po
             const point = ring[p];
             // round here because mapbox-gl-native uses integers to represent
             // points and we need to do the same to avoid renering differences.
-            point.x = Math.round(point.x * scale);
-            point.y = Math.round(point.y * scale);
+            const x = Math.round(point.x * scale);
+            const y = Math.round(point.y * scale);
+
+            point.x = clamp(x, MIN, MAX);
+            point.y = clamp(y, MIN, MAX);
 
-            if (point.x < bounds.min || point.x > bounds.max || point.y < bounds.min || point.y > bounds.max) {
+            if (x < point.x || x > point.x + 1 || y < point.y || y > point.y + 1) {
+                // warn when exceeding allowed extent except for the 1-px-off case
+                // https://github.com/mapbox/mapbox-gl-js/issues/8992
                 warnOnce('Geometry exceeds allowed extent, reduce your vector tile buffer size');
-                point.x = clamp(point.x, bounds.min, bounds.max);
-                point.y = clamp(point.y, bounds.min, bounds.max);
             }
         }
     }

src/source/geojson_source.js

@@ -138,6 +138,7 @@ class GeoJSONSource extends Evented implements Source {
                 maxZoom: options.clusterMaxZoom !== undefined ?
                     Math.min(options.clusterMaxZoom, this.maxzoom - 1) :
                     (this.maxzoom - 1),
+                minPoints: Math.max(2, options.clusterMinPoints || 2),
                 extent: EXTENT,
                 radius: (options.clusterRadius || 50) * scale,
                 log: false,

src/style-spec/reference/v8.json

@@ -377,6 +377,10 @@
       "type": "number",
       "doc": "Max zoom on which to cluster points if clustering is enabled. Defaults to one zoom less than maxzoom (so that last zoom features are not clustered)."
     },
+    "clusterMinPoints": {
+      "type": "number",
+      "doc": "Minimum number of points necessary to form a cluster if clustering is enabled. Defaults to `2`."
+    },
     "clusterProperties": {
       "type": "*",
       "doc": "An object defining custom properties on the generated clusters if clustering is enabled, aggregating values from clustered points. Has the form `{\"property_name\": [operator, map_expression]}`. `operator` is any expression function that accepts at least 2 operands (e.g. `\"+\"` or `\"max\"`) — it accumulates the property value from clusters/points the cluster contains; `map_expression` produces the value of a single point.\n\nExample: `{\"sum\": [\"+\", [\"get\", \"scalerank\"]]}`.\n\nFor more advanced use cases, in place of `operator`, you can use a custom reduce expression that references a special `[\"accumulated\"]` value, e.g.:\n`{\"sum\": [[\"+\", [\"accumulated\"], [\"get\", \"sum\"]], [\"get\", \"scalerank\"]]}`"

src/ui/handler_manager.js

@@ -128,12 +128,14 @@ class HandlerManager {
         const el = this._el;
 
         this._listeners = [
-            // Bind touchstart and touchmove with passive: false because, even though
-            // they only fire a map events and therefore could theoretically be
-            // passive, binding with passive: true causes iOS not to respect
-            // e.preventDefault() in _other_ handlers, even if they are non-passive
-            // (see https://bugs.webkit.org/show_bug.cgi?id=184251)
-            [el, 'touchstart', {passive: false}],
+            // This needs to be `passive: true` so that a double tap fires two
+            // pairs of touchstart/end events in iOS Safari 13. If this is set to
+            // `passive: false` then the second pair of events is only fired if
+            // preventDefault() is called on the first touchstart. Calling preventDefault()
+            // undesirably prevents click events.
+            [el, 'touchstart', {passive: true}],
+            // This needs to be `passive: false` so that scrolls and pinches can be
+            // prevented in browsers that don't support `touch-actions: none`, for example iOS Safari 12.
             [el, 'touchmove', {passive: false}],
             [el, 'touchend', undefined],
             [el, 'touchcancel', undefined],

src/util/browser.js

@@ -54,7 +54,7 @@ const exported = {
         return linkEl.href;
     },
 
-    hardwareConcurrency: window.navigator.hardwareConcurrency || 4,
+    hardwareConcurrency: window.navigator && window.navigator.hardwareConcurrency || 4,
 
     get devicePixelRatio() { return window.devicePixelRatio; },
     get prefersReducedMotion(): boolean {

src/util/browser/window.js

@@ -2,4 +2,5 @@
 /* eslint-env browser */
 import type {Window} from '../../types/window';
 
-export default (self: Window);
+// shim window for the case of requiring the browser bundle in Node
+export default typeof self !== 'undefined' ? (self: Window) : (({}: any): Window);

src/util/dom.js

@@ -20,7 +20,7 @@ DOM.createNS = function (namespaceURI: string, tagName: string) {
     return el;
 };
 
-const docStyle = window.document.documentElement.style;
+const docStyle = window.document && window.document.documentElement.style;
 
 function testProp(props) {
     if (!docStyle) return props[0];

test/build/min.test.js

@@ -36,6 +36,11 @@ test('can be browserified', (t) => {
     });
 });
 
+test('evaluates without errors', (t) => {
+    t.doesNotThrow(() => require(path.join(__dirname, '../../dist/mapbox-gl.js')));
+    t.end();
+});
+
 test('distributed in plain ES5 code', (t) => {
     const linter = new Linter();
     const messages = linter.verify(minBundle, {

test/unit/source/geojson_source.test.js

@@ -176,6 +176,7 @@ test('GeoJSONSource#update', (t) => {
                 t.equal(message, 'geojson.loadData');
                 t.deepEqual(params.superclusterOptions, {
                     maxZoom: 12,
+                    minPoints: 3,
                     extent: 8192,
                     radius: 1600,
                     log: false,
@@ -190,6 +191,7 @@ test('GeoJSONSource#update', (t) => {
             cluster: true,
             clusterMaxZoom: 12,
             clusterRadius: 100,
+            clusterMinPoints: 3,
             generateId: true
         }, mockDispatcher).load();
     });

yarn.lock

@@ -10299,10 +10299,10 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supercluster@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.0.0.tgz#75d474fafb0a055db552ed7bd7bbda583f6ab321"
-  integrity sha512-8VuHI8ynylYQj7Qf6PBMWy1PdgsnBiIxujOgc9Z83QvJ8ualIYWNx2iMKyKeC4DZI5ntD9tz/CIwwZvIelixsA==
+supercluster@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.0.tgz#f0a457426ec0ab95d69c5f03b51e049774b94479"
+  integrity sha512-LDasImUAFMhTqhK+cUXfy9C2KTUqJ3gucLjmNLNFmKWOnDUBxLFLH9oKuXOTCLveecmxh8fbk8kgh6Q0gsfe2w==
   dependencies:
     kdbush "^3.0.0"