Validate that raster layers do not specify both 'resampling' and 'raster-resampling'

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## main
 ### ✨ Features and improvements
+- Validate that `raster` layers do not specify both `resampling` and `raster-resampling` paint properties ([#1532](https://github.com/maplibre/maplibre-style-spec/pull/1532)) (by [larsmaxfield](https://github.com/larsmaxfield))
 - _...Add new stuff here..._
 
 ### 🐞 Bug fixes

src/reference/v8.json

@@ -7763,7 +7763,7 @@
       "default": "linear",
       "sdk-support": {
         "basic functionality": {
-          "js": "https://github.com/maplibre/maplibre-gl-js/issues/7154",
+          "js": "5.20.0",
           "android": "https://github.com/maplibre/maplibre-native/issues/4117",
           "ios": "https://github.com/maplibre/maplibre-native/issues/4117"
         }
@@ -8050,7 +8050,7 @@
       "default": "linear",
       "sdk-support": {
         "basic functionality": {
-          "js": "https://github.com/maplibre/maplibre-gl-js/issues/7154",
+          "js": "5.20.0",
           "android": "https://github.com/maplibre/maplibre-native/issues/4117",
           "ios": "https://github.com/maplibre/maplibre-native/issues/4117"
         }
@@ -8128,7 +8128,7 @@
       "default": "linear",
       "sdk-support": {
         "basic functionality": {
-          "js": "https://github.com/maplibre/maplibre-gl-js/issues/7154",
+          "js": "5.20.0",
           "android": "https://github.com/maplibre/maplibre-native/issues/4117",
           "ios": "https://github.com/maplibre/maplibre-native/issues/4117"
         }

src/validate/validate_layer.ts

@@ -144,6 +144,16 @@ export function validateLayer(options) {
         }
     }
 
+    if (type === 'raster' && layer.paint?.resampling && layer.paint?.['raster-resampling']) {
+        errors.push(
+            new ValidationError(
+                key,
+                layer.paint,
+                `layer "${layer.id}" redundantly specifies "resampling" and "raster-resampling" paint properties, but only one is allowed. It is advised to use "resampling".`
+            )
+        );
+    }
+
     errors = errors.concat(
         validateObject({
             key,

test/integration/style-spec/tests/layers.input.json

@@ -190,6 +190,16 @@
         "hillshade-highlight-color": [],
         "hillshade-shadow-color": []
       }
+    },
+    {
+      "id": "redundant-resampling",
+      "type": "raster",
+      "source": "raster",
+      "source-layer": "source-layer",
+      "paint": {
+        "resampling": "nearest",
+        "raster-resampling": "linear"
+      }
     }
   ]
 }

test/integration/style-spec/tests/layers.output.json

@@ -102,5 +102,9 @@
   {
     "message": "layers[22].paint.hillshade-shadow-color: array length at least 1 expected, length 0 found",
     "line": 191
+  },
+  {
+    "message": "layers[23]: layer \"redundant-resampling\" redundantly specifies \"resampling\" and \"raster-resampling\" paint properties, but only one is allowed. It is advised to use \"resampling\".",
+    "line": 199
   }
 ]