nreese · Jun 29, 2023 · Jun 7, 2023 · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023
diff --git a/src/plugins/data_views/common/types.ts b/src/plugins/data_views/common/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObject } from '@kbn/core/server';
 import type { ErrorToastOptions, ToastInputFields } from '@kbn/core-notifications-browser';
@@ -437,7 +438,7 @@ export type FieldSpec = DataViewFieldBase & {
   /**
    * set if field is a TSDB metric field
    */
-  timeSeriesMetric?: 'histogram' | 'summary' | 'gauge' | 'counter';
+  timeSeriesMetric?: estypes.MappingTimeSeriesMetricType;
 
   // not persisted
 

diff --git a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ElasticsearchClient } from '@kbn/core/server';
 import { keyBy } from 'lodash';
 import type { QueryDslQueryContainer } from '../../common/types';
@@ -27,7 +28,7 @@ export interface FieldDescriptor {
   metadata_field?: boolean;
   fixedInterval?: string[];
   timeZone?: string[];
-  timeSeriesMetric?: 'histogram' | 'summary' | 'counter' | 'gauge';
+  timeSeriesMetric?: estypes.MappingTimeSeriesMetricType;
   timeSeriesDimension?: boolean;
 }
 

diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -122,13 +122,17 @@ export function readFieldCapsResponse(
         return agg;
       }
 
-      let timeSeriesMetricType: 'gauge' | 'counter' | undefined;
+      let timeSeriesMetricType: 'gauge' | 'counter' | 'position' | undefined;
       if (timeSeriesMetricProp.length === 1 && timeSeriesMetricProp[0] === 'gauge') {
         timeSeriesMetricType = 'gauge';
       }
       if (timeSeriesMetricProp.length === 1 && timeSeriesMetricProp[0] === 'counter') {
         timeSeriesMetricType = 'counter';
       }
+      // @ts-expect-error MappingTimeSeriesMetricType does not contain 'position'
+      if (timeSeriesMetricProp.length === 1 && timeSeriesMetricProp[0] === 'position') {
+        timeSeriesMetricType = 'position';
+      }
       const esType = types[0];
       const field = {
         name: fieldName,
@@ -144,7 +148,9 @@ export function readFieldCapsResponse(
         timeSeriesDimension: capsByType[types[0]].time_series_dimension,
       };
       // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
+      // @ts-expect-error MappingTimeSeriesMetricType does not contain 'position'
       agg.array.push(field);
+      // @ts-expect-error MappingTimeSeriesMetricType does not contain 'position'
       agg.hash[fieldName] = field;
       return agg;
     },

