maplibre-gl 2.2.0-pre.2 → 2.2.0

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.2.0-pre.2",
+  "version": "2.2.0",
   "main": "dist/maplibre-gl.js",
   "style": "dist/maplibre-gl.css",
   "license": "BSD-3-Clause",
@@ -12,125 +12,126 @@
   "types": "dist/maplibre-gl.d.ts",
   "type": "module",
   "dependencies": {
-    "@mapbox/geojson-rewind": "^0.5.1",
+    "@mapbox/geojson-rewind": "^0.5.2",
     "@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/tiny-sdf": "^2.0.5",
     "@mapbox/unitbezier": "^0.0.1",
     "@mapbox/vector-tile": "^1.3.1",
     "@mapbox/whoots-js": "^3.1.0",
-    "@types/geojson": "^7946.0.8",
+    "@types/geojson": "^7946.0.10",
     "@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.3",
+    "earcut": "^2.2.4",
     "geojson-vt": "^3.2.1",
     "gl-matrix": "^3.4.3",
     "murmurhash-js": "^1.0.0",
     "pbf": "^3.2.1",
     "potpack": "^1.0.2",
     "quickselect": "^2.0.0",
-    "supercluster": "^7.1.4",
+    "supercluster": "^7.1.5",
     "tinyqueue": "^2.0.3",
     "vt-pbf": "^3.1.3"
   },
   "devDependencies": {
     "@mapbox/gazetteer": "^5.1.0",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
-    "@mapbox/mvt-fixtures": "^3.6.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@mapbox/mvt-fixtures": "^3.9.0",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-strip": "^2.1.0",
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@swc/cli": "^0.1.55",
-    "@swc/core": "^1.2.135",
-    "@swc/jest": "^0.2.17",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@types/benchmark": "^2.1.1",
     "@types/browserify": "^12.0.37",
     "@types/cssnano": "^5.0.0",
-    "@types/d3": "^7.1.0",
+    "@types/d3": "^7.4.0",
     "@types/diff": "^5.0.2",
     "@types/earcut": "^2.1.1",
-    "@types/eslint": "^8.4.1",
-    "@types/gl": "^4.1.0",
+    "@types/eslint": "^8.4.5",
+    "@types/gl": "^4.1.1",
     "@types/glob": "^7.2.0",
-    "@types/jest": "^27.4.0",
-    "@types/jsdom": "^16.2.14",
+    "@types/jest": "^28.1.6",
+    "@types/jsdom": "^20.0.0",
     "@types/minimist": "^1.2.2",
     "@types/murmurhash-js": "^1.0.3",
     "@types/nise": "^1.4.0",
-    "@types/offscreencanvas": "^2019.6.4",
+    "@types/offscreencanvas": "^2019.7.0",
     "@types/pixelmatch": "^5.2.4",
     "@types/pngjs": "^6.0.1",
-    "@types/react": "^18.0.8",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^18.0.15",
+    "@types/react-dom": "^18.0.6",
     "@types/request": "^2.48.8",
     "@types/rollup-plugin-json": "^3.0.3",
     "@types/shuffle-seed": "^1.1.0",
     "@types/supercluster": "^7.1.0",
     "@types/window-or-global": "^1.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.14.0",
-    "@typescript-eslint/parser": "^5.14.0",
-    "address": "^1.1.2",
+    "@typescript-eslint/eslint-plugin": "^5.32.0",
+    "@typescript-eslint/parser": "^5.32.0",
+    "acorn-import-assertions": "^1.8.0",
+    "address": "^1.2.0",
     "benchmark": "^2.1.4",
     "browserify": "^17.0.0",
-    "canvas": "^2.9.0",
-    "cssnano": "^5.0.16",
-    "d3": "^7.3.0",
+    "canvas": "^2.9.3",
+    "cssnano": "^5.1.12",
+    "d3": "^7.6.1",
     "d3-queue": "^3.0.7",
-    "diff": "^5.0.0",
-    "documentation": "13.0.2",
-    "dts-bundle-generator": "^6.4.0",
-    "eslint": "^8.7.0",
+    "diff": "^5.1.0",
+    "documentation": "14.0.0-alpha.1",
+    "dts-bundle-generator": "^6.12.0",
+    "eslint": "^8.21.0",
     "eslint-config-mourner": "^3.0.0",
-    "eslint-plugin-html": "^6.2.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jest": "^26.0.0",
-    "eslint-plugin-jsdoc": "^39.2.9",
-    "eslint-plugin-react": "^7.28.0",
-    "gl": "^5.0.0",
-    "glob": "^7.2.0",
-    "is-builtin-module": "^3.1.0",
-    "jest": "^27.5.1",
-    "jest-canvas-mock": "^2.3.1",
-    "jest-playwright-preset": "^1.7.0",
-    "jsdom": "^19.0.0",
-    "json-stringify-pretty-compact": "^3.0.0",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.7.0",
+    "eslint-plugin-jsdoc": "^39.3.4",
+    "eslint-plugin-react": "^7.30.1",
+    "gl": "^5.0.3",
+    "glob": "^8.0.3",
+    "is-builtin-module": "^3.2.0",
+    "jest": "^28.1.3",
+    "jest-canvas-mock": "^2.4.0",
+    "jest-environment-jsdom": "^28.1.3",
+    "jest-playwright-preset": "^2.0.0",
+    "jsdom": "^20.0.0",
+    "json-stringify-pretty-compact": "^4.0.0",
     "mapbox-gl-styles": "^2.0.2",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "mock-geolocation": "^1.0.11",
     "nise": "^5.1.1",
     "node-plantuml": "^0.9.0",
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
-    "pdf-merger-js": "^3.3.2",
-    "pixelmatch": "^5.2.1",
-    "playwright": "^1.18.1",
+    "pdf-merger-js": "^3.4.0",
+    "pixelmatch": "^5.3.0",
+    "playwright": "^1.24.2",
     "pngjs": "^6.0.0",
-    "postcss": "^8.4.5",
-    "postcss-cli": "^9.1.0",
+    "postcss": "^8.4.14",
+    "postcss-cli": "^10.0.0",
     "postcss-inline-svg": "^5.0.0",
     "pretty-bytes": "^6.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "request": "^2.88.0",
-    "rollup": "^2.66.1",
+    "rollup": "^2.77.2",
+    "rollup-plugin-import-assert": "^2.1.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-unassert": "^0.3.0",
     "rw": "^1.3.3",
-    "semver": "^7.3.5",
+    "semver": "^7.3.7",
     "shuffle-seed": "^1.1.6",
     "source-map-explorer": "^2.5.2",
     "st": "^3.0.0",
-    "stylelint": "^14.3.0",
-    "stylelint-config-standard": "^25.0.0",
-    "ts-node": "^10.5.0",
-    "typescript": "^4.6.2"
+    "stylelint": "^14.9.1",
+    "stylelint-config-standard": "^26.0.0",
+    "ts-jest": "^28.0.7",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4",
+    "unassert-rollup-plugin": "^2.0.0"
   },
   "scripts": {
     "generate-shaders": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-shaders.ts",
@@ -139,6 +140,7 @@
     "generate-style-spec": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-spec.ts",
     "generate-typings": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-typings.ts",
     "generate-query-test-fixtures": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-query-test-fixtures.ts",
+    "generate-debug-index-file": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-debug-index-file.ts",
     "build-dev": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:dev",
     "watch-dev": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:dev --watch",
     "build-prod": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:production",
@@ -154,22 +156,23 @@
     "start": "run-p watch-css start-server",
     "start-debug": "run-p watch-css watch-dev start-server",
     "start-bench": "run-p watch-css watch-benchmarks start-server-at-test",
-    "lint": "eslint --cache --ext \".ts,.js,.html\" --ignore-path .gitignore src test build debug/*.html jest.config.js",
+    "lint": "eslint --cache --ext \".ts,.tsx,.js,.html\" --ignore-path .gitignore src test build",
     "lint-docs": "documentation lint src/index.ts",
     "lint-css": "stylelint \"src/css/maplibre-gl.css\"",
     "test": "run-s lint lint-css lint-docs test-unit",
-    "test-build": "jest --roots ./test/build",
+    "test-build": "jest -c ./jest.config.builds.ts --roots ./test/build",
     "test-symbol-shaping": "jest --roots ./test/integration/symbol-shaping",
     "test-style-spec": "jest --roots ./test/integration/style-spec",
-    "test-browser": "jest -c ./jest.config.e2e.js --roots ./test/integration/browser",
-    "test-render": "node --loader ts-node/esm --experimental-specifier-resolution=node --experimental-json-modules --max-old-space-size=2048 test/integration/render/render.test.ts",
-    "test-query": "jest -c ./jest.config.e2e.js --roots ./test/integration/query",
+    "test-browser": "jest -c ./jest.config.e2e.ts --roots ./test/integration/browser",
+    "test-render": "node --loader ts-node/esm --experimental-specifier-resolution=node --max-old-space-size=2048 test/integration/render/render.test.ts",
+    "test-query": "jest -c ./jest.config.e2e.ts --roots ./test/integration/query",
     "test-expression": "jest --roots ./test/integration/expression",
-    "test-unit": "jest --roots ./src",
-    "codegen": "npm run generate-style-code && npm run generate-struct-arrays && npm run generate-style-spec && npm run generate-shaders",
+    "test-unit": "jest  -c ./jest.config.ts --roots ./src",
+    "codegen": "npm run generate-style-code && npm run generate-struct-arrays && npm run generate-style-spec && npm run generate-shaders && npm run generate-debug-index-file",
     "benchmark": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/run-benchmarks.ts",
     "gl-stats": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/gl-stats.ts",
-    "postinstall": "node ./postinstall.js"
+    "postinstall": "node ./postinstall.js",
+    "typecheck": "tsc --project tsconfig.typecheck.json"
   },
   "files": [
     "build/",

package/src/css/maplibre-gl.css

@@ -464,26 +464,6 @@
     100% { transform: rotate(360deg); }
 }
 
