[Maps] rename VectorLayer to GeoJsonVectorLayer and TiledVectorLayer …

…to MvtVectorLayer (#117207) * [Maps] rename VectorLayer to GeoJsonVectorLayer and TiledVectorLayer to MvtVectorLayer * fix jest test * eslint * review feedback * eslint Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Nov 8, 2021 · 635cad4 · 635cad4
1 parent b1e48fb
commit 635cad4
Show file tree

Hide file tree

Showing 42 changed files with 597 additions and 513 deletions.
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
@@ -85,7 +85,6 @@ export const SOURCE_DATA_REQUEST_ID = 'source';
 export const SOURCE_META_DATA_REQUEST_ID = `${SOURCE_DATA_REQUEST_ID}_${META_DATA_REQUEST_ID_SUFFIX}`;
 export const SOURCE_FORMATTERS_DATA_REQUEST_ID = `${SOURCE_DATA_REQUEST_ID}_${FORMATTERS_DATA_REQUEST_ID_SUFFIX}`;
 export const SOURCE_BOUNDS_DATA_REQUEST_ID = `${SOURCE_DATA_REQUEST_ID}_bounds`;
-export const SUPPORTS_FEATURE_EDITING_REQUEST_ID = 'SUPPORTS_FEATURE_EDITING_REQUEST_ID';
 
 export const MIN_ZOOM = 0;
 export const MAX_ZOOM = 24;

diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -61,7 +61,7 @@ import { MapSettings } from '../reducers/map';
 import { DrawState, MapCenterAndZoom, MapExtent, Timeslice } from '../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../common/constants';
 import { updateTooltipStateForLayer } from './tooltip_actions';
-import { VectorLayer } from '../classes/layers/vector_layer';
+import { isVectorLayer, IVectorLayer } from '../classes/layers/vector_layer';
 import { SET_DRAW_MODE } from './ui_actions';
 import { expandToTileBoundaries } from '../classes/util/geo_tile_utils';
 import { getToasts } from '../kibana_services';
@@ -357,12 +357,12 @@ export function addNewFeatureToIndex(geometry: Geometry | Position[]) {
       return;
     }
     const layer = getLayerById(layerId, getState());
-    if (!layer || !(layer instanceof VectorLayer)) {
+    if (!layer || !isVectorLayer(layer)) {
       return;
     }
 
     try {
-      await layer.addFeature(geometry);
+      await (layer as IVectorLayer).addFeature(geometry);
       await dispatch(syncDataForLayerDueToDrawing(layer));
     } catch (e) {
       getToasts().addError(e, {
@@ -385,11 +385,11 @@ export function deleteFeatureFromIndex(featureId: string) {
       return;
     }
     const layer = getLayerById(layerId, getState());
-    if (!layer || !(layer instanceof VectorLayer)) {
+    if (!layer || !isVectorLayer(layer)) {
       return;
     }
     try {
-      await layer.deleteFeature(featureId);
+      await (layer as IVectorLayer).deleteFeature(featureId);
       await dispatch(syncDataForLayerDueToDrawing(layer));
     } catch (e) {
       getToasts().addError(e, {

diff --git a/.../maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts b/.../maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
@@ -23,7 +23,7 @@ import {
   ESSearchSourceDescriptor,
 } from '../../../../common/descriptor_types';
 import { VectorStyle } from '../../styles/vector/vector_style';
-import { VectorLayer } from '../vector_layer';
+import { GeoJsonVectorLayer } from '../vector_layer';
 import { EMSFileSource } from '../../sources/ems_file_source';
 // @ts-ignore
 import { ESSearchSource } from '../../sources/es_search_source';
@@ -51,7 +51,7 @@ function createChoroplethLayerDescriptor({
     aggFieldName: '',
     rightSourceId: joinId,
   });
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     joins: [
       {
         leftField,

diff --git a/x-pack/plugins/maps/public/classes/layers/create_region_map_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/create_region_map_layer_descriptor.ts
@@ -22,7 +22,7 @@ import {
 } from '../../../common/constants';
 import { VectorStyle } from '../styles/vector/vector_style';
 import { EMSFileSource } from '../sources/ems_file_source';
-import { VectorLayer } from './vector_layer';
+import { GeoJsonVectorLayer } from './vector_layer';
 import { getDefaultDynamicProperties } from '../styles/vector/vector_style_defaults';
 import { NUMERICAL_COLOR_PALETTES } from '../styles/color_palettes';
 import { getJoinAggKey } from '../../../common/get_agg_key';
@@ -97,7 +97,7 @@ export function createRegionMapLayerDescriptor({
   if (termsSize !== undefined) {
     termSourceDescriptor.size = termsSize;
   }
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label,
     joins: [
       {

diff --git a/x-pack/plugins/maps/public/classes/layers/create_tile_map_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/create_tile_map_layer_descriptor.ts
@@ -24,7 +24,7 @@ import {
 } from '../../../common/constants';
 import { VectorStyle } from '../styles/vector/vector_style';
 import { ESGeoGridSource } from '../sources/es_geo_grid_source';
-import { VectorLayer } from './vector_layer';
+import { GeoJsonVectorLayer } from './vector_layer';
 import { HeatmapLayer } from './heatmap_layer';
 import { getDefaultDynamicProperties } from '../styles/vector/vector_style_defaults';
 import { NUMERICAL_COLOR_PALETTES } from '../styles/color_palettes';
@@ -162,7 +162,7 @@ export function createTileMapLayerDescriptor({
     };
   }
 
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label,
     sourceDescriptor: geoGridSourceDescriptor,
     style: VectorStyle.createDescriptor(styleProperties),

diff --git a/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx
@@ -12,7 +12,7 @@ import { FeatureCollection } from 'geojson';
 import { EuiPanel } from '@elastic/eui';
 import { DEFAULT_MAX_RESULT_WINDOW, SCALING_TYPES } from '../../../../common/constants';
 import { GeoJsonFileSource } from '../../sources/geojson_file_source';
-import { VectorLayer } from '../../layers/vector_layer';
+import { GeoJsonVectorLayer } from '../../layers/vector_layer';
 import { createDefaultLayerDescriptor } from '../../sources/es_search_source';
 import { RenderWizardArguments } from '../../layers/layer_wizard_registry';
 import { FileUploadGeoResults } from '../../../../../file_upload/public';
@@ -113,7 +113,7 @@ export class ClientFileCreateSourceEditor extends Component<RenderWizardArgument
         : null,
       name,
     });
-    const layerDescriptor = VectorLayer.createDescriptor(
+    const layerDescriptor = GeoJsonVectorLayer.createDescriptor(
       { sourceDescriptor },
       this.props.mapColors
     );

diff --git a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts
@@ -20,13 +20,11 @@ import { buildVectorRequestMeta } from '../build_vector_request_meta';
 const SCALED_PROPERTY_NAME = '__kbn_heatmap_weight__'; // unique name to store scaled value for weighting
 
 export class HeatmapLayer extends AbstractLayer {
-  static type = LAYER_TYPE.HEATMAP;
-
   private readonly _style: HeatmapStyle;
 
   static createDescriptor(options: Partial<HeatmapLayerDescriptor>) {
     const heatmapLayerDescriptor = super.createDescriptor(options);
-    heatmapLayerDescriptor.type = HeatmapLayer.type;
+    heatmapLayerDescriptor.type = LAYER_TYPE.HEATMAP;
     heatmapLayerDescriptor.style = HeatmapStyle.createDescriptor();
     return heatmapLayerDescriptor;
   }

diff --git a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx
@@ -10,7 +10,7 @@ import { EuiPanel, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { createNewIndexAndPattern } from './create_new_index_pattern';
 import { RenderWizardArguments } from '../layer_wizard_registry';
-import { VectorLayer } from '../vector_layer';
+import { GeoJsonVectorLayer } from '../vector_layer';
 import { ESSearchSource } from '../../sources/es_search_source';
 import { ADD_LAYER_STEP_ID } from '../../../connected_components/add_layer_panel/view';
 import { getFileUpload, getIndexNameFormComponent } from '../../../kibana_services';
@@ -127,7 +127,7 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
       geoField: 'coordinates',
       filterByMapBounds: false,
     });
-    const layerDescriptor = VectorLayer.createDescriptor(
+    const layerDescriptor = GeoJsonVectorLayer.createDescriptor(
       { sourceDescriptor },
       this.props.mapColors
     );

diff --git a/...ugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.ts b/...ugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.ts
@@ -33,7 +33,7 @@ import { DISPLAY } from './display_select';
 import { VectorStyle } from '../../../styles/vector/vector_style';
 import { EMSFileSource } from '../../../sources/ems_file_source';
 import { ESGeoGridSource } from '../../../sources/es_geo_grid_source';
-import { VectorLayer } from '../../vector_layer';
+import { GeoJsonVectorLayer } from '../../vector_layer';
 import { HeatmapLayer } from '../../heatmap_layer';
 import { getDefaultDynamicProperties } from '../../../styles/vector/vector_style_defaults';
 
@@ -164,7 +164,7 @@ export function createLayerDescriptor({
       aggFieldName: 'field' in metricsDescriptor ? metricsDescriptor.field : '',
       rightSourceId: joinId,
     });
-    return VectorLayer.createDescriptor({
+    return GeoJsonVectorLayer.createDescriptor({
       label,
       joins: [
         {
@@ -244,7 +244,7 @@ export function createLayerDescriptor({
     },
   };
 
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label,
     query: apmSourceQuery,
     sourceDescriptor: geoGridSourceDescriptor,

diff --git a/...k/plugins/maps/public/classes/layers/solution_layers/security/create_layer_descriptors.ts b/...k/plugins/maps/public/classes/layers/solution_layers/security/create_layer_descriptors.ts
@@ -22,7 +22,7 @@ import {
   SYMBOLIZE_AS_TYPES,
   VECTOR_STYLES,
 } from '../../../../../common/constants';
-import { VectorLayer } from '../../vector_layer';
+import { GeoJsonVectorLayer } from '../../vector_layer';
 import { VectorStyle } from '../../../styles/vector/vector_style';
 // @ts-ignore
 import { ESSearchSource } from '../../../sources/es_search_source';
@@ -93,7 +93,7 @@ function createSourceLayerDescriptor(indexPatternId: string, indexPatternTitle:
     [VECTOR_STYLES.ICON_SIZE]: { type: STYLE_TYPE.STATIC, options: { size: 8 } },
   };
 
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label: i18n.translate('xpack.maps.sescurity.sourceLayerLabel', {
       defaultMessage: '{indexPatternTitle} | Source Point',
       values: { indexPatternTitle },
@@ -146,7 +146,7 @@ function createDestinationLayerDescriptor(indexPatternId: string, indexPatternTi
     [VECTOR_STYLES.ICON_SIZE]: { type: STYLE_TYPE.STATIC, options: { size: 8 } },
   };
 
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label: i18n.translate('xpack.maps.sescurity.destinationLayerLabel', {
       defaultMessage: '{indexPatternTitle} | Destination point',
       values: { indexPatternTitle },
@@ -192,7 +192,7 @@ function createLineLayerDescriptor(indexPatternId: string, indexPatternTitle: st
     },
   };
 
-  return VectorLayer.createDescriptor({
+  return GeoJsonVectorLayer.createDescriptor({
     label: i18n.translate('xpack.maps.sescurity.lineLayerLabel', {
       defaultMessage: '{indexPatternTitle} | Line',
       values: { indexPatternTitle },

diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
@@ -11,11 +11,9 @@ import { SOURCE_DATA_REQUEST_ID, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../../.
 import { TileStyle } from '../../styles/tile/tile_style';
 
 export class TileLayer extends AbstractLayer {
-  static type = LAYER_TYPE.TILE;
-
   static createDescriptor(options, mapColors) {
     const tileLayerDescriptor = super.createDescriptor(options, mapColors);
-    tileLayerDescriptor.type = TileLayer.type;
+    tileLayerDescriptor.type = LAYER_TYPE.TILE;
     tileLayerDescriptor.alpha = _.get(options, 'alpha', 1);
     tileLayerDescriptor.style = { type: LAYER_STYLE_TYPE.TILE };
     return tileLayerDescriptor;

diff --git a/...ector_layer/blended_vector_layer.test.tsx → ...ector_layer/blended_vector_layer.test.tsx b/...ector_layer/blended_vector_layer.test.tsx → ...ector_layer/blended_vector_layer.test.tsx
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { SCALING_TYPES, SOURCE_TYPES } from '../../../../common/constants';
+import { SCALING_TYPES, SOURCE_TYPES } from '../../../../../common/constants';
 import { BlendedVectorLayer } from './blended_vector_layer';
-import { ESSearchSource } from '../../sources/es_search_source';
+import { ESSearchSource } from '../../../sources/es_search_source';
 import {
   AbstractESSourceDescriptor,
   ESGeoGridSourceDescriptor,
-} from '../../../../common/descriptor_types';
+} from '../../../../../common/descriptor_types';
 
-jest.mock('../../../kibana_services', () => {
+jest.mock('../../../../kibana_services', () => {
   return {
     getIsDarkMode() {
       return false;

diff --git a/...nded_vector_layer/blended_vector_layer.ts → ...nded_vector_layer/blended_vector_layer.ts b/...nded_vector_layer/blended_vector_layer.ts → ...nded_vector_layer/blended_vector_layer.ts
@@ -6,11 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IVectorLayer, VectorLayer } from '../vector_layer';
-import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
-import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
-import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
-import { IStyleProperty } from '../../styles/vector/properties/style_property';
+import { IVectorLayer } from '../vector_layer';
+import { GeoJsonVectorLayer } from '../geojson_vector_layer';
+import { IVectorStyle, VectorStyle } from '../../../styles/vector/vector_style';
+import { getDefaultDynamicProperties } from '../../../styles/vector/vector_style_defaults';
+import { IDynamicStyleProperty } from '../../../styles/vector/properties/dynamic_style_property';
+import { IStyleProperty } from '../../../styles/vector/properties/style_property';
 import {
   COUNT_PROP_LABEL,
   COUNT_PROP_NAME,
@@ -21,13 +22,13 @@ import {
   VECTOR_STYLES,
   LAYER_STYLE_TYPE,
   FIELD_ORIGIN,
-} from '../../../../common/constants';
-import { ESGeoGridSource } from '../../sources/es_geo_grid_source/es_geo_grid_source';
-import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
-import { IESSource } from '../../sources/es_source';
-import { ISource } from '../../sources/source';
-import { DataRequestContext } from '../../../actions';
-import { DataRequestAbortError } from '../../util/data_request';
+} from '../../../../../common/constants';
+import { ESGeoGridSource } from '../../../sources/es_geo_grid_source/es_geo_grid_source';
+import { canSkipSourceUpdate } from '../../../util/can_skip_fetch';
+import { IESSource } from '../../../sources/es_source';
+import { ISource } from '../../../sources/source';
+import { DataRequestContext } from '../../../../actions';
+import { DataRequestAbortError } from '../../../util/data_request';
 import {
   VectorStyleDescriptor,
   SizeDynamicOptions,
@@ -37,11 +38,11 @@ import {
   VectorLayerDescriptor,
   VectorSourceRequestMeta,
   VectorStylePropertiesDescriptor,
-} from '../../../../common/descriptor_types';
-import { IVectorSource } from '../../sources/vector_source';
-import { LICENSED_FEATURES } from '../../../licensed_features';
-import { ESSearchSource } from '../../sources/es_search_source/es_search_source';
-import { isSearchSourceAbortError } from '../../sources/es_source/es_source';
+} from '../../../../../common/descriptor_types';
+import { IVectorSource } from '../../../sources/vector_source';
+import { LICENSED_FEATURES } from '../../../../licensed_features';
+import { ESSearchSource } from '../../../sources/es_search_source/es_search_source';
+import { isSearchSourceAbortError } from '../../../sources/es_source/es_source';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
 
@@ -170,14 +171,12 @@ export interface BlendedVectorLayerArguments {
   layerDescriptor: VectorLayerDescriptor;
 }
 
-export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
-  static type = LAYER_TYPE.BLENDED_VECTOR;
-
+export class BlendedVectorLayer extends GeoJsonVectorLayer implements IVectorLayer {
   static createDescriptor(
     options: Partial<VectorLayerDescriptor>,
     mapColors: string[]
   ): VectorLayerDescriptor {
-    const layerDescriptor = VectorLayer.createDescriptor(options, mapColors);
+    const layerDescriptor = GeoJsonVectorLayer.createDescriptor(options, mapColors);
     layerDescriptor.type = LAYER_TYPE.BLENDED_VECTOR;
     return layerDescriptor;
   }

diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/blended_vector_layer/index.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/blended_vector_layer/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { BlendedVectorLayer } from './blended_vector_layer';
diff --git a/...s/vector_layer/assign_feature_ids.test.ts → ...n_vector_layer/assign_feature_ids.test.ts b/...s/vector_layer/assign_feature_ids.test.ts → ...n_vector_layer/assign_feature_ids.test.ts
diff --git a/...layers/vector_layer/assign_feature_ids.ts → ...eojson_vector_layer/assign_feature_ids.ts b/...layers/vector_layer/assign_feature_ids.ts → ...eojson_vector_layer/assign_feature_ids.ts