@eturnity/eturnity_3d 9.31.0 → 9.31.1-EXP-24.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "9.31.0",
+  "version": "9.31.1-EXP-24.0",
   "files": [
     "dist",
     "src"
@@ -11,12 +11,13 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "test": "jest",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src`",
     "prettier": "prettier --write \"**/*.{js,vue}\"",
     "merge-remote-master": "node scripts/merge-remote-master.js"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "9.31.0",
+    "@eturnity/eturnity_maths": "9.31.0-EXP-24.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",
@@ -35,14 +36,19 @@
     "vuex": "4.1.0"
   },
   "devDependencies": {
+    "@babel/core": "7.22.0",
+    "@babel/preset-env": "7.22.0",
     "@vitejs/plugin-vue": "2.0.1",
     "@vue/compiler-sfc": "3.3.4",
     "@vue/eslint-config-standard": "8.0.1",
+    "babel-jest": "29.7.0",
     "eslint": "8.0.1",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-vue": "9.14.1",
     "html-webpack-plugin": "3.2.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "prettier": "2.8.4",
     "prettier-plugin-vue": "1.1.6",
     "vite": "2.7.2",

package/src/config.js

@@ -8,6 +8,7 @@ export const mmTolerance = 5
 export const mmTolerance3dNode = 50
 export const earthRadius = 6371008
 export const marginAroundBuildingForCameraViewInMeter = 5
+export const DEFAULT_FOV = 50
 export const layerColors = {
   construction: {
     fillColor: 'transparent',

package/src/helper/cameraMixin.js

@@ -6,13 +6,21 @@ import {
   multiplyVector,
   substractVector,
 } from '@eturnity/eturnity_maths'
-import { marginAroundBuildingForCameraViewInMeter } from '../config'
+import {
+  DEFAULT_FOV,
+  marginAroundBuildingForCameraViewInMeter,
+} from '../config'
 import OverlayLayer from '../Overlay/OverlayLayer'
 export default {
   data() {
     return {
       animationFrameId: null,
-      perspectiveCamera: new THREE.PerspectiveCamera(80, 300 / 300, 1, 50000),
+      perspectiveCamera: new THREE.PerspectiveCamera(
+        DEFAULT_FOV,
+        300 / 300,
+        1,
+        50000
+      ),
       orthographicCamera: new THREE.OrthographicCamera(
         -50,
         50,
@@ -398,7 +406,7 @@ export default {
     },
     setCameraInitialPosition() {
       if (this.roofs.length == 0) return
-      let newFov = 50
+      let newFov = DEFAULT_FOV
       if (
         this.roofsBounds.xMax === Infinity ||
         this.roofsBounds.xMin === -Infinity ||
@@ -462,7 +470,7 @@ export default {
       if (this.camera.isOrthographicCamera) {
         this.setOrthographicCameraGlobalPosition()
       } else {
-        let newFov = 50
+        let newFov = DEFAULT_FOV
         let bounds = this.roofsBounds
         if (
           bounds.xMax === Infinity ||
@@ -618,7 +626,7 @@ export default {
       const {
         position,
         target,
-        fov = 50,
+        fov = DEFAULT_FOV,
         duration = 1500,
         callback = () => {},
       } = payload

package/src/store/hydrateData.js

@@ -1,6 +1,9 @@
 //Synchronisation with BE:
 import {
-  Polygon,
+  Roof,
+  Obstacle,
+  ModuleField,
+  Panel,
   updateComputedGeometryPolygon,
   getObstacleMarginOutline,
   multiplyVector,
@@ -90,7 +93,7 @@ export async function hydratePolygons({
     const roof_outline = roofResp.roof_outline.map((p) => {
       return { x: p[0], y: p[1], z: p[2] }
     })
-    let roof = new Polygon(roof_outline, 'roof')
+    let roof = new Roof(roof_outline)
     roof.id = roofResp.roof_uuid
     roof.version = roofResp.version
     roof.name = roofResp.roof_name
@@ -116,7 +119,7 @@ export async function hydratePolygons({
     const obstacle_outline = obstacleResp.obstacle_outline.map((p) => {
       return { x: p[0], y: p[1], z: p[2] }
     })
-    let obstacle = new Polygon(obstacle_outline, 'obstacle')
+    let obstacle = new Obstacle(obstacle_outline)
     obstacle.id = obstacleResp.obstacle_uuid
     obstacle.version = obstacleResp.version
     obstacle.height = obstacleResp.obstacle_height_above_ground_mm
@@ -145,7 +148,7 @@ export async function hydratePolygons({
         return { x: p[0], y: p[1], z: p[2] }
       })
 
-    let moduleField = new Polygon(module_field_outline, 'moduleField')
+    let moduleField = new ModuleField(module_field_outline)
     moduleField.id = moduleFieldResp.module_field_uuid
     moduleField.version = moduleFieldResp.version
 
@@ -212,7 +215,7 @@ export async function hydratePolygons({
     })
 
     modules.forEach((module) => {
-      let panel = new Polygon(module.outline, '')
+      let panel = new Panel(module.outline)
       panel.id = module.module_uuid
       panel.gridIndex = module.gridIndex
       panel.row_index = module.row_index

package/src/store/hydratePolygons.spec.js

@@ -0,0 +1,111 @@
+import { hydratePolygons } from './hydrateData'
+import { Roof, Obstacle, ModuleField, Panel } from '@eturnity/eturnity_maths'
+
+const square = (size) => [
+  [0, 0, 0],
+  [size, 0, 0],
+  [size, size, 0],
+  [0, size, 0],
+]
+
+const moduleGrid = {
+  grid_origin: [0, 0, 0],
+  grid_row_vector: [1100, 0, 0],
+  grid_column_vector: [0, 1900, 0],
+  panel_height_vector: [0, 1800, 0],
+  panel_width_vector: [1000, 0, 0],
+  modules: [
+    {
+      module_uuid: 'module-active',
+      row_index: 0,
+      col_index: 0,
+      is_active: true,
+    },
+    {
+      module_uuid: 'module-inactive',
+      row_index: 0,
+      col_index: 1,
+      is_active: false,
+    },
+  ],
+}
+
+async function hydrateFixture() {
+  return hydratePolygons({
+    roofsResponse: [
+      {
+        roof_uuid: 'roof-1',
+        version: 3,
+        roof_outline: square(10000),
+        roof_margins_mm: [200, 200, 200, 200],
+        roof_slope_degrees: 0,
+        roof_orientation_degrees: 180,
+        roof_name: 'test roof',
+      },
+    ],
+    obstaclesResponse: [
+      {
+        obstacle_uuid: 'obstacle-1',
+        version: 1,
+        obstacle_outline: square(1000),
+        obstacle_margins_mm: [100, 100, 100, 100],
+        obstacle_height_above_ground_mm: 500,
+        obstacle_slope_is_parallel_to_roof: true,
+      },
+    ],
+    moduleFieldsResponse: [
+      {
+        module_field_uuid: 'mf-1',
+        version: 2,
+        module_field_outline: square(5000),
+        col_spacing_mm: 20,
+        row_spacing_mm: 20,
+        is_row_spacing_automatic: false,
+        offset_percent: 0,
+        panel_orientation: 'portrait',
+        panel_direction_degrees: 0,
+        module_grids: [moduleGrid],
+      },
+    ],
+  })
+}
+
+const byLayer = (polygons, layer) => polygons.filter((p) => p.layer == layer)
+
+describe('hydratePolygons builds typed polygon instances', () => {
+  it('hydrates roofs, obstacles and module fields to their subclasses', async () => {
+    const { polygons } = await hydrateFixture()
+    const [roof] = byLayer(polygons, 'roof')
+    const [obstacle] = byLayer(polygons, 'obstacle')
+    const [moduleField] = byLayer(polygons, 'moduleField')
+    expect(roof).toBeInstanceOf(Roof)
+    expect(obstacle).toBeInstanceOf(Obstacle)
+    expect(moduleField).toBeInstanceOf(ModuleField)
+  })
+
+  it('hydrates every grid module as a Panel, with activeness as the layer', async () => {
+    const { polygons } = await hydrateFixture()
+    const panels = byLayer(polygons, 'panel')
+    const userDeactivatedPanels = byLayer(polygons, 'user_deactivated_panel')
+    expect(panels).toHaveLength(1)
+    expect(panels[0]).toBeInstanceOf(Panel)
+    expect(panels[0].id).toBe('module-active')
+    expect(userDeactivatedPanels).toHaveLength(1)
+    expect(userDeactivatedPanels[0]).toBeInstanceOf(Panel)
+    expect(userDeactivatedPanels[0].id).toBe('module-inactive')
+  })
+
+  it('round-trips hydrated polygons through serializeForBEStorage', async () => {
+    const { polygons } = await hydrateFixture()
+    const [roof] = byLayer(polygons, 'roof')
+    const [obstacle] = byLayer(polygons, 'obstacle')
+    const roofPayload = roof.serializeForBEStorage()
+    expect(roofPayload.roof_uuid).toBe('roof-1')
+    expect(roofPayload.roof_outline).toEqual(square(10000))
+    expect(roofPayload.roof_margins_mm).toEqual([200, 200, 200, 200])
+    const obstaclePayload = obstacle.serializeForBEStorage()
+    expect(obstaclePayload.obstacle_uuid).toBe('obstacle-1')
+    expect(obstaclePayload.obstacle_height_above_ground_mm).toBe(500)
+    expect(obstaclePayload.obstacle_slope_is_parallel_to_roof).toBe(true)
+  })
+})

package/dist/assets/theme.js

@@ -1,43 +0,0 @@
-const theme = {
-  colors: {
-    primary: '#282387',
-    secondary: '#818181',
-    tertiary: '#d5d5d5',
-    black: '#263238',
-    yellow: '#fdb813',
-    darkGray: '#818181',
-    mediumGray: '#d5d5d5',
-    lightGray: '#f2f2f2',
-    white: '#fff',
-    blue: '#48a2d0',
-    red: '#FF5656',
-    blue1: '#e4efff',
-    blue2: '#F6FAFF',
-    grey1: '#666',
-    grey2: '#c4c4c4',
-    grey3: '#b2b9c5',
-    grey4: '#dee2eb',
-    grey5: '#fafafa',
-    grey6: '#555d61',
-    turquoise: '#20A4CA',
-    green: '#99db0c',
-    purple: '#505ca6',
-    disabled: '#dfe1e1',
-    transparentWhite1: '#ffffff32',
-    transparentBlack1: '#263238e6',
-    transparentBlue1: '#20a4cae6',
-    blueElectric: '#66dffa',
-    eturnityGrey: '#263238'
-  },
-
-  screen: {
-    mobileSmall: '345px',
-    mobile: '425px',
-    mobileLarge: '530px',
-    tablet: '768px',
-    tabletLarge: '950px'
-  },
-  borderRadius: '4px'
-}
-
-export default theme

package/dist/assets/vue.svg

@@ -1 +0,0 @@
-<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="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>