remove extra type changes

Author: shahzad31

x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/LayerList.ts

@@ -5,9 +5,11 @@
  */
 
 import {
+  EMSFileSourceDescriptor,
+  EMSTMSSourceDescriptor,
   ESTermSourceDescriptor,
-  LayerDescriptor,
-  VectorLayerDescriptor,
+  LayerDescriptor as BaseLayerDescriptor,
+  VectorLayerDescriptor as BaseVectorLayerDescriptor,
   VectorStyleDescriptor,
 } from '../../../../../../maps/common/descriptor_types';
 import {
@@ -45,6 +47,14 @@ export const TRANSACTION_DURATION_REGION =
 export const TRANSACTION_DURATION_COUNTRY =
   '__kbnjoin__avg_of_transaction.duration.us__3657625d-17b0-41ef-99ba-3a2b2938655c';
 
+interface LayerDescriptor extends BaseLayerDescriptor {
+  sourceDescriptor: EMSTMSSourceDescriptor;
+}
+
+interface VectorLayerDescriptor extends BaseVectorLayerDescriptor {
+  sourceDescriptor: EMSFileSourceDescriptor;
+}
+
 export function getLayerList() {
   const baseLayer: LayerDescriptor = {
     sourceDescriptor: { type: 'EMS_TMS', isAutoSelect: true },

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

@@ -8,12 +8,7 @@
 import { Query } from 'src/plugins/data/public';
 import { StyleDescriptor, VectorStyleDescriptor } from './style_property_descriptor_types';
 import { DataRequestDescriptor } from './data_request_descriptor_types';
-import {
-  AbstractSourceDescriptor,
-  EMSFileSourceDescriptor,
-  EMSTMSSourceDescriptor,
-  ESTermSourceDescriptor,
-} from './source_descriptor_types';
+import { AbstractSourceDescriptor, ESTermSourceDescriptor } from './source_descriptor_types';
 
 export type JoinDescriptor = {
   leftField?: string;
@@ -33,11 +28,7 @@ export type LayerDescriptor = {
   areLabelsOnTop?: boolean;
   minZoom?: number;
   maxZoom?: number;
-  sourceDescriptor:
-    | AbstractSourceDescriptor
-    | EMSFileSourceDescriptor
-    | EMSTMSSourceDescriptor
-    | null;
+  sourceDescriptor: AbstractSourceDescriptor | null;
   type?: string;
   visible?: boolean;
   style?: StyleDescriptor | null;

x-pack/plugins/maps/public/embeddable/types.ts

@@ -11,12 +11,7 @@ import {
   EmbeddableOutput,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../src/plugins/embeddable/public/lib/embeddables';
-import {
-  FieldFilter,
-  Query,
-  RefreshInterval,
-  TimeRange,
-} from '../../../../../src/plugins/data/common';
+import { Filter, Query, RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common';
 import { LayerDescriptor, MapCenterAndZoom } from '../../common/descriptor_types';
 
 export interface MapEmbeddableConfig {
@@ -32,7 +27,7 @@ export interface MapEmbeddableConfig {
 
 export interface MapEmbeddableInput extends EmbeddableInput {
   timeRange?: TimeRange;
-  filters: FieldFilter[];
+  filters: Filter[];
   query?: Query;
   refreshConfig: RefreshInterval;
   isLayerTOCOpen: boolean;