@eturnity/eturnity_3d 8.34.1 → 8.34.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.34.1",
+  "version": "8.34.2",
   "files": [
     "dist",
     "src"
@@ -16,7 +16,7 @@
     "merge-remote-master": "node scripts/merge-remote-master.js"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "8.19.0",
+    "@eturnity/eturnity_maths": "8.34.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",

package/src/store/hydrateData.js

@@ -3,6 +3,9 @@ import {
   Polygon,
   updateComputedGeometryPolygon,
   getObstacleMarginOutline,
+  multiplyVector,
+  addVector,
+  Vector,
 } from '@eturnity/eturnity_maths'
 import OverlayLayer from '../Overlay/OverlayLayer'
 import getLayers from '../utils/layers'
@@ -26,6 +29,25 @@ function sanitizedOutline(outline) {
     return accumulator
   }, [])
 }
+export function getModuleOutline({ module, grid }) {
+  const rowIndex = module.row_index
+  const colIndex = module.col_index
+  const gridRowVector = new Vector(grid.grid_row_vector)
+  const gridColVector = new Vector(grid.grid_column_vector)
+  const panelHeightVector = new Vector(grid.panel_height_vector)
+  const panelWidthVector = new Vector(grid.panel_width_vector)
+  const gridOrigin = new Vector(grid.grid_origin)
+  const localA = addVector(
+    multiplyVector(rowIndex, gridRowVector),
+    multiplyVector(colIndex, gridColVector)
+  )
+  const A = addVector(gridOrigin, localA)
+  const B = addVector(A, panelHeightVector)
+  const C = addVector(A, addVector(panelHeightVector, panelWidthVector))
+  const D = addVector(A, panelWidthVector)
+  return [A, B, C, D]
+}
+
 export async function hydratePolygons({
   roofsResponse = [],
   obstaclesResponse = [],
@@ -170,56 +192,47 @@ export async function hydratePolygons({
     moduleField.pvModuleId = moduleFieldResp.pv_module_id
     moduleField.mountingSystemId = moduleFieldResp.mounting_system_id
 
+    moduleField.data.moduleGrids = moduleFieldResp.module_grids
+    moduleField.needsOptimisation = false
+
     const modules = []
-    moduleFieldResp.modules.forEach((module) => {
-      modules.push({
-        ...module,
-        status: module.status || 'active',
-        clipped: module.clipped === undefined ? false : module.clipped,
-      })
-    })
-    if (moduleFieldResp.user_deactivated_modules) {
-      moduleFieldResp.user_deactivated_modules.forEach((module) => {
+    moduleFieldResp.module_grids.forEach((grid, gridIndex) => {
+      grid.modules.forEach((module) => {
         modules.push({
           ...module,
-          status: 'user_deactivated',
-          clipped: module.clipped === undefined ? false : module.clipped,
+          outline: getModuleOutline({
+            module,
+            grid,
+            offset: moduleFieldResp.offset_percent,
+          }),
+          gridIndex: gridIndex,
         })
       })
-    }
-    moduleField.data.modules = modules
-    modules
-      .filter((m) => !m.clipped)
-      .forEach((module) => {
-        const outline = module.outline.map((p) => {
-          return { x: p[0], y: p[1], z: p[2] }
-        })
-        let panel = new Polygon(outline, '')
-        panel.id = module.module_uuid
-        panel.row_index = module.row_index
-        panel.col_index = module.col_index
-        panel.status = module.status
-        panel.clipped = module.clipped
-        panel.moduleField = moduleField
-        panel.poolGroupUuid = module.project_variant_pool_group_uuid
-        if (panel.poolGroupUuid) {
-          panel.poolGroupUuidColor = `#${panel.poolGroupUuid.slice(0, 6)}`
-        }
-        panel.available = true
-        switch (module.status) {
-          case 'active':
-            panel.layer = 'panel'
-            MFpanels.push(panel)
-            panels.push(panel)
-            break
-          case 'user_deactivated':
-            panel.layer = 'user_deactivated_panel'
-            MFuserDeactivatedPanels.push(panel)
-            userDeactivatedPanels.push(panel)
-            break
-        }
-        panel = updateComputedGeometryPolygon(panel)
-      })
+    })
+
+    modules.forEach((module) => {
+      const panel = new Polygon(module.outline, '')
+      panel.id = module.module_uuid
+      panel.gridIndex = module.gridIndex
+      panel.row_index = module.row_index
+      panel.col_index = module.col_index
+      panel.is_active = module.is_active
+      panel.moduleField = moduleField
+      panel.poolGroupUuid = module.project_variant_pool_group_uuid
+      if (panel.poolGroupUuid) {
+        panel.poolGroupUuidColor = `#${panel.poolGroupUuid.slice(0, 6)}`
+      }
+      panel.available = true
+      if (module.is_active) {
+        panel.layer = 'panel'
+        MFpanels.push(panel)
+        panels.push(panel)
+      } else {
+        panel.layer = 'user_deactivated_panel'
+        MFuserDeactivatedPanels.push(panel)
+        userDeactivatedPanels.push(panel)
+      }
+    })
 
     const roof = roofs.find((r) => r.id == moduleFieldResp.roof_uuid)
     if (roof) {