rebase datashader

x-pack/plugins/maps/config.ts

@@ -7,11 +7,20 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
+export interface DatashaderConfigType {
+  url: string;
+  defaultGeospatialField: string;
+  defaultEllipseMajor: string;
+  defaultEllipseMinor: string;
+  defaultEllipseTilt: string;
+}
+
 export interface MapsConfigType {
   enabled: boolean;
   showMapVisualizationTypes: boolean;
   showMapsInspectorAdapter: boolean;
   preserveDrawingBuffer: boolean;
+  datashader: DatashaderConfigType;
 }
 
 export const configSchema = schema.object({
@@ -21,6 +30,13 @@ export const configSchema = schema.object({
   showMapsInspectorAdapter: schema.boolean({ defaultValue: false }),
   // flag used in functional testing
   preserveDrawingBuffer: schema.boolean({ defaultValue: false }),
+  datashader: schema.object({
+    url: schema.string(),
+    defaultGeospatialField: schema.string({ defaultValue: null }),
+    defaultEllipseMajor: schema.string({ defaultValue: null }),
+    defaultEllipseMinor: schema.string({ defaultValue: null }),
+    defaultEllipseTilt: schema.string({ defaultValue: null })
+  }),
 });
 
 export type MapsXPackConfig = TypeOf<typeof configSchema>;

x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts

@@ -37,6 +37,8 @@ export function registerLayerWizards() {
     return;
   }
 
+  registerLayerWizard(datashaderWizardConfig);
+
   // Registration order determines display order
   registerLayerWizard(uploadLayerWizardConfig);
   registerLayerWizard(ObservabilityLayerWizardConfig);

x-pack/plugins/maps/public/datashader/datashader_layer.js

@@ -18,9 +18,9 @@ export class DatashaderLayer extends AbstractLayer {
     super({ layerDescriptor, source, style });
     if (!layerDescriptor.style) {
       const defaultStyle = DatashaderStyle.createDescriptor();
-      this._style = new DatashaderStyle(defaultStyle);
+      this._style = new DatashaderStyle(defaultStyle, source, this);
     } else {
-      this._style = new DatashaderStyle(layerDescriptor.style);
+      this._style = new DatashaderStyle(layerDescriptor.style, source, this);
     }
     this._mbMap = null;
   }
@@ -70,6 +70,7 @@ export class DatashaderLayer extends AbstractLayer {
       const timeFieldName = await this._source.getTimeFieldName();
       const geoField = await this._source.getGeoField();
       const applyGlobalQuery = this._source.getApplyGlobalQuery();
+      const applyGlobalTime = this._source.getApplyGlobalTime();
 
       const categoryField = this._style._descriptor.properties.categoryField;
       let categoryFormatter = null;
@@ -91,6 +92,7 @@ export class DatashaderLayer extends AbstractLayer {
         timeFieldName: timeFieldName,
         geoField: geoField,
         applyGlobalQuery: applyGlobalQuery,
+        applyGlobalTime: applyGlobalTime,
         categoryFieldMeta: categoryFieldMeta,
         categoryFieldFormatter: categoryFormatter
       }
@@ -158,7 +160,9 @@ export class DatashaderLayer extends AbstractLayer {
     let dataMeta = sourceDataRequest.getMeta();
     if (dataMeta) {
       const currentParamsObj = {};
-      currentParamsObj.timeFilters = dataMeta.timeFilters;
+      if (data.applyGlobalTime) {
+          currentParamsObj.timeFilters = dataMeta.timeFilters;
+      }
       currentParamsObj.filters = []
       if (data.applyGlobalQuery) {
         currentParamsObj.filters = [...dataMeta.filters];

x-pack/plugins/maps/public/datashader/sources/datashader_source.js

@@ -58,10 +58,11 @@ export class DatashaderSource extends AbstractTMSSource {
   });
   static icon = 'grid';
 
-  static createDescriptor({ urlTemplate, indexTitle, indexPatternId, timeFieldName, geoField, applyGlobalQuery }) {
+  static createDescriptor({ urlTemplate, indexTitle, indexPatternId, timeFieldName, geoField, applyGlobalQuery, applyGlobalTime }) {
     return {
       type: DatashaderSource.type,
       applyGlobalQuery: applyGlobalQuery,
+      applyGlobalTime: applyGlobalTime,
       urlTemplate,
       indexTitle,
       indexPatternId,
@@ -87,6 +88,7 @@ export class DatashaderSource extends AbstractTMSSource {
       {
         ...descriptor,
         applyGlobalQuery: _.get(descriptor, 'applyGlobalQuery', true),
+        applyGlobalTime: _.get(descriptor, 'applyGlobalTime', true),
       },
       inspectorAdapters
     );
@@ -216,6 +218,14 @@ export class DatashaderSource extends AbstractTMSSource {
     return [];
   }
 
+  getApplyGlobalQuery() {
+    return this._descriptor.applyGlobalQuery;
+  }
+
+  getApplyGlobalTime() {
+    return this._descriptor.applyGlobalTime;
+  }
+
   async getIndexPattern() {
     if (this.indexPattern) {
       return this.indexPattern;

x-pack/plugins/maps/public/datashader/styles/datashader/components/legend/datashader_legend.js

@@ -83,7 +83,9 @@ export class DatashaderLegend extends React.Component {
     }
 
     const currentParamsObj = {};
-    currentParamsObj.timeFilters = dataMeta.timeFilters;
+    if (data.applyGlobalTime) {
+      currentParamsObj.timeFilters = dataMeta.timeFilters;
+    }
     currentParamsObj.filters = []
     if (data.applyGlobalQuery) {
       currentParamsObj.filters = [...dataMeta.filters];

x-pack/plugins/maps/public/datashader/styles/datashader/datashader_style.js

@@ -22,8 +22,10 @@ import { getDatashader } from '../../../kibana_services';
 export class DatashaderStyle {
   static type = LAYER_STYLE_TYPE.DATASHADER;
 
-  constructor(descriptor = {}) {
+  constructor(descriptor = {}, source, layer) {
     this._descriptor = DatashaderStyle.createDescriptor(descriptor.properties);
+    this._layer = layer;
+    this._source = source;
   }
 
   static createDescriptor(properties = {}, isTimeAware = true) {
@@ -51,7 +53,7 @@ export class DatashaderStyle {
     return LAYER_STYLE_TYPE.DATASHADER;
   }
 
-  renderEditor({ layer, onStyleDescriptorChange }) {
+  renderEditor(onStyleDescriptorChange) {
     const rawProperties = this.getRawProperties();
     const handlePropertyChange = (propertyName, settings) => {
       rawProperties[propertyName] = settings; //override single property, but preserve the rest
@@ -76,7 +78,7 @@ export class DatashaderStyle {
         settings={config}
         properties={this._descriptor.properties}
         handlePropertyChange={handlePropertyChange}
-        layer={layer}
+        layer={this._layer}
       />
     );
   }

x-pack/plugins/maps/public/kibana_services.ts

@@ -59,6 +59,7 @@ export const getMapAppConfig = () => mapAppConfig;
 export const getEnabled = () => getMapAppConfig().enabled;
 export const getShowMapsInspectorAdapter = () => getMapAppConfig().showMapsInspectorAdapter;
 export const getPreserveDrawingBuffer = () => getMapAppConfig().preserveDrawingBuffer;
+export const getDatashader = () => _.get(getMapAppConfig(), 'datashader', {});
 
 // map.* kibana.yml settings from maps_legacy plugin that are shared between OSS map visualizations and maps app
 let kibanaCommonConfig: MapsLegacyConfig;

x-pack/plugins/maps/public/selectors/map_selectors.ts

@@ -91,6 +91,8 @@ export function createLayerInstance(
         layerDescriptor: layerDescriptor as VectorLayerDescriptor,
         source: source as IVectorSource,
       });
+    case DatashaderLayer.type:
+      return new DatashaderLayer({ layerDescriptor, source });
     default:
       throw new Error(`Unrecognized layerType ${layerDescriptor.type}`);
   }