diff --git a/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
index 722fdd03ebc43..80e417f9dfa62 100644
--- a/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
@@ -132,6 +132,7 @@ export type LayerDescriptor = {
   __dataRequests?: DataRequestDescriptor[];
   __isInErrorState?: boolean;
   __errorMessage?: string;
+  __trackedLayerDescriptor?: LayerDescriptor;
   alpha?: number;
   id: string;
   label?: string | null;
diff --git a/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts
new file mode 100644
index 0000000000000..6da72fbbd8227
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IESTermSource } from '../sources/es_term_source';
+import { IJoin } from './join';
+import { JoinDescriptor } from '../../../common/descriptor_types';
+import { ISource } from '../sources/source';
+
+export class InnerJoin implements IJoin {
+  constructor(joinDescriptor: JoinDescriptor, leftSource: ISource);
+
+  getRightJoinSource(): IESTermSource;
+
+  toDescriptor(): JoinDescriptor;
+}
diff --git a/x-pack/plugins/maps/public/classes/joins/join.ts b/x-pack/plugins/maps/public/classes/joins/join.ts
index 7d402dc777fdc..6554f7581d99c 100644
--- a/x-pack/plugins/maps/public/classes/joins/join.ts
+++ b/x-pack/plugins/maps/public/classes/joins/join.ts
@@ -5,7 +5,10 @@
  */
 
 import { IESTermSource } from '../sources/es_term_source';
