Move common types and constants to maps_legacy

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,

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;

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,

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>;
 

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) {

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';
 

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;

src/legacy/core_plugins/tile_map/public/types.ts → 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 {

src/legacy/core_plugins/tile_map/common/origin.ts → src/plugins/maps_legacy/public/common/types/index.ts

@@ -17,7 +17,10 @@
  * under the License.
  */
 
-export enum ORIGIN {
-  EMS = 'elastic_maps_service',
-  KIBANA_YML = 'self_hosted',
-}
+/**
+ * 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';

src/legacy/core_plugins/region_map/public/types.ts → 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;

src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx → 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;

src/legacy/core_plugins/tile_map/public/components/wms_options.tsx → 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;

src/plugins/maps_legacy/public/index.ts

@@ -75,5 +75,10 @@ export function getBaseMapsVis(core: CoreSetup) {
   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']>;

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

@@ -24,7 +24,7 @@ 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) {

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';