-@keyframes maplibregl-spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-@keyframes maplibregl-spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-@keyframes maplibregl-spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-@keyframes maplibregl-spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
 a.maplibregl-ctrl-logo,
 a.mapboxgl-ctrl-logo {
     width: 88px;
@@ -542,6 +522,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
         position: relative;
         background-color: #fff;
         border-radius: 12px;
+        box-sizing: content-box;
     }
 
     .maplibregl-ctrl-attrib.maplibregl-compact-show,
@@ -580,6 +561,15 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
         border: 0;
     }
 
+    .maplibregl-ctrl-attrib summary.maplibregl-ctrl-attrib-button {
+        appearance: none;
+        list-style: none;
+    }
+
+    .maplibregl-ctrl-attrib summary.maplibregl-ctrl-attrib-button::-webkit-details-marker {
+        display: none;
+    }
+
     .maplibregl-ctrl-top-left .maplibregl-ctrl-attrib-button,
     .maplibregl-ctrl-bottom-left .maplibregl-ctrl-attrib-button,
     .mapboxgl-ctrl-top-left .mapboxgl-ctrl-attrib-button,
@@ -887,18 +877,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
     100% { transform: scale(1); opacity: 0; }
 }
 
-@keyframes maplibregl-user-location-dot-pulse {
-    0%   { transform: scale(1); opacity: 1; }
-    70%  { transform: scale(3); opacity: 0; }
-    100% { transform: scale(1); opacity: 0; }
-}
-
-@keyframes maplibregl-user-location-dot-pulse {
-    0%   { transform: scale(1); opacity: 1; }
-    70%  { transform: scale(3); opacity: 0; }
-    100% { transform: scale(1); opacity: 0; }
-}
-
 .maplibregl-user-location-dot-stale,
 .mapboxgl-user-location-dot-stale {
     background-color: #aaa;
@@ -937,3 +915,41 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
     border: 2px dotted #202020;
     opacity: 0.5;
 }
