maplibre-gl 2.0.2 → 2.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maplibre-gl",
   "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "dist/maplibre-gl.js",
   "style": "dist/maplibre-gl.css",
   "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
     "url": "git://github.com/maplibre/maplibre-gl-js.git"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "types": "dist/maplibre-gl.d.ts",
   "type": "module",
@@ -18,10 +18,14 @@
     "@mapbox/geojson-rewind": "^0.5.0",
     "@mapbox/jsonlint-lines-primitives": "^2.0.2",
     "@mapbox/mapbox-gl-supported": "^2.0.1",
+    "@mapbox/point-geometry": "^0.1.0",
     "@mapbox/tiny-sdf": "^2.0.4",
     "@mapbox/unitbezier": "^0.0.1",
     "@mapbox/vector-tile": "^1.3.1",
     "@mapbox/whoots-js": "^3.1.0",
+    "@types/geojson": "^7946.0.7",
+    "@types/mapbox__point-geometry": "^0.1.2",
+    "@types/mapbox__vector-tile": "^1.3.0",
     "@types/pbf": "^3.0.2",
     "csscolorparser": "~1.0.3",
     "earcut": "^2.2.2",
@@ -31,7 +35,7 @@
     "pbf": "^3.2.1",
     "potpack": "^1.0.1",
     "quickselect": "^2.0.0",
-    "supercluster": "^7.1.0",
+    "supercluster": "^7.1.4",
     "tinyqueue": "^2.0.3",
     "vt-pbf": "^3.1.1"
   },
@@ -57,7 +61,6 @@
     "@types/earcut": "^2.1.1",
     "@types/ejs": "^3.1.0",
     "@types/eslint": "^8.2.1",
-    "@types/geojson": "^7946.0.7",
     "@types/gl": "^4.1.0",
     "@types/glob": "^7.1.3",
     "@types/jest": "^27.0.2",
@@ -83,16 +86,15 @@
     "@types/supercluster": "^5.0.2",
     "@types/tape": "^4.13.2",
     "@types/window-or-global": "^1.0.4",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "address": "^1.1.2",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^27.2.5",
     "babelify": "^10.0.0",
     "benchmark": "^2.1.4",
     "browserify": "^17.0.0",
-    "canvas": "^2.6.1",
-    "chalk": "^4.1.2",
+    "canvas": "^2.9.0",
     "chokidar": "^3.0.2",
     "cssnano": "^5.0.8",
     "d3": "^4.12.0",
@@ -107,7 +109,7 @@
     "eslint-plugin-jest": "^25.2.2",
     "eslint-plugin-jsdoc": "^37.0.3",
     "eslint-plugin-react": "^7.25.1",
-    "gl": "^4.5.3",
+    "gl": "^5.0.0",
     "glob": "^7.1.4",
     "is-builtin-module": "^3.0.0",
     "jest": "^27.2.4",
@@ -168,7 +170,7 @@
     "testem": "^3.5.0",
     "ts-jest": "^27.0.5",
     "ts-node": "^10.2.1",
