down select mapModules for getLayerDescriptors callback

elastic · Aug 13, 2021 · 568f1ee · 568f1ee
1 parent 09d7ee2
commit 568f1ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/x-pack/plugins/maps/public/embeddable/map_component.tsx b/x-pack/plugins/maps/public/embeddable/map_component.tsx
@@ -18,7 +18,12 @@ interface Props {
   filters?: Filter[];
   query?: Query;
   timeRange?: TimeRange;
-  getLayerDescriptors: (mapModules: LazyLoadedMapModules) => LayerDescriptor[];
+  getLayerDescriptors: (
+    mapModules: Pick<
+      LazyLoadedMapModules,
+      'createTileMapLayerDescriptor' | 'createRegionMapLayerDescriptor'
+    >
+  ) => LayerDescriptor[];
   mapCenter?: MapCenterAndZoom;
   onInitialRenderComplete?: () => void;
   /*
@@ -78,7 +83,10 @@ export class MapComponent extends Component<Props, State> {
           title: '',
           layerListJSON: JSON.stringify([
             mapModules.createBasemapLayerDescriptor(),
-            ...this.props.getLayerDescriptors(mapModules),
+            ...this.props.getLayerDescriptors({
+              createRegionMapLayerDescriptor: mapModules.createRegionMapLayerDescriptor,
+              createTileMapLayerDescriptor: mapModules.createTileMapLayerDescriptor,
+            }),
           ]),
         },
         mapCenter: this.props.mapCenter,

diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
@@ -25,10 +25,12 @@ export function RegionMapVisualization(props: Props) {
     lon: props.visConfig.mapCenter[1],
     zoom: props.visConfig.mapZoom,
   };
-  function getLayerDescriptors(mapModules: LazyLoadedMapModules) {
-    const layerDescriptor = mapModules.createRegionMapLayerDescriptor(
-      props.visConfig.layerDescriptorParams
-    );
+  function getLayerDescriptors({
+    createRegionMapLayerDescriptor,
+  }: {
+    createRegionMapLayerDescriptor: LazyLoadedMapModules['createRegionMapLayerDescriptor'];
+  }) {
+    const layerDescriptor = createRegionMapLayerDescriptor(props.visConfig.layerDescriptorParams);
     return layerDescriptor ? [layerDescriptor] : [];
   }
   return (

diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
@@ -25,10 +25,12 @@ export function TileMapVisualization(props: Props) {
     lon: props.visConfig.mapCenter[1],
     zoom: props.visConfig.mapZoom,
   };
-  function getLayerDescriptors(mapModules: LazyLoadedMapModules) {
-    const layerDescriptor = mapModules.createTileMapLayerDescriptor(
-      props.visConfig.layerDescriptorParams
-    );
+  function getLayerDescriptors({
+    createTileMapLayerDescriptor,
+  }: {
+    createTileMapLayerDescriptor: LazyLoadedMapModules['createTileMapLayerDescriptor'];
+  }) {
+    const layerDescriptor = createTileMapLayerDescriptor(props.visConfig.layerDescriptorParams);
     return layerDescriptor ? [layerDescriptor] : [];
   }
   return (