Fix moveLayer tests

GitOrigin-RevId: dfd4a9fb54d5a691f290a47d883bbf01b2863eaa

Author: ibesora

src/style/style.ts

@@ -2710,7 +2710,7 @@ class Style extends Evented<MapEvents> {
             // or it has the same slot as the 'before' layer,
             // then we can insert the new layer before the existing one.
             const beforeLayer = this._layers[before];
-            if (layer.slot === beforeLayer.slot) index = beforeIndex;
+            if (!layer.slot || layer.slot === beforeLayer.slot) index = beforeIndex;
             else warnOnce(`Layer with id "${before}" has a different slot. Layers can only be rearranged within the same slot.`);
         }
 
@@ -2785,7 +2785,7 @@ class Style extends Evented<MapEvents> {
             // or it has the same slot as the 'before' layer,
             // then we can insert the new layer before the existing one.
             const beforeLayer = this._layers[before];
-            if (layer.slot === beforeLayer.slot) newIndex = beforeIndex;
+            if (!layer.slot || layer.slot === beforeLayer.slot) newIndex = beforeIndex;
             else warnOnce(`Layer with id "${before}" has a different slot. Layers can only be rearranged within the same slot.`);
         }
 

test/integration/render-tests/slots/layer-without-slot-before-layer-with-slot/style.json

@@ -9,31 +9,26 @@
         [
           "addLayer",
           {
-            "id": "red",
-            "source": "red",
+            "id": "green",
+            "source": "green",
             "type": "circle",
-            "slot": "slot",
             "paint": {
-              "circle-color": "#ff0000",
-              "circle-radius": 10
+              "circle-color": "#008000"
             }
           }
         ],
         [
           "addLayer",
           {
-            "id": "green",
-            "source": "green",
+            "id": "red",
+            "source": "red",
             "type": "circle",
+            "slot": "slot",
             "paint": {
-              "circle-color": "#008000"
+              "circle-color": "#ff0000",
+              "circle-radius": 10
             }
           }
-        ],
-        [
-          "moveLayer",
-          "green",
-          "red"
         ]
       ]
     }

test/unit/style/style.test.ts

@@ -1258,6 +1258,39 @@ describe('Style#moveLayer', () => {
         style.moveLayer('b', 'b');
         expect(style._order).toEqual(['a', 'b', 'c']);
     });
+
+    test('Throws a warning when layers have different slots', async () => {
+        const style = new Style(new StubMap());
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        style.loadJSON(createStyleJSON({
+            layers: [
+                {id: 'a', type: 'background', slot: 'main'},
+                {id: 'b', type: 'background', slot: 'aux'}
+            ]
+        }));
+
+        await waitFor(style, "style.load");
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+        style.moveLayer('b', 'a');
+        expect(warnSpy).toHaveBeenCalledOnce();
+        expect(warnSpy).toHaveBeenCalledWith('Layer with id "a" has a different slot. Layers can only be rearranged within the same slot.');
+        expect(style._order).toEqual(['a', 'b']);
+    });
+
+    test('Does not throw warning when layer has not a slot', async () => {
+        const style = new Style(new StubMap());
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        style.loadJSON(createStyleJSON({
+            layers: [
+                {id: 'a', type: 'background', slot: 'main'},
+                {id: 'b', type: 'background'}
+            ]
+        }));
+
+        await waitFor(style, "style.load");
+        style.moveLayer('b', 'a');
+        expect(style._order).toEqual(['b', 'a']);
+    });
 });
 
 describe('Style#setPaintProperty', () => {