diff --git a/x-pack/plugins/gis/public/actions/store_actions.js b/x-pack/plugins/gis/public/actions/store_actions.js
index dc6a170b6f470..9c06a186e5b46 100644
--- a/x-pack/plugins/gis/public/actions/store_actions.js
+++ b/x-pack/plugins/gis/public/actions/store_actions.js
@@ -251,12 +251,35 @@ export function clearMouseCoordinates() {
   return { type: CLEAR_MOUSE_COORDINATES };
 }
 
-export function setGoto({ lat, lon, zoom }) {
+
+export function fitToLayerExtent(layerId) {
+  return async function (dispatch, getState) {
+    const targetLayer = getLayerList(getState()).find(layer => {
+      return layer.getId() === layerId;
+    });
+
+    if (targetLayer) {
+      const dataFilters = getDataFilters(getState());
+      const bounds = await targetLayer.getBounds(dataFilters);
+      if (bounds) {
+        await dispatch(setGotoWithBounds(bounds));
+      }
+    }
+  };
+}
+
+export function setGotoWithBounds(bounds) {
   return {
     type: SET_GOTO,
-    lat,
-    lon,
-    zoom,
+    bounds: bounds
+  };
+}
+
+
+export function setGotoWithCenter({ lat, lon, zoom }) {
+  return {
+    type: SET_GOTO,
+    center: { lat, lon, zoom }
   };
 }
 
diff --git a/x-pack/plugins/gis/public/angular/map_controller.js b/x-pack/plugins/gis/public/angular/map_controller.js
index f6128b429bd0f..2c45fdcd5eae6 100644
--- a/x-pack/plugins/gis/public/angular/map_controller.js
+++ b/x-pack/plugins/gis/public/angular/map_controller.js
@@ -17,7 +17,7 @@ import {
   setSelectedLayer,
   setTimeFilters,
   setRefreshConfig,
-  setGoto,
+  setGotoWithCenter,
   replaceLayerList,
   setQuery,
 } from '../actions/store_actions';
@@ -85,7 +85,7 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
       queryFromSavedObject = mapState.query;
       const timeFilters = mapState.timeFilters ? mapState.timeFilters : timefilter.getTime();
       store.dispatch(setTimeFilters(timeFilters));
-      store.dispatch(setGoto({
+      store.dispatch(setGotoWithCenter({
         lat: mapState.center.lat,
         lon: mapState.center.lon,
         zoom: mapState.zoom,
diff --git a/x-pack/plugins/gis/public/components/layer_panel/index.js b/x-pack/plugins/gis/public/components/layer_panel/index.js
index cd14860b7ccf3..4560660bcd733 100644
--- a/x-pack/plugins/gis/public/components/layer_panel/index.js
+++ b/x-pack/plugins/gis/public/components/layer_panel/index.js
@@ -7,6 +7,9 @@
 import { connect } from 'react-redux';
 import { LayerPanel } from './view';
 import { getSelectedLayer } from '../../selectors/map_selectors';
+import {
+  fitToLayerExtent
+} from '../../actions/store_actions';
 
 function mapStateToProps(state = {}) {
   return {
@@ -14,8 +17,12 @@ function mapStateToProps(state = {}) {
   };
 }
 
-function mapDispatchToProps(/* dispatch */) {
-  return {};
+function mapDispatchToProps(dispatch) {
+  return {
+    fitToBounds: (layerId) => {
+      dispatch(fitToLayerExtent(layerId));
+    }
+  };
 }
 
 const connectedLayerPanel = connect(mapStateToProps, mapDispatchToProps)(LayerPanel);
diff --git a/x-pack/plugins/gis/public/components/layer_panel/settings_panel/index.js b/x-pack/plugins/gis/public/components/layer_panel/settings_panel/index.js
index 2bbcbe3273e01..6a79f6fcd6bc9 100644
--- a/x-pack/plugins/gis/public/components/layer_panel/settings_panel/index.js
+++ b/x-pack/plugins/gis/public/components/layer_panel/settings_panel/index.js
@@ -24,7 +24,7 @@ function mapStateToProps(state = {}) {
     maxZoom: selectedLayer.getMaxZoom(),
     minZoom: selectedLayer.getMinZoom(),
     renderSourceDetails: selectedLayer.renderSourceDetails,
-    renderSourceSettingsEditor: selectedLayer.renderSourceSettingsEditor,
+    renderSourceSettingsEditor: selectedLayer.renderSourceSettingsEditor
   };
 }
 
diff --git a/x-pack/plugins/gis/public/components/layer_panel/view.js b/x-pack/plugins/gis/public/components/layer_panel/view.js
index 1e827f74b598f..6c46c94c75602 100644
--- a/x-pack/plugins/gis/public/components/layer_panel/view.js
+++ b/x-pack/plugins/gis/public/components/layer_panel/view.js
@@ -12,6 +12,7 @@ import { FlyoutFooter } from './flyout_footer';
 import { SettingsPanel } from './settings_panel';
 
 import {
+  EuiButtonIcon,
   EuiFlexItem,
   EuiTitle,
   EuiPanel,
@@ -70,7 +71,9 @@ export class LayerPanel  extends React.Component {
         <EuiFlyoutHeader hasBorder className="gisLayerPanel__header">
           <EuiFlexGroup responsive={false} alignItems="center" gutterSize="s">
             <EuiFlexItem grow={false}>
-              {selectedLayer.getIcon()}
+              <EuiButtonIcon iconType={selectedLayer.getLayerTypeIconName()} iconSide="right" onClick={this.props.fitToBounds}>
+                Fit
+              </EuiButtonIcon>
             </EuiFlexItem>
             <EuiFlexItem>
               <EuiTitle size="s">
diff --git a/x-pack/plugins/gis/public/components/map/mb/view.js b/x-pack/plugins/gis/public/components/map/mb/view.js
index b8033c7e54ed4..6b5d3db00487f 100644
--- a/x-pack/plugins/gis/public/components/map/mb/view.js
+++ b/x-pack/plugins/gis/public/components/map/mb/view.js
@@ -10,6 +10,7 @@ import { ResizeChecker } from 'ui/resize_checker';
 import { syncLayerOrder, removeOrphanedSourcesAndLayers, createMbMapInstance } from './utils';
 import { inspectorAdapters } from '../../../kibana_services';
 import { DECIMAL_DEGREES_PRECISION, ZOOM_PRECISION } from '../../../../common/constants';
+import mapboxgl from 'mapbox-gl';
 
 export class MBMapContainer extends React.Component {
 
@@ -61,7 +62,8 @@ export class MBMapContainer extends React.Component {
   }
 
   async _initializeMap() {
-    this._mbMap = await createMbMapInstance(this.refs.mapContainer, this.props.goto);
+
+    this._mbMap = await createMbMapInstance(this.refs.mapContainer, this.props.goto ? this.props.goto.center : null);
 
     // Override mapboxgl.Map "on" and "removeLayer" methods so we can track layer listeners
     // Tracked layer listerners are used to clean up event handlers
@@ -88,6 +90,7 @@ export class MBMapContainer extends React.Component {
 
     this.assignSizeWatch();
 
+
     // moveend callback is debounced to avoid updating map extent state while map extent is still changing
     // moveend is fired while the map extent is still changing in the following scenarios
     // 1) During opening/closing of layer details panel, the EUI animation results in 8 moveend events
@@ -169,11 +172,23 @@ export class MBMapContainer extends React.Component {
     }
 
     clearGoto();
-    this._mbMap.setZoom(goto.zoom);
-    this._mbMap.setCenter({
-      lng: goto.lon,
-      lat: goto.lat
-    });
+
+    if (goto.bounds) {
+      //clamping ot -89/89 latitudes since Mapboxgl does not seem to handle bounds that contain the poles (logs errors to the console when using -90/90)
+      const lnLatBounds = new mapboxgl.LngLatBounds(
+        new mapboxgl.LngLat(clamp(goto.bounds.min_lon, -180, 180), clamp(goto.bounds.min_lat, -89, 89)),
+        new mapboxgl.LngLat(clamp(goto.bounds.max_lon, -180, 180), clamp(goto.bounds.max_lat, -89, 89)),
+      );
+      this._mbMap.fitBounds(lnLatBounds);
+    } else if (goto.center) {
+      this._mbMap.setZoom(goto.center.zoom);
+      this._mbMap.setCenter({
+        lng: goto.center.lon,
+        lat: goto.center.lat
+      });
+    }
+
+
   };
 
   _syncMbMapWithLayerList = () => {
@@ -217,3 +232,10 @@ export class MBMapContainer extends React.Component {
     );
   }
 }
+
+
+function clamp(val, min, max) {
+  if (val > max) val = max;
+  else if (val < min) val = min;
+  return val;
+}
diff --git a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/_toc_entry.scss b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/_toc_entry.scss
index 403c3e89a4391..6f699c5dc5ec7 100644
--- a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/_toc_entry.scss
+++ b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/_toc_entry.scss
@@ -11,6 +11,10 @@
   opacity: 0.5;
 }
 
+.gisTocEntry__grab {
+  margin-left: $euiSizeXS;
+}
+
 .gisTocEntry__grab:hover {
   cursor: grab;
 }
diff --git a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/index.js b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/index.js
index a8ba35f8aa0be..c774fe7ecd756 100644
--- a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/index.js
+++ b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/index.js
@@ -6,9 +6,9 @@
 
 import _ from 'lodash';
 import { connect } from 'react-redux';
-import { TOCEntry } from './toc_entry';
+import { TOCEntry } from './view';
 import { updateFlyout, FLYOUT_STATE } from '../../../../../store/ui';
-import { setSelectedLayer, toggleLayerVisible } from '../../../../../actions/store_actions';
+import { fitToLayerExtent, setSelectedLayer, toggleLayerVisible } from '../../../../../actions/store_actions';
 
 function mapStateToProps(state = {}) {
   return {
@@ -22,7 +22,12 @@ function mapDispatchToProps(dispatch) {
       dispatch(setSelectedLayer(layerId));
       dispatch(updateFlyout(FLYOUT_STATE.LAYER_PANEL));
     },
-    toggleVisible: layerId => dispatch(toggleLayerVisible(layerId))
+    toggleVisible: layerId => {
+      dispatch(toggleLayerVisible(layerId));
+    },
+    fitToBounds: (layerId) => {
+      dispatch(fitToLayerExtent(layerId));
+    }
   });
 }
 
diff --git a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry.js b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
similarity index 53%
rename from x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry.js
rename to x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
index 3789ad2c0df9f..0ad1a9e10fa52 100644
--- a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry.js
+++ b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
@@ -9,12 +9,9 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
-  EuiLoadingSpinner,
-  EuiToolTip,
-  EuiIconTip,
   EuiSpacer
 } from '@elastic/eui';
-import { VisibilityToggle } from '../../../../../shared/components/visibility_toggle';
+import { LayerTocActions } from '../../../../../shared/components/layer_toc_actions';
 
 export class TOCEntry extends React.Component {
 
@@ -26,69 +23,44 @@ export class TOCEntry extends React.Component {
 
   componentDidMount() {
     this._isMounted = true;
+    this._updateDisplayName();
   }
 
   componentWillUnmount() {
     this._isMounted = false;
   }
 
-  _renderVisibilityToggle() {
-    const { layer, toggleVisible } = this.props;
-    return (
-      <VisibilityToggle
-        id={layer.getId()}
-        checked={layer.isVisible()}
-        onChange={() => toggleVisible(layer.getId())}
-        size={'l'}
-      >
-        {layer.getIcon()}
-      </VisibilityToggle>
-    );
-  }
 
-  render() {
-
-    const { layer, openLayerPanel, zoom } = this.props;
-
-    const displayName = layer.getDisplayName();
-    Promise.resolve(displayName).then(label => {
-      if (this._isMounted) {
-        if (label !== this.state.displayName) {
-          this.setState({
-            displayName: label
-          });
-        }
+  async _updateDisplayName() {
+    const label = await this.props.layer.getDisplayName();
+    if (this._isMounted) {
+      if (label !== this.state.displayName) {
+        this.setState({
+          displayName: label
+        });
       }
-    });
-
-    let visibilityIndicator;
-    if (layer.dataHasLoadError()) {
-      visibilityIndicator = (
-        <EuiIconTip
-          aria-label="Load warning"
-          size="m"
-          type="alert"
-          color="warning"
-          content={layer.getDataLoadError()}
-        />
-      );
-    } else if (layer.isLayerLoading()) {
-      visibilityIndicator = <EuiLoadingSpinner size="m"/>;
-    } else if (!layer.showAtZoomLevel(zoom)) {
-      const { minZoom, maxZoom } = layer.getZoomConfig();
-      visibilityIndicator = (
-        <EuiToolTip
-          position="left"
-          content={`Map is at zoom level ${zoom}.
-          This layer is only visible between zoom levels ${minZoom} to ${maxZoom}.`}
-        >
-          {this._renderVisibilityToggle()}
-        </EuiToolTip>
-      );
-    } else {
-      visibilityIndicator = this._renderVisibilityToggle();
     }
+  }
 
+  componentDidUpdate() {
+    this._updateDisplayName();
+  }
+
+  render() {
+
+    const { layer, openLayerPanel, zoom, toggleVisible, fitToBounds } = this.props;
+    const legendIcon = (
+      <LayerTocActions
+        layer={layer}
+        fitToBounds={() => {
+          fitToBounds(layer.getId());
+        }}
+        zoom={zoom}
+        toggleVisible={() => {
+          toggleVisible(layer.getId());
+        }}
+      />
+    );
     let tocDetails = layer.getTOCDetails();
     if (tocDetails) {
       tocDetails = (
@@ -106,7 +78,7 @@ export class TOCEntry extends React.Component {
         data-layerid={layer.getId()}
       >
         <EuiFlexGroup
-          gutterSize="s"
+          gutterSize="none"
           alignItems="center"
           responsive={false}
           className={
@@ -114,7 +86,7 @@ export class TOCEntry extends React.Component {
           }
         >
           <EuiFlexItem grow={false}>
-            {visibilityIndicator}
+            { legendIcon }
           </EuiFlexItem>
           <EuiFlexItem>
             <button
diff --git a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/view.js b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/view.js
index 86676058392dd..c241e7fdb9543 100644
--- a/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/view.js
+++ b/x-pack/plugins/gis/public/components/widget_overlay/layer_control/layer_toc/view.js
@@ -51,7 +51,7 @@ export class LayerTOC extends React.Component {
   render() {
     const layerEntries = this._renderLayers();
     return (
-      <div className="layerTOC" ref={node => this._domContainer = node}>
+      <div ref={node => this._domContainer = node}>
         {layerEntries}
       </div>
     );
diff --git a/x-pack/plugins/gis/public/components/widget_overlay/view_control/set_view/index.js b/x-pack/plugins/gis/public/components/widget_overlay/view_control/set_view/index.js
index 594de9d520b59..0659c74330820 100644
--- a/x-pack/plugins/gis/public/components/widget_overlay/view_control/set_view/index.js
+++ b/x-pack/plugins/gis/public/components/widget_overlay/view_control/set_view/index.js
@@ -6,7 +6,7 @@
 
 import { connect } from 'react-redux';
 import { SetView } from './set_view';
-import { setGoto } from '../../../../actions/store_actions';
+import { setGotoWithCenter } from '../../../../actions/store_actions';
 import { getMapZoom, getMapCenter } from "../../../../selectors/map_selectors";
 import { closeSetView } from '../../../../store/ui';
 
@@ -21,7 +21,7 @@ function mapDispatchToProps(dispatch) {
   return {
     onSubmit: ({ lat, lon, zoom }) => {
       dispatch(closeSetView());
-      dispatch(setGoto({ lat, lon, zoom }));
+      dispatch(setGotoWithCenter({ lat, lon, zoom }));
     }
   };
 }
diff --git a/x-pack/plugins/gis/public/shared/components/_index.scss b/x-pack/plugins/gis/public/shared/components/_index.scss
index 92f80a4d62aaa..4ddda7ea571a0 100644
--- a/x-pack/plugins/gis/public/shared/components/_index.scss
+++ b/x-pack/plugins/gis/public/shared/components/_index.scss
@@ -1,2 +1 @@
 @import './map_listing';
-@import './visibility_toggle';
diff --git a/x-pack/plugins/gis/public/shared/components/_visibility_toggle.scss b/x-pack/plugins/gis/public/shared/components/_visibility_toggle.scss
deleted file mode 100644
index d8dea14f5025e..0000000000000
--- a/x-pack/plugins/gis/public/shared/components/_visibility_toggle.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.gisVisibilityToggle {
-  position: relative;
-  display: inline-block;
-  min-height: 20px;
-
-  .gisVisibilityToggle__body {
-    line-height: 19px;
-
-    > * {
-      vertical-align: baseline;
-    }
-  }
-
-  .gisVisibilityToggle__content {
-    svg {
-      display: inline-block;
-      vertical-align: middle;
-    }
-
-    .filter {
-      display: none;
-    }
-  }
-
-  .gisVisibilityToggle__eye,
-  .gisVisibilityToggle__eyeClosed,
-  .gisVisibilityToggle__content {
-    transition: opacity .2s ease-in-out;
-  }
-
-  .gisVisibilityToggle__eye,
-  .gisVisibilityToggle__eyeClosed {
-    position: absolute;
-    left: 0;
-    top: 0;
-    opacity: 0;
-    z-index: 1;
-  }
-
-  .gisVisibilityToggle__input {
-    z-index: 2;
-    position: absolute;
-    opacity: 0;
-    width: 100%;
-    height: 100%;
-    cursor: pointer;
-  }
-
-  .gisVisibilityToggle__body {
-    @include size($euiSize);
-    display: block;
-  }
-
-  &:hover,
-  &:focus {
-    cursor: pointer;
-    color: $euiColorPrimary;
-
-    .gisVisibilityToggle__content {
-      opacity: 0;
-    }
-
-    .gisVisibilityToggle__input:checked {
-      + .gisVisibilityToggle__body > .gisVisibilityToggle__eye {
-        opacity: 1;
-      }
-    }
-  }
-
-  .gisVisibilityToggle__input:not(:checked) {
-    + .gisVisibilityToggle__body > .gisVisibilityToggle__content {
-      opacity: 0;
-    }
-    + .gisVisibilityToggle__body > .gisVisibilityToggle__eyeClosed {
-      opacity: 1;
-    }
-  }
-}
diff --git a/x-pack/plugins/gis/public/shared/components/layer_toc_actions.js b/x-pack/plugins/gis/public/shared/components/layer_toc_actions.js
new file mode 100644
index 0000000000000..da07fbfc335c9
--- /dev/null
+++ b/x-pack/plugins/gis/public/shared/components/layer_toc_actions.js
@@ -0,0 +1,161 @@
+/*
+ * 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 React, { Component } from 'react';
+
+import {
+  EuiButtonEmpty,
+  EuiPopover,
+  EuiContextMenu,
+  EuiIcon,
+  EuiLoadingSpinner,
+  EuiToolTip,
+  EuiIconTip
+} from '@elastic/eui';
+
+
+function flattenPanelTree(tree, array = []) {
+  array.push(tree);
+
+  if (tree.items) {
+    tree.items.forEach(item => {
+      if (item.panel) {
+        flattenPanelTree(item.panel, array);
+        item.panel = item.panel.id;
+      }
+    });
+  }
+
+  return array;
+}
+
+export class LayerTocActions extends Component {
+
+
+  state = {
+    isPopoverOpen: false
+  };
+
+  _onClick = () => {
+    this.setState(prevState => ({
+      isPopoverOpen: !prevState.isPopoverOpen,
+    }));
+  };
+
+  _closePopover = () => {
+    this.setState(() => ({
+      isPopoverOpen: false
+    }));
+  };
+
+  _renderButton() {
+    const icon = this._renderIcon();
+    return (
+      <EuiButtonEmpty
+        size="xs"
+        flush="left"
+        color="text"
+        onClick={this._onClick}
+      >
+        {icon}
+      </EuiButtonEmpty>);
+  }
+
+
+  _getVisbilityIcon() {
+    const iconType = this.props.layer.isVisible() ? 'eye' : 'eyeClosed';
+    return (
+      <EuiIcon
+        type={iconType}
+        size="m"
+      />);
+  }
+
+  _renderIcon() {
+    const { zoom, layer } = this.props;
+    let smallLegendIcon;
+    if (layer.dataHasLoadError()) {
+      smallLegendIcon = (
+        <EuiIconTip
+          aria-label="Load warning"
+          size="m"
+          type="alert"
+          color="warning"
+          content={layer.getDataLoadError()}
+        />
+      );
+    } else if (layer.isLayerLoading()) {
+      smallLegendIcon = <EuiLoadingSpinner size="m"/>;
+    } else if (!layer.showAtZoomLevel(zoom)) {
+      const { minZoom, maxZoom } = layer.getZoomConfig();
+      const icon = layer.getIcon();
+      smallLegendIcon = (
+        <EuiToolTip
+          position="top"
+          content={`Map is at zoom level ${zoom}.
+          This layer is only visible between zoom levels ${minZoom} to ${maxZoom}.`}
+        >
+          {icon}
+        </EuiToolTip>
+      );
+    } else {
+      smallLegendIcon = layer.getIcon();
+    }
+    return smallLegendIcon;
+  }
+
+  _getPanels() {
+
+    const visibilityToggle = this._getVisbilityIcon();
+    const panelTree = {
+      id: 0,
+      title: 'Layer actions',
+      items: [
+        {
+          name: 'Fit to data',
+          icon: (
+            <EuiIcon
+              type="search"
+              size="m"
+            />
+          ),
+          onClick: () => {
+            this._closePopover();
+            this.props.fitToBounds();
+          },
+        },
+        {
+          name: this.props.layer.isVisible() ? 'Hide layer' : 'Show layer',
+          icon: visibilityToggle,
+          onClick: () => {
+            this._closePopover();
+            this.props.toggleVisible();
+          }
+        }
+      ],
+    };
+
+    return flattenPanelTree(panelTree);
+  }
+
+  render() {
+    return (
+      <EuiPopover
+        id="contextMenu"
+        button={this._renderButton()}
+        isOpen={this.state.isPopoverOpen}
+        closePopover={this._closePopover}
+        panelPaddingSize="none"
+        withTitle
+        anchorPosition="leftUp"
+      >
+        <EuiContextMenu
+          initialPanelId={0}
+          panels={this._getPanels()}
+        />
+      </EuiPopover>);
+  }
+}
diff --git a/x-pack/plugins/gis/public/shared/components/visibility_toggle.js b/x-pack/plugins/gis/public/shared/components/visibility_toggle.js
deleted file mode 100644
index 5438fa710c474..0000000000000
--- a/x-pack/plugins/gis/public/shared/components/visibility_toggle.js
+++ /dev/null
@@ -1,66 +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 React from 'react';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import {
-  EuiIcon
-} from '@elastic/eui';
-
-//import { EuiIcon } from '../../icon';
-
-export const VisibilityToggle = ({
-  id,
-  name,
-  checked,
-  disabled,
-  onChange,
-  children,
-  className
-}) => {
-  const classes = classNames('gisVisibilityToggle', className);
-
-  return (
-    <div className={classes}>
-      <input
-        className="gisVisibilityToggle__input"
-        name={name}
-        id={id}
-        type="checkbox"
-        checked={checked}
-        disabled={disabled}
-        onChange={onChange}
-      />
-
-      <span className="gisVisibilityToggle__body">
-        <span className="gisVisibilityToggle__eye" >
-          <EuiIcon
-            type={'eye'}
-          />
-        </span>
-        <span className="gisVisibilityToggle__eyeClosed" >
-          <EuiIcon
-            type={'eyeClosed'}
-          />
-        </span>
-        <span className="gisVisibilityToggle__content">
-          {children}
-        </span>
-      </span>
-    </div>
-  );
-};
-
-VisibilityToggle.propTypes = {
-  name: PropTypes.string,
-  id: PropTypes.string,
-  label: PropTypes.node,
-  checked: PropTypes.bool,
-  onChange: PropTypes.func,
-  disabled: PropTypes.bool,
-  children: PropTypes.element.isRequired,
-};
diff --git a/x-pack/plugins/gis/public/shared/icons/additional_layer_icons.js b/x-pack/plugins/gis/public/shared/icons/additional_layer_icons.js
index f45302b0b00bf..bf23450a29cb5 100644
--- a/x-pack/plugins/gis/public/shared/icons/additional_layer_icons.js
+++ b/x-pack/plugins/gis/public/shared/icons/additional_layer_icons.js
@@ -9,6 +9,7 @@ import React from 'react';
 
 export const FillableCircle = ({ style }) => (
   <svg
+    className="euiIcon euiIcon--medium"
     xmlns="http://www.w3.org/2000/svg"
     width="16"
     height="16"
@@ -52,4 +53,4 @@ export const FillableVector = ({ style }) => (
   >
     <rect width="15" height="15" x=".5" y=".5" style={style} rx="4"/>
   </svg>
-);
\ No newline at end of file
+);
diff --git a/x-pack/plugins/gis/public/shared/layers/heatmap_layer.js b/x-pack/plugins/gis/public/shared/layers/heatmap_layer.js
index 8459dd833f4ce..906dade3aa3d3 100644
--- a/x-pack/plugins/gis/public/shared/layers/heatmap_layer.js
+++ b/x-pack/plugins/gis/public/shared/layers/heatmap_layer.js
@@ -6,14 +6,14 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { ALayer } from './layer';
+import { AbstractLayer } from './layer';
 import { EuiIcon } from '@elastic/eui';
 import { HeatmapStyle } from './styles/heatmap_style';
 import { getGeohashPrecisionForZoom } from '../utils/zoom_to_precision';
 
 const SCALED_PROPERTY_NAME = '__kbn_heatmap_weight__';//unique name to store scaled value for weighting
 
-export class HeatmapLayer extends ALayer {
+export class HeatmapLayer extends AbstractLayer {
 
   static type = "HEATMAP";
 
@@ -75,7 +75,7 @@ export class HeatmapLayer extends ALayer {
     }
 
     const propertyKey = this._getPropKeyOfSelectedMetric();
-    const dataBoundToMap = ALayer.getBoundDataForSource(mbMap, this.getId());
+    const dataBoundToMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId());
     if (featureCollection !== dataBoundToMap) {
       let max = 0;
       for (let i = 0; i < featureCollection.features.length; i++) {
@@ -97,6 +97,9 @@ export class HeatmapLayer extends ALayer {
     mbMap.setLayerZoomRange(heatmapLayerId, this._descriptor.minZoom, this._descriptor.maxZoom);
   }
 
+  async getBounds(filters) {
+    return await this._source.getBoundsForFilters(filters);
+  }
 
   async syncData({ startLoading, stopLoading, onLoadError, dataFilters }) {
     if (!this.isVisible() || !this.showAtZoomLevel(dataFilters.zoom)) {
@@ -150,11 +153,10 @@ export class HeatmapLayer extends ALayer {
     startLoading('source', requestToken, dataMeta);
     try {
       const layerName = await this.getDisplayName();
-      const data = await this._source.getGeoJsonPoints({
+      const data = await this._source.getGeoJsonPoints({ layerName }, {
         geohashPrecision: geohashPrecision,
-        extent: buffer,
+        buffer: buffer,
         timeFilters,
-        layerName,
         query,
       });
       stopLoading('source', requestToken, data);
@@ -163,10 +165,14 @@ export class HeatmapLayer extends ALayer {
     }
   }
 
+  getLayerTypeIconName() {
+    return 'heatmap';
+  }
+
   getIcon() {
     return (
       <EuiIcon
-        type={'heatmap'}
+        type={this.getLayerTypeIconName()}
       />
     );
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/layer.js b/x-pack/plugins/gis/public/shared/layers/layer.js
index 5018ff3bd3f95..829885012b710 100644
--- a/x-pack/plugins/gis/public/shared/layers/layer.js
+++ b/x-pack/plugins/gis/public/shared/layers/layer.js
@@ -11,10 +11,10 @@ import { DataRequest } from './util/data_request';
 const SOURCE_UPDATE_REQUIRED = true;
 const NO_SOURCE_UPDATE_REQUIRED = false;
 
-export class ALayer {
+export class AbstractLayer {
 
   constructor({ layerDescriptor, source, style }) {
-    this._descriptor = ALayer.createDescriptor(layerDescriptor);
+    this._descriptor = AbstractLayer.createDescriptor(layerDescriptor);
     this._source = source;
     this._style = style;
 
@@ -201,6 +201,20 @@ export class ALayer {
       : SOURCE_UPDATE_REQUIRED;
   }
 
+  getLayerTypeIconName() {
+    throw new Error('should implement Layer#getLayerTypeIconName');
+  }
+
+
+  async getBounds() {
+    return {
+      min_lon: -180,
+      max_lon: 180,
+      min_lat: -89,
+      max_lat: 89
+    };
+  }
+
   renderStyleEditor(style, options) {
     return style.renderEditor(options);
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/layer.test.js b/x-pack/plugins/gis/public/shared/layers/layer.test.js
index 06fd4778d2b6a..98be0855cd4b7 100644
--- a/x-pack/plugins/gis/public/shared/layers/layer.test.js
+++ b/x-pack/plugins/gis/public/shared/layers/layer.test.js
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ALayer } from './layer';
+import { AbstractLayer } from './layer';
 
 describe('layer', () => {
-  const layer = new ALayer({ layerDescriptor: {} });
+  const layer = new AbstractLayer({ layerDescriptor: {} });
 
   describe('updateDueToExtent', () => {
 
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/ems_file_source.js b/x-pack/plugins/gis/public/shared/layers/sources/ems_file_source.js
index b4d466e0113c6..2af4a08a92f33 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/ems_file_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/ems_file_source.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { VectorSource } from './vector_source';
+import { AbstractVectorSource } from './vector_source';
 import React from 'react';
 import {
   EuiLink,
@@ -16,7 +16,7 @@ import {
 import { GIS_API_PATH } from '../../../../common/constants';
 import { emsServiceSettings } from '../../../kibana_services';
 
-export class EMSFileSource extends VectorSource {
+export class EMSFileSource extends AbstractVectorSource {
 
   static type = 'EMS_FILE';
   static title = 'Elastic Maps Service vector shapes';
@@ -63,7 +63,7 @@ export class EMSFileSource extends VectorSource {
   async getGeoJsonWithMeta() {
     const fileSource = this._emsFiles.find((source => source.id === this._descriptor.id));
     const fetchUrl = `../${GIS_API_PATH}/data/ems?id=${encodeURIComponent(this._descriptor.id)}`;
-    const featureCollection = await VectorSource.getGeoJson(fileSource, fetchUrl);
+    const featureCollection = await AbstractVectorSource.getGeoJson(fileSource, fetchUrl);
     return {
       data: featureCollection,
       meta: {}
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/plugins/gis/public/shared/layers/sources/ems_tms_source/ems_tms_source.js
index c43449a1367db..fb3be0e06e9ae 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/ems_tms_source/ems_tms_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/ems_tms_source/ems_tms_source.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
-import { TMSSource } from '../tms_source';
+import { AbstractTMSSource } from '../tms_source';
 import { TileLayer } from '../../tile_layer';
 import {
   EuiText,
@@ -14,7 +14,7 @@ import {
 import _ from 'lodash';
 
 
-export class EMSTMSSource extends TMSSource {
+export class EMSTMSSource extends AbstractTMSSource {
 
   static type = 'EMS_TMS';
   static title = 'Elastic Maps Service tiles';
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/es_geohashgrid_source/es_geohashgrid_source.js b/x-pack/plugins/gis/public/shared/layers/sources/es_geohashgrid_source/es_geohashgrid_source.js
index a5897ea047576..55b3679facdd1 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/es_geohashgrid_source/es_geohashgrid_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/es_geohashgrid_source/es_geohashgrid_source.js
@@ -8,18 +8,11 @@ import _ from 'lodash';
 import React from 'react';
 import uuid from 'uuid/v4';
 
-import { VectorSource } from '../vector_source';
+import { AbstractESSource } from '../es_source';
 import { HeatmapLayer } from '../../heatmap_layer';
 import { VectorLayer } from '../../vector_layer';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import {
-  indexPatternService,
-  fetchSearchSourceAndRecordWithInspector,
-  inspectorAdapters,
-  SearchSource,
-  timeService,
-} from '../../../../kibana_services';
-import { createExtentFilter, makeGeohashGridPolygon } from '../../../../elasticsearch_geo_utils';
+import { makeGeohashGridPolygon } from '../../../../elasticsearch_geo_utils';
 import { AggConfigs } from 'ui/vis/agg_configs';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 import { convertToGeoJson } from './convert_to_geojson';
@@ -54,12 +47,11 @@ const aggSchemas = new Schemas([
   }
 ]);
 
-export class ESGeohashGridSource extends VectorSource {
+export class ESGeohashGridSource extends AbstractESSource {
 
   static type = 'ES_GEOHASH_GRID';
   static title = 'Elasticsearch geohash aggregation';
   static description = 'Group geospatial data in grids with metrics for each gridded cell';
-  static icon = 'logoElasticsearch';
 
   static createDescriptor({ indexPatternId, geoField, requestType }) {
     return {
@@ -103,42 +95,22 @@ export class ESGeohashGridSource extends VectorSource {
     );
   }
 
-  destroy() {
-    inspectorAdapters.requests.resetRequest(this._descriptor.id);
-  }
-
-  isFieldAware() {
-    return true;
-  }
-
-  isRefreshTimerAware() {
-    return true;
-  }
-
-  isQueryAware() {
-    return true;
-  }
-
   getFieldNames() {
     return this.getMetricFields().map(({ propertyKey }) => {
       return propertyKey;
     });
   }
 
-  getIndexPatternIds() {
-    return  [this._descriptor.indexPatternId];
-  }
-
   isGeohashPrecisionAware() {
     return true;
   }
 
   async getGeoJsonWithMeta({ layerName }, searchFilters) {
-    const featureCollection = await this.getGeoJsonPoints({
+
+    const featureCollection = await this.getGeoJsonPoints({ layerName }, {
       geohashPrecision: searchFilters.geohashPrecision,
-      extent: searchFilters.buffer,
+      buffer: searchFilters.buffer,
       timeFilters: searchFilters.timeFilters,
-      layerName,
       query: searchFilters.query,
     });
 
@@ -163,72 +135,25 @@ export class ESGeohashGridSource extends VectorSource {
     });
   }
 
-  async getGeoJsonPoints({ geohashPrecision, extent, timeFilters, layerName, query }) {
-
-    let indexPattern;
-    try {
-      indexPattern = await indexPatternService.get(this._descriptor.indexPatternId);
-    } catch (error) {
-      throw new Error(`Unable to find Index pattern ${this._descriptor.indexPatternId}`);
-    }
 
-    const geoField = indexPattern.fields.byName[this._descriptor.geoField];
-    if (!geoField) {
-      throw new Error(`Index pattern ${indexPattern.title} no longer contains the geo field ${this._descriptor.geoField}`);
-    }
+  async getGeoJsonPoints({ layerName }, { geohashPrecision, buffer, timeFilters, query }) {
 
+    const indexPattern = await this._getIndexPattern();
+    const searchSource  = await this._makeSearchSource({ buffer, timeFilters, query }, 0);
     const aggConfigs = new AggConfigs(indexPattern, this._makeAggConfigs(geohashPrecision), aggSchemas.all);
+    searchSource.setField('aggs', aggConfigs.toDsl());
+    const esResponse = await this._runEsQuery(layerName, searchSource, 'Elasticsearch geohash_grid aggregation request');
 
-    let resp;
-    try {
-      const searchSource = new SearchSource();
-      searchSource.setField('index', indexPattern);
-      searchSource.setField('size', 0);
-      searchSource.setField('aggs', aggConfigs.toDsl());
-      searchSource.setField('filter', () => {
-        const filters = [];
-        filters.push(createExtentFilter(extent, geoField.name, geoField.type));
-        filters.push(timeService.createFilter(indexPattern, timeFilters));
-        return filters;
-      });
-      searchSource.setField('query', query);
-
-      resp = await fetchSearchSourceAndRecordWithInspector({
-        searchSource,
-        requestName: layerName,
-        requestId: this._descriptor.id,
-        requestDesc: 'Elasticsearch geohash_grid aggregation request'
-      });
-    } catch(error) {
-      throw new Error(`Elasticsearch search request failed, error: ${error.message}`);
-    }
-
-    const tabifiedResp = tabifyAggResponse(aggConfigs, resp);
+    const tabifiedResp = tabifyAggResponse(aggConfigs, esResponse);
     const { featureCollection } = convertToGeoJson(tabifiedResp);
 
     return featureCollection;
   }
 
-  async isTimeAware() {
-    const indexPattern = await this._getIndexPattern();
-    const timeField = indexPattern.timeFieldName;
-    return !!timeField;
-  }
-
   isFilterByMapBounds() {
     return true;
   }
 
-  async _getIndexPattern() {
-    let indexPattern;
-    try {
-      indexPattern = await indexPatternService.get(this._descriptor.indexPatternId);
-    } catch (error) {
-      throw new Error(`Unable to find Index pattern ${this._descriptor.indexPatternId}`);
-    }
-    return indexPattern;
-  }
-
   _getValidMetrics() {
     const metrics = _.get(this._descriptor, 'metrics', []).filter(({ type, field }) => {
       if (type === 'count') {
@@ -346,11 +271,6 @@ export class ESGeohashGridSource extends VectorSource {
     });
   }
 
-  async getDisplayName() {
-    const indexPattern = await this._getIndexPattern();
-    return indexPattern.title;
-  }
-
   canFormatFeatureProperties() {
     return true;
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/es_join_source.js b/x-pack/plugins/gis/public/shared/layers/sources/es_join_source.js
index 1eaa055439ae0..1c43dbdd9634e 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/es_join_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/es_join_source.js
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import React, { Fragment } from 'react';
 
-import { ASource } from './source';
+import { AbstractSource } from './source';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import {
   fetchSearchSourceAndRecordWithInspector,
@@ -59,7 +59,7 @@ export function extractPropertiesMap(resp, propertyNames, countPropertyName) {
   return propertiesMap;
 }
 
-export class ESJoinSource extends ASource {
+export class ESJoinSource extends AbstractSource {
 
   static type = 'ES_JOIN_SOURCE';
 
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/es_search_source/es_search_source.js b/x-pack/plugins/gis/public/shared/layers/sources/es_search_source/es_search_source.js
index 47f59e26fb44b..27caf9e133533 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/es_search_source/es_search_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/es_search_source/es_search_source.js
@@ -8,27 +8,22 @@ import _ from 'lodash';
 import React from 'react';
 import uuid from 'uuid/v4';
 
-import { VectorSource } from '../vector_source';
+import { AbstractESSource } from '../es_source';
 import {
-  fetchSearchSourceAndRecordWithInspector,
-  inspectorAdapters,
   indexPatternService,
-  SearchSource,
 } from '../../../../kibana_services';
-import { hitsToGeoJson, createExtentFilter } from '../../../../elasticsearch_geo_utils';
-import { timefilter } from 'ui/timefilter/timefilter';
+import { hitsToGeoJson } from '../../../../elasticsearch_geo_utils';
 import { ESSourceDetails } from '../../../components/es_source_details';
 import { CreateSourceEditor } from './create_source_editor';
 import { UpdateSourceEditor } from './update_source_editor';
 
 const DEFAULT_LIMIT = 2048;
 
-export class ESSearchSource extends VectorSource {
+export class ESSearchSource extends AbstractESSource {
 
   static type = 'ES_SEARCH';
   static title = 'Elasticsearch documents';
   static description = 'Geospatial data from an Elasticsearch index';
-  static icon = 'logoElasticsearch';
 
   static renderEditor({ onPreviewSource }) {
     const onSelect = (layerConfig) => {
@@ -53,10 +48,6 @@ export class ESSearchSource extends VectorSource {
     });
   }
 
-  destroy() {
-    inspectorAdapters.requests.resetRequest(this._descriptor.id);
-  }
-
   renderSourceSettingsEditor({ onChange }) {
     return (
       <UpdateSourceEditor
@@ -75,18 +66,6 @@ export class ESSearchSource extends VectorSource {
     });
   }
 
-  isFieldAware() {
-    return true;
-  }
-
-  isRefreshTimerAware() {
-    return true;
-  }
-
-  isQueryAware() {
-    return true;
-  }
-
   getFieldNames() {
     return [
       this._descriptor.geoField,
@@ -94,9 +73,6 @@ export class ESSearchSource extends VectorSource {
     ];
   }
 
-  getIndexPatternIds() {
-    return  [this._descriptor.indexPatternId];
-  }
 
   renderDetails() {
     return (
@@ -109,62 +85,19 @@ export class ESSearchSource extends VectorSource {
     );
   }
 
-  async _getIndexPattern() {
-    let indexPattern;
-    try {
-      indexPattern = await indexPatternService.get(this._descriptor.indexPatternId);
-    } catch (error) {
-      throw new Error(`Unable to find Index pattern ${this._descriptor.indexPatternId}`);
-    }
-    return indexPattern;
-  }
-
   async getGeoJsonWithMeta({ layerName }, searchFilters) {
-    const indexPattern = await this._getIndexPattern();
 
-    const geoField = indexPattern.fields.byName[this._descriptor.geoField];
-    if (!geoField) {
-      throw new Error(`Index pattern ${indexPattern.title} no longer contains the geo field ${this._descriptor.geoField}`);
-    }
-
-    let resp;
-    try {
-      const searchSource = new SearchSource();
-      searchSource.setField('index', indexPattern);
-      searchSource.setField('size', this._descriptor.limit);
-      // Setting "fields" instead of "source: { includes: []}"
-      // because SearchSource automatically adds the following by default
-      // 1) all scripted fields
-      // 2) docvalue_fields value is added for each date field in an index - see getComputedFields
-      // By setting "fields", SearchSource removes all of defaults
-      searchSource.setField('fields', searchFilters.fieldNames);
-      const isTimeAware = await this.isTimeAware();
-      searchSource.setField('filter', () => {
-        const filters = [];
-        //todo: this seems somewhat redundant. Have this be passed in as arguments in the getGeoJson.
-        //no need to submit time and extent filters in the method if they are not supposed to be applied anyway
-        if (this.isFilterByMapBounds()) {
-          filters.push(createExtentFilter(searchFilters.buffer, geoField.name, geoField.type));
-        }
-
-        if (isTimeAware) {
-          filters.push(timefilter.createFilter(indexPattern, searchFilters.timeFilters));
-        }
-        return filters;
-      });
-      searchSource.setField('query', searchFilters.query);
 
-      resp = await fetchSearchSourceAndRecordWithInspector({
-        searchSource,
-        requestName: layerName,
-        requestId: this._descriptor.id,
-        requestDesc: 'Elasticsearch document request'
-      });
-    } catch(error) {
-      throw new Error(`Elasticsearch search request failed, error: ${error.message}`);
-    }
+    const searchSource = await this._makeSearchSource(searchFilters, this._descriptor.limit);
+    // Setting "fields" instead of "source: { includes: []}"
+    // because SearchSource automatically adds the following by default
+    // 1) all scripted fields
+    // 2) docvalue_fields value is added for each date field in an index - see getComputedFields
+    // By setting "fields", SearchSource removes all of defaults
+    searchSource.setField('fields', searchFilters.fieldNames);
 
     let featureCollection;
+    const indexPattern = await this._getIndexPattern();
     const flattenHit = hit => {
       const properties = indexPattern.flattenHit(hit);
       // remove metaFields
@@ -173,7 +106,11 @@ export class ESSearchSource extends VectorSource {
       });
       return properties;
     };
+
+
+    const resp = await this._runEsQuery(layerName, searchSource, 'Elasticsearch document request');
     try {
+      const geoField = await this._getGeoField();
       featureCollection = hitsToGeoJson(resp.hits.hits, flattenHit, geoField.name, geoField.type);
     } catch(error) {
       throw new Error(`Unable to convert search response to geoJson feature collection, error: ${error.message}`);
@@ -221,10 +158,6 @@ export class ESSearchSource extends VectorSource {
     return _.get(this._descriptor, 'filterByMapBounds', false);
   }
 
-  async getDisplayName() {
-    const indexPattern = await this._getIndexPattern();
-    return indexPattern.title;
-  }
 
   async getStringFields() {
     const indexPattern = await this._getIndexPattern();
@@ -236,10 +169,4 @@ export class ESSearchSource extends VectorSource {
     });
   }
 
-  async isTimeAware() {
-    const indexPattern = await this._getIndexPattern();
-    const timeField = indexPattern.timeFieldName;
-    return !!timeField;
-  }
-
 }
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/es_source.js b/x-pack/plugins/gis/public/shared/layers/sources/es_source.js
new file mode 100644
index 0000000000000..3256a96b7f3db
--- /dev/null
+++ b/x-pack/plugins/gis/public/shared/layers/sources/es_source.js
@@ -0,0 +1,145 @@
+/*
+ * 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 { AbstractVectorSource } from './vector_source';
+import {
+  fetchSearchSourceAndRecordWithInspector,
+  indexPatternService,
+  inspectorAdapters, SearchSource
+} from '../../../kibana_services';
+import { createExtentFilter } from '../../../elasticsearch_geo_utils';
+import { timefilter } from 'ui/timefilter/timefilter';
+import _ from 'lodash';
+import { AggConfigs } from 'ui/vis/agg_configs';
+
+
+export class AbstractESSource extends AbstractVectorSource {
+
+  static icon = 'logoElasticsearch';
+
+  constructor(descriptor) {
+    super(descriptor);
+  }
+
+  isFieldAware() {
+    return true;
+  }
+
+  isRefreshTimerAware() {
+    return true;
+  }
+
+  isQueryAware() {
+    return true;
+  }
+
+  getIndexPatternIds() {
+    return  [this._descriptor.indexPatternId];
+  }
+
+  destroy() {
+    inspectorAdapters.requests.resetRequest(this._descriptor.id);
+  }
+
+  async _runEsQuery(layerName, searchSource, requestDescription) {
+    try {
+      return await fetchSearchSourceAndRecordWithInspector({
+        searchSource,
+        requestName: layerName,
+        requestId: this._descriptor.id,
+        requestDesc: requestDescription
+      });
+    } catch(error) {
+      throw new Error(`Elasticsearch search request failed, error: ${error.message}`);
+    }
+  }
+
+  async _makeSearchSource({ buffer, query, timeFilters }, limit) {
+    const indexPattern = await this._getIndexPattern();
+    const geoField = await this._getGeoField();
+    const isTimeAware = await this.isTimeAware();
+    const searchSource = new SearchSource();
+    searchSource.setField('index', indexPattern);
+    searchSource.setField('size', limit);
+    searchSource.setField('filter', () => {
+      const filters = [];
+      if (this.isFilterByMapBounds() && buffer) {//buffer can be empty
+        filters.push(createExtentFilter(buffer, geoField.name, geoField.type));
+      }
+      if (isTimeAware) {
+        filters.push(timefilter.createFilter(indexPattern, timeFilters));
+      }
+      return filters;
+    });
+    searchSource.setField('query', query);
+    return searchSource;
+  }
+
+  async getBoundsForFilters({ query, timeFilters }, layerName) {
+
+    const searchSource = await this._makeSearchSource({ query, timeFilters }, 0);
+    const geoField = await this._getGeoField();
+    const indexPattern = await this._getIndexPattern();
+
+    const geoBoundsAgg = [{
+      type: 'geo_bounds',
+      enabled: true,
+      params: {
+        field: geoField
+      },
+      schema: 'metric'
+    }];
+
+    const aggConfigs = new AggConfigs(indexPattern, geoBoundsAgg);
+    searchSource.setField('aggs', aggConfigs.toDsl());
+
+    const esResp = await this._runEsQuery(layerName, searchSource, 'bounds request');
+    const esBounds = _.get(esResp, 'aggregations.1.bounds');
+    return (esBounds) ?
+      {
+        min_lon: esBounds.top_left.lon,
+        max_lon: esBounds.bottom_right.lon,
+        min_lat: esBounds.bottom_right.lat,
+        max_lat: esBounds.top_left.lat
+      }  : null;
+  }
+
+  async isTimeAware() {
+    const indexPattern = await this._getIndexPattern();
+    const timeField = indexPattern.timeFieldName;
+    return !!timeField;
+  }
+
+
+  async _getIndexPattern() {
+    let indexPattern;
+    try {
+      indexPattern = await indexPatternService.get(this._descriptor.indexPatternId);
+    } catch (error) {
+      throw new Error(`Unable to find Index pattern ${this._descriptor.indexPatternId}`);
+    }
+    return indexPattern;
+  }
+
+  async _getGeoField() {
+    const indexPattern = await this._getIndexPattern();
+    const geoField = indexPattern.fields.byName[this._descriptor.geoField];
+    if (!geoField) {
+      throw new Error(`Index pattern ${indexPattern.title} no longer contains the geo field ${this._descriptor.geoField}`);
+    }
+    return geoField;
+  }
+
+  async getDisplayName() {
+    const indexPattern = await this._getIndexPattern();
+    return indexPattern.title;
+  }
+
+  isBoundsAware() {
+    return true;
+  }
+
+}
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js b/x-pack/plugins/gis/public/shared/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
index 47a92ec27daef..7377423cb66f1 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
@@ -5,14 +5,14 @@
  */
 
 import _ from 'lodash';
-import { VectorSource } from '../vector_source';
+import { AbstractVectorSource } from '../vector_source';
 import React from 'react';
 import {
   EuiText,
 } from '@elastic/eui';
 import { CreateSourceEditor } from './create_source_editor';
 
-export class KibanaRegionmapSource extends VectorSource {
+export class KibanaRegionmapSource extends AbstractVectorSource {
 
   static type = 'REGIONMAP_FILE';
   static title = 'Custom vector shapes';
@@ -62,7 +62,7 @@ export class KibanaRegionmapSource extends VectorSource {
 
   async getGeoJsonWithMeta() {
     const fileSource = this._regionList.find(source => source.name === this._descriptor.name);
-    const featureCollection = await VectorSource.getGeoJson(fileSource, fileSource.url);
+    const featureCollection = await AbstractVectorSource.getGeoJson(fileSource, fileSource.url);
     return {
       data: featureCollection
     };
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js b/x-pack/plugins/gis/public/shared/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
index 4b29d315488e0..89b81f3989452 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
-import { TMSSource } from '../tms_source';
+import { AbstractTMSSource } from '../tms_source';
 import { TileLayer } from '../../tile_layer';
 import { CreateSourceEditor } from './create_source_editor';
 import { EuiText } from '@elastic/eui';
 
-export class KibanaTilemapSource extends  TMSSource {
+export class KibanaTilemapSource extends  AbstractTMSSource {
 
   static type = 'KIBANA_TILEMAP';
   static title = 'Custom Tile Map Service';
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/source.js b/x-pack/plugins/gis/public/shared/layers/sources/source.js
index 6d7a9f316c1b6..5377cb2144045 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/source.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-export class ASource {
+export class AbstractSource {
 
   static renderEditor() {
     throw new Error('Must implement Source.renderEditor');
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/tms_source.js b/x-pack/plugins/gis/public/shared/layers/sources/tms_source.js
index a635d650ee8c1..852dffd1ef5f2 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/tms_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/tms_source.js
@@ -5,9 +5,9 @@
  */
 
 
-import { ASource } from './source';
+import { AbstractSource } from './source';
 
-export class TMSSource extends ASource {
+export class AbstractTMSSource extends AbstractSource {
   getUrlTemplate() {
     throw new Error('Should implement TMSSource#getUrlTemplate');
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/vector_source.js b/x-pack/plugins/gis/public/shared/layers/sources/vector_source.js
index 6f4ad01f01b2d..d237f2636b329 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/vector_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/vector_source.js
@@ -7,11 +7,11 @@
 
 import { VectorLayer } from '../vector_layer';
 import { VectorStyle } from '../styles/vector_style';
-import { ASource } from './source';
+import { AbstractSource } from './source';
 import * as topojson from 'topojson-client';
 import _ from 'lodash';
 
-export class VectorSource extends ASource {
+export class AbstractVectorSource extends AbstractSource {
 
   static async getGeoJson({ format, meta }, fetchUrl) {
     let jsonFeatures;
@@ -60,6 +60,15 @@ export class VectorSource extends ASource {
     return false;
   }
 
+  isBoundsAware() {
+    return false;
+  }
+
+  async getBoundsForFilters() {
+    console.warn('Should implement AbstractVectorSource#getBoundsForFilters');
+    return null;
+  }
+
   async getNumberFields() {
     return [];
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/wms_source.js b/x-pack/plugins/gis/public/shared/layers/sources/wms_source.js
index 458cdbf5e39fd..f8ef5c7c5851c 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/wms_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/wms_source.js
@@ -12,10 +12,10 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 
-import { TMSSource } from './tms_source';
+import { AbstractTMSSource } from './tms_source';
 import { TileLayer } from '../tile_layer';
 
-export class WMSSource extends TMSSource {
+export class WMSSource extends AbstractTMSSource {
 
   static type = 'WMS';
   static title = 'Web Map Service';
diff --git a/x-pack/plugins/gis/public/shared/layers/sources/xyz_tms_source.js b/x-pack/plugins/gis/public/shared/layers/sources/xyz_tms_source.js
index 9ec050ec11085..602e3fb4eb960 100644
--- a/x-pack/plugins/gis/public/shared/layers/sources/xyz_tms_source.js
+++ b/x-pack/plugins/gis/public/shared/layers/sources/xyz_tms_source.js
@@ -12,10 +12,10 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 
-import { TMSSource } from './tms_source';
+import { AbstractTMSSource } from './tms_source';
 import { TileLayer } from '../tile_layer';
 
-export class XYZTMSSource extends TMSSource {
+export class XYZTMSSource extends AbstractTMSSource {
 
   static type = 'EMS_XYZ';
   static title = 'Tile Map Service from URL';
diff --git a/x-pack/plugins/gis/public/shared/layers/tile_layer.js b/x-pack/plugins/gis/public/shared/layers/tile_layer.js
index 5950398a6ff10..8c10489e9f7e7 100644
--- a/x-pack/plugins/gis/public/shared/layers/tile_layer.js
+++ b/x-pack/plugins/gis/public/shared/layers/tile_layer.js
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AbstractLayer } from './layer';
 import _ from 'lodash';
-import { ALayer } from './layer';
 import React from 'react';
 import { EuiIcon } from '@elastic/eui';
 import { TileStyle } from '../layers/styles/tile_style';
 
-export class TileLayer extends ALayer {
+export class TileLayer extends AbstractLayer {
 
   static type = "TILE";
 
@@ -62,10 +62,14 @@ export class TileLayer extends ALayer {
     });
   }
 
+  getLayerTypeIconName() {
+    return 'grid';
+  }
+
   getIcon() {
     return (
       <EuiIcon
-        type={'grid'}
+        type={this.getLayerTypeIconName()}
       />
     );
   }
diff --git a/x-pack/plugins/gis/public/shared/layers/vector_layer.js b/x-pack/plugins/gis/public/shared/layers/vector_layer.js
index b81bf0dfff83c..61197ea3f5664 100644
--- a/x-pack/plugins/gis/public/shared/layers/vector_layer.js
+++ b/x-pack/plugins/gis/public/shared/layers/vector_layer.js
@@ -5,10 +5,11 @@
  */
 
 import mapboxgl from 'mapbox-gl';
+import turf from 'turf';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { ALayer } from './layer';
+import { AbstractLayer } from './layer';
 import { VectorStyle } from './styles/vector_style';
 import { LeftInnerJoin } from './joins/left_inner_join';
 
@@ -23,7 +24,7 @@ const EMPTY_FEATURE_COLLECTION = {
   features: []
 };
 
-export class VectorLayer extends ALayer {
+export class VectorLayer extends AbstractLayer {
 
   static type = 'VECTOR';
 
@@ -91,6 +92,10 @@ export class VectorLayer extends ALayer {
     return this._style.getIcon(isPointsOnly);
   }
 
+  getLayerTypeIconName() {
+    return 'vector';
+  }
+
   getColorRamp() {
     // TODO: Determine if can be data-driven first
     return this._style.getColorRamp();
@@ -100,6 +105,27 @@ export class VectorLayer extends ALayer {
     return this._style.getTOCDetails();
   }
 
+  _getBoundsBasedOnData() {
+    const featureCollection = this._getSourceFeatureCollection();
+    if (!featureCollection) {
+      return null;
+    }
+    const bbox =  turf.bbox(featureCollection);
+    return {
+      min_lon: bbox[0],
+      min_lat: bbox[1],
+      max_lon: bbox[2],
+      max_lat: bbox[3]
+    };
+  }
+
+  async getBounds(filters) {
+    if (this._source.isBoundsAware()) {
+      return await this._source.getBoundsForFilters(filters);
+    }
+    return this._getBoundsBasedOnData();
+  }
+
   async getStringFields() {
     return await this._source.getStringFields();
   }
@@ -254,7 +280,6 @@ export class VectorLayer extends ALayer {
     return await Promise.all(joinSyncs);
   }
 
-
   _getSearchFilters(dataFilters) {
     const fieldNames = [
       ...this._source.getFieldNames(),
@@ -373,7 +398,7 @@ export class VectorLayer extends ALayer {
       return;
     }
 
-    const dataBoundToMap = ALayer.getBoundDataForSource(mbMap, this.getId());
+    const dataBoundToMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId());
     if (featureCollection !== dataBoundToMap) {
       mbGeoJSONSource.setData(featureCollection);
     }
diff --git a/x-pack/plugins/gis/public/store/map.js b/x-pack/plugins/gis/public/store/map.js
index 78cc2560ae7e3..2c2abc2ab44ed 100644
--- a/x-pack/plugins/gis/public/store/map.js
+++ b/x-pack/plugins/gis/public/store/map.js
@@ -121,9 +121,8 @@ export function map(state = INITIAL_STATE, action) {
       return {
         ...state,
         goto: {
-          lat: action.lat,
-          lon: action.lon,
-          zoom: action.zoom,
+          center: action.center,
+          bounds: action.bounds
         }
       };
     case CLEAR_GOTO: