Skip to content

Commit

Permalink
Merge pull request #889 from jgravois/2.0.5-prep
Browse files Browse the repository at this point in the history
2.0.5 release prep
  • Loading branch information
jgravois authored Nov 16, 2016
2 parents d7a3083 + 3065e5e commit def3680
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Upcoming changes][unreleased]

## [2.0.5]

### Fixed
* DynamicMapLayer image overlays now utilize a proxy when appropriate [#862](https://github.com/Esri/esri-leaflet/issues/862)
* `DynamicMapLayer.layerDefs` provided as a string are now serialized correctly [#866](https://github.com/Esri/esri-leaflet/pull/866) (thank you[@whyvez](https://github.com/whyvez)!)
* We no longer ask for raw geojson from ArcGIS Online proxied services that can't provide it. [#876](https://github.com/Esri/esri-leaflet/issues/876)
* Copyright text for `TiledMapLayer` is now displayed automatically when the map has a custom projection. [#877](https://github.com/Esri/esri-leaflet/issues/877)
* When a null extent is encountered by L.esri.Query, no matter its form, an `Invalid Bounds` error is passed in the callback. [#879](https://github.com/Esri/esri-leaflet/issues/879)
* `L.esri.request` now sets the generic `withCredentials` header when appropriate [#881](https://github.com/Esri/esri-leaflet/issues/881)

## [2.0.4]

### Changed
Expand Down Expand Up @@ -475,7 +485,8 @@ None
* Add DarkGray and DarkGrayLabels to BasemapLayer. #190
* An attributionControl on maps is now required when using BasemapLayer. #159

[unreleased]: https://github.com/esri/esri-leaflet/compare/v2.0.4...HEAD
[unreleased]: https://github.com/esri/esri-leaflet/compare/v2.0.5...HEAD
[2.0.4]: https://github.com/esri/esri-leaflet/compare/v2.0.4...v2.0.5
[2.0.4]: https://github.com/esri/esri-leaflet/compare/v2.0.3...v2.0.4
[2.0.3]: https://github.com/esri/esri-leaflet/compare/v2.0.2...v2.0.3
[2.0.2]: https://github.com/esri/esri-leaflet/compare/v2.0.1...v2.0.2
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The easiest way to get started is to load Esri Leaflet via [CDN](https://unpkg.c
<script src="https://unpkg.com/[email protected]/dist/leaflet-src.js"></script>

<!-- Load Esri Leaflet locally, after cloning this repository -->
<script src="https://unpkg.com/[email protected].4"></script>
<script src="https://unpkg.com/[email protected].5"></script>

<style>
html, body, #map {
Expand Down Expand Up @@ -132,10 +132,8 @@ http://esri.github.io/esri-leaflet/plugins/)

## Issues


If something isn't working the way you expected, please take a look at [previously logged issues](https://github.com/Esri/esri-leaflet/issues?labels=FAQ&milestone=&page=1&state=closed) that resolve common problems first. Have you found a new bug? Want to request a new feature? We'd love to hear from you. Please let us know by submitting an [issue](https://github.com/Esri/esri-leaflet/issues).


If you're looking for help you can also post issues on [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-leaflet,leaflet) and/or the [Esri Leaflet place](https://geonet.esri.com/discussion/create.jspa?sr=pmenu&containerID=1841&containerType=700&tags=esri-leaflet,leaflet) on GeoNet.

## Going Deeper
Expand All @@ -153,13 +151,13 @@ If you'd like to inspect and modify the source of Esri Leaflet, follow the instr

### Dependencies

* Esri Leaflet [1.x](https://github.com/Esri/esri-leaflet/releases/tag/v1.0.3) (available on [CDN](https://cdn.jsdelivr.net/leaflet.esri/1.0.3/esri-leaflet.js)) can be used in apps alongside:
* Esri Leaflet [1.x](https://github.com/Esri/esri-leaflet/releases/tag/v1.0.3) (available on [CDN](https://cdn.jsdelivr.net/leaflet.esri/1.0.4/esri-leaflet.js)) can be used in apps alongside:
* [Leaflet](http://leafletjs.com) version 0.7.x.

* Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.2) (available on [CDN](https://unpkg.com/[email protected].3)) can be used in apps alongside:
* [Leaflet](http://leafletjs.com) version 1.0.x.
* Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.5) (available on [CDN](https://unpkg.com/[email protected].5)) can be used in apps alongside:
* [Leaflet](http://leafletjs.com) version 1.x.

The `master` branch of this repository is only compatible with Leaflet 1.0.x.
The `master` branch of this repository is only compatible with Leaflet 1.x.

### Versioning

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.",
"main": "dist/esri-leaflet.js",
"dependencies": {
"leaflet": "^1.0.0-rc.2"
"leaflet": "^1.0.0"
},
"ignore": [
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esri-leaflet",
"description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.",
"version": "2.0.4",
"version": "2.0.5",
"author": "Patrick Arlt <[email protected]> (http://patrickarlt.com)",
"browser": "dist/esri-leaflet-debug.js",
"bugs": {
Expand Down

0 comments on commit def3680

Please sign in to comment.