dgeoutils 2.4.32 → 2.4.34

package/dist/cjs/DPolygon.d.ts

@@ -38,7 +38,9 @@ export declare class DPolygon {
     get extend(): DPolygon;
     get size(): DPoint;
     get leftTop(): DPoint;
+    get minPoint(): DPoint;
     get rightBottom(): DPoint;
+    get maxPoint(): DPoint;
     get length(): number;
     get fullLength(): number;
     get perimeter(): number;

package/dist/cjs/DPolygon.js

@@ -340,6 +340,13 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DPolygon.prototype, "minPoint", {
+        get: function () {
+            return this.leftTop;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(DPolygon.prototype, "rightBottom", {
         get: function () {
             var _a = this, maxX = _a.maxX, maxY = _a.maxY;
@@ -348,6 +355,13 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DPolygon.prototype, "maxPoint", {
+        get: function () {
+            return this.rightBottom;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(DPolygon.prototype, "length", {
         get: function () {
             return this.pPoints.length;

package/dist/cjs/InterpolationMatrix.d.ts

@@ -3,19 +3,19 @@ import { DPoint } from './DPoint';
 export declare class InterpolationMatrix {
     private readonly stepSize;
     private readonly p;
-    private readonly minPoint;
-    private readonly maxPoint;
+    readonly minPoint: DPoint;
+    readonly maxPoint: DPoint;
     private points;
     private cells;
     private allCells;
     private readonly sizePoly;
     private readonly keys;
+    readonly size: DPoint;
     constructor(bboxLike: DPolygon, stepSize: number, keys: string[] | string, p?: number);
     setKnownPoints(points: DPoint[] | DPolygon): InterpolationMatrix;
     positionToCellCoords(d: DPoint): DPoint;
     calculate(): InterpolationMatrix;
     getCellValue({ x, y }: DPoint, key?: string | string[]): (number | Record<string, number>);
-    get size(): DPoint;
     get getCellData(): Record<number, Record<number, Record<string, number>>>;
     get allCellsClone(): DPolygon[];
     private interpolateValues;

package/dist/cjs/InterpolationMatrix.js

@@ -37,15 +37,6 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterpolationMatrix = void 0;
 var DPolygon_1 = require("./DPolygon");
@@ -59,14 +50,30 @@ var InterpolationMatrix = (function () {
         this.points = [];
         this.cells = {};
         this.allCells = [];
-        this.minPoint = bboxLike.leftTop;
-        this.maxPoint = bboxLike.rightBottom;
+        this.minPoint = bboxLike.minPoint;
+        this.maxPoint = bboxLike.maxPoint;
         this.sizePoly = DPolygon_1.DPolygon.createSquareBySize(new DPoint_1.DPoint(this.stepSize));
+        this.size = this.maxPoint.clone().move(this.minPoint.clone().minus())
+            .divide(this.stepSize)
+            .ceil();
         this.keys = Array.isArray(keys) ? keys : [keys];
         this.generateCells();
     }
     InterpolationMatrix.prototype.setKnownPoints = function (points) {
+        var _this = this;
         this.points = points instanceof DPolygon_1.DPolygon ? points.points : points;
+        this.minPoint.setProperties(this.points.reduce(function (a, v) { return _this.keys
+            .reduce(function (aa, k) {
+            var _a;
+            aa[k] = Math.min((_a = a[k]) !== null && _a !== void 0 ? _a : Infinity, v.properties[k]);
+            return aa;
+        }, a); }, {}));
+        this.maxPoint.setProperties(this.points.reduce(function (a, v) { return _this.keys
+            .reduce(function (aa, k) {
+            var _a;
+            aa[k] = Math.max((_a = a[k]) !== null && _a !== void 0 ? _a : -Infinity, v.properties[k]);
+            return aa;
+        }, a); }, {}));
         return this;
     };
     InterpolationMatrix.prototype.positionToCellCoords = function (d) {
@@ -94,13 +101,6 @@ var InterpolationMatrix = (function () {
         }
         return __assign({}, cell.properties);
     };
-    Object.defineProperty(InterpolationMatrix.prototype, "size", {
-        get: function () {
-            return new DPoint_1.DPoint(Math.max.apply(Math, __spreadArray([], __read(Object.keys(this.cells).map(Number)), false)), Math.max.apply(Math, __spreadArray([], __read(Object.keys(this.cells[0]).map(Number)), false)));
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(InterpolationMatrix.prototype, "getCellData", {
         get: function () {
             return this.allCells.reduce(function (a, c) {

package/dist/es2015/DPolygon.js

@@ -178,10 +178,16 @@ export class DPolygon {
         const { minX, minY } = this;
         return new DPoint(minX, minY);
     }
+    get minPoint() {
+        return this.leftTop;
+    }
     get rightBottom() {
         const { maxX, maxY } = this;
         return new DPoint(maxX, maxY);
     }
+    get maxPoint() {
+        return this.rightBottom;
+    }
     get length() {
         return this.pPoints.length;
     }

package/dist/es2015/InterpolationMatrix.js

@@ -19,14 +19,29 @@ export class InterpolationMatrix {
         this.points = [];
         this.cells = {};
         this.allCells = [];
-        this.minPoint = bboxLike.leftTop;
-        this.maxPoint = bboxLike.rightBottom;
+        this.minPoint = bboxLike.minPoint;
+        this.maxPoint = bboxLike.maxPoint;
         this.sizePoly = DPolygon.createSquareBySize(new DPoint(this.stepSize));
+        this.size = this.maxPoint.clone().move(this.minPoint.clone().minus())
+            .divide(this.stepSize)
+            .ceil();
         this.keys = Array.isArray(keys) ? keys : [keys];
         this.generateCells();
     }
     setKnownPoints(points) {
         this.points = points instanceof DPolygon ? points.points : points;
+        this.minPoint.setProperties(this.points.reduce((a, v) => this.keys
+            .reduce((aa, k) => {
+            var _a;
+            aa[k] = Math.min((_a = a[k]) !== null && _a !== void 0 ? _a : Infinity, v.properties[k]);
+            return aa;
+        }, a), {}));
+        this.maxPoint.setProperties(this.points.reduce((a, v) => this.keys
+            .reduce((aa, k) => {
+            var _a;
+            aa[k] = Math.max((_a = a[k]) !== null && _a !== void 0 ? _a : -Infinity, v.properties[k]);
+            return aa;
+        }, a), {}));
         return this;
     }
     positionToCellCoords(d) {
@@ -53,9 +68,6 @@ export class InterpolationMatrix {
         }
         return Object.assign({}, cell.properties);
     }
-    get size() {
-        return new DPoint(Math.max(...Object.keys(this.cells).map(Number)), Math.max(...Object.keys(this.cells[0]).map(Number)));
-    }
     get getCellData() {
         return this.allCells.reduce((a, c) => {
             const _a = c.properties, { x, y } = _a, props = __rest(_a, ["x", "y"]);

package/dist/esm/DPolygon.js

@@ -337,6 +337,13 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DPolygon.prototype, "minPoint", {
+        get: function () {
+            return this.leftTop;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(DPolygon.prototype, "rightBottom", {
         get: function () {
             var _a = this, maxX = _a.maxX, maxY = _a.maxY;
@@ -345,6 +352,13 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DPolygon.prototype, "maxPoint", {
+        get: function () {
+            return this.rightBottom;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(DPolygon.prototype, "length", {
         get: function () {
             return this.pPoints.length;

package/dist/esm/InterpolationMatrix.js

@@ -36,15 +36,6 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { DPolygon } from './DPolygon';
 import { DPoint } from './DPoint';
 import { isDefAndNotNull } from './utils';
@@ -56,14 +47,30 @@ var InterpolationMatrix = (function () {
         this.points = [];
         this.cells = {};
         this.allCells = [];
-        this.minPoint = bboxLike.leftTop;
-        this.maxPoint = bboxLike.rightBottom;
+        this.minPoint = bboxLike.minPoint;
+        this.maxPoint = bboxLike.maxPoint;
         this.sizePoly = DPolygon.createSquareBySize(new DPoint(this.stepSize));
+        this.size = this.maxPoint.clone().move(this.minPoint.clone().minus())
+            .divide(this.stepSize)
+            .ceil();
         this.keys = Array.isArray(keys) ? keys : [keys];
         this.generateCells();
     }
     InterpolationMatrix.prototype.setKnownPoints = function (points) {
+        var _this = this;
         this.points = points instanceof DPolygon ? points.points : points;
+        this.minPoint.setProperties(this.points.reduce(function (a, v) { return _this.keys
+            .reduce(function (aa, k) {
+            var _a;
+            aa[k] = Math.min((_a = a[k]) !== null && _a !== void 0 ? _a : Infinity, v.properties[k]);
+            return aa;
+        }, a); }, {}));
+        this.maxPoint.setProperties(this.points.reduce(function (a, v) { return _this.keys
+            .reduce(function (aa, k) {
+            var _a;
+            aa[k] = Math.max((_a = a[k]) !== null && _a !== void 0 ? _a : -Infinity, v.properties[k]);
+            return aa;
+        }, a); }, {}));
         return this;
     };
     InterpolationMatrix.prototype.positionToCellCoords = function (d) {
@@ -91,13 +98,6 @@ var InterpolationMatrix = (function () {
         }
         return __assign({}, cell.properties);
     };
-    Object.defineProperty(InterpolationMatrix.prototype, "size", {
-        get: function () {
-            return new DPoint(Math.max.apply(Math, __spreadArray([], __read(Object.keys(this.cells).map(Number)), false)), Math.max.apply(Math, __spreadArray([], __read(Object.keys(this.cells[0]).map(Number)), false)));
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(InterpolationMatrix.prototype, "getCellData", {
         get: function () {
             return this.allCells.reduce(function (a, c) {