@eturnity/eturnity_maths 7.16.0-qa-dev03.2 → 7.16.0-qa-dev03.4

package/package.json

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

package/src/splitMergePolygons.js

@@ -13,13 +13,15 @@ import {
   isPointBetweenSegment,
   isInsidePolygon,
   verticalProjectionOnPlane,
-  polygonsHaveSame2DOutline
+  polygonsHaveSame2DOutline,
+  calculateArea
 } from './geometry'
 import { groupBy } from 'lodash'
 import { Polygon } from './objects/Polygon'
 import { defaultBaseHeight, mmTolerance } from './config'
+import { intersectOutlines } from './intersectionPolygon'
 
-export function mergePolygons(polygonIdsToMerge, edges, layer) {
+export function mergePolygons(polygonIdsToMerge, edges, layer, polygons) {
   const outsideEdge = edges.filter((e) => e.belongsTo.length == 1)
   const insideEdge = edges.filter((e) => e.belongsTo.length == 2)
   const insideEdgeToKeep = insideEdge.filter((e) => {
@@ -50,7 +52,15 @@ export function mergePolygons(polygonIdsToMerge, edges, layer) {
 
   const polygonList = []
   for (let k = 0; k < outlineList.length; k++) {
-    polygonList.push(new Polygon(outlineList[k], layer))
+    //check if roof with same outline already exist: 
+      let polygon = polygons.find((polygon) =>
+        polygonsHaveSame2DOutline(outlineList[k], polygon.outline)
+      )
+      let newPolygon=new Polygon(outlineList[k], layer)
+      if (polygon) {
+        newPolygon.id=polygon.id
+      }
+    polygonList.push(newPolygon)
   }
   return polygonList
 }
@@ -457,7 +467,22 @@ export function getOutlineList(nodeList, edgeList, roofs = []) {
     )
     if (roof) {
       outline = JSON.parse(JSON.stringify(roof.outline))
-    }
+    } else {
+			let underneathRoofsIntersectionsData = roofs.map(roof=>{
+				const intersections = intersectOutlines(roof.outline,outline)
+				let area=0
+				if(intersections.length){
+					area=calculateArea(intersections[0])
+				}
+				return {roof,intersectionLength:intersections.length,intersections,area}
+			})
+			underneathRoofsIntersectionsData = underneathRoofsIntersectionsData.filter(d=>d.intersectionLength > 0)
+			if(underneathRoofsIntersectionsData.length>0){
+				underneathRoofsIntersectionsData.sort((a,b)=> a.roof.area-b.roof.area)
+				let roofUnderneath=underneathRoofsIntersectionsData[0].roof
+        outline = outline.map(p=>verticalProjectionOnPlane(p,roofUnderneath.normalVector,roofUnderneath.flatOutline[0]))
+			}
+		}
     return outline
   })
   return outlines