dgeoutils 2.4.23 → 2.4.25

package/dist/cjs/DPolygon.d.ts

@@ -7,6 +7,7 @@ import { LineString, Polygon, Geometry as GeoJsonGeometry, Feature, FeatureColle
 interface DeepArray<T> extends Array<T | DeepArray<T>> {
 }
 export declare const MIN_POINTS_IN_VALID_POLYGON = 3;
+declare type SetterFunction<T> = (t: DPolygon) => T;
 export declare class DPolygon {
     private pPoints;
     properties: Record<string, any>;
@@ -116,6 +117,7 @@ export declare class DPolygon {
     get closed(): boolean;
     buffer(v: number, quadrantSegments?: number, type?: number): DPolygon;
     sideBuffers(v: number, quadrantSegments?: number): [DPolygon, DPolygon];
+    setProperties(v: SetterFunction<Record<string, any>> | Record<string, any>): DPolygon;
     bezier(step?: number): DPolygon;
     setGrowingHeight(from: number, to: number): DPolygon;
     loopPointsGenerator(): () => Generator<[DPoint, DPoint, undefined, number]>;

package/dist/cjs/DPolygon.js

@@ -775,7 +775,7 @@ var DPolygon = (function () {
     DPolygon.prototype.clone = function () {
         var res = new DPolygon(this.points.map(function (r) { return r.clone(); }));
         res.holes = this.holes.map(function (h) { return h.clone(); });
-        res.properties = this.properties;
+        res.properties = __assign({}, this.properties);
         return res;
     };
     DPolygon.prototype.equal = function (p) {
@@ -1409,6 +1409,10 @@ var DPolygon = (function () {
         buffer.unshift(buffer.pop());
         return [linePart.reverse(), buffer];
     };
+    DPolygon.prototype.setProperties = function (v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    };
     DPolygon.prototype.bezier = function (step) {
         if (step === void 0) { step = 0.1; }
         var res = new DPolygon();

package/dist/cjs/TraceMatrix.d.ts

@@ -6,10 +6,10 @@ export declare enum TraceMatrixValues {
 }
 export declare type SimpleMatrix = TraceMatrixValues[][];
 export declare class TraceMatrix {
-    private readonly size;
     private readonly m;
     approximation: boolean;
-    constructor(size: DPoint, f: (p: DPoint) => TraceMatrixValues);
+    private readonly size;
+    constructor(s: DPoint, f: (p: DPoint) => TraceMatrixValues);
     fullMatrixTrace(): DPolygon[];
     private reverseMatrix;
     private findGroupByIndex;

package/dist/cjs/TraceMatrix.js

@@ -61,9 +61,8 @@ var setByPosition = function (m, p, value) {
     return m[p.y][p.x];
 };
 var TraceMatrix = (function () {
-    function TraceMatrix(size, f) {
+    function TraceMatrix(s, f) {
         var _this = this;
-        this.size = size;
         this.approximation = true;
         this.findGroupByIndex = function (m, s) {
             var res = new DPolygon_1.DPolygon();
@@ -199,7 +198,30 @@ var TraceMatrix = (function () {
             var t = _this.reverseMatrix(tmpMatrix);
             return _this.totalCountInMatrix(t) ? t : null;
         };
-        this.m = TraceMatrix.createMatrix(this.size, f);
+        this.size = s.clone().scale(4);
+        var t = TraceMatrix.createMatrix(this.size, function (p) {
+            var _a = p.clone().mod(4), x = _a.x, y = _a.y;
+            if ([1, 2].includes(x) && [1, 2].includes(y)) {
+                return f(p.clone().div(4));
+            }
+            return TraceMatrixValues.f;
+        });
+        this.m = TraceMatrix.createMatrix(this.size);
+        for (var i = 1; i < this.size.x - 1; i++) {
+            for (var j = 1; j < this.size.y - 1; j++) {
+                if (t[i][j] === TraceMatrixValues.t) {
+                    this.m[i - 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i - 1][j] = TraceMatrixValues.t;
+                    this.m[i - 1][j + 1] = TraceMatrixValues.t;
+                    this.m[i][j - 1] = TraceMatrixValues.t;
+                    this.m[i][j] = TraceMatrixValues.t;
+                    this.m[i][j + 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j] = TraceMatrixValues.t;
+                    this.m[i + 1][j + 1] = TraceMatrixValues.t;
+                }
+            }
+        }
     }
     TraceMatrix.prototype.fullMatrixTrace = function () {
         var _this = this;
@@ -214,7 +236,10 @@ var TraceMatrix = (function () {
             if (holesGroups[index] && holesGroups[index].length) {
                 res.holes = holesPaths[index];
             }
-            return res;
+            return res.loop()
+                .divide(4)
+                .round()
+                .run();
         });
     };
     TraceMatrix.prototype.reverseMatrix = function (m) {

package/dist/es2015/DPolygon.js

@@ -458,7 +458,7 @@ export class DPolygon {
     clone() {
         const res = new DPolygon(this.points.map((r) => r.clone()));
         res.holes = this.holes.map((h) => h.clone());
-        res.properties = this.properties;
+        res.properties = Object.assign({}, this.properties);
         return res;
     }
     equal(p) {
@@ -958,6 +958,10 @@ export class DPolygon {
         buffer.unshift(buffer.pop());
         return [linePart.reverse(), buffer];
     }
+    setProperties(v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    }
     bezier(step = 0.1) {
         const res = new DPolygon();
         for (let i = 0; i < 1; i += step) {

package/dist/es2015/TraceMatrix.js

@@ -21,8 +21,7 @@ const setByPosition = (m, p, value) => {
     return m[p.y][p.x];
 };
 export class TraceMatrix {
-    constructor(size, f) {
-        this.size = size;
+    constructor(s, f) {
         this.approximation = true;
         this.findGroupByIndex = (m, s) => {
             const res = new DPolygon();
@@ -147,7 +146,30 @@ export class TraceMatrix {
             const t = this.reverseMatrix(tmpMatrix);
             return this.totalCountInMatrix(t) ? t : null;
         };
-        this.m = TraceMatrix.createMatrix(this.size, f);
+        this.size = s.clone().scale(4);
+        const t = TraceMatrix.createMatrix(this.size, (p) => {
+            const { x, y } = p.clone().mod(4);
+            if ([1, 2].includes(x) && [1, 2].includes(y)) {
+                return f(p.clone().div(4));
+            }
+            return TraceMatrixValues.f;
+        });
+        this.m = TraceMatrix.createMatrix(this.size);
+        for (let i = 1; i < this.size.x - 1; i++) {
+            for (let j = 1; j < this.size.y - 1; j++) {
+                if (t[i][j] === TraceMatrixValues.t) {
+                    this.m[i - 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i - 1][j] = TraceMatrixValues.t;
+                    this.m[i - 1][j + 1] = TraceMatrixValues.t;
+                    this.m[i][j - 1] = TraceMatrixValues.t;
+                    this.m[i][j] = TraceMatrixValues.t;
+                    this.m[i][j + 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j] = TraceMatrixValues.t;
+                    this.m[i + 1][j + 1] = TraceMatrixValues.t;
+                }
+            }
+        }
     }
     fullMatrixTrace() {
         const groups = this.findAllGroupsInMatrix(this.m);
@@ -161,7 +183,10 @@ export class TraceMatrix {
             if (holesGroups[index] && holesGroups[index].length) {
                 res.holes = holesPaths[index];
             }
-            return res;
+            return res.loop()
+                .divide(4)
+                .round()
+                .run();
         });
     }
     reverseMatrix(m) {

package/dist/esm/DPolygon.js

@@ -772,7 +772,7 @@ var DPolygon = (function () {
     DPolygon.prototype.clone = function () {
         var res = new DPolygon(this.points.map(function (r) { return r.clone(); }));
         res.holes = this.holes.map(function (h) { return h.clone(); });
-        res.properties = this.properties;
+        res.properties = __assign({}, this.properties);
         return res;
     };
     DPolygon.prototype.equal = function (p) {
@@ -1406,6 +1406,10 @@ var DPolygon = (function () {
         buffer.unshift(buffer.pop());
         return [linePart.reverse(), buffer];
     };
+    DPolygon.prototype.setProperties = function (v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    };
     DPolygon.prototype.bezier = function (step) {
         if (step === void 0) { step = 0.1; }
         var res = new DPolygon();

package/dist/esm/TraceMatrix.js

@@ -58,9 +58,8 @@ var setByPosition = function (m, p, value) {
     return m[p.y][p.x];
 };
 var TraceMatrix = (function () {
-    function TraceMatrix(size, f) {
+    function TraceMatrix(s, f) {
         var _this = this;
-        this.size = size;
         this.approximation = true;
         this.findGroupByIndex = function (m, s) {
             var res = new DPolygon();
@@ -196,7 +195,30 @@ var TraceMatrix = (function () {
             var t = _this.reverseMatrix(tmpMatrix);
             return _this.totalCountInMatrix(t) ? t : null;
         };
-        this.m = TraceMatrix.createMatrix(this.size, f);
+        this.size = s.clone().scale(4);
+        var t = TraceMatrix.createMatrix(this.size, function (p) {
+            var _a = p.clone().mod(4), x = _a.x, y = _a.y;
+            if ([1, 2].includes(x) && [1, 2].includes(y)) {
+                return f(p.clone().div(4));
+            }
+            return TraceMatrixValues.f;
+        });
+        this.m = TraceMatrix.createMatrix(this.size);
+        for (var i = 1; i < this.size.x - 1; i++) {
+            for (var j = 1; j < this.size.y - 1; j++) {
+                if (t[i][j] === TraceMatrixValues.t) {
+                    this.m[i - 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i - 1][j] = TraceMatrixValues.t;
+                    this.m[i - 1][j + 1] = TraceMatrixValues.t;
+                    this.m[i][j - 1] = TraceMatrixValues.t;
+                    this.m[i][j] = TraceMatrixValues.t;
+                    this.m[i][j + 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j - 1] = TraceMatrixValues.t;
+                    this.m[i + 1][j] = TraceMatrixValues.t;
+                    this.m[i + 1][j + 1] = TraceMatrixValues.t;
+                }
+            }
+        }
     }
     TraceMatrix.prototype.fullMatrixTrace = function () {
         var _this = this;
@@ -211,7 +233,10 @@ var TraceMatrix = (function () {
             if (holesGroups[index] && holesGroups[index].length) {
                 res.holes = holesPaths[index];
             }
-            return res;
+            return res.loop()
+                .divide(4)
+                .round()
+                .run();
         });
     };
     TraceMatrix.prototype.reverseMatrix = function (m) {