From 02cbd9c374c2b7549427f74dded6b02823db538e Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Tue, 28 Apr 2020 10:41:36 -0600
Subject: [PATCH] Consolidate cross-cutting concerns between region &
 coordinate maps in new maps_legacy plugin (#64123)

---
 .../vis_type_vega/vega_visualization.js       | 14 +++++
 .../__tests__/region_map_visualization.js     | 20 ++++--
 .../public/components/region_map_options.tsx  |  3 +-
 .../core_plugins/region_map/public/legacy.ts  |  5 --
 .../core_plugins/region_map/public/plugin.ts  | 19 +++---
 .../region_map/public/region_map_type.js      |  4 +-
 .../public/region_map_visualization.js        | 21 ++-----
 .../region_map/public/tooltip.html            |  8 ---
 .../region_map/public/tooltip_formatter.js    | 57 +++++++----------
 .../core_plugins/region_map/public/util.ts    |  3 +-
 .../core_plugins/tile_map/common/origin.ts    | 23 -------
 .../coordinate_maps_visualization.js          | 20 ++++--
 .../public/__tests__/geohash_layer.js         |  3 +-
 .../public/components/tile_map_options.tsx    |  4 +-
 .../tile_map/public/editors/_tooltip.html     |  8 ---
 .../public/editors/_tooltip_formatter.js      | 62 -------------------
 .../tile_map/public/geohash_layer.js          |  3 +-
 .../core_plugins/tile_map/public/legacy.ts    |  5 --
 .../core_plugins/tile_map/public/plugin.ts    | 20 +++---
 .../tile_map/public/shim/index.ts             | 20 ------
 .../tile_map/public/tile_map_type.js          |  3 +-
 .../tile_map/public/tile_map_visualization.js | 35 ++++-------
 ...dencies_plugin.ts => tooltip_formatter.js} | 42 +++++++------
 .../public/__tests__/map/service_settings.js  |  2 +-
 .../public/common/{ => constants}/origin.ts   |  0
 .../common/types/external_basemap_types.ts}   |  2 +-
 .../maps_legacy/public/common/types}/index.ts |  8 ++-
 .../public/common/types}/map_types.ts         |  0
 .../public/common/types/region_map_types.ts}  |  4 +-
 .../components/wms_internal_options.tsx       | 43 ++++++++-----
 .../public/components/wms_options.tsx         | 18 +++---
 src/plugins/maps_legacy/public/index.ts       | 27 +++++++-
 .../public/map}/base_maps_visualization.js    | 24 ++++---
 .../maps_legacy/public/map/kibana_map.js      | 30 +++++----
 .../public/map/service_settings.js            |  2 +-
 src/plugins/maps_legacy/public/plugin.ts      | 12 ++--
 .../maps_legacy/public/tooltip_provider.js}   | 39 ++++++------
 src/plugins/vis_type_vega/public/plugin.ts    |  7 ++-
 src/plugins/vis_type_vega/public/services.ts  |  3 +
 .../public/vega_view/vega_map_view.js         | 26 +++-----
 .../translations/translations/ja-JP.json      | 20 ------
 .../translations/translations/zh-CN.json      | 20 ------
 42 files changed, 274 insertions(+), 415 deletions(-)
 delete mode 100644 src/legacy/core_plugins/region_map/public/tooltip.html
 delete mode 100644 src/legacy/core_plugins/tile_map/common/origin.ts
 delete mode 100644 src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
 delete mode 100644 src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
 delete mode 100644 src/legacy/core_plugins/tile_map/public/shim/index.ts
 rename src/legacy/core_plugins/tile_map/public/{shim/legacy_dependencies_plugin.ts => tooltip_formatter.js} (57%)
 rename src/plugins/maps_legacy/public/common/{ => constants}/origin.ts (100%)
 rename src/{legacy/core_plugins/tile_map/public/types.ts => plugins/maps_legacy/public/common/types/external_basemap_types.ts} (95%)
 rename src/{legacy/core_plugins/region_map/public/shim => plugins/maps_legacy/public/common/types}/index.ts (79%)
 rename src/{legacy/core_plugins/tile_map/public => plugins/maps_legacy/public/common/types}/map_types.ts (100%)
 rename src/{legacy/core_plugins/region_map/public/types.ts => plugins/maps_legacy/public/common/types/region_map_types.ts} (89%)
 rename src/{legacy/core_plugins/tile_map => plugins/maps_legacy}/public/components/wms_internal_options.tsx (77%)
 rename src/{legacy/core_plugins/tile_map => plugins/maps_legacy}/public/components/wms_options.tsx (82%)
 rename src/{legacy/core_plugins/tile_map/public => plugins/maps_legacy/public/map}/base_maps_visualization.js (89%)
 rename src/{legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts => plugins/maps_legacy/public/tooltip_provider.js} (56%)

diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
index 21b7ea7dbf4c..9f5f4b764f9b 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
@@ -59,12 +59,14 @@ import {
   setData,
   setSavedObjects,
   setNotifications,
+  setKibanaMapFactory,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../../plugins/vis_type_vega/public/services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setInjectedVarFunc } from '../../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ServiceSettings } from '../../../../../../plugins/maps_legacy/public/map/service_settings';
+import { getKibanaMapFactoryProvider } from '../../../../../../plugins/maps_legacy/public';
 
 const THRESHOLD = 0.1;
 const PIXEL_DIFF = 30;