-    "typescript": "^4.4.2"
+    "typescript": "^4.5.4"
   },
   "browser": {
     "./rollup/build/tsc/src/util/web_worker.js": "./build/web_worker_replacement.js"
@@ -211,7 +213,8 @@
     "test-expressions": "node --experimental-specifier-resolution=node test/expression.test.js",
     "test-cov": "nyc --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
     "test-jest": "jest",
-    "codegen": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-code.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-struct-arrays.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-spec.ts"
+    "codegen": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-code.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-struct-arrays.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-spec.ts",
+    "gl-stats": "node bench/gl-stats.js"
   },
   "files": [
     "build/",

package/src/data/array_types.ts

@@ -3,7 +3,7 @@
 import assert from 'assert';
 import {Struct, StructArray} from '../util/struct_array';
 import {register} from '../util/web_worker_transfer';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 
 /**
  * Implementation of the StructArray layout:

package/src/data/bucket/circle_bucket.ts

@@ -23,7 +23,7 @@ import type HeatmapStyleLayer from '../../style/style_layer/heatmap_style_layer'
 import type Context from '../../gl/context';
 import type IndexBuffer from '../../gl/index_buffer';
 import type VertexBuffer from '../../gl/vertex_buffer';
-import type Point from '../../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {FeatureStates} from '../../source/source_state';
 import type {ImagePosition} from '../../render/image_atlas';
 import type {VectorTileLayer} from '@mapbox/vector-tile';

package/src/data/bucket/fill_bucket.test.ts

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
-import Point from '../../util/point';
+import Point from '@mapbox/point-geometry';
 import segment from '../segment';
 import FillBucket from './fill_bucket';
 import FillStyleLayer from '../../style/style_layer/fill_style_layer';

package/src/data/bucket/fill_bucket.ts

@@ -26,7 +26,7 @@ import type FillStyleLayer from '../../style/style_layer/fill_style_layer';
 import type Context from '../../gl/context';
 import type IndexBuffer from '../../gl/index_buffer';
 import type VertexBuffer from '../../gl/vertex_buffer';
-import type Point from '../../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {FeatureStates} from '../../source/source_state';
 import type {ImagePosition} from '../../render/image_atlas';
 import type {VectorTileLayer} from '@mapbox/vector-tile';

package/src/data/bucket/fill_extrusion_bucket.ts

@@ -30,7 +30,7 @@ import type FillExtrusionStyleLayer from '../../style/style_layer/fill_extrusion
 import type Context from '../../gl/context';
 import type IndexBuffer from '../../gl/index_buffer';
 import type VertexBuffer from '../../gl/vertex_buffer';
-import type Point from '../../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {FeatureStates} from '../../source/source_state';
 import type {ImagePosition} from '../../render/image_atlas';
 import type {VectorTileLayer} from '@mapbox/vector-tile';

package/src/data/bucket/line_bucket.test.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
-import Point from '../../util/point';
+import Point from '@mapbox/point-geometry';
 import segment from '../segment';
 import LineBucket from './line_bucket';
 import LineStyleLayer from '../../style/style_layer/line_style_layer';

package/src/data/bucket/line_bucket.ts

@@ -23,7 +23,7 @@ import type {
     PopulateParameters
 } from '../bucket';
 import type LineStyleLayer from '../../style/style_layer/line_style_layer';
-import type Point from '../../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {Segment} from '../segment';
 import {RGBAImage} from '../../util/image';
 import type Context from '../../gl/context';

package/src/data/bucket/symbol_bucket.ts

@@ -16,7 +16,7 @@ import {SymbolLayoutArray,
     SymbolLineVertexArray
 } from '../array_types';
 
-import Point from '../../util/point';
+import Point from '@mapbox/point-geometry';
 import SegmentVector from '../segment';
 import {ProgramConfigurationSet} from '../program_configuration';
 import {TriangleIndexArray, LineIndexArray} from '../index_array_type';

package/src/data/bucket.ts

@@ -7,7 +7,7 @@ import type {FeatureStates} from '../source/source_state';
 import type {ImagePosition} from '../render/image_atlas';
 import type {CanonicalTileID} from '../source/tile_id';
 import type {VectorTileFeature, VectorTileLayer} from '@mapbox/vector-tile';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 
 export type BucketParameters<Layer extends TypedStyleLayer> = {
   index: number;

package/src/data/evaluation_feature.ts

@@ -1,5 +1,5 @@
 import loadGeometry from './load_geometry';
-import type Point from '../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 type EvaluationFeature = {

package/src/data/feature_index.ts

@@ -1,4 +1,4 @@
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import loadGeometry from './load_geometry';
 import toEvaluationFeature from './evaluation_feature';
 import EXTENT from './extent';

package/src/data/load_geometry.ts

@@ -2,7 +2,7 @@ import {warnOnce, clamp} from '../util/util';
 
 import EXTENT from './extent';
 
-import type Point from '../util/point';
+import type Point from '@mapbox/point-geometry';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 // These bounds define the minimum and maximum supported coordinate values.

package/src/geo/edge_insets.ts

@@ -1,5 +1,5 @@
 import {number} from '../style-spec/util/interpolate';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import {clamp} from '../util/util';
 
 /**

package/src/geo/transform.test.ts

@@ -1,4 +1,4 @@
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import Transform from './transform';
 import LngLat from './lng_lat';
 import {OverscaledTileID, CanonicalTileID} from '../source/tile_id';

package/src/geo/transform.ts

@@ -1,7 +1,7 @@
 import LngLat from './lng_lat';
 import LngLatBounds from './lng_lat_bounds';
 import MercatorCoordinate, {mercatorXfromLng, mercatorYfromLat, mercatorZfromAltitude} from './mercator_coordinate';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import {wrap, clamp} from '../util/util';
 import {number as interpolate} from '../style-spec/util/interpolate';
 import EXTENT from '../data/extent';

package/src/index.ts

@@ -13,7 +13,7 @@ import Marker from './ui/marker';
 import Style from './style/style';
 import LngLat from './geo/lng_lat';
 import LngLatBounds from './geo/lng_lat_bounds';
-import Point from './util/point';
+import Point from '@mapbox/point-geometry';
 import MercatorCoordinate from './geo/mercator_coordinate';
 import {Evented} from './util/evented';
 import config from './util/config';

package/src/render/draw_symbol.ts

@@ -1,4 +1,4 @@
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import drawCollisionDebug from './draw_collision_debug';
 
 import SegmentVector from '../data/segment';

package/src/source/geojson_source.test.ts

@@ -227,6 +227,33 @@ describe('GeoJSONSource#update', () => {
         } as GeoJSONSourceOptions, mockDispatcher, undefined).load();
     });
 
+    test('forwards Supercluster options with worker request, ignore max zoom of source', done => {
+        const mockDispatcher = wrapDispatcher({
+            send(message, params) {
+                expect(message).toBe('geojson.loadData');
+                expect(params.superclusterOptions).toEqual({
+                    maxZoom: 12,
+                    minPoints: 3,
+                    extent: 8192,
+                    radius: 1600,
+                    log: false,
+                    generateId: true
+                });
+                done();
+            }
+        });
+
+        new GeoJSONSource('id', {
+            data: {},
+            maxzoom: 10,
+            cluster: true,
+            clusterMaxZoom: 12,
+            clusterRadius: 100,
+            clusterMinPoints: 3,
+            generateId: true
+        } as GeoJSONSourceOptions, mockDispatcher, undefined).load();
+    });
+
     test('transforms url before making request', () => {
         const mapStub = {
             _requestManager: {

package/src/source/geojson_source.ts

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

package/src/source/geojson_wrapper.ts

@@ -1,4 +1,4 @@
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 
 import mvt from '@mapbox/vector-tile';
 import type {VectorTileFeature, VectorTileLayer, VectorTile} from '@mapbox/vector-tile';

package/src/source/query_features.test.ts

@@ -4,7 +4,7 @@ import {
 } from './query_features';
 import SourceCache from './source_cache';
 import Transform from '../geo/transform';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import Dispatcher from '../util/dispatcher';
 
 describe('QueryFeatures#rendered', () => {

package/src/source/query_features.ts

@@ -4,7 +4,7 @@ import type CollisionIndex from '../symbol/collision_index';
 import type Transform from '../geo/transform';
 import type {RetainedQueryData} from '../symbol/placement';
 import type {FilterSpecification} from '../style-spec/types';
-import type Point from '../util/point';
+import type Point from '@mapbox/point-geometry';
 import assert from 'assert';
 import {mat4} from 'gl-matrix';
 

package/src/source/source_cache.test.ts

@@ -4,7 +4,7 @@ import Tile from './tile';
 import {OverscaledTileID} from './tile_id';
 import Transform from '../geo/transform';
 import LngLat from '../geo/lng_lat';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import {Event, ErrorEvent, Evented} from '../util/evented';
 import {extend} from '../util/util';
 import browser from '../util/browser';

package/src/source/source_cache.ts

@@ -7,7 +7,7 @@ import MercatorCoordinate from '../geo/mercator_coordinate';
 import {keysDifference} from '../util/util';
 import EXTENT from '../data/extent';
 import Context from '../gl/context';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import browser from '../util/browser';
 import {OverscaledTileID} from './tile_id';
 import assert from 'assert';

package/src/source/tile.ts

@@ -30,7 +30,7 @@ import type Transform from '../geo/transform';
 import type {LayerFeatureStates} from './source_state';
 import type {Cancelable} from '../types/cancelable';
 import type {FilterSpecification} from '../style-spec/types';
-import type Point from '../util/point';
+import type Point from '@mapbox/point-geometry';
 import {mat4} from 'gl-matrix';
 import type {VectorTileLayer} from '@mapbox/vector-tile';
 

package/src/source/tile_id.ts

@@ -1,6 +1,6 @@
 import {getTileBBox} from '@mapbox/whoots-js';
 import EXTENT from '../data/extent';
-import Point from '../util/point';
+import Point from '@mapbox/point-geometry';
 import MercatorCoordinate from '../geo/mercator_coordinate';
 
 import assert from 'assert';