Backport PR #7724

---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <[email protected]> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <[email protected]> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <[email protected]> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <[email protected]> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <[email protected]> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <[email protected]> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <[email protected]> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <[email protected]> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <[email protected]> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <[email protected]> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <[email protected]> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <[email protected]> on 2016-07-19T17:39:40Z

src/cli/serve/read_yaml_config.js

@@ -32,6 +32,11 @@ let legacySettingMap = {
   request_timeout: 'elasticsearch.requestTimeout',
   shard_timeout: 'elasticsearch.shardTimeout',
   startup_timeout: 'elasticsearch.startupTimeout',
+  tilemap_url: 'tilemap.url',
+  tilemap_min_zoom: 'tilemap.options.minZoom',
+  tilemap_max_zoom: 'tilemap.options.maxZoom',
+  tilemap_attribution: 'tilemap.options.attribution',
+  tilemap_subdomains: 'tilemap.options.subdomains',
   verify_ssl: 'elasticsearch.ssl.verify',
 };
 

src/plugins/kibana/index.js

@@ -38,7 +38,8 @@ module.exports = function (kibana) {
           let config = server.config();
 
           return {
-            kbnDefaultAppId: config.get('kibana.defaultAppId')
+            kbnDefaultAppId: config.get('kibana.defaultAppId'),
+            tilemap: config.get('tilemap')
           };
         }
       },

src/plugins/testsBundle/testsEntryTemplate.js

@@ -27,7 +27,15 @@ window.__KBN__ = {
     kbnIndex: '.kibana',
     esShardTimeout: 1500,
     esApiVersion: '2.0',
-    esRequestTimeout: '300000'
+    esRequestTimeout: '300000',
+    tilemap: {
+      url: 'https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?my_app_name=kibana&my_app_version=1.2.3&elastic_tile_service_tos=agree',
+      options: {
+        minZoom: 1,
+        maxZoom: 7,
+        attribution: '© [Elastic Tile Service](https://www.elastic.co/elastic_tile_service)'
+      }
+    }
   }
 };
 

src/server/config/schema.js

@@ -8,6 +8,8 @@ let fromRoot = utils('fromRoot');
 const randomBytes = require('crypto').randomBytes;
 const getData = require('../path').getData;
 
+import pkg from '../../../src/utils/packageJson';
+
 module.exports = () => Joi.object({
   pkg: Joi.object({
     version: Joi.string().default(Joi.ref('$version')),
@@ -119,6 +121,21 @@ module.exports = () => Joi.object({
 
   status: Joi.object({
     allowAnonymous: Joi.boolean().default(false)
+  }).default(),
+
+  tilemap: Joi.object({
+    url: Joi.string().default(`https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?my_app_name=kibana&my_app_version=${pkg.version}&elastic_tile_service_tos=agree`),
+    options: Joi.object({
+      attribution: Joi.string().default('© [Elastic Tile Service](https://www.elastic.co/elastic-tile-service)'),
+      minZoom: Joi.number().min(1, 'Must not be less than 1').default(1),
+      maxZoom: Joi.number().default(7),
+      tileSize: Joi.number(),
+      subdomains: Joi.array().items(Joi.string()).single(),
+      errorTileUrl: Joi.string().uri(),
+      tms: Joi.boolean(),
+      reuseTiles: Joi.boolean(),
+      bounds: Joi.array().items(Joi.array().items(Joi.number()).min(2).required()).min(2)
+    }).default()
   }).default()
 
 }).default();

src/ui/public/vislib/styles/_tilemap.less

@@ -158,6 +158,10 @@
 .leaflet-control-attribution {
   background-color: @tilemap-leaflet-footer-bg !important;
   color: @tilemap-leaflet-footer-color !important;
+
+  p {
+    display: inline;
+  }
 }
 
 .leaflet-left {

src/ui/public/vislib/visualizations/_map.js

@@ -1,21 +1,24 @@
 define(function (require) {
-  return function MapFactory(Private) {
+  return function MapFactory(Private, tilemap) {
     let _ = require('lodash');
     let $ = require('jquery');
     let L = require('leaflet');
+    let marked = require('marked');
+    marked.setOptions({
+      gfm: true, // Github-flavored markdown
+      sanitize: true // Sanitize HTML tags
+    });
 
     let defaultMapZoom = 2;
     let defaultMapCenter = [15, 5];
     let defaultMarkerType = 'Scaled Circle Markers';
 
+    let tilemapOptions = tilemap.options;
+    let attribution = marked(tilemapOptions.attribution);
+
     let mapTiles = {
-      url: 'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpeg',
-      options: {
-        attribution: 'Tiles by <a href="http://www.mapquest.com/">MapQuest</a> &mdash; ' +
-          'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
-          '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-        subdomains: '1234'
-      }
+      url: tilemap.url,
+      options: _.assign({}, tilemapOptions, { attribution })
     };
 
     let markerTypes = {
@@ -47,8 +50,8 @@ define(function (require) {
       this._attr = params.attr || {};
 
       let mapOptions = {
-        minZoom: 1,
-        maxZoom: 18,
+        minZoom: tilemapOptions.minZoom,
+        maxZoom: tilemapOptions.maxZoom,
         noWrap: true,
         maxBounds: L.latLngBounds([-90, -220], [90, 220]),
         scrollWheelZoom: false,
@@ -261,9 +264,18 @@ define(function (require) {
     TileMapMap.prototype._createMap = function (mapOptions) {
       if (this.map) this.destroy();
 
+      if (this._attr.wms && this._attr.wms.enabled) {
+        _.assign(mapOptions, {
+          minZoom: 1,
+          maxZoom: 18
+        });
+      }
+
+      const savedZoom = _.get(this._geoJson, 'properties.zoom');
+
       // get center and zoom from mapdata, or use defaults
       this._mapCenter = _.get(this._geoJson, 'properties.center') || defaultMapCenter;
-      this._mapZoom = _.get(this._geoJson, 'properties.zoom') || defaultMapZoom;
+      this._mapZoom = Math.max(Math.min(savedZoom || defaultMapZoom, mapOptions.maxZoom), mapOptions.minZoom);
 
       // add map tiles layer, using the mapTiles object settings
       if (this._attr.wms && this._attr.wms.enabled) {