@eturnity/eturnity_3d 7.16.0-qa-dev03.1 → 7.16.0-qa03-7.16.0

package/.bitbucket/ci/build_customization_config.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+log() {
+    timestamp=$(date +"%Y-%m-%d %H:%M:%S")
+    echo "$timestamp $1"
+}
+
+log "Building customization for image ..."
+
+rm -f .env && cp .env.bitbucket .env
+
+Customize API keys
+if [[ $NAMESPACE = 'eturnity-prod'* ]]; then
+    sed -i "s|{{VUE_APP_GOOGLE_MAP_API_KEY}}|$BB_VUE_APP_GOOGLE_MAP_API_KEY_PROD|g" .env
+    sed -i "s|{{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}|$BB_VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY_PROD|g" .env
+else
+    sed -i "s|{{VUE_APP_GOOGLE_MAP_API_KEY}}|$BB_VUE_APP_GOOGLE_MAP_API_KEY_DEV|g" .env
+    sed -i "s|{{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}|$BB_VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY_DEV|g" .env
+fi
+
+log "Building customization for image done"

package/.env

@@ -1 +1,2 @@
-VUE_APP_GOOGLE_MAP_API_KEY=AIzaSyAxqgQ_iRKAQ6AMvZ0a6Z0vkBwYTM-pnHM
+VUE_APP_GOOGLE_MAP_API_KEY={{API_KEY_FOR_LOCAL_DEVELOPMENT}}
+VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY={{API_KEY_FOR_LOCAL_DEVELOPMENT}}

package/.env.bitbucket

