From 02f57d69a1236b3afa7d7260b182e0d9b103b1ad Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 19 Sep 2017 13:11:29 -0400
Subject: [PATCH 01/13] enable turning on/off of warnings

---
 .../region_map/public/region_map_controller.js            | 3 ++-
 src/core_plugins/region_map/public/region_map_vis.js      | 3 ++-
 .../region_map/public/region_map_vis_params.html          | 8 ++++++++
 .../region_map/public/region_map_vis_params.js            | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_controller.js b/src/core_plugins/region_map/public/region_map_controller.js
index 4df872e28ea15..6d9ddadb1f626 100644
--- a/src/core_plugins/region_map/public/region_map_controller.js
+++ b/src/core_plugins/region_map/public/region_map_controller.js
@@ -136,7 +136,8 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
       $scope.vis.API.events.filter({ point: { aggConfigResult: aggConfigResult } });
     });
     choroplethLayer.on('styleChanged', function (event) {
-      if (event.mismatches.length > 0 && config.get('visualization:regionmap:showWarnings')) {
+      const shouldShowWarning = $scope.vis.params.isDisplayWarning && config.get('visualization:regionmap:showWarnings');
+      if (event.mismatches.length > 0 && shouldShowWarning) {
         notify.warning(
           `Could not show ${event.mismatches.length} ${event.mismatches.length > 1 ? 'results' : 'result'} on the map.`
             + ` To avoid this, ensure that each term can be joined to a corresponding shape on that shape's join field.`
diff --git a/src/core_plugins/region_map/public/region_map_vis.js b/src/core_plugins/region_map/public/region_map_vis.js
index cc6a44d23f5a1..24bd8485810ec 100644
--- a/src/core_plugins/region_map/public/region_map_vis.js
+++ b/src/core_plugins/region_map/public/region_map_vis.js
@@ -32,7 +32,8 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps
         addTooltip: true,
         colorSchema: 'Yellow to Red',
         selectedLayer: selectedLayer,
-        selectedJoinField: selectedJoinField
+        selectedJoinField: selectedJoinField,
+        isDisplayWarning: true
       },
       template: regionTemplate,
     },
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 7e5c1dff0231b..8e5270569188c 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -38,6 +38,14 @@
 </div>
 
 <div class="kuiSideBarSection">
+  <div class="kuiSideBarFormRow">
+    <label class="kuiSideBarFormRow__label" for="displayWarnings">
+      Display warnings
+    </label>
+    <div class="kuiSideBarFormRow__control">
+      <input id="displayWarnings" type="checkbox" ng-model="vis.params.isDisplayWarning">
+    </div>
+  </div>
   <div class="kuiSideBarSectionTitle">
     <div class="kuiSideBarSectionTitle__text">Style settings</div>
   </div>
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.js b/src/core_plugins/region_map/public/region_map_vis_params.js
index 9729f359509b0..b2a2bab81dba6 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.js
+++ b/src/core_plugins/region_map/public/region_map_vis_params.js
@@ -43,7 +43,9 @@ uiModules.get('kibana/region_map')
 
           })
           .catch(function (error) {
-            notify.warning(error.message);
+            if ($scope.vis.params.isDisplayWarning) {
+              notify.warning(error.message);
+            }
           });
 
         function onLayerChange() {

From adf6c72290a80afa0c028c715b21046f64d59149 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 19 Sep 2017 13:20:47 -0400
Subject: [PATCH 02/13] add tooltip

---
 src/core_plugins/region_map/public/region_map_vis_params.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 8e5270569188c..a0dd146e95d27 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -41,7 +41,9 @@
   <div class="kuiSideBarFormRow">
     <label class="kuiSideBarFormRow__label" for="displayWarnings">
       Display warnings
+      <kbn-info info="Turns on/of warnings from the Visualization. When turned off, no warning will be shown about terms in the result that could not be joined to the vector layer."></kbn-info>
     </label>
+
     <div class="kuiSideBarFormRow__control">
       <input id="displayWarnings" type="checkbox" ng-model="vis.params.isDisplayWarning">
     </div>

From 9a24aadb9922589baf52809b4f20e5b7e1cc99ef Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 19 Sep 2017 16:35:22 -0400
Subject: [PATCH 03/13] add server setting so users can opt out of connecting
 to the EMS service

---
 .../public/region_map_vis_params.js           | 84 +++++++++++--------
 src/server/config/schema.js                   |  1 +
 2 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.js b/src/core_plugins/region_map/public/region_map_vis_params.js
index b2a2bab81dba6..1caeb114ecc2a 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.js
+++ b/src/core_plugins/region_map/public/region_map_vis_params.js
@@ -1,12 +1,11 @@
-import { uiModules } from 'ui/modules';
+import {uiModules} from 'ui/modules';
 import regionMapVisParamsTemplate from './region_map_vis_params.html';
-import { mapToLayerWithId } from './util';
+import {mapToLayerWithId} from './util';
 
 uiModules.get('kibana/region_map')
-  .directive('regionMapVisParams', function (serviceSettings, Notifier) {
+  .directive('regionMapVisParams', function (serviceSettings, regionmapsConfig, Notifier) {
 
-
-    const notify = new Notifier({ location: 'Region map' });
+    const notify = new Notifier({location: 'Region map'});
 
     return {
       restrict: 'E',
@@ -14,39 +13,54 @@ uiModules.get('kibana/region_map')
       link: function ($scope) {
 
         $scope.collections = $scope.vis.type.editorConfig.collections;
-
         $scope.onLayerChange = onLayerChange;
-        serviceSettings.getFileLayers()
-          .then(function (layersFromService) {
-
-            layersFromService = layersFromService.map(mapToLayerWithId.bind(null, 'elastic_maps_service'));
-            const newVectorLayers = $scope.collections.vectorLayers.slice();
-            for (let i = 0; i < layersFromService.length; i += 1) {
-              const layerFromService = layersFromService[i];
-              const alreadyAdded = newVectorLayers.some((layer) => layerFromService.layerId === layer.layerId);
-              if (!alreadyAdded) {
-                newVectorLayers.push(layerFromService);
+
+        if (regionmapsConfig.includeElasticMapsService) {
+
+          serviceSettings.getFileLayers()
+            .then(function (layersFromService) {
+
+              layersFromService = layersFromService.map(mapToLayerWithId.bind(null, 'elastic_maps_service'));
+              const newVectorLayers = $scope.collections.vectorLayers.slice();
+              for (let i = 0; i < layersFromService.length; i += 1) {
+                const layerFromService = layersFromService[i];
+                const alreadyAdded = newVectorLayers.some((layer) => layerFromService.layerId === layer.layerId);
+                if (!alreadyAdded) {
+                  newVectorLayers.push(layerFromService);
+                }
+              }
+
+              $scope.collections.vectorLayers = newVectorLayers;
+              if ($scope.collections.vectorLayers[0] && !$scope.vis.params.selectedLayer) {
+                $scope.vis.params.selectedLayer = $scope.collections.vectorLayers[0];
+                onLayerChange();
               }
-            }
-
-            $scope.collections.vectorLayers = newVectorLayers;
-            if ($scope.collections.vectorLayers[0] && !$scope.vis.params.selectedLayer) {
-              $scope.vis.params.selectedLayer = $scope.collections.vectorLayers[0];
-              onLayerChange();
-            }
-
-            //the dirty flag is set to true because the change in vector layers config causes an update of the scope.params
-            //temp work-around. addressing this issue with the visualize refactor for 6.0
-            setTimeout(function () {
-              $scope.dirty = false;
-            }, 0);
-
-          })
-          .catch(function (error) {
-            if ($scope.vis.params.isDisplayWarning) {
+
+              //the dirty flag is set to true because the change in vector layers config causes an update of the scope.params
+              //temp work-around. addressing this issue with the visualize refactor for 6.0
+              setTimeout(function () {
+                $scope.dirty = false;
+              }, 0);
+              $scope.collections.vectorLayers = newVectorLayers;
+
+              if ($scope.collections.vectorLayers[0] && !$scope.vis.params.selectedLayer) {
+                $scope.vis.params.selectedLayer = $scope.collections.vectorLayers[0];
+                onLayerChange();
+              }
+
+
+              //the dirty flag is set to true because the change in vector layers config causes an update of the scope.params
+              //temp work-around. addressing this issue with the visualize refactor for 6.0
+              setTimeout(function () {
+                $scope.dirty = false;
+              }, 0);
+
+
+            })
+            .catch(function (error) {
               notify.warning(error.message);
-            }
-          });
+            });
+        }
 
         function onLayerChange() {
           $scope.vis.params.selectedJoinField = $scope.vis.params.selectedLayer.fields[0];
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index e3438e23b611b..c50f42eb623d3 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -188,6 +188,7 @@ export default () => Joi.object({
     }).default()
   }).default(),
   regionmap: Joi.object({
+    includeElasticMapsService: Joi.boolean().default(true),
     layers: Joi.array().items(Joi.object({
       url: Joi.string(),
       type: Joi.string(),

From 50c80575cbb2ac4ce85eb1117f5efeddbe6c62e1 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 19 Sep 2017 18:57:26 -0400
Subject: [PATCH 04/13] replace WMS options with custom directive, so we can
 reuse it in region maps

---
 .../tile_map/public/editors/tile_map.html     | 74 +-----------------
 .../tile_map/public/editors/wms_options.html  | 76 +++++++++++++++++++
 .../tile_map/public/editors/wms_options.js    | 11 +++
 .../tile_map/public/maps_visualization.js     |  2 +-
 4 files changed, 89 insertions(+), 74 deletions(-)
 create mode 100644 src/core_plugins/tile_map/public/editors/wms_options.html
 create mode 100644 src/core_plugins/tile_map/public/editors/wms_options.js

diff --git a/src/core_plugins/tile_map/public/editors/tile_map.html b/src/core_plugins/tile_map/public/editors/tile_map.html
index 903dfd24ad410..378fc891401cd 100644
--- a/src/core_plugins/tile_map/public/editors/tile_map.html
+++ b/src/core_plugins/tile_map/public/editors/tile_map.html
@@ -53,77 +53,5 @@
     </label>
   </div>
 
-  <div class="vis-option-item form-group">
-    <label>
-      <input type="checkbox"
-      name="wms.enabled"
-      ng-model="vis.params.wms.enabled">
-
-      WMS compliant map server
-
-      <kbn-info info="Use WMS compliant map tile server. For advanced users only."></kbn-info>
-    </label>
-  </div>
-
-  <div ng-show="vis.params.wms.enabled" class="well">
-    <div class="vis-option-item form-group">
-        <p>WMS is an OGC standard for map image services. For more information, go <a href="http://www.opengeospatial.org/standards/wms">here</a>.</p>
-        <label>
-          WMS url* <kbn-info info="The URL of the WMS web service."></kbn-info>
-        </label>
-      <input type="text" class="form-control"
-        name="wms.url"
-        ng-model="vis.params.wms.url">
-    </div>
-
-    <div class="vis-option-item form-group">
-      <label>
-        WMS layers* <kbn-info info="A comma seperated list of layers to use."></kbn-info>
-      </label>
-      <input type="text" class="form-control"
-        ng-require="vis.params.wms.enabled"
-        ng-model="vis.params.wms.options.layers"
-        name="wms.options.layers">
-    </div>
-
-    <div class="vis-option-item form-group">
-      <label>
-        WMS version* <kbn-info info="The version of WMS the server supports"></kbn-info>
-      </label>
-      <input type="text" class="form-control"
-        name="wms.options.version"
-        ng-model="vis.params.wms.options.version">
-    </div>
-
-    <div class="vis-option-item form-group">
-      <label>
-        WMS format* <kbn-info info="Usually image/png or image/jpeg. Use png if the server will return transparent layers."></kbn-info>
-      </label>
-      <input type="text" class="form-control"
-        name="wms.options.format"
-        ng-model="vis.params.wms.options.format">
-    </div>
-
-    <div class="vis-option-item form-group">
-      <label>
-        WMS attribution <kbn-info info="Attribution string for the lower right corner."></kbn-info>
-      </label>
-      <input type="text" class="form-control"
-        name="wms.options.attribution"
-        ng-model="vis.params.wms.options.attribution">
-    </div>
-
-    <div class="vis-option-item form-group">
-      <label>
-        WMS styles* <kbn-info info="A comma seperated list of WMS server supported styles to use. Blank in most cases."></kbn-info>
-      </label>
-      <input type="text" class="form-control"
-        name="wms.options.styles"
-        ng-model="vis.params.wms.options.styles">
-    </div>
-
-    <p>* if this parameter is incorrect, maps will fail to load.</p>
-
-
-  </div>
+  <wms-options></wms-options>
 </div>
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.html b/src/core_plugins/tile_map/public/editors/wms_options.html
new file mode 100644
index 0000000000000..82db68026df94
--- /dev/null
+++ b/src/core_plugins/tile_map/public/editors/wms_options.html
@@ -0,0 +1,76 @@
+<div>
+  
+  <div class="vis-option-item form-group">
+    <label>
+      <input type="checkbox"
+             name="wms.enabled"
+             ng-model="vis.params.wms.enabled">
+
+      WMS compliant map server
+
+      <kbn-info info="Use WMS compliant map tile server. For advanced users only."></kbn-info>
+    </label>
+  </div>
+
+  <div ng-show="vis.params.wms.enabled" class="well">
+    <div class="vis-option-item form-group">
+      <p>WMS is an OGC standard for map image services. For more information, go <a href="http://www.opengeospatial.org/standards/wms">here</a>.</p>
+      <label>
+        WMS url* <kbn-info info="The URL of the WMS web service."></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             name="wms.url"
+             ng-model="vis.params.wms.url">
+    </div>
+
+    <div class="vis-option-item form-group">
+      <label>
+        WMS layers* <kbn-info info="A comma seperated list of layers to use."></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             ng-require="vis.params.wms.enabled"
+             ng-model="vis.params.wms.options.layers"
+             name="wms.options.layers">
+    </div>
+
+    <div class="vis-option-item form-group">
+      <label>
+        WMS version* <kbn-info info="The version of WMS the server supports"></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             name="wms.options.version"
+             ng-model="vis.params.wms.options.version">
+    </div>
+
+    <div class="vis-option-item form-group">
+      <label>
+        WMS format* <kbn-info info="Usually image/png or image/jpeg. Use png if the server will return transparent layers."></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             name="wms.options.format"
+             ng-model="vis.params.wms.options.format">
+    </div>
+
+    <div class="vis-option-item form-group">
+      <label>
+        WMS attribution <kbn-info info="Attribution string for the lower right corner."></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             name="wms.options.attribution"
+             ng-model="vis.params.wms.options.attribution">
+    </div>
+
+    <div class="vis-option-item form-group">
+      <label>
+        WMS styles* <kbn-info info="A comma seperated list of WMS server supported styles to use. Blank in most cases."></kbn-info>
+      </label>
+      <input type="text" class="form-control"
+             name="wms.options.styles"
+             ng-model="vis.params.wms.options.styles">
+    </div>
+
+    <p>* if this parameter is incorrect, maps will fail to load.</p>
+
+
+  </div>
+</div>
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.js b/src/core_plugins/tile_map/public/editors/wms_options.js
new file mode 100644
index 0000000000000..b082a16ca0ab1
--- /dev/null
+++ b/src/core_plugins/tile_map/public/editors/wms_options.js
@@ -0,0 +1,11 @@
+import { uiModules } from 'ui/modules';
+import wmsOptionsTemplate from './wms_options.html';
+const module = uiModules.get('kibana');
+
+module.directive('wmsOptions', function () {
+  return {
+    restrict: 'E',
+    template: wmsOptionsTemplate,
+    replace: true
+  };
+});
diff --git a/src/core_plugins/tile_map/public/maps_visualization.js b/src/core_plugins/tile_map/public/maps_visualization.js
index 232c147af3827..12d0704dd36f7 100644
--- a/src/core_plugins/tile_map/public/maps_visualization.js
+++ b/src/core_plugins/tile_map/public/maps_visualization.js
@@ -1,12 +1,12 @@
 import 'ui/vislib';
 import 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options';
+import './editors/wms_options';
 import $ from 'jquery';
 import _ from 'lodash';
 import { KibanaMap } from './kibana_map';
 import { GeohashLayer } from './geohash_layer';
 import { SearchSourceProvider } from 'ui/courier/data_source/search_source';
 import { VisAggConfigProvider } from 'ui/vis/agg_config';
-// import './lib/service_settings';
 import 'ui/vis/map/service_settings';
 import './styles/_tilemap.less';
 

From 0177d3092220f4025d64f4f8fff3c15114673e0a Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 19 Sep 2017 19:09:13 -0400
Subject: [PATCH 05/13] add wms settings form to Region Map

---
 .../region_map/public/region_map_vis_params.html           | 7 +++++--
 .../region_map/public/region_map_vis_params.js             | 2 ++
 src/core_plugins/tile_map/public/editors/wms_options.html  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index a0dd146e95d27..77636569b05af 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -66,9 +66,12 @@
   </div>
 </div>
 
+
 <div class="kuiSideBarSection">
   <div class="kuiSideBarSectionTitle">
-    <div class="kuiSideBarSectionTitle__text">Basic settings</div>
+    <div class="kuiSideBarSectionTitle__text">
+      Base Layer Settings
+    </div>
   </div>
-  <vislib-basic-options></vislib-basic-options>
+  <wms-options></wms-options>
 </div>
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.js b/src/core_plugins/region_map/public/region_map_vis_params.js
index 1caeb114ecc2a..b9a0c8872a225 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.js
+++ b/src/core_plugins/region_map/public/region_map_vis_params.js
@@ -1,6 +1,8 @@
 import {uiModules} from 'ui/modules';
 import regionMapVisParamsTemplate from './region_map_vis_params.html';
 import {mapToLayerWithId} from './util';
+import '../../tile_map/public/editors/wms_options';
+import _ from 'lodash';
 
 uiModules.get('kibana/region_map')
   .directive('regionMapVisParams', function (serviceSettings, regionmapsConfig, Notifier) {
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.html b/src/core_plugins/tile_map/public/editors/wms_options.html
index 82db68026df94..c23ac730c4ea0 100644
--- a/src/core_plugins/tile_map/public/editors/wms_options.html
+++ b/src/core_plugins/tile_map/public/editors/wms_options.html
@@ -1,5 +1,5 @@
 <div>
-  
+
   <div class="vis-option-item form-group">
     <label>
       <input type="checkbox"

From 5156548a43654d9ceca15e7c1ba4f2d2e86561c6 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Wed, 20 Sep 2017 18:26:23 -0400
Subject: [PATCH 06/13] no need to recreate map after leaflet upgrade

---
 src/core_plugins/tile_map/public/kibana_map.js  |  7 +++++++
 .../tile_map/public/maps_visualization.js       | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/core_plugins/tile_map/public/kibana_map.js b/src/core_plugins/tile_map/public/kibana_map.js
index e5626e8845c88..3afb5f34102c6 100644
--- a/src/core_plugins/tile_map/public/kibana_map.js
+++ b/src/core_plugins/tile_map/public/kibana_map.js
@@ -528,6 +528,13 @@ export class KibanaMap extends EventEmitter {
     this._updateExtent();
   }
 
+  setMinZoom(zoom) {
+    this._leafletMap.setMinZoom(zoom);
+  }
+
+  setMaxZoom(zoom) {
+    this._leafletMap.setMaxZoom(zoom);
+  }
 
   getLeafletBaseLayer() {
     return this._leafletBaseLayer;
diff --git a/src/core_plugins/tile_map/public/maps_visualization.js b/src/core_plugins/tile_map/public/maps_visualization.js
index 12d0704dd36f7..14e93c2d79552 100644
--- a/src/core_plugins/tile_map/public/maps_visualization.js
+++ b/src/core_plugins/tile_map/public/maps_visualization.js
@@ -172,6 +172,7 @@ export function MapsVisualizationProvider(serviceSettings, Notifier, getAppState
      * called on options change (vis.params change)
      */
     async _updateParams() {
+
       const mapParams = this._getMapsParams();
       if (_.eq(this._currentParams, mapParams)) {
         return;
@@ -181,12 +182,13 @@ export function MapsVisualizationProvider(serviceSettings, Notifier, getAppState
       const { minZoom, maxZoom } = this._getMinMaxZoom();
 
       if (mapParams.wms.enabled) {
-        //Switch to WMS
+        // Switch to WMS
         if (maxZoom > this._kibanaMap.getMaxZoomLevel()) {
           //need to recreate the map with less restrictive zoom
+          this._kibanaMap.removeLayer(this._geohashLayer);
           this._geohashLayer = null;
-          this._kibanaMapReady = this._makeKibanaMap();
-          await this._kibanaMapReady;
+          this._kibanaMap.setMinZoom(minZoom);
+          this._kibanaMap.setMaxZoom(maxZoom);
         }
 
         this._kibanaMap.setBaseLayer({
@@ -200,13 +202,13 @@ export function MapsVisualizationProvider(serviceSettings, Notifier, getAppState
         });
       } else {
 
-        //switch to regular
+        // switch to tms
         if (maxZoom < this._kibanaMap.getMaxZoomLevel()) {
           //need to recreate the map with more restrictive zoom level
+          this._kibanaMap.removeLayer(this._geohashLayer);
           this._geohashLayer = null;
-          this._kibanaMapReady = this._makeKibanaMap();
-          await this._kibanaMapReady;
-
+          this._kibanaMap.setMinZoom(minZoom);
+          this._kibanaMap.setMaxZoom(maxZoom);
           if (this._kibanaMap.getZoomLevel() > maxZoom) {
             this._kibanaMap.setZoomLevel(maxZoom);
           }
@@ -221,6 +223,7 @@ export function MapsVisualizationProvider(serviceSettings, Notifier, getAppState
           });
         }
       }
+
       const geohashOptions = this._getGeohashOptions();
       if (!this._geohashLayer || !this._geohashLayer.isReusable(geohashOptions)) {
         this._recreateGeohashLayer(this._chartData);

From 3301dfff4e4e53af880f2d110a21473869b40db4 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Thu, 21 Sep 2017 14:53:47 -0400
Subject: [PATCH 07/13] add WMS map to region map

---
 .../public/region_map_controller.js           | 39 +++++++++++++++----
 .../region_map/public/region_map_vis.js       |  5 ++-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_controller.js b/src/core_plugins/region_map/public/region_map_controller.js
index 6d9ddadb1f626..7df94f469b1b2 100644
--- a/src/core_plugins/region_map/public/region_map_controller.js
+++ b/src/core_plugins/region_map/public/region_map_controller.js
@@ -32,7 +32,6 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
   });
 
   $scope.$watch('esResponse', async function (tableGroup) {
-
     kibanaMapReady.then(() => {
 
       let results;
@@ -52,7 +51,6 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
       }
 
       updateChoroplethLayer($scope.vis.params.selectedLayer.url, $scope.vis.params.selectedLayer.attribution);
-
       const metricsAgg = _.first($scope.vis.getAggConfig().bySchemaName.metric);
       choroplethLayer.setMetrics(results, metricsAgg);
       setTooltipFormatter();
@@ -78,6 +76,10 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
       choroplethLayer.setColorRamp(truncatedColorMaps[visParams.colorSchema]);
       setTooltipFormatter();
 
+
+      updateBaseLayer(visParams);
+
+
       kibanaMap.setShowTooltip(visParams.addTooltip);
       kibanaMap.setLegendPosition(visParams.legendPosition);
       kibanaMap.useUiStateFromVisualization($scope.vis);
@@ -86,11 +88,34 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
     });
   });
 
-  async function makeKibanaMap() {
+  async function updateBaseLayer(visParams) {
     const tmsSettings = await serviceSettings.getTMSService();
-    const minMaxZoom = tmsSettings.getMinMaxZoom(false);
+    let baseLayerOptions;
+    let minMaxZoom;
+    if (visParams.wms.enabled) {
+      minMaxZoom = tmsSettings.getMinMaxZoom(true);
+      baseLayerOptions = {
+        baseLayerType: 'wms',
+        options: {
+          minZoom: minMaxZoom.minZoom,
+          maxZoom: minMaxZoom.maxZoom,
+          url: visParams.wms.url,
+          ...visParams.wms.options
+        }
+      };
+    } else {
+      minMaxZoom = tmsSettings.getMinMaxZoom(false);
+      const tmsUrl = tmsSettings.getUrl();
+      const tmsOptions = tmsSettings.getTMSOptions();
+      baseLayerOptions = { baseLayerType: 'tms', options: { tmsUrl, ...tmsOptions } };
+    }
+    kibanaMap.setMinZoom(minMaxZoom.minZoom);
+    kibanaMap.setMaxZoom(minMaxZoom.maxZoom);
+    kibanaMap.setBaseLayer(baseLayerOptions);
+  }
 
-    const options = { ...minMaxZoom };
+  async function makeKibanaMap() {
+    const options = {};
     const uiState = $scope.vis.getUiState();
     const zoomFromUiState = parseInt(uiState.get('mapZoom'));
     const centerFromUIState = uiState.get('mapCenter');
@@ -98,13 +123,13 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
     options.center = centerFromUIState ? centerFromUIState : DEFAULT_ZOOM_SETTINGS.mapCenter;
     kibanaMap = new KibanaMap($element[0], options);
 
-
     const tmsUrl = tmsSettings.getUrl();
     const tmsOptions = tmsSettings.getTMSOptions();
     kibanaMap.setBaseLayer({ baseLayerType: 'tms', options: { tmsUrl, ...tmsOptions } });
     kibanaMap.addLegendControl();
     kibanaMap.addFitControl();
     kibanaMap.persistUiStateForVisualization($scope.vis);
+    await updateBaseLayer($scope.vis.params);
   }
 
   function setTooltipFormatter() {
@@ -140,7 +165,7 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
       if (event.mismatches.length > 0 && shouldShowWarning) {
         notify.warning(
           `Could not show ${event.mismatches.length} ${event.mismatches.length > 1 ? 'results' : 'result'} on the map.`
-            + ` To avoid this, ensure that each term can be joined to a corresponding shape on that shape's join field.`
+          + ` To avoid this, ensure that each term can be joined to a corresponding shape on that shape's join field.`
           + ` Could not join following terms: ${event.mismatches.join(',')}`
         );
       }
diff --git a/src/core_plugins/region_map/public/region_map_vis.js b/src/core_plugins/region_map/public/region_map_vis.js
index 24bd8485810ec..37cfb85fb749b 100644
--- a/src/core_plugins/region_map/public/region_map_vis.js
+++ b/src/core_plugins/region_map/public/region_map_vis.js
@@ -10,7 +10,7 @@ import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 import { truncatedColorMaps } from 'ui/vislib/components/color/truncated_colormaps';
 import { mapToLayerWithId } from './util';
 
-VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmapsConfig) {
+VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmapsConfig, config) {
   const VisFactory = Private(VisFactoryProvider);
   const Schemas = Private(VisSchemasProvider);
 
@@ -33,7 +33,8 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps
         colorSchema: 'Yellow to Red',
         selectedLayer: selectedLayer,
         selectedJoinField: selectedJoinField,
-        isDisplayWarning: true
+        isDisplayWarning: true,
+        wms: config.get('visualization:tileMap:WMSdefaults')
       },
       template: regionTemplate,
     },

From ebe581d075f829627acd6de04afcde583b3ce045 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Mon, 13 Nov 2017 13:52:53 -0500
Subject: [PATCH 08/13] linting issues

---
 .../region_map/public/region_map_controller.js             | 4 ----
 .../region_map/public/region_map_vis_params.js             | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_controller.js b/src/core_plugins/region_map/public/region_map_controller.js
index 7df94f469b1b2..71d4ffc750246 100644
--- a/src/core_plugins/region_map/public/region_map_controller.js
+++ b/src/core_plugins/region_map/public/region_map_controller.js
@@ -122,10 +122,6 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
     options.zoom = !isNaN(zoomFromUiState) ? zoomFromUiState : DEFAULT_ZOOM_SETTINGS.zoom;
     options.center = centerFromUIState ? centerFromUIState : DEFAULT_ZOOM_SETTINGS.mapCenter;
     kibanaMap = new KibanaMap($element[0], options);
-
-    const tmsUrl = tmsSettings.getUrl();
-    const tmsOptions = tmsSettings.getTMSOptions();
-    kibanaMap.setBaseLayer({ baseLayerType: 'tms', options: { tmsUrl, ...tmsOptions } });
     kibanaMap.addLegendControl();
     kibanaMap.addFitControl();
     kibanaMap.persistUiStateForVisualization($scope.vis);
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.js b/src/core_plugins/region_map/public/region_map_vis_params.js
index b9a0c8872a225..386311d467196 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.js
+++ b/src/core_plugins/region_map/public/region_map_vis_params.js
@@ -1,13 +1,12 @@
-import {uiModules} from 'ui/modules';
+import { uiModules } from 'ui/modules';
 import regionMapVisParamsTemplate from './region_map_vis_params.html';
-import {mapToLayerWithId} from './util';
+import { mapToLayerWithId } from './util';
 import '../../tile_map/public/editors/wms_options';
-import _ from 'lodash';
 
 uiModules.get('kibana/region_map')
   .directive('regionMapVisParams', function (serviceSettings, regionmapsConfig, Notifier) {
 
-    const notify = new Notifier({location: 'Region map'});
+    const notify = new Notifier({ location: 'Region map' });
 
     return {
       restrict: 'E',

From 4f5c29c0c38f5b5520366c92d1324a580fcf1ab9 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Mon, 13 Nov 2017 14:17:39 -0500
Subject: [PATCH 09/13] fix rebase

---
 .../public/region_map_vis_params.html         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 77636569b05af..1dd5a4036e85c 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -34,20 +34,21 @@
           <option value=''>Select</option></select>
       </div>
     </div>
+    <div class="kuiSideBarFormRow">
+      <label class="kuiSideBarFormRow__label" for="displayWarnings">
+        Display warnings &nbsp;
+        <kbn-info info="Turns on/off warnings. When turned off, no warning will be shown when terms in the result that could not be joined to the vector layer."></kbn-info>
+      </label>
+
+      <div class="kuiSideBarFormRow__control">
+        <input id="displayWarnings" type="checkbox" ng-model="vis.params.isDisplayWarning">
+      </div>
+    </div>
   </div>
 </div>
 
 <div class="kuiSideBarSection">
-  <div class="kuiSideBarFormRow">
-    <label class="kuiSideBarFormRow__label" for="displayWarnings">
-      Display warnings
-      <kbn-info info="Turns on/of warnings from the Visualization. When turned off, no warning will be shown about terms in the result that could not be joined to the vector layer."></kbn-info>
-    </label>
 
-    <div class="kuiSideBarFormRow__control">
-      <input id="displayWarnings" type="checkbox" ng-model="vis.params.isDisplayWarning">
-    </div>
-  </div>
   <div class="kuiSideBarSectionTitle">
     <div class="kuiSideBarSectionTitle__text">Style settings</div>
   </div>

From 6e024c2bdf8176263fc1d05f23f2569a102ec41e Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Wed, 15 Nov 2017 01:14:40 -0500
Subject: [PATCH 10/13] improve wording

---
 src/core_plugins/region_map/public/region_map_controller.js   | 4 ++--
 src/core_plugins/region_map/public/region_map_vis_params.html | 4 ++--
 src/core_plugins/tile_map/public/editors/wms_options.js       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_controller.js b/src/core_plugins/region_map/public/region_map_controller.js
index 71d4ffc750246..5cdef58ab0e9d 100644
--- a/src/core_plugins/region_map/public/region_map_controller.js
+++ b/src/core_plugins/region_map/public/region_map_controller.js
@@ -161,8 +161,8 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
       if (event.mismatches.length > 0 && shouldShowWarning) {
         notify.warning(
           `Could not show ${event.mismatches.length} ${event.mismatches.length > 1 ? 'results' : 'result'} on the map.`
-          + ` To avoid this, ensure that each term can be joined to a corresponding shape on that shape's join field.`
-          + ` Could not join following terms: ${event.mismatches.join(',')}`
+          + ` To avoid this, ensure that each term can be matched to a corresponding shape on that shape's join field.`
+          + ` Could not match following terms: ${event.mismatches.join(',')}`
         );
       }
     });
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 1dd5a4036e85c..ed0382d433c95 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -37,7 +37,7 @@
     <div class="kuiSideBarFormRow">
       <label class="kuiSideBarFormRow__label" for="displayWarnings">
         Display warnings &nbsp;
-        <kbn-info info="Turns on/off warnings. When turned off, no warning will be shown when terms in the result that could not be joined to the vector layer."></kbn-info>
+        <kbn-info info="Turns on/off warnings. When turned on, warning will be shown for each term that cannot be matched to a shape in the vector layer based on the join field. When turned off, these warnings will be turned off."></kbn-info>
       </label>
 
       <div class="kuiSideBarFormRow__control">
@@ -51,7 +51,7 @@
 
   <div class="kuiSideBarSectionTitle">
     <div class="kuiSideBarSectionTitle__text">Style settings</div>
-  </div>
+t  </div>
   <div class="kuiSideBarFormRow" >
     <label class="kuiSideBarFormRow__label" for="colorSchema">
       Color Schema
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.js b/src/core_plugins/tile_map/public/editors/wms_options.js
index b082a16ca0ab1..22084308d5e1c 100644
--- a/src/core_plugins/tile_map/public/editors/wms_options.js
+++ b/src/core_plugins/tile_map/public/editors/wms_options.js
@@ -6,6 +6,6 @@ module.directive('wmsOptions', function () {
   return {
     restrict: 'E',
     template: wmsOptionsTemplate,
-    replace: true
+    replace: true,
   };
 });

From bc98a9bf0559ad65ea6661eaa1a6c3509e812095 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Wed, 15 Nov 2017 01:18:47 -0500
Subject: [PATCH 11/13] add global config

---
 docs/setup/settings.asciidoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 9748a70be5dde..6e5a56d8ae109 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -97,6 +97,9 @@ The following example shows a valid regionmap configuration.
                 description: "Full department name"
               - name: "INSEE"
                 description: "INSEE numeric identifier"
+                
+`regionmap.includeElasticMapsService`:: turns on or off whether layers from the Elastic Maps Service should be included in the vector layer option list. 
+By turning this off, only the layers that are configured here will be included.             
 
 `server.basePath:`:: Enables you to specify a path to mount Kibana at if you are running behind a proxy. This only affects
  the URLs generated by Kibana, your proxy is expected to remove the basePath value before forwarding requests

From 9c44822d76e5c77f7e8d1492586f31718ec7ac3d Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Wed, 15 Nov 2017 09:59:58 -0500
Subject: [PATCH 12/13] fix typo

---
 src/core_plugins/region_map/public/region_map_vis_params.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index ed0382d433c95..2a454765b890d 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -51,7 +51,7 @@
 
   <div class="kuiSideBarSectionTitle">
     <div class="kuiSideBarSectionTitle__text">Style settings</div>
-t  </div>
+  </div>
   <div class="kuiSideBarFormRow" >
     <label class="kuiSideBarFormRow__label" for="colorSchema">
       Color Schema

From a8e3c5018b4dc8c36930e4b59d8e7a2094f05a5c Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 15 Nov 2017 16:51:45 +0100
Subject: [PATCH 13/13] Use child scope for wms-options

---
 .../public/region_map_vis_params.html          |  2 +-
 .../tile_map/public/editors/tile_map.html      |  2 +-
 .../tile_map/public/editors/wms_options.html   | 18 +++++++++---------
 .../tile_map/public/editors/wms_options.js     |  3 +++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 2a454765b890d..20d2d7596f736 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -74,5 +74,5 @@
       Base Layer Settings
     </div>
   </div>
-  <wms-options></wms-options>
+  <wms-options options="vis.params.wms"></wms-options>
 </div>
diff --git a/src/core_plugins/tile_map/public/editors/tile_map.html b/src/core_plugins/tile_map/public/editors/tile_map.html
index 378fc891401cd..61d2e19cf80a3 100644
--- a/src/core_plugins/tile_map/public/editors/tile_map.html
+++ b/src/core_plugins/tile_map/public/editors/tile_map.html
@@ -53,5 +53,5 @@
     </label>
   </div>
 
-  <wms-options></wms-options>
+  <wms-options options="vis.params.wms"></wms-options>
 </div>
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.html b/src/core_plugins/tile_map/public/editors/wms_options.html
index c23ac730c4ea0..b8f7469c075d7 100644
--- a/src/core_plugins/tile_map/public/editors/wms_options.html
+++ b/src/core_plugins/tile_map/public/editors/wms_options.html
@@ -4,7 +4,7 @@
     <label>
       <input type="checkbox"
              name="wms.enabled"
-             ng-model="vis.params.wms.enabled">
+             ng-model="options.enabled">
 
       WMS compliant map server
 
@@ -12,7 +12,7 @@
     </label>
   </div>
 
-  <div ng-show="vis.params.wms.enabled" class="well">
+  <div ng-show="options.enabled" class="well">
     <div class="vis-option-item form-group">
       <p>WMS is an OGC standard for map image services. For more information, go <a href="http://www.opengeospatial.org/standards/wms">here</a>.</p>
       <label>
@@ -20,7 +20,7 @@
       </label>
       <input type="text" class="form-control"
              name="wms.url"
-             ng-model="vis.params.wms.url">
+             ng-model="options.url">
     </div>
 
     <div class="vis-option-item form-group">
@@ -28,8 +28,8 @@
         WMS layers* <kbn-info info="A comma seperated list of layers to use."></kbn-info>
       </label>
       <input type="text" class="form-control"
-             ng-require="vis.params.wms.enabled"
-             ng-model="vis.params.wms.options.layers"
+             ng-require="options.enabled"
+             ng-model="options.options.layers"
              name="wms.options.layers">
     </div>
 
@@ -39,7 +39,7 @@
       </label>
       <input type="text" class="form-control"
              name="wms.options.version"
-             ng-model="vis.params.wms.options.version">
+             ng-model="options.options.version">
     </div>
 
     <div class="vis-option-item form-group">
@@ -48,7 +48,7 @@
       </label>
       <input type="text" class="form-control"
              name="wms.options.format"
-             ng-model="vis.params.wms.options.format">
+             ng-model="options.options.format">
     </div>
 
     <div class="vis-option-item form-group">
@@ -57,7 +57,7 @@
       </label>
       <input type="text" class="form-control"
              name="wms.options.attribution"
-             ng-model="vis.params.wms.options.attribution">
+             ng-model="options.options.attribution">
     </div>
 
     <div class="vis-option-item form-group">
@@ -66,7 +66,7 @@
       </label>
       <input type="text" class="form-control"
              name="wms.options.styles"
-             ng-model="vis.params.wms.options.styles">
+             ng-model="options.options.styles">
     </div>
 
     <p>* if this parameter is incorrect, maps will fail to load.</p>
diff --git a/src/core_plugins/tile_map/public/editors/wms_options.js b/src/core_plugins/tile_map/public/editors/wms_options.js
index 22084308d5e1c..6070ca0d6aa15 100644
--- a/src/core_plugins/tile_map/public/editors/wms_options.js
+++ b/src/core_plugins/tile_map/public/editors/wms_options.js
@@ -7,5 +7,8 @@ module.directive('wmsOptions', function () {
     restrict: 'E',
     template: wmsOptionsTemplate,
     replace: true,
+    scope: {
+      'options': '='
+    }
   };
 });