dgeoutils 2.4.14 → 2.4.15

package/dist/cjs/DPoint.d.ts

@@ -19,9 +19,7 @@ export declare class DPoint {
     x: number;
     y: number;
     z?: number | undefined;
-    properties: {
-        [key: string]: any;
-    };
+    properties: Record<string, any>;
     constructor();
     constructor(xy: number);
     constructor(x: number, y: number);
@@ -119,9 +117,7 @@ export declare class DPoint {
     set lon(v: number);
     get alt(): number | undefined;
     set alt(v: number | undefined);
-    simple(xKey?: string, yKey?: string): {
-        [key: string]: number;
-    };
+    simple<T extends Record<string, number>>(xKey?: string, yKey?: string, zKey?: string): T;
     setIfLessThan(p: DPoint): DPoint;
     minus(): DPoint;
     orthodromicPath(point: DPoint, pointsCount?: number): DPolygon;

package/dist/cjs/DPoint.js

@@ -58,7 +58,7 @@ var DPoint = (function () {
         return new DPoint();
     };
     DPoint.parse = function (c, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         var _a = c, lat = _a.lat, lon = _a.lon, _b = _a.lng, lng = _b === void 0 ? lon : _b, alt = _a.alt;
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
@@ -157,7 +157,7 @@ var DPoint = (function () {
     };
     DPoint.prototype.toCoords = function (format) {
         var _this = this;
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         return format.replace(/[^x-z]/gmiu, '').split('')
             .map(function (k) { return ({
             x: _this.x,
@@ -167,7 +167,7 @@ var DPoint = (function () {
             .filter(function (r) { return r !== undefined; });
     };
     DPoint.prototype.toGeoJSON = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         return {
             type: 'Point',
             coordinates: this.toCoords(format)
@@ -691,14 +691,14 @@ var DPoint = (function () {
         enumerable: false,
         configurable: true
     });
-    DPoint.prototype.simple = function (xKey, yKey) {
-        var _a;
+    DPoint.prototype.simple = function (xKey, yKey, zKey) {
+        var _a, _b;
         if (xKey === void 0) { xKey = 'x'; }
         if (yKey === void 0) { yKey = 'y'; }
-        return _a = {},
-            _a[xKey] = this.x,
-            _a[yKey] = this.y,
-            _a;
+        if (zKey === void 0) { zKey = 'z'; }
+        return __assign((_a = {}, _a[xKey] = this.x, _a[yKey] = this.y, _a), ((0, utils_1.isDefAndNotNull)(this.z) ? (_b = {},
+            _b[zKey] = this.z,
+            _b) : {}));
     };
     DPoint.prototype.setIfLessThan = function (p) {
         this.x = Math.max(this.x, p.x);

package/dist/cjs/DPolygon.d.ts

@@ -94,13 +94,13 @@ export declare class DPolygon {
     onBorder(p: DPoint): boolean;
     nextStart(): DPolygon;
     removeDuplicates(): DPolygon;
-    static toGeoJSONFeatureCollection(polygons: DPolygon[], format?: string): FeatureCollection<LineString | Polygon, Record<string, any>>;
+    static toGeoJSONFeatureCollection(polygons: DPolygon[], format?: string): FeatureCollection<LineString | Polygon>;
     static parse(a: LatLng[], format?: string): DPolygon;
     static parse(a: number[][], format?: string): DPolygon;
     static parse(a: DCoord[], format?: string): DPolygon;
     static parse(a: GeoJsonGeometry | Feature | FeatureCollection<LineString | Polygon>, format?: string): DPolygon | DeepArray<DPolygon>;
     toArrayOfCoords(format?: string): DCoord[];
-    toGeoJSONFeature(format?: string): Feature<LineString | Polygon, Record<string, any>>;
+    toGeoJSONFeature(format?: string): Feature<LineString | Polygon>;
     toGeoJSON(format?: string): LineString | Polygon;
     divideToPieces(piecesCount: number, withAltitude?: boolean): DPolygon;
     prepareToFastSearch(): void;

package/dist/cjs/DPolygon.js

@@ -967,14 +967,14 @@ var DPolygon = (function () {
         return this;
     };
     DPolygon.toGeoJSONFeatureCollection = function (polygons, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         return {
             type: 'FeatureCollection',
             features: polygons.map(function (polygon) { return polygon.toGeoJSONFeature(format); })
         };
     };
     DPolygon.parse = function (a, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         if (a.type) {
             switch (a.type) {
                 case 'FeatureCollection':
@@ -990,7 +990,14 @@ var DPolygon = (function () {
                     }, []);
                 case 'Feature': {
                     var t = DPolygon.parse(a.geometry, format);
-                    t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                    if (Array.isArray(t)) {
+                        t.forEach(function (record) {
+                            record.properties = __assign(__assign({}, a.properties), { id: a.id });
+                        });
+                    }
+                    else {
+                        t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                    }
                     return t;
                 }
                 case 'LineString':
@@ -1031,11 +1038,11 @@ var DPolygon = (function () {
             .map(function (r) { return DPoint_1.DPoint.parse(r, format); }));
     };
     DPolygon.prototype.toArrayOfCoords = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         return this.mapArray(function (r) { return r.toCoords(format); });
     };
     DPolygon.prototype.toGeoJSONFeature = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         return {
             type: 'Feature',
             properties: __assign({}, this.properties),
@@ -1043,7 +1050,7 @@ var DPolygon = (function () {
         };
     };
     DPolygon.prototype.toGeoJSON = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
         if (this.closed) {
             return {
                 type: 'Polygon',

package/dist/cjs/utils.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="offscreencanvas" />
 import { DPoint } from './DPoint';
-export declare const DGeo: {
+interface DGeoInterface {
     DEBUG: boolean;
-};
+    parseFormat: string;
+}
+export declare const DGeo: DGeoInterface;
 export declare const warn: (...args: any[]) => void;
 export declare const isDefAndNotNull: (a: any) => boolean;
 declare type CheckFunc = (p: DPoint) => CheckFunction;
@@ -19,8 +21,10 @@ interface CheckFunction {
     checkArgument: (argName: string) => CheckArgument;
 }
 export declare const checkFunction: (funcName: string) => CheckFunction;
-export declare const createArray: (v: number, fillSymbol?: any) => number[];
-export declare const createMatrix: ({ h, w }: DPoint, fillSymbol?: any) => number[][];
+declare type ArrayFillFunction<T> = (index: number) => T;
+export declare const createArray: <T = number>(v: number, fillSymbol?: T | ArrayFillFunction<T> | undefined) => T[];
+declare type MatrixFillFunction<T> = (x: number, y: number) => T;
+export declare const createMatrix: <T>({ h, w }: DPoint, fillSymbol?: T | MatrixFillFunction<T> | undefined) => T[][];
 export declare const gaussianElimination: {
     (matrix: number[][]): number[];
     MIN: number;

package/dist/cjs/utils.js

@@ -28,7 +28,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.div = exports.getCombinations = exports.cartesianProduct = exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = exports.DGeo = void 0;
 var DPoint_1 = require("./DPoint");
 exports.DGeo = {
-    DEBUG: false
+    DEBUG: false,
+    parseFormat: 'xyz'
 };
 var warn = function () {
     var args = [];
@@ -105,13 +106,19 @@ var checkFunction = function (funcName) { return ({
 }); };
 exports.checkFunction = checkFunction;
 var createArray = function (v, fillSymbol) {
-    if (fillSymbol === void 0) { fillSymbol = 0; }
-    return new Array(v).fill(fillSymbol);
+    if (typeof fillSymbol === 'function') {
+        return new Array(v).fill(false)
+            .map(function (_, i) { return fillSymbol(i); });
+    }
+    return new Array(v).fill(fillSymbol !== null && fillSymbol !== void 0 ? fillSymbol : 0);
 };
 exports.createArray = createArray;
 var createMatrix = function (_a, fillSymbol) {
     var h = _a.h, w = _a.w;
-    if (fillSymbol === void 0) { fillSymbol = 0; }
+    if (typeof fillSymbol === 'function') {
+        return (0, exports.createArray)(h)
+            .map(function (_, y) { return (0, exports.createArray)(w, function (x) { return fillSymbol(x, y); }); });
+    }
     return (0, exports.createArray)(h)
         .map(function () { return (0, exports.createArray)(w, fillSymbol); });
 };

package/dist/es2015/DPoint.js

@@ -1,6 +1,6 @@
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, div, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, DGeo, div, isDefAndNotNull } from './utils';
 const diff = 0;
 const radiansPolygon = new DPolygon();
 const pseudoMercatorPolygon = new DPolygon();
@@ -25,7 +25,7 @@ export class DPoint {
     static zero() {
         return new DPoint();
     }
-    static parse(c, format = 'xyz') {
+    static parse(c, format = DGeo.parseFormat) {
         const { lat, lon, lng = lon, alt } = c;
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
@@ -119,7 +119,7 @@ export class DPoint {
         const y = PI_IN_DEGREE / Math.PI * Math.atan((Math.exp(n) - Math.exp(-n)) / 2);
         return new DPoint(x, y, zoom);
     }
-    toCoords(format = 'xyz') {
+    toCoords(format = DGeo.parseFormat) {
         return format.replace(/[^x-z]/gmiu, '').split('')
             .map((k) => ({
             x: this.x,
@@ -128,7 +128,7 @@ export class DPoint {
         })[k])
             .filter((r) => r !== undefined);
     }
-    toGeoJSON(format = 'xyz') {
+    toGeoJSON(format = DGeo.parseFormat) {
         return {
             type: 'Point',
             coordinates: this.toCoords(format)
@@ -573,11 +573,10 @@ export class DPoint {
     set alt(v) {
         this.z = v;
     }
-    simple(xKey = 'x', yKey = 'y') {
-        return {
-            [xKey]: this.x,
-            [yKey]: this.y
-        };
+    simple(xKey = 'x', yKey = 'y', zKey = 'z') {
+        return Object.assign({ [xKey]: this.x, [yKey]: this.y }, (isDefAndNotNull(this.z) ? {
+            [zKey]: this.z
+        } : {}));
     }
     setIfLessThan(p) {
         this.x = Math.max(this.x, p.x);

package/dist/es2015/DPolygon.js

@@ -4,7 +4,7 @@ import { DCircle } from './DCircle';
 import { DNumbers } from './DNumbers';
 import { io as jstsIo, operation } from 'jsts';
 import { DPolygonLoop } from './DPolygonLoop';
-import { isDefAndNotNull } from './utils';
+import { DGeo, isDefAndNotNull } from './utils';
 const { buffer: { BufferParameters: { CAP_ROUND, CAP_FLAT, CAP_SQUARE } } } = operation;
 export const MIN_POINTS_IN_VALID_POLYGON = 3;
 const APPROXIMATION_VALUE = 0.1;
@@ -618,13 +618,13 @@ export class DPolygon {
         }
         return this;
     }
-    static toGeoJSONFeatureCollection(polygons, format = 'xyz') {
+    static toGeoJSONFeatureCollection(polygons, format = DGeo.parseFormat) {
         return {
             type: 'FeatureCollection',
             features: polygons.map((polygon) => polygon.toGeoJSONFeature(format))
         };
     }
-    static parse(a, format = 'xyz') {
+    static parse(a, format = DGeo.parseFormat) {
         if (a.type) {
             switch (a.type) {
                 case 'FeatureCollection':
@@ -640,7 +640,14 @@ export class DPolygon {
                     }, []);
                 case 'Feature': {
                     const t = DPolygon.parse(a.geometry, format);
-                    t.properties = Object.assign(Object.assign({}, a.properties), { id: a.id });
+                    if (Array.isArray(t)) {
+                        t.forEach((record) => {
+                            record.properties = Object.assign(Object.assign({}, a.properties), { id: a.id });
+                        });
+                    }
+                    else {
+                        t.properties = Object.assign(Object.assign({}, a.properties), { id: a.id });
+                    }
                     return t;
                 }
                 case 'LineString':
@@ -680,17 +687,17 @@ export class DPolygon {
         return new DPolygon(a
             .map((r) => DPoint.parse(r, format)));
     }
-    toArrayOfCoords(format = 'xyz') {
+    toArrayOfCoords(format = DGeo.parseFormat) {
         return this.mapArray((r) => r.toCoords(format));
     }
-    toGeoJSONFeature(format = 'xyz') {
+    toGeoJSONFeature(format = DGeo.parseFormat) {
         return {
             type: 'Feature',
             properties: Object.assign({}, this.properties),
             geometry: this.toGeoJSON(format)
         };
     }
-    toGeoJSON(format = 'xyz') {
+    toGeoJSON(format = DGeo.parseFormat) {
         if (this.closed) {
             return {
                 type: 'Polygon',

package/dist/es2015/utils.js

@@ -1,6 +1,7 @@
 import { DPoint } from './DPoint';
 export const DGeo = {
-    DEBUG: false
+    DEBUG: false,
+    parseFormat: 'xyz'
 };
 export const warn = (...args) => {
     if (DGeo.DEBUG) {
@@ -69,9 +70,21 @@ export const checkFunction = (funcName) => ({
         };
     }
 });
-export const createArray = (v, fillSymbol = 0) => new Array(v).fill(fillSymbol);
-export const createMatrix = ({ h, w }, fillSymbol = 0) => createArray(h)
-    .map(() => createArray(w, fillSymbol));
+export const createArray = (v, fillSymbol) => {
+    if (typeof fillSymbol === 'function') {
+        return new Array(v).fill(false)
+            .map((_, i) => fillSymbol(i));
+    }
+    return new Array(v).fill(fillSymbol !== null && fillSymbol !== void 0 ? fillSymbol : 0);
+};
+export const createMatrix = ({ h, w }, fillSymbol) => {
+    if (typeof fillSymbol === 'function') {
+        return createArray(h)
+            .map((_, y) => createArray(w, (x) => fillSymbol(x, y)));
+    }
+    return createArray(h)
+        .map(() => createArray(w, fillSymbol));
+};
 export const gaussianElimination = (matrix) => {
     const n = matrix.length;
     const matrixClone = createMatrix(new DPoint(n + 1, n));

package/dist/esm/DPoint.js

@@ -27,7 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
 };
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, div, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, DGeo, div, isDefAndNotNull } from './utils';
 var diff = 0;
 var radiansPolygon = new DPolygon();
 var pseudoMercatorPolygon = new DPolygon();
@@ -55,7 +55,7 @@ var DPoint = (function () {
         return new DPoint();
     };
     DPoint.parse = function (c, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         var _a = c, lat = _a.lat, lon = _a.lon, _b = _a.lng, lng = _b === void 0 ? lon : _b, alt = _a.alt;
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
@@ -154,7 +154,7 @@ var DPoint = (function () {
     };
     DPoint.prototype.toCoords = function (format) {
         var _this = this;
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         return format.replace(/[^x-z]/gmiu, '').split('')
             .map(function (k) { return ({
             x: _this.x,
@@ -164,7 +164,7 @@ var DPoint = (function () {
             .filter(function (r) { return r !== undefined; });
     };
     DPoint.prototype.toGeoJSON = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         return {
             type: 'Point',
             coordinates: this.toCoords(format)
@@ -688,14 +688,14 @@ var DPoint = (function () {
         enumerable: false,
         configurable: true
     });
-    DPoint.prototype.simple = function (xKey, yKey) {
-        var _a;
+    DPoint.prototype.simple = function (xKey, yKey, zKey) {
+        var _a, _b;
         if (xKey === void 0) { xKey = 'x'; }
         if (yKey === void 0) { yKey = 'y'; }
-        return _a = {},
-            _a[xKey] = this.x,
-            _a[yKey] = this.y,
-            _a;
+        if (zKey === void 0) { zKey = 'z'; }
+        return __assign((_a = {}, _a[xKey] = this.x, _a[yKey] = this.y, _a), (isDefAndNotNull(this.z) ? (_b = {},
+            _b[zKey] = this.z,
+            _b) : {}));
     };
     DPoint.prototype.setIfLessThan = function (p) {
         this.x = Math.max(this.x, p.x);

package/dist/esm/DPolygon.js

@@ -78,7 +78,7 @@ import { DCircle } from './DCircle';
 import { DNumbers } from './DNumbers';
 import { io as jstsIo, operation } from 'jsts';
 import { DPolygonLoop } from './DPolygonLoop';
-import { isDefAndNotNull } from './utils';
+import { DGeo, isDefAndNotNull } from './utils';
 var _a = operation.buffer.BufferParameters, CAP_ROUND = _a.CAP_ROUND, CAP_FLAT = _a.CAP_FLAT, CAP_SQUARE = _a.CAP_SQUARE;
 export var MIN_POINTS_IN_VALID_POLYGON = 3;
 var APPROXIMATION_VALUE = 0.1;
@@ -964,14 +964,14 @@ var DPolygon = (function () {
         return this;
     };
     DPolygon.toGeoJSONFeatureCollection = function (polygons, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         return {
             type: 'FeatureCollection',
             features: polygons.map(function (polygon) { return polygon.toGeoJSONFeature(format); })
         };
     };
     DPolygon.parse = function (a, format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         if (a.type) {
             switch (a.type) {
                 case 'FeatureCollection':
@@ -987,7 +987,14 @@ var DPolygon = (function () {
                     }, []);
                 case 'Feature': {
                     var t = DPolygon.parse(a.geometry, format);
-                    t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                    if (Array.isArray(t)) {
+                        t.forEach(function (record) {
+                            record.properties = __assign(__assign({}, a.properties), { id: a.id });
+                        });
+                    }
+                    else {
+                        t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                    }
                     return t;
                 }
                 case 'LineString':
@@ -1028,11 +1035,11 @@ var DPolygon = (function () {
             .map(function (r) { return DPoint.parse(r, format); }));
     };
     DPolygon.prototype.toArrayOfCoords = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         return this.mapArray(function (r) { return r.toCoords(format); });
     };
     DPolygon.prototype.toGeoJSONFeature = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         return {
             type: 'Feature',
             properties: __assign({}, this.properties),
@@ -1040,7 +1047,7 @@ var DPolygon = (function () {
         };
     };
     DPolygon.prototype.toGeoJSON = function (format) {
-        if (format === void 0) { format = 'xyz'; }
+        if (format === void 0) { format = DGeo.parseFormat; }
         if (this.closed) {
             return {
                 type: 'Polygon',

package/dist/esm/utils.js

@@ -25,7 +25,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { DPoint } from './DPoint';
 export var DGeo = {
-    DEBUG: false
+    DEBUG: false,
+    parseFormat: 'xyz'
 };
 export var warn = function () {
     var args = [];
@@ -99,12 +100,18 @@ export var checkFunction = function (funcName) { return ({
     }
 }); };
 export var createArray = function (v, fillSymbol) {
-    if (fillSymbol === void 0) { fillSymbol = 0; }
-    return new Array(v).fill(fillSymbol);
+    if (typeof fillSymbol === 'function') {
+        return new Array(v).fill(false)
+            .map(function (_, i) { return fillSymbol(i); });
+    }
+    return new Array(v).fill(fillSymbol !== null && fillSymbol !== void 0 ? fillSymbol : 0);
 };
 export var createMatrix = function (_a, fillSymbol) {
     var h = _a.h, w = _a.w;
-    if (fillSymbol === void 0) { fillSymbol = 0; }
+    if (typeof fillSymbol === 'function') {
+        return createArray(h)
+            .map(function (_, y) { return createArray(w, function (x) { return fillSymbol(x, y); }); });
+    }
     return createArray(h)
         .map(function () { return createArray(w, fillSymbol); });
 };