@eturnity/eturnity_3d 1.0.0 → 1.0.2

package/package.json

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

package/src/store/hydrateData.js

@@ -40,8 +40,7 @@ export async function hydrateData({ state, commit }, data) {
     commit('mutate_layoutSettings', layoutSetting)
     commit('mutate_module_texture_version_id', layoutSetting.module_texture_version_id)
     let layers=getLayers()
-    console.log(layers,layoutSetting.map_layer)
-    let selectedLayer=layers.find(layer=>layer.key==layoutSetting.map_layer)
+    let selectedLayer=layers.find(layer=>layer.key==layoutSetting.background_map_settings.layerKey)
     commit('mutate_selectedMapLayer', selectedLayer)
     
     //end of layoutSetting correction

package/src/store/nodesEdgesCreation.js

@@ -1,19 +1,17 @@
 import { Point, Line } from '@eturnity/eturnity_maths'
 import { mmTolerance } from '../config'
 import {
-  isSamePoint2D,
   isSamePoint3D,
-  isSameSegment2D,
   isAlmostSameSegment2D,
   isSameSegment3D,
   isAlmostSamePoint2D
 } from '@eturnity/eturnity_maths'
 
-export function generateNodes2D(polygons, constructionPolyline) {
+export function generateNodes2D(polygons) {
     let nodes2D = []
     polygons
       .filter((poly) =>
-        ['roof', 'obstacle', 'tmpModuleField', 'moduleField'].includes(poly.layer)
+        ['roof', 'obstacle', 'tmpModuleField', 'moduleField','construction'].includes(poly.layer)
       )
       .forEach((polygon) => {
         const outline = polygon.outline
@@ -25,6 +23,7 @@ export function generateNodes2D(polygons, constructionPolyline) {
           if (!node2D) {
             node2D = new Point(point.x, point.y, point.z, polygon.layer)
             node2D.belongsTo = []
+            node2D.id="node2D"
             node2D.itemType = 'node2D'
             node2D.layer = polygon.layer
             node2D.masterHandle = {
@@ -40,35 +39,19 @@ export function generateNodes2D(polygons, constructionPolyline) {
             index: i,
             polygon
           })
+          node2D.id+="_"+polygon.id+"_"+i
         })
       })
-    if (constructionPolyline) {
-      constructionPolyline.outline.forEach((point, i) => {
-        //check if nodes2D already exist
-        const node2D = new Point(
-          point.x,
-          point.y,
-          point.z,
-          constructionPolyline.layer
-        )
-        node2D.belongsTo = [
-          {
-            polygonId: constructionPolyline.id,
-            index: i,
-            polygon: constructionPolyline
-          }
-        ]
-        node2D.itemType = 'node2D'
-        node2D.layer = constructionPolyline.layer
-        nodes2D.push(node2D)
-      })
-    }
+ 
     //all nodes has been created. now lets update open/selected field
     nodes2D.forEach((node2D) => {
       if (node2D.masterHandle) {
         node2D.masterHandle.open =
-          node2D.belongsTo.filter((item) => item.polygon.outline[item.index].open)
+          node2D.belongsTo.filter((item) => item.polygon.outline[item.index].open || item.polygon.outline[item.index].hasWarning)
             .length > 0
+        node2D.masterHandle.hasWarning =
+        node2D.belongsTo.filter((item) => item.polygon.outline[item.index].hasWarning)
+          .length > 0
         node2D.masterHandle.selected =
           node2D.belongsTo.filter(
             (item) => item.polygon.outline[item.index].selected
@@ -92,6 +75,7 @@ export function generateNodes3D(polygons) {
           if (!node3D) {
             node3D = new Point(point.x, point.y, point.z, polygon.layer)
             node3D.belongsTo = []
+            node3D.id="node3D"
             node3D.itemType = 'node3D'
             node3D.layer = polygon.layer
             node3D.masterHandle = {
@@ -107,6 +91,7 @@ export function generateNodes3D(polygons) {
             index: i,
             polygon
           })
+          node3D.id+="_"+polygon.id+"_"+i
         })
       })
     //all nodes has been created. now lets update open/selected field
@@ -124,13 +109,16 @@ export function generateNodes3D(polygons) {
     return nodes3D
   }
   
-export function generateEdges2D(polygons, constructionPolyline) {
+export function generateEdges2D(polygons) {
     let edges2D = []
     polygons
-      .filter((poly) => ['roof', 'obstacle'].includes(poly.layer))
+      .filter((poly) => ['roof', 'obstacle','moduleField','construction'].includes(poly.layer))
       .forEach((polygon) => {
         const outline = polygon.outline
         outline.forEach((point, i) => {
+          if(!polygon.isClosed && i==outline.length-1){
+            return
+          }
           //check if edge2D already exist
           const nextPoint = outline[(i + 1) % outline.length]
           let edge2D = edges2D.find((edge) => {
@@ -142,6 +130,7 @@ export function generateEdges2D(polygons, constructionPolyline) {
           if (!edge2D) {
             //create an edge at this position
             edge2D = new Line(point, nextPoint, polygon.layer)
+            edge2D.id='edge2D'
             edge2D.belongsTo = []
             edge2D.layer = polygon.layer
             edge2D.selected = false
@@ -154,31 +143,9 @@ export function generateEdges2D(polygons, constructionPolyline) {
             index: i,
             polygon
           })
+          edge2D.id+="_"+polygon.id+"_"+i
         })
       })
-    if (constructionPolyline) {
-      constructionPolyline.outline.forEach((point, i) => {
-        //check if nodes2D already exist
-        if (i != constructionPolyline.outline.length - 1) {
-          const nextPoint =
-            constructionPolyline.outline[
-              (i + 1) % constructionPolyline.outline.length
-            ]
-          const edge2D = new Line(point, nextPoint, constructionPolyline.layer)
-          edge2D.belongsTo = [
-            {
-              polygonId: constructionPolyline.id,
-              index: i,
-              polygon: constructionPolyline
-            }
-          ]
-          edge2D.layer = constructionPolyline.layer
-          edge2D.selected = false
-          edge2D.itemType = 'edge2D'
-          edges2D.push(edge2D)
-        }
-      })
-    }
     return edges2D
   }
   
@@ -198,6 +165,7 @@ export function generateEdges3D(polygons) {
           if (!edge3D) {
             //create an edge at this position
             edge3D = new Line(point, nextPoint, polygon.layer)
+            edge3D.id='edge3D'
             edge3D.belongsTo = []
             edge3D.layer = polygon.layer
             edge3D.selected = false
@@ -210,6 +178,7 @@ export function generateEdges3D(polygons) {
             index: i,
             polygon
           })
+          edge3D.id+="_"+polygon.id+"_"+i
         })
       })
     return edges3D