fix(markers): Bug solved which prevents to create a markers group wit…

…hout overlay
tombatossals · Feb 9, 2014 · 2017f1a · 2017f1a
1 parent 4dacd3d
commit 2017f1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/directives/layers.js b/src/directives/layers.js
@@ -37,9 +37,9 @@ angular.module("leaflet-directive").directive('layers', function ($log, $q, leaf
                 leafletLayers.baselayers = {};
                 leafletLayers.controls = {};
                 leafletLayers.controls.layers = new L.control.layers();
-                if (layers.options != null) {
-                  leafletLayers.controls.layers.options = layers.options;
-                };
+                if (isDefined(layers.options)) {
+                    leafletLayers.controls.layers.options = layers.options;
+                }
                 leafletLayers.controls.layers.setPosition(defaults.controlLayersPosition);
 
 

diff --git a/src/directives/markers.js b/src/directives/markers.js
@@ -105,7 +105,8 @@ angular.module("leaflet-directive").directive('markers', function ($log, $rootSc
                                         marker.openPopup();
                                     }
 
-                                } else {
+                                // Add the marker to the map if it hasn't been added to a layer or to a group
+                                } else if (!isDefined(markerData.group)) {
                                     // We do not have a layer attr, so the marker goes to the map layer
                                     map.addLayer(marker);
                                     if (markerData.focus === true) {