fix #6501, fix moving layer to it's current location

mapbox · Apr 19, 2018 · b0ba8bd · b0ba8bd
1 parent 0a53a14
commit b0ba8bd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/style/style.js b/src/style/style.js
@@ -605,6 +605,10 @@ class Style extends Evented {
             return;
         }
 
+        if (id === before) {
+            return;
+        }
+
         const index = this._order.indexOf(id);
         this._order.splice(index, 1);
 

diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js
@@ -1273,6 +1273,23 @@ test('Style#moveLayer', (t) => {
         });
     });
 
+    t.test('moves to existing location', (t) => {
+        const style = new Style(new StubMap());
+        style.loadJSON(createStyleJSON({
+            layers: [
+                {id: 'a', type: 'background'},
+                {id: 'b', type: 'background'},
+                {id: 'c', type: 'background'}
+            ]
+        }));
+
+        style.on('style.load', () => {
+            style.moveLayer('b', 'b');
+            t.deepEqual(style._order, ['a', 'b', 'c']);
+            t.end();
+        });
+    });
+
     t.end();
 });