chore(merge): merge with 1.X branch, fix angular-ui#294

Author: elesdoar

.jshintrc

@@ -7,7 +7,7 @@
     "eqeqeq": true,
     "immed": true,
     "indent": 4,
-    "latedef": true,
+    "latedef": false,
     "newcap": true,
     "noarg": true,
     "regexp": true,

bower.json

@@ -38,14 +38,14 @@
     "Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
     "Leaflet.awesome-markers": "*",
     "leaflet-providers": "~1.1.5",
-    "leaflet.vector-markers": "0.0.4",
+    "leaflet.vector-markers": "~0.0.6",
     "webgl-heatmap-leaflet": "*",
     "leaflet-plugins": "*",
     "esri-leaflet": "~1.0.4",
     "proj4": "*",
     "font-awesome": "~4.3.x",
-    "proj4leaflet": "*",
-    "Leaflet.MakiMarkers": "*",
+    "proj4leaflet": "~0.x",
+    "Leaflet.MakiMarkers": "~2.x",
     "Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
     "Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
     "Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
@@ -69,7 +69,8 @@
     "*.md",
     "Gruntfile.js",
     "package.json",
-    "dist/coverage/",
-    "logo.svg"
+    "logo.svg",
+    "bower.json",
+    "dist/coverage/"
   ]
 }

dist/ui-leaflet.js

@@ -1,5 +1,5 @@
 /*!
-*  ui-leaflet 2.0.0 2016-10-04
+*  ui-leaflet 2.0.0 2016-10-05
 *  ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
 *  git: https://github.com/angular-ui/ui-leaflet
 */
