@eturnity/eturnity_3d 1.0.43 → 1.0.45

package/index.html

@@ -10,7 +10,6 @@
     <div id="app3"></div>
     
     <script>
-        console.log(ThreeDLayoutView)
         const base_url='http://localhost:8080'
         const geometry={roofs:[],obstacles:[],moduleFields:[],layoutSettings:{}}
         const specificData={uuid:"d5774a28-d71c-4b1d-81bd-5bb4b57d82b6",view_mode:"top",base_url}

package/package.json

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

package/src/components/ThreeCanvasViewer.vue

@@ -73,7 +73,6 @@ export default {
     this.$root.$on('on-roofSelected',(polygon)=>this.setCameraOrthogonalTo(polygon))
     this.updateProjectionMaterial()
     
-    console.log('uuid to focus on:', this.uuid)
     const polygon = this.polygons.find((p) => p.id == this.uuid)
     this.setCamera(polygon, this.view_mode)
     this.isReady.geometry = true
@@ -108,7 +107,6 @@ export default {
     }),
     setCamera(polygon, view_mode) {
       let margin=0.2
-      console.log('viewmode', view_mode)
       if (!polygon || view_mode == 'global') {
         let roofsBounds = this.roofsBounds
         //let distance = 5 + objectRadius / Math.sin(((this.orthographicCamera.fov / 2) * Math.PI) / 180)
@@ -142,7 +140,6 @@ export default {
           const geometry = mesh.geometry
 
           if (geometry.boundingSphere === null) geometry.computeBoundingSphere()
-          console.log('geometry.boundingSphere', geometry.boundingSphere)
           target = [
             geometry.boundingSphere.center.x,
             geometry.boundingSphere.center.y,
@@ -158,7 +155,6 @@ export default {
         const targetVector = polygonRef.meanPoint
         //const target=[targetVector.x/1000,targetVector.y/1000,targetVector.z/1000]
         let cameraMoveVector = { x: 0, y: 0, z: 0 }
-        console.log('normalVector:', polygonRef.normalVector)
         if (view_mode == 'ortho') {
           cameraMoveVector = multiplyVector(
             distance * 1000,
@@ -174,7 +170,6 @@ export default {
           const target = [0, 0, 0]
 
           let {xMin,xMax,yMin,yMax}=this.orthographicBounds(polygonBounds,margin)
-          console.log('top POS TARGET', position, target)
           this.orthographicCamera.position.set(...position)
           this.orthographicCamera.lookAt(...target)
 
@@ -261,7 +256,6 @@ export default {
           // dispatch the custom event
           document.dispatchEvent(event)
           this.screenshotable = true
-          console.log('screenshotable')
         }
       },
       deep: true

package/src/helper/MapView.js

@@ -88,16 +88,13 @@ export class MapView extends Mesh
 	 */
 	setRoot(root)
 	{
-        console.log('root',root)
 
 		if (typeof root === 'number') 
 		{
 			const rootConstructor = MapPlaneNode//MapView.mapModes.get(root);
-            console.log('rootConstructor',rootConstructor)
 			// @ts-ignore
 			root = new rootConstructor(null, this);
 		}
-        console.log(root)
 
 		// Remove old root
 		if (!!this.root ) 
@@ -130,7 +127,6 @@ export class MapView extends Mesh
 	 */
 	preSubdivide() 
 	{
-        console.log('preSbdivide')
 		const minZoom = this.provider.minZoom
 		const maxZoom = this.provider.maxZoom
 		function subdivide(node, depth) 
@@ -154,7 +150,6 @@ export class MapView extends Mesh
 		}
 
 		
-        console.log("minmax zoom",minZoom,maxZoom)
 		if (minZoom > 0) 
 		{  
 			subdivide(this.root, minZoom);

package/src/helper/materials.js

@@ -17,7 +17,7 @@ material.edge=new THREE.MeshPhongMaterial({ color: beamColor,transparent:true,op
 material.node=new THREE.PointsMaterial( { size: 0.05, sizeAttenuation: true,color: node3DColor, opacity:node3dOpacity, transparent: true } );
     const loader = new THREE.TextureLoader()
     // texture.minFilter = THREE.LinearFilter
-    material.panel={}
+material.panel={}
     
     for(let k=0;k<defaultTextureUrls.length;k++){
         let texture=loader.load(defaultTextureUrls[k], function (texture) {})

package/src/helper/renderMixin.js

@@ -825,7 +825,6 @@ export default {
             topMesh.geometry=updateBufferPanelGeometry(panelPolygon,topMesh.geometry)
             sideMesh.geometry=updateBufferPanelSideGeometry(panelPolygon,sideMesh.geometry)
           }
-          let pvId = panelPolygon.moduleField.pvData.id
           topMesh.material= material
           
         }

package/src/store/hydrateData.js

@@ -11,15 +11,10 @@ import {
 } from '../helper/UpdateRoofObstacleRelations'
 
 export async function hydrateData({ state, commit }, data) {
-  console.log(data)
   let roofsResponse = data.roofs
   let obstaclesResponse = data.obstacles
   let moduleFieldsResponse = data.moduleFields
   const layoutSettingResponse = data.layoutSettings
-  console.log("roofsResponse",roofsResponse)
-  console.log("obstaclesResponse",obstaclesResponse)
-  console.log("moduleFieldsResponse",moduleFieldsResponse)
-  console.log("layoutSettingResponse",layoutSettingResponse)
   //removing empty roof,obstacle and modulefield generated by BE on variant creation
   roofsResponse=roofsResponse.reduce((acc,cur)=>{
     if(cur.roof_outline.length>0){acc.push(cur)}
@@ -36,9 +31,9 @@ export async function hydrateData({ state, commit }, data) {
 
   if (!!layoutSettingResponse) {
     const layoutSetting = layoutSettingResponse
-    
+    const module_texture_version_id=layoutSetting.module_texture_version_id || 0
     commit('mutate_layoutSettings', layoutSetting)
-    commit('mutate_module_texture_version_id', layoutSetting.module_texture_version_id || 0)
+    commit('mutate_module_texture_version_id', module_texture_version_id)
     let layers=getLayers()
     let selectedLayer=layers.find(layer=>layer.key==layoutSetting.background_map_settings.layerKey)
     commit('mutate_selectedMapLayer', selectedLayer)
@@ -164,38 +159,7 @@ export async function hydrateData({ state, commit }, data) {
   //Get PV & Mounting system component Data (texture):
   pv_module_ids = [...new Set(pv_module_ids)]
   mounting_system_ids = [...new Set(mounting_system_ids)]
-  const promiseList = []
-  // for (let k in pv_module_ids) {
-  //   promiseList.push(
-  //     axios.get('/component_library/products/pv_modules/' + pv_module_ids[k])
-  //   )
-  // }
-  // for (let k in mounting_system_ids) {
-  //   promiseList.push(
-  //     axios.get(
-  //       '/component_library/products/mounting_systems/' + mounting_system_ids[k]
-  //     )
-  //   )
-  // }
-  // const results = await Promise.all(promiseList)
-  // for (let k in pv_module_ids) {
-  //   const pv_module_id = pv_module_ids[k]
-  //   const pvData = results[k].data
-  //   moduleFields.forEach((m) => {
-  //     if (m.data.component_id_pv_module == pv_module_id) {
-  //       m.pvData = pvData
-  //     }
-  //   })
-  // }
-  // for (let k in mounting_system_ids) {
-  //   const mounting_system_id = mounting_system_ids[k]
-  //   const mountingData = results[parseInt(k) + pv_module_ids.length].data
-  //   moduleFields.forEach((m) => {
-  //     if (m.data.component_id_mounting_system == mounting_system_id) {
-  //       m.mountingData = mountingData
-  //     }
-  //   })
-  // }
+  
   state.polygons = [
     ...roofs,
     ...obstacles,