dgeoutils 2.4.12 → 2.4.15

package/dist/cjs/DPoint.d.ts

@@ -1,7 +1,7 @@
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
 import { Point } from 'geojson';
-export declare const EARTH_RADIUS_IN_METERS = 6371008.8;
+export declare const EARTH_RADIUS_IN_METERS = 6378137;
 export declare type DCoord = [number, number] | [number, number, number];
 export interface LatLng {
     lat: number;
@@ -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);
@@ -83,6 +81,14 @@ export declare class DPoint {
     divide(p: DPoint): DPoint;
     divide(x: number, y: number): DPoint;
     divide(x: number, y: number, z: number): DPoint;
+    mod(v: number): DPoint;
+    mod(p: DPoint): DPoint;
+    mod(x: number, y: number): DPoint;
+    mod(x: number, y: number, z: number): DPoint;
+    div(v: number): DPoint;
+    div(p: DPoint): DPoint;
+    div(x: number, y: number): DPoint;
+    div(x: number, y: number, z: number): DPoint;
     equal(p: DPoint): boolean;
     like(p: DPoint, d?: number): boolean;
     flipVertically(size: DPoint): DPoint;
@@ -111,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

@@ -35,11 +35,11 @@ var diff = 0;
 var radiansPolygon = new DPolygon_1.DPolygon();
 var pseudoMercatorPolygon = new DPolygon_1.DPolygon();
 var worldGeodeticPolygon = new DPolygon_1.DPolygon();
-exports.EARTH_RADIUS_IN_METERS = 6371008.8;
-var EARTH_IN_MITERS = 20037508.34;
+exports.EARTH_RADIUS_IN_METERS = 6378137;
+var EARTH_IN_METERS = 20037508.34;
 var DEGREES_IN_EARTH = 180;
-var MITERS_IN_ONE_DEGREE = EARTH_IN_MITERS / DEGREES_IN_EARTH;
-var DEGREES_IN_ONE_MITER = DEGREES_IN_EARTH / EARTH_IN_MITERS;
+var METERS_IN_ONE_DEGREE = EARTH_IN_METERS / DEGREES_IN_EARTH;
+var DEGREES_IN_ONE_METER = DEGREES_IN_EARTH / EARTH_IN_METERS;
 exports.HALF_PI_IN_DEGREE = 90;
 exports.PI_IN_DEGREE = 180;
 exports.DOUBLE_PI_IN_DEGREE = 360;
@@ -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)
@@ -335,9 +335,9 @@ var DPoint = (function () {
         (0, utils_1.checkFunction)('degreeToMeters')
             .checkArgument('this')
             .shouldBeDegree(this);
-        var x = ((this.x + exports.PI_IN_DEGREE) % exports.DOUBLE_PI_IN_DEGREE - exports.PI_IN_DEGREE) * MITERS_IN_ONE_DEGREE;
+        var x = ((this.x + exports.PI_IN_DEGREE) % exports.DOUBLE_PI_IN_DEGREE - exports.PI_IN_DEGREE) * METERS_IN_ONE_DEGREE;
         var y = (Math.log(Math.tan(((this.y + exports.HALF_PI_IN_DEGREE) % exports.PI_IN_DEGREE) *
-            (Math.PI / exports.DOUBLE_PI_IN_DEGREE))) / exports.PI_TO_DEGREE) * MITERS_IN_ONE_DEGREE;
+            (Math.PI / exports.DOUBLE_PI_IN_DEGREE))) / exports.PI_TO_DEGREE) * METERS_IN_ONE_DEGREE;
         this.x = x;
         this.y = y;
         return this;