@@ -312,14 +312,15 @@ angular.module('ui-leaflet').factory('leafletBoundsHelpers', ["leafletLogger", "
 angular.module('ui-leaflet').factory('leafletControlHelpers', ["$rootScope", "leafletLogger", "leafletHelpers", "leafletLayerHelpers", "leafletMapDefaults", function ($rootScope, leafletLogger, leafletHelpers, leafletLayerHelpers, leafletMapDefaults) {
     var isDefined = leafletHelpers.isDefined,
         isObject = leafletHelpers.isObject,
+        get = leafletHelpers.get,
         createLayer = leafletLayerHelpers.createLayer,
         _controls = {},
         errorHeader = leafletHelpers.errorHeader + ' [Controls] ',
         $log = leafletLogger;
 
     var _controlLayersMustBeVisible = function _controlLayersMustBeVisible(baselayers, overlays, mapId) {
         var defaults = leafletMapDefaults.getDefaults(mapId);
-        if (!defaults.controls.layers.visible) {
+        if (!get(defaults, 'controls.layers.visible')) {
             return false;
         }
 
@@ -357,7 +358,7 @@ angular.module('ui-leaflet').factory('leafletControlHelpers', ["$rootScope", "le
         angular.extend(controlOptions, defaults.controls.layers.options);
 
         var control;
-        if (defaults.controls.layers && isDefined(defaults.controls.layers.control)) {
+        if (!!get(defaults, 'controls.layers.control')) {
             control = defaults.controls.layers.control.apply(this, [[], [], controlOptions]);
         } else {
             control = new L.control.layers([], [], controlOptions);
@@ -534,8 +535,8 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
         _private[itemName] = {};
     });
 
-    this.unresolveMap = function (scopeId) {
-        var id = leafletHelpers.obtainEffectiveMapId(_private.map, scopeId);
+    this.unresolveMap = function (mapId) {
+        var id = leafletHelpers.obtainEffectiveMapId(_private.map, mapId);
         _privateItems.forEach(function (itemName) {
             _private[itemName][id] = undefined;
         });
@@ -544,14 +545,14 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
     //int repetitive stuff (get and sets)
     _privateItems.forEach(function (itemName) {
         var name = upperFirst(itemName);
-        self['set' + name] = function (lObject, scopeId) {
-            var defer = getUnresolvedDefer(_private[itemName], scopeId);
+        self['set' + name] = function (lObject, mapId) {
+            var defer = getUnresolvedDefer(_private[itemName], mapId);
             defer.resolve(lObject);
-            setResolvedDefer(_private[itemName], scopeId);
+            setResolvedDefer(_private[itemName], mapId);
         };
 
-        self['get' + name] = function (scopeId) {
-            var defer = getDefer(_private[itemName], scopeId);
+        self['get' + name] = function (mapId) {
+            var defer = getDefer(_private[itemName], mapId);
             return defer.promise;
         };
     });
@@ -568,7 +569,7 @@ angular.module('ui-leaflet').service('leafletDirectiveControlsHelpers', ["leafle
 
     var _errorHeader = _mainErrorHeader + '[leafletDirectiveControlsHelpers';
 
-    var _extend = function _extend(id, thingToAddName, createFn, cleanFn) {
+    var extend = function extend(id, thingToAddName, createFn, cleanFn) {
         var _fnHeader = _errorHeader + '.extend] ';
         var extender = {};
         if (!_isDefined(thingToAddName)) {
@@ -589,14 +590,14 @@ angular.module('ui-leaflet').service('leafletDirectiveControlsHelpers', ["leafle
         }
 
         //add external control to create / destroy markers without a watch
-        leafletData.getDirectiveControls().then(function (controls) {
+        leafletData.getDirectiveControls(id).then(function (controls) {
             angular.extend(controls, extender);
             leafletData.setDirectiveControls(controls, id);
         });
     };
 
     return {
-        extend: _extend
+        extend: extend
     };
 }]);
 
@@ -692,21 +693,16 @@ angular.module('ui-leaflet').service('leafletHelpers', ["$q", "$log", "$timeout"
     };
     _getObjectValue(obj,"bike.1") returns 'hi'
     this is getPath in ui-gmap
+     like _.get
+    http://stackoverflow.com/questions/2631001/javascript-test-for-existence-of-nested-object-key?page=1&tab=active#tab-top
      */
-    var _getObjectValue = function _getObjectValue(object, pathStr) {
-        var obj;
-        if (!object || !angular.isObject(object)) return;
-        //if the key is not a sting then we already have the value
-        if (pathStr === null || !angular.isString(pathStr)) {
-            return pathStr;
-        }
-        obj = object;
-        pathStr.split('.').forEach(function (value) {
-            if (obj) {
-                obj = obj[value];
-            }
-        });
-        return obj;
+    var _getObjectValue = function _getObjectValue(object, path) {
+        if (!object) return;
+        path = path.split('.');
+        var obj = object[path.shift()];
+        while (obj && path.length) {
+            obj = obj[path.shift()];
+        }return obj;
     };
 
     /*
@@ -733,18 +729,21 @@ angular.module('ui-leaflet').service('leafletHelpers', ["$q", "$log", "$timeout"
     };
 
     function _obtainEffectiveMapId(d, mapId) {
-        var id, i;
+        var id,
+            keys = Object.keys(d);
+
         if (!angular.isDefined(mapId)) {
-            if (Object.keys(d).length === 0) {
+            if (keys.length === 0 || keys.length === 1 && keys[0] === 'main') {
+                //default non id attribute map
+                // OR one key 'main'
+                /*
+                    Main Reason:
+                    Initally if we have only one map and no "id" then d will be undefined initially.
+                    On subsequent runs it will be just d.main so we need to return the last map.
+                */
                 id = "main";
-            } else if (Object.keys(d).length >= 1) {
-                for (i in d) {
-                    if (d.hasOwnProperty(i)) {
-                        id = i;
-                    }
-                }
             } else {
-                $log.error(_errorHeader + "- You have more than 1 map on the DOM, you must provide the map ID to the leafletData.getXXX call");
+                throw new Error(_errorHeader + "- You have more than 1 map on the DOM, you must provide the map ID to the leafletData.getXXX call. Where one of the following mapIds " + Object.keys(d).join(',') + ' are available.');
             }
         } else {
             id = mapId;
@@ -809,6 +808,7 @@ angular.module('ui-leaflet').service('leafletHelpers', ["$q", "$log", "$timeout"
     var directiveNormalize = function directiveNormalize(name) {
         return camelCase(name.replace(PREFIX_REGEXP, ""));
     };
+
     // END AngularJS port
 
     var _watchTrapDelayMilliSec = 10;
@@ -834,6 +834,7 @@ angular.module('ui-leaflet').service('leafletHelpers', ["$q", "$log", "$timeout"
         clone: _clone,
         errorHeader: _errorHeader,
         getObjectValue: _getObjectValue,
+        get: _getObjectValue,
         getObjectArrayPath: _getObjectArrayPath,
         getObjectDotPath: _getObjectDotPath,
         defaultTo: function defaultTo(val, _default) {

dist/ui-leaflet.min.js

@@ -52,7 +52,7 @@
     "karma-chrome-launcher": "^0.x",
     "karma-coffee-preprocessor": "^0.3.0",
     "karma-coverage": "^0.5.3",
-    "karma-firefox-launcher": "0.x",
+    "karma-firefox-launcher": "^0.1.4",
     "karma-html2js-preprocessor": "^0.1.0",
     "karma-jasmine": "^0.3.6",
     "karma-mocha-reporter": "1.x",