@eturnity/eturnity_maths 8.34.0 → 8.46.0

package/package.json

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

package/src/geometry.js

@@ -493,12 +493,16 @@ export function isInsideEdge2D(M, A, B) {
   return result
 }
 
-export function polygonsHaveSame2DOutline(outline1, outline2) {
+export function polygonsHaveSame2DOutline(outline1, outline2, tolerance = 0) {
   let sameLength = outline1.length == outline2.length
   return (
     sameLength &&
-    outline1.every((p) => outline2.find((v) => v.x == p.x && v.y == p.y)) &&
-    outline2.every((p) => outline1.find((v) => v.x == p.x && v.y == p.y))
+    outline1.every((p) =>
+      outline2.find((v) => isAlmostSamePoint2D(v, p, tolerance))
+    ) &&
+    outline2.every((p) =>
+      outline1.find((v) => isAlmostSamePoint2D(v, p, tolerance))
+    )
   )
 }
 

package/src/objects/Polygon.js

@@ -36,6 +36,7 @@ export class Polygon {
     this.isLoading = false
     this.positionOffset = { x: 0, y: 0, z: 0 }
     this.angleOffset = 0
+    this.dataSource = null
     if (this.layer == 'obstacle') {
       this.isParallel = true
     } else if (this.layer == 'roof') {
@@ -235,6 +236,7 @@ export class Polygon {
         sameMargin: this.margins.sameMargin,
         distances: JSON.parse(JSON.stringify(this.margins.distances)),
       },
+      dataSource: this.dataSource,
     }
     const extraSerialization = {}
     if (this.layer == 'roof') {
@@ -291,6 +293,7 @@ export class Polygon {
         roof_orientation_degrees: this.direction,
         roof_name: this.name,
         shading_data: this.shadingData ? this.shadingData : undefined,
+        data_source: this.dataSource ? this.dataSource : null,
       }
     } else if (this.layer == 'obstacle') {
       const margins_obstacle_mm = this.margins.isSameMargin

package/src/objects/hydrate.js

@@ -6,6 +6,7 @@ export function hydratePolygon(serializedPolygon) {
   polygon.version = serializedPolygon.version
   polygon.name = serializedPolygon.name
   polygon.margins = serializedPolygon.margins
+  polygon.dataSource = serializedPolygon.dataSource
   if (layer == 'obstacle') {
     polygon.isParallel = serializedPolygon.isParallel
     polygon.height = serializedPolygon.height

package/src/splitMergePolygons.js

@@ -111,6 +111,7 @@ export function splitPolygonsV2(polygons) {
     const outlines = getOutlineList(nodeList, edgeList, polygons)
     const newPolygons = []
     outlines.forEach(({ outline, hitPoint }) => {
+      let dataSource = null
       // check if outline has points that are intersections to determine if it is split/untouched
       const outlineIntersections = []
       let numberOfIntersectionPoints = 0
@@ -225,6 +226,8 @@ export function splitPolygonsV2(polygons) {
 
           // Preference for highest polygon average height as original polygon
           originalPolygon = originalPolygonCanditates[0]
+          // Persist polygon datasource of original polygon
+          dataSource = originalPolygon ? originalPolygon.dataSource : null
         }
 
         const normalVector = originalPolygon
@@ -247,12 +250,13 @@ export function splitPolygonsV2(polygons) {
 
       // check if there is an existing polygon with the same outline
       const polygon = polygons.find((polygon) =>
-        polygonsHaveSame2DOutline(outline, polygon.outline)
+        polygonsHaveSame2DOutline(outline, polygon.outline, mmTolerance)
       )
       if (polygon && !constructionPolygons.includes(polygon)) {
         newPolygons.push(polygon)
       } else {
         const newPolygon = new Polygon(outline, 'roof')
+        newPolygon.dataSource = dataSource
         newPolygons.push(newPolygon)
       }
     })