Destroying scope should only remove its own defaults

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/leaflet.js

@@ -135,7 +135,7 @@ angular.module('ui-leaflet', ['nemLogging']).directive('leaflet',
             });
 
             scope.$on('$destroy', function () {
-                leafletMapDefaults.reset();
+                leafletMapDefaults.reset(attrs.id);
                 map.remove();
                 leafletData.unresolveMap(attrs.id);
             });

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');

src/services/leafletMapDefaults.js

@@ -48,8 +48,11 @@ angular.module('ui-leaflet').factory('leafletMapDefaults', function ($q, leaflet
 
     // Get the _defaults dictionary, and override the properties defined by the user
     return {
-        reset: function () {
-           defaults = {};
+        reset: function (scopeId) {
+            if (!isDefined(scopeId)){
+                scopeId = 'main';
+            }
+           delete defaults[scopeId];
         },
         getDefaults: function (scopeId) {
             var mapId = obtainEffectiveMapId(defaults, scopeId);

test/karma.conf.js

@@ -30,7 +30,7 @@ module.exports = (karma) => {
             'test/unit/bootstrap.coffee',
             'test/unit/**/*.js',
             'test/unit/**/*.coffee',
-            'bower_components/Leaflet.PolylineDecorator/leaflet.polylineDecorator.js',
+            'bower_components/Leaflet.PolylineDecorator/dist/leaflet.polylineDecorator.js',
             //do not include those specs for jasmine html runner by karma kama_jasmine_runner.html
             {pattern:'test/**/**/*.coffee', included: false},
             {pattern: 'dist/**/*.js.map', included: false}