Skip to content

Commit

Permalink
Merge pull request #816 from jgravois/2.0.2
Browse files Browse the repository at this point in the history
2.0.2
  • Loading branch information
patrickarlt authored Aug 3, 2016
2 parents 84b5225 + 739ca69 commit 2e7275a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Upcoming changes][unreleased]

## [2.0.2]

### Added
* support for `ImageMapLayer` services that require a token to be passed in a request for raw images [#812](https://github.com/Esri/esri-leaflet/pull/812)
* more graceful handling of stubborn `TiledMapLayer` services [#810](https://github.com/Esri/esri-leaflet/pull/810)

### Fixed
* bug which resulted in global `map` scope creep [#814](https://github.com/Esri/esri-leaflet/issues/818)
* bug which caused distortion in featureLayer display [#814](https://github.com/Esri/esri-leaflet/issues/818)

### Changed
* Attribution text which is displayed for hosted Esri basemaps is now 'Powered by [Esri](https://www.esri.com)'

## [2.0.1]

### Added
Expand Down Expand Up @@ -438,7 +451,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.1...HEAD
[unreleased]: https://github.com/esri/esri-leaflet/compare/v2.0.2...HEAD
[2.0.1]: https://github.com/esri/esri-leaflet/compare/v2.0.1...v2.0.2
[2.0.1]: https://github.com/esri/esri-leaflet/compare/v2.0.0...v2.0.1
[2.0.0]: https://github.com/esri/esri-leaflet/compare/v2.0.0-beta.8...v2.0.0
[2.0.0-beta.8]: https://github.com/esri/esri-leaflet/compare/v2.0.0-beta.7...v2.0.0-beta.8
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ The easiest way to get started is to load Esri Leaflet via [CDN](http://www.jsde
<html>
<head>
<!-- Load Leaflet from CDN-->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.1/leaflet.css" />
<script src="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.1/leaflet.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.2/leaflet.css" />
<script src="https://cdn.jsdelivr.net/leaflet/1.0.0-rc.2/leaflet.js"></script>

<!-- Load Esri Leaflet locally, after cloning this repository -->
<script src="https://cdn.jsdelivr.net/leaflet.esri/2.0.1/esri-leaflet.js"></script>
<script src="https://cdn.jsdelivr.net/leaflet.esri/2.0.2/esri-leaflet.js"></script>

<style>
html, body, #map {
Expand Down Expand Up @@ -153,7 +153,7 @@ If you'd like to inspect and modify the source of Esri Leaflet, follow the instr
* 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:
* [Leaflet](http://leafletjs.com) version 0.7.x.

* Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.1) (available on [CDN](https://cdn.jsdelivr.net/leaflet.esri/2.0.1/esri-leaflet.js)) can be used in apps alongside:
* Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.2) (available on [CDN](https://cdn.jsdelivr.net/leaflet.esri/2.0.2/esri-leaflet.js)) can be used in apps alongside:
* [Leaflet](http://leafletjs.com) version 1.0.0-rc.X.

The `master` branch of this repository is only compatible with Leaflet 1.0.x.
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "esri-leaflet",
"version": "v2.0.1",
"version": "v2.0.2",
"main": "dist/esri-leaflet.js",
"dependencies": {
"leaflet": "^1.0.0-rc.1"
"leaflet": "^1.0.0-rc.2"
},
"ignore": [
"**/.*",
Expand Down
4 changes: 2 additions & 2 deletions 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.1",
"version": "2.0.2",
"author": "Patrick Arlt <[email protected]> (http://patrickarlt.com)",
"browser": "dist/esri-leaflet-debug.js",
"bugs": {
Expand All @@ -13,7 +13,7 @@
],
"dependencies": {
"arcgis-to-geojson-utils": "^1.0.1",
"leaflet": "^1.0.0-rc.1",
"leaflet": "^1.0.0-rc.2",
"leaflet-virtual-grid": "^1.0.3",
"tiny-binary-search": "^1.0.2"
},
Expand Down

0 comments on commit 2e7275a

Please sign in to comment.