Skip to content

Commit

Permalink
Merge pull request #25 from ngoldman/master
Browse files Browse the repository at this point in the history
Fix repo
  • Loading branch information
patrickarlt committed Feb 25, 2014
2 parents 62921c0 + 744b68e commit 0851da7
Show file tree
Hide file tree
Showing 14 changed files with 74 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = function(grunt) {
options: {
banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> Environmental Systems Research Institute, Inc.\n' +
'* Apache License' +
'* Apache 2.0 License ' +
'*/\n\n'
},
js: {
Expand Down Expand Up @@ -65,7 +65,7 @@ module.exports = function(grunt) {
expand: true,
cwd: 'src/',
src: ['img/*.{png,jpg,gif}'],
dest: 'dist/img'
dest: 'dist/'
}]
}
},
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ Take a look at the live demo at http://esri.github.io/esri-leaflet-geocoder/
var map = L.map('map').setView([45.5165, -122.6764], 12);
var tiles = L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png").addTo(map);
// create the geocoding control and add it to the map
var searchControl = new L.esri.Controls.Geosearch().addTo(map);
// create an empty layer group to store the results and add it to the map
var results = new L.LayerGroup().addTo(map);
// listen for the results event and add every result to the map
searchControl.on("results", function(data){
results.clearLayers();
Expand Down Expand Up @@ -108,7 +108,7 @@ For reference here is the internal structure of the geocoder...

```html
<div class="geocoder-control leaflet-control">

<input class="geocoder-control-input leaflet-bar">

<ul class="geocoder-control-suggestions leaflet-bar">
Expand Down Expand Up @@ -157,7 +157,7 @@ Constructor | Options | Description
Option | Type | Default | Description
--- | --- | --- | ---
`url` | `String` | `<WorldGeocodeServiceURL>` | Defaults to the ArcGIS World Geocoding service.
`outFields`| `String` | "Subregion, Region, PlaceName, Match_addr, Country, Addr_type, City, Place_addr" | The fields from the service that you would like returned.
`outFields`| `String` | "Subregion, Region, PlaceName, Match_addr, Country, Addr_type, City, Place_addr" | The fields from the service that you would like returned.

### Methods

Expand Down Expand Up @@ -226,15 +226,15 @@ 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,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
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.
A copy of the license is available in the repository's [license.txt]( https://raw.github.com/Esri/esri-leaflet-geocoder/master/license.txt) file.

[](Esri Tags: ArcGIS Web Mapping Leaflet Geocoding)
[](Esri Language: JavaScript)
4 changes: 2 additions & 2 deletions dist/esri-leaflet-geocoder-src.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! esri-leaflet-geocoder - v0.0.1 - 2014-02-25
/*! esri-leaflet-geocoder - v0.0.1-beta.2 - 2014-02-25
* Copyright (c) 2014 Environmental Systems Research Institute, Inc.
* Apache License*/
* Apache 2.0 License */

.geocoder-control-input {
background-color: white;
Expand Down
4 changes: 2 additions & 2 deletions dist/esri-leaflet-geocoder-src.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! esri-leaflet-geocoder - v0.0.1 - 2014-02-25
/*! esri-leaflet-geocoder - v0.0.1-beta.2 - 2014-02-25
* Copyright (c) 2014 Environmental Systems Research Institute, Inc.
* Apache License*/
* Apache 2.0 License */

(function(L){

Expand Down
4 changes: 2 additions & 2 deletions dist/esri-leaflet-geocoder.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0851da7

Please sign in to comment.