@@ -0,0 +1,2 @@
+VUE_APP_GOOGLE_MAP_API_KEY={{VUE_APP_GOOGLE_MAP_API_KEY}}
+VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY={{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}

package/bitbucket-pipelines.yml

@@ -22,6 +22,7 @@ definitions:
         script:
           - ./.bitbucket/ci/build_image_config.sh
           - export $(cat .env.image | xargs)
+          - ./.bitbucket/ci/build_customization_config.sh
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - docker build -t $IMAGE_NAME .
           - docker login --username $BB_PIPELINE_REGISTRY_TOKEN --password $BB_PIPELINE_REGISTRY_TOKEN $BB_CONTAINER_REGISTRY
@@ -65,6 +66,7 @@ definitions:
         script:
           - ./.bitbucket/ci/build_image_config.sh
           - export $(cat .env.image | xargs)
+          - ./.bitbucket/ci/build_customization_config.sh
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - export RELEASE_TAG=latest
           - export RELEASE_IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$RELEASE_TAG

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.16.0-qa-dev03.1",
+  "version": "7.16.0-qa03-7.16.0",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.16.0-qa-dev03.0",
+    "@eturnity/eturnity_maths": "7.16.0-qa03-7.16.0",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",

package/src/helper/customProvider.js

@@ -26,7 +26,8 @@ export class CustomProvider extends MapProvider {
         resolve(this.defaultImage)
       } else if (zoom > maxZoomLayer) {
       } else {
-        var image = document.createElement('img')
+        const image = document.createElement('img')
+
         image.onload = function () {
           image.style.backgroundColor = 'red'
           resolve(image)
@@ -50,6 +51,17 @@ export class CustomProvider extends MapProvider {
           const yMax = yMin + resolution_mPerTile
 
           imageSrc += `&service=WMS&request=GetMap&layers=rgb&styles=&format=image%2Fjpeg&transparent=false&version=1.1.1&id=bkg_image&layerTypeAPI=bkgHexagonGermanyLayer&width=256&height=256&srs=EPSG%3A3857&bbox=${xMin},${yMin},${xMax},${yMax}`
+        } else if (this.layer.key == 'azureSatelliteLayer') {
+          const { apiVersion, tilesetId, subscriptionKey } =
+            this.layer.layerData.options
+          imageSrc = imageSrc
+            .replace('{x}', x)
+            .replace('{y}', y)
+            .replace('{z}', zoom)
+            .replace('{apiVersion}', apiVersion)
+            .replace('{tilesetId}', tilesetId)
+            .replace('{subscriptionKey}', subscriptionKey)
+          imageSrc = imageSrc + `&no-cache=${Date.now()}`
         } else {
           imageSrc = imageSrc.replace('{x}', x)
           imageSrc = imageSrc.replace('{y}', y)

package/src/helper/render/clear.js

@@ -25,6 +25,23 @@ export default {
         if (obj.material.dispose) obj.material.dispose()
       }
     },
+    clearPanelsFromChangingRoofs(roofIds) {
+      const roofs = this.polygons.filter((polygon) =>
+        roofIds.includes(polygon.id)
+      )
+      roofs.forEach((roof) =>
+        roof.moduleFields.forEach((mf) =>
+          mf.panels.forEach((panel) => {
+            let meshTop = this.meshes.panelsMeshes[panel.id + '_top']
+            let meshSide = this.meshes.panelsMeshes[panel.id + '_side']
+            if (meshTop || meshSide) {
+              this.clearMeshFromScene(meshTop, this.scene)
+              this.clearMeshFromScene(meshSide, this.scene)
+            }
+          })
+        )
+      )
+    },
     clearMeshFromScene(mesh, scene) {
       if (!mesh || !scene) {
         return

package/src/helper/render/edge.js

@@ -87,8 +87,6 @@ export default {
           cylinder.userData.edgeId = edge.id
           cylinder.userData.type = 'edgeMeshes'
           cylinder.userData.layer = edge.layer
-          cylinder.frustumCulled = false
-          cylinder.renderOrder = 10
 
           cylinder.frustumCulled = false
           cylinder.renderOrder = 10

package/src/helper/render/geometryHandler.js

@@ -8,8 +8,7 @@ import {
   getNormalVectorFrom3Points,
   hasNaN,
   getDistanceBetweenPoints,
-  intersectOutlines,
-  isSameSegment2D
+  intersectOutlines
 } from '@eturnity/eturnity_maths'
 
 export function getTriangleVerticesFromOutline(
@@ -153,7 +152,7 @@ export function getWallVertices(polygon) {
     )
   })
 
-  polygon.holes.forEach((hole, holeIndex) => {
+  polygon.holes.forEach((hole) => {
     let obstacleWallOutline =
       intersectOutlines(hole.outline, polygon.outline)[0] || []
     obstacleWallOutline = obstacleWallOutline.map((p) => {
@@ -166,47 +165,34 @@ export function getWallVertices(polygon) {
         ).z
       }
     })
-
     const lengthHole = obstacleWallOutline.length
     obstacleWallOutline.forEach((p_up_0, index) => {
       const p_up_1 = obstacleWallOutline[(index + 1) % lengthHole]
       const p_bottom_0 = { ...p_up_0, z: 0 }
       const p_bottom_1 = { ...p_up_1, z: 0 }
 
-      const isEdgeConnectedToRoof = !polygon.holes.some((hole, i) => {
-        return (
-          holeIndex != i &&
-          hole.outline.some((p, p_index, outline) => {
-            let p_next_index = (p_index + 1) % outline.length
-            return isSameSegment2D([p_up_0, p_up_1], [p, outline[p_next_index]])
-          })
-        )
-      })
-
-      if (isEdgeConnectedToRoof) {
-        trianglesVertices.push(
-          ...[
-            p_up_0.x / 1000,
-            p_up_0.y / 1000,
-            p_up_0.z / 1000,
-            p_up_1.x / 1000,
-            p_up_1.y / 1000,
-            p_up_1.z / 1000,
-            p_bottom_0.x / 1000,
-            p_bottom_0.y / 1000,
-            p_bottom_0.z / 1000,
-            p_up_1.x / 1000,
-            p_up_1.y / 1000,
-            p_up_1.z / 1000,
-            p_bottom_0.x / 1000,
-            p_bottom_0.y / 1000,
-            p_bottom_0.z / 1000,
-            p_bottom_1.x / 1000,
-            p_bottom_1.y / 1000,
-            p_bottom_1.z / 1000
-          ]
-        )
-      }
+      trianglesVertices.push(
+        ...[
+          p_up_0.x / 1000,
+          p_up_0.y / 1000,
+          p_up_0.z / 1000,
+          p_up_1.x / 1000,
+          p_up_1.y / 1000,
+          p_up_1.z / 1000,
+          p_bottom_0.x / 1000,
+          p_bottom_0.y / 1000,
+          p_bottom_0.z / 1000,
+          p_up_1.x / 1000,
+          p_up_1.y / 1000,
+          p_up_1.z / 1000,
+          p_bottom_0.x / 1000,
+          p_bottom_0.y / 1000,
+          p_bottom_0.z / 1000,
+          p_bottom_1.x / 1000,
+          p_bottom_1.y / 1000,
+          p_bottom_1.z / 1000
+        ]
+      )
     })
   })
   if (hasNaN(trianglesVertices)) {
@@ -578,7 +564,7 @@ export function updateBufferPanelSideGeometry(panelPolygon, geometry) {
     panelPolygon.outline,
     panelOutlineTop
   )
-
+  
   if (hasNaN(triangleVertices)) {
     return null
   }
@@ -601,7 +587,7 @@ export function updateBufferPanelSideGeometry(panelPolygon, geometry) {
   geometry.attributes.position.needsUpdate = true
   geometry.computeVertexNormals()
   geometry.needsUpdate = true
-
+ 
   return geometry
 }
 export function getBufferPanelSideGeometry(panelPolygon) {

package/src/helper/render/roof.js

@@ -18,23 +18,25 @@ export default {
   methods: {
     updateRoofGeometry(geometry, roofPolygon) {
       const roofOutline = roofPolygon.outline
-      let cropedHolesOutline = roofPolygon.holes.map((h) => {
-        //let's crop obstacle with roof outline
-        const cropedHoleOutline =
-          intersectOutlines(h.outline, roofPolygon.outline)[0] || []
-        const outline = cropedHoleOutline.map((p) => {
-          return {
-            x: p.x,
-            y: p.y,
-            z: verticalProjectionOnPlane(
-              p,
-              roofPolygon.normalVector,
-              roofPolygon.flatOutline[0]
-            ).z
-          }
+      let cropedHolesOutline = roofPolygon.holes
+        .filter((h) => h.layer == 'obstacle')
+        .map((h) => {
+          //let's crop obstacle with roof outline
+          const cropedHoleOutline =
+            intersectOutlines(h.outline, roofPolygon.outline)[0] || []
+          const outline = cropedHoleOutline.map((p) => {
+            return {
+              x: p.x,
+              y: p.y,
+              z: verticalProjectionOnPlane(
+                p,
+                roofPolygon.normalVector,
+                roofPolygon.flatOutline[0]
+              ).z
+            }
+          })
+          return outline
         })
-        return outline
-      })
 
       cropedHolesOutline = cropedHolesOutline.filter((outline) => !!outline)
       geometry = updateBufferRoofGeometry(
@@ -47,23 +49,25 @@ export default {
     },
     createRoofGeometry(roofPolygon) {
       const roofOutline = roofPolygon.outline
-      let cropedHolesOutline = roofPolygon.holes.map((h) => {
-        //let's crop obstacle with roof outline
-        const cropedHoleOutline =
-          intersectOutlines(h.outline, roofPolygon.outline)[0] || []
-        const outline = cropedHoleOutline.map((p) => {
-          return {
-            x: p.x,
-            y: p.y,
-            z: verticalProjectionOnPlane(
-              p,
-              roofPolygon.normalVector,
-              roofPolygon.flatOutline[0]
-            ).z
-          }
+      let cropedHolesOutline = roofPolygon.holes
+        .filter((h) => h.layer == 'obstacle')
+        .map((h) => {
+          //let's crop obstacle with roof outline
+          const cropedHoleOutline =
+            intersectOutlines(h.outline, roofPolygon.outline)[0] || []
+          const outline = cropedHoleOutline.map((p) => {
+            return {
+              x: p.x,
+              y: p.y,
+              z: verticalProjectionOnPlane(
+                p,
+                roofPolygon.normalVector,
+                roofPolygon.flatOutline[0]
+              ).z
+            }
+          })
+          return outline
         })
-        return outline
-      })
 
       cropedHolesOutline = cropedHolesOutline.filter((outline) => !!outline)
       let geometry = getBufferRoofGeometry(roofOutline, cropedHolesOutline)

package/src/helper/renderMixin.js

@@ -296,6 +296,7 @@ export default {
             method: this.renderRoofsMargin,
             arg: []
           })
+          break
         case 'selectedModuleFieldChange':
           methodList.push({
             name: 'renderEdges',
@@ -379,6 +380,13 @@ export default {
             arg: []
           })
           break
+        case 'clearPanelFromChangingRoofs':
+          methodList.push({
+            name: 'clearPanelsFromChangingRoofs',
+            method: this.clearPanelsFromChangingRoofs,
+            arg: [params.roofIds]
+          })
+          break
         case 'selectedPanelChange':
           methodList.push({
             name: 'renderModuleFields',

package/src/store/nodesEdgesCreation.js

@@ -4,8 +4,7 @@ import {
   isAlmostSamePoint3D,
   isAlmostSameSegment2D,
   isAlmostSameSegment3D,
-  isAlmostSamePoint2D,
-  verticalProjectionOnPlane
+  isAlmostSamePoint2D
 } from '@eturnity/eturnity_maths'
 
 export function generateNodes2D(polygons) {
@@ -57,15 +56,14 @@ export function generateNodes2D(polygons) {
     if (node2D.masterHandle) {
       node2D.masterHandle.open = node2D.belongsTo.some(
         (item) =>
-          item.index == null ||
           item.polygon.outline[item.index].open ||
           item.polygon.outline[item.index].hasWarning
       )
       node2D.masterHandle.hasWarning = node2D.belongsTo.some(
-        (item) => item.index == null || item.polygon.outline[item.index].hasWarning
+        (item) => item.polygon.outline[item.index].hasWarning
       )
       node2D.masterHandle.selected = node2D.belongsTo.every(
-        (item) => item.index == null || item.polygon.outline[item.index].selected
+        (item) => item.polygon.outline[item.index].selected
       )
     }
   })
@@ -121,7 +119,7 @@ export function generateNodes3D(polygons) {
   return nodes3D
 }
 
-export function generateEdges2D(polygons, splitEdgesIds = []) {
+export function generateEdges2D(polygons) {
   let edges2D = []
   polygons
     .filter((poly) =>
@@ -161,72 +159,9 @@ export function generateEdges2D(polygons, splitEdgesIds = []) {
           index: i,
           polygon
         })
-        if (polygon.roofs && polygon.roofs.length > 0) {
-          polygon.roofs.forEach((supportRoof) => {
-            edge2D.belongsTo.push({
-              polygonId: supportRoof.id,
-              index: null,
-              polygon: supportRoof
-            })
-          })
-        }
         edge2D.id += '_' + polygon.id + '_' + i
       })
     })
-  edges2D.forEach((edge2D) => {
-    edge2D.isSplit = splitEdgesIds.includes(edge2D.id)
-    if (edge2D.belongsTo.length > 2) {
-      edge2D.belongsTo = edge2D.belongsTo.filter((i) => i.index !== null)
-    }
-  })
-  edges2D.forEach((edge2D) => {
-    const isNotSplit = edge2D.belongsTo.every((item, index, array) => {
-      if (index == 0) {
-        return true
-      }
-      const outline0 = array[0].polygon.outline
-      const outline1 = item.polygon.outline
-      let point0, point1, nextPoint0, nextPoint1
-      if (array[0].index !== null) {
-        point0 = outline0[array[0].index]
-        nextPoint0 = outline0[(array[0].index + 1) % outline0.length]
-      } else {
-        point0 = verticalProjectionOnPlane(
-          outline1[item.index],
-          array[0].polygon.normalVector,
-          array[0].polygon.flatOutline[0]
-        )
-        nextPoint0 = verticalProjectionOnPlane(
-          outline1[(item.index + 1) % outline1.length],
-          array[0].polygon.normalVector,
-          array[0].polygon.flatOutline[0]
-        )
-      }
-      if (item.index !== null) {
-        point1 = outline1[item.index]
-        nextPoint1 = outline1[(item.index + 1) % outline1.length]
-      } else {
-        point1 = verticalProjectionOnPlane(
-          outline0[array[0].index],
-          item.polygon.normalVector,
-          item.polygon.flatOutline[0]
-        )
-        nextPoint1 = verticalProjectionOnPlane(
-          outline0[(array[0].index + 1) % outline0.length],
-          item.polygon.normalVector,
-          item.polygon.flatOutline[0]
-        )
-      }
-      return isAlmostSameSegment3D(
-        [point0, nextPoint0],
-        [point1, nextPoint1],
-        mmTolerance
-      )
-    })
-    if (!isNotSplit && edge2D.belongsTo.length == 2 && edge2D.layer == 'roof') {
-      edge2D.isSplit = true
-    }
-  })
   return edges2D
 }
 

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

@@ -8,7 +8,7 @@ import { hydrateData } from './hydrateData.js'
 
 const init_state = {
   isLoading: false,
-  
+
   polygons: [],
   nodes: [],
   edges: [],

package/src/utils/layers.js

@@ -189,6 +189,29 @@ function getLayers() {
     }
   )
 
+  const azureSatelliteLayer = L.tileLayer(
+    'https://atlas.microsoft.com/map/tile?' +
+      'api-version={apiVersion}' +
+      '&tilesetId={tilesetId}' +
+      '&subscription-key={subscriptionKey}' +
+      '&zoom={z}' +
+      '&x={x}' +
+      '&y={y}',
+    {
+      layerTypeAPI: 'azureSatelliteLayer',
+      id: 'azure_satellite',
+      attribution: `\u00A9 ${new Date().getFullYear()} EarthStar Geographics, Microsoft`,
+      minZoom: leafletMapLayersConfig['azureSatelliteLayer']['minZoom'],
+      maxZoom: leafletMapLayersConfig['azureSatelliteLayer']['maxZoom'],
+      maxNativeZoom:
+        leafletMapLayersConfig['azureSatelliteLayer']['maxNativeZoom'],
+      // query parameters
+      apiVersion: '2022-08-01',
+      tilesetId: 'microsoft.imagery',
+      subscriptionKey: process.env.VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY
+    }
+  )
+
   return [
     {
       name: 'SwissTopo (satellite)',
@@ -259,6 +282,11 @@ function getLayers() {
       name: 'GeoPortal France (satellite)',
       key: 'geoportail_fr_wmts_ortho_layer',
       layerData: GeoLayer_HR
+    },
+    {
+      name: 'Bing (satellite)',
+      key: 'azureSatelliteLayer',
+      layerData: azureSatelliteLayer
     }
   ]
 }

package/src/utils/leaflet-config.service.js

@@ -63,5 +63,10 @@ export const leafletMapLayersConfig = {
     maxZoom: 22,
     maxNativeZoom: 19,
     minZoom: 6
+  },
+  azureSatelliteLayer: {
+    maxZoom: 25,
+    maxNativeZoom: 19,
+    minZoom: 1
   }
 }