[Maps] Add super-fine option to grid/cluster layers

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

@@ -36,6 +36,7 @@ export const FONTS_API_PATH = `${GIS_API_PATH}/fonts`;
 export const API_ROOT_PATH = `/${GIS_API_PATH}`;
 
 export const MVT_GETTILE_API_PATH = 'mvt/getTile';
+export const MVT_GETGRIDTILE_API_PATH = 'mvt/getGridTile';
 export const MVT_SOURCE_LAYER_NAME = 'source_layer';
 export const KBN_TOO_MANY_FEATURES_PROPERTY = '__kbn_too_many_features__';
 export const KBN_TOO_MANY_FEATURES_IMAGE_ID = '__kbn_too_many_features_image_id__';
@@ -164,8 +165,13 @@ export enum GRID_RESOLUTION {
   COARSE = 'COARSE',
   FINE = 'FINE',
   MOST_FINE = 'MOST_FINE',
+  SUPER_FINE = 'SUPER_FINE',
 }
 
+export const SUPER_FINE_ZOOM_DELTA = 7; // (2 ^ SUPER_FINE_ZOOM_DELTA) ^ 2 =  number of cells in a given tile
+export const GEOTILE_GRID_AGG_NAME = 'gridSplit';
+export const GEOCENTROID_AGG_NAME = 'gridCentroid';
+
 export const TOP_TERM_PERCENTAGE_SUFFIX = '__percentage';
 
 export const COUNT_PROP_LABEL = i18n.translate('xpack.maps.aggs.defaultCountLabel', {

x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js → x-pack/plugins/maps/common/convert_to_geojson.js

@@ -5,12 +5,12 @@
  */
 
 import _ from 'lodash';
-import { RENDER_AS } from '../../../../common/constants';
+import { RENDER_AS, GEOTILE_GRID_AGG_NAME, GEOCENTROID_AGG_NAME } from './constants';
 import { getTileBoundingBox } from './geo_tile_utils';
-import { extractPropertiesFromBucket } from '../../util/es_agg_utils';
-import { clamp } from '../../../../common/elasticsearch_geo_utils';
+import { extractPropertiesFromBucket } from './es_agg_utils';
+import { clamp } from './elasticsearch_geo_utils';
 
-const GRID_BUCKET_KEYS_TO_IGNORE = ['key', 'gridCentroid'];
+const GRID_BUCKET_KEYS_TO_IGNORE = ['key', GEOCENTROID_AGG_NAME];
 
 export function convertCompositeRespToGeoJson(esResponse, renderAs) {
   return convertToGeoJson(
@@ -20,7 +20,7 @@ export function convertCompositeRespToGeoJson(esResponse, renderAs) {
       return _.get(esResponse, 'aggregations.compositeSplit.buckets', []);
     },
     (gridBucket) => {
-      return gridBucket.key.gridSplit;
+      return gridBucket.key[GEOTILE_GRID_AGG_NAME];
     }
   );
 }
@@ -30,7 +30,7 @@ export function convertRegularRespToGeoJson(esResponse, renderAs) {
     esResponse,
     renderAs,
     (esResponse) => {
-      return _.get(esResponse, 'aggregations.gridSplit.buckets', []);
+      return _.get(esResponse, `aggregations.${GEOTILE_GRID_AGG_NAME}.buckets`, []);
     },
     (gridBucket) => {
       return gridBucket.key;
@@ -49,7 +49,7 @@ function convertToGeoJson(esResponse, renderAs, pluckGridBuckets, pluckGridKey)
       type: 'Feature',
       geometry: rowToGeometry({
         gridKey,
-        gridCentroid: gridBucket.gridCentroid,
+        [GEOCENTROID_AGG_NAME]: gridBucket[GEOCENTROID_AGG_NAME],
         renderAs,
       }),
       id: gridKey,

x-pack/plugins/maps/public/classes/util/es_agg_utils.ts → x-pack/plugins/maps/common/es_agg_utils.ts

@@ -5,8 +5,8 @@
  */
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import { IndexPattern, IFieldType } from '../../../../../../src/plugins/data/public';
-import { TOP_TERM_PERCENTAGE_SUFFIX } from '../../../common/constants';
+import { IndexPattern, IFieldType } from '../../../../../../src/plugins/data/common';
+import { TOP_TERM_PERCENTAGE_SUFFIX } from './constants';
 
 export function getField(indexPattern: IndexPattern, fieldName: string) {
   const field = indexPattern.fields.getByName(fieldName);

x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js → x-pack/plugins/maps/common/geo_tile_utils.js

@@ -5,8 +5,8 @@
  */
 
 import _ from 'lodash';
-import { DECIMAL_DEGREES_PRECISION } from '../../../../common/constants';
-import { clampToLatBounds } from '../../../../common/elasticsearch_geo_utils';
+import { DECIMAL_DEGREES_PRECISION } from './constants';
+import { clampToLatBounds } from './elasticsearch_geo_utils';
 
 const ZOOM_TILE_KEY_INDEX = 0;
 const X_TILE_KEY_INDEX = 1;

x-pack/plugins/maps/public/classes/fields/es_agg_field.ts

@@ -12,7 +12,7 @@ import { IVectorSource } from '../sources/vector_source';
 import { ESDocField } from './es_doc_field';
 import { AGG_TYPE, FIELD_ORIGIN } from '../../../common/constants';
 import { isMetricCountable } from '../util/is_metric_countable';
-import { getField, addFieldToDSL } from '../util/es_agg_utils';
+import { getField, addFieldToDSL } from '../../../common/es_agg_utils';
 import { TopTermPercentageField } from './top_term_percentage_field';
 import { ITooltipProperty, TooltipProperty } from '../tooltips/tooltip_property';
 import { ESAggTooltipProperty } from '../tooltips/es_agg_tooltip_property';
@@ -30,13 +30,15 @@ export class ESAggField implements IESAggField {
   private readonly _label?: string;
   private readonly _aggType: AGG_TYPE;
   private readonly _esDocField?: IField | undefined;
+  private readonly _canReadFromGeoJson: boolean;
 
   constructor({
     label,
     source,
     aggType,
     esDocField,
     origin,
+    canReadFromGeoJson = true,
   }: {
     label?: string;
     source: IESAggSource;
@@ -49,6 +51,7 @@ export class ESAggField implements IESAggField {
     this._label = label;
     this._aggType = aggType;
     this._esDocField = esDocField;
+    this._canReadFromGeoJson = canReadFromGeoJson;
   }
 
   getSource(): IVectorSource {
@@ -132,18 +135,19 @@ export class ESAggField implements IESAggField {
   }
 
   supportsAutoDomain(): boolean {
-    return true;
+    return this._canReadFromGeoJson ? true : this.supportsFieldMeta();
   }
 
   canReadFromGeoJson(): boolean {
-    return true;
+    return this._canReadFromGeoJson;
   }
 }
 
 export function esAggFieldsFactory(
   aggDescriptor: AggDescriptor,
   source: IESAggSource,
-  origin: FIELD_ORIGIN
+  origin: FIELD_ORIGIN,
+  canReadFromGeoJson?: boolean = true
 ): IESAggField[] {
   const aggField = new ESAggField({
     label: aggDescriptor.label,
@@ -153,12 +157,13 @@ export function esAggFieldsFactory(
     aggType: aggDescriptor.type,
     source,
     origin,
+    canReadFromGeoJson,
   });
 
   const aggFields: IESAggField[] = [aggField];
 
   if (aggDescriptor.field && aggDescriptor.type === AGG_TYPE.TERMS) {
-    aggFields.push(new TopTermPercentageField(aggField));
+    aggFields.push(new TopTermPercentageField(aggField, canReadFromGeoJson));
   }
 
   return aggFields;

x-pack/plugins/maps/public/classes/fields/top_term_percentage_field.ts

@@ -13,9 +13,11 @@ import { FIELD_ORIGIN } from '../../../common/constants';
 
 export class TopTermPercentageField implements IESAggField {
   private readonly _topTermAggField: IESAggField;
+  private readonly _canReadFromGeoJson: boolean;
 
-  constructor(topTermAggField: IESAggField) {
+  constructor(topTermAggField: IESAggField, canReadFromGeoJson?: boolean = true) {
     this._topTermAggField = topTermAggField;
+    this._canReadFromGeoJson = canReadFromGeoJson;
   }
 
   getSource(): IVectorSource {
@@ -61,7 +63,7 @@ export class TopTermPercentageField implements IESAggField {
   }
 
   supportsAutoDomain(): boolean {
-    return true;
+    return this._canReadFromGeoJson;
   }
 
   supportsFieldMeta(): boolean {
@@ -81,6 +83,6 @@ export class TopTermPercentageField implements IESAggField {
   }
 
   canReadFromGeoJson(): boolean {
-    return true;
+    return this._canReadFromGeoJson;
   }
 }

x-pack/plugins/maps/public/classes/layers/layer.tsx

@@ -423,7 +423,7 @@ export class AbstractLayer implements ILayer {
 
   renderSourceSettingsEditor({ onChange }: SourceEditorArgs) {
     const source = this.getSourceForEditing();
-    return source.renderSourceSettingsEditor({ onChange });
+    return source.renderSourceSettingsEditor({ onChange, currentLayerType: this._descriptor.type });
   }
 
   getPrevRequestToken(dataId: string): symbol | undefined {

x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx

@@ -66,6 +66,7 @@ export class TiledVectorLayer extends VectorLayer {
     const templateWithMeta = await this._source.getUrlTemplateWithMeta(searchFilters);
     if (prevDataRequest) {
       const data: MVTSingleLayerVectorSourceConfig = prevDataRequest.getData() as MVTSingleLayerVectorSourceConfig;
+
       if (data) {
         const canSkipBecauseNoChanges =
           data.layerName === this._source.getLayerName() &&

x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.d.ts

@@ -13,17 +13,21 @@ import { AbstractESAggSourceDescriptor } from '../../../../common/descriptor_typ
 export interface IESAggSource extends IESSource {
   getAggKey(aggType: AGG_TYPE, fieldName: string): string;
   getAggLabel(aggType: AGG_TYPE, fieldName: string): string;
-  getMetricFields(): IESAggField[];
+  getMetricFields(canReadFromGeoJson?: boolean): IESAggField[];
   hasMatchingMetricField(fieldName: string): boolean;
   getMetricFieldForName(fieldName: string): IESAggField | null;
 }
 
 export class AbstractESAggSource extends AbstractESSource implements IESAggSource {
-  constructor(sourceDescriptor: AbstractESAggSourceDescriptor, inspectorAdapters: object);
+  constructor(
+    sourceDescriptor: AbstractESAggSourceDescriptor,
+    inspectorAdapters: object,
+    canReadFromGeoJson?
+  );
 
   getAggKey(aggType: AGG_TYPE, fieldName: string): string;
   getAggLabel(aggType: AGG_TYPE, fieldName: string): string;
-  getMetricFields(): IESAggField[];
+  getMetricFields(canReadFromGeoJson?: boolean): IESAggField[];
   hasMatchingMetricField(fieldName: string): boolean;
   getMetricFieldForName(fieldName: string): IESAggField | null;
 }

x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.js

@@ -13,13 +13,13 @@ import { getSourceAggKey } from '../../../../common/get_agg_key';
 export const DEFAULT_METRIC = { type: AGG_TYPE.COUNT };
 
 export class AbstractESAggSource extends AbstractESSource {
-  constructor(descriptor, inspectorAdapters) {
+  constructor(descriptor, inspectorAdapters, canReadFromGeoJson = true) {
     super(descriptor, inspectorAdapters);
     this._metricFields = [];
     if (this._descriptor.metrics) {
       this._descriptor.metrics.forEach((aggDescriptor) => {
         this._metricFields.push(
-          ...esAggFieldsFactory(aggDescriptor, this, this.getOriginForField())
+          ...esAggFieldsFactory(aggDescriptor, this, this.getOriginForField(), canReadFromGeoJson)
         );
       });
     }
@@ -48,11 +48,16 @@ export class AbstractESAggSource extends AbstractESSource {
     return FIELD_ORIGIN.SOURCE;
   }
 
-  getMetricFields() {
+  getMetricFields(canReadFromGeoJson = true) {
     const metrics = this._metricFields.filter((esAggField) => esAggField.isValid());
     // Handle case where metrics is empty because older saved object state is empty array or there are no valid aggs.
     return metrics.length === 0
-      ? esAggFieldsFactory({ type: AGG_TYPE.COUNT }, this, this.getOriginForField())
+      ? esAggFieldsFactory(
+          { type: AGG_TYPE.COUNT },
+          this,
+          this.getOriginForField(),
+          canReadFromGeoJson
+        )
       : metrics;
   }
 

x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts

@@ -5,10 +5,15 @@
  */
 
 import { AbstractESAggSource } from '../es_agg_source';
-import { ESGeoGridSourceDescriptor } from '../../../../common/descriptor_types';
+import {
+  ESGeoGridSourceDescriptor,
+  MapFilters,
+  MapQuery,
+} from '../../../../common/descriptor_types';
 import { GRID_RESOLUTION } from '../../../../common/constants';
+import { ITiledSingleLayerVectorSource } from '../vector_source';
 
-export class ESGeoGridSource extends AbstractESAggSource {
+export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingleLayerVectorSource {
   static createDescriptor({
     indexPatternId,
     geoField,
@@ -18,7 +23,26 @@ export class ESGeoGridSource extends AbstractESAggSource {
 
   constructor(sourceDescriptor: ESGeoGridSourceDescriptor, inspectorAdapters: unknown);
 
+  private readonly _descriptor: ESGeoGridSourceDescriptor;
+
   getFieldNames(): string[];
   getGridResolution(): GRID_RESOLUTION;
   getGeoGridPrecision(zoom: number): number;
+
+  getLayerName(): string;
+
+  getUrlTemplateWithMeta(
+    searchFilters: MapFilters & {
+      applyGlobalQuery: boolean;
+      fieldNames: string[];
+      geogridPrecision?: number;
+      sourceQuery: MapQuery;
+      sourceMeta: VectorSourceSyncMeta;
+    }
+  ): Promise<{
+    layerName: string;
+    urlTemplate: string;
+    minSourceZoom: number;
+    maxSourceZoom: number;
+  }>;
 }