Skip to content

Commit 1f8e69d

Browse files
committed
Merge branch 'master' into 1384-lod
# Conflicts: # src/Layers/TiledMapLayer.js
2 parents bf616b3 + 83eb5f2 commit 1f8e69d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+9219
-7408
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
id: reproduction
1818
attributes:
1919
label: Reproduction
20-
description: A link to a public repository or jsbin (you can start with https://jsbin.com/yewimat/edit) that reproduces the issue, along with a step by step explanation of how to see the issue. If no reproduction case is provided within a reasonable time-frame, the issue will be closed.
20+
description: A link to a public repository or jsbin (you can start with https://jsbin.com/moterub/edit) that reproduces the issue, along with a step by step explanation of how to see the issue. If no reproduction case is provided within a reasonable time-frame, the issue will be closed.
2121
placeholder: Reproduction
2222
validations:
2323
required: true

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ body:
2121
description: Please provide the URL to the associated documentation page, if applicable.
2222
placeholder: e.g. https://developers.arcgis.com/esri-leaflet/samples/visualize-points-as-a-heatmap/
2323
validations:
24-
required: false
24+
required: false

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignore artifacts:
2+
build
3+
coverage

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
3+
}

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased][unreleased]
77

8+
## [3.0.16] - 2025-05-01
9+
10+
### Changed
11+
12+
- Changed code formatting from Semistandard to Prettier and ESLint ([#1408](https://github.com/Esri/esri-leaflet/pull/1408))
13+
14+
## [3.0.15] - 2025-04-07
15+
16+
### Fixed
17+
18+
- `apikey` property on TiledMapLayer ([#1407](https://github.com/Esri/esri-leaflet/pull/1407))
819

920
## [3.0.14] - 2024-12-17
1021

@@ -881,7 +892,9 @@ None
881892
- Add DarkGray and DarkGrayLabels to BasemapLayer. #190
882893
- An attributionControl on maps is now required when using BasemapLayer. #159
883894

884-
[unreleased]: https://github.com/esri/esri-leaflet/compare/v3.0.14..HEAD
895+
[unreleased]: https://github.com/esri/esri-leaflet/compare/v3.0.16..HEAD
896+
[3.0.16]: https://github.com/esri/esri-leaflet/compare/v3.0.15..v3.0.16
897+
[3.0.15]: https://github.com/esri/esri-leaflet/compare/v3.0.14..v3.0.15
885898
[3.0.14]: https://github.com/esri/esri-leaflet/compare/v3.0.13..v3.0.14
886899
[3.0.13]: https://github.com/esri/esri-leaflet/compare/v3.0.12..v3.0.13
887900
[3.0.12]: https://github.com/esri/esri-leaflet/compare/v3.0.11..v3.0.12

CONTRIBUTING.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ If you think you're encountering a new bug, please feel free to log an [issue](h
1010

1111
**Please include the following in your issue:**
1212

13-
* Browser
14-
* Browser version
15-
* Leaflet version `L.version`
16-
* Esri Leaflet version `L.esri.VERSION`
17-
* Bundling tool (webpack, browserify, Require JS) if any
13+
- Browser
14+
- Browser version
15+
- Leaflet version `L.version`
16+
- Esri Leaflet version `L.esri.VERSION`
17+
- Bundling tool (webpack, browserify, Require JS) if any
1818

1919
### I want to contribute, what should I work on?
2020

@@ -32,7 +32,7 @@ You can run the tests with `npm test`.
3232

3333
##### Support for new services and layer types
3434

35-
Support for new layer types and services are always needed. The [plugin candidates](https://github.com/Esri/esri-leaflet/issues?labels=Plugin+Candidate&page=1&state=open) list is a good place to start.
35+
Support for new layer types and services are always needed. The [plugin candidates](https://github.com/Esri/esri-leaflet/issues?labels=Plugin+Candidate&page=1&state=open) list is a good place to start.
3636

3737
### Can I publish my own Esri Leaflet plugins?
3838

@@ -50,9 +50,15 @@ Of course! If you develop reusable components for use with Esri Leaflet that you
5050

5151
If you'd like to build the Esri Leaflet website locally, make sure you have the [Grunt CLI](http://gruntjs.com/getting-started) installed.
5252

53-
### Linting
53+
### Linting and Code Formatting
5454

55-
Please make sure your changes pass JS Hint. This will help make sure code is consistent throughout Esri Leaflet. After installing the node dependencies for this project you can run `npm run lint` so that `semistandard` can make sure all is well.
55+
Please make sure your changes pass ESLint and Prettier. This will help make sure code is consistent throughout Esri Leaflet. To check this, run `npm run lint` which will check both. Other helpful commands:
56+
57+
- `npm run lint` - tests code for ESLint and Prettier
58+
- `npm run eslint` - tests code for ESLint
59+
- `npm run eslintfix` - fixes ESLint errors
60+
- `npm run prettier` - tests code for Prettier
61+
- `npm run prettierfix` - fixes Prettier errors
5662

5763
### Testing
5864

README.md

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
> This project is maintained with :heart: by folks on multiple teams at Esri, but we provide no guarantee of individual features, nor a traditional product lifecycle to support planning.
1313
14-
The goal of this project is **not** to replace the [ArcGIS API for JavaScript](https://developers.arcgis.com/en/javascript/) but rather to provide small components for *only some* aspects of the ArcGIS platform for developers who prefer to build mapping applications with [Leaflet](http://leafletjs.com/).
14+
The goal of this project is **not** to replace the [ArcGIS API for JavaScript](https://developers.arcgis.com/en/javascript/) but rather to provide small components for _only some_ aspects of the ArcGIS platform for developers who prefer to build mapping applications with [Leaflet](http://leafletjs.com/).
1515

1616
We are proud to facilitate a project which requires participation from our diverse user community in order to thrive and we welcome contributions from those [just getting their feet wet](https://github.com/Esri/esri-leaflet/issues/647) in open-source.
1717

1818
Support for [Geocoding](https://github.com/Esri/esri-leaflet-geocoder) services and [Geoprocessing](https://github.com/jgravois/esri-leaflet-gp) services, as well as service defined [rendering](https://github.com/esri/esri-leaflet-renderers) are available as well (via additional plugins).
1919

20-
> If you'd like to display Esri services in *any* Leaflet application, we ask that you adhere to our [Terms of Use](#terms) and attribution requirements.
20+
> If you'd like to display Esri services in _any_ Leaflet application, we ask that you adhere to our [Terms of Use](#terms) and attribution requirements.
2121
2222
## Table of Contents
2323

@@ -37,11 +37,11 @@ Support for [Geocoding](https://github.com/Esri/esri-leaflet-geocoder) services
3737
- [License](#license)
3838

3939
## Quick Start
40+
4041
The easiest way to get started is to load Esri Leaflet via [CDN](https://unpkg.com/esri-leaflet). Here is an example you can copy/paste into your own `.html` file: [Esri Leaflet Quick Start](https://developers.arcgis.com/esri-leaflet/get-started/)
4142

4243
[![App](https://raw.github.com/Esri/esri-leaflet/master/example.png)](https://developers.arcgis.com/esri-leaflet/samples/)
4344

44-
4545
## [Samples, Tutorials, and API Reference](https://developers.arcgis.com/esri-leaflet/)
4646

4747
[Samples](https://developers.arcgis.com/esri-leaflet/samples/), [tutorials](https://developers.arcgis.com/esri-leaflet/tutorials/), and the [API reference](https://developers.arcgis.com/esri-leaflet/api-reference/) can be found at [developers.arcgis.com/esri-leaflet](https://developers.arcgis.com/esri-leaflet/).
@@ -60,31 +60,31 @@ https://developers.arcgis.com/esri-leaflet/plugins/
6060

6161
## Frequently Asked Questions
6262

63-
* [What are the terms of use for ArcGIS Online services?](#terms)
64-
* [What exactly is Esri Leaflet? Is it a replacement for Leaflet?](https://github.com/Esri/esri-leaflet/wiki/FAQ#what-is-esri-leaflet)
65-
* [Will Esri Leaflet replace the ArcGIS API for JavaScript?](https://github.com//Esri/esri-leaflet/wiki/FAQ#will-esri-leaflet-replace-the-arcgis-api-for-javascript)
66-
* [What is the benefit of using Esri Leaflet over using Leaflet all by itself?](https://github.com//Esri/esri-leaflet/wiki/FAQ#why-use-esri-leaflet)
67-
* [What are the goals of Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-are-the-goals-of-esri-leaflet)
68-
* [Can I use Esri Leaflet with Leaflet Version 1.0.x?](https://github.com/Esri/esri-leaflet/wiki/FAQ#can-i-use-esri-leaflet-with-leaflet-version-10x)
69-
* [How do you decide what features get included in Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#how-do-you-decide-what-features-get-included-in-esri-leaflet)
70-
* [I have an idea! What should I do?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-have-an-idea-what-should-i-do)
71-
* [When will you support "x"?](https://github.com//Esri/esri-leaflet/wiki/FAQ#when-will-you-support-x)
72-
* [Can you implement feature "x"?](https://github.com//Esri/esri-leaflet/wiki/FAQ#can-you-implement-feature-x)
73-
* [I want to contribute. How can I help?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-want-to-contribute-how-can-i-help)
74-
* [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)
75-
* [I built a reusable component (layer type, api wrapper, ui control etc...) can I contribute it to Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-built-a-reusable-component-layer-type-api-wrapper-ui-control-etc-can-i-contribute-it-to-esri-leaflet)
76-
* [Which services require authentication?](https://github.com//Esri/esri-leaflet/wiki/FAQ#which-services-require-authentication)
77-
* [What are some good Leaflet Plugins?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-are-some-good-leaflet-plugins)
78-
* [What browsers does Esri Leaflet support?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-browsers-does-esri-leaflet-support)
79-
* [What versions of ArcGIS Server does Esri Leaflet support?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-versions-of-arcgis-server-does-esri-leaflet-support)
80-
* [Upgrading the version of Esri Leaflet used in my app broke everything!](https://github.com//Esri/esri-leaflet/wiki/FAQ#upgrading-the-version-of-esri-leaflet-used-in-my-app-broke-everything)
81-
* [Does Esri Leaflet support IE 'compatibility mode'?](https://github.com//Esri/esri-leaflet/wiki/FAQ#compatibility-mode)
82-
* [I'm into TypeScript, but Esri Leaflet seems to be a vanilla JS thing. Can I find typings somewhere?](https://github.com//Esri/esri-leaflet/wiki/FAQ#typescript-typings)
83-
* [When _exactly_ do I need to use a paid Esri developer account to deploy to production?](https://github.com//Esri/esri-leaflet/wiki/FAQ#deployment-plan)
63+
- [What are the terms of use for ArcGIS Online services?](#terms)
64+
- [What exactly is Esri Leaflet? Is it a replacement for Leaflet?](https://github.com/Esri/esri-leaflet/wiki/FAQ#what-is-esri-leaflet)
65+
- [Will Esri Leaflet replace the ArcGIS API for JavaScript?](https://github.com//Esri/esri-leaflet/wiki/FAQ#will-esri-leaflet-replace-the-arcgis-api-for-javascript)
66+
- [What is the benefit of using Esri Leaflet over using Leaflet all by itself?](https://github.com//Esri/esri-leaflet/wiki/FAQ#why-use-esri-leaflet)
67+
- [What are the goals of Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-are-the-goals-of-esri-leaflet)
68+
- [Can I use Esri Leaflet with Leaflet Version 1.0.x?](https://github.com/Esri/esri-leaflet/wiki/FAQ#can-i-use-esri-leaflet-with-leaflet-version-10x)
69+
- [How do you decide what features get included in Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#how-do-you-decide-what-features-get-included-in-esri-leaflet)
70+
- [I have an idea! What should I do?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-have-an-idea-what-should-i-do)
71+
- [When will you support "x"?](https://github.com//Esri/esri-leaflet/wiki/FAQ#when-will-you-support-x)
72+
- [Can you implement feature "x"?](https://github.com//Esri/esri-leaflet/wiki/FAQ#can-you-implement-feature-x)
73+
- [I want to contribute. How can I help?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-want-to-contribute-how-can-i-help)
74+
- [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)
75+
- [I built a reusable component (layer type, api wrapper, ui control etc...) can I contribute it to Esri Leaflet?](https://github.com//Esri/esri-leaflet/wiki/FAQ#i-built-a-reusable-component-layer-type-api-wrapper-ui-control-etc-can-i-contribute-it-to-esri-leaflet)
76+
- [Which services require authentication?](https://github.com//Esri/esri-leaflet/wiki/FAQ#which-services-require-authentication)
77+
- [What are some good Leaflet Plugins?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-are-some-good-leaflet-plugins)
78+
- [What browsers does Esri Leaflet support?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-browsers-does-esri-leaflet-support)
79+
- [What versions of ArcGIS Server does Esri Leaflet support?](https://github.com//Esri/esri-leaflet/wiki/FAQ#what-versions-of-arcgis-server-does-esri-leaflet-support)
80+
- [Upgrading the version of Esri Leaflet used in my app broke everything!](https://github.com//Esri/esri-leaflet/wiki/FAQ#upgrading-the-version-of-esri-leaflet-used-in-my-app-broke-everything)
81+
- [Does Esri Leaflet support IE 'compatibility mode'?](https://github.com//Esri/esri-leaflet/wiki/FAQ#compatibility-mode)
82+
- [I'm into TypeScript, but Esri Leaflet seems to be a vanilla JS thing. Can I find typings somewhere?](https://github.com//Esri/esri-leaflet/wiki/FAQ#typescript-typings)
83+
- [When _exactly_ do I need to use a paid Esri developer account to deploy to production?](https://github.com//Esri/esri-leaflet/wiki/FAQ#deployment-plan)
8484

8585
## Issues
8686

87-
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).
87+
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).
8888

8989
If you're looking for help you can also find answers on [Stack Overflow](https://stackoverflow.com/questions/tagged/esri-oss) and [GeoNet](https://community.esri.com/groups/esri-leaflet/activity).
9090

@@ -103,13 +103,14 @@ If you'd like to inspect and modify the source of Esri Leaflet, follow the instr
103103

104104
### Dependencies
105105

106-
* Esri Leaflet [1.x](https://github.com/Esri/esri-leaflet/releases/tag/v1.0.4) (available on [CDN](https://unpkg.com/[email protected])) can be used in apps alongside:
107-
* [Leaflet](http://leafletjs.com) version 0.7.x.
106+
- Esri Leaflet [1.x](https://github.com/Esri/esri-leaflet/releases/tag/v1.0.4) (available on [CDN](https://unpkg.com/[email protected])) can be used in apps alongside:
107+
108+
- [Leaflet](http://leafletjs.com) version 0.7.x.
108109

109-
* Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.8) (available on [CDN](https://unpkg.com/[email protected])) can be used in apps alongside:
110-
* [Leaflet](http://leafletjs.com) version 1.x.
110+
- Esri Leaflet [2.x](https://github.com/Esri/esri-leaflet/releases/tag/v2.0.8) (available on [CDN](https://unpkg.com/[email protected])) can be used in apps alongside:
111+
- [Leaflet](http://leafletjs.com) version 1.x.
111112

112-
The `master` branch of this repository is *only* compatible with Leaflet 1.x.
113+
The `master` branch of this repository is _only_ compatible with Leaflet 1.x.
113114

114115
### Versioning
115116

@@ -125,21 +126,21 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
125126

126127
If you're using Esri [content and services](https://developers.arcgis.com/documentation/mapping-apis-and-services/services/), you'll need to license your usage with an API key or an ArcGIS identity. Full details can be found here: [Deployment guidelines](https://developers.arcgis.com/documentation/mapping-apis-and-services/deployment/).
127128

128-
If you display an ArcGIS Online service in **any** Leaflet application, we require that you include Esri attribution and recognize data providers. Using this plugin, it couldn't be easier to follow the terms. Just select your basemap and the appropriate credits will be displayed dynamically in Leaflet's own [Attribution control](http://leafletjs.com/reference.html#control-attribution) as users pan/zoom.
129+
If you display an ArcGIS Online service in **any** Leaflet application, we require that you include Esri attribution and recognize data providers. Using this plugin, it couldn't be easier to follow the terms. Just select your basemap and the appropriate credits will be displayed dynamically in Leaflet's own [Attribution control](http://leafletjs.com/reference.html#control-attribution) as users pan/zoom.
129130

130131
```js
131-
L.esri.basemapLayer('Topographic').addTo(map);
132+
L.esri.basemapLayer("Topographic").addTo(map);
132133
```
133134

134135
![attribution](https://raw.github.com/Esri/esri-leaflet/master/attribution.png)
135136

136-
* [Esri Attribution Requirements](https://developers.arcgis.com/documentation/mapping-apis-and-services/deployment/basemap-attribution/)
137-
* [Licensing & Attribution](https://developers.arcgis.com/documentation/mapping-apis-and-services/deployment/)
137+
- [Esri Attribution Requirements](https://developers.arcgis.com/documentation/mapping-apis-and-services/deployment/basemap-attribution/)
138+
- [Licensing & Attribution](https://developers.arcgis.com/documentation/mapping-apis-and-services/deployment/)
138139

139140
### Credit
140141

141-
* `L.esri.DynamicMapLayer` originally used code from [AGS.Layer.Dynamic.js](https://github.com/sanborn/leaflet-ags/blob/master/src/AGS.Layer.Dynamic.js)
142-
* `L.esri.TiledMapLayer` adapts some code from [arcgis-level-fixer](https://github.com/gisinc/arcgis-level-fixer)
142+
- `L.esri.DynamicMapLayer` originally used code from [AGS.Layer.Dynamic.js](https://github.com/sanborn/leaflet-ags/blob/master/src/AGS.Layer.Dynamic.js)
143+
- `L.esri.TiledMapLayer` adapts some code from [arcgis-level-fixer](https://github.com/gisinc/arcgis-level-fixer)
143144

144145
### License
145146

RELEASE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
- Push commit to master
77
- Run `npm whoami`, making sure you're logged in properly to NPM. If not, `npm login`.
88
- If you have GitHub 2FA enabled (you should!), you may need to set an environmental variable with a GitHub [personal access token](https://github.com/settings/tokens) (with "repo access" scope) (`export GH_RELEASE_GITHUB_API_TOKEN="..."`)
9-
- Run `npm run release` (or on Windows, run `scripts/release.sh` from a bash-compatible terminal like Git Bash, Windows Subsystem for Linux, etc)
10-
9+
- Run `npm run release` (or on Windows, run `scripts/release.sh` from a bash-compatible terminal like Git Bash, Windows Subsystem for Linux, etc)
1110

1211
After that's all complete, you can do these later at your leisure:
1312

0 commit comments

Comments
 (0)