@eturnity/eturnity_3d 1.0.13-debug → 1.0.14-debug

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "1.0.13-debug",
+  "version": "1.0.14-debug",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -1,6 +1,8 @@
 import {
   isInsidePolygon,
   verticalProjectionOnPlane,
+  calculateArea,
+  intersectOutlines
 } from '@eturnity/eturnity_maths'
 //this function just update the "roof" and "moduleField(s)" properties of panels,moduleFields and roofs
 export function UpdateRoofModuleFieldRelations(state) {
@@ -29,12 +31,18 @@ export function UpdateRoofModuleFieldRelations(state) {
   for (let k in moduleFieldPolygons) {
     const moduleField = moduleFieldPolygons[k]
     //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
-    const roofPolygonCandidates = roofPolygons.filter((roof) =>
+    const moduleFieldArea=calculateArea(moduleField.outline)
+    //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
+    let roofPolygonCandidates = roofPolygons.filter((roof) =>
       {
-        return moduleField.outline.every(p=>{
-          console.log(p,roof.margins.innerOutline,isInsidePolygon(p, roof.margins.innerOutline))
-          return isInsidePolygon(p, roof.margins.innerOutline)
-        })
+        const intersection=intersectOutlines(
+          moduleField.outline,
+          roof.outline
+        )
+        console.log('inter:',intersection)
+        const intersectionArea=calculateArea(intersection[0])
+        console.log(intersectionArea,0.9*moduleFieldArea,intersectionArea>0.9*moduleFieldArea)
+        return intersectionArea>0.9*moduleFieldArea
       }
     )
     console.log(roofPolygonCandidates)