dgeoutils 2.2.8 → 2.2.9

package/dist/DPolygon.d.ts

@@ -81,7 +81,7 @@ export declare class DPolygon {
     simpleInclude(p: DPoint): boolean;
     drawPolygonOnCanvas(canvas: HTMLCanvasElement | OffscreenCanvas, fillColor?: string, strokeColor?: string, shadowColor?: string, lineWidth?: number, steps?: number): void;
     clearPolygonOnCanvas(canvas: HTMLCanvasElement | OffscreenCanvas): void;
-    contain(p: DPoint, isBorderInside?: boolean, move?: DPoint): boolean;
+    contain(p: DPoint, isBorderInside?: boolean): boolean;
     onBorder(p: DPoint): boolean;
     nextStart(): DPolygon;
     removeDuplicates(): DPolygon;
@@ -105,7 +105,6 @@ export declare class DPolygon {
     private simpleIncludeY;
     private douglasPeucker;
     private goByPath;
-    private contain2;
     private getJSTSGeometry;
     private simpleLogicFunction;
 }

package/dist/DPolygon.js

@@ -492,7 +492,7 @@ class DPolygon {
         ctx.fill();
         ctx.globalCompositeOperation = old;
     }
-    contain(p, isBorderInside = false, move = DPoint_1.DPoint.zero()) {
+    contain(p, isBorderInside = false) {
         const simpleInclude = this.simpleInclude(p);
         if (!simpleInclude) {
             return false;
@@ -501,21 +501,34 @@ class DPolygon {
         if (onBorder) {
             return isBorderInside;
         }
-        const line = p.findLine(this.leftTop.move(move));
         const poly = this.deintersection;
-        const intersectionPoints = [];
+        let totalFi = 0;
         for (let i = 0; i < poly.length - 1; i++) {
-            const polygonLine = poly.at(i).findLine(poly.at(i + 1));
-            const intersection = line.intersection(polygonLine, CLOSE_TO_INTERSECTION_DISTANCE);
-            if (intersection) {
-                intersectionPoints.push(intersection);
+            const p1 = poly.at(i);
+            const p2 = poly.at(i + 1);
+            const line1 = new DLine_1.DLine(p1.x - p.x, p1.y - p.y, 0);
+            const line2 = new DLine_1.DLine(p2.x - p.x, p2.y - p.y, 0);
+            const fiDif = line1.findFi(line2);
+            if (line1.vectorProduct(line2).c > 0) {
+                totalFi += fiDif;
             }
+            else {
+                totalFi -= fiDif;
+            }
+        }
+        const eps = Math.PI / 10000;
+        let result = false;
+        const absTotalFi = Math.abs(totalFi);
+        if (absTotalFi < eps) {
+            result = false;
+        }
+        else if (Math.abs(2 * Math.PI - absTotalFi) < eps) {
+            result = true;
         }
-        const hasCorners = intersectionPoints.some((z) => poly.has(z));
-        if (hasCorners) {
-            return this.contain2(p, isBorderInside);
+        else {
+            throw new Error('contains2 faild');
         }
-        return intersectionPoints.length % 2 === 1;
+        return result;
     }
     onBorder(p) {
         const simpleInclude = this.simpleInclude(p);
@@ -830,44 +843,6 @@ class DPolygon {
             ctx.lineTo(x, y);
         }
     }
-    contain2(p, isBorderInside = false) {
-        const simpleInclude = this.simpleInclude(p);
-        if (!simpleInclude) {
-            return false;
-        }
-        const onBorder = this.onBorder(p);
-        if (onBorder) {
-            return isBorderInside;
-        }
-        const poly = this.deintersection;
-        let totalFi = 0;
-        for (let i = 0; i < poly.length - 1; i++) {
-            const p1 = poly.at(i);
-            const p2 = poly.at(i + 1);
-            const line1 = new DLine_1.DLine(p1.x - p.x, p1.y - p.y, 0);
-            const line2 = new DLine_1.DLine(p2.x - p.x, p2.y - p.y, 0);
-            const fiDif = line1.findFi(line2);
-            if (line1.vectorProduct(line2).c > 0) {
-                totalFi += fiDif;
-            }
-            else {
-                totalFi -= fiDif;
-            }
-        }
-        const eps = Math.PI / 10000;
-        let result = false;
-        const absTotalFi = Math.abs(totalFi);
-        if (absTotalFi < eps) {
-            result = false;
-        }
-        else if (Math.abs(2 * Math.PI - absTotalFi) < eps) {
-            result = true;
-        }
-        else {
-            throw new Error('contains2 faild');
-        }
-        return result;
-    }
     getJSTSGeometry(p, unionThis, unionThat) {
         const unionOrIntersection = unionThat === unionThis;
         const reader = new jsts_1.io.WKTReader();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",