From 104100eb2aff7292eec066bafb4f58f78775f421 Mon Sep 17 00:00:00 2001
From: Matti Puputti <matti.puputti@intel.com>
Date: Sat, 7 Aug 2021 09:31:33 +0200
Subject: [PATCH 1/2] Update ActiveLayers.js

Updated to work with Leaflet 1.4.0
---
 bower.json                        | 24 ------------------------
 dist/leaflet.active-layers.min.js |  4 ++--
 package.json                      |  4 ++--
 src/ActiveLayers.js               | 13 +++++++++----
 4 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 bower.json

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 07cc69d..0000000
--- a/bower.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "leaflet.active-layers",
-  "version": "0.3.0",
-  "homepage": "https://github.com/vogdb/Leaflet.ActiveLayers",
-  "authors": [
-    "vogdb"
-  ],
-  "description": "Leaflet - get currently active layers on the map.",
-  "main": "./dist/leaflet.active-layers.min.js",
-  "keywords": [
-    "leaflet",
-    "mapbox"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "app/bower_components",
-    "test",
-    "tests"
-  ]
-}
-
diff --git a/dist/leaflet.active-layers.min.js b/dist/leaflet.active-layers.min.js
index 838c45e..187066b 100644
--- a/dist/leaflet.active-layers.min.js
+++ b/dist/leaflet.active-layers.min.js
@@ -1,5 +1,5 @@
 /**
  * Created: vogdb Date: 5/4/13 Time: 1:54 PM
- * Version: 0.3.0
+ * Version: 0.3.1
  */
