dgeoutils 2.4.34 → 2.4.37

package/dist/cjs/DLine.d.ts

@@ -1,5 +1,6 @@
 import { DPoint } from './DPoint';
 import { DCircle } from './DCircle';
+import { DPolygon } from './DPolygon';
 export declare class DLine {
     a: number;
     b: number;
@@ -34,4 +35,5 @@ export declare class DLine {
     movePoint(points: DPoint[], distances: number[]): DPoint[];
     findFi({ a, b }: DLine, delta?: number): number;
     vectorProduct({ a, b, c }: DLine): DLine;
+    bresenhamsLine(): DPolygon;
 }

package/dist/cjs/DLine.js

@@ -4,6 +4,7 @@ exports.DLine = void 0;
 var DPoint_1 = require("./DPoint");
 var utils_1 = require("./utils");
 var DNumbers_1 = require("./DNumbers");
+var DPolygon_1 = require("./DPolygon");
 var DLine = (function () {
     function DLine(a, b, c, begin, end) {
         if (begin === void 0) { begin = DPoint_1.DPoint.zero(); }
@@ -305,6 +306,38 @@ var DLine = (function () {
         var _b = this, q = _b.a, w = _b.b, e = _b.c;
         return new DLine(w * c - e * b, e * a - q * c, q * b - w * a);
     };
+    DLine.prototype.bresenhamsLine = function () {
+        var _a = this.begin, x0 = _a.x, y0 = _a.y;
+        var _b = this.end, x1 = _b.x, y1 = _b.y;
+        var dx = Math.abs(x1 - x0);
+        var sx = x0 < x1 ? 1 : -1;
+        var dy = -Math.abs(y1 - y0);
+        var sy = y0 < y1 ? 1 : -1;
+        var error = dx + dy;
+        var res = new DPolygon_1.DPolygon();
+        while (true) {
+            res.push(new DPoint_1.DPoint(x0, y0));
+            if (x0 === x1 && y0 === y1) {
+                break;
+            }
+            var e2 = 2 * error;
+            if (e2 >= dy) {
+                if (x0 === x1) {
+                    break;
+                }
+                error += dy;
+                x0 += sx;
+            }
+            if (e2 <= dx) {
+                if (y0 === y1) {
+                    break;
+                }
+                error += dx;
+                y0 += sy;
+            }
+        }
+        return res;
+    };
     return DLine;
 }());
 exports.DLine = DLine;

package/dist/cjs/DPolygon.js

@@ -1004,13 +1004,16 @@ var DPolygon = (function () {
                     }, []);
                 case 'Feature': {
                     var t = DPolygon.parse(a.geometry, format);
+                    var props_1 = __assign(__assign({}, a.properties), (a.id ? ({
+                        id: a.id
+                    }) : ({})));
                     if (Array.isArray(t)) {
                         t.forEach(function (record) {
-                            record.properties = __assign(__assign({}, a.properties), { id: a.id });
+                            record.properties = __assign({}, props_1);
                         });
                     }
                     else {
-                        t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                        t.properties = __assign({}, props_1);
                     }
                     return t;
                 }

package/dist/es2015/DLine.js

@@ -1,6 +1,7 @@
 import { DPoint } from './DPoint';
 import { checkFunction } from './utils';
 import { DNumbers } from './DNumbers';
+import { DPolygon } from './DPolygon';
 export class DLine {
     constructor(a, b, c, begin = DPoint.zero(), end = DPoint.zero()) {
         this.a = a;
@@ -254,4 +255,36 @@ export class DLine {
         const { a: q, b: w, c: e } = this;
         return new DLine(w * c - e * b, e * a - q * c, q * b - w * a);
     }
+    bresenhamsLine() {
+        let { x: x0, y: y0 } = this.begin;
+        const { x: x1, y: y1 } = this.end;
+        const dx = Math.abs(x1 - x0);
+        const sx = x0 < x1 ? 1 : -1;
+        const dy = -Math.abs(y1 - y0);
+        const sy = y0 < y1 ? 1 : -1;
+        let error = dx + dy;
+        const res = new DPolygon();
+        while (true) {
+            res.push(new DPoint(x0, y0));
+            if (x0 === x1 && y0 === y1) {
+                break;
+            }
+            const e2 = 2 * error;
+            if (e2 >= dy) {
+                if (x0 === x1) {
+                    break;
+                }
+                error += dy;
+                x0 += sx;
+            }
+            if (e2 <= dx) {
+                if (y0 === y1) {
+                    break;
+                }
+                error += dx;
+                y0 += sy;
+            }
+        }
+        return res;
+    }
 }

package/dist/es2015/DPolygon.js

@@ -646,13 +646,16 @@ export class DPolygon {
                     }, []);
                 case 'Feature': {
                     const t = DPolygon.parse(a.geometry, format);
+                    const props = Object.assign(Object.assign({}, a.properties), (a.id ? ({
+                        id: a.id
+                    }) : ({})));
                     if (Array.isArray(t)) {
                         t.forEach((record) => {
-                            record.properties = Object.assign(Object.assign({}, a.properties), { id: a.id });
+                            record.properties = Object.assign({}, props);
                         });
                     }
                     else {
-                        t.properties = Object.assign(Object.assign({}, a.properties), { id: a.id });
+                        t.properties = Object.assign({}, props);
                     }
                     return t;
                 }

package/dist/esm/DLine.js

@@ -1,6 +1,7 @@
 import { DPoint } from './DPoint';
 import { checkFunction } from './utils';
 import { DNumbers } from './DNumbers';
+import { DPolygon } from './DPolygon';
 var DLine = (function () {
     function DLine(a, b, c, begin, end) {
         if (begin === void 0) { begin = DPoint.zero(); }
@@ -302,6 +303,38 @@ var DLine = (function () {
         var _b = this, q = _b.a, w = _b.b, e = _b.c;
         return new DLine(w * c - e * b, e * a - q * c, q * b - w * a);
     };
+    DLine.prototype.bresenhamsLine = function () {
+        var _a = this.begin, x0 = _a.x, y0 = _a.y;
+        var _b = this.end, x1 = _b.x, y1 = _b.y;
+        var dx = Math.abs(x1 - x0);
+        var sx = x0 < x1 ? 1 : -1;
+        var dy = -Math.abs(y1 - y0);
+        var sy = y0 < y1 ? 1 : -1;
+        var error = dx + dy;
+        var res = new DPolygon();
+        while (true) {
+            res.push(new DPoint(x0, y0));
+            if (x0 === x1 && y0 === y1) {
+                break;
+            }
+            var e2 = 2 * error;
+            if (e2 >= dy) {
+                if (x0 === x1) {
+                    break;
+                }
+                error += dy;
+                x0 += sx;
+            }
+            if (e2 <= dx) {
+                if (y0 === y1) {
+                    break;
+                }
+                error += dx;
+                y0 += sy;
+            }
+        }
+        return res;
+    };
     return DLine;
 }());
 export { DLine };

package/dist/esm/DPolygon.js

@@ -1001,13 +1001,16 @@ var DPolygon = (function () {
                     }, []);
                 case 'Feature': {
                     var t = DPolygon.parse(a.geometry, format);
+                    var props_1 = __assign(__assign({}, a.properties), (a.id ? ({
+                        id: a.id
+                    }) : ({})));
                     if (Array.isArray(t)) {
                         t.forEach(function (record) {
-                            record.properties = __assign(__assign({}, a.properties), { id: a.id });
+                            record.properties = __assign({}, props_1);
                         });
                     }
                     else {
-                        t.properties = __assign(__assign({}, a.properties), { id: a.id });
+                        t.properties = __assign({}, props_1);
                     }
                     return t;
                 }