fix duplicate layer test, enforce layer id uniqueness (#6147)

* fix duplicate layer test, enforce layer id uniqueness * remove unneeded stub
mapbox · Feb 13, 2018 · b713e25 · b713e25
1 parent e077b78
commit b713e25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/style/style.js b/src/style/style.js
@@ -521,6 +521,11 @@ class Style extends Evented {
 
         const id = layerObject.id;
 
+        if (this.getLayer(id)) {
+            this.fire('error', {error: new Error(`Layer with id "${id}" already exists on this map`)});
+            return;
+        }
+
         if (typeof layerObject.source === 'object') {
             this.addSource(id, layerObject.source);
             layerObject = util.clone(layerObject);

diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js
@@ -997,15 +997,13 @@ test('Style#addLayer', (t) => {
         const layer = {id: 'background', type: 'background'};
 
         style.on('error', (e) => {
-            t.deepEqual(e.layer, {id: 'background'});
-            t.notOk(/duplicate/.match(e.error.message));
+            t.match(e.error, /already exists/);
             t.end();
         });
 
         style.on('style.load', () => {
             style.addLayer(layer);
             style.addLayer(layer);
-            t.end();
         });
     });