Remove resampling validation logic for raster layers (#7224)

* Remove resampling validation logic in raster layer

Style spec v24.7.0 now validates redundant properties

* Update maplibre-style-spec version to 24.7.0

* Update package-lock.json

Author: larsmaxfield

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",

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);
     }
 }