@eturnity/eturnity_3d 6.37.1 → 6.37.2-EPDM-7379.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.37.1",
+  "version": "6.37.2-EPDM-7379.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": "6.37.0",
+    "@eturnity/eturnity_maths": "6.37.0-EPDM-7379.0",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",

package/src/components/ThreeCanvasViewer.vue

@@ -34,6 +34,7 @@ export default {
         1,
         1000
       ),
+      layers:null,
       provider: null,
       cameraProjection: null,
       texture: null,
@@ -128,7 +129,8 @@ export default {
       hydrateData: 'hydrateData'
     }),
     ...mapMutations({
-      setModuleTextureVersionId: 'mutate_moduleTextureVersionId'
+      setModuleTextureVersionId: 'mutate_moduleTextureVersionId',
+      setSelectedMapLayer: 'mutate_selectedMapLayer'
     }),
     hideMesh(mesh){
       if(mesh){

package/src/helper/threeMixin.js

@@ -2,14 +2,37 @@ import * as THREE from 'three'
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
 import { Sky } from 'three/examples/jsm/objects/Sky.js'
 import { CustomProvider } from './customProvider'
+import getLayers from '../utils/layers'
 
 export default {
   methods: {
     initialiseThreeMap() {
       //Extention of the map with geo-map
+      if (!this.selectedMapLayer) {
+        this.setInitialMapLayer()
+      }
       this.provider = new CustomProvider('', this.selectedMapLayer.key)
       this.renderTiles()
     },
+    setInitialMapLayer() {
+      if (!this.layers || this.layers.length == 0) {
+        this.layers = getLayers()
+      }
+      this.setSelectedMapLayer(null)
+
+      if (this.selectedMapLayer === null) {
+        for (var i in this.layers) {
+          if (this.globalProjectProperties && this.layers[i].key === this.globalProjectProperties.map_type) {
+            this.setSelectedMapLayer(this.layers[i])
+          }
+        }
+      }
+
+      if (this.selectedMapLayer === null) {
+        this.setSelectedMapLayer(this.layers[7])
+      }
+    },
+
     initSky() {
       // Add Sky
       let sky = new Sky()
@@ -35,7 +58,6 @@ export default {
       sun = null
     },
     initialiseThree(isInteractive = true) {
-
       this.scene.background = new THREE.Color(0xb0b0b0)
 
       this.camera.position.set(0, -100, 50)

package/src/store/nodesEdgesCreation.js

@@ -1,9 +1,9 @@
 import { Point, Line } from '@eturnity/eturnity_maths'
 import { mmTolerance } from '../config'
 import {
-  isSamePoint3D,
+  isAlmostSamePoint3D,
   isAlmostSameSegment2D,
-  isSameSegment3D,
+  isAlmostSameSegment3D,
   isAlmostSamePoint2D
 } from '@eturnity/eturnity_maths'
 
@@ -74,6 +74,7 @@ export function generateNodes2D(polygons) {
 }
 
 export function generateNodes3D(polygons) {
+  console.log('generate Node 3d')
   let nodes3D = []
   polygons
     .filter((poly) =>
@@ -83,7 +84,9 @@ export function generateNodes3D(polygons) {
       const outline = polygon.outline
       outline.forEach((point, i) => {
         //check if nodes2D already exist
-        let node3D = nodes3D.find((node) => isSamePoint3D(node, point))
+        let node3D = nodes3D.find((node) =>
+          isAlmostSamePoint3D(node, point, mmTolerance)
+        )
         if (!node3D) {
           node3D = new Point(point.x, point.y, point.z, polygon.layer)
           node3D.belongsTo = []
@@ -176,8 +179,11 @@ export function generateEdges3D(polygons) {
         //check if edge2D already exist
         const nextPoint = outline[(i + 1) % outline.length]
         let edge3D = edges3D.find((edge) => {
-          isSameSegment3D([point, nextPoint], edge.outline) &&
-            edge.layer == polygon.layer
+          isAlmostSameSegment3D(
+            [point, nextPoint],
+            edge.outline,
+            mmTolerance
+          ) && edge.layer == polygon.layer
         })
         if (!edge3D) {
           //create an edge at this position