Merge pull request #174 from elesdoar/master

Solve my wrong PR

Author: nmccready

.gitignore

@@ -6,6 +6,7 @@ Thumbs.db
 # Project
 # ===========
 dist/ui-leaflet.pre.js
+dist/coverage/
 js/angular-leaflet-directive-webpage.ngmin.js
 
 # Related ecosystem

.npmignore

@@ -42,3 +42,5 @@ test
 Gruntfile.js
 package.json
 bower.json
+
+dist/coverage/

bower.json

@@ -64,6 +64,7 @@
     "*.md",
     "Gruntfile.js",
     "package.json",
-    "bower.json"
+    "bower.json",
+    "dist/coverage/"
   ]
 }

dist/ui-leaflet.js

@@ -1,5 +1,5 @@
 /*!
-*  ui-leaflet 1.0.0 2015-10-30
+*  ui-leaflet 1.0.0 2015-11-03
 *  ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
 *  git: https://github.com/angular-ui/ui-leaflet
 */
@@ -2298,7 +2298,6 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', ["$rootScope", "$t
         errorHeader = leafletHelpers.errorHeader,
         $log = leafletLogger;
 
-
     var _string = function (marker) {
         //this exists since JSON.stringify barfs on cyclic
         var retStr = '';
@@ -2708,6 +2707,27 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', ["$rootScope", "$t
                 marker.setLatLng([markerData.lat, markerData.lng]);
             }
         };
+
+    var _getLayerModels = function (models, layerName){
+      if (!isDefined(models))
+        return;
+      if (layerName)
+        return models[layerName];
+      return models;
+    };
+
+    var _getModelFromModels = function (models, id, layerName){
+      if(!isDefined(models))
+        return;
+      if(!id){
+        $log.error(errorHeader + 'marker id missing in getMarker');
+        return;
+      }
+      if(layerName)
+        return models[layerName][id];
+
+      return models[id];
+    };
     return {
         resetMarkerGroup: _resetMarkerGroup,
 
@@ -2811,7 +2831,9 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', ["$rootScope", "$t
             } , isDeepWatch);
         },
         string: _string,
-        log: _log
+        log: _log,
+        getModelFromModels : _getModelFromModels,
+        getLayerModels : _getLayerModels
     };
 }]);
 
@@ -4397,6 +4419,8 @@ angular.module('ui-leaflet').directive('markers',
         addMarkerToGroup = leafletMarkersHelpers.addMarkerToGroup,
         createMarker = leafletMarkersHelpers.createMarker,
         deleteMarker = leafletMarkersHelpers.deleteMarker,
+        getModelFromModels = leafletMarkersHelpers.getModelFromModels,
+        getLayerModels = leafletMarkersHelpers.getLayerModels,
         $it = leafletIterators,
         _markersWatchOptions = leafletHelpers.watchOptions,
         maybeWatch = leafletWatchHelpers.maybeWatch,
@@ -4524,7 +4548,7 @@ angular.module('ui-leaflet').directive('markers',
                 leafletMarkerEvents.bindEvents(mapId, marker, pathToMarker, model, leafletScope, layerName);
             }
             else {
-                var oldModel = isDefined(oldModel)? oldModels[newName] : undefined;
+                var oldModel = getModelFromModels(oldModels, newName, maybeLayerName);
                 updateMarker(model, oldModel, maybeLMarker, pathToMarker, leafletScope, layers, map);
             }
         }
