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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_maths",
3
- "version": "7.16.0-qa-dev03.3",
3
+ "version": "7.16.0-qa-dev03.4",
4
4
  "author": "Eturnity Team",
5
5
  "main": "src/index.js",
6
6
  "private": false,
@@ -21,7 +21,7 @@ import { Polygon } from './objects/Polygon'
21
21
  import { defaultBaseHeight, mmTolerance } from './config'
22
22
  import { intersectOutlines } from './intersectionPolygon'
23
23
 
24
- export function mergePolygons(polygonIdsToMerge, edges, layer) {
24
+ export function mergePolygons(polygonIdsToMerge, edges, layer, polygons) {
25
25
  const outsideEdge = edges.filter((e) => e.belongsTo.length == 1)
26
26
  const insideEdge = edges.filter((e) => e.belongsTo.length == 2)
27
27
  const insideEdgeToKeep = insideEdge.filter((e) => {
@@ -52,7 +52,15 @@ export function mergePolygons(polygonIdsToMerge, edges, layer) {
52
52
 
53
53
  const polygonList = []
54
54
  for (let k = 0; k < outlineList.length; k++) {
55
- polygonList.push(new Polygon(outlineList[k], layer))
55
+ //check if roof with same outline already exist:
56
+ let polygon = polygons.find((polygon) =>
57
+ polygonsHaveSame2DOutline(outlineList[k], polygon.outline)
58
+ )
59
+ let newPolygon=new Polygon(outlineList[k], layer)
60
+ if (polygon) {
61
+ newPolygon.id=polygon.id
62
+ }
63
+ polygonList.push(newPolygon)
56
64
  }
57
65
  return polygonList
58
66
  }