[Maps] Vector tiles for Elasticsearch Data

x-pack/legacy/plugins/maps/common/constants.ts

@@ -27,6 +27,9 @@ export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
 export const TELEMETRY_TYPE = 'maps-telemetry';
 
+export const MVT_GETTILE_API_PATH = 'mvt/getTile';
+export const MVT_GETGRIDTILE_API_PATH = 'mvt/getGridTile';
+
 export const MAP_APP_PATH = `app/${APP_ID}`;
 export const GIS_API_PATH = `api/${APP_ID}`;
 export const INDEX_SETTINGS_API_PATH = `${GIS_API_PATH}/indexSettings`;
@@ -37,9 +40,13 @@ export function createMapPath(id: string) {
   return `${MAP_BASE_URL}/${id}`;
 }
 
+export const MVT_SOURCE_ID = 'geojsonLayer';
+export const KBN_TOO_MANY_FEATURES_PROPERTY = '__kbn_too_many_features__';
+
 export const LAYER_TYPE = {
   TILE: 'TILE',
   VECTOR: 'VECTOR',
+  TILED_VECTOR: 'TILED_VECTOR',
   VECTOR_TILE: 'VECTOR_TILE',
   HEATMAP: 'HEATMAP',
 };
@@ -49,11 +56,14 @@ export const SORT_ORDER = {
   DESC: 'desc',
 };
 
+// sources
 export const EMS_TMS = 'EMS_TMS';
 export const EMS_FILE = 'EMS_FILE';
 export const ES_GEO_GRID = 'ES_GEO_GRID';
 export const ES_SEARCH = 'ES_SEARCH';
 export const ES_PEW_PEW = 'ES_PEW_PEW';
