Avoid making copies of custom layers. Avoid deep watching of layers

Author: eugenehuangsg

src/directives/layercontrol.js

@@ -212,7 +212,7 @@ angular.module('ui-leaflet').directive('layercontrol', function ($filter, leafle
                     });
                 });
 
-                leafletScope.$watch('layers.overlays', function(newOverlayLayers) {
+                leafletScope.$watchCollection('layers.overlays', function (newOverlayLayers) {
                     var overlaysArray = [];
                     var groupVisibleCount = {};
                     leafletData.getLayers().then(function() {
@@ -259,7 +259,7 @@ angular.module('ui-leaflet').directive('layercontrol', function ($filter, leafle
                         }
                         scope.overlaysArray = overlaysArray;
                     });
-                }, true);
+                });
             });
         }
     };

src/directives/layers.js

@@ -78,8 +78,8 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le
                 }
 
                 // Watch for the base layers
-                leafletScope.$watch('layers.baselayers', function(newBaseLayers, oldBaseLayers) {
-                    if(angular.equals(newBaseLayers, oldBaseLayers)) {
+                leafletScope.$watchCollection('layers.baselayers', function (newBaseLayers, oldBaseLayers) {
+                    if (angular.equals(newBaseLayers, oldBaseLayers)) {
                         isLayersControlVisible = updateLayersControl(map, mapId, isLayersControlVisible, newBaseLayers, layers.overlays, leafletLayers);
                         return true;
                     }
@@ -133,11 +133,11 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le
 
                     // Only show the layers switch selector control if we have more than one baselayer + overlay
                     isLayersControlVisible = updateLayersControl(map, mapId, isLayersControlVisible, newBaseLayers, layers.overlays, leafletLayers);
-                }, true);
+                });
 
                 // Watch for the overlay layers
-                leafletScope.$watch('layers.overlays', function(newOverlayLayers, oldOverlayLayers) {
-                    if(angular.equals(newOverlayLayers, oldOverlayLayers)) {
+                leafletScope.$watchCollection('layers.overlays', function (newOverlayLayers, oldOverlayLayers) {
+                    if (angular.equals(newOverlayLayers, oldOverlayLayers)) {
                         isLayersControlVisible = updateLayersControl(map, mapId, isLayersControlVisible, layers.baselayers, newOverlayLayers, leafletLayers);
                         return true;
                     }
@@ -219,7 +219,7 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le
 
                     // Only add the layers switch selector control if we have more than one baselayer + overlay
                     isLayersControlVisible = updateLayersControl(map, mapId, isLayersControlVisible, layers.baselayers, newOverlayLayers, leafletLayers);
-                }, true);
+                });
             });
         }
     };

src/services/leafletLayerHelpers.js

@@ -218,7 +218,7 @@ angular.module('ui-leaflet')
         custom: {
             createLayer: function (params) {
                 if (params.layer instanceof L.Class) {
-                    return angular.copy(params.layer);
+                        return params.layer;
                 }
                 else {
                     $log.error('[AngularJS - Leaflet] A custom layer must be a leaflet Class');