Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/test/SS-t-P1d6CwREny2/attach/sceneStore

public/static/lib/potree/potree.js

@@ -138754,7 +138754,11 @@ ENDSEC
 	                }
 	                this.images360.panos.forEach(pano=>{
 	                    Potree.Utils.updateVisible(pano, 'screenshot', true);
-	                });    
+	                }); 
+	                viewer.scene.measurements.forEach((e)=>{
+	                    Potree.Utils.updateVisible(e, 'screenshot', true);  
+	                });
+	                
 	                Potree.Utils.updateVisible(this.reticule, 'screenshot', true);
 	                 
 	            
@@ -138829,7 +138833,12 @@ ENDSEC
 	            this.images360.panos.forEach(pano=>{//令漫游点不可见
 	                Potree.Utils.updateVisible(pano, 'screenshot', false);
 	            }); 
-	        }                    
+	        } 
+	        if(info.hideMeasures){
+	            viewer.scene.measurements.forEach((e)=>{
+	                Potree.Utils.updateVisible(e, 'screenshot', false);  
+	            });
+	        }            
 	        Potree.Utils.updateVisible(this.reticule, 'screenshot', false);//令reticule不可见 
 	                                
 	        

src/graphic/Controls/AddLine.js

@@ -5,6 +5,7 @@ import VectorCategory from "../enum/VectorCategory";
 import Point from "../Geometry/Point.js";
 import { mathUtil } from "../Util/MathUtil";
 import Settings from "../Settings";
