Region map visualization

docs/getting-started/tutorial-visualizing.asciidoc

@@ -129,10 +129,10 @@ make the differences stand out, starting the Y-axis at a value closer to the min
 
 Save this chart with the name _Bar Example_.
 
-Next, we're going to use a tile map chart to visualize geographic information in our log file sample data. 
+Next, we're going to use a coordinate map chart to visualize geographic information in our log file sample data. 
 
 . Click *New*.
-. Select  *Tile map*. 
+. Select  *Coordinate map*. 
 . Select the `logstash-*` index pattern. 
 . Set the time window for the events we're exploring:
 . Click the time picker in the Kibana toolbar.

docs/management/advanced-options.asciidoc

@@ -48,7 +48,7 @@ increase request processing time.
 when necessary.
 `visualization:tileMap:maxPrecision`:: The maximum geoHash precision displayed on tile maps: 7 is high, 10 is very high,
 12 is the maximum. {es-ref}search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator[Explanation of cell dimensions].
-`visualization:tileMap:WMSdefaults`:: Default properties for the WMS map server support in the tile map.
+`visualization:tileMap:WMSdefaults`:: Default properties for the WMS map server support in the coordinate map.
 `visualization:colorMapping`:: Maps values to specified colors within visualizations.
 `visualization:loadingDelay`:: Time to wait before dimming visualizations during query.
 `visualization:dimmingOpacity`:: When part of a visualization is highlighted, by hovering over it for example, ths is the opacity applied to the other elements. A higher number means other elements will be less opaque.

docs/visualize.asciidoc

@@ -36,7 +36,7 @@ To create a visualization:
 <<metric-chart,Metric>>:: Display a single number.
 * *Maps*
 [horizontal]
-<<tilemap,Tile map>>:: Associate the results of an aggregation with geographic
+<<tilemap,Coordinate map>>:: Associate the results of an aggregation with geographic
 locations.
 * *Time Series*
 [horizontal]

docs/visualize/tilemap.asciidoc

@@ -1,7 +1,7 @@
 [[tilemap]]
 == Tile Maps
 
-A tile map displays a geographic area overlaid with circles keyed to the data determined by the buckets you specify.
+A coordinate map displays a geographic area overlaid with circles keyed to the data determined by the buckets you specify.
 
 NOTE: By default, Kibana uses the https://www.elastic.co/elastic-tile-service[Elastic Tile Service]
 to display map tiles. To use other tile service providers, configure the <<tilemap-settings,tilemap settings>>
@@ -13,7 +13,7 @@ in `kibana.yml`.
 
 ===== Metrics
 
-The default _metrics_ aggregation for a tile map is the *Count* aggregation. You can select any of the following
+The default _metrics_ aggregation for a coordinate map is the *Count* aggregation. You can select any of the following
 aggregations as the metrics aggregation:
 
 *Count*:: The {es-ref}search-aggregations-metrics-valuecount-aggregation.html[_count_] aggregation returns a raw count of

q