+import { JoinDescriptor } from '../../../common/descriptor_types';
 
 export interface IJoin {
   getRightJoinSource(): IESTermSource;
+
+  toDescriptor(): JoinDescriptor;
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index c46d22ef0bd88..d7343430e72f1 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -19,9 +19,7 @@ import {
   MIN_ZOOM,
   SOURCE_DATA_ID_ORIGIN,
 } from '../../../common/constants';
-// @ts-ignore
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { copyPersistentState } from '../../reducers/util.js';
+import { copyPersistentState } from '../../reducers/util';
 import {
   LayerDescriptor,
   MapExtent,
diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts
index 6f719d8abdcb9..fd39511060e40 100644
--- a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts
+++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts
@@ -14,5 +14,6 @@ interface ITileLayerArguments {
 }
 
 export class TileLayer extends AbstractLayer {
+  static type: string;
   constructor(args: ITileLayerArguments);
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
index 73785d4cc04e0..aa5bc3b09da90 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
@@ -32,6 +32,8 @@ export interface IVectorLayer extends ILayer {
 }
 
 export class VectorLayer extends AbstractLayer implements IVectorLayer {
+  static type: string;
+
   protected readonly _style: IVectorStyle;
   static createDescriptor(
     options: Partial<VectorLayerDescriptor>,
diff --git a/x-pack/plugins/maps/public/classes/sources/source.ts b/x-pack/plugins/maps/public/classes/sources/source.ts
index f53cf689fbfe5..a7bf6a19103f3 100644
--- a/x-pack/plugins/maps/public/classes/sources/source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source.ts
@@ -9,8 +9,6 @@
 import { ReactElement } from 'react';
 
 import { Adapters } from 'src/plugins/inspector/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-// @ts-ignore
 import { copyPersistentState } from '../../reducers/util';
 
 import { SourceDescriptor } from '../../../common/descriptor_types';
diff --git a/x-pack/plugins/maps/public/reducers/map.d.ts b/x-pack/plugins/maps/public/reducers/map.d.ts
index 20e1dc1035e19..8fc655b2c837a 100644
--- a/x-pack/plugins/maps/public/reducers/map.d.ts
+++ b/x-pack/plugins/maps/public/reducers/map.d.ts
@@ -22,6 +22,7 @@ export type MapContext = {
   zoom?: number;
   center?: MapCenter;
   scrollZoom: boolean;
+  buffer?: MapExtent;
   extent?: MapExtent;
   mouseCoordinates?: {
     lat: number;
diff --git a/x-pack/plugins/maps/public/reducers/map.js b/x-pack/plugins/maps/public/reducers/map.js
index a76267bb7095e..bdd9798ab4676 100644
--- a/x-pack/plugins/maps/public/reducers/map.js
+++ b/x-pack/plugins/maps/public/reducers/map.js
@@ -102,7 +102,7 @@ const updateLayerSourceDescriptorProp = (state, layerId, propName, value) => {
   return { ...state, layerList: updatedList };
 };
 
-const INITIAL_STATE = {
+export const DEFAULT_MAP_STATE = {
   ready: false,
   mapInitError: null,
   goto: null,
@@ -133,7 +133,7 @@ const INITIAL_STATE = {
   __rollbackSettings: null,
 };
 
-export function map(state = INITIAL_STATE, action) {
+export function map(state = DEFAULT_MAP_STATE, action) {
   switch (action.type) {
     case UPDATE_DRAW_STATE:
       return {
diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
index 6d216eb60c45d..c608c098a97e9 100644
--- a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
+++ b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
@@ -24,4 +24,4 @@ interface EventHandlers {
 
 export function setEventHandlers(eventHandlers?: EventHandlers): AnyAction;
 
-export function getInspectorAdapters(args: unknown): Adapters | undefined;
+export function getInspectorAdapters(args: unknown): Adapters;
diff --git a/x-pack/plugins/maps/public/reducers/store.d.ts b/x-pack/plugins/maps/public/reducers/store.d.ts
index 72713f943d6a6..1609ebce85794 100644
--- a/x-pack/plugins/maps/public/reducers/store.d.ts
+++ b/x-pack/plugins/maps/public/reducers/store.d.ts
@@ -16,3 +16,5 @@ export interface MapStoreState {
 export type MapStore = Store<MapStoreState>;
 
 export function createMapStore(): MapStore;
+
+export const DEFAULT_MAP_STORE_STATE: MapStoreState;
diff --git a/x-pack/plugins/maps/public/reducers/store.js b/x-pack/plugins/maps/public/reducers/store.js
index b5c4bb435e725..a1bc6b8e70139 100644
--- a/x-pack/plugins/maps/public/reducers/store.js
+++ b/x-pack/plugins/maps/public/reducers/store.js
@@ -6,10 +6,15 @@
 
 import { combineReducers, applyMiddleware, createStore, compose } from 'redux';
 import thunk from 'redux-thunk';
-import { ui } from './ui';
-import { map } from './map';
+import { ui, DEFAULT_MAP_UI_STATE } from './ui';
+import { map, DEFAULT_MAP_STATE } from './map'; // eslint-disable-line import/named
 import { nonSerializableInstances } from './non_serializable_instances';
 
+export const DEFAULT_MAP_STORE_STATE = {
+  ui: { ...DEFAULT_MAP_UI_STATE },
+  map: { ...DEFAULT_MAP_STATE },
+};
+
 export function createMapStore() {
   const enhancers = [applyMiddleware(thunk)];
   const rootReducer = combineReducers({
diff --git a/x-pack/plugins/maps/public/reducers/ui.ts b/x-pack/plugins/maps/public/reducers/ui.ts
index 537ea7fc7b24b..dad9fd2327103 100644
--- a/x-pack/plugins/maps/public/reducers/ui.ts
+++ b/x-pack/plugins/maps/public/reducers/ui.ts
@@ -44,7 +44,7 @@ export type MapUiState = {
 
 export const DEFAULT_IS_LAYER_TOC_OPEN = true;
 
-const INITIAL_STATE = {
+export const DEFAULT_MAP_UI_STATE = {
   flyoutDisplay: FLYOUT_STATE.NONE,
   isFullScreen: false,
   isReadOnly: false,
@@ -57,7 +57,7 @@ const INITIAL_STATE = {
 };
 
 // Reducer
-export function ui(state: MapUiState = INITIAL_STATE, action: any) {
+export function ui(state: MapUiState = DEFAULT_MAP_UI_STATE, action: any) {
   switch (action.type) {
     case UPDATE_FLYOUT:
       return { ...state, flyoutDisplay: action.display };
diff --git a/x-pack/plugins/maps/public/reducers/util.test.js b/x-pack/plugins/maps/public/reducers/util.test.ts
similarity index 100%
rename from x-pack/plugins/maps/public/reducers/util.test.js
rename to x-pack/plugins/maps/public/reducers/util.test.ts
diff --git a/x-pack/plugins/maps/public/reducers/util.js b/x-pack/plugins/maps/public/reducers/util.ts
similarity index 87%
rename from x-pack/plugins/maps/public/reducers/util.js
rename to x-pack/plugins/maps/public/reducers/util.ts
index e93eedbaebf50..614edcdb43807 100644
--- a/x-pack/plugins/maps/public/reducers/util.js
+++ b/x-pack/plugins/maps/public/reducers/util.ts
@@ -6,14 +6,15 @@
 
 export const TRACKED_LAYER_DESCRIPTOR = '__trackedLayerDescriptor';
 
-export function copyPersistentState(input) {
+export function copyPersistentState(input: any) {
   if (typeof input !== 'object' || input === null) {
-    //primitive
+    // primitive
     return input;
   }
   const copyInput = Array.isArray(input) ? [] : {};
   for (const key in input) {
     if (!key.startsWith('__')) {
+      // @ts-ignore
       copyInput[key] = copyPersistentState(input[key]);
     }
   }
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.d.ts b/x-pack/plugins/maps/public/selectors/map_selectors.d.ts
deleted file mode 100644
index e3a9596c9e374..0000000000000
--- a/x-pack/plugins/maps/public/selectors/map_selectors.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { MapCenter } from '../../common/descriptor_types';
-import { MapStoreState } from '../reducers/store';
-import { MapSettings } from '../reducers/map';
-import { IVectorLayer } from '../classes/layers/vector_layer/vector_layer';
-import { ILayer } from '../classes/layers/layer';
-
-export function getHiddenLayerIds(state: MapStoreState): string[];
-
-export function getMapZoom(state: MapStoreState): number;
-
-export function getMapCenter(state: MapStoreState): MapCenter;
-
-export function getQueryableUniqueIndexPatternIds(state: MapStoreState): string[];
-
-export function getMapSettings(state: MapStoreState): MapSettings;
-
-export function hasMapSettingsChanges(state: MapStoreState): boolean;
-
-export function isUsingSearch(state: MapStoreState): boolean;
-
-export function getSpatialFiltersLayer(state: MapStoreState): IVectorLayer;
-
-export function getLayerList(state: MapStoreState): ILayer[];
-export function getFittableLayers(state: MapStoreState): ILayer[];
-
-export function getSelectedLayer(state: MapStoreState): ILayer | undefined;
-
-export function getMapColors(state: MapStoreState): string[];
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/plugins/maps/public/selectors/map_selectors.test.ts
similarity index 82%
rename from x-pack/plugins/maps/public/selectors/map_selectors.test.js
rename to x-pack/plugins/maps/public/selectors/map_selectors.test.ts
index b6b192ecd9bca..7f50ca9045038 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.test.js
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.test.ts
@@ -26,13 +26,17 @@ jest.mock('../kibana_services', () => ({
   }),
 }));
 
+import { DEFAULT_MAP_STORE_STATE } from '../reducers/store';
 import { getTimeFilters } from './map_selectors';
 
 describe('getTimeFilters', () => {
   it('should return timeFilters when contained in state', () => {
     const state = {
+      ...DEFAULT_MAP_STORE_STATE,
       map: {
+        ...DEFAULT_MAP_STORE_STATE.map,
         mapState: {
+          ...DEFAULT_MAP_STORE_STATE.map.mapState,
           timeFilters: {
             to: '2001-01-01',
             from: '2001-12-31',
@@ -45,9 +49,12 @@ describe('getTimeFilters', () => {
 
   it('should return kibana time filters when not contained in state', () => {
     const state = {
+      ...DEFAULT_MAP_STORE_STATE,
       map: {
+        ...DEFAULT_MAP_STORE_STATE.map,
         mapState: {
-          timeFilters: null,
+          ...DEFAULT_MAP_STORE_STATE.map.mapState,
+          timeFilters: undefined,
         },
       },
     };
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.js b/x-pack/plugins/maps/public/selectors/map_selectors.ts
similarity index 56%
rename from x-pack/plugins/maps/public/selectors/map_selectors.js
rename to x-pack/plugins/maps/public/selectors/map_selectors.ts
index c2933dc3052cc..ff4738e506f4d 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -6,17 +6,23 @@
 
 import { createSelector } from 'reselect';
 import _ from 'lodash';
+import { Adapters } from 'src/plugins/inspector/public';
 import { TileLayer } from '../classes/layers/tile_layer/tile_layer';
+// @ts-ignore
 import { VectorTileLayer } from '../classes/layers/vector_tile_layer/vector_tile_layer';
 import { VectorLayer } from '../classes/layers/vector_layer/vector_layer';
+import { VectorStyle } from '../classes/styles/vector/vector_style';
+// @ts-ignore
 import { HeatmapLayer } from '../classes/layers/heatmap_layer/heatmap_layer';
 import { BlendedVectorLayer } from '../classes/layers/blended_vector_layer/blended_vector_layer';
 import { getTimeFilter } from '../kibana_services';
 import { getInspectorAdapters } from '../reducers/non_serializable_instances';
 import { TiledVectorLayer } from '../classes/layers/tiled_vector_layer/tiled_vector_layer';
 import { copyPersistentState, TRACKED_LAYER_DESCRIPTOR } from '../reducers/util';
+import { IJoin } from '../classes/joins/join';
 import { InnerJoin } from '../classes/joins/inner_join';
 import { getSourceByType } from '../classes/sources/source_registry';
+// @ts-ignore
 import { GeojsonFileSource } from '../classes/sources/client_file_source';
 import {
   LAYER_TYPE,
@@ -25,37 +31,67 @@ import {
   VECTOR_STYLES,
   SPATIAL_FILTERS_LAYER_ID,
 } from '../../common/constants';
+// @ts-ignore
 import { extractFeaturesFromFilters } from '../elasticsearch_geo_utils';
-
-function createLayerInstance(layerDescriptor, inspectorAdapters) {
-  const source = createSourceInstance(layerDescriptor.sourceDescriptor, inspectorAdapters);
+import { MapStoreState } from '../reducers/store';
+import {
+  DataRequestDescriptor,
+  DrawState,
+  Goto,
+  LayerDescriptor,
+  MapCenter,
+  MapExtent,
+  MapQuery,
+  MapRefreshConfig,
+  TooltipState,
+  VectorLayerDescriptor,
+} from '../../common/descriptor_types';
+import { MapSettings } from '../reducers/map';
+import { Filter, TimeRange } from '../../../../../src/plugins/data/public';
+import { ISource } from '../classes/sources/source';
+import { ITMSSource } from '../classes/sources/tms_source';
+import { IVectorSource } from '../classes/sources/vector_source';
+
+function createLayerInstance(layerDescriptor: LayerDescriptor, inspectorAdapters: Adapters) {
+  const source: ISource = createSourceInstance(layerDescriptor.sourceDescriptor, inspectorAdapters);
 
   switch (layerDescriptor.type) {
     case TileLayer.type:
-      return new TileLayer({ layerDescriptor, source });
+      return new TileLayer({ layerDescriptor, source: source as ITMSSource });
     case VectorLayer.type:
-      const joins = [];
-      if (layerDescriptor.joins) {
-        layerDescriptor.joins.forEach(joinDescriptor => {
+      const joins: IJoin[] = [];
+      const vectorLayerDescriptor = layerDescriptor as VectorLayerDescriptor;
+      if (vectorLayerDescriptor.joins) {
+        vectorLayerDescriptor.joins.forEach(joinDescriptor => {
           const join = new InnerJoin(joinDescriptor, source);
           joins.push(join);
         });
       }
-      return new VectorLayer({ layerDescriptor, source, joins });
+      return new VectorLayer({
+        layerDescriptor: vectorLayerDescriptor,
+        source: source as IVectorSource,
+        joins,
+      });
     case VectorTileLayer.type:
       return new VectorTileLayer({ layerDescriptor, source });
     case HeatmapLayer.type:
       return new HeatmapLayer({ layerDescriptor, source });
     case BlendedVectorLayer.type:
-      return new BlendedVectorLayer({ layerDescriptor, source });
+      return new BlendedVectorLayer({
+        layerDescriptor: layerDescriptor as VectorLayerDescriptor,
+        source: source as IVectorSource,
+      });
     case TiledVectorLayer.type:
-      return new TiledVectorLayer({ layerDescriptor, source });
+      return new TiledVectorLayer({
+        layerDescriptor: layerDescriptor as VectorLayerDescriptor,
+        source: source as IVectorSource,
+      });
     default:
       throw new Error(`Unrecognized layerType ${layerDescriptor.type}`);
   }
 }
 
-function createSourceInstance(sourceDescriptor, inspectorAdapters) {
+function createSourceInstance(sourceDescriptor: any, inspectorAdapters: Adapters): ISource {
   const source = getSourceByType(sourceDescriptor.type);
   if (!source) {
     throw new Error(`Unrecognized sourceType ${sourceDescriptor.type}`);
@@ -63,9 +99,10 @@ function createSourceInstance(sourceDescriptor, inspectorAdapters) {
   return new source.ConstructorFunction(sourceDescriptor, inspectorAdapters);
 }
 
-export const getMapSettings = ({ map }) => map.settings;
+export const getMapSettings = ({ map }: MapStoreState): MapSettings => map.settings;
 
-const getRollbackMapSettings = ({ map }) => map.__rollbackSettings;
+const getRollbackMapSettings = ({ map }: MapStoreState): MapSettings | null =>
+  map.__rollbackSettings;
 
 export const hasMapSettingsChanges = createSelector(
   getMapSettings,
@@ -75,76 +112,86 @@ export const hasMapSettingsChanges = createSelector(
   }
 );
 
-export const getOpenTooltips = ({ map }) => {
+export const getOpenTooltips = ({ map }: MapStoreState): TooltipState[] => {
   return map && map.openTooltips ? map.openTooltips : [];
 };
 
-export const getHasLockedTooltips = state => {
-  return getOpenTooltips(state).some(({ isLocked }) => {
+export const getHasLockedTooltips = (state: MapStoreState): boolean => {
+  return getOpenTooltips(state).some(({ isLocked }: TooltipState) => {
     return isLocked;
   });
 };
 
-export const getMapReady = ({ map }) => map && map.ready;
+export const getMapReady = ({ map }: MapStoreState): boolean => map && map.ready;
 
-export const getMapInitError = ({ map }) => map.mapInitError;
+export const getMapInitError = ({ map }: MapStoreState): string | null | undefined =>
+  map.mapInitError;
 
-export const getGoto = ({ map }) => map && map.goto;
+export const getGoto = ({ map }: MapStoreState): Goto | null | undefined => map && map.goto;
 
-export const getSelectedLayerId = ({ map }) => {
+export const getSelectedLayerId = ({ map }: MapStoreState): string | null => {
   return !map.selectedLayerId || !map.layerList ? null : map.selectedLayerId;
 };
 
-export const getTransientLayerId = ({ map }) => map.__transientLayerId;
+export const getTransientLayerId = ({ map }: MapStoreState): string | null =>
+  map.__transientLayerId;
 
-export const getLayerListRaw = ({ map }) => (map.layerList ? map.layerList : []);
+export const getLayerListRaw = ({ map }: MapStoreState): LayerDescriptor[] =>
+  map.layerList ? map.layerList : [];
 
-export const getWaitingForMapReadyLayerListRaw = ({ map }) =>
+export const getWaitingForMapReadyLayerListRaw = ({ map }: MapStoreState): LayerDescriptor[] =>
   map.waitingForMapReadyLayerList ? map.waitingForMapReadyLayerList : [];
 
-export const getScrollZoom = ({ map }) => map.mapState.scrollZoom;
+export const getScrollZoom = ({ map }: MapStoreState): boolean => map.mapState.scrollZoom;
 
-export const isInteractiveDisabled = ({ map }) => map.mapState.disableInteractive;
+export const isInteractiveDisabled = ({ map }: MapStoreState): boolean =>
+  map.mapState.disableInteractive;
 
-export const isTooltipControlDisabled = ({ map }) => map.mapState.disableTooltipControl;
+export const isTooltipControlDisabled = ({ map }: MapStoreState): boolean =>
+  map.mapState.disableTooltipControl;
 
-export const isToolbarOverlayHidden = ({ map }) => map.mapState.hideToolbarOverlay;
+export const isToolbarOverlayHidden = ({ map }: MapStoreState): boolean =>
+  map.mapState.hideToolbarOverlay;
 
-export const isLayerControlHidden = ({ map }) => map.mapState.hideLayerControl;
+export const isLayerControlHidden = ({ map }: MapStoreState): boolean =>
+  map.mapState.hideLayerControl;
 
-export const isViewControlHidden = ({ map }) => map.mapState.hideViewControl;
+export const isViewControlHidden = ({ map }: MapStoreState): boolean =>
+  map.mapState.hideViewControl;
 
-export const getMapExtent = ({ map }) => (map.mapState.extent ? map.mapState.extent : {});
+export const getMapExtent = ({ map }: MapStoreState): MapExtent | undefined => map.mapState.extent;
 
-export const getMapBuffer = ({ map }) => (map.mapState.buffer ? map.mapState.buffer : {});
+export const getMapBuffer = ({ map }: MapStoreState): MapExtent | undefined => map.mapState.buffer;
 
-export const getMapZoom = ({ map }) => (map.mapState.zoom ? map.mapState.zoom : 0);
+export const getMapZoom = ({ map }: MapStoreState): number =>
+  map.mapState.zoom ? map.mapState.zoom : 0;
 
-export const getMapCenter = ({ map }) =>
+export const getMapCenter = ({ map }: MapStoreState): MapCenter =>
   map.mapState.center ? map.mapState.center : { lat: 0, lon: 0 };
 
-export const getMouseCoordinates = ({ map }) => map.mapState.mouseCoordinates;
+export const getMouseCoordinates = ({ map }: MapStoreState) => map.mapState.mouseCoordinates;
 
-export const getTimeFilters = ({ map }) =>
+export const getTimeFilters = ({ map }: MapStoreState): TimeRange =>
   map.mapState.timeFilters ? map.mapState.timeFilters : getTimeFilter().getTime();
 
-export const getQuery = ({ map }) => map.mapState.query;
+export const getQuery = ({ map }: MapStoreState): MapQuery | undefined => map.mapState.query;
 
-export const getFilters = ({ map }) => map.mapState.filters;
+export const getFilters = ({ map }: MapStoreState): Filter[] => map.mapState.filters;
 
-export const isUsingSearch = state => {
+export const isUsingSearch = (state: MapStoreState): boolean => {
   const filters = getFilters(state).filter(filter => !filter.meta.disabled);
   const queryString = _.get(getQuery(state), 'query', '');
-  return filters.length || queryString.length;
+  return !!filters.length || !!queryString.length;
 };
 
-export const getDrawState = ({ map }) => map.mapState.drawState;
+export const getDrawState = ({ map }: MapStoreState): DrawState | undefined =>
+  map.mapState.drawState;
 
-export const isDrawingFilter = ({ map }) => {
+export const isDrawingFilter = ({ map }: MapStoreState): boolean => {
   return !!map.mapState.drawState;
 };
 
-export const getRefreshConfig = ({ map }) => {
+export const getRefreshConfig = ({ map }: MapStoreState): MapRefreshConfig => {
   if (map.mapState.refreshConfig) {
     return map.mapState.refreshConfig;
   }
@@ -156,19 +203,20 @@ export const getRefreshConfig = ({ map }) => {
   };
 };
 
-export const getRefreshTimerLastTriggeredAt = ({ map }) => map.mapState.refreshTimerLastTriggeredAt;
+export const getRefreshTimerLastTriggeredAt = ({ map }: MapStoreState): string | undefined =>
+  map.mapState.refreshTimerLastTriggeredAt;
 
-function getLayerDescriptor(state = {}, layerId) {
+function getLayerDescriptor(state: MapStoreState, layerId: string) {
   const layerListRaw = getLayerListRaw(state);
   return layerListRaw.find(layer => layer.id === layerId);
 }
 
-export function getDataRequestDescriptor(state = {}, layerId, dataId) {
+export function getDataRequestDescriptor(state: MapStoreState, layerId: string, dataId: string) {
   const layerDescriptor = getLayerDescriptor(state, layerId);
   if (!layerDescriptor || !layerDescriptor.__dataRequests) {
     return;
   }
-  return _.get(layerDescriptor, '__dataRequests', []).find(dataRequest => {
+  return layerDescriptor.__dataRequests.find((dataRequest: DataRequestDescriptor) => {
     return dataRequest.dataId === dataId;
   });
 }
@@ -208,34 +256,31 @@ export const getSpatialFiltersLayer = createSelector(
     );
 
     return new VectorLayer({
-      layerDescriptor: {
+      layerDescriptor: VectorLayer.createDescriptor({
         id: SPATIAL_FILTERS_LAYER_ID,
         visible: settings.showSpatialFilters,
         alpha: settings.spatialFiltersAlpa,
-        type: LAYER_TYPE.VECTOR,
         __dataRequests: [
           {
             dataId: SOURCE_DATA_ID_ORIGIN,
             data: featureCollection,
           },
         ],
-        style: {
-          properties: {
-            [VECTOR_STYLES.FILL_COLOR]: {
-              type: STYLE_TYPE.STATIC,
-              options: {
-                color: settings.spatialFiltersFillColor,
-              },
+        style: VectorStyle.createDescriptor({
+          [VECTOR_STYLES.FILL_COLOR]: {
+            type: STYLE_TYPE.STATIC,
+            options: {
+              color: settings.spatialFiltersFillColor,
             },
-            [VECTOR_STYLES.LINE_COLOR]: {
-              type: STYLE_TYPE.STATIC,
-              options: {
-                color: settings.spatialFiltersLineColor,
-              },
+          },
+          [VECTOR_STYLES.LINE_COLOR]: {
+            type: STYLE_TYPE.STATIC,
+            options: {
+              color: settings.spatialFiltersLineColor,
             },
           },
-        },
-      },
+        }),
+      }),
       source: new GeojsonFileSource(geoJsonSourceDescriptor),
     });
   }
@@ -253,8 +298,8 @@ export const getLayerList = createSelector(
 
 export const getFittableLayers = createSelector(getLayerList, layerList => {
   return layerList.filter(layer => {
-    //These are the only layer-types that implement bounding-box retrieval reliably
-    //This will _not_ work if Maps will allow register custom layer types
+    // These are the only layer-types that implement bounding-box retrieval reliably
+    // This will _not_ work if Maps will allow register custom layer types
     const isFittable =
       layer.getType() === LAYER_TYPE.VECTOR ||
       layer.getType() === LAYER_TYPE.BLENDED_VECTOR ||
@@ -280,25 +325,25 @@ export const getMapColors = createSelector(
   getTransientLayerId,
   getLayerListRaw,
   (transientLayerId, layerList) =>
-    layerList.reduce((accu, layer) => {
+    layerList.reduce((accu: string[], layer: LayerDescriptor) => {
       if (layer.id === transientLayerId) {
         return accu;
       }
-      const color = _.get(layer, 'style.properties.fillColor.options.color');
+      const color: string | undefined = _.get(layer, 'style.properties.fillColor.options.color');
       if (color) accu.push(color);
       return accu;
     }, [])
 );
 
 export const getSelectedLayerJoinDescriptors = createSelector(getSelectedLayer, selectedLayer => {
-  return selectedLayer.getJoins().map(join => {
+  return selectedLayer.getJoins().map((join: IJoin) => {
     return join.toDescriptor();
   });
 });
 
 // Get list of unique index patterns used by all layers
 export const getUniqueIndexPatternIds = createSelector(getLayerList, layerList => {
-  const indexPatternIds = [];
+  const indexPatternIds: string[] = [];
   layerList.forEach(layer => {
     indexPatternIds.push(...layer.getIndexPatternIds());
   });
@@ -307,7 +352,7 @@ export const getUniqueIndexPatternIds = createSelector(getLayerList, layerList =
 
 // Get list of unique index patterns, excluding index patterns from layers that disable applyGlobalQuery
 export const getQueryableUniqueIndexPatternIds = createSelector(getLayerList, layerList => {
-  const indexPatternIds = [];
+  const indexPatternIds: string[] = [];
   layerList.forEach(layer => {
     indexPatternIds.push(...layer.getQueryableIndexPatternIds());
   });