@eturnity/eturnity_maths 6.44.1 → 6.46.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "6.44.1",
+  "version": "6.46.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,

package/src/objects/derivedState/updateComputedGeometryPolygon.js

@@ -1,7 +1,8 @@
 import {
   meanVector,
   substractVector,
-  multiplyVector
+  multiplyVector,
+  addVector
 } from '../../vector'
 import {
   verticalProjectionOnPlane,
@@ -9,7 +10,11 @@ import {
   directionWithNormalVector,
   isClockWise,
   calculateArea,
-  getConcaveOutline
+  getConcaveOutline,
+  normalizedVectorTowardInsideAngle,
+  normalizeVector,
+  isAlmostSamePoint2D,
+  getDistanceBetweenPoints
 } from '../../geometry'
 import { maximumGapLimit } from '../../config'
 import { SVD } from 'svd-js'
@@ -56,6 +61,10 @@ export function updateComputedGeometryPolygon(polygon) {
   if(!['roof','obstacle','moduleField'].includes(polygon.layer)){
     return polygon
   }
+  if(isAlmostSamePoint2D(polygon.outline[0],polygon.outline[polygon.outline.length-1],10)){
+    polygon.outline.pop()
+  }
+  polygon.outline = calculateValidOutlineFromPolygon(polygon.outline)
   const {
     projectedOutline,
     maximumGap,
@@ -88,6 +97,33 @@ export function updateComputedGeometryPolygon(polygon) {
   }
   return polygon
 }
+export function calculateValidOutlineFromPolygon(outline){
+//check if two nodes are same
+  const nodeIndexToSplit=[]
+  for(let k=0;k<outline.length-1;k++){
+    for(let i=k+1;i<outline.length;i++){
+      if(isAlmostSamePoint2D(outline[k],outline[i],100)){
+        nodeIndexToSplit.push([k,i])
+      }
+    }
+  }
+  for(let coupleToSplit of nodeIndexToSplit){
+  const A = outline[(coupleToSplit[0]-1+outline.length)%outline.length]
+  const B = outline[coupleToSplit[0]]
+  const C = outline[(coupleToSplit[0]+1)%outline.length]
+  let v = normalizedVectorTowardInsideAngle(A,B,C)
+  // let v0=normalizeVector(substractVector())
+  outline[coupleToSplit[0]] = {
+      ...addVector(multiplyVector(-50,v),B),
+      z:outline[coupleToSplit[0]].z
+    }
+  outline[coupleToSplit[1]] = {
+      ...addVector(multiplyVector(50,v),B),
+      z:outline[coupleToSplit[1]].z
+    }
+  }
+  return outline
+}
 
 export function calculateBestFittingPlanePolygon(fullOutline) {
   if (fullOutline.length < 3) {

package/src/splitMergePolygons.js

@@ -61,7 +61,6 @@ export function splitPolygons(
   roofs,
   isClosedContructionPolyline
 ) {
-  //if(isClosedContructionPolyline){
   constructionPolyline.outline.forEach((p) => {
     let supportRoof = roofs.find((roof) => isInsidePolygon(p, roof.outline))
     if (supportRoof) {
@@ -82,7 +81,6 @@ export function splitPolygons(
   //2. gather all nodes+intersection in a list[[x,y],[x,y]]
   const nodeList = getNodeList(intersections, roofEdge, constructionPolyline)
   //3. generate all edges not cut, those cut and those from construction polyline
-
   const edgeList = getEdgeList(
     nodeList,
     intersections,
@@ -393,7 +391,7 @@ function forestRecursion(cycleTree) {
       return done
     }, [])
     if (cycleTree.cycle.length) {
-      //cycles.push(cycleTree.cycle)
+      cycles.push(cycleTree.cycle)
     }
     return cycles
   } else {
@@ -416,7 +414,6 @@ export function getOutlineList(nodeList, edgeList, roofs = []) {
     let cycleArray = forestRecursion(cycleTree)
     cycles.push(...cycleArray)
   }
-
   let outlines = cycles
     .map((cycle) => {
       return cycle.map((index) => {