@eturnity/eturnity_3d 6.48.0 → 6.48.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.48.0",
+  "version": "6.48.2",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,8 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "6.48.0",
-    "axios": "^1.3.2",
+    "@eturnity/eturnity_maths": "6.48.0-EPDM-9282.3",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",

package/src/functions.js

@@ -1,2 +1,3 @@
 export * from './helper/UpdateRoofModuleFieldRelations'
 export * from './helper/UpdateRoofObstacleRelations'
+export * from './store/hydrateData'

package/src/main.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import App from './App.vue'
-// import axios from 'axios'
 import threeDModule from './store/three-d-module'
 
 Vue.use(Vuex)

package/src/store/hydrateData.js

@@ -7,18 +7,13 @@ import {
 } from '@eturnity/eturnity_maths'
 import getLayers from '../utils/layers'
 import { UpdateRoofObstacleRelations } from '../helper/UpdateRoofObstacleRelations'
-
-export async function hydrateData({ state, commit }, data) {
-  let roofsResponse = data.roofs
-  let obstaclesResponse = data.obstacles
-  let moduleFieldsResponse = data.moduleFields
-  const layoutSettingResponse = data.layoutSettings
-  const imageOverlayResponse = data.imageOverlay
-  const mapType = data.mapType
-  let layers = getLayers()
-  let selectedLayer = layers.find((layer) => layer.key == mapType)
-  commit('mutate_selectedMapLayer', selectedLayer)
-
+export async function hydratePolygons({
+  roofsResponse,
+  obstaclesResponse,
+  moduleFieldsResponse,
+  projectId,
+  projectVariantId
+}) {
   //removing empty roof,obstacle and modulefield generated by BE on variant creation
   roofsResponse = roofsResponse.reduce((acc, cur) => {
     if (cur.roof_outline.length > 0) {
@@ -39,31 +34,6 @@ export async function hydrateData({ state, commit }, data) {
     return acc
   }, [])
 
-  if (imageOverlayResponse && imageOverlayResponse.image_overlay_url) {
-    let imageOverlay = {
-      url: imageOverlayResponse.image_overlay_url,
-      uuid: imageOverlayResponse.image_overlay_uuid,
-      corners: imageOverlayResponse.image_overlay_settings.corners
-    }
-    commit('mutate_imageOverlay', imageOverlay)
-  }
-
-  if (!!layoutSettingResponse) {
-    const layoutSetting = layoutSettingResponse
-    commit('mutate_layoutSettings', layoutSetting)
-    commit('mutate_wallColor', layoutSetting.wall_color)
-
-    //end of layoutSetting correction
-    const newMapConfig = state.mapConfig
-    newMapConfig.center = {
-      lat: layoutSetting.layout_latitude,
-      lng: layoutSetting.layout_longitude
-    }
-    newMapConfig.layer = selectedLayer
-    newMapConfig.zoom = layoutSetting.map_zoom
-    commit('mutate_mapConfig', newMapConfig)
-  }
-
   const roofs = []
   const obstacles = []
   const moduleFields = []
@@ -78,7 +48,6 @@ export async function hydrateData({ state, commit }, data) {
     let roof = new Polygon(roof_outline, 'roof')
     roof.id = roofResp.roof_uuid
     roof.name = roofResp.roof_name
-    roof = updateComputedGeometryPolygon(roof)
     roof.margins.distances = roofResp.roof_margins_mm
     roof.margins.isSameMargin = roofResp.roof_margins_mm.every(
       (val) => val == roofResp.roof_margins_mm[0]
@@ -87,7 +56,7 @@ export async function hydrateData({ state, commit }, data) {
       ? roofResp.roof_margins_mm[0]
       : 200
     roof.moduleFields = []
-    roof = getRoofMarginOutline(roof)
+    roof = updateComputedGeometryPolygon(roof)
     roofs.push(roof)
   })
   obstaclesResponse.forEach((obstacleResp) => {
@@ -110,23 +79,28 @@ export async function hydrateData({ state, commit }, data) {
     obstacles.push(obstacle)
   })
   moduleFieldsResponse.forEach((moduleFieldResp) => {
-    const module_field_outline = moduleFieldResp.module_field_outline.map(
-      (p) => {
+    const MFpanels = []
+    const MFuserDeactivatedPanels = []
+    const module_field_outline = moduleFieldResp.module_field_outline
+      .filter((p) => !!p)
+      .map((p) => {
         return { x: p[0], y: p[1], z: p[2] }
-      }
-    )
+      })
 
     let moduleField = new Polygon(module_field_outline, 'moduleField')
     moduleField.id = moduleFieldResp.module_field_uuid
-    // add moduleField pvData
+    moduleField.version = moduleFieldResp.version
+
     moduleField.pvData = {}
     moduleField.pvData.module_texture_version_id =
       moduleFieldResp.module_texture_version_id
     moduleField.data = {}
-    moduleField.data.texture_img_url = moduleFieldResp.texture_img_url
     moduleField.data.col_spacing_mm = moduleFieldResp.col_spacing_mm
     moduleField.data.row_spacing_mm = moduleFieldResp.row_spacing_mm
-    moduleField.data.offset = moduleFieldResp.offset
+    moduleField.data.row_spacing_hill_mm = moduleFieldResp.row_spacing_hill_mm
+    moduleField.data.row_spacing_valley_mm =
+      moduleFieldResp.row_spacing_valley_mm
+    moduleField.data.offset_percent = moduleFieldResp.offset_percent
     moduleField.data.panel_orientation = moduleFieldResp.panel_orientation
     moduleField.data.panel_direction_degrees =
       moduleFieldResp.panel_direction_degrees
@@ -136,8 +110,7 @@ export async function hydrateData({ state, commit }, data) {
       moduleFieldResp.component_id_mounting_system
     moduleField.data.module_tilt_degrees = moduleFieldResp.module_tilt_degrees
     moduleField.data.base_line_index = moduleFieldResp.base_line_index
-    pv_module_ids.push(moduleFieldResp.component_id_pv_module)
-    mounting_system_ids.push(moduleFieldResp.component_id_mounting_system)
+    moduleField.data.justify_percent = moduleFieldResp.justify_percent
 
     moduleField.data.number_of_panels_override =
       moduleFieldResp.number_of_panels_override
@@ -148,52 +121,125 @@ export async function hydrateData({ state, commit }, data) {
     moduleField.data.yearly_yield_kwh_kwp_2 =
       moduleFieldResp.yearly_yield_kwh_kwp_2
 
-    moduleField.data.modules = moduleFieldResp.modules
-    moduleFieldResp.modules.forEach((m) => {
-      const panel = new Polygon(
-        m.outline.map((p) => {
-          return { x: p[0], y: p[1], z: p[2] }
-        }),
-        'panel'
-      )
-      panel.index = m.index
-      panel.moduleField = moduleField
-      panels.push(panel)
+    pv_module_ids.push(moduleFieldResp.component_id_pv_module)
+    mounting_system_ids.push(moduleFieldResp.component_id_mounting_system)
+
+    moduleField.pvModuleId = moduleFieldResp.pv_module_id
+    moduleField.mountingSystemId = moduleFieldResp.mounting_system_id
+
+    const modules = []
+    moduleFieldResp.modules.forEach((module) => {
+      modules.push({
+        ...module,
+        status: module.status || 'active',
+        clipped: module.clipped === undefined ? false : module.clipped
+      })
     })
-    moduleField.data.user_deactivated_modules =
-      moduleFieldResp.user_deactivated_modules
-    moduleFieldResp.user_deactivated_modules.forEach((m) => {
-      const panel = new Polygon(
-        m.outline.map((p) => {
+    if (moduleFieldResp.user_deactivated_modules) {
+      moduleFieldResp.user_deactivated_modules.forEach((module) => {
+        modules.push({
+          ...module,
+          status: 'user_deactivated',
+          clipped: module.clipped === undefined ? false : module.clipped
+        })
+      })
+    }
+    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] }
-        }),
-        'user_deactivated_panel'
-      )
-      panel.moduleField = moduleField
-      panel.index = m.index
-      userDeactivatedPanels.push(panel)
-    })
+        })
+        const panel = new Polygon(outline, '')
+        panel.index = module.index
+        panel.status = module.status
+        panel.clipped = module.clipped
+        panel.moduleField = moduleField
+        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
+        }
+      })
+
     const roof = roofs.find((r) => r.id == moduleFieldResp.roof_uuid)
     if (!roof.moduleFields) {
       roof.moduleFields = []
     }
     roof.moduleFields.push(moduleField)
     moduleField.roof = roof
-    moduleField.panels = panels
-    moduleField.userDeactivatedPanels = userDeactivatedPanels
+    moduleField.panels = MFpanels
+    moduleField.userDeactivatedPanels = MFuserDeactivatedPanels
     moduleField = updateComputedGeometryPolygon(moduleField)
     moduleFields.push(moduleField)
   })
-  //Get PV & Mounting system component Data (texture):
+  //Get PV & Mounting system component Data:
   pv_module_ids = [...new Set(pv_module_ids)]
   mounting_system_ids = [...new Set(mounting_system_ids)]
 
-  state.polygons = [
-    ...roofs,
-    ...obstacles,
-    ...moduleFields,
-    ...panels,
-    ...userDeactivatedPanels
-  ]
+  return {
+    polygons: [
+      ...roofs,
+      ...obstacles,
+      ...moduleFields,
+      ...panels,
+      ...userDeactivatedPanels
+    ],
+    pv_module_ids,
+    mounting_system_ids
+  }
+}
+
+export async function hydrateData({ state, commit }, data) {
+  let roofsResponse = data.roofs
+  let obstaclesResponse = data.obstacles
+  let moduleFieldsResponse = data.moduleFields
+  const layoutSettingResponse = data.layoutSettings
+  const imageOverlayResponse = data.imageOverlay
+  const mapType = data.mapType
+  let layers = getLayers()
+  let selectedLayer = layers.find((layer) => layer.key == mapType)
+  commit('mutate_selectedMapLayer', selectedLayer)
+
+  if (imageOverlayResponse && imageOverlayResponse.image_overlay_url) {
+    let imageOverlay = {
+      url: imageOverlayResponse.image_overlay_url,
+      uuid: imageOverlayResponse.image_overlay_uuid,
+      corners: imageOverlayResponse.image_overlay_settings.corners
+    }
+    commit('mutate_imageOverlay', imageOverlay)
+  }
+  if (!!layoutSettingResponse) {
+    const layoutSetting = layoutSettingResponse
+    commit('mutate_layoutSettings', layoutSetting)
+    commit('mutate_wallColor', layoutSetting.wall_color)
+
+    //end of layoutSetting correction
+    const newMapConfig = state.mapConfig
+    newMapConfig.center = {
+      lat: layoutSetting.layout_latitude,
+      lng: layoutSetting.layout_longitude
+    }
+    newMapConfig.layer = selectedLayer
+    newMapConfig.zoom = layoutSetting.map_zoom
+    commit('mutate_mapConfig', newMapConfig)
+  }
+
+  const hydratationResult = await hydratePolygons({
+    roofsResponse,
+    obstaclesResponse,
+    moduleFieldsResponse
+  })
+
+  state.polygons = hydratationResult.polygons
+
   state = UpdateRoofObstacleRelations(state)
 }