Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix remove layers #2116

Merged
merged 2 commits into from
May 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/api/v4/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ Client.prototype.removeLayer = function (layer) {
* @api
*/
Client.prototype.removeLayers = function (layers) {
layers.forEach(this._removeLayer, this);
var layersToRemove = layers.slice(0);
layersToRemove.forEach(this._removeLayer, this);

return this._reload();
};

Expand Down
2 changes: 1 addition & 1 deletion src/api/v4/layers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Layers.prototype.add = function (layer) {
};

Layers.prototype.remove = function (layer) {
return this._layers.splice(this._layers.indexOf(layer));
return this._layers.splice(this._layers.indexOf(layer), 1);
};

Layers.prototype.size = function () {
Expand Down
17 changes: 17 additions & 0 deletions test/spec/api/v4/client.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,23 @@ describe('api/v4/client', function () {
});
});

describe('.removeLayers', function () {
it('must remove all layers', function () {
var source = new carto.source.Dataset('ne_10m_populated_places_simple');
var style = new carto.style.CartoCSS('#layer { marker-fill: red; }');
var layerA = new carto.layer.Layer(source, style, {});
var layerB = new carto.layer.Layer(source, style, {});
var layerC = new carto.layer.Layer(source, style, {});
client.addLayers([layerA, layerB, layerC]);

expect(client.getLayers().length).toEqual(3);

client.removeLayers(client.getLayers());

expect(client.getLayers().length).toEqual(0);
});
});

describe('.moveLayer', function () {
it('should throw a descriptive error when the parameter is invalid', function () {
var source = new carto.source.Dataset('ne_10m_populated_places_simple');
Expand Down
41 changes: 41 additions & 0 deletions test/spec/api/v4/layers.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
var Layers = require('../../../../src/api/v4/layers');

describe('api/v4/layers', function () {
var layers;

function createFakeLayer (id) {
return {
getId: function () {
return id;
}
};
}

function seedLayers (layers) {
var layerA = createFakeLayer('A');
var layerB = createFakeLayer('B');
var layerC = createFakeLayer('C');

layers.add(layerA);
layers.add(layerB);
layers.add(layerC);

return [layerA, layerB, layerC];
}

beforeEach(function () {
layers = new Layers();
});

describe('.remove', function () {
it('should remove the layer from the collection', function () {
var createdLayers = seedLayers(layers);

layers.remove(createdLayers[1]);

expect(layers.size()).toBe(2);
expect(layers.indexOf(createdLayers[0])).toBe(0);
expect(layers.indexOf(createdLayers[2])).toBe(1);
});
});
});