-L.Control.ActiveLayers=L.Control.Layers.extend({getActiveBaseLayer:function(){return this._activeBaseLayer},getActiveOverlayLayers:function(){return this._activeOverlayLayers},onAdd:function(e){var t=L.Control.Layers.prototype.onAdd.call(this,e);return Array.isArray(this._layers)?(this._activeBaseLayer=this._findActiveBaseLayer(),this._activeOverlayLayers=this._findActiveOverlayLayers()):(this._activeBaseLayer=this._findActiveBaseLayerLegacy(),this._activeOverlayLayers=this._findActiveOverlayLayersLegacy()),t},_findActiveBaseLayer:function(){var e=this._layers;for(var t=0;t<e.length;t++){var n=e[t];if(!n.overlay&&this._map.hasLayer(n.layer))return n}throw new Error("Control doesn't have any active base layer!")},_findActiveOverlayLayers:function(){var e={},t=this._layers;for(var n=0;n<t.length;n++){var r=t[n];r.overlay&&this._map.hasLayer(r.layer)&&(e[r.layer._leaflet_id]=r)}return e},_findActiveBaseLayerLegacy:function(){var e=this._layers;for(var t in e)if(this._layers.hasOwnProperty(t)){var n=e[t];if(!n.overlay&&this._map.hasLayer(n.layer))return n}throw new Error("Control doesn't have any active base layer!")},_findActiveOverlayLayersLegacy:function(){var e={},t=this._layers;for(var n in t)if(this._layers.hasOwnProperty(n)){var r=t[n];r.overlay&&this._map.hasLayer(r.layer)&&(e[n]=r)}return e},_onLayerChange:function(){L.Control.Layers.prototype._onLayerChange.apply(this,arguments),this._recountLayers()},_onInputClick:function(){this._handlingClick=!0,this._recountLayers(),L.Control.Layers.prototype._onInputClick.call(this),this._handlingClick=!1},_recountLayers:function(){var e,t,n,r=this._form.getElementsByTagName("input"),i=r.length;for(e=0;e<i;e++)t=r[e],Array.isArray(this._layers)?n=this._layers[e]:n=this._layers[t.layerId],t.checked&&!this._map.hasLayer(n.layer)?n.overlay?this._activeOverlayLayers[t.layerId]=n:this._activeBaseLayer=n:!t.checked&&this._map.hasLayer(n.layer)&&n.overlay&&delete this._activeOverlayLayers[t.layerId]}}),L.control.activeLayers=function(e,t,n){return new L.Control.ActiveLayers(e,t,n)};
+L.Control.ActiveLayers=L.Control.Layers.extend({getActiveBaseLayer:function(){return this._activeBaseLayer},getActiveOverlayLayers:function(){return this._activeOverlayLayers},onAdd:function(e){var t=L.Control.Layers.prototype.onAdd.call(this,e);return Array.isArray(this._layers)?(this._activeBaseLayer=this._findActiveBaseLayer(),this._activeOverlayLayers=this._findActiveOverlayLayers()):(this._activeBaseLayer=this._findActiveBaseLayerLegacy(),this._activeOverlayLayers=this._findActiveOverlayLayersLegacy()),t},_findActiveBaseLayer:function(){var e=this._layers;for(var t=0;t<e.length;t++){var n=e[t];if(!n.overlay&&this._map.hasLayer(n.layer))return n}throw new Error("Control doesn't have any active base layer!")},_findActiveOverlayLayers:function(){var e={},t=this._layers;for(var n=0;n<t.length;n++){var r=t[n];r.overlay&&this._map.hasLayer(r.layer)&&(e[r.layer._leaflet_id]=r)}return e},_findActiveBaseLayerLegacy:function(){var e=this._layers;for(var t in e)if(this._layers.hasOwnProperty(t)){var n=e[t];if(!n.overlay&&this._map.hasLayer(n.layer))return n}throw new Error("Control doesn't have any active base layer!")},_findActiveOverlayLayersLegacy:function(){var e={},t=this._layers;for(var n in t)if(this._layers.hasOwnProperty(n)){var r=t[n];r.overlay&&this._map.hasLayer(r.layer)&&(e[n]=r)}return e},_onLayerChange:function(){L.Control.Layers.prototype._onLayerChange.apply(this,arguments),this._recountLayers()},_onInputClick:function(){this._handlingClick=!0,this._recountLayers(),L.Control.Layers.prototype._onInputClick.call(this),this._handlingClick=!1},_recountLayers:function(){var e,t,n,r,i;this.hasOwnProperty('_section')?r=this._section.getElementsByTagName('input'):r=this._form.getElementsByTagName("input");i=r.length;for(e=0;e<i;e++)t=r[e],Array.isArray(this._layers)?n=this._layers[e]:n=this._layers[t.layerId],t.checked&&!this._map.hasLayer(n.layer)?n.overlay?this._activeOverlayLayers[t.layerId]=n:this._activeBaseLayer=n:!t.checked&&this._map.hasLayer(n.layer)&&n.overlay&&delete this._activeOverlayLayers[t.layerId]}}),L.control.activeLayers=function(e,t,n){return new L.Control.ActiveLayers(e,t,n)};
diff --git a/package.json b/package.json
index 91ba266..559c56f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "leaflet.active-layers",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "A plugin for the Leaflet library. This plugin adds new L.Control.ActiveLayers with functionality to get currently active layers on the map.",
     "repository": {
         "type": "git",
@@ -14,7 +14,7 @@
         }
     ],
     "dependencies": {
-      "leaflet": "~0.7"
+      "leaflet": "~1.4"
     },
     "devDependencies": {
         "grunt-contrib-watch": "~0.3.1",
diff --git a/src/ActiveLayers.js b/src/ActiveLayers.js
index a9f5582..f3b2d1f 100644
--- a/src/ActiveLayers.js
+++ b/src/ActiveLayers.js
@@ -1,6 +1,6 @@
 /**
  * Created: vogdb Date: 5/4/13 Time: 1:54 PM
- * Version: 0.3.0
+ * Version: 0.3.1
  */
 
 L.Control.ActiveLayers = L.Control.Layers.extend({
@@ -104,9 +104,14 @@ L.Control.ActiveLayers = L.Control.Layers.extend({
   },
 
   _recountLayers: function () {
-    var i, input, obj,
-      inputs = this._form.getElementsByTagName('input'),
-      inputsLen = inputs.length;
+    var i, input, obj, inputs, inputsLen
+    if (this.hasOwnProperty('_section')) {
+      inputs = this._section.getElementsByTagName('input')
+    } else {
+      // Up until version 1.3.6, Leaflet used _form.
+      inputs = this._form.getElementsByTagName('input')
+    }
+    inputsLen = inputs.length;
 
     for (i = 0; i < inputsLen; i++) {
       input = inputs[i]

From 2f00271c1023487a8ca2e3abefff8db94dc0050d Mon Sep 17 00:00:00 2001
From: Aleksei <vozhdb@gmail.com>
Date: Sun, 8 Aug 2021 23:17:02 +0200
Subject: [PATCH 2/2] update leaflet dependency

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 559c56f..61ba792 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
         }
     ],
     "dependencies": {
-      "leaflet": "~1.4"
+      "leaflet": ">0.7"
     },
     "devDependencies": {
         "grunt-contrib-watch": "~0.3.1",