Merge branch 'master' into set-where

README.md

@@ -11,7 +11,7 @@ A live demo is available on the [Esri Leaflet website](http://esri.github.io/esr
 Here is a quick example to get you started. Just change the paths to point to the proper libraries and go.
 
 <a href="http://esri.github.io/esri-leaflet/examples/clustering-feature-layers.html">
-  <img src="https://github.com/Esri/esri-leaflet-cluster/raw/master/esri-leaflet-clustered-feature-layer.jpg" alt="Demo">
+  <img src="https://github.com/Esri/esri-leaflet-cluster/raw/master/cluster-example.jpg" alt="Demo">
 </a>
 
 ```html
@@ -22,21 +22,26 @@ Here is a quick example to get you started. Just change the paths to point to th
   <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
 
   <!-- Load Leaflet from CDN-->
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.3/leaflet.css" />
-  <script src="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.3/leaflet-src.js"></script>
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.1.0/dist/leaflet.css"
+    integrity="sha512-wcw6ts8Anuw10Mzh9Ytw4pylW8+NAD4ch3lqm9lzAsTxg0GFeJgoAtxuCLREZSC5lUXdVyo/7yfsqFjQ4S+aKw=="
+    crossorigin=""/>
+  <script src="https://unpkg.com/leaflet@1.1.0/dist/leaflet.js"
+    integrity="sha512-mNqn2Wg7tSToJhvHcqfzLMU6J4mkOImSPTxVZAdo+lcPlk+GhZmYgACEe0x35K7YzW1zJ7XyJV/TT1MrdXvMcA=="
+    crossorigin=""></script>
 
   <!-- Load Esri Leaflet from CDN -->
-  <script src="http://cdn.jsdelivr.net/leaflet.esri/2.0.2/esri-leaflet.js"></script>
+  <script src="https://unpkg.com/esri-leaflet@2.1.0/dist/esri-leaflet.js"
+    integrity="sha512-Tojl3UMd387f6DdAJlo+fKfJZiP55fYT+6Y58yKbHydnueOdSFOxrgLPuUxm7VW1szEt3hZVwv3V2sSUCuT35w=="
+    crossorigin=""></script>
 
-  <!-- Include Leaflet.markercluster via rawgit.com
-in production you'd be better off hosting these libraries yourself -->
-  <link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/Leaflet/Leaflet.markercluster/v1.0.0-rc.1/dist/MarkerCluster.Default.css">
-  <link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/Leaflet/Leaflet.markercluster/v1.0.0-rc.1/dist/MarkerCluster.css">
-  <script src="https://cdn.rawgit.com/Leaflet/Leaflet.markercluster/v1.0.0-rc.1/dist/leaflet.markercluster.js"></script>
+  <link rel="stylesheet" type="text/css" href="https://unpkg.com/leaflet.markercluster@1.0.4/dist/MarkerCluster.Default.css">
+  <link rel="stylesheet" type="text/css" href="https://unpkg.com/leaflet.markercluster@1.0.4/dist/MarkerCluster.css">
+  <script src="https://unpkg.com/leaflet.markercluster@1.0.4/dist/leaflet.markercluster.js"></script>
 
-
-  <!-- Load Clustered Feature Layer from CDN -->
-  <script src="https://unpkg.com/esri-leaflet-cluster@2.0.0"></script>
+  <!-- Load Esri Leaflet Cluster from CDN -->
+  <script src="https://unpkg.com/esri-leaflet-cluster@2.0.0/dist/esri-leaflet-cluster.js"
+    integrity="sha512-mhpdD3igvv7A/84hueuHzV0NIKFHmp2IvWnY5tIdtAHkHF36yySdstEVI11JZCmSY4TCvOkgEoW+zcV/rUfo0A=="
+    crossorigin=""></script>
 
   <style>
     body {margin:0;padding:0;}
@@ -62,7 +67,7 @@ in production you'd be better off hosting these libraries yourself -->
 
 ### Documentation & Examples
 
-A full [API Reference](http://esri.github.io/esri-leaflet/api-reference/layers/clustered-feature-layer.html) and examples can be found on the [Esri Leaflet](http://esri.github.io/esri-leaflet/) website.
+A full [API Reference](http://esri.github.io/esri-leaflet/api-reference/layers/cluster-feature-layer.html) and examples can be found on the [Esri Leaflet](http://esri.github.io/esri-leaflet/) website.
 
 ### Development Instructions
 
@@ -83,9 +88,9 @@ If you'd like to inspect and modify the source of Esri Leaflet Cluster, follow t
   * [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster) version `0.4`
 
 * version [2.0.0](https://github.com/Esri/esri-leaflet-cluster/releases/tag/v2.0.0) (available on [CDN](https://unpkg.com/esri-leaflet-cluster@2.0.0)) can be used in apps alongside:
-  *  [Leaflet](http://leafletjs.com) version `1.0.0`.
+  *  [Leaflet](http://leafletjs.com) version `1.x`.
   * Esri Leaflet version `2.x`
-  * [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster) version `1.0.0-rc.1`
+  * [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster) version `1.x`
 
 ### Resources
 
@@ -97,9 +102,9 @@ If you'd like to inspect and modify the source of Esri Leaflet Cluster, follow t
 
 ### Issues
 
-Find a bug or want to request a new feature?  Please let us know by submitting an [issue](https://github.com/Esri/esri-leaflet-clustered-feature-layer/issues).
+Find a bug or want to request a new feature?  Please let us know by submitting an [issue](https://github.com/Esri/esri-leaflet-cluster/issues).
 
-Please take a look at [previous issues on Esri Leaflet](https://github.com/Esri/esri-leaflet/issues?labels=FAQ&milestone=&page=1&state=closed) and [previous issues on Esri Leaflet Clustered Feature Layer](https://github.com/Esri/esri-leaflet-clustered-feature-layer/issues?labels=FAQ&milestone=&page=1&state=closed)that resolve common problems.
+Please take a look at [previous Esri Leaflet issues](https://github.com/Esri/esri-leaflet/issues?labels=FAQ&milestone=&page=1&state=closed) and [previous Esri Leaflet Cluster issues](https://github.com/Esri/esri-leaflet-cluster/issues?labels=FAQ&milestone=&page=1&state=closed)that resolve common problems.
 
 You can also post issues on the [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-leaflet,leaflet) an/or the [Esri Leaflet place](https://geonet.esri.com/discussion/create.jspa?sr=pmenu&containerID=1841&containerType=700&tags=esri-leaflet,leaflet) on GeoNet.
 
@@ -108,7 +113,7 @@ You can also post issues on the [GIS Stackexchange](http://gis.stackexchange.com
 Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/Esri/esri-leaflet/blob/master/CONTRIBUTING.md).
 
 ### Licensing
-Copyright 2016 Esri
+Copyright 2017 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -122,7 +127,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-A copy of the license is available in the repository's [LICENSE](./LICENSE) file.
-
-[](Esri Tags: ArcGIS Web Mapping Leaflet)
-[](Esri Language: JavaScript)
+A copy of the license is available in the repository's [LICENSE](./LICENSE) file.

bower.json

@@ -1,10 +1,10 @@
 {
-  "name": "esri-leaflet-clustered-feature-layer",
-  "main": "dist/esri-leaflet-clustered-feature-layer.js",
+  "name": "esri-leaflet-cluster",
+  "main": "dist/esri-leaflet-cluster.js",
   "dependencies": {
     "esri-leaflet": "^2.0.0",
-    "leaflet": "^1.0.0-rc.3",
-    "leaflet.markercluster": "git+https://github.com/Leaflet/Leaflet.markercluster.git#v1.0.0-rc.1"
+    "leaflet": "^1.0.0",
+    "leaflet.markercluster": "^1.0.0"
   },
   "ignore": [
     "**/.*",

karma.conf.js

@@ -1,7 +1,7 @@
 // Karma configuration
 // Generated on Fri May 30 2014 15:44:45 GMT-0400 (EDT)
 
-module.exports = function(config) {
+module.exports = function (config) {
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -64,8 +64,8 @@ module.exports = function(config) {
 
     // Configure the coverage reporters
     coverageReporter: {
-      reporters:[
-        {type: 'html', dir:'coverage/'},
+      reporters: [
+        {type: 'html', dir: 'coverage/'},
         {type: 'text'}
       ]
     }