+export const ES_MVT_SEARCH = 'ES_MVT_SEARCH';
+export const ES_MVT_GEO_GRID = 'ES_MVT_GEO_GRID';
 
 export const FIELD_ORIGIN = {
   SOURCE: 'source',
@@ -158,3 +168,5 @@ export const SYMBOLIZE_AS_TYPES = {
 };
 
 export const DEFAULT_ICON = 'airfield';
+
+export const DEFAULT_COUNTABLE_SCALE = 2048;

x-pack/legacy/plugins/maps/public/components/global_filter_checkbox.js

@@ -7,14 +7,15 @@
 import React from 'react';
 import { EuiFormRow, EuiSwitch } from '@elastic/eui';
 
-export function GlobalFilterCheckbox({ applyGlobalQuery, label, setApplyGlobalQuery }) {
+export function GlobalFilterCheckbox({ applyGlobalQuery, label, setApplyGlobalQuery, enableSwitch}) {
   const onApplyGlobalQueryChange = event => {
     setApplyGlobalQuery(event.target.checked);
   };
 
   return (
     <EuiFormRow display="columnCompressedSwitch">
       <EuiSwitch
+        disabled={!enableSwitch}
         label={label}
         checked={applyGlobalQuery}
         onChange={onApplyGlobalQueryChange}

x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js

@@ -219,12 +219,14 @@ export class FilterEditor extends Component {
 
         {filterByBoundsSwitch}
 
+
         <GlobalFilterCheckbox
           label={i18n.translate('xpack.maps.filterEditor.applyGlobalQueryCheckboxLabel', {
             defaultMessage: `Apply global filter to layer data`,
           })}
           applyGlobalQuery={this.props.layer.getSource().getApplyGlobalQuery()}
           setApplyGlobalQuery={this._onApplyGlobalQueryChange}
+          enableSwitch={this.props.layer.getSource().isQueryAwareTogglable()}
         />
       </Fragment>
     );

x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js

@@ -35,10 +35,11 @@ export class FeatureProperties extends React.Component {
     this._fetchProperties({
       nextFeatureId: this.props.featureId,
       nextLayerId: this.props.layerId,
+      meta: this.props.meta
     });
   };
 
-  _fetchProperties = async ({ nextLayerId, nextFeatureId }) => {
+  _fetchProperties = async ({ nextLayerId, nextFeatureId, meta }) => {
     if (this.prevLayerId === nextLayerId && this.prevFeatureId === nextFeatureId) {
       // do not reload same feature properties
       return;
@@ -64,6 +65,7 @@ export class FeatureProperties extends React.Component {
       properties = await this.props.loadFeatureProperties({
         layerId: nextLayerId,
         featureId: nextFeatureId,
+        meta: meta,
       });
     } catch (error) {
       if (this._isMounted) {

x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js

@@ -93,6 +93,7 @@ export class FeaturesTooltip extends React.Component {
     return this.props.loadPreIndexedShape({
       layerId: this.state.currentFeature.layerId,
       featureId: this.state.currentFeature.id,
+      meta: this.state.currentFeature.meta
     });
   };
 
@@ -104,6 +105,7 @@ export class FeaturesTooltip extends React.Component {
     const currentFeatureGeometry = this.props.loadFeatureGeometry({
       layerId: this.state.currentFeature.layerId,
       featureId: this.state.currentFeature.id,
+      meta: this.state.currentFeature.meta,
     });
     const geoFields = this._filterGeoFields(currentFeatureGeometry);
 
@@ -132,6 +134,7 @@ export class FeaturesTooltip extends React.Component {
         <FeatureProperties
           featureId={this.state.currentFeature.id}
           layerId={this.state.currentFeature.layerId}
+          meta={this.state.currentFeature.meta}
           loadFeatureProperties={this.props.loadFeatureProperties}
           showFilterButtons={!!this.props.addFilters && this.props.isLocked}
           onCloseTooltip={this.props.closeTooltip}

x-pack/legacy/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js

@@ -140,9 +140,14 @@ export class TooltipControl extends React.Component {
         uniqueFeatures.push({
           id: featureId,
           layerId: layerId,
+          meta: {
+            docId: mbFeature.properties._id, //hacky for now
+            indexName: mbFeature.properties._index //hacky for now
+          }
         });
       }
     }
+
     return uniqueFeatures;
   }
 
@@ -242,45 +247,32 @@ export class TooltipControl extends React.Component {
 
   // Must load original geometry instead of using geometry from mapbox feature.
   // Mapbox feature geometry is from vector tile and is not the same as the original geometry.
-  _loadFeatureGeometry = ({ layerId, featureId }) => {
+  _loadFeatureGeometry = ({ layerId, featureId, meta }) => {
+
     const tooltipLayer = this._findLayerById(layerId);
     if (!tooltipLayer) {
       return null;
     }
 
-    const targetFeature = tooltipLayer.getFeatureById(featureId);
-    if (!targetFeature) {
-      return null;
-    }
-
-    return targetFeature.geometry;
+    return tooltipLayer.getGeometryByFeatureId(featureId);
   };
 
-  _loadFeatureProperties = async ({ layerId, featureId }) => {
+  _loadFeatureProperties = async ({ layerId, featureId, meta }) => {
     const tooltipLayer = this._findLayerById(layerId);
     if (!tooltipLayer) {
       return [];
     }
 
-    const targetFeature = tooltipLayer.getFeatureById(featureId);
-    if (!targetFeature) {
-      return [];
-    }
-    return await tooltipLayer.getPropertiesForTooltip(targetFeature.properties);
+
+    return await tooltipLayer.getFeaturePropertiesByFeatureId(featureId, meta);
   };
 
-  _loadPreIndexedShape = async ({ layerId, featureId }) => {
+  _loadPreIndexedShape = async ({ layerId, featureId, meta}) => {
     const tooltipLayer = this._findLayerById(layerId);
     if (!tooltipLayer) {
       return null;
     }
-
-    const targetFeature = tooltipLayer.getFeatureById(featureId);
-    if (!targetFeature) {
-      return null;
-    }
-
-    return await tooltipLayer.getSource().getPreIndexedShape(targetFeature.properties);
+    return await tooltipLayer.loadPreIndexedShapeByFeatureId(featureId, meta);
   };
 
   _findLayerById = layerId => {

x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js

@@ -143,6 +143,18 @@ export class MBMapContainer extends React.Component {
         mbMap.addControl(new mapboxgl.NavigationControl({ showCompass: false }), 'top-left');
       }
 
+      const hatchImageBase64 =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAVSSURBVHja7NwxCiMxEERRHWzufyHDpO1EoRnGjmz/V7CwLLwNHBStHqQ1r3POzDEza/859r/dDc/zP+DXxX/y2PDYf383PM9/uV83muScz8Pz/Bf7NSKSjQIQiReAEYnno36NJQnPZ73PJDwf9n5Ano8XgBGK58NHAEsUng8vAUUkGgUgogCMSDxf9C4D8XzYr4vm8JmE56PXgf2APO89ACMUz4/3ACxReL62BBSRP48CEIkXgBGJ56PeZSCe9x6AzyQ8X/R+QJ73HoARiuerRwBLFJ4PLwFFJBoFIKIAjEg8X/QuA/F82LsOzPNhrwB4XgEYoXjeEcAShectAUWkEQUgEi8AIxLPR73LQDzvPQCfSXi+6P2APO89ACMUz1ePAJYoPB9eAopINApARAEYkXi+6F0G4vmwdx2Y58NeAfC8AjBC8bwjgCUKz1sCikgjCkAkXgBGJJ6PepeBeN57AD6T8HzR+wF53nsARiierx4BLFF4PrwEFJFoFICIAjAi8XzRuwzE82HvOjDPh70C4HkFYITieUcASxSetwQUkUYUgEi8AIxIPB/1LgPxvPcAfCbh+aL3A/K89wCMUDxfPQJYovB8eAkoItEoABEFYETi+aJ3GYjnw951YJ4PewXA8wrACMXzjgCWKDxvCSgijSgAkXgBGJF4PupdBuJ57wH4TMLzRe8H5HnvARiheL56BLBE4fnwElBEolEAIgrAiMTzRe8yEM+HvevAPB/2CoDnFYARiucdASxReN4SUEQaUQAi8QIwIvF81LsMxPPeA/CZhOeL3g/I894DMELxfPUIYInC8+EloIhEowBEFIARieeL3mUgng9714F5PuwVAM8rACMUzzsCWKLwvCWgiDSiAETiBWBE4vmodxmI570H4DMJzxe9H5DnvQdghOL56hHAEoXnw0tAEYlGAYgoACMSzxe9y0A8H/auA/N82CsAnlcARiiedwSwROF5S0ARaUQBiMQLwIjE81HvMhDPew/AZxKeL3o/IM97D8AIxfPVI4AlCs+Hl4AiEo0CEFEARiSeL3qXgXg+7F0H5vmwVwA8rwCMUDzvCGCJwvOWgCLSiAIQiReAEYnno95lIJ73HoDPJDxf9H5AnvcegBGK56tHAEsUng8vAUUkGgUgogCMSDxf9C4D8XzYuw7M82GvAHheARiheN4RwBKF5y0BRaQRBSASLwAjEs9HvctAPO89AJ9JeL7o/YA87z0AIxTPV48Alig8H14Cikg0CkBEARiReL7oXQbi+bB3HZjnw14B8LwCMELxvCOAJQrPWwKKSCMKQCReAEYkno96l4F43nsAPpPwfNH7AXneewBGKJ6vHgEsUXg+vAQUkWgUgIgCMCLxfNG7DMTzYe86MM+HvQLgeQVghOJ5RwBLFJ63BBSRRhSASLwAjEg8H/UuA/G89wB8JuH5ovcD8rz3AIxQPF89Alii8Hx4CSgi0SgAEQVgROL5oncZiOfD3nVgng97BcDzCsAIxfOOAJYoPG8JKCKNKACReAEYkXg+6l0G4nnvAfhMwvNF7wfkee8BGKF4vnoEsETh+fASUESiUQAiCsCIxPNF7zIQz4e968A8H/YKgOcVgBGK5x0BLFF43hJQRBpRACLxAjAi8XzUuwzE894D8JmE54veD8jz3gMwQvF89QhgicLz4SWgiESjAEQUgBGJ54veZSCeD3vXgXk+7BUAzysAIxTPOwJYovC8JaCINKIAROIFYETi+ah3GYjnvQfgMwnPF70fkOe9B2CE4vnqEcAShefDS0ARiUYBiCgAIxLPF73LQDwf9q4D83zYPwcA+NYiinqfLBIAAAAASUVORK5CYII=';
+        // 'data:image/png;base64,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';
+
+      const hatchImage = new Image();
+      hatchImage.onload = () => {
+        mbMap.addImage('__kbn_too_many_features__', hatchImage);
+      };
+      hatchImage.src = hatchImageBase64;
+
+
+
       let emptyImage;
       mbMap.on('styleimagemissing', e => {
         if (emptyImage) {
@@ -155,6 +167,7 @@ export class MBMapContainer extends React.Component {
         emptyImage.src =
           'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYV2NgAAIAAAUAAarVyFEAAAAASUVORK5CYII=';
         emptyImage.crossOrigin = 'anonymous';
+
         resolve(mbMap);
       });
     });

x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.js

@@ -5,7 +5,7 @@
  */
 
 import { AbstractField } from './field';
-import { COUNT_AGG_TYPE } from '../../../common/constants';
+import { COUNT_AGG_TYPE, METRIC_TYPE } from '../../../common/constants';
 import { isMetricCountable } from '../util/is_metric_countable';
 import { ESAggMetricTooltipProperty } from '../tooltips/es_aggmetric_tooltip_property';
 
@@ -79,10 +79,23 @@ export class ESAggMetricField extends AbstractField {
 
   supportsFieldMeta() {
     // count and sum aggregations are not within field bounds so they do not support field meta.
-    return !isMetricCountable(this.getAggType());
+    // return !isMetricCountable(this.getAggType());
+    return ![METRIC_TYPE.SUM, METRIC_TYPE.UNIQUE_COUNT].includes(this.getAggType());
   }
 
   async getOrdinalFieldMetaRequest(config) {
-    return this._esDocField.getOrdinalFieldMetaRequest(config);
+    if (this._esDocField) {
+      return this._esDocField.getOrdinalFieldMetaRequest(config);
+    } else {
+      return {
+        type_count: {
+          value_count: {
+            script: {
+              source: '1',
+            },
+          },
+        },
+      };
+    }
   }
 }

x-pack/legacy/plugins/maps/public/layers/layer.js

@@ -81,7 +81,7 @@ export class AbstractLayer {
   }
 
   supportsElasticsearchFilters() {
-    return this._source.isESSource();
+    return this._source.supportsESFilters();
   }
 
   async supportsFitToBounds() {

x-pack/legacy/plugins/maps/public/layers/sources/all_sources.js

@@ -14,8 +14,14 @@ import { KibanaTilemapSource } from './kibana_tilemap_source';
 import { ESGeoGridSource } from './es_geo_grid_source';
 import { ESSearchSource } from './es_search_source';
 import { ESPewPewSource } from './es_pew_pew_source/es_pew_pew_source';
+import { MVTVectorSource } from './mvt_vector_source/mvt_vector_source';
+import { ESMVTSearchSource } from './es_mvt_search_source/es_mvt_search_source';
+import {ESMVTGeoGridSource} from "./es_mvt_geo_grid_source/es_mvt_geo_grid_source";
 
 export const ALL_SOURCES = [
+  // MVTVectorSource,
+  ESMVTSearchSource,
+  ESMVTGeoGridSource,
   GeojsonFileSource,
   ESSearchSource,
   ESGeoGridSource,

x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js

@@ -99,7 +99,9 @@ export class AbstractESAggSource extends AbstractESSource {
   }
 
   createMetricAggConfigs() {
-    return this.getMetricFields().map(esAggMetric => esAggMetric.makeMetricAggConfig());
+    const mf = this.getMetricFields().map(esAggMetric => esAggMetric.makeMetricAggConfig());
+
+    return mf;
   }
 
   async getNumberFields() {

x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js

@@ -24,6 +24,12 @@ import { npStart } from 'ui/new_platform';
 const { IndexPatternSelect } = npStart.plugins.data.ui;
 
 const requestTypeOptions = [
+  {
+    label: i18n.translate('xpack.maps.source.esGeoGrid.pointsDropdownOption', {
+      defaultMessage: 'clusters',
+    }),
+    value: RENDER_AS.POINT,
+  },
   {
     label: i18n.translate('xpack.maps.source.esGeoGrid.gridRectangleDropdownOption', {
       defaultMessage: 'grid rectangles',
@@ -36,12 +42,6 @@ const requestTypeOptions = [
     }),
     value: RENDER_AS.HEATMAP,
   },
-  {
-    label: i18n.translate('xpack.maps.source.esGeoGrid.pointsDropdownOption', {
-      defaultMessage: 'clusters',
-    }),
-    value: RENDER_AS.POINT,
-  },
 ];
 
 export class CreateSourceEditor extends Component {
@@ -184,6 +184,8 @@ export class CreateSourceEditor extends Component {
       return null;
     }
 
+    const options = this.props.clustersOnly ? requestTypeOptions.slice(0, 1) : requestTypeOptions;
+
     return (
       <EuiFormRow
         label={i18n.translate('xpack.maps.source.esGeoGrid.showAsLabel', {
@@ -195,7 +197,7 @@ export class CreateSourceEditor extends Component {
             defaultMessage: 'Select a single option',
           })}
           singleSelection={{ asPlainText: true }}
-          options={requestTypeOptions}
+          options={options}
           selectedOptions={[this.state.requestType]}
           onChange={this._onRequestTypeSelect}
           isClearable={false}