@eturnity/eturnity_3d 6.44.1 → 6.46.0

package/dist/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.44.1",
+  "version": "6.46.0",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",

package/src/components/ThreeCanvasViewer.vue

@@ -69,6 +69,7 @@ export default {
   },
   mixins: [renderMixin, threeMixin, materialMixin],
   async mounted() {
+    console.info('6.43.0-EPDM-8438.4')
     await this.hydrateData(this.geometryData)
     this.renderer.domElement.style.width = '100%'
     this.renderer.domElement.style.height = '100%'
@@ -145,7 +146,6 @@ export default {
       hydrateData: 'hydrateData'
     }),
     ...mapMutations({
-      setModuleTextureVersionId: 'mutate_moduleTextureVersionId',
       setSelectedMapLayer: 'mutate_selectedMapLayer'
     }),
     hideMesh(mesh) {

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -30,15 +30,14 @@ export function UpdateRoofModuleFieldRelations(state) {
 
   for (let k in moduleFieldPolygons) {
     const moduleField = moduleFieldPolygons[k]
-    const moduleFieldArea = calculateArea(moduleField.outline)
     //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
     let roofPolygonCandidates = roofPolygons.filter((roof) => {
       const intersection = intersectOutlines(moduleField.outline, roof.outline)
       if (intersection.length == 0) return false
       const intersectionArea = calculateArea(intersection[0])
-      return intersectionArea > 0.9 * moduleFieldArea
+      return intersectionArea > 100
     })
-    //roofs on roof can lead to multiple roof under a point. moduleField is in the smallest
+    //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
     let smallestRoof = null
     for (let roof of roofPolygonCandidates) {
       if (!smallestRoof || smallestRoof.area > roof.area) {
@@ -58,7 +57,6 @@ export function UpdateRoofModuleFieldRelations(state) {
         p.roof = roofPolygon
       }
     })
-    //}
   }
 
   let newPolygons = state.polygons.map((p) => {

package/src/helper/render/panel.js

@@ -61,16 +61,16 @@ export default {
         if (panelPolygon.moduleField.data.number_of_panels_override) {
           return
         }
-        let materialId = 'default_' + this.moduleTextureVersionId
+        const moduleTextureId = panelPolygon.moduleField.pvData.hasOwnProperty(
+          'module_texture_version_id'
+        )
+          ? panelPolygon.moduleField.pvData.module_texture_version_id
+          : 0
+        let materialId = 'default_' + moduleTextureId
         let material = this.material.panel[materialId]
         material.transparent = true
         material.opacity = this.panelOpacity
-        if (panelPolygon.moduleField.pvData) {
-          if (this.material.panel[panelPolygon.moduleField.pvData.id]) {
-            materialId = panelPolygon.moduleField.pvData.id
-            material = this.material.panel[materialId]
-          }
-        } else if (panelPolygon.moduleField.data) {
+        if (panelPolygon.moduleField.data) {
           if (
             this.material.panel[
               panelPolygon.moduleField.data.component_id_pv_module
@@ -79,6 +79,11 @@ export default {
             materialId = panelPolygon.moduleField.data.component_id_pv_module
             material = this.material.panel[materialId]
           }
+        } else if (panelPolygon.moduleField.pvData) {
+          if (this.material.panel[panelPolygon.moduleField.pvData.id]) {
+            materialId = panelPolygon.moduleField.pvData.id
+            material = this.material.panel[materialId]
+          }
         }
         if (
           !this.meshes.panelsMeshes[panelPolygon.id + '_top'] ||

package/src/helper/renderMixin.js

@@ -28,8 +28,6 @@ export default {
   created() {},
   computed: {
     ...mapState({
-      moduleTextureVersionId: (state) =>
-        state.threeDModule.moduleTextureVersionId,
       wallColor: (state) => state.threeDModule.wallColor,
       selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
       panelOpacity: (state) => state.threeDModule.panelOpacity,

package/src/store/hydrateData.js

@@ -50,9 +50,7 @@ export async function hydrateData({ state, commit }, data) {
 
   if (!!layoutSettingResponse) {
     const layoutSetting = layoutSettingResponse
-    const moduleTextureVersionId = layoutSetting.module_texture_version_id || 0
     commit('mutate_layoutSettings', layoutSetting)
-    commit('mutate_moduleTextureVersionId', moduleTextureVersionId)
     commit('mutate_wallColor', layoutSetting.wall_color)
 
     //end of layoutSetting correction
@@ -120,6 +118,10 @@ export async function hydrateData({ state, commit }, data) {
 
     let moduleField = new Polygon(module_field_outline, 'moduleField')
     moduleField.id = moduleFieldResp.module_field_uuid
+    // add moduleField pvData
+    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

package/src/store/three-d-module.js

@@ -28,7 +28,6 @@ const init_state = {
   //useless state for viewer
   pvDataMemo: [],
   mountingDataMemo: [],
-  moduleTextureVersionId: 0,
   wallColor: '#454545',
   panelOpacity: 1,
   selectedMapLayer: null,
@@ -149,9 +148,6 @@ const mutations = {
   mutate_buildingLocation(state, value) {
     state.buildingLocation = value
   },
-  mutate_moduleTextureVersionId(state, value) {
-    state.moduleTextureVersionId = value
-  },
   mutate_wallColor(state, value) {
     state.wallColor = value
   },