Merge branch 'master' of github.com:Esri/esri-leaflet

CHANGELOG.md

@@ -4,23 +4,24 @@
 
 #### Breaking Changes
 
-* `L.esri.Tasks.Identify` has been renamed to `L.esri.Tasks.IdentifyFeatures`. This is to reduce confusion with `L.esri.Tasks.IdentifyImage` and to clearly deliniate what these 2 classes do.
+* `L.esri.Tasks.Identify` has been renamed to `L.esri.Tasks.IdentifyFeatures`. This is to reduce confusion with `L.esri.Tasks.IdentifyImage` and to clearly delineate what these 2 classes do.
 
 #### Changes
 * Logo position can now be controlled by using the `logoPosition` option on `L.esri.BasemapLayer` https://github.com/Esri/esri-leaflet/issues/210
-* Logo can now be hidden entirely and readded to the map with the `L.esri.Controls.Logo` class. **If you use Esris map tiles you must display the Esri Logo!**
+* Logo can now be hidden entirely and re-added to the map with the `L.esri.Controls.Logo` class. **If you use Esri map tiles you must display the Esri Logo!**
 * Fix a regression from Beta 4 where features could not be loaded from ArcGIS Server if they were in non-mercator references. https://github.com/Esri/esri-leaflet/issues/283 https://github.com/Esri/esri-leaflet/pull/322
 * The `addFeature`, `removeFeature`, `updateFeature` methods will no longer throw errors when callbacks are omitted. https://github.com/Esri/esri-leaflet/issues/285
 * `deleteFeature` now properly removes the feature from the map so it will now appear after zooming or panning. https://github.com/Esri/esri-leaflet/issues/284
 * New `createfeature`, `addfeature` and `removefeature` events on `L.esri.FeatureLayer`. https://github.com/Esri/esri-leaflet/issues/282
-* `L.esri.Tasks.Query` now supports Map Services and Image Services with the new `query.layer(id)` and `query.pixelSize(point)` params respectivly
+* `L.esri.Tasks.Query` now supports Map Services and Image Services with the new `query.layer(id)` and `query.pixelSize(point)` params respectively
 * New `L.esri.Tasks.Find` task for searching feature text in Map Services https://github.com/Esri/esri-leaflet/pull/287. Thanks @rdjurasaj-usgs!
 * Support for image services via `L.esri.Layers.ImageMapLayer`. Thanks @rdjurasaj-usgs and @tomwayson
 * `L.esri.Tasks.IdentifyImage` for identifying images. Thanks @tomwayson.
 
 #### Misc
 * [New example](esri.github.io/esri-leaflet/examples/parse-feature-collection.html) for parsing [Feature Collections](http://resources.arcgis.com/en/help/arcgis-rest-api/#/featureCollection/02r30000003m000000/) from ArcGIS Online.
-* * Travis CI is now running tests https://github.com/Esri/esri-leaflet/pull/271
+* [New example]() for labeling points with [Leaflet.label](https://github.com/Leaflet/Leaflet.label).
+* Travis CI is now running tests https://github.com/Esri/esri-leaflet/pull/271
 * Build are no longer saved in the `/dist` folder. https://github.com/Esri/esri-leaflet/pull/307
 * [Development Roadmap](https://github.com/Esri/esri-leaflet/wiki/Roadmap) has been updated.
 

README.md

@@ -78,6 +78,8 @@ If you are interested in contributing to Esri Leaflet or are interetsed in seein
 * [I want to contribute. How can I help?](https://github.com/Esri/esri-leaflet/wiki/FAQ#i-want-to-contribute-how-can-i-help)
 * [I built something with Esri Leaflet can I show you?](https://github.com/Esri/esri-leaflet/wiki/FAQ#i-built-something-with-esri-leaflet-can-i-show-you)
 * [I built a reusable component (layer type, api wrapper, ui control ect...) can I contribute it to Esri Leaflet?](i-built-a-reusable-component-layer-type-api-wrapper-ui-control-ect-can-i-contribute-it-to-esri-leaflet)
+* [What are the terms of use for Esri map tiles?](#what-are-the-terms-of-use-for-esri-map-tiles)
+* [Which services require authentication?](#which-services-require-authentication)
 * [What are some good Leaflet Plugins?](https://github.com/Esri/esri-leaflet/wiki/FAQ#what-are-some-good-leaflet-plugins)
 
 ### Projects Using Esri Leaflet

site/source/pages/api-reference/layers/image-map-layer.md

@@ -73,10 +73,13 @@ Option | Type | Default | Description
             <td><code>this</code></td>
             <td>
                 Uses the provided function to create a popup that will identify pixel value(s) whenever the map is clicked. Your function will be passed an object with a `pixel` property that is a <a href="http://geojson.org/geojson-spec.html#point">GeoJSON Point</a> with the pixel value(s) at the clicked location and should return the appropriate HTML. If you do not want to open the popup when there are no results, return <code>false</code>.
+
 <pre class="js"><code>imageMapLayer.bindPopup(function(err, identifyResults, response){
     var value = results.pixel.properties.value;;
     return (value) ? 'Pixel value: ' + value : false;
 });</code></pre>
+
+                NOTE: by default, if the layer has a mosaic rule applied, then the same rule will be applied to the identify request. Conversely, if the layer has a rendering rule applied, that rule is **NOT** applied to the layer so that that the raw pixel value can be returned. If you need specific control over how these rules (and/or other identify parameters) are passed to the identify service, use <a href="{{assets}}api-reference/tasks/identify-image.html"><code>L.esri.Tasks.IdentifyImage</code></a>.
             </td>
         </tr>
         <tr>