Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit bd65183

Browse files
author
Waldemar Panas
committed
fix(markers): fix problem with old groups
1 parent b1cbfa9 commit bd65183

File tree

6 files changed

+29
-23
lines changed

6 files changed

+29
-23
lines changed

dist/ui-leaflet.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* ui-leaflet 1.0.0 2015-12-20
2+
* ui-leaflet 1.0.0 2016-02-15
33
* ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
44
* git: https://github.com/angular-ui/ui-leaflet
55
*/
@@ -1385,7 +1385,7 @@ angular.module('ui-leaflet').service('leafletIterators', ["leafletLogger", "leaf
13851385
// `key:value` pairs.
13861386
var _matcher,
13871387
_matches = null;
1388-
_matcher = _matches = function (attrs) {
1388+
_matcher = _matches = function _matches(attrs) {
13891389
attrs = _extendOwn({}, attrs);
13901390
return function (obj) {
13911391
return _isMatch(obj, attrs);
@@ -1404,7 +1404,7 @@ angular.module('ui-leaflet').service('leafletIterators', ["leafletLogger", "leaf
14041404

14051405
var _every,
14061406
_all = null;
1407-
_every = _all = function (obj, predicate, context) {
1407+
_every = _all = function _all(obj, predicate, context) {
14081408
predicate = cb(predicate, context);
14091409
var keys = !_isArrayLike(obj) && _keys(obj),
14101410
length = (keys || obj).length;
@@ -3595,7 +3595,7 @@ angular.module('ui-leaflet').directive('geojson', ["$timeout", "leafletLogger",
35953595
if (angular.isFunction(geojson.onEachFeature)) {
35963596
onEachFeature = geojson.onEachFeature;
35973597
} else {
3598-
onEachFeature = function (feature, layer) {
3598+
onEachFeature = function onEachFeature(feature, layer) {
35993599
if (leafletHelpers.LabelPlugin.isLoaded() && isDefined(feature.properties.description)) {
36003600
layer.bindLabel(feature.properties.description);
36013601
}
@@ -4284,6 +4284,7 @@ angular.module('ui-leaflet').directive('markers', ["leafletLogger", "$rootScope"
42844284
deleteMarker = leafletMarkersHelpers.deleteMarker,
42854285
getModelFromModels = leafletMarkersHelpers.getModelFromModels,
42864286
getLayerModels = leafletMarkersHelpers.getLayerModels,
4287+
resetMarkerGroups = leafletMarkersHelpers.resetMarkerGroups,
42874288
$it = leafletIterators,
42884289
_defaultWatchOptions = leafletHelpers.watchOptions,
42894290
maybeWatch = leafletWatchHelpers.maybeWatch,
@@ -4466,7 +4467,7 @@ angular.module('ui-leaflet').directive('markers', ["leafletLogger", "$rootScope"
44664467
if (isDefined(controller[1])) {
44674468
getLayers = controller[1].getLayers;
44684469
} else {
4469-
getLayers = function () {
4470+
getLayers = function getLayers() {
44704471
var deferred = $q.defer();
44714472
deferred.resolve();
44724473
return deferred.promise;
@@ -4484,6 +4485,7 @@ angular.module('ui-leaflet').directive('markers', ["leafletLogger", "$rootScope"
44844485

44854486
getLayers().then(function (layers) {
44864487
var _clean = function _clean(models, oldModels) {
4488+
resetMarkerGroups();
44874489
if (isNested) {
44884490
$it.each(models, function (markerToMaybeDel, layerName) {
44894491
var oldLayerModels = getLayerModels(oldModels, layerName);
@@ -4589,7 +4591,7 @@ angular.module('ui-leaflet').directive('paths', ["leafletLogger", "$q", "leaflet
45894591
if (isDefined(controller[1])) {
45904592
getLayers = controller[1].getLayers;
45914593
} else {
4592-
getLayers = function () {
4594+
getLayers = function getLayers() {
45934595
var deferred = $q.defer();
45944596
deferred.resolve();
45954597
return deferred.promise;
@@ -5188,7 +5190,7 @@ angular.module('ui-leaflet').factory('leafletMarkerEvents', ["$rootScope", "$q",
51885190

51895191
'use strict';
51905192

5191-
function _typeof(obj) { return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj; }
5193+
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
51925194

51935195
angular.module('ui-leaflet').factory('leafletPathEvents', ["$rootScope", "$q", "leafletLogger", "leafletHelpers", "leafletLabelEvents", "leafletEventsHelpers", function ($rootScope, $q, leafletLogger, leafletHelpers, leafletLabelEvents, leafletEventsHelpers) {
51945196
var isDefined = leafletHelpers.isDefined,

dist/ui-leaflet.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-leaflet_dev_mapped.js

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-leaflet_dev_mapped.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/directives/markers.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ angular.module('ui-leaflet').directive('markers',
1515
deleteMarker = leafletMarkersHelpers.deleteMarker,
1616
getModelFromModels = leafletMarkersHelpers.getModelFromModels,
1717
getLayerModels = leafletMarkersHelpers.getLayerModels,
18+
resetMarkerGroups = leafletMarkersHelpers.resetMarkerGroups,
1819
$it = leafletIterators,
1920
_defaultWatchOptions = leafletHelpers.watchOptions,
2021
maybeWatch = leafletWatchHelpers.maybeWatch,
@@ -233,6 +234,7 @@ angular.module('ui-leaflet').directive('markers',
233234

234235
getLayers().then(function(layers) {
235236
var _clean = function(models, oldModels){
237+
resetMarkerGroups();
236238
if(isNested) {
237239
$it.each(models, function(markerToMaybeDel, layerName) {
238240
var oldLayerModels = getLayerModels(oldModels, layerName);

0 commit comments

Comments
 (0)