@@ -0,0 +1,94 @@
+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 90e0e74..0245f51 100644
+--- a/src/core_plugins/region_map/public/region_map_controller.js
++++ b/src/core_plugins/region_map/public/region_map_controller.js
+@@ -28,23 +28,6 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
+   let choroplethLayer = null;
+   const kibanaMapReady = makeKibanaMap();
+ 
+-  serviceSettings.getFileLayers()
+-    .then(function (layersFromService) {
+-      const newVectorLayers = $scope.vis.type.params.vectorLayers.slice();
+-      for (let i = 0; i < layersFromService.length; i += 1) {
+-        const layerFromService = layersFromService[i];
+-        const alreadyAdded = newVectorLayers.some((layer) =>_.eq(layerFromService, layer));
+-        if (!alreadyAdded) {
+-          newVectorLayers.push(layerFromService);
+-        }
+-      }
+-      $scope.vis.type.params.vectorLayers = newVectorLayers;
+-      $scope.$apply();
+-    })
+-    .catch(function (error) {
+-      notify.warning(error.message);
+-    });
+-
+   $scope.$watch('esResponse', async function (response) {
+     kibanaMapReady.then(() => {
+       const metricsAgg = _.first($scope.vis.aggs.bySchemaName.metric);
+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 821c8a7..8d961be 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,19 +1,54 @@
+ import { uiModules } from 'ui/modules';
+ import regionMapVisParamsTemplate from './region_map_vis_params.html';
++import _ from 'lodash';
+ 
+ uiModules.get('kibana/region_map')
+-  .directive('regionMapVisParams', function () {
++  .directive('regionMapVisParams', function (serviceSettings, Notifier) {
++
++
++    const notify = new Notifier({ location: 'Region map' });
++
+     return {
+       restrict: 'E',
+       template: regionMapVisParamsTemplate,
+       link: function ($scope) {
++
++
++        console.log('calling the linker function...');
++
+         $scope.onLayerChange = onLayerChange;
+-        $scope.$watch('vis.type.params.vectorLayers', () => {
+-          if ($scope.vis.type.params.vectorLayers[0] && !$scope.vis.params.selectedLayer) {
+-            $scope.vis.params.selectedLayer = $scope.vis.type.params.vectorLayers[0];
+-            onLayerChange();
+-          }
+-        });
++
++
++        serviceSettings.getFileLayers()
++          .then(function (layersFromService) {
++
++            const newVectorLayers = $scope.vis.type.params.vectorLayers.slice();
++            for (let i = 0; i < layersFromService.length; i += 1) {
++              const layerFromService = layersFromService[i];
++              const alreadyAdded = newVectorLayers.some((layer) =>_.eq(layerFromService, layer));
++              if (!alreadyAdded) {
++                newVectorLayers.push(layerFromService);
++              }
++            }
++
++            $scope.vis.type.params.vectorLayers = newVectorLayers;
++
++            if ($scope.vis.type.params.vectorLayers[0] && !$scope.vis.params.selectedLayer) {
++              $scope.vis.params.selectedLayer = $scope.vis.type.params.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];

src/core_plugins/kbn_vislib_vis_types/public/tile_map.js

@@ -14,7 +14,7 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
 
   return new MapsVisType({
     name: 'tile_map',
-    title: 'Tile Map',
+    title: 'Coordinate Map',
     image,
     description: 'Plot latitude and longitude coordinates on a map',
     category: VisType.CATEGORY.MAP,

src/core_plugins/kibana/inject_vars.js

@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export function injectVars(server) {
   const serverConfig = server.config();
 
@@ -6,13 +8,20 @@ export function injectVars(server) {
   //keeping this logic for backward compatibilty.
   const configuredUrl = server.config().get('tilemap.url');
   const isOverridden = typeof configuredUrl === 'string' && configuredUrl !== '';
-  const tilemapConfig = serverConfig.get('tilemap');
+  const tilemapConfig = _.cloneDeep(serverConfig.get('tilemap'));
+  const vectormapsConfig = _.cloneDeep(serverConfig.get('regionmap'));
+  const mapConfig = _.cloneDeep(serverConfig.get('map'));
+
+
+  vectormapsConfig.layers =  (vectormapsConfig.layers) ? vectormapsConfig.layers : [];
 
   return {
     kbnDefaultAppId: serverConfig.get('kibana.defaultAppId'),
+    vectormapsConfig: vectormapsConfig,
+    mapConfig: mapConfig,
     tilemapsConfig: {
       deprecated: {
-        isOverridden,
+        isOverridden: isOverridden,
         config: tilemapConfig,
       },
       manifestServiceUrl: serverConfig.get('tilemap.manifestServiceUrl')

src/core_plugins/region_map/index.js

@@ -0,0 +1,9 @@
+export default function (kibana) {
+
+  return new kibana.Plugin({
+    uiExports: {
+      visTypes: ['plugins/region_map/region_map_vis']
+    }
+  });
+
+}

src/core_plugins/region_map/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "region_map",
+  "version": "kibana"
+}