+
+.maplibregl-cooperative-gesture-screen {
+    background: rgba(0 0 0 / 40%);
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: white;
+    padding: 1rem;
+    font-size: 1.4em;
+    line-height: 1.2;
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 1s ease 1s;
+}
+
+.maplibregl-cooperative-gesture-screen.maplibregl-show {
+    opacity: 1;
+    transition: opacity 0.05s;
+}
+
+.maplibregl-cooperative-gesture-screen .maplibregl-mobile-message {
+    display: none;
+}
+
+@media (hover: none), (max-width: 480px) {
+    .maplibregl-cooperative-gesture-screen .maplibregl-desktop-message {
+        display: none;
+    }
+
+    .maplibregl-cooperative-gesture-screen .maplibregl-mobile-message {
+        display: block;
+    }
+}

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

@@ -55,6 +55,7 @@ test('FillBucket segmentation', () => {
         id: 'test',
         type: 'fill',
         layout: {},
+        source: 'source',
         paint: {
             'fill-color': ['to-color', ['get', 'foo'], '#000']
         }

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

@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import fs from 'fs';
 import path from 'path';
 import Protobuf from 'pbf';

package/src/data/bucket/symbol_bucket.ts

@@ -21,7 +21,7 @@ import SegmentVector from '../segment';
 import {ProgramConfigurationSet} from '../program_configuration';
 import {TriangleIndexArray, LineIndexArray} from '../index_array_type';
 import transformText from '../../symbol/transform_text';
-import mergeLines from '../../symbol/mergelines';
+import mergeLines from '../../symbol/merge_lines';
 import {allowsVerticalWritingMode, stringContainsRTLText} from '../../util/script_detection';
 import {WritingMode} from '../../symbol/shaping';
 import loadGeometry from '../load_geometry';

package/src/data/evaluation_feature.ts

@@ -26,6 +26,6 @@ type EvaluationFeature = {
 export default function toEvaluationFeature(feature: VectorTileFeature, needGeometry: boolean): EvaluationFeature {
     return {type: feature.type,
         id: feature.id,
-        properties:feature.properties,
+        properties: feature.properties,
         geometry: needGeometry ? loadGeometry(feature) : []};
 }

package/src/data/program_configuration.ts

@@ -698,7 +698,7 @@ function paintAttributeNames(property, type) {
 
 function getLayoutException(property) {
     const propertyExceptions = {
-        'line-pattern':{
+        'line-pattern': {
             'source': PatternLayoutArray,
             'composite': PatternLayoutArray
         },
@@ -706,7 +706,7 @@ function getLayoutException(property) {
             'source': PatternLayoutArray,
             'composite': PatternLayoutArray
         },
-        'fill-extrusion-pattern':{
+        'fill-extrusion-pattern': {
             'source': PatternLayoutArray,
             'composite': PatternLayoutArray
         }

package/src/geo/transform.test.ts

@@ -93,7 +93,7 @@ describe('transform', () => {
         transform.latRange = [-5, 5];
 
         transform.zoom = 0;
-        expect(transform.zoom).toBe(5.135709286104402);
+        expect(transform.zoom).toBe(5.1357092861044045);
 
         transform.center = new LngLat(-50, -30);
         expect(transform.center).toEqual(new LngLat(0, -0.0063583052861417855));
@@ -103,6 +103,39 @@ describe('transform', () => {
         expect(transform.center).toEqual(new LngLat(-4.828338623046875, -4.828969771321582));
     });
 
+    test('lngRange can constrain zoom and center across meridian', () => {
+        const transform = new Transform(0, 22, 0, 60, true);
+        transform.center = new LngLat(180, 0);
+        transform.zoom = 10;
+        transform.resize(500, 500);
+
+        // equivalent ranges
+        const lngRanges: [number, number][] = [
+            [175, -175], [175, 185], [-185, -175], [-185, 185]
+        ];
+
+        for (const lngRange of lngRanges) {
+            transform.lngRange = lngRange;
+            transform.latRange = [-5, 5];
+
+            transform.zoom = 0;
+            expect(transform.zoom).toBe(5.1357092861044045);
+
+            transform.center = new LngLat(-50, -30);
+            expect(transform.center).toEqual(new LngLat(180, -0.0063583052861417855));
+
+            transform.zoom = 10;
+            transform.center = new LngLat(-50, -30);
+            expect(transform.center).toEqual(new LngLat(-175.171661376953125, -4.828969771321582));
+
+            transform.center = new LngLat(230, 0);
+            expect(transform.center).toEqual(new LngLat(-175.171661376953125, 0));
+
+            transform.center = new LngLat(130, 0);
+            expect(transform.center).toEqual(new LngLat(175.171661376953125, 0));
+        }
+    });
+
     describe('coveringTiles', () => {
         const options = {
             minzoom: 1,

package/src/geo/transform.ts

@@ -438,12 +438,9 @@ class Transform {
                 let quadrant = it.aabb.quadrant(i);
                 if (options.terrain) {
                     const tileID = new OverscaledTileID(childZ, it.wrap, childZ, childX, childY);
-                    const tile = options.terrain.getTerrainData(tileID).tile;
-                    let minElevation = this.elevation, maxElevation = this.elevation;
-                    if (tile && tile.dem) {
-                        minElevation = tile.dem.min * options.terrain.exaggeration;
-                        maxElevation = tile.dem.max * options.terrain.exaggeration;
-                    }
+                    const minMax = options.terrain.getMinMaxElevation(tileID);
+                    const minElevation = minMax.minElevation ?? this.elevation;
+                    const maxElevation = minMax.maxElevation ?? this.elevation;
                     quadrant = new Aabb(
                         [quadrant.min[0], quadrant.min[1], minElevation] as vec3,
                         [quadrant.max[0], quadrant.max[1], maxElevation] as vec3
@@ -496,7 +493,7 @@ class Transform {
      * get the elevation from terrain for the current zoomlevel.
      * @param lnglat the location
      * @param terrain the terrain
-     * @returns {Number} elevation in meters
+     * @returns {number} elevation in meters
      */
     getElevation(lnglat: LngLat, terrain: Terrain) {
         const merc = MercatorCoordinate.fromLngLat(lnglat);
@@ -654,8 +651,8 @@ class Transform {
     /**
      * Given a coordinate, return the screen point that corresponds to it
      * @param {Coordinate} coord
-     * @params {number} elevation default = 0
-     * @params {mat4} pixelMatrix, default = this.pixelMatrix
+     * @param {number} elevation default = 0
+     * @param {mat4} pixelMatrix, default = this.pixelMatrix
      * @returns {Point} screen point
      * @private
      */
@@ -766,8 +763,20 @@ class Transform {
 
         if (this.lngRange) {
             const lngRange = this.lngRange;
-            minX = mercatorXfromLng(lngRange[0]) * this.worldSize;
-            maxX = mercatorXfromLng(lngRange[1]) * this.worldSize;
+
+            minX = wrap(
+                mercatorXfromLng(lngRange[0]) * this.worldSize,
+                0,
+                this.worldSize
+            );
+            maxX = wrap(
+                mercatorXfromLng(lngRange[1]) * this.worldSize,
+                0,
+                this.worldSize
+            );
+
+            if (maxX < minX) maxX += this.worldSize;
+
             sx = maxX - minX < size.x ? size.x / (maxX - minX) : 0;
         }
 
@@ -795,8 +804,9 @@ class Transform {
         }
 
         if (this.lngRange) {
-            const x = point.x,
-                w2 = size.x / 2;
+            const centerX = (minX + maxX) / 2;
+            const x = wrap(point.x, centerX - this.worldSize / 2, centerX + this.worldSize / 2);
+            const w2 = size.x / 2;
 
             if (x - w2 < minX) x2 = minX + w2;
             if (x + w2 > maxX) x2 = maxX - w2;
@@ -806,7 +816,7 @@ class Transform {
         if (x2 !== undefined || y2 !== undefined) {
             this.center = this.unproject(new Point(
                 x2 !== undefined ? x2 : point.x,
-                y2 !== undefined ? y2 : point.y));
+                y2 !== undefined ? y2 : point.y)).wrap();
         }
 
         this._unmodified = unmodified;
@@ -909,7 +919,7 @@ class Transform {
             dx = x - Math.round(x) + angleCos * xShift + angleSin * yShift,
             dy = y - Math.round(y) + angleCos * yShift + angleSin * xShift;
         const alignedM = new Float64Array(m) as any as mat4;
-        mat4.translate(alignedM, alignedM, [ dx > 0.5 ? dx - 1 : dx, dy > 0.5 ? dy - 1 : dy, 0 ]);
+        mat4.translate(alignedM, alignedM, [dx > 0.5 ? dx - 1 : dx, dy > 0.5 ? dy - 1 : dy, 0]);
         this.alignedProjMatrix = alignedM;
 
         // inverse matrix for conversion from screen coordinaes to location

package/src/gl/vertex_buffer.ts

@@ -14,11 +14,11 @@ import type Context from '../gl/context';
  * @readonly
  */
 const AttributeType = {
-    Int8:   'BYTE',
-    Uint8:  'UNSIGNED_BYTE',
-    Int16:  'SHORT',
+    Int8: 'BYTE',
+    Uint8: 'UNSIGNED_BYTE',
+    Int16: 'SHORT',
     Uint16: 'UNSIGNED_SHORT',
-    Int32:  'INT',
+    Int32: 'INT',
     Uint32: 'UNSIGNED_INT',
     Float32: 'FLOAT'
 };

package/src/index.ts

@@ -237,7 +237,7 @@ Debug.extend(exported, {isSafari, getPerformanceMetrics: PerformanceUtils.getPer
  * @param {boolean} lazy If set to `true`, mapboxgl will defer loading the plugin until rtl text is encountered,
  *    rtl text will then be rendered only after the plugin finishes loading.
  * @example
- * maplibregl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js');
+ * maplibregl.setRTLTextPlugin('https://unpkg.com/@mapbox/mapbox-gl-rtl-text@0.2.3/mapbox-gl-rtl-text.js');
  * @see [Add support for right-to-left scripts](https://maplibre.org/maplibre-gl-js-docs/example/mapbox-gl-rtl-text/)
  */
 

package/src/render/draw_debug.ts

@@ -92,7 +92,7 @@ function drawDebugTile(painter, sourceCache, coord: OverscaledTileID) {
     if (coord.overscaledZ !== coord.canonical.z) {
         tileIdText += ` => ${coord.overscaledZ}`;
     }
-    const tileLabel = `${tileIdText} ${tileSizeKb}kb`;
+    const tileLabel = `${tileIdText} ${tileSizeKb}kB`;
     drawTextToOverlay(painter, tileLabel);
 
     program.draw(context, gl.TRIANGLES, depthMode, stencilMode, ColorMode.alphaBlended, CullFaceMode.disabled,

package/src/render/draw_symbol.test.ts

@@ -14,9 +14,6 @@ import Transform from '../geo/transform';
 import type EvaluationParameters from '../style/evaluation_parameters';
 import type {SymbolLayerSpecification} from '../style-spec/types.g';
 import Style from '../style/style';
-import TerrainSourceCache from '../source/terrain_source_cache';
-import {Evented} from '../util/evented';
-import {RequestManager} from '../util/request_manager';
 
 jest.mock('./painter');
 jest.mock('./program');
@@ -25,22 +22,6 @@ jest.mock('../source/tile');
 jest.mock('../data/bucket/symbol_bucket');
 jest.mock('../symbol/projection');
 
-class StubMap extends Evented {
-    transform: Transform;
-    painter: Painter;
-    _requestManager: RequestManager;
-
-    constructor() {
-        super();
-        this.transform = new Transform();
-        this._requestManager = {
-            transformRequest: (url) => {
-                return {url};
-            }
-        } as any as RequestManager;
-    }
-}
-
 describe('drawSymbol', () => {
     test('should not do anything', () => {
         const mockPainter = new Painter(null, null);
@@ -63,7 +44,7 @@ describe('drawSymbol', () => {
         painterMock.renderPass = 'translucent';
         painterMock.transform = {pitch: 0, labelPlaneMatrix: mat4.create()} as any as Transform;
         painterMock.options = {} as any;
-        painterMock.style = {terrainSourceCache: {getTerrain: () => null}} as any as Style;
+        painterMock.style = {} as any as Style;
 
         const layerSpec = {
             id: 'mock-layer',
@@ -164,9 +145,7 @@ describe('drawSymbol', () => {
         const sourceCacheMock = new SourceCache(null, null, null);
         (sourceCacheMock.getTile as jest.Mock).mockReturnValue(tile);
         sourceCacheMock.map = {showCollisionBoxes: false} as any as Map;
-        painterMock.style = {
-            terrainSourceCache: new TerrainSourceCache(new Style(new StubMap() as any as Map))
-        } as any as Style;
+        painterMock.style = {} as any as Style;
 
         const spy = jest.spyOn(symbolProjection, 'updateLineLabels');
         drawSymbol(painterMock, sourceCacheMock, layer, [tileId], null);

package/src/render/draw_terrain.ts

@@ -107,7 +107,7 @@ function prepareTerrain(painter: Painter, terrain: Terrain, tile: Tile, stack: n
     if (!tile.textures[stack]) {
         tile.textures[stack] = painter.getTileTexture(size) || new Texture(context, {width: size, height: size, data: null}, context.gl.RGBA);
         tile.textures[stack].bind(context.gl.LINEAR, context.gl.CLAMP_TO_EDGE);
-        if (stack === 0) terrain.sourceCache.renderHistory.push(tile.tileID.key);
+        if (stack === 0) terrain.sourceCache.renderHistory.unshift(tile.tileID.key);
     }
     const fb = terrain.getRTTFramebuffer();
     fb.colorAttachment.set(tile.textures[stack].texture);

package/src/render/image_atlas.ts

@@ -1,3 +1,4 @@
+/* eslint-disable key-spacing */
 import {RGBAImage} from '../util/image';
 import {register} from '../util/web_worker_transfer';
 import potpack from 'potpack';

package/src/render/image_manager.ts

@@ -1,3 +1,4 @@
+/* eslint-disable key-spacing */
 import potpack from 'potpack';
 
 import {Event, ErrorEvent, Evented} from '../util/evented';