+import { pointService } from "../Service/PointService";
 
 export default class AddLine {
   constructor() {
@@ -63,7 +64,7 @@ export default class AddLine {
       this.newLine.getCategory() != VectorCategory.Line.ArrowLine &&
       this.newLine.getCategory() != VectorCategory.Line.GuideLine
     ) {
-      lineService.mergePoint(
+      pointService.mergePoint(
         this.newLine.endId,
         listenLayer.modifyPoint.linkedPointId
       );

src/graphic/Controls/MovePoint.js

@@ -1,5 +1,9 @@
 import { dataService } from "../Service/DataService";
+import { pointService } from "../Service/PointService";
 import Settings from "../Settings";
+import VectorCategory from "../enum/VectorCategory";
+import { listenLayer } from "../ListenLayer";
+
 export default class MovePoint {
   constructor() {}
 
@@ -9,6 +13,26 @@ export default class MovePoint {
     point.y = position.y;
   }
 
+  finish(pointId) {
+    if (
+      pointId &&
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedPointId
+    ) {
+      let linkedPoint = dataService.getPoint(
+        listenLayer.modifyPoint.linkedPointId
+      );
+      const category = linkedPoint.getCategory();
+      if (
+        category != VectorCategory.Point.BasePoint &&
+        category != VectorCategory.Point.TestBasePoint &&
+        category != VectorCategory.Point.TestPoint
+      ) {
+        pointService.mergePoint(pointId, listenLayer.modifyPoint.linkedPointId);
+      }
+    }
+  }
+
   //直角定位法
   //movePointForLocationByAngle(testPointId, basePointId) {
   movePointByAngleLocation(pointId) {

src/graphic/Layer.js

@@ -819,6 +819,7 @@ export default class Layer {
         break;
       case LayerEvents.MovePoint:
         needAutoRedraw = true;
+        movePoint.finish(draggingItem.vectorId);
         this.history.save();
         break;
       case LayerEvents.MoveCircle:
@@ -856,7 +857,7 @@ export default class Layer {
     dataService.setGridForZoom(
       coordinate.width,
       coordinate.height,
-      (coordinate.res * coordinate.zoom) / coordinate.defaultZoom
+      coordinate.zoom / coordinate.defaultZoom
     );
     this.renderer.autoRedraw();
   }

src/graphic/Load.js

@@ -145,6 +145,9 @@ export default class Load {
           );
         }
       }
+      if (data3d.meterPerPixel) {
+        coordinate.setRes(data3d.meterPerPixel);
+      }
     }
     this.layer.history.init();
     this.layer.renderer.autoRedraw();

src/graphic/Service/DataService.js

@@ -70,11 +70,9 @@ export class DataService {
     this.grid.startX += dx;
     this.grid.startY += dy;
     this.grid.step1 =
-      (this.grid.defalutstep1 * coordinate.res * coordinate.zoom) /
-      coordinate.defaultZoom;
+      (this.grid.defalutstep1 * coordinate.zoom) / coordinate.defaultZoom;
     this.grid.step2 =
-      (this.grid.defalutstep2 * coordinate.res * coordinate.zoom) /
-      coordinate.defaultZoom;
+      (this.grid.defalutstep2 * coordinate.zoom) / coordinate.defaultZoom;
     while (this.grid.startX > 0) {
       this.grid.startX -= this.grid.step2;
     }

src/graphic/Service/LineService.js

@@ -72,26 +72,18 @@ export default class LineService {
     return newLine;
   }
 
-  //将pointId1合并到pointId2
-  mergePoint(pointId1, pointId2) {
-    if (pointId1 == pointId2) {
-      return;
-    } else if (pointId1 != null && pointId2 != null) {
-      let point1 = dataService.getPoint(pointId1);
-      let parent1 = point1.getParent();
-      let point2 = dataService.getPoint(pointId2);
-      for (let key in parent1) {
-        let line = dataService.getLine(key);
-        let dir = line.getDir(pointId1);
-        if (dir == "start") {
-          line.startId = pointId2;
-        } else if (dir == "end") {
-          line.endId = pointId2;
-        }
-        point2.setPointParent(key, dir);
+  getLine(pointId1, pointId2) {
+    let lines = dataService.getLines();
+    for (let key in lines) {
+      const line = dataService.getLine(key);
+      if (
+        (line.startId == pointId1 && line.endId == pointId2) ||
+        (line.endId == pointId1 && line.startId == pointId2)
+      ) {
+        return key;
       }
-      dataService.deletePoint(pointId1);
     }
+    return null;
   }
 }
 

src/graphic/Service/PointService.js

@@ -3,6 +3,7 @@ import Line from "../Geometry/Line.js";
 import { dataService } from "./DataService.js";
 import VectorCategory from "../enum/VectorCategory.js";
 import { mathUtil } from "../Util/MathUtil.js";
+import { lineService } from "./LineService.js";
 export default class PointService {
   constructor() {}
 
@@ -11,6 +12,35 @@ export default class PointService {
     dataService.addPoint(point);
     return point;
   }
+
+  //将pointId1合并到pointId2
+  mergePoint(pointId1, pointId2) {
+    if (pointId1 == pointId2) {
+      return;
+    } else if (pointId1 != null && pointId2 != null) {
+      let point1 = dataService.getPoint(pointId1);
+      let parent1 = point1.getParent();
+      let point2 = dataService.getPoint(pointId2);
+      if (mathUtil.equalPoint(point1, point2)) {
+        let lineId = lineService.getLine(pointId1, pointId2);
+        if (lineId) {
+          dataService.deleteLine(lineId);
+          return;
+        }
+      }
+      for (let key in parent1) {
+        let line = dataService.getLine(key);
+        let dir = line.getDir(pointId1);
+        if (dir == "start") {
+          line.startId = pointId2;
+        } else if (dir == "end") {
+          line.endId = pointId2;
+        }
+        point2.setPointParent(key, dir);
+      }
+      dataService.deletePoint(pointId1);
+    }
+  }
 }
 
 const pointService = new PointService();

src/graphic/Service/UIService.js

@@ -81,17 +81,24 @@ export default class UIService {
   }
 
   isBelongPoint(ui) {
-    // if (ui == UIEvents.Arrow) {
-    //   this.setLineCategory(VectorCategory.Line.ArrowLine);
-    //   return true;
-    // } else if (ui == UIEvents.MeasureLine) {
-    //   this.setLineCategory(VectorCategory.Line.MeasureLine);
-    //   return true;
-    // } else if (ui == UIEvents.Line) {
-    //   this.setLineCategory(VectorCategory.Line.NormalLine);
-    //   return true;
-    // }
-    // return false;
+    if (ui == UIEvents.NormalLocationMode) {
+      this.setPointCategory(VectorCategory.Point.TestPoint);
+      this.setLocationMode(Constant.normalLocationMode);
+      return true;
+    } else if (ui == UIEvents.AngleLocationMode) {
+      this.setPointCategory(VectorCategory.Point.TestPoint);
+      this.setLocationMode(Constant.angleLocationMode);
+      return true;
+    } else if (ui == UIEvents.AllLocationMode) {
+      this.setPointCategory(VectorCategory.Point.TestPoint);
+      this.setLocationMode(Constant.allLocationMode);
+      return true;
+    } else if (ui == UIEvents.BasePoint) {
+      this.setPointCategory(VectorCategory.Point.BasePoint);
+      this.setLocationMode(null);
+      return true;
+    }
+    return false;
   }
 
   setWayType(value) {

src/sdk/laser/core/enter.js

@@ -305,6 +305,7 @@ var enter = ({
                         type: "measure",
                         measurement: measure,
                         hideMarkers: true,
+                        hideMeasures:true,
                         ifGetPose: true,
                     },
                         width,