Throw if argument to addLayer is not actually a layer (Leaflet#5689)

Fixes Leaflet#5225.
Dzwiedzminator · Aug 6, 2017 · 54ce147 · 54ce147
1 parent ce107a9
commit 54ce147
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/spec/suites/map/MapSpec.js b/spec/suites/map/MapSpec.js
@@ -419,6 +419,13 @@ describe("Map", function () {
 			map.addLayer(layer);
 		});
 
+		it("throws if adding something which is not a layer", function () {
+			var control = L.control.layers();
+			expect(function () {
+				map.addLayer(control);
+			}).to.throwError();
+		});
+
 		describe("When the first layer is added to a map", function () {
 			it("fires a zoomlevelschange event", function () {
 				var spy = sinon.spy();

diff --git a/src/layer/Layer.js b/src/layer/Layer.js
@@ -155,6 +155,10 @@ Map.include({
 	// @method addLayer(layer: Layer): this
 	// Adds the given layer to the map
 	addLayer: function (layer) {
+		if (!layer._layerAdd) {
+			throw new Error('The provided object is not a Layer.');
+		}
+
 		var id = Util.stamp(layer);
 		if (this._layers[id]) { return this; }
 		this._layers[id] = layer;