Fix TypeScript errors in ol/interaction/Draw

src/ol/interaction/Draw.js

@@ -81,12 +81,36 @@ import {createEditingStyle} from '../style/Style.js';
  */
 
 
+/**
+ * Coordinate type when drawing points.
+ * @typedef {import("../coordinate.js").Coordinate} PointCoordType
+ */
+
+
+/**
+ * Coordinate type when drawing lines.
+ * @typedef {Array<import("../coordinate.js").Coordinate>} LineCoordType
+ */
+
+
+/**
+ * Coordinate type when drawing polygons.
+ * @typedef {Array<Array<import("../coordinate.js").Coordinate>>} PolyCoordType
+ */
+
+
+/**
+ * Types used for drawing coordinates.
+ * @typedef {PointCoordType|LineCoordType|PolyCoordType} SketchCoordType
+ */
+
+
 /**
  * Function that takes an array of coordinates and an optional existing geometry as
  * arguments, and returns a geometry. The optional existing geometry is the
  * geometry that is returned when the function is called without a second
  * argument.
- * @typedef {function(!Array<import("../coordinate.js").Coordinate>, import("../geom/SimpleGeometry.js").default=):
+ * @typedef {function(!SketchCoordType, import("../geom/SimpleGeometry.js").default=):
  *     import("../geom/SimpleGeometry.js").default} GeometryFunction
  */
 
