@eturnity/eturnity_maths 6.48.0 → 6.48.3

package/package.json

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

package/src/objects/Polygon.js

@@ -121,9 +121,9 @@ export class Polygon {
       name: this.name,
       type: this.type,
       outline: this.outline.map(p=>{return {
-        x:parseInt(p.x),
-        y:parseInt(p.y),
-        z:parseInt(p.z),
+        x: p.x,
+        y: p.y,
+        z: p.z,
       }}),
       holes: this.holes.map((p) => p.id),
       layer: this.layer,
@@ -149,21 +149,24 @@ export class Polygon {
         return { id: roof.id }
       })
     } else if (this.layer == 'moduleField') {
-      extraSerialization.data = {...this.data,modules:[]}
+      const modules=[]
+      if(this.panels){
+        this.panels.forEach((p) => {
+            modules.push({ id: p.id, index: p.index, outline: p.outline, status: p.status || "active" })
+          })
+      }
+      if(this.userDeactivatedPanels){
+        this.userDeactivatedPanels.forEach((p) => {
+            modules.push({ id: p.id, index: p.index, outline: p.outline, status: p.status || "user_deactivated" })
+          })
+      }
+      extraSerialization.data = {...this.data,modules:[...this.data.modules]}
       extraSerialization.roof = { id: this.roof.id }
       extraSerialization.pvData = this.pvData?{...this.pvData}:null
       extraSerialization.mountingData = this.mountingData?{...this.mountingData}:null
-      extraSerialization.panels = []
-      // this.panels
-      //   ? this.panels.map((p) => {
-      //       return { id: p.id, index: p.index, outline: p.outline }
-      //     })
-      //   : []
-      extraSerialization.userDeactivatedPanels = this.userDeactivatedPanels
-        ? this.userDeactivatedPanels.map((p) => {
-            return { id: p.id, index: p.index, outline: p.outline }
-          })
-        : []
+      extraSerialization.modules = modules
+      extraSerialization.needsOptimisation = this.needsOptimisation
+
     } else if (this.layer == 'panel') {
       extraSerialization.index = this.index
       extraSerialization.moduleField = { id: this.moduleField.id }
@@ -209,15 +212,24 @@ export class Polygon {
       const modules = this.panels.map((p) => {
         return {
           index: p.index,
-          outline: p.outline.map((v) => [v.x, v.y, v.z])
+          outline: p.outline.map((v) => [v.x, v.y, v.z]),
+          status: p.status || "active",
+          clipped: p.clipped === undefined ? false : p.clipped
         }
       })
       const user_deactivated_modules = this.userDeactivatedPanels.map((p) => {
         return {
           index: p.index,
-          outline: p.outline.map((v) => [v.x, v.y, v.z])
+          outline: p.outline.map((v) => [v.x, v.y, v.z]),
         }
       })
+      user_deactivated_modules.forEach(p=>{
+        modules.push({
+          ...p,
+          status: p.status || "user_deactivated",
+          clipped: p.clipped === undefined ? false : p.clipped
+        })
+      })
       return {
         module_field_uuid: this.id,
         roof_uuid: this.roof.id,
@@ -232,7 +244,6 @@ export class Polygon {
         component_id_mounting_system: this.data.component_id_mounting_system,
         modules: modules,
         module_tilt_degrees: this.data.module_tilt_degrees,
-        user_deactivated_modules: user_deactivated_modules,
         base_line_index: this.data.base_line_index,
         justify_percent: this.data.justify_percent,