@eturnity/eturnity_3d 7.30.0 → 7.32.1

package/src/helper/renderMixin.js

@@ -10,7 +10,7 @@ export default {
       lastTic: new Date().getTime() * 1e4,
       //lastTic:(new Date()).getTime()
       lastGeometryEventIdDone: -1,
-      backgroundImagesizeInMm: null
+      backgroundImagesizeInMm: null,
     }
   },
   created() {
@@ -25,7 +25,7 @@ export default {
       roofMarginMeshes: {},
       moduleFieldsMeshes: {},
       tileMeshes: {},
-      overlayMeshes: {}
+      overlayMeshes: {},
     }
   },
   mounted() {
@@ -36,14 +36,14 @@ export default {
       wallColor: (state) => state.threeDModule.wallColor,
       selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
       panelOpacity: (state) => state.threeDModule.panelOpacity,
-      pvDataMemo: (state) => state.threeDModule.pvDataMemo
+      pvDataMemo: (state) => state.threeDModule.pvDataMemo,
     }),
     ...mapGetters({
       selectedTool: 'getSelectedTool',
       roofs: 'getRoofs',
       lastGeometryEventId: 'getLastGeometryEventId',
       roofsBounds: 'getRoofsBounds',
-      geometryEvents: 'getGeometryEvents'
+      geometryEvents: 'getGeometryEvents',
     }),
     layerKey() {
       if (this.selectedMapLayer) {
@@ -87,7 +87,7 @@ export default {
     },
     geometryEventsToDoWithoutFull() {
       return this.geometryEventsToDo.filter((e) => e.name != 'full')
-    }
+    },
   },
   methods: {
     refreshRendering(e) {
@@ -121,14 +121,14 @@ export default {
           methodList.push({
             name: 'zoomIn3D',
             method: this.zoomIn3D,
-            arg: []
+            arg: [],
           })
           break
         case 'zoomOut3D':
           methodList.push({
             name: 'zoomOut3D',
             method: this.zoomOut3D,
-            arg: []
+            arg: [],
           })
           break
         case 'set3DCameraGlobalPosition':
@@ -136,36 +136,37 @@ export default {
           methodList.push({
             name: 'setCameraGlobalPosition',
             method: this.setCameraGlobalPosition,
-            arg: []
+            arg: [],
           })
           break
         case 'setCameraInitialPosition':
           methodList.push({
             name: 'setCameraInitialPosition',
             method: this.setCameraInitialPosition,
-            arg: []
+            arg: [],
           })
           break
         case 'setCameraToOverlay':
           methodList.push({
             name: 'setCameraToOverlay',
             method: this.setCameraToOverlay,
-            arg: [params.overlayId]
+            arg: [params.overlayId],
           })
           break
         case 'toolChange': //params.toolName
           methodList.push({
             name: 'renderEdges',
             method: this.renderEdges,
-            arg: []
+            arg: [],
           })
+          break
         case 'marginIsSameChange': //params.polygon
         case 'marginDifferentChange': //params.polygon,index
         case 'marginSameChange': //params.polygon
           methodList.push({
             name: 'renderRoofsMargin',
             method: this.renderRoofsMargin,
-            arg: []
+            arg: [],
           })
           break
         case 'full':
@@ -174,8 +175,9 @@ export default {
           methodList.push({
             name: 'renderOverlays',
             method: this.renderOverlays,
-            arg: []
+            arg: [],
           })
+          break
         case 'removeNodes': //params.nodes
         case 'removeEdges': //params.edges
         case 'translate': //params.edges
@@ -183,40 +185,40 @@ export default {
             methodList.push({
               name: 'removeConstructionPolyline',
               method: this.removeConstructionPolylineMesh,
-              arg: []
+              arg: [],
             })
           }
           methodList.push({
             name: 'renderGeometry',
             method: this.renderGeometry,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'showPanels',
             method: this.showPanels,
-            arg: []
+            arg: [],
           })
           break
         case 'moveBuilding':
           methodList.push({
             name: 'renderRoofs',
             method: this.renderRoofs,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderEdges',
             method: this.renderEdges,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderBase',
             method: this.renderBase,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderObstacles',
             method: this.renderObstacles,
-            arg: []
+            arg: [],
           })
           break
         case 'updateOutlineXY': //params.polygon,?index
@@ -224,49 +226,49 @@ export default {
             methodList.push({
               name: 'renderRoofs',
               method: this.renderRoofs,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderEdges',
               method: this.renderEdges,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderBase',
               method: this.renderBase,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderObstacles',
               method: this.renderObstacles,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderNodes',
               method: this.renderNodes,
-              arg: []
+              arg: [],
             })
           } else if (params.layer == 'obstacle') {
             methodList.push({
               name: 'renderBase',
               method: this.renderBase,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderRoofs',
               method: this.renderRoofs,
-              arg: []
+              arg: [],
             })
             methodList.push({
               name: 'renderObstacles',
               method: this.renderObstacles,
-              arg: []
+              arg: [],
             })
           }
           methodList.push({
             name: 'renderRoofsMargin',
             method: this.renderRoofsMargin,
-            arg: []
+            arg: [],
           })
           break
         case 'removePanels': //params.panels
@@ -280,7 +282,7 @@ export default {
           methodList.push({
             name: 'renderPanels',
             method: this.renderPanels,
-            arg: []
+            arg: [],
           })
           break
         case 'addPointToPolygon': //params.polygon,index
@@ -293,30 +295,32 @@ export default {
           methodList.push({
             name: 'renderEdges',
             method: this.renderEdges,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderBuilding',
             method: this.renderBuilding,
-            arg: []
+            arg: [],
           })
+          break
         case 'selectedRoofChange':
         case 'selectedObstacleChange':
           methodList.push({
             name: 'renderFlatRoofs',
             method: this.renderFlatRoofs,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderRoofsMargin',
             method: this.renderRoofsMargin,
-            arg: []
+            arg: [],
           })
+          break
         case 'selectedModuleFieldChange':
           methodList.push({
             name: 'renderEdges',
             method: this.renderEdges,
-            arg: []
+            arg: [],
           })
           break
         case 'subHandleSelectionChange':
@@ -325,7 +329,7 @@ export default {
           methodList.push({
             name: 'renderBuilding',
             method: this.renderBuilding,
-            arg: []
+            arg: [],
           })
           break
         case 'parallelChange': //params.obstacle
@@ -333,57 +337,57 @@ export default {
           methodList.push({
             name: 'renderObstacles',
             method: this.renderObstacles,
-            arg: []
+            arg: [],
           })
           break
         case 'roofInclineDirectionChange':
           methodList.push({
             name: 'renderRoofs',
             method: this.renderRoofs,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderEdges',
             method: this.renderEdges,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderBase',
             method: this.renderBase,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderObstacles',
             method: this.renderObstacles,
-            arg: []
+            arg: [],
           })
           break
         case 'backgroundTextureChange':
           methodList.push({
             name: 'renderTiles',
             method: this.renderTiles,
-            arg: []
+            arg: [],
           })
           break
         case 'changeMapProjection':
           methodList.push({
             name: 'renderTiles',
             method: this.debouncedRenderTiles,
-            arg: []
+            arg: [],
           })
           break
         case 'hidePanels':
           methodList.push({
             name: 'hidePanels',
             method: this.hidePanels,
-            arg: []
+            arg: [],
           })
           break
         case 'showPanels':
           methodList.push({
             name: 'showPanels',
             method: this.showPanels,
-            arg: []
+            arg: [],
           })
           break
         case 'removeImageOverlay':
@@ -392,26 +396,26 @@ export default {
           methodList.push({
             name: 'updateProjectionMaterials',
             method: this.updateProjectionMaterials,
-            arg: []
+            arg: [],
           })
           methodList.push({
             name: 'renderOverlays',
             method: this.renderOverlays,
-            arg: []
+            arg: [],
           })
           break
         case 'selectedPanelChange':
           methodList.push({
             name: 'renderModuleFields',
             method: this.renderModuleFields,
-            arg: []
+            arg: [],
           })
           break
         case 'removeConstruction':
           methodList.push({
             name: 'removeConstructionPolyline',
             method: this.removeConstructionPolyline,
-            arg: []
+            arg: [],
           })
           break
       }
@@ -420,9 +424,9 @@ export default {
     async renderMethods(methodList) {
       for (let item of methodList) {
         if (item.method) {
-          try{
-          await item.method(...item.arg)
-          }catch(err){
+          try {
+            await item.method(...item.arg)
+          } catch (err) {
             console.error(err)
           }
         }
@@ -467,24 +471,24 @@ export default {
       docEl = null
       box = null
       return { top: Math.round(top), left: Math.round(left) }
-    }
+    },
   },
   watch: {
     pvDataMemo: {
       handler() {
         this.loadNewPanelTextures()
-      }
+      },
     },
     'material.panel': {
       handler() {
         this.renderPanels()
-      }
+      },
     },
     geometryEventsToDo(val) {
       if (val.length > 0) {
         this.refreshRendering()
       }
-    }
+    },
   },
   beforeDestroy() {
     if (this.renderer) {
@@ -507,5 +511,5 @@ export default {
     this.raycaster = null
     this.loader = null
     this.provider = null
-  }
+  },
 }

package/src/helper/threeMixin.js

@@ -22,10 +22,10 @@ export default {
         texturesToLoad: 0,
         threeMap: false,
         geometry: false,
-        camera: false
+        camera: false,
       },
       screenshotable: false,
-      DOMElement: null
+      DOMElement: null,
     }
   },
   mixins: [initializeThree, renderMixin, materialMixin],
@@ -33,7 +33,7 @@ export default {
     initialiseThree({
       isInteractive = true,
       isPerspectiveCamera = true,
-      DOMElement = this.$refs.canvas3DContainer
+      DOMElement = this.$refs.canvas3DContainer,
     } = {}) {
       this.DOMElement = DOMElement
 
@@ -88,7 +88,7 @@ export default {
         this.orbitControl.mouseButtons = {
           RIGHT: THREE.MOUSE.PAN,
           LEFT: THREE.MOUSE.ROTATE,
-          MIDDLE: THREE.MOUSE.DOLLY
+          MIDDLE: THREE.MOUSE.DOLLY,
         }
       } else {
         this.orbitControl.screenSpacePanning = true
@@ -97,7 +97,7 @@ export default {
         this.orbitControl.mouseButtons = {
           LEFT: THREE.MOUSE.PAN,
           MIDDLE: THREE.MOUSE.DOLLY,
-          RIGHT: THREE.MOUSE.ROTATE
+          RIGHT: THREE.MOUSE.ROTATE,
         }
       }
       this.orbitControl.addEventListener('change', () => {
@@ -181,7 +181,9 @@ export default {
         try {
           this.renderer.clear()
           this.renderer.render(this.scene, this.camera)
-        } catch (err) {}
+        } catch (err) {
+          return err
+        }
       }
     },
     orbitControlChange() {
@@ -214,10 +216,10 @@ export default {
         this.setCameraAspectRatio()
         this.render()
       }
-    }
+    },
   },
   beforeDestroy() {
     this.DOMElement = null
     window.removeEventListener('resize', this.onWindowResize, false)
-  }
+  },
 }

package/src/main.js

@@ -17,10 +17,10 @@ const Renderer = class {
             ...threeDModule.state,
             geometryData,
             ...specificData,
-            isInteractive
-          }
-        }
-      }
+            isInteractive,
+          },
+        },
+      },
     })
     this.App = createApp(App).use(myStore)
     this.App.mount(identifier)