@@ -272,8 +296,7 @@ class Draw extends PointerInteraction {
     if (!geometryFunction) {
       if (this.type_ === GeometryType.CIRCLE) {
         /**
-         * @param {!Array<import("../coordinate.js").Coordinate>} coordinates
+         * @param {!LineCoordType} coordinates The coordinates.
-         *     The coordinates.
          * @param {import("../geom/SimpleGeometry.js").default=} opt_geometry Optional geometry.
          * @return {import("../geom/SimpleGeometry.js").default} A geometry.
          */
@@ -296,8 +319,7 @@ class Draw extends PointerInteraction {
           Constructor = Polygon;
         }
         /**
-         * @param {!Array<import("../coordinate.js").Coordinate>} coordinates
+         * @param {!LineCoordType} coordinates The coordinates.
-         *     The coordinates.
          * @param {import("../geom/SimpleGeometry.js").default=} opt_geometry Optional geometry.
          * @return {import("../geom/SimpleGeometry.js").default} A geometry.
          */
@@ -358,7 +380,7 @@ class Draw extends PointerInteraction {
 
     /**
      * Sketch coordinates. Used when drawing a line or polygon.
-     * @type {import("../coordinate.js").Coordinate|Array<import("../coordinate.js").Coordinate>|Array<Array<import("../coordinate.js").Coordinate>>}
+     * @type {SketchCoordType}
      * @private
      */
     this.sketchCoords_ = null;
@@ -372,7 +394,7 @@ class Draw extends PointerInteraction {
 
     /**
      * Sketch line coordinates. Used when drawing a polygon or circle.
-     * @type {Array<import("../coordinate.js").Coordinate>}
+     * @type {LineCoordType}
      * @private
      */
     this.sketchLineCoords_ = null;
@@ -495,10 +517,9 @@ class Draw extends PointerInteraction {
       if (this.mode_ === Mode.LINE_STRING) {
         potentiallyDone = this.sketchCoords_.length > this.minPoints_;
       } else if (this.mode_ === Mode.POLYGON) {
-        potentiallyDone = this.sketchCoords_[0].length >
+        const sketchCoords = /** @type {PolyCoordType} */ (this.sketchCoords_);
-            this.minPoints_;
+        potentiallyDone = sketchCoords[0].length > this.minPoints_;
-        potentiallyFinishCoordinates = [this.sketchCoords_[0][0],
+        potentiallyFinishCoordinates = [sketchCoords[0][0], sketchCoords[0][sketchCoords[0].length - 2]];
-          this.sketchCoords_[0][this.sketchCoords_[0].length - 2]];
       }
       if (potentiallyDone) {
         const map = event.map;
@@ -577,7 +598,7 @@ class Draw extends PointerInteraction {
     if (this.mode_ === Mode.POINT) {
       last = this.sketchCoords_;
     } else if (this.mode_ === Mode.POLYGON) {
-      coordinates = this.sketchCoords_[0];
+      coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       last = coordinates[coordinates.length - 1];
       if (this.atFinish_(event)) {
         // snap to finish
@@ -589,11 +610,12 @@ class Draw extends PointerInteraction {
     }
     last[0] = coordinate[0];
     last[1] = coordinate[1];
-    this.geometryFunction_(/** @type {!Array<import("../coordinate.js").Coordinate>} */ (this.sketchCoords_), geometry);
+    this.geometryFunction_(/** @type {!LineCoordType} */ (this.sketchCoords_), geometry);
     if (this.sketchPoint_) {
       const sketchPointGeom = /** @type {Point} */ (this.sketchPoint_.getGeometry());
       sketchPointGeom.setCoordinates(coordinate);
     }
+    /** @type {LineString} */
     let sketchLineGeom;
     if (geometry instanceof Polygon &&
         this.mode_ !== Mode.POLYGON) {
@@ -629,7 +651,7 @@ class Draw extends PointerInteraction {
     let coordinates;
     if (this.mode_ === Mode.LINE_STRING) {
       this.finishCoordinate_ = coordinate.slice();
-      coordinates = this.sketchCoords_;
+      coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
       if (coordinates.length >= this.maxPoints_) {
         if (this.freehand_) {
           coordinates.pop();
@@ -640,7 +662,7 @@ class Draw extends PointerInteraction {
       coordinates.push(coordinate.slice());
       this.geometryFunction_(coordinates, geometry);
     } else if (this.mode_ === Mode.POLYGON) {
-      coordinates = this.sketchCoords_[0];
+      coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       if (coordinates.length >= this.maxPoints_) {
         if (this.freehand_) {
           coordinates.pop();
@@ -669,16 +691,18 @@ class Draw extends PointerInteraction {
       return;
     }
     const geometry = /** @type {import("../geom/SimpleGeometry.js").default} */ (this.sketchFeature_.getGeometry());
-    let coordinates, sketchLineGeom;
+    let coordinates;
+    /** @type {LineString} */
+    let sketchLineGeom;
     if (this.mode_ === Mode.LINE_STRING) {
-      coordinates = this.sketchCoords_;
+      coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
       coordinates.splice(-2, 1);
       this.geometryFunction_(coordinates, geometry);
       if (coordinates.length >= 2) {
         this.finishCoordinate_ = coordinates[coordinates.length - 2].slice();
       }
     } else if (this.mode_ === Mode.POLYGON) {
-      coordinates = this.sketchCoords_[0];
+      coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       coordinates.splice(-2, 1);
       sketchLineGeom = /** @type {LineString} */ (this.sketchLine_.getGeometry());
       sketchLineGeom.setCoordinates(coordinates);
@@ -711,18 +735,18 @@ class Draw extends PointerInteraction {
       this.geometryFunction_(coordinates, geometry);
     } else if (this.mode_ === Mode.POLYGON) {
       // remove the redundant last point in ring
-      coordinates[0].pop();
+      /** @type {PolyCoordType} */ (coordinates)[0].pop();
       this.geometryFunction_(coordinates, geometry);
       coordinates = geometry.getCoordinates();
     }
 
     // cast multi-part geometries
     if (this.type_ === GeometryType.MULTI_POINT) {
-      sketchFeature.setGeometry(new MultiPoint([coordinates]));
+      sketchFeature.setGeometry(new MultiPoint([/** @type {PointCoordType} */(coordinates)]));
     } else if (this.type_ === GeometryType.MULTI_LINE_STRING) {
-      sketchFeature.setGeometry(new MultiLineString([coordinates]));
+      sketchFeature.setGeometry(new MultiLineString([/** @type {LineCoordType} */(coordinates)]));
     } else if (this.type_ === GeometryType.MULTI_POLYGON) {
-      sketchFeature.setGeometry(new MultiPolygon([coordinates]));
+      sketchFeature.setGeometry(new MultiPolygon([/** @type {PolyCoordType} */(coordinates)]));
     }
 
     // First dispatch event to allow full set up of feature
@@ -749,7 +773,7 @@ class Draw extends PointerInteraction {
       this.sketchFeature_ = null;
       this.sketchPoint_ = null;
       this.sketchLine_ = null;
-      this.overlay_.getSource().clear(true);
+      /** @type {VectorSource} */ (this.overlay_.getSource()).clear(true);
     }
     return sketchFeature;
   }
@@ -788,7 +812,7 @@ class Draw extends PointerInteraction {
     if (this.sketchPoint_) {
       sketchFeatures.push(this.sketchPoint_);
     }
-    const overlaySource = this.overlay_.getSource();
+    const overlaySource = /** @type {VectorSource} */ (this.overlay_.getSource());
     overlaySource.clear(true);
     overlaySource.addFeatures(sketchFeatures);
   }
@@ -843,7 +867,7 @@ export function handleEvent(event) {
     } else {
       this.lastDragTime_ = undefined;
     }
-    if (this.shouldHandle_ && this.downTimeout_) {
+    if (this.shouldHandle_ && this.downTimeout_ !== undefined) {
       clearTimeout(this.downTimeout_);
       this.downTimeout_ = undefined;
     }
@@ -860,8 +884,8 @@ export function handleEvent(event) {
     pass = event.type === MapBrowserEventType.POINTERMOVE;
     if (pass && this.freehand_) {
       pass = this.handlePointerMove_(event);
-    } else if (event.pointerEvent.pointerType == POINTER_TYPE ||
+    } else if (/** @type {MapBrowserPointerEvent} */ (event).pointerEvent.pointerType == POINTER_TYPE ||
-        (event.type === MapBrowserEventType.POINTERDRAG && !this.downTimeout_)) {
+        (event.type === MapBrowserEventType.POINTERDRAG && this.downTimeout_ === undefined)) {
       this.handlePointerMove_(event);
     }
   } else if (event.type === MapBrowserEventType.DBLCLICK) {
@@ -890,7 +914,7 @@ function handleDownEvent(event) {
     this.lastDragTime_ = Date.now();
     this.downTimeout_ = setTimeout(function() {
       this.handlePointerMove_(new MapBrowserPointerEvent(
-        MapBrowserEventType.POINTERMOVE, event.map, event.pointerEvent, event.frameState));
+        MapBrowserEventType.POINTERMOVE, event.map, event.pointerEvent, false, event.frameState));
     }.bind(this), this.dragVertexDelay_);
     this.downPx_ = event.pixel;
     return true;
@@ -959,8 +983,8 @@ function handleUpEvent(event) {
  */
 export function createRegularPolygon(opt_sides, opt_angle) {
   return function(coordinates, opt_geometry) {
-    const center = coordinates[0];
+    const center = /** @type {LineCoordType} */ (coordinates)[0];
-    const end = coordinates[1];
+    const end = /** @type {LineCoordType} */ (coordinates)[1];
     const radius = Math.sqrt(
       squaredCoordinateDistance(center, end));
     const geometry = opt_geometry ? /** @type {Polygon} */ (opt_geometry) :
@@ -987,7 +1011,7 @@ export function createRegularPolygon(opt_sides, opt_angle) {
 export function createBox() {
   return (
     function(coordinates, opt_geometry) {
-      const extent = boundingExtent(coordinates);
+      const extent = boundingExtent(/** @type {LineCoordType} */ (coordinates));
       const boxCoordinates = [[
         getBottomLeft(extent),
         getBottomRight(extent),