diff --git a/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
@@ -91,8 +91,10 @@ export type ESGeoGridSourceDescriptor = AbstractESAggSourceDescriptor & {
 
 export type ESGeoLineSourceDescriptor = AbstractESAggSourceDescriptor & {
   geoField: string;
-  splitField: string;
-  sortField: string;
+  groupByTimeseries: boolean;
+  lineSimplificationSize: number;
+  splitField?: string;
+  sortField?: string;
 };
 
 export type ESSearchSourceDescriptor = AbstractESSourceDescriptor & {

diff --git a/...plugins/maps/public/classes/sources/es_geo_grid_source/render_as_select/show_as_label.tsx b/...plugins/maps/public/classes/sources/es_geo_grid_source/render_as_select/show_as_label.tsx
@@ -19,7 +19,7 @@ export function ShowAsLabel(props: Props) {
   return (
     <EuiToolTip
       content={
-        <EuiText>
+        <EuiText size="s">
           <dl>
             <dt>{CLUSTER_LABEL}</dt>
             <dd>

diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/constants.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/constants.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// geo_line aggregation without time series buckets uses lots of resources
+// limit resource consumption by limiting number of tracks to smaller amount
+export const MAX_TERMS_TRACKS = 250;
+
+// Constant is used to identify time series id field in UIs, tooltips, and styling.
+// Constant is not passed to Elasticsearch APIs and is not related to '_tsid' document metadata field.
+// Constant value of '_tsid' is arbitrary.
+export const TIME_SERIES_ID_FIELD_NAME = '_tsid';
+
+export const DEFAULT_LINE_SIMPLIFICATION_SIZE = 500;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/convert_to_geojson.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/convert_to_geojson.ts
@@ -20,7 +20,9 @@ export function convertToGeoJson(esResponse: any, entitySplitFieldName: string)
   for (let i = 0; i < entityKeys.length; i++) {
     const entityKey = entityKeys[i];
     const bucket = buckets[entityKey];
-    const feature = bucket.path as Feature;
+    const feature = {
+      ...(bucket.path as Feature),
+    };
     if (!feature.properties!.complete) {
       numTrimmedTracks++;
     }

diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
@@ -7,46 +7,47 @@
 
 import React, { Component } from 'react';
 
-import { DataView } from '@kbn/data-plugin/common';
-import { i18n } from '@kbn/i18n';
-import { EuiFormRow, EuiPanel } from '@elastic/eui';
-import { SingleFieldSelect } from '../../../components/single_field_select';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
+import { EuiPanel } from '@elastic/eui';
 import { GeoIndexPatternSelect } from '../../../components/geo_index_pattern_select';
-
-import { getGeoPointFields } from '../../../index_pattern_util';
+import { GeoFieldSelect } from '../../../components/geo_field_select';
+import { ESGeoLineSourceDescriptor } from '../../../../common/descriptor_types';
+import { getGeoPointFields, getIsTimeseries } from '../../../index_pattern_util';
 import { GeoLineForm } from './geo_line_form';
+import { DEFAULT_LINE_SIMPLIFICATION_SIZE } from './constants';
 
 interface Props {
-  onSourceConfigChange: (
-    sourceConfig: {
-      indexPatternId: string;
-      geoField: string;
-      splitField: string;
-      sortField: string;
-    } | null
-  ) => void;
+  onSourceConfigChange: (sourceConfig: Partial<ESGeoLineSourceDescriptor> | null) => void;
 }
 
 interface State {
   indexPattern: DataView | null;
+  pointFields: DataViewField[];
   geoField: string;
+  groupByTimeseries: boolean;
   splitField: string;
   sortField: string;
+  lineSimplificationSize: number;
 }
 
 export class CreateSourceEditor extends Component<Props, State> {
   state: State = {
     indexPattern: null,
+    pointFields: [],
     geoField: '',
+    groupByTimeseries: false,
     splitField: '',
     sortField: '',
+    lineSimplificationSize: DEFAULT_LINE_SIMPLIFICATION_SIZE,
   };
 
   _onIndexPatternSelect = (indexPattern: DataView) => {
     const pointFields = getGeoPointFields(indexPattern.fields);
     this.setState(
       {
         indexPattern,
+        pointFields,
+        groupByTimeseries: getIsTimeseries(indexPattern),
         geoField: pointFields.length ? pointFields[0].name : '',
         sortField: indexPattern.timeFieldName ? indexPattern.timeFieldName : '',
       },
@@ -67,6 +68,24 @@ export class CreateSourceEditor extends Component<Props, State> {
     );
   };
 
+  _onGroupByTimeseriesChange = (groupByTimeseries: boolean) => {
+    this.setState(
+      {
+        groupByTimeseries,
+      },
+      this.previewLayer
+    );
+  };
+
+  _onLineSimplificationSizeChange = (lineSimplificationSize: number) => {
+    this.setState(
+      {
+        lineSimplificationSize,
+      },
+      this.previewLayer
+    );
+  };
+
   _onSplitFieldSelect = (newValue: string) => {
     this.setState(
       {
@@ -86,11 +105,28 @@ export class CreateSourceEditor extends Component<Props, State> {
   };
 
   previewLayer = () => {
-    const { indexPattern, geoField, splitField, sortField } = this.state;
+    const {
+      indexPattern,
+      geoField,
+      groupByTimeseries,
+      splitField,
+      sortField,
+      lineSimplificationSize,
+    } = this.state;
 
     const sourceConfig =
-      indexPattern && indexPattern.id && geoField && splitField && sortField
-        ? { indexPatternId: indexPattern.id, geoField, splitField, sortField }
+      indexPattern &&
+      indexPattern.id &&
+      geoField &&
+      (groupByTimeseries || (splitField && sortField))
+        ? {
+            indexPatternId: indexPattern.id,
+            geoField,
+            groupByTimeseries,
+            lineSimplificationSize,
+            splitField,
+            sortField,
+          }
         : null;
     this.props.onSourceConfigChange(sourceConfig);
   };
@@ -101,20 +137,12 @@ export class CreateSourceEditor extends Component<Props, State> {
     }
 
     return (
-      <EuiFormRow
-        label={i18n.translate('xpack.maps.source.esGeoLine.geofieldLabel', {
-          defaultMessage: 'Geospatial field',
-        })}
-      >
-        <SingleFieldSelect
-          placeholder={i18n.translate('xpack.maps.source.esGeoLine.geofieldPlaceholder', {
-            defaultMessage: 'Select geo field',
-          })}
-          value={this.state.geoField}
-          onChange={this._onGeoFieldSelect}
-          fields={getGeoPointFields(this.state.indexPattern.fields)}
-        />
-      </EuiFormRow>
+      <GeoFieldSelect
+        value={this.state.geoField}
+        onChange={this._onGeoFieldSelect}
+        geoFields={this.state.pointFields}
+        isClearable={false}
+      />
     );
   }
 
@@ -125,9 +153,14 @@ export class CreateSourceEditor extends Component<Props, State> {
 
     return (
       <GeoLineForm
+        isColumnCompressed={false}
         indexPattern={this.state.indexPattern}
+        onGroupByTimeseriesChange={this._onGroupByTimeseriesChange}
+        onLineSimplificationSizeChange={this._onLineSimplificationSizeChange}
         onSortFieldChange={this._onSortFieldSelect}
         onSplitFieldChange={this._onSplitFieldSelect}
+        groupByTimeseries={this.state.groupByTimeseries}
+        lineSimplificationSize={this.state.lineSimplificationSize}
         sortField={this.state.sortField}
         splitField={this.state.splitField}
       />