@eturnity/eturnity_3d 7.16.0 → 7.18.0-qa-elisee.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.16.0",
+  "version": "7.18.0-qa-elisee.1",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.10.0",
+    "@eturnity/eturnity_maths": "7.18.0-qa-elisee.1",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",
@@ -41,9 +41,9 @@
     "eslint-plugin-prettier": "3.4.1",
     "eslint-plugin-vue": "5.2.3",
     "html-webpack-plugin": "^3.2.0",
+    "prettier": "2.8.4",
     "webpack": "^4.46.0",
-    "webpack-cli": "^4.10.0",
-    "prettier": "2.8.4"
+    "webpack-cli": "^4.10.0"
   },
   "eslintConfig": {
     "root": true,

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -13,42 +13,80 @@ export function UpdateRoofModuleFieldRelations(state) {
   const panelPolygons = state.polygons.filter((poly) =>
     ['panel', 'user_deactivated_panel'].includes(poly.layer)
   )
+  panelPolygons.forEach((panel) => {
+    panel.roof = null
+  })
   //let's remove all moduleFields from roofs
+
   roofPolygons.forEach((roofPolygon) => {
-    //breaking circular reference for memory management
-    for (let k in roofPolygon.moduleFields) {
-      roofPolygon.moduleFields[k] = null
+    if (!roofPolygon.moduleFields) {
+      roofPolygon.moduleFields = []
     }
-    roofPolygon.moduleFields = []
+    roofPolygon.moduleFields.filter((mf) => {
+      moduleFieldPolygons.some((p) => p.id == mf.id)
+    })
   })
   moduleFieldPolygons.forEach((moduleFieldPolygon) => {
-    moduleFieldPolygon.roof = null
-  })
-  panelPolygons.forEach((panelPolygon) => {
-    panelPolygon.roof = null
+    if (
+      moduleFieldPolygon.roof &&
+      !roofPolygons.some((r) => r.id == moduleFieldPolygon.roof.id)
+    ) {
+      moduleFieldPolygon.roof = null
+    }
   })
 
   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)
-    let roofPolygonCandidates = roofPolygons.filter((roof) => {
-      const intersection = intersectOutlines(moduleField.outline, roof.outline)
-      if (intersection.length == 0) return false
-      const intersectionArea = calculateArea(intersection[0])
-      return intersectionArea > 100 && moduleField.area <= roof.area + 0.1
-    })
-    //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
-    let smallestRoof = null
-    for (let roof of roofPolygonCandidates) {
-      if (!smallestRoof || smallestRoof.area > roof.area) {
-        smallestRoof = roof
-      }
-    }
-    let roofPolygon = smallestRoof
+    let roofPolygon = moduleField.roof
     if (!roofPolygon) {
-      continue
+      //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.map((roof) => {
+        const intersection = intersectOutlines(
+          moduleField.outline,
+          roof.outline
+        )
+        if (intersection.length == 0) {
+          return {
+            roof,
+            intersectionArea: 0,
+            intersectionRatio: 0,
+            areaRatio: 0,
+            roofBiggerThanModuleField: 1
+          }
+        }
+        const intersectionArea_m2 = calculateArea(intersection[0]) / 1e6
+        return {
+          roof,
+          intersectionArea: intersectionArea_m2,
+          intersectionRatio: (intersectionArea_m2 / roof.area).toFixed(3),
+          areaRatio: (moduleField.area / roof.area).toFixed(3),
+          roofBiggerThanModuleField: roof.area >= moduleField.area ? 1 : -1
+        }
+      })
+      //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
+
+      roofPolygonCandidates
+        .sort((a, b) => b.roof.area - a.roof.area)
+        .sort((a, b) => a.intersectionArea - b.intersectionArea)
+        .sort(
+          (a, b) => a.roofBiggerThanModuleField - b.roofBiggerThanModuleField
+        )
+      let polygonCandidate = roofPolygonCandidates.pop()
+      if (!polygonCandidate) {
+        continue
+      }
+      roofPolygon = polygonCandidate.roof
+      if (!roofPolygon) {
+        continue
+      }
+
+      roofPolygon.moduleFields.push(moduleField)
     }
-    roofPolygon.moduleFields.push(moduleField)
+    roofPolygon = roofPolygons.find((r) => r.id == roofPolygon.id)
+    roofPolygon.moduleFields = [
+      ...roofPolygon.moduleFields.filter((mf) => mf.id != moduleField.id),
+      moduleField
+    ]
     moduleField.roof = roofPolygon
     moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
     panelPolygons.forEach((p) => {
@@ -72,7 +110,9 @@ export function UpdateRoofModuleFieldRelations(state) {
       return panelPolygons.find((panel) => panel.id == p.id)
   })
   state = { ...state, polygons: newPolygons }
+
   state = removeModuleFieldAndPanelsOnNoOrMultipleRoofs(state)
+
   return state
 }
 

package/jsconfig.json

@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "exclude": ["node_modules", "dist"]
-}