Mostly file movement, a few updates. Some work towards using NP config

src/plugins/maps_legacy/kibana.json

@@ -2,5 +2,7 @@
   "id": "mapsLegacy",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "ui": true
+  "configPath": ["map"],
+  "ui": true,
+  "server": true
 }

src/plugins/maps_legacy/public/index.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup, PluginInitializerContext } from 'kibana/public';
 import { bindSetupCoreAndPlugins, MapsLegacyPlugin } from './plugin';
 // @ts-ignore
 import * as colorUtil from './map/color_util';
@@ -41,8 +41,15 @@ import {
 // @ts-ignore
 import { mapTooltipProvider } from './tooltip_provider';
 
-export function plugin() {
-  return new MapsLegacyPlugin();
+export interface MapsLegacyConfigType {
+  emsTileLayerId: string;
+  includeElasticMapsService: boolean;
+  proxyElasticMapsServiceInMaps: boolean;
+  tilemap: any;
+}
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new MapsLegacyPlugin(initializerContext);
 }
 
 /** @public */

src/plugins/maps_legacy/public/map/service_settings.js

@@ -27,10 +27,10 @@ import { ORIGIN } from '../common/constants/origin';
 const TMS_IN_YML_ID = 'TMS in config/kibana.yml';
 
 export class ServiceSettings {
-  constructor() {
+  constructor(mapConfig, tilemapsConfig) {
     const getInjectedVar = getInjectedVarFunc();
-    this.mapConfig = getInjectedVar('mapConfig');
-    this.tilemapsConfig = getInjectedVar('tilemapsConfig');
+    this.mapConfig = mapConfig;
+    this.tilemapsConfig = tilemapsConfig;
     const kbnVersion = getInjectedVar('version');
 
     this._showZoomMessage = true;

src/plugins/maps_legacy/public/plugin.ts

@@ -18,14 +18,14 @@
  */
 
 // @ts-ignore
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
 // @ts-ignore
 import { setToasts, setUiSettings, setInjectedVarFunc } from './kibana_services';
 // @ts-ignore
 import { ServiceSettings } from './map/service_settings';
 // @ts-ignore
 import { getPrecision, getZoomPrecision } from './map/precision';
-import { MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
+import { MapsLegacyConfigType, MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
 
 /**
  * These are the interfaces with your public contracts. You should export these
@@ -45,13 +45,20 @@ export interface MapsLegacySetupDependencies {}
 export interface MapsLegacyStartDependencies {}
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegacyPluginStart> {
+  constructor(initializerContext: PluginInitializerContext) {
+    this.initializerContext = initializerContext;
+  }
+
   public setup(core: CoreSetup, plugins: MapsLegacySetupDependencies) {
     bindSetupCoreAndPlugins(core);
 
+    const config = this.initializerContext.config.get<MapsLegacyConfigType>();
+
     return {
-      serviceSettings: new ServiceSettings(),
+      serviceSettings: new ServiceSettings(config, config.tilemap),
       getZoomPrecision,
       getPrecision,
+      config,
     };
   }
 

src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js → src/plugins/tile_map/public/__tests__/coordinate_maps_visualization.js

@@ -26,34 +26,34 @@ import blues from './blues.png';
 import shadedGeohashGrid from './shadedGeohashGrid.png';
 import heatmapRaw from './heatmap_raw.png';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_CATALOGUE from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_manifest.json';
+import EMS_CATALOGUE from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_manifest.json';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_FILES from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_files.json';
+import EMS_FILES from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_files.json';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_TILES from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_tiles.json';
+import EMS_TILES from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_tiles.json';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_STYLE_ROAD_MAP_BRIGHT from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_style_bright';
+import EMS_STYLE_ROAD_MAP_BRIGHT from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_style_bright';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_STYLE_ROAD_MAP_DESATURATED from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_style_desaturated';
+import EMS_STYLE_ROAD_MAP_DESATURATED from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_style_desaturated';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import EMS_STYLE_DARK_MAP from '../../../../../plugins/maps_legacy/public/__tests__/map/ems_mocks/sample_style_dark';
+import EMS_STYLE_DARK_MAP from '../../../maps_legacy/public/__tests__/map/ems_mocks/sample_style_dark';
 
 import { createTileMapVisualization } from '../tile_map_visualization';
 import { createTileMapTypeDefinition } from '../tile_map_type';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExprVis } from '../../../../../plugins/visualizations/public/expressions/vis';
+import { ExprVis } from '../../../visualizations/public/expressions/vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_types/base_vis_type';
+import { BaseVisType } from '../../../visualizations/public/vis_types/base_vis_type';
 import {
   getPrecision,
   getZoomPrecision,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../plugins/maps_legacy/public/map/precision';
+} from '../../../maps_legacy/public/map/precision';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { ServiceSettings } from '../../../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';
+import { setInjectedVarFunc } from '../../../maps_legacy/public/kibana_services';
+import { getBaseMapsVis } from '../../../maps_legacy/public';
 
 function mockRawData() {
   const stack = [dummyESResponse];

src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js → src/plugins/tile_map/public/__tests__/geohash_layer.js

@@ -25,7 +25,7 @@ import scaledCircleMarkersPng from './scaledCircleMarkers.png';
 import { ImageComparator } from 'test_utils/image_comparator';
 import GeoHashSampleData from './dummy_es_response.json';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaMap } from '../../../../../plugins/maps_legacy/public/map/kibana_map';
+import { KibanaMap } from '../../../maps_legacy/public/map/kibana_map';
 
 describe('geohash_layer', function() {
   let domNode;

src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx → src/plugins/tile_map/public/components/tile_map_options.tsx

@@ -22,13 +22,8 @@ import { EuiPanel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import {
-  BasicOptions,
-  RangeOption,
-  SelectOption,
-  SwitchOption,
-} from '../../../../../plugins/charts/public';
-import { WmsOptions, TileMapVisParams, MapTypes } from '../../../../../plugins/maps_legacy/public';
+import { BasicOptions, RangeOption, SelectOption, SwitchOption } from '../../../charts/public';
+import { WmsOptions, TileMapVisParams, MapTypes } from '../../../maps_legacy/public';
 
 export type TileMapOptionsProps = VisOptionsProps<TileMapVisParams>;
 

src/legacy/core_plugins/tile_map/public/geohash_layer.js → src/plugins/tile_map/public/geohash_layer.js

@@ -20,7 +20,7 @@
 import L from 'leaflet';
 import { min, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaMapLayer, MapTypes } from '../../../../plugins/maps_legacy/public';
+import { KibanaMapLayer, MapTypes } from '../../maps_legacy/public';
 import { HeatmapMarkers } from './markers/heatmap';
 import { ScaledCirclesMarkers } from './markers/scaled_circles';
 import { ShadedCirclesMarkers } from './markers/shaded_circles';

src/legacy/core_plugins/tile_map/public/index.scss → src/plugins/tile_map/public/index.scss

@@ -7,4 +7,4 @@
 //   tlmChart__legend--small
 //   tlmChart__legend-isLoading
 
-@import './tile_map';
+@import 'tile_map';

src/legacy/core_plugins/tile_map/public/index.ts → src/plugins/tile_map/public/index.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from 'kibana/public';
 import { TileMapPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {

src/legacy/core_plugins/tile_map/public/markers/scaled_circles.js → src/plugins/tile_map/public/markers/scaled_circles.js

@@ -22,8 +22,8 @@ import _ from 'lodash';
 import d3 from 'd3';
 import $ from 'jquery';
 import { EventEmitter } from 'events';
-import { colorUtil } from '../../../../../plugins/maps_legacy/public';
-import { truncatedColorMaps } from '../../../../../plugins/charts/public';
+import { colorUtil } from '../../../maps_legacy/public';
+import { truncatedColorMaps } from '../../../charts/public';
 
 export class ScaledCirclesMarkers extends EventEmitter {
   constructor(

src/legacy/core_plugins/tile_map/public/plugin.ts → src/plugins/tile_map/public/plugin.ts

@@ -22,20 +22,24 @@ import {
   Plugin,
   PluginInitializerContext,
   IUiSettingsClient,
-} from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+} from 'kibana/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup } from '../../visualizations/public';
 // 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 { getBaseMapsVis, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { getBaseMapsVis, MapsLegacyPluginSetup } from '../../maps_legacy/public';
+import { DataPublicPluginStart } from '../../data/public';
 import { setFormatService, setQueryService } from './services';
 
+export interface TileMapConfigType {
+  tilemap: any;
+}
+
 /** @private */
 interface TileMapVisualizationDependencies {
   uiSettings: IUiSettingsClient;
@@ -79,6 +83,11 @@ export class TileMapPlugin implements Plugin<Promise<void>, void> {
     expressions.registerFunction(() => createTileMapFn(visualizationDependencies));
 
     visualizations.createBaseVisualization(createTileMapTypeDefinition(visualizationDependencies));
+
+    const config = this.initializerContext.config.get<TileMapConfigType>();
+    return {
+      config,
+    };
   }
 
   public start(core: CoreStart, { data }: TileMapPluginStartDependencies) {

src/legacy/core_plugins/tile_map/public/services.ts → src/plugins/tile_map/public/services.ts

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { createGetterSetter } from '../../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { createGetterSetter } from '../../kibana_utils/public';
+import { DataPublicPluginStart } from '../../data/public';
 
 export const [getFormatService, setFormatService] = createGetterSetter<
   DataPublicPluginStart['fieldFormats']

src/legacy/core_plugins/tile_map/public/tile_map_fn.js → src/plugins/tile_map/public/tile_map_fn.js

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { convertToGeoJson } from '../../../../plugins/maps_legacy/public';
+import { convertToGeoJson } from '../../maps_legacy/public';
 import { i18n } from '@kbn/i18n';
 
 export const createTileMapFn = () => ({

src/legacy/core_plugins/tile_map/public/tile_map_type.js → src/plugins/tile_map/public/tile_map_type.js

@@ -19,12 +19,12 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { convertToGeoJson, MapTypes } from '../../../../plugins/maps_legacy/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { convertToGeoJson, MapTypes } from '../../maps_legacy/public';
+import { Schemas } from '../../vis_default_editor/public';
 import { createTileMapVisualization } from './tile_map_visualization';
 import { TileMapOptions } from './components/tile_map_options';
 import { supportsCssFilters } from './css_filters';
-import { truncatedColorSchemas } from '../../../../plugins/charts/public';
+import { truncatedColorSchemas } from '../../charts/public';
 
 export function createTileMapTypeDefinition(dependencies) {
   const CoordinateMapsVisualization = createTileMapVisualization(dependencies);

src/legacy/core_plugins/tile_map/public/tile_map_visualization.js → src/plugins/tile_map/public/tile_map_visualization.js

@@ -20,11 +20,7 @@
 import { get } from 'lodash';
 import { GeohashLayer } from './geohash_layer';
 import { getFormatService, getQueryService } from './services';
-import {
-  scaleBounds,
-  geoContains,
-  mapTooltipProvider,
-} from '../../../../plugins/maps_legacy/public';
+import { scaleBounds, geoContains, mapTooltipProvider } from '../../maps_legacy/public';
 import { tooltipFormatter } from './tooltip_formatter';
 
 export const createTileMapVisualization = dependencies => {

src/legacy/core_plugins/tile_map/public/tilemap_fn.test.js → src/plugins/tile_map/public/tilemap_fn.test.js

@@ -18,7 +18,7 @@
  */
 
 // eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
 import { createTileMapFn } from './tile_map_fn';
 
 jest.mock('ui/new_platform');
@@ -37,7 +37,7 @@ jest.mock('../../../../plugins/maps_legacy/public', () => ({
   }),
 }));
 
-import { convertToGeoJson } from '../../../../plugins/maps_legacy/public';
+import { convertToGeoJson } from '../../maps_legacy/public';
 
 describe('interpreter/functions#tilemap', () => {
   const fn = functionWrapper(createTileMapFn());