@eturnity/eturnity_maths 9.13.0 → 9.19.0

package/package.json

@@ -1,15 +1,9 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "9.13.0",
+  "version": "9.19.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,
-  "scripts": {
-    "test": "jest",
-    "prepare": "husky",
-    "lint": "eslint --fix --debug --ext .js,.vue .",
-    "merge-remote-master": "node scripts/merge-master.js"
-  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/eturnitydevs/eturnity_maths.git"
@@ -43,5 +37,10 @@
     "prettier": "^2.8.4",
     "prettier-plugin-vue": "^1.1.6"
   },
-  "description": ""
-}
+  "description": "",
+  "scripts": {
+    "test": "jest",
+    "lint": "eslint --fix --debug --ext .js,.vue .",
+    "merge-remote-master": "node scripts/merge-master.js"
+  }
+}

package/src/objects/Polygon.js

@@ -404,6 +404,7 @@ export class Polygon {
     } else if (this.layer == 'roof_plan_item') {
       extraSerialization.colorIndex = this.colorIndex
       extraSerialization.hasFillColor = this.hasFillColor
+      extraSerialization.isClosed = this.isClosed
     }
     return JSON.parse(
       JSON.stringify({ ...baseSerialization, ...extraSerialization })

package/src/objects/derivedState/updateComputedGeometryPolygon.js

@@ -78,7 +78,11 @@ export function updateComputedGeometryPolygon(polygon) {
     return polygon
   }
   let newOutline = [...polygon.outline]
+  const isOpenRoofPlanItem =
+    polygon.layer === 'roof_plan_item' && polygon.isClosed === false
+
   if (
+    !isOpenRoofPlanItem &&
     newOutline.length > 0 &&
     isAlmostSamePoint2D(newOutline[0], newOutline[newOutline.length - 1], 10)
   ) {
@@ -90,6 +94,15 @@ export function updateComputedGeometryPolygon(polygon) {
   }
   newOutline = calculateValidOutlineFromPolygon(newOutline)
 
+  if (isOpenRoofPlanItem) {
+    if (newOutline.length < 2) {
+      throw new Error('outline not valid')
+    }
+    if (newOutline.length < 3) {
+      return updateComputedGeometryOpenRoofPlanItemPolygon(polygon, newOutline)
+    }
+  }
+
   if (newOutline.length < 3) {
     throw new Error('outline not valid')
   }
@@ -124,6 +137,9 @@ export function updateComputedGeometryPolygon(polygon) {
   polygon.direction = direction
   polygon.area = calculateArea(polygon.flatOutline) / 1000000
   polygon.isClockwise = isClockWise(polygon.outline)
+  if (polygon.layer === 'roof_plan_item' && polygon.isClosed === false) {
+    polygon.isClockwise = false
+  }
   polygon = updateMarginOutlinePolygon(polygon)
   if (polygon.layer == 'moduleField') {
     let trimedOutline = []
@@ -150,6 +166,27 @@ export function updateComputedGeometryPolygon(polygon) {
   }
   return polygon
 }
+
+function updateComputedGeometryOpenRoofPlanItemPolygon(polygon, newOutline) {
+  polygon.outline = newOutline
+  const normalVector = { x: 0, y: 0, z: 1 }
+  const meanPoint = meanVector(newOutline)
+  polygon.flatOutline = newOutline.map((p) => ({
+    x: p.x,
+    y: p.y,
+    z: Math.max(0, Math.min(50000, p.z)),
+  }))
+  polygon.maximumGap = 0
+  polygon.isFlat = true
+  polygon.normalVector = normalVector
+  polygon.meanPoint = meanPoint
+  polygon.incline = inclineWithNormalVector(normalVector)
+  polygon.direction = directionWithNormalVector(normalVector)
+  polygon.area = 0
+  polygon.isClockwise = false
+  return updateMarginOutlinePolygon(polygon)
+}
+
 export function calculateValidOutlineFromPolygon(outline) {
   //check if two nodes are same
   outline = [...outline]

package/src/objects/hydrate.js

@@ -49,6 +49,9 @@ export function hydratePolygon(serializedPolygon) {
     polygon.shape = 'polygon'
     polygon.colorIndex = serializedPolygon.colorIndex
     polygon.hasFillColor = serializedPolygon.hasFillColor
+    if (serializedPolygon.isClosed === false) {
+      polygon.isClosed = false
+    }
   }
   updateComputedGeometryPolygon(polygon)
   return polygon