Merge remote-tracking branch 'upstream/master'

Author: nmccready

bower.json

@@ -43,7 +43,9 @@
     "Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
     "Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
     "ionrangeslider": "~1.9.3",
-    "leaflet-minimap": "~2.2.0"
+    "leaflet-minimap": "~2.2.0",
+    "esri-leaflet-clustered-feature-layer": "~1.0.0-rc.4",
+    "esri-leaflet-heatmap-feature-layer": "~1.0.0-rc.4"
   },
   "overrides": {
     "Leaflet.utfgrid": {

dist/angular-leaflet-directive.js

@@ -918,19 +918,31 @@ angular.module("leaflet-directive").factory('leafletHelpers', ["$q", "$log", fun
                 }
             }
         },
-        YandexLayerPlugin: {
+        AGSFeatureLayerPlugin: {
             isLoaded: function() {
-                return angular.isDefined(L.Yandex);
+                return L.esri !== undefined && L.esri.featureLayer !== undefined;
             },
-            is: function(layer) {
+            is: function (layer) {
                 if (this.isLoaded()) {
-                    return layer instanceof L.Yandex;
+                    return layer instanceof L.esri.featureLayer;
                 } else {
                     return false;
                 }
             }
         },
-        DynamicMapLayerPlugin: {
+        AGSTiledMapLayerPlugin: {
+            isLoaded: function() {
+                return L.esri !== undefined && L.esri.tiledMapLayer !== undefined;
+            },
+            is: function (layer) {
+                if (this.isLoaded()) {
+                    return layer instanceof L.esri.tiledMapLayer;
+                } else {
+                    return false;
+                }
+            }
+        },
+        AGSDynamicMapLayerPlugin: {
             isLoaded: function () {
                 return L.esri !== undefined && L.esri.dynamicMapLayer !== undefined;
             },
@@ -942,6 +954,54 @@ angular.module("leaflet-directive").factory('leafletHelpers', ["$q", "$log", fun
                 }
             }
         },
+        AGSImageMapLayerPlugin: {
+            isLoaded: function () {
+                return L.esri !== undefined && L.esri.imageMapLayer !== undefined;
+            },
+            is: function (layer) {
+                if (this.isLoaded()) {
+                    return layer instanceof L.esri.imageMapLayer;
+                } else {
+                    return false;
+                }
+            }
+        },
+        AGSClusteredLayerPlugin: {
+            isLoaded: function () {
+                return L.esri !== undefined && L.esri.clusteredFeatureLayer !== undefined;
+            },
+            is: function (layer) {
+                if (this.isLoaded()) {
+                    return layer instanceof L.esri.clusteredFeatureLayer;
+                } else {
+                    return false;
+                }
+            }
+        },
+        AGSHeatmapLayerPlugin: {
+            isLoaded: function () {
+                return L.esri !== undefined && L.esri.heatmapFeatureLayer !== undefined;
+            },
+            is: function (layer) {
+                if (this.isLoaded()) {
+                    return layer instanceof L.esri.heatmapFeatureLayer;
+                } else {
+                    return false;
+                }
+            }
+        },
+        YandexLayerPlugin: {
+            isLoaded: function() {
+                return angular.isDefined(L.Yandex);
+            },
+            is: function(layer) {
+                if (this.isLoaded()) {
+                    return layer instanceof L.Yandex;
+                } else {
+                    return false;
+                }
+            }
+        },
         GeoJSONPlugin: {
             isLoaded: function(){
                 return angular.isDefined(L.TileLayer.GeoJSON);
@@ -1202,6 +1262,7 @@ angular.module("leaflet-directive")
     var isObject = leafletHelpers.isObject;
     var isArray = leafletHelpers.isArray;
     var isDefined = leafletHelpers.isDefined;
+    var errorHeader = leafletHelpers.errorHeader;
     var $it = leafletIterators;
 
     var utfGridCreateLayer = function(params) {
@@ -1382,20 +1443,81 @@ angular.module("leaflet-directive")
                 return layer;
             }
         },
-        dynamic: {
+        agsFeature: {
+            mustHaveUrl: true,
+            createLayer: function(params) {
+                if (!Helpers.AGSFeatureLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri plugin is not loaded.');
+                    return;
+                }
+                return L.esri.featureLayer(params.url, params.options);
+            }
+        },
+        agsTiled: {
             mustHaveUrl: true,
             createLayer: function(params) {
-                if (!Helpers.DynamicMapLayerPlugin.isLoaded()) {
+                if (!Helpers.AGSTiledMapLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri plugin is not loaded.');
+                    return;
+                }
+                return L.esri.tiledMapLayer(params.url, params.options);
+            }
+        },
+        agsDynamic: {
+            mustHaveUrl: true,
+            createLayer: function(params) {
+                if (!Helpers.AGSDynamicMapLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri plugin is not loaded.');
                     return;
                 }
                 return L.esri.dynamicMapLayer(params.url, params.options);
             }
         },
+        agsImage: {
+            mustHaveUrl: true,
+            createLayer: function(params) {
+                if (!Helpers.AGSImageMapLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri plugin is not loaded.');
+                    return;
+                }
+                return L.esri.imageMapLayer(params.url, params.options);
+            }
+        },
+        agsClustered: {
+            mustHaveUrl: true,
+            createLayer: function(params) {
+                if (!Helpers.AGSClusteredLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri clustered layer plugin is not loaded.');
+                    return;
+                }
+
+                if(!Helpers.MarkerClusterPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The markercluster plugin is not loaded.');
+                    return;
+                }
+                return L.esri.clusteredFeatureLayer(params.url, params.options);
+            }
+        },
+        agsHeatmap: {
+            mustHaveUrl: true,
+            createLayer: function(params) {
+                if (!Helpers.AGSHeatmapLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The esri heatmap layer plugin is not loaded.');
+                    return;
+                }
+
+                if(!Helpers.HeatLayerPlugin.isLoaded()) {
+                    $log.warn(errorHeader + ' The heatlayer plugin is not loaded.');
+                    return;
+                }
+                return L.esri.heatmapFeatureLayer(params.url, params.options);
+            }
+        },
         markercluster: {
             mustHaveUrl: false,
             createLayer: function(params) {
                 if (!Helpers.MarkerClusterPlugin.isLoaded()) {
-                    $log.error('[AngularJS - Leaflet] The markercluster plugin is not loaded.');
+                    $log.warn(errorHeader + ' The markercluster plugin is not loaded.');
                     return;
                 }
                 return new L.MarkerClusterGroup(params.options);

dist/angular-leaflet-directive_dev_mapped.js

@@ -37,11 +37,13 @@
         <script src="../bower_components/leaflet.draw/dist/leaflet.draw.js"></script>
         <script src="../bower_components/leaflet-plugins/layer/Marker.Rotate.js"></script>
         <script src="../bower_components/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
+        <script src="../bower_components/esri-leaflet-clustered-feature-layer/dist/esri-leaflet-clustered-feature-layer.js"></script>
         <script src="../bower_components/Leaflet.PolylineDecorator/leaflet.polylineDecorator.min.js"></script>
         <script src="../bower_components/Leaflet.awesome-markers/dist/leaflet.awesome-markers.js"></script>
         <script src="../bower_components/Leaflet.MakiMarkers/Leaflet.MakiMarkers.js"></script>
         <script src="../bower_components/Leaflet.ExtraMarkers/src/leaflet.extra-markers.js"></script>
         <script src="../bower_components/Leaflet.heat/dist/leaflet-heat.js"></script>
+        <script src="../bower_components/esri-leaflet-heatmap-feature-layer/dist/esri-leaflet-heatmap-feature-layer.js"></script>
         <script src="../bower_components/Leaflet.fullscreen/dist/Leaflet.fullscreen.min.js"></script>
         <script src="../bower_components/leaflet-minimap/dist/Control.MiniMap.min.js"></script>