Merge branch 'maplibre:main' into issue_7149

Author: pcardinal

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6

package-lock.json

@@ -24,7 +24,7 @@
     "@mapbox/vector-tile": "^2.0.4",
     "@mapbox/whoots-js": "^3.1.0",
     "@maplibre/geojson-vt": "^6.0.1",
-    "@maplibre/maplibre-gl-style-spec": "^24.6.0",
+    "@maplibre/maplibre-gl-style-spec": "^24.7.0",
     "@maplibre/mlt": "^1.1.6",
     "@maplibre/vt-pbf": "^4.3.0",
     "@types/geojson": "^7946.0.16",
@@ -40,14 +40,14 @@
   "devDependencies": {
     "@mapbox/mapbox-gl-rtl-text": "^0.3.0",
     "@mapbox/mvt-fixtures": "^3.10.0",
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-commonjs": "^29.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-strip": "^3.0.4",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.4",
-    "@stylistic/eslint-plugin": "^5.9.0",
+    "@stylistic/eslint-plugin": "^5.10.0",
     "@types/benchmark": "^2.1.5",
     "@types/d3": "^7.4.3",
     "@types/earcut": "^3.0.0",
@@ -57,7 +57,7 @@
     "@types/minimist": "^1.2.5",
     "@types/murmurhash-js": "^1.0.6",
     "@types/nise": "^1.4.5",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.3.5",
     "@types/offscreencanvas": "^2019.7.3",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.5",
@@ -80,7 +80,7 @@
     "cssnano": "^7.1.2",
     "d3": "^7.9.0",
     "d3-queue": "^3.0.7",
-    "devtools-protocol": "^0.0.1591319",
+    "devtools-protocol": "^0.0.1594462",
     "diff": "^8.0.3",
     "dts-bundle-generator": "^9.5.1",
     "eslint": "^9.39.2",
@@ -97,7 +97,7 @@
     "minimist": "^1.2.8",
     "mock-geolocation": "^1.0.11",
     "monocart-coverage-reports": "^2.12.9",
-    "nise": "^6.1.2",
+    "nise": "^6.1.3",
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
     "pdf-merger-js": "^5.1.2",
@@ -113,7 +113,7 @@
     "regenerate": "^1.4.2",
     "rollup": "^4.59.0",
     "rollup-plugin-sourcemaps2": "^0.5.6",
-    "rollup-plugin-visualizer": "^7.0.0",
+    "rollup-plugin-visualizer": "^7.0.1",
     "rw": "^1.3.3",
     "semver": "^7.7.4",
     "sharp": "^0.34.5",

package.json

@@ -29,19 +29,4 @@ describe('RasterStyleLayer correctly handles "resampling" and "raster-resampling
         expect(resampling).toEqual(undefined);
     });
 
-    test('warns when both "resampling" and "raster-resampling" are specified upon instantiation', () => {
-        const originalWarn = console.warn;
-        console.warn = vi.fn();
-
-        const layerSpec = createLayerSpec({
-            paint: {
-                resampling: 'nearest',
-                'raster-resampling': 'nearest',
-            }
-        });
-        createStyleLayer(layerSpec, {});
-        expect(console.warn).toHaveBeenCalledTimes(1);
-        console.warn = originalWarn;
-    });
-
 });

src/style/style_layer/raster_style_layer.test.ts

@@ -1,5 +1,4 @@
 import {StyleLayer} from '../style_layer';
-import {warnOnce} from '../../util/util';
 
 import properties, {type RasterPaintPropsPossiblyEvaluated} from './raster_style_layer_properties.g';
 import {type Transitionable, type Transitioning, type PossiblyEvaluated} from '../properties';
@@ -15,10 +14,6 @@ export class RasterStyleLayer extends StyleLayer {
     paint: PossiblyEvaluated<RasterPaintProps, RasterPaintPropsPossiblyEvaluated>;
 
     constructor(layer: LayerSpecification, globalState: Record<string, any>) {
-        const resampling = layer.paint?.['resampling'];
-        if (resampling && layer.paint?.['raster-resampling']) {
-            warnOnce(`Raster layer "${layer.id}" paint properties "resampling" and "raster-resampling" are both specified, but only "resampling" needs to be specified. Defaulting to "resampling" (${resampling}).`);
-        }
         super(layer, properties, globalState);
     }
 }