[Maps] Convert AbstractSource and AbstractLayer to TS

x-pack/legacy/plugins/maps/public/selectors/map_selectors.js

@@ -7,6 +7,8 @@
 import { createSelector } from 'reselect';
 import _ from 'lodash';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { TileStyle } from '../../../../../plugins/maps/public/layers/styles/tile/tile_style';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { TileLayer } from '../../../../../plugins/maps/public/layers/tile_layer';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { VectorTileLayer } from '../../../../../plugins/maps/public/layers/vector_tile_layer';
@@ -34,7 +36,7 @@ function createLayerInstance(layerDescriptor, inspectorAdapters) {
 
   switch (layerDescriptor.type) {
     case TileLayer.type:
-      return new TileLayer({ layerDescriptor, source });
+      return new TileLayer({ layerDescriptor, source, style: new TileStyle() });
     case VectorLayer.type:
       const joins = [];
       if (layerDescriptor.joins) {
@@ -45,11 +47,11 @@ function createLayerInstance(layerDescriptor, inspectorAdapters) {
       }
       return new VectorLayer({ layerDescriptor, source, joins });
     case VectorTileLayer.type:
-      return new VectorTileLayer({ layerDescriptor, source });
+      return new VectorTileLayer({ layerDescriptor, source, style: new TileStyle() });
     case HeatmapLayer.type:
       return new HeatmapLayer({ layerDescriptor, source });
     case BlendedVectorLayer.type:
-      return new BlendedVectorLayer({ layerDescriptor, source });
+      return new BlendedVectorLayer({ layerDescriptor, source, joins: [] });
     default:
       throw new Error(`Unrecognized layerType ${layerDescriptor.type}`);
   }

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

@@ -168,6 +168,7 @@ export enum STYLE_TYPE {
 export enum LAYER_STYLE_TYPE {
   VECTOR = 'VECTOR',
   HEATMAP = 'HEATMAP',
+  TILE = 'TILE',
 }
 
 export const COLOR_MAP_TYPE = {

x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts

@@ -6,7 +6,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { AGG_TYPE, GRID_RESOLUTION, RENDER_AS, SORT_ORDER, SCALING_TYPES } from '../constants';
-import { VectorStyleDescriptor } from './style_property_descriptor_types';
+import { StyleDescriptor, VectorStyleDescriptor } from './style_property_descriptor_types';
 import { DataRequestDescriptor } from './data_request_descriptor_types';
 
 export type AttributionDescriptor = {
@@ -17,6 +17,7 @@ export type AttributionDescriptor = {
 export type AbstractSourceDescriptor = {
   id?: string;
   type: string;
+  applyGlobalQuery?: boolean;
 };
 
 export type EMSTMSSourceDescriptor = AbstractSourceDescriptor & {
@@ -71,16 +72,15 @@ export type ESTermSourceDescriptor = AbstractESAggSourceDescriptor & {
   term: string; // term field name
 };
 
-export type KibanaRegionmapSourceDescriptor = {
-  type: string;
+export type KibanaRegionmapSourceDescriptor = AbstractSourceDescriptor & {
   name: string;
 };
 
-export type KibanaTilemapSourceDescriptor = {
+export type KibanaTilemapSourceDescriptor = AbstractSourceDescriptor & {
   type: string;
 };
 
-export type WMSSourceDescriptor = {
+export type WMSSourceDescriptor = AbstractSourceDescriptor & {
   type: string;
   serviceUrl: string;
   layers: string;
@@ -99,6 +99,8 @@ export type JoinDescriptor = {
   right: ESTermSourceDescriptor;
 };
 
+// todo : this union type is incompatible with dynamic extensibility of sources.
+// Reconsider using SourceDescriptor in type signatures for top-level classes
 export type SourceDescriptor =
   | XYZTMSSourceDescriptor
   | WMSSourceDescriptor
@@ -107,20 +109,28 @@ export type SourceDescriptor =
   | ESTermSourceDescriptor
   | ESSearchSourceDescriptor
   | ESGeoGridSourceDescriptor
+  | EMSTMSSourceDescriptor
   | EMSFileSourceDescriptor;
 
+export type Query = {
+  query?: string;
+  language?: string;
+};
+
 export type LayerDescriptor = {
   __dataRequests?: DataRequestDescriptor[];
   __isInErrorState?: boolean;
   __errorMessage?: string;
   alpha?: number;
   id: string;
-  label?: string;
+  label?: string | null;
   minZoom?: number;
   maxZoom?: number;
-  sourceDescriptor: SourceDescriptor;
+  sourceDescriptor: SourceDescriptor | null;
   type?: string;
   visible?: boolean;
+  style?: StyleDescriptor | null;
+  query?: Query;
 };
 
 export type VectorLayerDescriptor = LayerDescriptor & {

x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.d.ts

@@ -182,7 +182,11 @@ export type VectorStylePropertiesDescriptor = {
   [VECTOR_STYLES.LABEL_BORDER_SIZE]?: LabelBorderSizeStylePropertyDescriptor;
 };
 
-export type VectorStyleDescriptor = {
+export type StyleDescriptor = {
+  type: string;
+};
+
+export type VectorStyleDescriptor = StyleDescriptor & {
   type: LAYER_STYLE_TYPE.VECTOR;
   properties: VectorStylePropertiesDescriptor;
 };

x-pack/plugins/maps/public/layers/blended_vector_layer.ts

@@ -36,6 +36,8 @@ import {
   DynamicStylePropertyOptions,
   VectorLayerDescriptor,
 } from '../../common/descriptor_types';
+import { IStyle } from './styles/abstract_style';
+import { IVectorSource } from './sources/vector_source';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
 
@@ -167,7 +169,7 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     super(options);
 
     this._documentSource = this._source as IESSource; // VectorLayer constructor sets _source as document source
-    this._documentStyle = this._style; // VectorLayer constructor sets _style as document source
+    this._documentStyle = this._style as IVectorStyle; // VectorLayer constructor sets _style as document source
 
     this._clusterSource = getClusterSource(this._documentSource, this._documentStyle);
     const clusterStyleDescriptor = getClusterStyleDescriptor(
@@ -229,11 +231,11 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     return this._documentSource;
   }
 
-  getCurrentStyle() {
+  getCurrentStyle(): IStyle {
     return this._isClustered ? this._clusterStyle : this._documentStyle;
   }
 
-  getStyleForEditing() {
+  getStyleForEditing(): IStyle {
     return this._documentStyle;
   }
 
@@ -242,8 +244,8 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     const requestToken = Symbol(`layer-active-count:${this.getId()}`);
     const searchFilters = this._getSearchFilters(
       syncContext.dataFilters,
-      this.getSource(),
-      this.getCurrentStyle()
+      this.getSource() as IVectorSource,
+      this.getCurrentStyle() as IVectorStyle
     );
     const canSkipFetch = await canSkipSourceUpdate({
       source: this.getSource(),