@eturnity/eturnity_maths 7.2.2-qa-7.2.3 → 7.2.2

package/package.json

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

package/src/config.js

@@ -5,7 +5,7 @@ export const snapToPointTolerance = 15
 export const snapToIntersectionPointTolerance = 15
 export const snapToLineTolerance = 10
 export const distanceToCloseNode = 70
-export const mmTolerance=1
+export const mmTolerance=50
 export const earthRadius=6371008
 
 export const layerColors = {

package/src/objects/Polygon.js

@@ -166,7 +166,6 @@ export class Polygon {
       extraSerialization.mountingData = this.mountingData?{...this.mountingData}:null
       extraSerialization.modules = modules
       extraSerialization.needsOptimisation = this.needsOptimisation
-      extraSerialization.priority = this.priority
 
     } else if (this.layer == 'panel') {
       extraSerialization.index = this.index
@@ -211,7 +210,27 @@ export class Polygon {
       if (!this.userDeactivatedPanels) {
         this.userDeactivatedPanels = []
       }
-      const modules = this.data.modules
+      const modules = this.panels.map((p) => {
+        return {
+          index: p.index,
+          outline: p.outline.map((v) => [v.x, v.y, v.z]),
+          status: p.status || "active",
+          clipped: p.clipped === undefined ? false : p.clipped
+        }
+      })
+      const user_deactivated_modules = this.userDeactivatedPanels.map((p) => {
+        return {
+          index: p.index,
+          outline: p.outline.map((v) => [v.x, v.y, v.z]),
+        }
+      })
+      user_deactivated_modules.forEach(p=>{
+        modules.push({
+          ...p,
+          status: p.status || "user_deactivated",
+          clipped: p.clipped === undefined ? false : p.clipped
+        })
+      })
       return {
         module_field_uuid: this.id,
         roof_uuid: this.roof.id,

package/src/objects/derivedState/updateComputedGeometryPolygon.js

@@ -16,10 +16,9 @@ import {
   isAlmostSamePoint2D,
   getDistanceBetweenPoints
 } from '../../geometry'
-import { maximumGapLimit, mmTolerance } from '../../config'
+import { maximumGapLimit } from '../../config'
 import { SVD } from 'svd-js'
 import {updateMarginOutlinePolygon} from './AddMargin'
-import { isSelfIntersecting } from '../../intersectionPolygon'
 
 //This function calculate derived field from polygon outline and margin outline
 export function updateComputedGeometryState(state) {
@@ -101,41 +100,28 @@ export function updateComputedGeometryPolygon(polygon) {
 export function calculateValidOutlineFromPolygon(outline){
 //check if two nodes are same
   const nodeIndexToSplit=[]
-  const nodesToRemove=[]
   for(let k=0;k<outline.length-1;k++){
     for(let i=k+1;i<outline.length;i++){
-      if(isAlmostSamePoint2D(outline[k],outline[i],2*mmTolerance)){
-        if(i==k+1){
-          nodesToRemove.push(i)
-        }else{
-          nodeIndexToSplit.push([k,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]
-  const D = outline[(coupleToSplit[1]-1+outline.length)%outline.length]
-  const E = outline[coupleToSplit[1]]
-  const F = outline[(coupleToSplit[1]+1)%outline.length]
-  let u = normalizedVectorTowardInsideAngle(A,B,C)
-  let v = normalizedVectorTowardInsideAngle(D,E,F)
-  
+  let v = normalizedVectorTowardInsideAngle(A,B,C)
+  // let v0=normalizeVector(substractVector())
   outline[coupleToSplit[0]] = {
-      ...addVector(multiplyVector(-mmTolerance,u),B),
+      ...addVector(multiplyVector(-50,v),B),
       z:outline[coupleToSplit[0]].z
     }
   outline[coupleToSplit[1]] = {
-      ...addVector(multiplyVector(mmTolerance,v),E),
+      ...addVector(multiplyVector(50,v),B),
       z:outline[coupleToSplit[1]].z
     }
   }
-  for(let index=nodesToRemove.length-1;index>=0;index--){
-    outline.splice(nodesToRemove[index],1)
-  }
   return outline
 }
 

package/src/objects/hydrate.js

@@ -3,7 +3,6 @@ export function hydratePolygon(serializedPolygon){
     const layer=serializedPolygon.layer
     let polygon=new Polygon(serializedPolygon.outline,layer)
     polygon.id=serializedPolygon.id
-    polygon.version=serializedPolygon.version
     polygon.name=serializedPolygon.name
     polygon.margins=serializedPolygon.margins
     if(layer=="obstacle"){