Merge pull request #1407 from MarkTorrey/tiledmaplayer-add-apikey

Add apikey prop to TiledMapLayer

Author: gavinr-maps

spec/Layers/TiledMapLayerSpec.js

@@ -131,6 +131,15 @@ describe('L.esri.TiledMapLayer', function () {
     expect(layer.tileUrl).to.equal('http://services.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/{z}/{y}/{x}?foo=bar');
   });
 
+  it('should use an apikey passed in options', function () {
+    layer = L.esri.tiledMapLayer({
+      url: url,
+      apikey: 'abc123'
+    });
+
+    expect(layer.tileUrl).to.equal('http://services.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/{z}/{y}/{x}?token=abc123');
+  });
+
   it('should use a token passed with authenticate()', function () {
     layer = L.esri.tiledMapLayer({
       url: url

src/Layers/TiledMapLayer.js

@@ -40,6 +40,11 @@ export var TiledMapLayer = TileLayer.extend({
   initialize: function (options) {
     options = Util.setOptions(this, options);
 
+    // support apikey property being passed in
+    if (options.apikey) {
+      options.token = options.apikey;
+    }
+
     // set the urls
     options = getUrlParams(options);
     this.tileUrl = (options.proxy ? options.proxy + '?' : '') + options.url + 'tile/{z}/{y}/{x}' + (options.requestParams && Object.keys(options.requestParams).length > 0 ? Util.getParamString(options.requestParams) : '');