[backport] PR #7724 to 4.x

elastic · Jul 13, 2016 · c989ff8 · c989ff8
1 parent 408f684
commit c989ff8
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/src/plugins/kibana/index.js b/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')
           };
         }
       },

diff --git a/src/plugins/testsBundle/testsEntryTemplate.js b/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?elastic_tile_service_tos=agree&my_app_name=kibana',
+      options: {
+        minZoom: 0,
+        maxZoom: 7,
+        attribution: '© [Elastic Tile Service](https://www.elastic.co/elastic_tile_service)'
+      }
+    }
   }
 };
 

diff --git a/src/server/config/schema.js b/src/server/config/schema.js
@@ -119,6 +119,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?elastic_tile_service_tos=agree&my_app_name=kibana'),
+    options: Joi.object({
+      attribution: Joi.string().default('© [Elastic Tile Service](https://www.elastic.co/elastic_tile_service)'),
+      minZoom: Joi.number().default(0),
+      maxZoom: Joi.number().default(7),
+      tileSize: Joi.number().optional(),
+      subdomains: Joi.array().items(Joi.string()).single().optional(),
+      errorTileUrl: Joi.string().uri().optional(),
+      tms: Joi.boolean().optional(),
+      reuseTiles: Joi.boolean().optional(),
+      bounds: Joi.array().items(Joi.array().items(Joi.number()).min(2).required()).min(2).optional()
+    }).default()
   }).default()
 
 }).default();
diff --git a/src/ui/public/vislib/styles/_tilemap.less b/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 {

diff --git a/src/ui/public/vislib/visualizations/_map.js b/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,