Add geometry check to filter out invalid geometries

x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx

@@ -39,7 +39,7 @@ mbDrawModes[DRAW_CIRCLE] = DrawCircle;
 
 export interface Props {
   drawType?: DRAW_TYPE;
-  onDraw: (event: { features: Feature[] }) => void;
+  onDraw: (drawControl: MapboxDraw) => (event: { features: Feature[] }) => void;
   onFeaturesSelected?: (drawControl: MapboxDraw) => (event: { features: Feature[] }) => void;
   mbMap: MbMap;
   drawActive: boolean;
@@ -112,7 +112,7 @@ export class DrawControl extends Component<Props> {
       this._mbDrawControlAdded = true;
       this.props.mbMap.getCanvas().style.cursor = 'crosshair';
       this.props.mbMap.on('draw.modechange', this._onModeChange);
-      this.props.mbMap.on('draw.create', this.props.onDraw);
+      this.props.mbMap.on('draw.create', this.props.onDraw(this._mbDrawControl));
       if (this.props.onFeaturesSelected) {
         this.props.mbMap.on(
           'draw.selectionchange',

x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx

@@ -11,10 +11,14 @@ import { Map as MbMap } from 'mapbox-gl';
 import MapboxDraw from '@mapbox/mapbox-gl-draw';
 import { Feature } from 'geojson';
 import { i18n } from '@kbn/i18n';
+// @ts-expect-error
+import * as jsts from 'jsts';
 import { getToasts } from '../../../../kibana_services';
 import { DrawControl } from '../';
 import { DRAW_TYPE } from '../../../../../common';
 
+const geoJSONReader = new jsts.io.GeoJSONReader();
+
 export interface Props {
   disableDrawState: () => void;
   addFeaturesToIndexQueue: (features: Feature[]) => void;
@@ -31,9 +35,15 @@ export class DrawFeatureControl extends Component<Props, {}> {
     }
   };
 
-  _onDraw = async (e: { features: Feature[] }) => {
+  _onDraw = (mbDrawControl: MapboxDraw) => async (e: { features: Feature[] }) => {
     try {
-      console.log(e);
+      e.features.forEach((feature: Feature) => {
+        const { geometry } = geoJSONReader.read(feature);
+        if (!geometry.isSimple() || !geometry.isValid()) {
+          mbDrawControl.delete(feature.id);
+          throw new Error('Invalid geometry detected');
+        }
+      });
       this.props.addFeaturesToIndexQueue(e.features);
     } catch (error) {
       getToasts().addWarning(

x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx

@@ -36,7 +36,7 @@ export interface Props {
 }
 
 export class DrawFilterControl extends Component<Props, {}> {
-  _onDraw = async (e: { features: Feature[] }) => {
+  _onDraw = () => async (e: { features: Feature[] }) => {
     if (
       !e.features.length ||
       !this.props.drawState ||