@@ -4615,8 +4639,8 @@ angular.module('ui-leaflet').directive('markers',
                     var _clean = function(models, oldModels){
                         if(isNested) {
                             $it.each(models, function(markerToMaybeDel, layerName) {
-                                var oldModel = isDefined(oldModel)? oldModels[layerName] : undefined;
-                                _destroy(markerToMaybeDel, oldModel, leafletMarkers[layerName], map, layers);
+                              var oldLayerModels = getLayerModels(oldModels, layerName);
+                                _destroy(markerToMaybeDel, oldLayerModels, leafletMarkers[layerName], map, layers);
                             });
                             return;
                         }
@@ -4628,8 +4652,9 @@ angular.module('ui-leaflet').directive('markers',
                         var skips = null;
                         if(isNested) {
                             $it.each(models, function(markersToAdd, layerName) {
-                                var oldModel = isDefined(oldModel)? oldModels[layerName] : undefined;
-                                skips = _getNewModelsToSkipp(models[layerName], oldModel, leafletMarkers[layerName]);
+                                var oldLayerModels = getLayerModels(oldModels, layerName);
+                                var newlayerModels = getLayerModels(models, layerName);
+                                skips = _getNewModelsToSkipp(newlayerModels, oldLayerModels, leafletMarkers[layerName]);
                                 _addMarkers(attrs.id, markersToAdd, oldModels, map, layers, leafletMarkers, leafletScope,
                                     watchOptions, layerName, skips);
                             });

dist/ui-leaflet.min.js

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html ng-app="demoapp">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="../bower_components/angular/angular.min.js"></script>
+    <script src="../bower_components/leaflet/dist/leaflet.js"></script>
+    <script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
+    <script src="../dist/ui-leaflet_dev_mapped.js"></script>
+    <link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script>
+    var app = angular.module('demoapp', ['ui-leaflet']);
+    app.controller('MixedMOverlaysMarkersNestedNoWatchController', function ($scope, leafletData, $timeout, leafletLogger) {
+      leafletLogger.currentLevel = leafletLogger.LEVELS.debug;
+        var _clonedMarkers;
+        $timeout(function () {
+            //should do nothing (not watched) and only see one destroy
+            _clonedMarkers = angular.copy($scope.markers);
+        },1000);
+        $timeout(function () {
+            leafletData.getDirectiveControls().then(function (controls) {
+                //move all markers by a few decimal points
+                for (var markerName in _clonedMarkers) {
+                    var marker = _clonedMarkers[markerName];
+                    marker.lat += .05;
+                }
+                //force manual update
+                controls.markers.create(_clonedMarkers ,$scope.markers);
+                $scope.markers = _clonedMarkers;
+            });
+        }, 4000);
+        angular.extend($scope, {
+            markersWatchOptions: {
+                doWatch: false,
+                isDeep: false,
+                individual: {
+                    doWatch: false,
+                    isDeep: false
+                }
+            },
+            center: {
+                lat: 42.20133,
+                lng: 2.19110,
+                zoom: 11
+            },
+
+            markers: {
+              m1: {
+                  lat: 42.20133,
+                  lng: 2.19110,
+                  message: "I'm a car"
+              },
+              m2: {
+                  lat: 42.21133,
+                  lng: 2.18110,
+                  message: "I'm a car"
+              }
+            }
+        });
+    });
+  </script>
+</head>
+<body ng-controller="MixedMOverlaysMarkersNestedNoWatchController">
+    <leaflet
+        lf-center="center"
+        markers="markers"
+        markers-watch-options="markersWatchOptions"
+        height="480px" width="100%">
+    </leaflet>
+    <h1>Overlays with nested markers no watchers example</h1>
+</body>
+</html>

dist/ui-leaflet.min.no-header.js

@@ -10,12 +10,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script>
     var app = angular.module("demoapp", ['ui-leaflet']);
-    app.controller('MixedMOverlaysMarkersNestedNoWatchController', function ($scope, leafletData, $timeout) {
+    app.controller('MixedMOverlaysMarkersNestedNoWatchController', function ($scope, leafletData, $timeout, leafletLogger) {
+      leafletLogger.currentLevel = leafletLogger.LEVELS.debug;
         var _clonedMarkers;
         $timeout(function () {
             //should do nothing (not watched) and only see one destroy
-            _clonedMarkers = angular.extend({},$scope.markers);
-            $scope.markers = {};
+            _clonedMarkers = angular.copy($scope.markers);
         },1000);
         $timeout(function () {
             leafletData.getDirectiveControls().then(function (controls) {
@@ -28,8 +28,8 @@
                     }
                 }
                 //force manual update
+                controls.markers.create(_clonedMarkers ,$scope.markers);
                 $scope.markers = _clonedMarkers;
-                controls.markers.create($scope.markers);
             });
         }, 4000);
         angular.extend($scope, {