Skip to content

Commit

Permalink
merge proofreading changes
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickarlt committed Jun 17, 2014
2 parents e6825f9 + a8f7d63 commit f5cfadc
Show file tree
Hide file tree
Showing 30 changed files with 95 additions and 95 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
* `L.esri.ClusteredFeatureLayer` and `L.esri.HeatMapFeatureLayer` now inherit from `L.`L.esri.FeatureManager` so they share many new methods and options.
* `L.esri.FeatureLayer`, `L.esri.ClusteredFeatureLayer` and `L.esri.HeatMapFeatureLayer` now support time enabled service via `from`, `to`, `timeFields` and `timeFilterMode` options and `setTimeRange(from, to)` and `getTimeRange()` methods.
* `L.esri.FeatureLayer`, `L.esri.ClusteredFeatureLayer` and `L.esri.HeatMapFeatureLayer` now support `where` options and have new methods for `setWhere()` and `getWhere()` to perform filtering.
* `L.esri.FeatureLayer` now supports generalizing polygon and polyline features on the service side for performence using the new `simplifyFactor` option.
* `L.esri.FeatureLayer` now supports generalizing polygon and polyline features on the service side for performance using the new `simplifyFactor` option.
* Don't throw errors when `L.esri.BasemapLayer` is added to maps without an attribution control. If you do not add attribution you must handle adding attribution your self to the map.
* Remove rbush. Switch to tracking feature ids with the cell key system.
* Remove `L.esri.Util.geojsonBounds` as it was only being used to create bounds and envelopes for rbush.
* add `bindPopup` method to `L.esri.DynamicMapLayer`.
* add `getTimeRange` and `setTimeRange` methods `L.esri.DynamicMapLayer`.
* New `L.esri.Services` namespace to handle generic abstraction of interacting with ArcGIS Online and ArcGIS server services.
* new `L.esri.Services.Service` base class that can be used for interacting with any service. All `L.esri.Layers` classes now uses `L.esri.Services.Service` internally for their API requests. This class also abstracts authentication and proxying.s
* new `L.esri.Services.Service` base class that can be used for interacting with any service. All `L.esri.Layers` classes now uses `L.esri.Services.Service` internally for their API requests. This class also abstracts authentication and proxying.
* new `L.esri.Services.FeatureLayer` class for interacting with the Feature Layer API.
* new `L.esri.Services.MapService` class for interacting with the Map Server API.
* new `L.esri.Tasks` namespace for tasks that map to individual API methods.
Expand Down Expand Up @@ -64,6 +64,6 @@

* Improve DynamicMapLayer panning and zooming performance. #137
* FeatureLayer and ClusteredFeatureLayer can now load features from map services. Thanks to @odoe and @jgravois.
* FeatureLayer, DynamicMapLayer and ClusteredFeatureLayer all accept a token option for accessing services that require authentication and fire a authenticationrequired event when they encounter a need for a token. Thanks to @aaronpk for the Oauth demos. #139
* FeatureLayer, DynamicMapLayer and ClusteredFeatureLayer all accept a token option for accessing services that require authentication and fire a `authenticationrequired` event when they encounter a need for a token. Thanks to @aaronpk for the Oauth demos. #139
* Add DarkGray and DarkGrayLabels to BasemapLayer. #190
* An attributionControl on maps is now required when using BasemapLayer. #159
* An attributionControl on maps is now required when using BasemapLayer. #159
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Esri Leaflet

Leaflet plugin for [ArcGIS Services](http://developers.arcgis.com). Currently Esri Leaflet supports loading Esri [basemaps](http://esri.github.io/esri-leaflet/examples/switching-basemaps.html) and [feature services](http://esri.github.io/esri-leaflet/examples/simple-feature-layer.html), as well as [tiled](http://esri.github.io/esri-leaflet/examples/tile-layer-2.html) and [dynamic](http://esri.github.io/esri-leaflet/examples/simple-dynamic-map-layer.html) map services.
Leaflet plugins for [ArcGIS Services](http://developers.arcgis.com). Currently Esri Leaflet supports loading Esri [basemaps](http://esri.github.io/esri-leaflet/examples/switching-basemaps.html) and [feature services](http://esri.github.io/esri-leaflet/examples/simple-feature-layer.html), as well as [tiled](http://esri.github.io/esri-leaflet/examples/tile-layer-2.html) and [dynamic](http://esri.github.io/esri-leaflet/examples/simple-dynamic-map-layer.html) map services.

The goal of Esri Leaflet is **not** to replace the [ArcGIS API for JavaScript](https://developers.arcgis.com/en/javascript/), but rather to provide small components to allow developers to build mapping applications with Leaflet.

Expand Down Expand Up @@ -73,7 +73,7 @@ Make Sure you have the [Grunt CLI](http://gruntjs.com/getting-started) installed

1. [Fork and clone Esri Leaflet](https://help.github.com/articles/fork-a-repo)
2. `cd` into the `esri-leaflet` folder
5. Install the dependancies with `npm install`
5. Install the dependencies with `npm install`
5. run `grunt` from the command line. This will start the web server locally at [http://localhost:8001](http://localhost:8001) and start watching the source files and running linting and testing commands.
6. Make your changes and create a [pull request](https://help.github.com/articles/creating-a-pull-request)

Expand Down Expand Up @@ -112,7 +112,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
> http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -123,4 +123,4 @@ limitations under the License.
A copy of the license is available in the repository's [license.txt]( https://raw.github.com/Esri/esri-leaflet/master/license.txt) file.

[](Esri Tags: ArcGIS Web Mapping Leaflet)
[](Esri Language: JavaScript)
[](Esri Language: JavaScript)
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",
"version": "0.0.1-beta.5",
"description": "Leaflet Plugins for consuming ArcGIS Online and ArcGIS Server services",
"description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services",
"main": "dist/esri-leaflet.js",
"devDependencies": {
"grunt": "^0.4.2",
Expand Down Expand Up @@ -42,4 +42,4 @@
"license": "Apache",
"readmeFilename": "README.md",
"dependencies": {}
}
}
2 changes: 1 addition & 1 deletion site/source/pages/api-reference/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ layout: documentation.hbs

### L.esri.Layers

Layers provide visualization capabilites for data hosted in Feautre Services and Map Services.
Layers provide visualization capabilities for data hosted in Feature Services and Map Services.

* [`L.esri.Layers.BasemapLayer`]({{assets}}api-reference/layers/basemap-layer.html)
* [`L.esri.Layers.DynamicMapLayer`]({{assets}}api-reference/layers/dynamic-map-layer.html)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ More information about Feature Layers can be found in the [`L.esri.Layers.Featur
<tr>
<td><code>precision</code></td>
<td><code>Integer</code></td>
<td>How many digits of precision to request from the server. <a href="http://en.wikipedia.org/wiki/Decimal_degrees">Wikipedia</a> has a great referance of digit precision to meters.</td>
<td>How many digits of precision to request from the server. <a href="http://en.wikipedia.org/wiki/Decimal_degrees">Wikipedia</a> has a great reference of digit precision to meters.</td>
</tr>
<tr>
<td><code>token</code></td>
Expand All @@ -100,7 +100,7 @@ More information about Feature Layers can be found in the [`L.esri.Layers.Featur
<tr>
<td><code>proxy</code></td>
<td><code>String</code></td>
<td>URL of an <a href="https://developers.arcgis.com/javascript/jshelp/ags_proxy.html">ArcGIS API for JavaScript proxies</a> or <a href="https://github.com/Esri/resource-proxy">ArcGIS Resoruce Proxies</a> to use for proxying POST requests.</td>
<td>URL of an <a href="https://developers.arcgis.com/javascript/jshelp/ags_proxy.html">ArcGIS API for JavaScript proxies</a> or <a href="https://github.com/Esri/resource-proxy">ArcGIS Resource Proxies</a> to use for proxying POST requests.</td>
</tr>
<tr>
<td><code>useCORS</code></td>
Expand Down Expand Up @@ -147,7 +147,7 @@ In additon to these events `L.esri.FeatureLayer` also fires the following [Mouse
<tr>
<td><code>setStyle({{{param 'PathOptions' 'style' 'http://leafletjs.com/reference.html#path-options'}}})</code><br><br><code>setStyle({{{param 'Function' 'style'}}})</code></td>
<td><code>this</code></td>
<td>Sets the given path options to each layer that has a <code>setStyle</code> method. Can also be a <code>Function</code> that will recive a <code>feature</code> argument and should return <a href="http://leafletjs.com/reference.html#path-options">Path Options</a>
<td>Sets the given path options to each layer that has a <code>setStyle</code> method. Can also be a <code>Function</code> that will receive a <code>feature</code> argument and should return <a href="http://leafletjs.com/reference.html#path-options">Path Options</a>
<pre><code class="language-javascript">featureLayer.setStyle(1, {
color: white;
})</code></pre>
Expand Down Expand Up @@ -240,7 +240,7 @@ In additon to these events `L.esri.FeatureLayer` also fires the following [Mouse
<td>
Adds a new feature to the feature layer. this also adds the feature to the map if creation is successful.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Create</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand All @@ -251,7 +251,7 @@ In additon to these events `L.esri.FeatureLayer` also fires the following [Mouse
<td>
Update the provided feature on the Feature Layer. This also updates the feature on the map.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Update</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand All @@ -262,7 +262,7 @@ In additon to these events `L.esri.FeatureLayer` also fires the following [Mouse
<td>
Remove the feature with the provided id from the feature layer. This will also remove the feature from the map if it exists.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Update</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand Down Expand Up @@ -292,4 +292,4 @@ var busStops = new L.esri.ClusteredFeatureLayer(url, {
});
}
}).addTo(map);
```
```
6 changes: 3 additions & 3 deletions site/source/pages/api-reference/layers/dynamic-map-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Option | Type | Default | Description
`opacity` | `Integer` | `1` | Opacity of the layer. Should be a value between 0 and 1.
`position` | `String` | '"front"` | position of the layer relative to other overlays
`token` | `String` | `null` | If you pass a token in your options it will included in all requests to the service. See [working with authenticated services](#working-with-authenticated-services) for more information.
`proxy` | `String` | `false` | URL of an [ArcGIS API for JavaScript proxies](https://developers.arcgis.com/javascript/jshelp/ags_proxy.html) or [ArcGIS Resoruce Proxies](https://github.com/Esri/resource-proxy) to use for proxying POST requests.
`proxy` | `String` | `false` | URL of an [ArcGIS API for JavaScript proxies](https://developers.arcgis.com/javascript/jshelp/ags_proxy.html) or [ArcGIS Resource Proxies](https://github.com/Esri/resource-proxy) to use for proxying POST requests.
`useCORS` | `Boolean` | `true` | If this service should use CORS when making GET requests.

### Methods
Expand Down Expand Up @@ -120,7 +120,7 @@ Option | Type | Default | Description
<tr>
<td><code>setTimeRange({{{param 'Date' 'from'}}}, {{{param 'Date' 'to'}}})</code></td>
<td><code>this</code></td>
<td>Redraws the layer witht he passed time range.</td>
<td>Redraws the layer with he passed time range.</td>
</tr>
<tr>
<td><code>getTimeOptions()</code></td>
Expand Down Expand Up @@ -184,4 +184,4 @@ L.esri.dynamicMapLayer(url, {
opacity : 0.25
}).addTo(map);

```
```
14 changes: 7 additions & 7 deletions site/source/pages/api-reference/layers/feature-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ You can create a new empty feature service witha single layer on the [ArcGIS fo
<tr>
<td><code>precision</code></td>
<td><code>Integer</code></td>
<td>How many digits of precision to request from the server. <a href="http://en.wikipedia.org/wiki/Decimal_degrees">Wikipedia</a> has a great referance of digit precision to meters.</td>
<td>How many digits of precision to request from the server. <a href="http://en.wikipedia.org/wiki/Decimal_degrees">Wikipedia</a> has a great reference of digit precision to meters.</td>
</tr>
<tr>
<td><code>token</code></td>
Expand All @@ -116,7 +116,7 @@ You can create a new empty feature service witha single layer on the [ArcGIS fo
<tr>
<td><code>proxy</code></td>
<td><code>String</code></td>
<td>URL of an <a href="https://developers.arcgis.com/javascript/jshelp/ags_proxy.html">ArcGIS API for JavaScript proxies</a> or <a href="https://github.com/Esri/resource-proxy">ArcGIS Resoruce Proxies</a> to use for proxying POST requests.</td>
<td>URL of an <a href="https://developers.arcgis.com/javascript/jshelp/ags_proxy.html">ArcGIS API for JavaScript proxies</a> or <a href="https://github.com/Esri/resource-proxy">ArcGIS Resource Proxies</a> to use for proxying POST requests.</td>
</tr>
<tr>
<td><code>useCORS</code></td>
Expand Down Expand Up @@ -151,7 +151,7 @@ In additon to these events `L.esri.Layer.FeatureLayer` also fires the following
<tr>
<td><code>setStyle({{{param 'PathOptions' 'style' 'http://leafletjs.com/reference.html#path-options'}}})</code><br><br><code>setStyle({{{param 'Function' 'style'}}})</code></td>
<td><code>this</code></td>
<td>Sets the given path options to each layer that has a <code>setStyle</code> method. Can also be a <code>Function</code> that will recive a <code>feature</code> argument and should return <a href="http://leafletjs.com/reference.html#path-options">Path Options</a>
<td>Sets the given path options to each layer that has a <code>setStyle</code> method. Can also be a <code>Function</code> that will receive a <code>feature</code> argument and should return <a href="http://leafletjs.com/reference.html#path-options">Path Options</a>
<pre><code class="language-javascript">featureLayer.setStyle(1, {
color: white;
})</code></pre>
Expand Down Expand Up @@ -256,7 +256,7 @@ In additon to these events `L.esri.Layer.FeatureLayer` also fires the following
<td>
Adds a new feature to the feature layer. this also adds the feature to the map if creation is successful.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Create</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand All @@ -267,7 +267,7 @@ In additon to these events `L.esri.Layer.FeatureLayer` also fires the following
<td>
Update the provided feature on the Feature Layer. This also updates the feature on the map.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Update</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand All @@ -278,7 +278,7 @@ In additon to these events `L.esri.Layer.FeatureLayer` also fires the following
<td>
Remove the feature with the provided id from the feature layer. This will also remove the feature from the map if it exists.
<ul>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the srevice.</li>
<li>Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.</li>
<li>Requires the <code>Update</code> capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities in the metadata.</li>
</ul>
</td>
Expand All @@ -294,4 +294,4 @@ var map = L.map('map').setView([45.53,-122.64], 14);
L.esri.basemapLayer("Streets").addTo(map);

var busStops = L.esri.featureLayer('http://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/services/stops/FeatureServer/0/').addTo(map);
```
```
Loading

0 comments on commit f5cfadc

Please sign in to comment.