Fix TypeScript errors in ol/geom/*

This commit is contained in:
Kevin Schmidt
2018-09-28 09:00:28 -06:00
parent 63f583e148
commit 7d5a81d40f
6 changed files with 25 additions and 18 deletions

View File

@@ -28,10 +28,10 @@ import {quantizeMultiArray} from '../geom/flat/simplify.js';
class MultiPolygon extends SimpleGeometry {
/**
* @param {Array<Array<Array<import("../coordinate.js").Coordinate>>>|Array<number>} coordinates Coordinates.
* @param {Array<Array<Array<import("../coordinate.js").Coordinate>>|Polygon>|Array<number>} coordinates Coordinates.
* For internal use, flat coordinats in combination with `opt_layout` and `opt_endss` are also accepted.
* @param {GeometryLayout=} opt_layout Layout.
* @param {Array<number>=} opt_endss Array of ends for internal use with flat coordinates.
* @param {Array<Array<number>>=} opt_endss Array of ends for internal use with flat coordinates.
*/
constructor(coordinates, opt_layout, opt_endss) {
@@ -81,10 +81,11 @@ class MultiPolygon extends SimpleGeometry {
if (!opt_endss && !Array.isArray(coordinates[0])) {
let layout = this.getLayout();
const polygons = /** @type {Array<Polygon>} */ (coordinates);
const flatCoordinates = [];
const endss = [];
for (let i = 0, ii = coordinates.length; i < ii; ++i) {
const polygon = coordinates[i];
for (let i = 0, ii = polygons.length; i < ii; ++i) {
const polygon = polygons[i];
if (i === 0) {
layout = polygon.getLayout();
}
@@ -101,10 +102,11 @@ class MultiPolygon extends SimpleGeometry {
opt_endss = endss;
}
if (opt_layout !== undefined && opt_endss) {
this.setFlatCoordinates(opt_layout, coordinates);
this.setFlatCoordinates(opt_layout, /** @type {Array<number>} */ (coordinates));
this.endss_ = opt_endss;
} else {
this.setCoordinates(coordinates, opt_layout);
this.setCoordinates(/** @type {Array<Array<Array<import("../coordinate.js").Coordinate>>>} */ (coordinates),
opt_layout);
}
}