package/src/store/hydrateData.js

@@ -3,7 +3,7 @@ import {
   Polygon,
   updateComputedGeometryPolygon,
   getRoofMarginOutline,
-  getObstacleMarginOutline
+  getObstacleMarginOutline,
 } from '@eturnity/eturnity_maths'
 import OverlayLayer from '../Overlay/OverlayLayer'
 import getLayers from '../utils/layers'
@@ -26,7 +26,7 @@ function sanitizedOutline(outline) {
 export async function hydratePolygons({
   roofsResponse,
   obstaclesResponse,
-  moduleFieldsResponse
+  moduleFieldsResponse,
 }) {
   //removing empty roof,obstacle and modulefield generated by BE on variant creation
   roofsResponse = roofsResponse.reduce((acc, cur) => {
@@ -79,10 +79,10 @@ export async function hydratePolygons({
       ? roofResp.roof_margins_mm[0]
       : 200
     roof.moduleFields = []
-    try{
-    roof = updateComputedGeometryPolygon(roof)
-    roofs.push(roof)
-    }catch(err){
+    try {
+      roof = updateComputedGeometryPolygon(roof)
+      roofs.push(roof)
+    } catch (err) {
       console.error(err)
     }
   })
@@ -95,18 +95,18 @@ export async function hydratePolygons({
     obstacle.version = obstacleResp.version
     obstacle.height = obstacleResp.obstacle_height_above_ground_mm
     obstacle.isParallel = obstacleResp.obstacle_slope_is_parallel_to_roof
-    try{
-    obstacle = updateComputedGeometryPolygon(obstacle)
-    obstacle.margins.distances = obstacleResp.obstacle_margins_mm
-    obstacle.margins.isSameMargin = obstacleResp.obstacle_margins_mm.every(
-      (val) => val === obstacleResp.obstacle_margins_mm[0]
-    )
-    obstacle.margins.sameMargin = obstacle.margins.isSameMargin
-      ? obstacleResp.obstacle_margins_mm[0]
-      : 200
-    obstacle = getObstacleMarginOutline(obstacle)
-    obstacles.push(obstacle)
-    }catch(err){
+    try {
+      obstacle = updateComputedGeometryPolygon(obstacle)
+      obstacle.margins.distances = obstacleResp.obstacle_margins_mm
+      obstacle.margins.isSameMargin = obstacleResp.obstacle_margins_mm.every(
+        (val) => val === obstacleResp.obstacle_margins_mm[0]
+      )
+      obstacle.margins.sameMargin = obstacle.margins.isSameMargin
+        ? obstacleResp.obstacle_margins_mm[0]
+        : 200
+      obstacle = getObstacleMarginOutline(obstacle)
+      obstacles.push(obstacle)
+    } catch (err) {
       console.error(err)
     }
   })
@@ -165,7 +165,7 @@ export async function hydratePolygons({
       modules.push({
         ...module,
         status: module.status || 'active',
-        clipped: module.clipped === undefined ? false : module.clipped
+        clipped: module.clipped === undefined ? false : module.clipped,
       })
     })
     if (moduleFieldResp.user_deactivated_modules) {
@@ -173,7 +173,7 @@ export async function hydratePolygons({
         modules.push({
           ...module,
           status: 'user_deactivated',
-          clipped: module.clipped === undefined ? false : module.clipped
+          clipped: module.clipped === undefined ? false : module.clipped,
         })
       })
     }
@@ -211,10 +211,10 @@ export async function hydratePolygons({
     moduleField.roof = roof
     moduleField.panels = MFpanels
     moduleField.userDeactivatedPanels = MFuserDeactivatedPanels
-    try{
-    moduleField = updateComputedGeometryPolygon(moduleField)
-    moduleFields.push(moduleField)
-    }catch(err){
+    try {
+      moduleField = updateComputedGeometryPolygon(moduleField)
+      moduleFields.push(moduleField)
+    } catch (err) {
       console.error(err)
     }
   })
@@ -227,10 +227,10 @@ export async function hydratePolygons({
       ...obstacles,
       ...moduleFields,
       ...panels,
-      ...userDeactivatedPanels
+      ...userDeactivatedPanels,
     ],
     pv_module_ids,
-    mounting_system_ids
+    mounting_system_ids,
   }
 }
 
@@ -250,12 +250,12 @@ export async function hydrateData({ state, commit }, data) {
     if (layoutSettingResponse) {
       origin = {
         lat: layoutSettingResponse.layout_latitude,
-        lng: layoutSettingResponse.layout_longitude
+        lng: layoutSettingResponse.layout_longitude,
       }
     }
     OverlayLayer.addOrUpdateSerializedItems(overlaysResponse, origin)
   }
-  if (!!layoutSettingResponse) {
+  if (layoutSettingResponse) {
     const layoutSetting = layoutSettingResponse
     commit('mutate_layoutSettings', layoutSetting)
     commit('mutate_wallColor', layoutSetting.wall_color)
@@ -264,7 +264,7 @@ export async function hydrateData({ state, commit }, data) {
     const newMapConfig = state.mapConfig
     newMapConfig.center = {
       lat: layoutSetting.layout_latitude,
-      lng: layoutSetting.layout_longitude
+      lng: layoutSetting.layout_longitude,
     }
     newMapConfig.layer = selectedLayer
     newMapConfig.zoom = layoutSetting.map_zoom
@@ -274,7 +274,7 @@ export async function hydrateData({ state, commit }, data) {
   const hydratationResult = await hydratePolygons({
     roofsResponse,
     obstaclesResponse,
-    moduleFieldsResponse
+    moduleFieldsResponse,
   })
 
   state.polygons = hydratationResult.polygons