From f442f225d016673ccf8a41f6e19678930a27b63c Mon Sep 17 00:00:00 2001
From: john gravois <jgravois@esri.com>
Date: Wed, 14 Sep 2016 10:44:43 -0700
Subject: [PATCH] display 'Powered by Esri' (#134)

* display consistent Esri attribution

* bump dependencies
---
 debug/sample.html                     | 5 ++++-
 package.json                          | 4 ++--
 spec/Controls/GeosearchSpec.js        | 2 +-
 src/Controls/Geosearch.js             | 4 ++++
 src/Providers/ArcgisOnlineGeocoder.js | 3 +--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debug/sample.html b/debug/sample.html
index 42d02fc..d867e64 100644
--- a/debug/sample.html
+++ b/debug/sample.html
@@ -29,7 +29,10 @@
 
     <script>
       var map = L.map('map').setView([37.74, -121.62], 9);
-      var tiles = L.esri.basemapLayer('Topographic').addTo(map);
+      // var tiles = L.esri.basemapLayer('Topographic').addTo(map);
+      L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
+      }).addTo(map);
 
       var searchControl = L.esri.Geocoding.geosearch({
         providers: [
diff --git a/package.json b/package.json
index 6143df5..09159ec 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "John Gravois <jgravois@esri.com> (http://johngravois.com)"
   ],
   "dependencies": {
-    "esri-leaflet": "^2.0.0",
-    "leaflet": "^1.0.0-rc.1"
+    "esri-leaflet": "^2.0.3",
+    "leaflet": "^1.0.0-rc.3"
   },
   "devDependencies": {
     "chai": "2.3.0",
diff --git a/spec/Controls/GeosearchSpec.js b/spec/Controls/GeosearchSpec.js
index 6d86329..6b05ef6 100644
--- a/spec/Controls/GeosearchSpec.js
+++ b/spec/Controls/GeosearchSpec.js
@@ -68,7 +68,7 @@ describe('L.esri.Geosearch', function () {
         ]
     }).addTo(map);
 
-    expect(map.attributionControl._container.innerHTML).to.contain('Geocoding by Esri');
+    expect(map.attributionControl._container.innerHTML).to.contain('Powered by');
   });
 
   it('should correctly build the searchExtent for the provider', function (done) {
diff --git a/src/Controls/Geosearch.js b/src/Controls/Geosearch.js
index f17dc54..cc5b585 100644
--- a/src/Controls/Geosearch.js
+++ b/src/Controls/Geosearch.js
@@ -1,5 +1,6 @@
 import L from 'leaflet';
 import { geosearchCore } from '../Classes/GeosearchCore';
+import { Util } from 'esri-leaflet';
 
 export var Geosearch = L.Control.extend({
   includes: L.Mixin.Events,
@@ -165,6 +166,9 @@ export var Geosearch = L.Control.extend({
   },
 
   onAdd: function (map) {
+    // include 'Powered by Esri' in map attribution
+    Util.setEsriAttribution(map);
+
     this._map = map;
     this._wrapper = L.DomUtil.create('div', 'geocoder-control ' + ((this.options.expanded) ? ' ' + 'geocoder-control-expanded' : ''));
     this._input = L.DomUtil.create('input', 'geocoder-control-input leaflet-bar', this._wrapper);
diff --git a/src/Providers/ArcgisOnlineGeocoder.js b/src/Providers/ArcgisOnlineGeocoder.js
index fff50c5..a0b25bc 100644
--- a/src/Providers/ArcgisOnlineGeocoder.js
+++ b/src/Providers/ArcgisOnlineGeocoder.js
@@ -3,8 +3,7 @@ import { GeocodeService } from '../Services/Geocode';
 export var ArcgisOnlineProvider = GeocodeService.extend({
   options: {
     label: 'Places and Addresses',
-    maxResults: 5,
-    attribution: '<a href="https://developers.arcgis.com/en/features/geocoding/">Geocoding by Esri</a>'
+    maxResults: 5
   },
 
   suggestions: function (text, bounds, callback) {