Merge branch 'main' into dependabot/npm_and_yarn/eslint-10.2.0

Author: HarelM

.github/workflows/test-all.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
-      - run: npm run lint
+      - run: npm run lint -- --max-warnings 0
         if: '!cancelled()'
       - run: npm run lint-css
         if: '!cancelled()'

CHANGELOG.md

@@ -2,9 +2,14 @@
 ### ✨ Features and improvements
 - _...Add new stuff here..._
 - Add `touchZoomRotate.setZoomRate()` and `touchZoomRotate.setZoomThreshold()` to customize touch zoom speed and pinch sensitivity ([#7271](https://github.com/maplibre/maplibre-gl-js/issues/7271))
+- Improve ability to communicate with imported scripts in workers and use `makeRequest` in workres as well ([#7451](https://github.com/maplibre/maplibre-gl-js/issues/7451)) (by [@HarelM](https://github.com/HarelM))
+- Allow `opacity` and `opacityWhenCovered` in `Marker` and `MarkerOptions` to accept `number` in addition to `string`, and add `maplibregl-marker-covered` CSS class to `Marker` element when covered by 3D terrain or a globe ([#7433](https://github.com/maplibre/maplibre-gl-js/issues/7433)) (by [@YuChunTsao](https://github.com/YuChunTsao))
 
 ### 🐞 Bug fixes
 - Fix polygon text label placement drifting far from center for convex polygons at high zoom due to coordinate rounding in geojson-vt ([#7380](https://github.com/maplibre/maplibre-gl-js/pull/7380)) (by [@CommanderStorm](https://github.com/CommanderStorm))
+- Ensure that a successful ArrayBuffer response from a custom protocol that is null/undefined is set to an empty ArrayBuffer ([#7427](https://github.com/maplibre/maplibre-gl-js/pull/7427)) (by [@neodescis](https://github.com/neodescis))
+- Fix error in `_contextRestored` when map was initialized without a style ([#7432](https://github.com/maplibre/maplibre-gl-js/issues/7432)) (by [@mvanhorn](https://github.com/mvanhorn))
+- Fix issue with the cache used for zoomLevelsToOverscale feature ([#7450](https://github.com/maplibre/maplibre-gl-js/issues/7450)) (by [@HarelM](https://github.com/HarelM))
 - _...Add new stuff here..._
 
 ## 5.22.0

build/eslint-rules/prefer-type-for-data-shapes.js

@@ -0,0 +1,38 @@
+export default {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Prefer type aliases over interfaces for plain data shapes (no methods, no inheritance)',
+        },
+        messages: {
+            preferType: 'Use a type alias instead of an interface for plain data shapes.',
+        },
+        schema: [],
+    },
+    create(context) {
+        return {
+            TSInterfaceDeclaration(node) {
+                if (node.extends && node.extends.length > 0) {
+                    return;
+                }
+
+                const hasBehavior = node.body.body.some(
+                    (member) =>
+                        member.type === 'TSMethodSignature' ||
+                        member.type === 'TSCallSignatureDeclaration' ||
+                        member.type === 'TSConstructSignatureDeclaration' ||
+                        (member.type === 'TSPropertySignature' &&
+                            (member.typeAnnotation?.typeAnnotation?.type === 'TSFunctionType' ||
+                             member.typeAnnotation?.typeAnnotation?.type === 'TSTypeQuery'))
+                );
+
+                if (!hasBehavior) {
+                    context.report({
+                        node: node.id,
+                        messageId: 'preferType',
+                    });
+                }
+            },
+        };
+    },
+};

eslint.config.js

@@ -6,10 +6,11 @@ import globals from 'globals';
 import tsParser from '@typescript-eslint/parser';
 import react from 'eslint-plugin-react';
 import html from 'eslint-plugin-html';
+import preferTypeForDataShapes from './build/eslint-rules/prefer-type-for-data-shapes.js';
 
 export default [
     {
-        ignores: ['build/*.js', 'build/rollup/**', 'staging/**', 'coverage/**', 'node_modules/**', 'docs/**', 'dist/**']
+        ignores: ['build/*.js', 'build/rollup/**', 'staging/**', 'coverage/**', 'node_modules/**', 'docs/**', 'dist/**', '**/*_generated.js']
     },
     {
         ignores: ['test/bench/**'],
@@ -19,6 +20,7 @@ export default [
             '@stylistic': stylisticTs,
             tsdoc,
             vitest,
+            'local': {rules: {'prefer-type-for-data-shapes': preferTypeForDataShapes}},
         },
 
         linterOptions: {
@@ -40,6 +42,7 @@ export default [
                 projectService: {
                     allowDefaultProject: [
                         'build/generate-*.ts',
+                        'build/eslint-rules/*.js',
                         'test/build/*.ts',
                         'eslint.config.js',
                         'postcss.config.js',
@@ -66,6 +69,7 @@ export default [
             '@typescript-eslint/prefer-includes': 'error',
             '@typescript-eslint/prefer-string-starts-ends-with': 'error',
             '@typescript-eslint/array-type': ['error', {default: 'array-simple'}],
+            'local/prefer-type-for-data-shapes': 'error',
 
             'prefer-object-spread': 'error',
             'prefer-object-has-own': 'error',

package-lock.json

@@ -92,7 +92,7 @@
     "glob": "^13.0.6",
     "globals": "^17.4.0",
     "is-builtin-module": "^5.0.0",
-    "jsdom": "^29.0.1",
+    "jsdom": "^29.0.2",
     "junit-report-builder": "^5.1.1",
     "minimist": "^1.2.8",
     "mock-geolocation": "^1.0.11",

package.json

@@ -9,44 +9,44 @@ export interface ReadOnlyBounds {
 
     /**
      * Returns whether this bounding box contains a point
-     * 
+     *
      * @param point - The point to check
      * @returns True if this bounding box contains point, false otherwise.
      */
     contains(point: Point2D): boolean;
 
     /**
      * Returns true if this bounding box contains no points
-     * 
+     *
      * @returns True if this bounding box contains no points.
      */
     empty(): boolean;
 
     /**
      * Returns the width of this bounding box.
-     * 
+     *
      * @returns `maxX - minX`.
      */
     width(): number;
 
     /**
      * Returns the height of this bounding box.
-     * 
+     *
      * @returns `maxY - minY`.
      */
     height(): number;
 
     /**
      * Returns true if this bounding box completely covers `other`.
-     * 
+     *
      * @param other - The other bounding box
      * @returns True if this bounding box completely encloses `other`
      */
     covers(other: ReadOnlyBounds): boolean;
 
     /**
      * Returns true if this bounding box touches any part of `other`.
-     * 
+     *
      * @param other - The other bounding box
      * @returns True if this bounding box touches any part of `other`.
      */
@@ -62,7 +62,7 @@ export class Bounds implements ReadOnlyBounds {
 
     /**
      * Expands this bounding box to include point.
-     * 
+     *
      * @param point - The point to include in this bounding box
      * @returns This mutated bounding box
      */
@@ -76,7 +76,7 @@ export class Bounds implements ReadOnlyBounds {
 
     /**
      * Expands this bounding box by a fixed amount in each direction.
-     * 
+     *
      * @param amount - The amount to expand the box by, or contract if negative
      * @returns This mutated bounding box
      */
@@ -97,7 +97,7 @@ export class Bounds implements ReadOnlyBounds {
 
     /**
      * Shrinks this bounding box by a fixed amount in each direction.
-     * 
+     *
      * @param amount - The amount to shrink the box by
      * @returns This mutated bounding box
      */
@@ -108,11 +108,11 @@ export class Bounds implements ReadOnlyBounds {
     /**
      * Returns a new bounding box that contains all of the corners of this bounding
      * box with a transform applied. Does not modify this bounding box.
-     * 
+     *
      * @param fn - The function to apply to each corner
      * @returns A new bounding box containing all of the mapped points.
      */
-    map(fn: (point: Point2D) => Point2D) {
+    map(fn: (point: Point) => Point2D): Bounds {
         const result = new Bounds();
         result.extend(fn(new Point(this.minX, this.minY)));
         result.extend(fn(new Point(this.maxX, this.minY)));
@@ -123,7 +123,7 @@ export class Bounds implements ReadOnlyBounds {
 
     /**
      * Creates a new bounding box that includes all points provided.
-     * 
+     *
      * @param points - The points to include inside the bounding box
      * @returns The new bounding box
      */

src/geo/bounds.ts

@@ -9,6 +9,7 @@ import type {CoveringTilesDetailsProvider} from './covering_tiles_details_provid
 import {OverscaledTileID} from '../../tile/tile_id';
 import {earthRadius} from '../lng_lat';
 import {ConvexVolume} from '../../util/primitives/convex_volume';
+import type {IBoundingVolume} from '../../util/primitives/bounding_volume';
 import {threePlaneIntersection} from '../../util/util';
 
 /**
@@ -57,7 +58,7 @@ export class GlobeCoveringTilesDetailsProvider implements CoveringTilesDetailsPr
      * Handles distances on a sphere correctly: X is wrapped when crossing the antimeridian,
      * when crossing the poles Y is mirrored and X is shifted by half world size.
      */
-    distanceToTile2d(pointX: number, pointY: number, tileID: {x: number; y: number; z: number}, _bv: ConvexVolume): number {
+    distanceToTile2d(pointX: number, pointY: number, tileID: {x: number; y: number; z: number}, _bv: IBoundingVolume): number {
         const scale = 1 << tileID.z;
         const tileMercatorSize = 1.0 / scale;
         const tileCornerX = tileID.x / scale; // In range 0..1

src/geo/projection/globe_covering_tiles_details_provider.ts

@@ -1,5 +1,6 @@
 import {OverscaledTileID} from '../../tile/tile_id';
 import {Aabb} from '../../util/primitives/aabb';
+import type {IBoundingVolume} from '../../util/primitives/bounding_volume';
 import {clamp} from '../../util/util';
 import {type MercatorCoordinate} from '../mercator_coordinate';
 import {type IReadonlyTransform} from '../transform_interface';
@@ -8,7 +9,8 @@ import {type CoveringTilesDetailsProvider} from './covering_tiles_details_provid
 
 export class MercatorCoveringTilesDetailsProvider implements CoveringTilesDetailsProvider {
 
-    distanceToTile2d(pointX: number, pointY: number, _tileID: {x: number; y: number; z: number}, aabb: Aabb): number {
+    distanceToTile2d(pointX: number, pointY: number, _tileID: {x: number; y: number; z: number}, boundingVolume: IBoundingVolume): number {
+        const aabb = boundingVolume as Aabb;
         const distanceX = aabb.distanceX([pointX, pointY]);
         const distanceY = aabb.distanceY([pointX, pointY]);
         return Math.hypot(distanceX, distanceY);

src/geo/projection/mercator_covering_tiles_details_provider.ts

@@ -65,11 +65,13 @@ export type TransformHelperCallbacks = {
 
 export type TransformOptions = {
     /**
-     * The minimum zoom level of the map.
+     * The minimum zoom level of the map. Users cannot zoom out beyond this level. (0–24)
+     * @defaultValue 0
      */
     minZoom?: number;
     /**
-     * The maximum zoom level of the map.
+     * The maximum zoom level of the map. Users cannot zoom in beyond this level. (0–24)
+     * @defaultValue 22
      */
     maxZoom?: number;
     /**