@eturnity/eturnity_3d 7.30.0 → 7.32.1

package/src/config.js

@@ -12,52 +12,52 @@ export const layerColors = {
   construction: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blueElectric,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   obstacleConstruction: {
     fillColor: 'transparent',
     strokeColor: theme.colors.red,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   roof: {
     fillColor: 'rgba(255, 255, 255, 0.1)',
     strokeColor: 'white',
-    strokeWidth: 0
+    strokeWidth: 0,
   },
   hoveredRoof: {
     fillColor: '#0068DE30',
     strokeColor: 'white',
-    strokeWidth: 0
+    strokeWidth: 0,
   },
   hoveredObstacle: {
     fillColor: theme.colors.transparentRed20,
     strokeColor: theme.colors.red,
-    strokeWidth: 0
+    strokeWidth: 0,
   },
   roofInside: {
     fillColor: 'rgba(255, 255, 255, 0.1)',
     strokeColor: 'white',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   obstacle: {
     fillColor: theme.colors.transparentRed10,
     strokeColor: theme.colors.red,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   panel: {
     fillColor: 'rgba(115, 115, 229, 0.1)',
     strokeColor: '#ffffff',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   user_deactivated_panel: {
     fillColor: 'rgba(115, 115, 229, 0.1)',
     strokeColor: 'white',
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   selectedPanel: {
     fillColor: '#0068DE80',
     strokeColor: theme.colors.blue,
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   snap: { fillColor: 'transparent', strokeColor: 'white' },
   snapTargetObstacle: { fillColor: theme.colors.red },
@@ -65,149 +65,149 @@ export const layerColors = {
   moduleField: {
     fillColor: 'rgba(255, 255, 255, 0.2)',
     strokeColor: 'transparent',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   hoveredModuleFieldEdge: {
     strokeColor: theme.colors.blue,
-    strokeWidth: 6
+    strokeWidth: 6,
   },
   moduleFieldBaseLineEdge: {
     strokeColor: theme.colors.purple2,
-    strokeWidth: 6
+    strokeWidth: 6,
   },
   node: {
     strokeColor: 'white',
     fillColor: 'rgba(255, 255, 255, 0.1)',
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   obstacleNode: {
     strokeColor: theme.colors.red,
     fillColor: 'rgba(255, 255, 255, 0.1)',
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   hoveredEdge: { strokeColor: theme.colors.blueElectric, strokeWidth: 3 },
   hoveredNode: {
     strokeColor: theme.colors.blueElectric,
     strokeWidth: 6,
-    fillColor: '#48a2d080'
+    fillColor: '#48a2d080',
   },
   hoveredObstacleNode: {
     strokeColor: theme.colors.red,
     strokeWidth: 2,
-    fillColor: theme.colors.transparentRed50
+    fillColor: theme.colors.transparentRed50,
   },
   hoveredMasterHandle: {
     strokeColor: theme.colors.blueElectric,
     strokeWidth: 3,
-    fillColor: 'black'
+    fillColor: 'black',
   },
   subHandleLink: { strokeColor: '#ffffffa0', strokeWidth: 2 },
   selectedEdge: { strokeColor: theme.colors.blue, strokeWidth: 3 },
   selectedEdgeObstacle: {
     strokeColor: theme.colors.darkRed,
-    strokeWidth: 4
+    strokeWidth: 4,
   },
   hoveredEdgeObstacle: {
     strokeColor: theme.colors.pureRed,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   selectedNode: {
     strokeColor: theme.colors.blue,
     strokeWidth: 2,
-    fillColor: theme.colors.blue
+    fillColor: theme.colors.blue,
   },
   selectedObstacleNode: {
     strokeColor: theme.colors.darkRed,
     strokeWidth: 2,
-    fillColor: theme.colors.pureRed
+    fillColor: theme.colors.pureRed,
   },
   hoveredModuleField: {
     fillColor: '#0068DE30',
     strokeColor: theme.colors.blueElectric,
-    strokeWidth: 5
+    strokeWidth: 5,
   },
   tmpModuleField: {
     fillColor: 'rgba(115, 115, 229, 0.2)',
     strokeColor: theme.colors.blue,
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   selectedModuleField: {
     fillColor: '#0068DEA0',
     strokeColor: theme.colors.blue,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   selectableModuleField: {
     fillColor: 'rgba(255, 255, 255, 0.2)',
     strokeColor: 'transparent',
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   overrideNumberOfPanelsModuleField: {
     fillColor: '#fc8b0080',
     strokeColor: 'transparent',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   highlight: {
     fillColor: 'rgba(255, 255, 255, 0.2)',
     strokeColor: 'white',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   selectedRoof: {
     fillColor: '#0068DE80',
     strokeColor: 'white',
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   selectedObstacle: {
     fillColor: theme.colors.transparentRed50,
     strokeColor: theme.colors.red,
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   selectedAndHighlighted: {
     fillColor: '#0068DEA0',
     strokeColor: theme.colors.blue,
-    strokeWidth: 2
+    strokeWidth: 2,
   },
   flatWarning: {
     fillColor: '#ffff0090',
     strokeColor: 'yellow',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   flatSelectedWarning: {
     fillColor: '#a0a00090',
     strokeColor: 'yellow',
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   customLength: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blueElectric,
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   snapDirectionIncline: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blue,
-    strokeWidth: 1
+    strokeWidth: 1,
   },
   inclineDirectionArrow: {
     fillColor: 'transparent',
     strokeColor: theme.colors.orange,
-    strokeWidth: 4
+    strokeWidth: 4,
   },
   inclineLabel: {
     fillColor: theme.colors.transparentBlack1,
-    textColor: 'white'
+    textColor: 'white',
   },
   directionLabel: {
     fillColor: theme.colors.transparentBlack1,
-    textColor: 'white'
+    textColor: 'white',
   },
   imageOverlayHandle: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blueElectric,
-    strokeWidth: 3
+    strokeWidth: 3,
   },
   angleLabelColor: {
     strokeColor: theme.colors.orange,
-    fillColor: theme.colors.orange
-  }
+    fillColor: theme.colors.orange,
+  },
 }
 
 export const snapInclineTolerance = 5
@@ -227,7 +227,7 @@ export const colorArrayBase = [
   '#C84E4E',
   '#90A650',
   '#D27CCA',
-  '#6276DF'
+  '#6276DF',
 ]
 export const colorArray = colorArrayBase.map((c) => c + 'c0')
 export const layerTools = {
@@ -235,7 +235,7 @@ export const layerTools = {
   roof: ['drawRoof', 'selectRoof'],
   obstacle: ['drawObstacle'],
   margin: ['selectMargin'],
-  panel: ['selectModuleField']
+  panel: ['selectModuleField'],
 }
 //3D visualisation:
 export const beamRadius = 0.05
@@ -251,33 +251,33 @@ const textureImageDomain = 'https://public-data.eturnity.io/'
 export const defaultTextureUrls = [
   textureImageDomain + 'textures/reneSola_Virtus_2_JC320S_24_Bbw.png',
   textureImageDomain + 'textures/longiSolarLR4_60HPH_370M.png',
-  textureImageDomain + 'textures/longiSolarLR4_60HPH_350M.png'
+  textureImageDomain + 'textures/longiSolarLR4_60HPH_350M.png',
 ]
 
 export const hitOption = {
   segments: true,
   stroke: true,
   fill: true,
-  tolerance: 10
+  tolerance: 10,
 }
 export const zoomFactor = Math.exp(Math.log(2) / 10)
 export const hitOptionPolygonStrict = {
   segments: false,
   stroke: false,
   fill: true,
-  tolerance: 0
+  tolerance: 0,
 }
 export const hitOptionStrokeStrict = {
   segments: false,
   stroke: true,
   fill: false,
-  tolerance: 0
+  tolerance: 0,
 }
 export const hitOptionStroke = {
   segments: false,
   stroke: true,
   fill: false,
-  tolerance: 2
+  tolerance: 2,
 }
 
 export const dragHeightSensitivity = 20

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -2,7 +2,7 @@ import {
   isInsidePolygon,
   verticalProjectionOnPlane,
   intersectOutlines,
-  calculateArea
+  calculateArea,
 } from '@eturnity/eturnity_maths'
 //this function just update the "roof" and "moduleField(s)" properties of panels,moduleFields and roofs
 export function UpdateRoofModuleFieldRelations(state) {
@@ -51,7 +51,7 @@ export function UpdateRoofModuleFieldRelations(state) {
             intersectionArea: 0,
             intersectionRatio: 0,
             areaRatio: 0,
-            roofBiggerThanModuleField: 1
+            roofBiggerThanModuleField: 1,
           }
         }
         const intersectionArea_m2 = calculateArea(intersection[0]) / 1e6
@@ -60,7 +60,7 @@ export function UpdateRoofModuleFieldRelations(state) {
           intersectionArea: intersectionArea_m2,
           intersectionRatio: (intersectionArea_m2 / roof.area).toFixed(3),
           areaRatio: (moduleField.area / roof.area).toFixed(3),
-          roofBiggerThanModuleField: roof.area >= moduleField.area ? 1 : -1
+          roofBiggerThanModuleField: roof.area >= moduleField.area ? 1 : -1,
         }
       })
       //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
@@ -85,7 +85,7 @@ export function UpdateRoofModuleFieldRelations(state) {
     roofPolygon = roofPolygons.find((r) => r.id == roofPolygon.id)
     roofPolygon.moduleFields = [
       ...roofPolygon.moduleFields.filter((mf) => mf.id != moduleField.id),
-      moduleField
+      moduleField,
     ]
     moduleField.roof = roofPolygon
     moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
@@ -134,7 +134,7 @@ export function removeModuleFieldAndPanelsOnNoOrMultipleRoofs(state) {
     ...remainingPolygons,
     ...remainingModuleFields,
     ...remainingPanels,
-    ...remainingUserDeactivatedPanels
+    ...remainingUserDeactivatedPanels,
   ]
   return state
 }

package/src/helper/UpdateRoofObstacleRelations.js

@@ -1,7 +1,7 @@
 import {
   verticalProjectionOnPlane,
   calculateArea,
-  isInsidePolygon
+  isInsidePolygon,
 } from '@eturnity/eturnity_maths'
 import { intersectOutlines } from '@eturnity/eturnity_maths'
 //this function just update the "roof" and "holes" properties of roofs and obstacles

package/src/helper/cameraMixin.js

@@ -5,14 +5,14 @@ import {
   addVector,
   getDistanceBetweenPoints,
   multiplyVector,
-  substractVector
+  substractVector,
 } from '@eturnity/eturnity_maths'
 import { marginAroundBuildingForCameraViewInMeter } from '../config'
 import OverlayLayer from '../Overlay/OverlayLayer'
 export default {
   data() {
     return {
-      animationFrameId: null
+      animationFrameId: null,
     }
   },
   created() {
@@ -117,7 +117,7 @@ export default {
       this.orbitControl.mouseButtons = {
         LEFT: THREE.MOUSE.PAN,
         MIDDLE: THREE.MOUSE.DOLLY,
-        RIGHT: THREE.MOUSE.ROTATE
+        RIGHT: THREE.MOUSE.ROTATE,
       }
       this.orbitControl.enableRotate = false
       this.orbitControl.update()
@@ -171,7 +171,7 @@ export default {
       this.orbitControl.mouseButtons = {
         LEFT: THREE.MOUSE.ROTATE,
         MIDDLE: THREE.MOUSE.DOLLY,
-        RIGHT: THREE.MOUSE.PAN
+        RIGHT: THREE.MOUSE.PAN,
       }
       this.orbitControl.update()
 
@@ -192,7 +192,7 @@ export default {
         newCameraPosition = [
           newCameraPosition.x,
           newCameraPosition.y,
-          newCameraPosition.z
+          newCameraPosition.z,
         ]
         target = [target.x, target.y, target.z]
         this.setTweenTo({ position: newCameraPosition, target, duration: 500 })
@@ -213,7 +213,7 @@ export default {
         newCameraPosition = [
           newCameraPosition.x,
           newCameraPosition.y,
-          newCameraPosition.z
+          newCameraPosition.z,
         ]
         target = [target.x, target.y, target.z]
         this.setTweenTo({ position: newCameraPosition, target, duration: 500 })
@@ -244,7 +244,7 @@ export default {
       bottom,
       zoom,
       x,
-      y
+      y,
     }) {
       if (left > right) {
         ;[left, right] = [right, left]
@@ -259,7 +259,7 @@ export default {
         bottom,
         zoom,
         x,
-        y
+        y,
       }
     },
     setOrthographicCameraPositionFromCameraParameters(cameraParams) {
@@ -292,7 +292,7 @@ export default {
         this.orbitControl.mouseButtons = {
           LEFT: THREE.MOUSE.PAN,
           MIDDLE: THREE.MOUSE.DOLLY,
-          RIGHT: THREE.MOUSE.ROTATE
+          RIGHT: THREE.MOUSE.ROTATE,
         }
         this.orbitControl.enableRotate = false
         this.orbitControl.update()
@@ -318,7 +318,7 @@ export default {
         bottom,
         zoom,
         x,
-        y
+        y,
       })
     },
     setCameraInitialPosition() {
@@ -328,7 +328,7 @@ export default {
       let targetVector = {
         x: (bounds.xMax + bounds.xMin) / 2000,
         y: (bounds.yMax + bounds.yMin) / 2000,
-        z: 0
+        z: 0,
       }
       let objectRadius_m = Math.max(
         (bounds.xMax - bounds.xMin) / 2000,
@@ -341,7 +341,7 @@ export default {
       const position = [
         positionVector.x,
         positionVector.y - distance,
-        positionVector.z
+        positionVector.z,
       ]
       let target = [targetVector.x, targetVector.y, targetVector.z]
 
@@ -360,7 +360,7 @@ export default {
         const target = [
           targetVector.x / 1000,
           targetVector.y / 1000,
-          targetVector.z / 1000
+          targetVector.z / 1000,
         ]
         const position = [target[0], target[1] - 20, target[2] + 50]
         this.setTweenTo({ position, target })
@@ -376,7 +376,7 @@ export default {
         let targetVector = {
           x: (bounds.xMax + bounds.xMin) / 2000,
           y: (bounds.yMax + bounds.yMin) / 2000,
-          z: 0
+          z: 0,
         }
         let objectRadius_m =
           marginAroundBuildingForCameraViewInMeter +
@@ -390,7 +390,7 @@ export default {
         const position = [
           positionVector.x,
           positionVector.y - distance,
-          positionVector.z
+          positionVector.z,
         ]
         let target = [targetVector.x, targetVector.y, targetVector.z]
         this.setTweenTo({ position, target, fov: newFov })
@@ -404,7 +404,7 @@ export default {
         let targetVector = {
           x: (bounds.xMax + bounds.xMin) / 2000,
           y: (bounds.yMax + bounds.yMin) / 2000,
-          z: 0
+          z: 0,
         }
         let objectRadius_m = Math.max(
           (bounds.xMax - bounds.xMin) / 2000,
@@ -425,7 +425,7 @@ export default {
         position,
         target,
         fov: newFov,
-        callback: this.turnPerspectiveCameraToOrthogonal
+        callback: this.turnPerspectiveCameraToOrthogonal,
       })
     },
     setCameraOrthogonalTo(polygon) {
@@ -435,7 +435,7 @@ export default {
         const target = [
           targetVector.x / 1000,
           targetVector.y / 1000,
-          targetVector.z / 1000
+          targetVector.z / 1000,
         ]
         const positionVector = addVector(
           polygonRef.meanPoint,
@@ -444,7 +444,7 @@ export default {
         const position = [
           positionVector.x / 1000,
           positionVector.y / 1000 - 1,
-          positionVector.z / 1000
+          positionVector.z / 1000,
         ]
         this.setTweenTo({ position, target })
       }
@@ -456,12 +456,12 @@ export default {
         const target = [
           targetVector.x / 1000,
           targetVector.y / 1000,
-          targetVector.z / 1000
+          targetVector.z / 1000,
         ]
         let sideVector = {
           x: -Math.cos(((polygonRef.direction + 45) * Math.PI) / 180),
           y: Math.sin(((polygonRef.direction + 45) * Math.PI) / 180),
-          z: 0
+          z: 0,
         }
         const positionVector = addVector(
           polygonRef.meanPoint,
@@ -470,7 +470,7 @@ export default {
         const position = [
           positionVector.x / 1000,
           positionVector.y / 1000,
-          positionVector.z / 1000 + 5
+          positionVector.z / 1000 + 5,
         ]
         this.setTweenTo({ position, target })
       }
@@ -481,28 +481,28 @@ export default {
         target,
         fov = 50,
         duration = 2000,
-        callback = () => {}
+        callback = () => {},
       } = payload
       TWEEN.removeAll()
       if (this.camera) {
         const currentTweenVar = {
-          t: 0
+          t: 0,
         }
         const initialTarget = {
           x: this.orbitControl.target.x,
           y: this.orbitControl.target.y,
-          z: this.orbitControl.target.z
+          z: this.orbitControl.target.z,
         }
         const initialFov = this.camera.fov
         const initialCameraPosition = {
           x: this.camera.position.x,
           y: this.camera.position.y,
-          z: this.camera.position.z
+          z: this.camera.position.z,
         }
         const finalCameraPosition = {
           x: position[0],
           y: position[1],
-          z: position[2]
+          z: position[2],
         }
         if (position[0] == target[0] && position[1] == target[1]) {
           const distance2D = getDistanceBetweenPoints(
@@ -529,7 +529,7 @@ export default {
               const nextPosition = {
                 x: finalCameraPosition.x + newDistance * Math.cos(newAngle),
                 y: finalCameraPosition.y + newDistance * Math.sin(newAngle),
-                z: newAltitude
+                z: newAltitude,
               }
               this.camera.position.set(
                 nextPosition.x,
@@ -546,7 +546,7 @@ export default {
               const nextTarget = {
                 x: initialTarget.x + t * (target[0] - initialTarget.x),
                 y: initialTarget.y + t * (target[1] - initialTarget.y),
-                z: initialTarget.z + t * (target[2] - initialTarget.z)
+                z: initialTarget.z + t * (target[2] - initialTarget.z),
               }
 
               this.orbitControl.target.set(
@@ -579,7 +579,7 @@ export default {
                   (1 - t) * (initialCameraPosition.y - finalCameraPosition.y),
                 z:
                   finalCameraPosition.z +
-                  (1 - t) * (initialCameraPosition.z - finalCameraPosition.z)
+                  (1 - t) * (initialCameraPosition.z - finalCameraPosition.z),
               }
               this.camera.position.set(
                 nextPosition.x,
@@ -589,7 +589,7 @@ export default {
               const nextTarget = {
                 x: initialTarget.x + t * (target[0] - initialTarget.x),
                 y: initialTarget.y + t * (target[1] - initialTarget.y),
-                z: initialTarget.z + t * (target[2] - initialTarget.z)
+                z: initialTarget.z + t * (target[2] - initialTarget.z),
               }
               this.orbitControl.target.set(
                 nextTarget.x,
@@ -608,7 +608,7 @@ export default {
       }
     },
     animate(e) {
-      if (!!TWEEN) {
+      if (TWEEN) {
         TWEEN.update()
       }
       let waitingBall = this.scene.getObjectByName('waitingBall')
@@ -623,11 +623,11 @@ export default {
         this.render()
       }
       this.animationFrameId = requestAnimationFrame(this.animate)
-    }
+    },
   },
 
   beforeDestroy() {
     TWEEN.removeAll()
     cancelAnimationFrame(this.animationFrameId)
-  }
+  },
 }

package/src/helper/customProvider.js

@@ -24,7 +24,6 @@ export class CustomProvider extends MapProvider {
     return new Promise((resolve, reject) => {
       if (zoom < minZoomLayer) {
         resolve(this.defaultImage)
-      } else if (zoom > maxZoomLayer) {
       } else {
         const image = document.createElement('img')
 

package/src/helper/initializeThree.js

@@ -6,9 +6,9 @@ export default {
     this.renderer = new THREE.WebGLRenderer({
       antialias: true,
       preserveDrawingBuffer: true,
-      powerPreference: 'high-performance'
+      powerPreference: 'high-performance',
     })
     this.raycaster = new THREE.Raycaster()
     this.loader = new THREE.TextureLoader()
-  }
+  },
 }