1.1.3 - modifying L.Map.removeLayer(layer)

slutske22 · May 8, 2020 · a20fd80 · a20fd80
1 parent 50e59fd
commit a20fd80
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/example/with-modules.js b/example/with-modules.js
@@ -517,3 +517,19 @@ function flyToNorway(){
   somePopup.closePopup()
 
 }
+
+
+
+window.simpleVector0 = simpleVector0
+window.map = map
+
+L.control.layers(null, {
+  "Vector 1": simpleVector0,
+  "Vector 2": simpleVector1,
+  "Vector 3": simpleVector2,
+  "Vector 4": simpleVector3,
+  "Vector 5": simpleVector4,
+  "Vector 6": simpleVector5,
+  "Group 2": group2,
+  "Group 3": group3
+}).addTo(map)
diff --git a/src/leaflet-arrowheads.js b/src/leaflet-arrowheads.js
@@ -30,8 +30,6 @@ L.Polyline.include({
       // Reset variables from previous this._update()
       if (this._arrowheads){
          this._arrowheads.remove()
-         let arrowheads = []
-         let allhats = []
       }
 
       //  -------------------------------------------------------- //
@@ -372,8 +370,7 @@ L.Polyline.include({
    remove: function () {
 
       if (this._arrowheads){
-         this._arrowheads.removeFrom(this._map || this._mapToAdd);
-         this._arrowheads = []
+         this._arrowheads.remove();
       }
       return this.removeFrom(this._map || this._mapToAdd);
    },
@@ -415,3 +412,38 @@ L.LayerGroup.include({
 
 
 })
+
+
+L.Map.include({
+
+   removeLayer: function (layer) {
+
+      var id = L.Util.stamp(layer);
+
+      if (layer._arrowheads){
+         layer._arrowheads.remove()
+      }
+
+		if (!this._layers[id]) { return this; }
+
+		if (this._loaded) {
+			layer.onRemove(this);
+		}
+
+		if (layer.getAttribution && this.attributionControl) {
+			this.attributionControl.removeAttribution(layer.getAttribution());
+		}
+
+		delete this._layers[id];
+
+		if (this._loaded) {
+			this.fire('layerremove', {layer: layer});
+			layer.fire('remove');
+		}
+
+		layer._map = layer._mapToAdd = null;
+
+		return this;
+	},
+
+})