Migrate Coordinate Maps to NP

.i18nrc.json

@@ -42,7 +42,7 @@
       "src/plugins/telemetry",
       "src/plugins/telemetry_management_section"
     ],
-    "tileMap": "src/legacy/core_plugins/tile_map",
+    "tileMap": "src/plugins/tile_map",
     "timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",

src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js

@@ -100,6 +100,39 @@ describe('VegaVisualizations', () => {
   setSavedObjects(npStart.core.savedObjects);
   setNotifications(npStart.core.notifications);
 
+  const mockMapConfig = {
+    includeElasticMapsService: true,
+    proxyElasticMapsServiceInMaps: false,
+    tilemap: {
+      deprecated: {
+        config: {
+          options: {
+            attribution: '',
+          },
+        },
+      },
+      options: {
+        attribution: '',
+        minZoom: 0,
+        maxZoom: 10,
+      },
+    },
+    regionmap: {
+      includeElasticMapsService: true,
+      layers: [],
+    },
+    manifestServiceUrl: '',
+    emsFileApiUrl: 'https://vector.maps.elastic.co',
+    emsTileApiUrl: 'https://tiles.maps.elastic.co',
+    emsLandingPageUrl: 'https://maps.elastic.co/v7.7',
+    emsFontLibraryUrl: 'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf',
+    emsTileLayerId: {
+      bright: 'road_map',
+      desaturated: 'road_map_desaturated',
+      dark: 'dark_map',
+    },
+  };
+
   beforeEach(ngMock.module('kibana'));
   beforeEach(
     ngMock.inject(() => {
@@ -127,7 +160,7 @@ describe('VegaVisualizations', () => {
             return 'not found';
         }
       });
-      const serviceSettings = new ServiceSettings();
+      const serviceSettings = new ServiceSettings(mockMapConfig, mockMapConfig.tilemap);
       vegaVisualizationDependencies = {
         serviceSettings,
         core: {

src/plugins/maps_legacy/config.ts

@@ -0,0 +1,67 @@
+/*
+ * 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 { schema, TypeOf } from '@kbn/config-schema';
+import { configSchema as tilemapSchema } from '../tile_map/config';
+
+// TODO: Pull this portion from region_map
+export const regionmapSchema = schema.object({
+  includeElasticMapsService: schema.boolean({ defaultValue: true }),
+  layers: schema.arrayOf(
+    schema.object({
+      url: schema.string(),
+      format: schema.object({
+        type: schema.string({ defaultValue: 'geojson' }),
+      }),
+      meta: schema.object({
+        feature_collection_path: schema.string({ defaultValue: 'data' }),
+      }),
+      attribution: schema.string(),
+      name: schema.string(),
+      fields: schema.arrayOf(
+        schema.object({
+          name: schema.string(),
+          description: schema.string(),
+        })
+      ),
+    }),
+    { defaultValue: [] }
+  ),
+});
+
+export const configSchema = schema.object({
+  includeElasticMapsService: schema.boolean({ defaultValue: true }),
+  proxyElasticMapsServiceInMaps: schema.boolean({ defaultValue: false }),
+  tilemap: tilemapSchema,
+  regionmap: regionmapSchema,
+  manifestServiceUrl: schema.string({ defaultValue: '' }),
+  emsFileApiUrl: schema.string({ defaultValue: 'https://vector.maps.elastic.co' }),
+  emsTileApiUrl: schema.string({ defaultValue: 'https://tiles.maps.elastic.co' }),
+  emsLandingPageUrl: schema.string({ defaultValue: 'https://maps.elastic.co/v7.7' }),
+  emsFontLibraryUrl: schema.string({
+    defaultValue: 'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf',
+  }),
+  emsTileLayerId: schema.object({
+    bright: schema.string({ defaultValue: 'road_map' }),
+    desaturated: schema.string({ defaultValue: 'road_map_desaturated' }),
+    dark: schema.string({ defaultValue: 'dark_map' }),
+  }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;

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/kibana_map.js

@@ -20,6 +20,7 @@
 import { EventEmitter } from 'events';
 import { createZoomWarningMsg } from './map_messages';
 import L from 'leaflet';
+import 'leaflet-draw';
 import $ from 'jquery';
 import _ from 'lodash';
 import { zoomToPrecision } from './zoom_to_precision';

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,15 @@
  */
 
 // @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';
+import { ConfigSchema } from '../config';
 
 /**
  * These are the interfaces with your public contracts. You should export these
@@ -45,13 +46,22 @@ export interface MapsLegacySetupDependencies {}
 export interface MapsLegacyStartDependencies {}
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegacyPluginStart> {
+  initializerContext: PluginInitializerContext<ConfigSchema>;
+
+  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+    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/plugins/maps_legacy/server/index.ts

@@ -0,0 +1,49 @@
+/*
+ * 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 { PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext } from 'kibana/public';
+import { configSchema, ConfigSchema } from '../config';
+
+export const config: PluginConfigDescriptor<ConfigSchema> = {
+  exposeToBrowser: {
+    includeElasticMapsService: true,
+    proxyElasticMapsServiceInMaps: true,
+    tilemap: true,
+    regionmap: true,
+    manifestServiceUrl: true,
+    emsFileApiUrl: true,
+    emsTileApiUrl: true,
+    emsLandingPageUrl: true,
+    emsFontLibraryUrl: true,
+    emsTileLayerId: true,
+  },
+  schema: configSchema,
+};
+
+export const plugin = (initializerContext: PluginInitializerContext) => ({
+  setup() {
+    // @ts-ignore
+    const config$ = initializerContext.config.create();
+    return {
+      config: config$,
+    };
+  },
+  start() {},
+});

src/plugins/tile_map/config.ts

@@ -0,0 +1,47 @@
+/*
+ * 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 { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  url: schema.maybe(schema.string()),
+  deprecated: schema.any({
+    defaultValue: {
+      config: {
+        options: {
+          attribution: '',
+        },
+      },
+    },
+  }),
+  options: schema.object({
+    attribution: schema.string({ defaultValue: '' }),
+    minZoom: schema.number({ defaultValue: 0, min: 0 }),
+    maxZoom: schema.number({ defaultValue: 10 }),
+    tileSize: schema.maybe(schema.number()),
+    subdomains: schema.maybe(schema.arrayOf(schema.string())),
+    errorTileUrl: schema.maybe(schema.string()),
+    tms: schema.maybe(schema.boolean()),
+    reuseTiles: schema.maybe(schema.boolean()),
+    bounds: schema.maybe(schema.arrayOf(schema.number({ min: 2 }))),
+    default: schema.maybe(schema.boolean()),
+  }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;

src/plugins/tile_map/kibana.json

@@ -0,0 +1,14 @@
+{
+  "id": "tileMap",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["map", "tilemap"],
+  "ui": true,
+  "server": true,
+  "requiredPlugins": [
+    "visualizations",
+    "expressions",
+    "mapsLegacy",
+    "data"
+  ]
+}