@@ -346,8 +346,8 @@ var DPoint = (function () {
         (0, utils_1.checkFunction)('metersToDegree')
             .checkArgument('this')
             .shouldBeMeters(this);
-        var lon = this.x * DEGREES_IN_ONE_MITER;
-        var lat = Math.atan(Math.pow(Math.E, ((this.y / MITERS_IN_ONE_DEGREE) * exports.PI_TO_DEGREE))) *
+        var lon = this.x * DEGREES_IN_ONE_METER;
+        var lat = Math.atan(Math.pow(Math.E, ((this.y / METERS_IN_ONE_DEGREE) * exports.PI_TO_DEGREE))) *
             (exports.DOUBLE_PI_IN_DEGREE / Math.PI) - exports.HALF_PI_IN_DEGREE;
         this.x = lon;
         this.y = lat;
@@ -455,6 +455,58 @@ var DPoint = (function () {
         }
         return this;
     };
+    DPoint.prototype.mod = function (x, y, z) {
+        if (y === void 0) { y = x; }
+        var xV = 0;
+        var yV = 0;
+        var zV = undefined;
+        if (x instanceof DPoint) {
+            xV = this.x % x.x;
+            yV = this.y % x.y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(x.z)) {
+                zV = this.z % x.z;
+            }
+        }
+        else {
+            xV = this.x % x;
+            yV = this.y % y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(z)) {
+                zV = this.z % z;
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if ((0, utils_1.isDefAndNotNull)(zV)) {
+            this.z = zV;
+        }
+        return this;
+    };
+    DPoint.prototype.div = function (x, y, z) {
+        if (y === void 0) { y = x; }
+        var xV = 0;
+        var yV = 0;
+        var zV = undefined;
+        if (x instanceof DPoint) {
+            xV = (0, utils_1.div)(this.x, x.x);
+            yV = (0, utils_1.div)(this.y, x.y);
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(x.z)) {
+                zV = (0, utils_1.div)(this.z, x.z);
+            }
+        }
+        else {
+            xV = (0, utils_1.div)(this.x, x);
+            yV = (0, utils_1.div)(this.y, y);
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(z)) {
+                zV = (0, utils_1.div)(this.z, z);
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if ((0, utils_1.isDefAndNotNull)(zV)) {
+            this.z = zV;
+        }
+        return this;
+    };
     DPoint.prototype.equal = function (p) {
         return this.x === p.x && this.y === p.y && this.z === p.z;
     };
@@ -639,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);
@@ -687,7 +739,7 @@ var DPoint = (function () {
             .sort(function (a, b) { return a.properties.distance - b.properties.distance; });
     };
     DPoint.prototype.calculateAltitudeByDistanceBetweenPoints = function (p1, p2) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (p1.alt === p2.alt) {
             this.alt = p1.alt;
         }
@@ -698,7 +750,7 @@ var DPoint = (function () {
             var distance1 = this.distance(p1);
             var distance2 = this.distance(p2);
             var totalDistance = distance1 + distance2;
-            if (p1.alt === minAlt) {
+            if (((_e = p1.alt) !== null && _e !== void 0 ? _e : 0) === minAlt) {
                 this.alt = minAlt + distance1 / totalDistance * dAlt;
             }
             else {

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/DPolygonLoop.d.ts

@@ -36,6 +36,12 @@ export declare class DPolygonLoop {
     divide(v: number): DPolygonLoop;
     divide(p: DPoint): DPolygonLoop;
     divide(x: number, y: number): DPolygonLoop;
+    div(v: number): DPolygonLoop;
+    div(p: DPoint): DPolygonLoop;
+    div(x: number, y: number): DPolygonLoop;
+    mod(v: number): DPolygonLoop;
+    mod(p: DPoint): DPolygonLoop;
+    mod(x: number, y: number): DPolygonLoop;
     degreeToRadians(): DPolygonLoop;
     radiansToDegrees(): DPolygonLoop;
     radiansToMeters(): DPolygonLoop;

package/dist/cjs/DPolygonLoop.js

@@ -36,6 +36,8 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
     LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
     LoopFunctions[LoopFunctions["setProperties"] = 32] = "setProperties";
+    LoopFunctions[LoopFunctions["div"] = 33] = "div";
+    LoopFunctions[LoopFunctions["mod"] = 34] = "mod";
 })(LoopFunctions || (LoopFunctions = {}));
 var decodePoolRecord = function (a, _a) {
     var functionName = _a.functionName, pointArg = _a.pointArg, numberPointArg = _a.numberPointArg, numberArg = _a.numberArg, setterArg = _a.setterArg, setterArgByObject = _a.setterArgByObject;
@@ -113,6 +115,14 @@ var decodePoolRecord = function (a, _a) {
             res = function (k, index) { return a(k, index)
                 .divide(numberPointArg, numberArg); };
             break;
+        case LoopFunctions.div:
+            res = function (k, index) { return a(k, index)
+                .div(numberPointArg, numberArg); };
+            break;
+        case LoopFunctions.mod:
+            res = function (k, index) { return a(k, index)
+                .mod(numberPointArg, numberArg); };
+            break;
         case LoopFunctions.degreeToRadians:
             res = function (k, index) { return a(k, index)
                 .degreeToRadians(); };
@@ -322,6 +332,22 @@ var DPolygonLoop = (function () {
         });
         return this;
     };
+    DPolygonLoop.prototype.div = function (x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.div,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    };
+    DPolygonLoop.prototype.mod = function (x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.mod,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    };
     DPolygonLoop.prototype.degreeToRadians = function () {
         this.pool.push({
             functionName: LoopFunctions.degreeToRadians

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;
@@ -39,4 +43,5 @@ export declare const cartesianProduct: {
     <T>(a: T[], ...b: T[][]): T[][];
 };
 export declare const getCombinations: <T>(arr: T[][]) => T[][];
+export declare const div: (a: number, b: number) => number;
 export {};

package/dist/cjs/utils.js

@@ -25,10 +25,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinations = exports.cartesianProduct = exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = exports.DGeo = void 0;
+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); });
 };
@@ -214,3 +221,5 @@ var getCombinations = function (arr) {
     return ans;
 };
 exports.getCombinations = getCombinations;
+var div = function (a, b) { return Math.floor(a / b); };
+exports.div = div;

package/dist/es2015/DPoint.js

@@ -1,15 +1,15 @@
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, DGeo, div, isDefAndNotNull } from './utils';
 const diff = 0;
 const radiansPolygon = new DPolygon();
 const pseudoMercatorPolygon = new DPolygon();
 const worldGeodeticPolygon = new DPolygon();
-export const EARTH_RADIUS_IN_METERS = 6371008.8;
-const EARTH_IN_MITERS = 20037508.34;
+export const EARTH_RADIUS_IN_METERS = 6378137;
+const EARTH_IN_METERS = 20037508.34;
 const DEGREES_IN_EARTH = 180;
-const MITERS_IN_ONE_DEGREE = EARTH_IN_MITERS / DEGREES_IN_EARTH;
-const DEGREES_IN_ONE_MITER = DEGREES_IN_EARTH / EARTH_IN_MITERS;
+const METERS_IN_ONE_DEGREE = EARTH_IN_METERS / DEGREES_IN_EARTH;
+const DEGREES_IN_ONE_METER = DEGREES_IN_EARTH / EARTH_IN_METERS;
 export const HALF_PI_IN_DEGREE = 90;
 export const PI_IN_DEGREE = 180;
 export const DOUBLE_PI_IN_DEGREE = 360;
@@ -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)
@@ -295,9 +295,9 @@ export class DPoint {
         checkFunction('degreeToMeters')
             .checkArgument('this')
             .shouldBeDegree(this);
-        const x = ((this.x + PI_IN_DEGREE) % DOUBLE_PI_IN_DEGREE - PI_IN_DEGREE) * MITERS_IN_ONE_DEGREE;
+        const x = ((this.x + PI_IN_DEGREE) % DOUBLE_PI_IN_DEGREE - PI_IN_DEGREE) * METERS_IN_ONE_DEGREE;
         const y = (Math.log(Math.tan(((this.y + HALF_PI_IN_DEGREE) % PI_IN_DEGREE) *
-            (Math.PI / DOUBLE_PI_IN_DEGREE))) / PI_TO_DEGREE) * MITERS_IN_ONE_DEGREE;
+            (Math.PI / DOUBLE_PI_IN_DEGREE))) / PI_TO_DEGREE) * METERS_IN_ONE_DEGREE;
         this.x = x;
         this.y = y;
         return this;
@@ -306,8 +306,8 @@ export class DPoint {
         checkFunction('metersToDegree')
             .checkArgument('this')
             .shouldBeMeters(this);
-        const lon = this.x * DEGREES_IN_ONE_MITER;
-        const lat = Math.atan(Math.pow(Math.E, ((this.y / MITERS_IN_ONE_DEGREE) * PI_TO_DEGREE))) *
+        const lon = this.x * DEGREES_IN_ONE_METER;
+        const lat = Math.atan(Math.pow(Math.E, ((this.y / METERS_IN_ONE_DEGREE) * PI_TO_DEGREE))) *
             (DOUBLE_PI_IN_DEGREE / Math.PI) - HALF_PI_IN_DEGREE;
         this.x = lon;
         this.y = lat;
@@ -412,6 +412,56 @@ export class DPoint {
         }
         return this;
     }
+    mod(x, y = x, z) {
+        let xV = 0;
+        let yV = 0;
+        let zV = undefined;
+        if (x instanceof DPoint) {
+            xV = this.x % x.x;
+            yV = this.y % x.y;
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(x.z)) {
+                zV = this.z % x.z;
+            }
+        }
+        else {
+            xV = this.x % x;
+            yV = this.y % y;
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(z)) {
+                zV = this.z % z;
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if (isDefAndNotNull(zV)) {
+            this.z = zV;
+        }
+        return this;
+    }
+    div(x, y = x, z) {
+        let xV = 0;
+        let yV = 0;
+        let zV = undefined;
+        if (x instanceof DPoint) {
+            xV = div(this.x, x.x);
+            yV = div(this.y, x.y);
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(x.z)) {
+                zV = div(this.z, x.z);
+            }
+        }
+        else {
+            xV = div(this.x, x);
+            yV = div(this.y, y);
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(z)) {
+                zV = div(this.z, z);
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if (isDefAndNotNull(zV)) {
+            this.z = zV;
+        }
+        return this;
+    }
     equal(p) {
         return this.x === p.x && this.y === p.y && this.z === p.z;
     }
@@ -523,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);
@@ -566,7 +615,7 @@ export class DPoint {
             .sort((a, b) => a.properties.distance - b.properties.distance);
     }
     calculateAltitudeByDistanceBetweenPoints(p1, p2) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (p1.alt === p2.alt) {
             this.alt = p1.alt;
         }
@@ -577,7 +626,7 @@ export class DPoint {
             const distance1 = this.distance(p1);
             const distance2 = this.distance(p2);
             const totalDistance = distance1 + distance2;
-            if (p1.alt === minAlt) {
+            if (((_e = p1.alt) !== null && _e !== void 0 ? _e : 0) === minAlt) {
                 this.alt = minAlt + distance1 / totalDistance * dAlt;
             }
             else {

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',