@@ -77,6 +79,18 @@ describe('VegaVisualizations', () => {
   let vegaVisualizationDependencies;
   let vegaVisType;
 
+  const coreSetupMock = {
+    notifications: {
+      toasts: {},
+    },
+    uiSettings: {
+      get: () => {},
+    },
+    injectedMetadata: {
+      getInjectedVar: () => {},
+    },
+  };
+  setKibanaMapFactory(getKibanaMapFactoryProvider(coreSetupMock));
   setInjectedVars({
     emsTileLayerId: {},
     enableExternalUrls: true,
diff --git a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
index 6e1b0b716094..87592cf4e750 100644
--- a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
@@ -54,6 +54,7 @@ import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_ty
 import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { getBaseMapsVis } from '../../../../../plugins/maps_legacy/public';
 
 const THRESHOLD = 0.45;
 const PIXEL_DIFF = 96;
@@ -101,7 +102,7 @@ describe('RegionMapsVisualizationTests', function() {
 
   let getManifestStub;
   beforeEach(
-    ngMock.inject((Private, $injector) => {
+    ngMock.inject(() => {
       setInjectedVarFunc(injectedVar => {
         switch (injectedVar) {
           case 'mapConfig':
@@ -127,17 +128,28 @@ describe('RegionMapsVisualizationTests', function() {
         }
       });
       const serviceSettings = new ServiceSettings();
-      const uiSettings = $injector.get('config');
       const regionmapsConfig = {
         includeElasticMapsService: true,
         layers: [],
       };
+      const coreSetupMock = {
+        notifications: {
+          toasts: {},
+        },
+        uiSettings: {
+          get: () => {},
+        },
+        injectedMetadata: {
+          getInjectedVar: () => {},
+        },
+      };
+      const BaseMapsVisualization = getBaseMapsVis(coreSetupMock, serviceSettings);
 
       dependencies = {
         serviceSettings,
-        $injector,
         regionmapsConfig,
-        uiSettings,
+        uiSettings: coreSetupMock.uiSettings,
+        BaseMapsVisualization,
       };
 
       regionMapVisType = new BaseVisType(createRegionMapTypeDefinition(dependencies));
diff --git a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
index 31a27c4da7fc..5604067433f1 100644
--- a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
+++ b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
@@ -32,8 +32,7 @@ import {
   SelectOption,
   SwitchOption,
 } from '../../../../../plugins/charts/public';
-import { WmsOptions } from '../../../tile_map/public/components/wms_options';
-import { RegionMapVisParams } from '../types';
+import { RegionMapVisParams, WmsOptions } from '../../../../../plugins/maps_legacy/public';
 
 const mapLayerForOption = ({ layerId, name }: VectorLayer) => ({
   text: name,
diff --git a/src/legacy/core_plugins/region_map/public/legacy.ts b/src/legacy/core_plugins/region_map/public/legacy.ts
index b0cc767a044e..4bbd839331e5 100644
--- a/src/legacy/core_plugins/region_map/public/legacy.ts
+++ b/src/legacy/core_plugins/region_map/public/legacy.ts
@@ -21,17 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { RegionMapPluginSetupDependencies } from './plugin';
-import { LegacyDependenciesPlugin } from './shim';
 import { plugin } from '.';
 
 const plugins: Readonly<RegionMapPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
   mapsLegacy: npSetup.plugins.mapsLegacy,
-
-  // Temporary solution
-  // It will be removed when all dependent services are migrated to the new platform.
-  __LEGACY: new LegacyDependenciesPlugin(),
 };
 
 const pluginInstance = plugin({} as PluginInitializerContext);
diff --git a/src/legacy/core_plugins/region_map/public/plugin.ts b/src/legacy/core_plugins/region_map/public/plugin.ts
index 1453c2155e2d..08a73517dc13 100644
--- a/src/legacy/core_plugins/region_map/public/plugin.ts
+++ b/src/legacy/core_plugins/region_map/public/plugin.ts
@@ -25,28 +25,28 @@ import {
 } from '../../../../core/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
 import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-
-import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
-
 // @ts-ignore
 import { createRegionMapFn } from './region_map_fn';
 // @ts-ignore
 import { createRegionMapTypeDefinition } from './region_map_type';
-import { IServiceSettings, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
+import {
+  getBaseMapsVis,
+  IServiceSettings,
+  MapsLegacyPluginSetup,
+} from '../../../../plugins/maps_legacy/public';
 
 /** @private */
-interface RegionMapVisualizationDependencies extends LegacyDependenciesPluginSetup {
+interface RegionMapVisualizationDependencies {
   uiSettings: IUiSettingsClient;
   regionmapsConfig: RegionMapsConfig;
   serviceSettings: IServiceSettings;
-  notificationService: any;
+  BaseMapsVisualization: any;
 }
 
 /** @internal */
 export interface RegionMapPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
-  __LEGACY: LegacyDependenciesPlugin;
   mapsLegacy: MapsLegacyPluginSetup;
 }
 
@@ -66,14 +66,13 @@ export class RegionMapPlugin implements Plugin<Promise<void>, void> {
 
   public async setup(
     core: CoreSetup,
-    { expressions, visualizations, mapsLegacy, __LEGACY }: RegionMapPluginSetupDependencies
+    { expressions, visualizations, mapsLegacy }: RegionMapPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<RegionMapVisualizationDependencies> = {
       uiSettings: core.uiSettings,
       regionmapsConfig: core.injectedMetadata.getInjectedVar('regionmap') as RegionMapsConfig,
       serviceSettings: mapsLegacy.serviceSettings,
-      notificationService: core.notifications.toasts,
-      ...(await __LEGACY.setup()),
+      BaseMapsVisualization: getBaseMapsVis(core, mapsLegacy.serviceSettings),
     };
 
     expressions.registerFunction(createRegionMapFn);
diff --git a/src/legacy/core_plugins/region_map/public/region_map_type.js b/src/legacy/core_plugins/region_map/public/region_map_type.js
index 9174b03cf843..b7ed14ed3706 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_type.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_type.js
@@ -23,9 +23,7 @@ import { createRegionMapVisualization } from './region_map_visualization';
 import { RegionMapOptions } from './components/region_map_options';
 import { truncatedColorSchemas } from '../../../../plugins/charts/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
-
-// TODO: reference to TILE_MAP plugin should be removed
-import { ORIGIN } from '../../tile_map/common/origin';
+import { ORIGIN } from '../../../../plugins/maps_legacy/public';
 
 export function createRegionMapTypeDefinition(dependencies) {
   const { uiSettings, regionmapsConfig, serviceSettings } = dependencies;
diff --git a/src/legacy/core_plugins/region_map/public/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
index f08d53ee35c8..5dbc1ecad277 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
@@ -21,30 +21,21 @@ import { i18n } from '@kbn/i18n';
 import ChoroplethLayer from './choropleth_layer';
 import { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { toastNotifications } from 'ui/notify';
-
-import { TileMapTooltipFormatter } from './tooltip_formatter';
 import { truncatedColorMaps } from '../../../../plugins/charts/public';
-
-// TODO: reference to TILE_MAP plugin should be removed
-import { BaseMapsVisualizationProvider } from '../../tile_map/public/base_maps_visualization';
+import { tooltipFormatter } from './tooltip_formatter';
+import { mapTooltipProvider } from '../../../../plugins/maps_legacy/public';
 
 export function createRegionMapVisualization({
   serviceSettings,
-  $injector,
   uiSettings,
-  notificationService,
+  BaseMapsVisualization,
 }) {
-  const BaseMapsVisualization = new BaseMapsVisualizationProvider(
-    serviceSettings,
-    notificationService
-  );
-  const tooltipFormatter = new TileMapTooltipFormatter($injector);
-
   return class RegionMapsVisualization extends BaseMapsVisualization {
     constructor(container, vis) {
       super(container, vis);
       this._vis = this.vis;
       this._choroplethLayer = null;
+      this._tooltipFormatter = mapTooltipProvider(container, tooltipFormatter);
     }
 
     async render(esResponse, visParams) {
@@ -89,7 +80,7 @@ export function createRegionMapVisualization({
       this._choroplethLayer.setMetrics(results, metricFieldFormatter, valueColumn.name);
       if (termColumn && valueColumn) {
         this._choroplethLayer.setTooltipFormatter(
-          tooltipFormatter,
+          this._tooltipFormatter,
           metricFieldFormatter,
           termColumn.name,
           valueColumn.name
@@ -123,7 +114,7 @@ export function createRegionMapVisualization({
       this._choroplethLayer.setColorRamp(truncatedColorMaps[visParams.colorSchema].value);
       this._choroplethLayer.setLineWeight(visParams.outlineWeight);
       this._choroplethLayer.setTooltipFormatter(
-        tooltipFormatter,
+        this._tooltipFormatter,
         metricFieldFormatter,
         this._metricLabel
       );
diff --git a/src/legacy/core_plugins/region_map/public/tooltip.html b/src/legacy/core_plugins/region_map/public/tooltip.html
deleted file mode 100644
index 0d57120c80a9..000000000000
--- a/src/legacy/core_plugins/region_map/public/tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table>
-  <tbody>
-    <tr ng-repeat="detail in details" >
-      <td class="visTooltip__label"><b>{{detail.label}}</b></td>
-      <td class="visTooltip__value">{{detail.value}}</td>
-    </tr>
-  </tbody>
-</table>
diff --git a/src/legacy/core_plugins/region_map/public/tooltip_formatter.js b/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
index 6df08aea0baa..8d38095ac25e 100644
--- a/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
+++ b/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
@@ -17,39 +17,24 @@
  * under the License.
  */
 
-import $ from 'jquery';
-import template from './tooltip.html';
-
-export const TileMapTooltipFormatter = $injector => {
-  const $rootScope = $injector.get('$rootScope');
-  const $compile = $injector.get('$compile');
-
-  const $tooltipScope = $rootScope.$new();
-  const $el = $('<div>').html(template);
-
-  $compile($el)($tooltipScope);
-
-  return function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
-    if (!metric) {
-      return '';
-    }
-
-    $tooltipScope.details = [];
-    if (fieldName && metric) {
-      $tooltipScope.details.push({
-        label: fieldName,
-        value: metric.term,
-      });
-    }
-
-    if (metric) {
-      $tooltipScope.details.push({
-        label: metricName,
-        value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
-      });
-    }
-
-    $tooltipScope.$apply();
-    return $el.html();
-  };
-};
+export function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
+  if (!metric) {
+    return '';
+  }
+
+  const details = [];
+  if (fieldName && metric) {
+    details.push({
+      label: fieldName,
+      value: metric.term,
+    });
+  }
+
+  if (metric) {
+    details.push({
+      label: metricName,
+      value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
+    });
+  }
+  return details;
+}
diff --git a/src/legacy/core_plugins/region_map/public/util.ts b/src/legacy/core_plugins/region_map/public/util.ts
index 24c721da1f31..b4e0dcd5f351 100644
--- a/src/legacy/core_plugins/region_map/public/util.ts
+++ b/src/legacy/core_plugins/region_map/public/util.ts
@@ -18,8 +18,7 @@
  */
 
 import { FileLayer, VectorLayer } from '../../../../plugins/maps_legacy/public';
-// TODO: reference to TILE_MAP plugin should be removed
-import { ORIGIN } from '../../../../legacy/core_plugins/tile_map/common/origin';
+import { ORIGIN } from '../../../../plugins/maps_legacy/public';
 
 export const mapToLayerWithId = (prefix: string, layer: FileLayer): VectorLayer => ({
   ...layer,
diff --git a/src/legacy/core_plugins/tile_map/common/origin.ts b/src/legacy/core_plugins/tile_map/common/origin.ts
deleted file mode 100644
index 7fcf1c659bdf..000000000000
--- a/src/legacy/core_plugins/tile_map/common/origin.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export enum ORIGIN {
-  EMS = 'elastic_maps_service',
-  KIBANA_YML = 'self_hosted',
-}
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
index 3904c4370790..bce2e157ebbc 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -53,6 +53,7 @@ import {
 import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { getBaseMapsVis } from '../../../../../plugins/maps_legacy/public';
 
 function mockRawData() {
   const stack = [dummyESResponse];
@@ -114,15 +115,26 @@ describe('CoordinateMapsVisualizationTest', function() {
             return 'not found';
         }
       });
+
+      const coreSetupMock = {
+        notifications: {
+          toasts: {},
+        },
+        uiSettings: {},
+        injectedMetadata: {
+          getInjectedVar: () => {},
+        },
+      };
       const serviceSettings = new ServiceSettings();
+      const BaseMapsVisualization = getBaseMapsVis(coreSetupMock, serviceSettings);
       const uiSettings = $injector.get('config');
 
       dependencies = {
-        serviceSettings,
-        uiSettings,
-        $injector,
-        getPrecision,
         getZoomPrecision,
+        getPrecision,
+        BaseMapsVisualization,
+        uiSettings,
+        serviceSettings,
       };
 
       visType = new BaseVisType(createTileMapTypeDefinition(dependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
index fc029d6bccb6..bdf9cd806eb8 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
@@ -24,7 +24,8 @@ import scaledCircleMarkersPng from './scaledCircleMarkers.png';
 // import shadedCircleMarkersPng from './shadedCircleMarkers.png';
 import { ImageComparator } from 'test_utils/image_comparator';
 import GeoHashSampleData from './dummy_es_response.json';
-import { KibanaMap } from '../../../../../plugins/maps_legacy/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaMap } from '../../../../../plugins/maps_legacy/public/map/kibana_map';
 
 describe('geohash_layer', function() {
   let domNode;
diff --git a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
index 9ca42fe3e407..1efb0b2f884f 100644
--- a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
@@ -28,9 +28,7 @@ import {
   SelectOption,
   SwitchOption,
 } from '../../../../../plugins/charts/public';
-import { WmsOptions } from './wms_options';
-import { TileMapVisParams } from '../types';
-import { MapTypes } from '../map_types';
+import { WmsOptions, TileMapVisParams, MapTypes } from '../../../../../plugins/maps_legacy/public';
 
 export type TileMapOptionsProps = VisOptionsProps<TileMapVisParams>;
 
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html b/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
deleted file mode 100644
index 9df5b94a21ed..000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table>
-  <tbody>
-    <tr ng-repeat="detail in details" >
-      <td class="visTooltip__label">{{detail.label}}</td>
-      <td class="visTooltip__value">{{detail.value}}</td>
-    </tr>
-  </tbody>
-</table>
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js b/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
deleted file mode 100644
index eec90e512b46..000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import $ from 'jquery';
-import { i18n } from '@kbn/i18n';
-
-import template from './_tooltip.html';
-
-export function TileMapTooltipFormatterProvider($injector) {
-  const $rootScope = $injector.get('$rootScope');
-  const $compile = $injector.get('$compile');
-
-  const $tooltipScope = $rootScope.$new();
-  const $el = $('<div>').html(template);
-
-  $compile($el)($tooltipScope);
-
-  return function tooltipFormatter(metricTitle, metricFormat, feature) {
-    if (!feature) {
-      return '';
-    }
-
-    $tooltipScope.details = [
-      {
-        label: metricTitle,
-        value: metricFormat(feature.properties.value),
-      },
-      {
-        label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
-          defaultMessage: 'Latitude',
-        }),
-        value: feature.geometry.coordinates[1],
-      },
-      {
-        label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
-          defaultMessage: 'Longitude',
-        }),
-        value: feature.geometry.coordinates[0],
-      },
-    ];
-
-    $tooltipScope.$apply();
-
-    return $el.html();
-  };
-}
diff --git a/src/legacy/core_plugins/tile_map/public/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
index b9acf1a15208..f0261483d302 100644
--- a/src/legacy/core_plugins/tile_map/public/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
@@ -20,12 +20,11 @@
 import L from 'leaflet';
 import { min, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaMapLayer } from '../../../../plugins/maps_legacy/public';
+import { KibanaMapLayer, MapTypes } from '../../../../plugins/maps_legacy/public';
 import { HeatmapMarkers } from './markers/heatmap';
 import { ScaledCirclesMarkers } from './markers/scaled_circles';
 import { ShadedCirclesMarkers } from './markers/shaded_circles';
 import { GeohashGridMarkers } from './markers/geohash_grid';
-import { MapTypes } from './map_types';
 
 export class GeohashLayer extends KibanaMapLayer {
   constructor(featureCollection, featureCollectionMetaData, options, zoom, kibanaMap) {
diff --git a/src/legacy/core_plugins/tile_map/public/legacy.ts b/src/legacy/core_plugins/tile_map/public/legacy.ts
index 741e118750f3..dd8d4c6e9311 100644
--- a/src/legacy/core_plugins/tile_map/public/legacy.ts
+++ b/src/legacy/core_plugins/tile_map/public/legacy.ts
@@ -21,17 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { TileMapPluginSetupDependencies } from './plugin';
-import { LegacyDependenciesPlugin } from './shim';
 import { plugin } from '.';
 
 const plugins: Readonly<TileMapPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
   mapsLegacy: npSetup.plugins.mapsLegacy,
-
-  // Temporary solution
-  // It will be removed when all dependent services are migrated to the new platform.
-  __LEGACY: new LegacyDependenciesPlugin(),
 };
 
 const pluginInstance = plugin({} as PluginInitializerContext);
diff --git a/src/legacy/core_plugins/tile_map/public/plugin.ts b/src/legacy/core_plugins/tile_map/public/plugin.ts
index 2b97407b17b3..aa1460a7e289 100644
--- a/src/legacy/core_plugins/tile_map/public/plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/plugin.ts
@@ -25,22 +25,21 @@ import {
 } from '../../../../core/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
 import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-
-import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
+// TODO: Determine why visualizations don't populate without this
+import 'angular-sanitize';
 
 // @ts-ignore
 import { createTileMapFn } from './tile_map_fn';
 // @ts-ignore
 import { createTileMapTypeDefinition } from './tile_map_type';
-import { IServiceSettings, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
+import { getBaseMapsVis, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
 
 /** @private */
-interface TileMapVisualizationDependencies extends LegacyDependenciesPluginSetup {
-  serviceSettings: IServiceSettings;
+interface TileMapVisualizationDependencies {
   uiSettings: IUiSettingsClient;
   getZoomPrecision: any;
   getPrecision: any;
-  notificationService: any;
+  BaseMapsVisualization: any;
 }
 
 /** @internal */
@@ -48,7 +47,6 @@ export interface TileMapPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
   mapsLegacy: MapsLegacyPluginSetup;
-  __LEGACY: LegacyDependenciesPlugin;
 }
 
 /** @internal */
@@ -61,16 +59,14 @@ export class TileMapPlugin implements Plugin<Promise<void>, void> {
 
   public async setup(
     core: CoreSetup,
-    { expressions, visualizations, mapsLegacy, __LEGACY }: TileMapPluginSetupDependencies
+    { expressions, visualizations, mapsLegacy }: TileMapPluginSetupDependencies
   ) {
-    const { getZoomPrecision, getPrecision, serviceSettings } = mapsLegacy;
+    const { getZoomPrecision, getPrecision } = mapsLegacy;
     const visualizationDependencies: Readonly<TileMapVisualizationDependencies> = {
-      serviceSettings,
       getZoomPrecision,
       getPrecision,
-      notificationService: core.notifications.toasts,
+      BaseMapsVisualization: getBaseMapsVis(core, mapsLegacy.serviceSettings),
       uiSettings: core.uiSettings,
-      ...(await __LEGACY.setup()),
     };
 
     expressions.registerFunction(() => createTileMapFn(visualizationDependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/shim/index.ts b/src/legacy/core_plugins/tile_map/public/shim/index.ts
deleted file mode 100644
index cfc7b62ff4f8..000000000000
--- a/src/legacy/core_plugins/tile_map/public/shim/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './legacy_dependencies_plugin';
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index ae3a839b600e..ca6a586d2200 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -19,11 +19,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { convertToGeoJson } from '../../../../plugins/maps_legacy/public';
+import { convertToGeoJson, MapTypes } from '../../../../plugins/maps_legacy/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
 import { createTileMapVisualization } from './tile_map_visualization';
 import { TileMapOptions } from './components/tile_map_options';
-import { MapTypes } from './map_types';
 import { supportsCssFilters } from './css_filters';
 import { truncatedColorSchemas } from '../../../../plugins/charts/public';
 
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
index fdce8bc51fe8..6a7bda5e1888 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
@@ -19,30 +19,24 @@
 
 import { get } from 'lodash';
 import { GeohashLayer } from './geohash_layer';
-import { BaseMapsVisualizationProvider } from './base_maps_visualization';
-import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter';
 import { npStart } from 'ui/new_platform';
 import { getFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
-import { scaleBounds, geoContains } from '../../../../plugins/maps_legacy/public';
-
-export const createTileMapVisualization = ({
-  serviceSettings,
-  $injector,
-  getZoomPrecision,
-  getPrecision,
-  notificationService,
-}) => {
-  const BaseMapsVisualization = new BaseMapsVisualizationProvider(
-    serviceSettings,
-    notificationService
-  );
-  const tooltipFormatter = new TileMapTooltipFormatterProvider($injector);
+import {
+  scaleBounds,
+  geoContains,
+  mapTooltipProvider,
+} from '../../../../plugins/maps_legacy/public';
+import { tooltipFormatter } from './tooltip_formatter';
+
+export const createTileMapVisualization = dependencies => {
+  const { getZoomPrecision, getPrecision, BaseMapsVisualization } = dependencies;
 
   return class CoordinateMapsVisualization extends BaseMapsVisualization {
     constructor(element, vis) {
       super(element, vis);
 
       this._geohashLayer = null;
+      this._tooltipFormatter = mapTooltipProvider(element, tooltipFormatter);
     }
 
     updateGeohashAgg = () => {
@@ -190,18 +184,15 @@ export const createTileMapVisualization = ({
       const metricDimension = this._params.dimensions.metric;
       const metricLabel = metricDimension ? metricDimension.label : '';
       const metricFormat = getFormat(metricDimension && metricDimension.format);
-      const boundTooltipFormatter = tooltipFormatter.bind(
-        null,
-        metricLabel,
-        metricFormat.getConverterFor('text')
-      );
 
       return {
         label: metricLabel,
         valueFormatter: this._geoJsonFeatureCollectionAndMeta
           ? metricFormat.getConverterFor('text')
           : null,
-        tooltipFormatter: this._geoJsonFeatureCollectionAndMeta ? boundTooltipFormatter : null,
+        tooltipFormatter: this._geoJsonFeatureCollectionAndMeta
+          ? this._tooltipFormatter.bind(null, metricLabel, metricFormat.getConverterFor('text'))
+          : null,
         mapType: newParams.mapType,
         isFilteredByCollar: this._isFilteredByCollar(),
         colorRamp: newParams.colorSchema,
diff --git a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
similarity index 57%
rename from src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
rename to src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
index 5296e98b09ef..1c87d4dcca2b 100644
--- a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
@@ -17,27 +17,29 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { CoreStart, Plugin } from 'kibana/public';
-// TODO: Determine why visualizations don't populate without this
-import 'angular-sanitize';
+import { i18n } from '@kbn/i18n';
 
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
-  $injector: any;
-}
-
-export class LegacyDependenciesPlugin
-  implements Plugin<Promise<LegacyDependenciesPluginSetup>, void> {
-  public async setup() {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-
-    return {
-      $injector,
-    } as LegacyDependenciesPluginSetup;
+export function tooltipFormatter(metricTitle, metricFormat, feature) {
+  if (!feature) {
+    return '';
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
-  }
+  return [
+    {
+      label: metricTitle,
+      value: metricFormat(feature.properties.value),
+    },
+    {
+      label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
+        defaultMessage: 'Latitude',
+      }),
+      value: feature.geometry.coordinates[1],
+    },
+    {
+      label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
+        defaultMessage: 'Longitude',
+      }),
+      value: feature.geometry.coordinates[0],
+    },
+  ];
 }
diff --git a/src/plugins/maps_legacy/public/__tests__/map/service_settings.js b/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
index 4cbe098501c6..822378163a7e 100644
--- a/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
+++ b/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
@@ -26,7 +26,7 @@ import EMS_TILES from './ems_mocks/sample_tiles.json';
 import EMS_STYLE_ROAD_MAP_BRIGHT from './ems_mocks/sample_style_bright';
 import EMS_STYLE_ROAD_MAP_DESATURATED from './ems_mocks/sample_style_desaturated';
 import EMS_STYLE_DARK_MAP from './ems_mocks/sample_style_dark';
-import { ORIGIN } from '../../common/origin';
+import { ORIGIN } from '../../common/constants/origin';
 
 describe('service_settings (FKA tilemaptest)', function() {
   let serviceSettings;
diff --git a/src/plugins/maps_legacy/public/common/origin.ts b/src/plugins/maps_legacy/public/common/constants/origin.ts
similarity index 100%
rename from src/plugins/maps_legacy/public/common/origin.ts
rename to src/plugins/maps_legacy/public/common/constants/origin.ts
diff --git a/src/legacy/core_plugins/tile_map/public/types.ts b/src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
similarity index 95%
rename from src/legacy/core_plugins/tile_map/public/types.ts
rename to src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
index e1b4c2731912..be9c4d0d9c37 100644
--- a/src/legacy/core_plugins/tile_map/public/types.ts
+++ b/src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { TmsLayer } from '../../../../plugins/maps_legacy/public';
+import { TmsLayer } from '../../index';
 import { MapTypes } from './map_types';
 
 export interface WMSOptions {
diff --git a/src/legacy/core_plugins/region_map/public/shim/index.ts b/src/plugins/maps_legacy/public/common/types/index.ts
similarity index 79%
rename from src/legacy/core_plugins/region_map/public/shim/index.ts
rename to src/plugins/maps_legacy/public/common/types/index.ts
index cfc7b62ff4f8..e6cabdde82cd 100644
--- a/src/legacy/core_plugins/region_map/public/shim/index.ts
+++ b/src/plugins/maps_legacy/public/common/types/index.ts
@@ -17,4 +17,10 @@
  * under the License.
  */
 
-export * from './legacy_dependencies_plugin';
+/**
+ * Use * syntax so that these exports do not break when internal
+ * types are stripped.
+ */
+export * from './external_basemap_types';
+export * from './map_types';
+export * from './region_map_types';
diff --git a/src/legacy/core_plugins/tile_map/public/map_types.ts b/src/plugins/maps_legacy/public/common/types/map_types.ts
similarity index 100%
rename from src/legacy/core_plugins/tile_map/public/map_types.ts
rename to src/plugins/maps_legacy/public/common/types/map_types.ts
diff --git a/src/legacy/core_plugins/region_map/public/types.ts b/src/plugins/maps_legacy/public/common/types/region_map_types.ts
similarity index 89%
rename from src/legacy/core_plugins/region_map/public/types.ts
rename to src/plugins/maps_legacy/public/common/types/region_map_types.ts
index 8585bf720e0c..0da597068f11 100644
--- a/src/legacy/core_plugins/region_map/public/types.ts
+++ b/src/plugins/maps_legacy/public/common/types/region_map_types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { VectorLayer, FileLayerField } from '../../../../plugins/maps_legacy/public';
-import { WMSOptions } from '../../tile_map/public/types';
+import { VectorLayer, FileLayerField } from '../../index';
+import { WMSOptions } from './external_basemap_types';
 
 export interface RegionMapVisParams {
   readonly addTooltip: true;
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx b/src/plugins/maps_legacy/public/components/wms_internal_options.tsx
similarity index 77%
rename from src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
rename to src/plugins/maps_legacy/public/components/wms_internal_options.tsx
index 47f5b8f31e62..d1def8153d1a 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
+++ b/src/plugins/maps_legacy/public/components/wms_internal_options.tsx
@@ -21,8 +21,8 @@ import React from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { TextInputOption } from '../../../../../plugins/charts/public';
-import { WMSOptions } from '../types';
+import { TextInputOption } from '../../../charts/public';
+import { WMSOptions } from '../common/types/external_basemap_types';
 
 interface WmsInternalOptions {
   wms: WMSOptions;
@@ -32,14 +32,14 @@ interface WmsInternalOptions {
 function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
   const wmsLink = (
     <EuiLink href="http://www.opengeospatial.org/standards/wms" target="_blank">
-      <FormattedMessage id="tileMap.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
+      <FormattedMessage id="maps_legacy.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
     </EuiLink>
   );
   const footnoteText = (
     <>
       <span aria-hidden="true">*</span>
       <FormattedMessage
-        id="tileMap.wmsOptions.mapLoadFailDescription"
+        id="maps_legacy.wmsOptions.mapLoadFailDescription"
         defaultMessage="If this parameter is incorrect, maps will fail to load."
       />
     </>
@@ -64,7 +64,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <EuiSpacer size="xs" />
       <EuiText size="xs">
         <FormattedMessage
-          id="tileMap.wmsOptions.wmsDescription"
+          id="maps_legacy.wmsOptions.wmsDescription"
           defaultMessage="WMS is an {wmsLink} for map image services."
           values={{ wmsLink }}
         />
@@ -74,14 +74,14 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
+            <FormattedMessage id="maps_legacy.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.urlOfWMSWebServiceTip"
+              id="maps_legacy.wmsOptions.urlOfWMSWebServiceTip"
               defaultMessage="The URL of the WMS web service."
             />
             {footnote}
@@ -95,14 +95,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsLayersLabel" defaultMessage="WMS layers" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsLayersLabel"
+              defaultMessage="WMS layers"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.listOfLayersToUseTip"
+              id="maps_legacy.wmsOptions.listOfLayersToUseTip"
               defaultMessage="A comma separated list of layers to use."
             />
             {footnote}
@@ -117,7 +120,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
         label={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.wmsVersionLabel"
+              id="maps_legacy.wmsOptions.wmsVersionLabel"
               defaultMessage="WMS version"
             />
             <span aria-hidden="true">*</span>
@@ -126,7 +129,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.versionOfWMSserverSupportsTip"
+              id="maps_legacy.wmsOptions.versionOfWMSserverSupportsTip"
               defaultMessage="The version of WMS the server supports."
             />
             {footnote}
@@ -140,14 +143,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsFormatLabel" defaultMessage="WMS format" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsFormatLabel"
+              defaultMessage="WMS format"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.imageFormatToUseTip"
+              id="maps_legacy.wmsOptions.imageFormatToUseTip"
               defaultMessage="Usually image/png or image/jpeg. Use png if the server will return transparent layers."
             />
             {footnote}
@@ -161,13 +167,13 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <FormattedMessage
-            id="tileMap.wmsOptions.wmsAttributionLabel"
+            id="maps_legacy.wmsOptions.wmsAttributionLabel"
             defaultMessage="WMS attribution"
           />
         }
         helpText={
           <FormattedMessage
-            id="tileMap.wmsOptions.attributionStringTip"
+            id="maps_legacy.wmsOptions.attributionStringTip"
             defaultMessage="Attribution string for the lower right corner."
           />
         }
@@ -179,14 +185,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsStylesLabel" defaultMessage="WMS styles" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsStylesLabel"
+              defaultMessage="WMS styles"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.wmsServerSupportedStylesListTip"
+              id="maps_legacy.wmsOptions.wmsServerSupportedStylesListTip"
               defaultMessage="A comma separated list of WMS server supported styles to use. Blank in most cases."
             />
             {footnote}
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx b/src/plugins/maps_legacy/public/components/wms_options.tsx
similarity index 82%
rename from src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
rename to src/plugins/maps_legacy/public/components/wms_options.tsx
index e74c260d3b8e..4892463bb9f8 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
+++ b/src/plugins/maps_legacy/public/components/wms_options.tsx
@@ -21,12 +21,12 @@ import React, { useMemo } from 'react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { TmsLayer } from '../../../../../plugins/maps_legacy/public';
-import { Vis } from '../../../../../plugins/visualizations/public';
-import { RegionMapVisParams } from '../../../region_map/public/types';
-import { SelectOption, SwitchOption } from '../../../../../plugins/charts/public';
+import { TmsLayer } from '../index';
+import { Vis } from '../../../visualizations/public';
+import { RegionMapVisParams } from '../common/types/region_map_types';
+import { SelectOption, SwitchOption } from '../../../charts/public';
 import { WmsInternalOptions } from './wms_internal_options';
-import { WMSOptions, TileMapVisParams } from '../types';
+import { WMSOptions, TileMapVisParams } from '../common/types/external_basemap_types';
 
 interface Props {
   stateParams: TileMapVisParams | RegionMapVisParams;
@@ -59,7 +59,7 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
       <EuiTitle size="xs">
         <h2>
           <FormattedMessage
-            id="tileMap.wmsOptions.baseLayerSettingsTitle"
+            id="maps_legacy.wmsOptions.baseLayerSettingsTitle"
             defaultMessage="Base layer settings"
           />
         </h2>
@@ -67,10 +67,10 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
       <EuiSpacer size="s" />
 
       <SwitchOption
-        label={i18n.translate('tileMap.wmsOptions.wmsMapServerLabel', {
+        label={i18n.translate('maps_legacy.wmsOptions.wmsMapServerLabel', {
           defaultMessage: 'WMS map server',
         })}
-        tooltip={i18n.translate('tileMap.wmsOptions.useWMSCompliantMapTileServerTip', {
+        tooltip={i18n.translate('maps_legacy.wmsOptions.useWMSCompliantMapTileServerTip', {
           defaultMessage: 'Use WMS compliant map tile server. For advanced users only.',
         })}
         paramName="enabled"
@@ -83,7 +83,7 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
           <EuiSpacer size="s" />
           <SelectOption
             id="wmsOptionsSelectTmsLayer"
-            label={i18n.translate('tileMap.wmsOptions.layersLabel', {
+            label={i18n.translate('maps_legacy.wmsOptions.layersLabel', {
               defaultMessage: 'Layers',
             })}
             options={tmsLayerOptions}
diff --git a/src/plugins/maps_legacy/public/index.ts b/src/plugins/maps_legacy/public/index.ts
index 861f67006ad8..17cecab9f745 100644
--- a/src/plugins/maps_legacy/public/index.ts
+++ b/src/plugins/maps_legacy/public/index.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { MapsLegacyPlugin } from './plugin';
+import { CoreSetup } from 'kibana/public';
+import { bindSetupCoreAndPlugins, MapsLegacyPlugin } from './plugin';
 // @ts-ignore
 import * as colorUtil from './map/color_util';
 // @ts-ignore
@@ -29,6 +30,7 @@ import { convertToGeoJson } from './map/convert_to_geojson';
 // @ts-ignore
 import { scaleBounds, getPrecision, geoContains } from './map/decode_geo_hash';
 // @ts-ignore
+import { BaseMapsVisualizationProvider } from './map/base_maps_visualization';
 import {
   VectorLayer,
   FileLayerField,
@@ -36,6 +38,8 @@ import {
   TmsLayer,
   IServiceSettings,
 } from './map/service_settings';
+// @ts-ignore
+import { mapTooltipProvider } from './tooltip_provider';
 
 export function plugin() {
   return new MapsLegacyPlugin();
@@ -49,13 +53,32 @@ export {
   colorUtil,
   convertToGeoJson,
   IServiceSettings,
-  KibanaMap,
   KibanaMapLayer,
   VectorLayer,
   FileLayerField,
   FileLayer,
   TmsLayer,
+  mapTooltipProvider,
 };
 
+// Due to a leaflet/leaflet-draw bug, it's not possible to consume leaflet maps w/ draw control
+// through a pipeline leveraging angular. For this reason, client plugins need to
+// init kibana map and the basemaps visualization directly rather than consume through
+// the usual plugin interface
+export function getKibanaMapFactoryProvider(core: CoreSetup) {
+  bindSetupCoreAndPlugins(core);
+  return (...args: any) => new KibanaMap(...args);
+}
+
+export function getBaseMapsVis(core: CoreSetup, serviceSettings: IServiceSettings) {
+  const getKibanaMap = getKibanaMapFactoryProvider(core);
+  return new BaseMapsVisualizationProvider(getKibanaMap, serviceSettings);
+}
+
+export * from './common/types';
+export { ORIGIN } from './common/constants/origin';
+
+export { WmsOptions } from './components/wms_options';
+
 export type MapsLegacyPluginSetup = ReturnType<MapsLegacyPlugin['setup']>;
 export type MapsLegacyPluginStart = ReturnType<MapsLegacyPlugin['start']>;
diff --git a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js b/src/plugins/maps_legacy/public/map/base_maps_visualization.js
similarity index 89%
rename from src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
rename to src/plugins/maps_legacy/public/map/base_maps_visualization.js
index 1dac4607280c..c4ac671a5187 100644
--- a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
+++ b/src/plugins/maps_legacy/public/map/base_maps_visualization.js
@@ -19,16 +19,14 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaMap } from '../../../../plugins/maps_legacy/public';
 import * as Rx from 'rxjs';
 import { filter, first } from 'rxjs/operators';
-import { toastNotifications } from 'ui/notify';
-import chrome from 'ui/chrome';
+import { getInjectedVarFunc, getUiSettings, getToasts } from '../kibana_services';
 
 const WMS_MINZOOM = 0;
 const WMS_MAXZOOM = 22; //increase this to 22. Better for WMS
 
-export function BaseMapsVisualizationProvider(mapServiceSettings, notificationService) {
+export function BaseMapsVisualizationProvider(getKibanaMap, mapServiceSettings) {
   /**
    * Abstract base class for a visualization consisting of a map with a single baselayer.
    * @class BaseMapsVisualization
@@ -36,7 +34,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
    */
 
   const serviceSettings = mapServiceSettings;
-  const toastService = notificationService;
+  const toastService = getToasts();
 
   return class BaseMapsVisualization {
     constructor(element, vis) {
@@ -99,7 +97,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
       options.center = centerFromUIState ? centerFromUIState : this.vis.params.mapCenter;
       const services = { toastService };
 
-      this._kibanaMap = new KibanaMap(this._container, options, services);
+      this._kibanaMap = getKibanaMap(this._container, options, services);
       this._kibanaMap.setMinZoom(WMS_MINZOOM); //use a default
       this._kibanaMap.setMaxZoom(WMS_MAXZOOM); //use a default
 
@@ -118,20 +116,20 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
 
     _tmsConfigured() {
       const { wms } = this._getMapsParams();
-      const hasTmsBaseLayer = !!wms.selectedTmsLayer;
+      const hasTmsBaseLayer = wms && !!wms.selectedTmsLayer;
 
       return hasTmsBaseLayer;
     }
 
     _wmsConfigured() {
       const { wms } = this._getMapsParams();
-      const hasWmsBaseLayer = !!wms.enabled;
+      const hasWmsBaseLayer = wms && !!wms.enabled;
 
       return hasWmsBaseLayer;
     }
 
     async _updateBaseLayer() {
-      const emsTileLayerId = chrome.getInjected('emsTileLayerId', true);
+      const emsTileLayerId = getInjectedVarFunc()('emsTileLayerId', true);
 
       if (!this._kibanaMap) {
         return;
@@ -149,7 +147,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
             this._setTmsLayer(initBasemapLayer);
           }
         } catch (e) {
-          toastNotifications.addWarning(e.message);
+          toastService.addWarning(e.message);
           return;
         }
         return;
@@ -176,7 +174,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
           this._setTmsLayer(selectedTmsLayer);
         }
       } catch (tmsLoadingError) {
-        toastNotifications.addWarning(tmsLoadingError.message);
+        toastService.addWarning(tmsLoadingError.message);
       }
     }
 
@@ -190,7 +188,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
       if (typeof isDesaturated !== 'boolean') {
         isDesaturated = true;
       }
-      const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode');
+      const isDarkMode = getUiSettings().get('theme:darkMode');
       const meta = await serviceSettings.getAttributesForTMSLayer(
         tmsLayer,
         isDesaturated,
@@ -208,7 +206,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
 
     async _updateData() {
       throw new Error(
-        i18n.translate('tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
+        i18n.translate('maps_legacy.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
           defaultMessage: 'Child should implement this method to respond to data-update',
         })
       );
diff --git a/src/plugins/maps_legacy/public/map/kibana_map.js b/src/plugins/maps_legacy/public/map/kibana_map.js
index 1c4d0882cb7d..c7cec1b14159 100644
--- a/src/plugins/maps_legacy/public/map/kibana_map.js
+++ b/src/plugins/maps_legacy/public/map/kibana_map.js
@@ -24,7 +24,8 @@ import $ from 'jquery';
 import _ from 'lodash';
 import { zoomToPrecision } from './zoom_to_precision';
 import { i18n } from '@kbn/i18n';
-import { ORIGIN } from '../common/origin';
+import { ORIGIN } from '../common/constants/origin';
+import { getToasts } from '../kibana_services';
 
 function makeFitControl(fitContainer, kibanaMap) {
   const FitControl = L.Control.extend({
@@ -101,7 +102,7 @@ function makeLegendControl(container, kibanaMap, position) {
  * Serves as simple abstraction for leaflet as well.
  */
 export class KibanaMap extends EventEmitter {
-  constructor(containerNode, options, services) {
+  constructor(containerNode, options) {
     super();
     this._containerNode = containerNode;
     this._leafletBaseLayer = null;
@@ -116,7 +117,6 @@ export class KibanaMap extends EventEmitter {
     this._layers = [];
     this._listeners = [];
     this._showTooltip = false;
-    this.toastService = services ? services.toastService : null;
 
     const leafletOptions = {
       minZoom: options.minZoom,
@@ -483,21 +483,19 @@ export class KibanaMap extends EventEmitter {
   }
 
   _addMaxZoomMessage = layer => {
-    if (this.toastService) {
-      const zoomWarningMsg = createZoomWarningMsg(
-        this.toastService,
-        this.getZoomLevel,
-        this.getMaxZoomLevel
-      );
+    const zoomWarningMsg = createZoomWarningMsg(
+      getToasts(),
+      this.getZoomLevel,
+      this.getMaxZoomLevel
+    );
 
-      this._leafletMap.on('zoomend', zoomWarningMsg);
-      this._containerNode.setAttribute('data-test-subj', 'zoomWarningEnabled');
+    this._leafletMap.on('zoomend', zoomWarningMsg);
+    this._containerNode.setAttribute('data-test-subj', 'zoomWarningEnabled');
 
-      layer.on('remove', () => {
-        this._leafletMap.off('zoomend', zoomWarningMsg);
-        this._containerNode.removeAttribute('data-test-subj');
-      });
-    }
+    layer.on('remove', () => {
+      this._leafletMap.off('zoomend', zoomWarningMsg);
+      this._containerNode.removeAttribute('data-test-subj');
+    });
   };
 
   setLegendPosition(position) {
diff --git a/src/plugins/maps_legacy/public/map/service_settings.js b/src/plugins/maps_legacy/public/map/service_settings.js
index f4f0d66ee20d..8e3a0648e99d 100644
--- a/src/plugins/maps_legacy/public/map/service_settings.js
+++ b/src/plugins/maps_legacy/public/map/service_settings.js
@@ -22,7 +22,7 @@ import MarkdownIt from 'markdown-it';
 import { EMSClient } from '@elastic/ems-client';
 import { i18n } from '@kbn/i18n';
 import { getInjectedVarFunc } from '../kibana_services';
-import { ORIGIN } from '../common/origin';
+import { ORIGIN } from '../common/constants/origin';
 
 const TMS_IN_YML_ID = 'TMS in config/kibana.yml';
 
diff --git a/src/plugins/maps_legacy/public/plugin.ts b/src/plugins/maps_legacy/public/plugin.ts
index 751be65e1dbf..acc7655a5e26 100644
--- a/src/plugins/maps_legacy/public/plugin.ts
+++ b/src/plugins/maps_legacy/public/plugin.ts
@@ -33,18 +33,20 @@ import { MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
  * @public
  */
 
+export const bindSetupCoreAndPlugins = (core: CoreSetup) => {
+  setToasts(core.notifications.toasts);
+  setUiSettings(core.uiSettings);
+  setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+};
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MapsLegacySetupDependencies {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MapsLegacyStartDependencies {}
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegacyPluginStart> {
-  constructor() {}
-
   public setup(core: CoreSetup, plugins: MapsLegacySetupDependencies) {
-    setToasts(core.notifications.toasts);
-    setUiSettings(core.uiSettings);
-    setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+    bindSetupCoreAndPlugins(core);
 
     return {
       serviceSettings: new ServiceSettings(),
diff --git a/src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts b/src/plugins/maps_legacy/public/tooltip_provider.js
similarity index 56%
rename from src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts
rename to src/plugins/maps_legacy/public/tooltip_provider.js
index 3a7615e83f28..856314081699 100644
--- a/src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts
+++ b/src/plugins/maps_legacy/public/tooltip_provider.js
@@ -17,26 +17,27 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { CoreStart, Plugin } from 'kibana/public';
+import React from 'react';
+import ReactDOMServer from 'react-dom/server';
 
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
-  $injector: any;
-  serviceSettings: any;
+function getToolTipContent(details) {
+  return ReactDOMServer.renderToStaticMarkup(
+    <table>
+      <tbody>
+        {details.map((detail, i) => (
+          <tr key={i}>
+            <td className="visTooltip__label">{detail.label}</td>
+            <td className="visTooltip__value">{detail.value}</td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
 }
 
-export class LegacyDependenciesPlugin
-  implements Plugin<Promise<LegacyDependenciesPluginSetup>, void> {
-  public async setup() {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-
-    return {
-      $injector,
-    } as LegacyDependenciesPluginSetup;
-  }
-
-  public start(core: CoreStart) {
-    // nothing to do here yet
-  }
+export function mapTooltipProvider(element, formatter) {
+  return (...args) => {
+    const details = formatter(...args);
+    return details && getToolTipContent(details);
+  };
 }
diff --git a/src/plugins/vis_type_vega/public/plugin.ts b/src/plugins/vis_type_vega/public/plugin.ts
index c312705194cd..b52dcfbd914f 100644
--- a/src/plugins/vis_type_vega/public/plugin.ts
+++ b/src/plugins/vis_type_vega/public/plugin.ts
@@ -26,14 +26,14 @@ import {
   setSavedObjects,
   setInjectedVars,
   setUISettings,
+  setKibanaMapFactory,
 } from './services';
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import { IServiceSettings } from '../../maps_legacy/public';
-import { ConfigSchema } from '../config';
-
+import { getKibanaMapFactoryProvider, IServiceSettings } from '../../maps_legacy/public';
 import './index.scss';
+import { ConfigSchema } from '../config';
 
 /** @internal */
 export interface VegaVisualizationDependencies {
@@ -75,6 +75,7 @@ export class VegaPlugin implements Plugin<Promise<void>, void> {
       emsTileLayerId: core.injectedMetadata.getInjectedVar('emsTileLayerId', true),
     });
     setUISettings(core.uiSettings);
+    setKibanaMapFactory(getKibanaMapFactoryProvider(core));
 
     const visualizationDependencies: Readonly<VegaVisualizationDependencies> = {
       core,
diff --git a/src/plugins/vis_type_vega/public/services.ts b/src/plugins/vis_type_vega/public/services.ts
index e349cfbdc002..f81f87d7ad2e 100644
--- a/src/plugins/vis_type_vega/public/services.ts
+++ b/src/plugins/vis_type_vega/public/services.ts
@@ -27,6 +27,9 @@ export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Dat
 export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
   'Notifications'
 );
+export const [getKibanaMapFactory, setKibanaMapFactory] = createGetterSetter<any>(
+  'KibanaMapFactory'
+);
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
index bd6652a59720..895d496a896a 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
+++ b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
@@ -21,13 +21,11 @@ import * as vega from 'vega-lib';
 import { i18n } from '@kbn/i18n';
 import { VegaBaseView } from './vega_base_view';
 import { VegaMapLayer } from './vega_map_layer';
-import { KibanaMap } from '../../../maps_legacy/public';
-import { getEmsTileLayerId, getUISettings } from '../services';
+import { getEmsTileLayerId, getUISettings, getKibanaMapFactory } from '../services';
 
 export class VegaMapView extends VegaBaseView {
-  constructor(opts, services) {
+  constructor(opts) {
     super(opts);
-    this.services = services;
   }
 
   async _initViewCustomizations() {
@@ -107,18 +105,14 @@ export class VegaMapView extends VegaBaseView {
     //   maxBounds = L.latLngBounds(L.latLng(b[1], b[0]), L.latLng(b[3], b[2]));
     // }
 
-    this._kibanaMap = new KibanaMap(
-      this._$container.get(0),
-      {
-        zoom,
-        minZoom,
-        maxZoom,
-        center: [mapConfig.latitude, mapConfig.longitude],
-        zoomControl: mapConfig.zoomControl,
-        scrollWheelZoom: mapConfig.scrollWheelZoom,
-      },
-      this.services
-    );
+    this._kibanaMap = getKibanaMapFactory()(this._$container.get(0), {
+      zoom,
+      minZoom,
+      maxZoom,
+      center: [mapConfig.latitude, mapConfig.longitude],
+      zoomControl: mapConfig.zoomControl,
+      scrollWheelZoom: mapConfig.scrollWheelZoom,
+    });
 
     if (baseMapOpts) {
       this._kibanaMap.setBaseLayer({
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ac074d99e9ff..d48e65fabb8d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2579,7 +2579,6 @@
     "telemetry.welcomeBanner.enableButtonLabel": "有効にする",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遠隔測定に関するプライバシーステートメント",
     "telemetry.welcomeBanner.title": "Elastic Stack の改善にご協力ください",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子は data-update に対応できるようこのメソドを導入する必要があります",
     "tileMap.function.help": "タイルマップのビジュアライゼーションです",
     "tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません",
     "tileMap.tooltipFormatter.latitudeLabel": "緯度",
@@ -2601,25 +2600,6 @@
     "tileMap.visParams.desaturateTilesLabel": "タイルを不飽和化",
     "tileMap.visParams.mapTypeLabel": "マップタイプ",
     "tileMap.visParams.reduceVibrancyOfTileColorsTip": "色の鮮明度を下げます。この機能は Internet Explorer ではバージョンにかかわらず利用できません。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角の属性文字列",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "ベースレイヤー設定",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常画像/png または画像/jpeg です。サーバーが透明レイヤーを返す場合は png を使用します。",
-    "tileMap.wmsOptions.layersLabel": "レイヤー",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "使用するレイヤーのコンマ区切りのリストです。",
-    "tileMap.wmsOptions.mapLoadFailDescription": "このパラメーターが正しくないと、マップが正常に読み込まれません。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS web サービスの URL です。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "WMS 対応のマップタイルサーバーを使用します。上級者向けです。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "サーバーがサポートしている WMS のバージョンです。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsDescription": "WMS は、マップイメージサービスの {wmsLink} です。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS フォーマット",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS レイヤー",
-    "tileMap.wmsOptions.wmsLinkText": "OGC スタンダード",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS マップサーバー",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "WMS サーバーがサポートしている使用スタイルのコンマ区切りのリストです。大抵は空白のままです。",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS スタイル",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS URL",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS バージョン",
     "timelion.badge.readOnly.text": "読み込み専用",
     "timelion.badge.readOnly.tooltip": "Timelion シートを保存できません",
     "timelion.breadcrumbs.create": "作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 60b958623bdc..196c8183e0cc 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2580,7 +2580,6 @@
     "telemetry.welcomeBanner.enableButtonLabel": "启用",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遥测隐私声明",
     "telemetry.welcomeBanner.title": "帮助我们改进 Elastic Stack",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子函数应实现此方法以响应数据更新",
     "tileMap.function.help": "磁贴地图可视化",
     "tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别",
     "tileMap.tooltipFormatter.latitudeLabel": "纬度",
@@ -2602,25 +2601,6 @@
     "tileMap.visParams.desaturateTilesLabel": "降低平铺地图饱和度",
     "tileMap.visParams.mapTypeLabel": "地图类型",
     "tileMap.visParams.reduceVibrancyOfTileColorsTip": "降低平铺地图颜色的亮度。此设置在任何版本的 IE 浏览器中均不起作用。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角的属性字符串。",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "基础图层设置",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常为 image/png 或 image/jpeg。如果服务器返回透明图层，则使用 png。",
-    "tileMap.wmsOptions.layersLabel": "图层",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "要使用的图层逗号分隔列表。",
-    "tileMap.wmsOptions.mapLoadFailDescription": "如果此参数不正确，将无法加载地图。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS Web 服务的 URL。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "使用符合 WMS 规范的平铺地图服务器。仅适用于高级用户。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "服务器支持的 WMS 版本。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsDescription": "WMS 是用于地图图像服务的 {wmsLink}。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS 格式",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS 图层",
-    "tileMap.wmsOptions.wmsLinkText": "OGC 标准",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS 地图服务器",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "要使用的以逗号分隔的 WMS 服务器支持的样式列表。在大部分情况下为空。",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS 样式",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS url",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS 版本",
     "timelion.badge.readOnly.text": "只读",
     "timelion.badge.readOnly.tooltip": "无法保存 Timelion 工作表",
     "timelion.breadcrumbs.create": "创建",