继续

src/graphic/Controls/AddPoint.js

@@ -52,8 +52,10 @@ export default class AddPoint {
   setLocationByAngle(testPointId) {
     let basePoint = this.isFocusBasePoint();
     if (!basePoint) {
+      console.error("没有基准点");
       return;
     }
+    console.error("选中基准点：" + basePoint.vectorId);
     let testPoint = dataService.getPoint(testPointId);
     if (testPoint.getCategory() != VectorCategory.Point.TestPoint) {
       return;

src/graphic/Controls/MovePoint.js

@@ -29,6 +29,8 @@ export default class MovePoint {
         category != VectorCategory.Point.TestPoint
       ) {
         pointService.mergePoint(pointId, listenLayer.modifyPoint.linkedPointId);
+      } else if (category == VectorCategory.Point.BasePoint) {
+        Settings.selectBasePointId = pointId;
       }
     }
   }

src/graphic/Controls/UIControl.js

@@ -71,8 +71,7 @@ export default class UIControl {
       } else if (this.selectUI != selectUI) {
         if (this.selectUI != null) {
           //先取消当前事件和进程
-          stateService.clear();
-          //。。。。
+          this.layer.exit();
         }
 
         //执行新的事件

src/graphic/Renderer/Render.js

@@ -35,6 +35,9 @@ export default class Render {
       case VectorType.CrossPoint:
         draw.drawCrossPoint(vector);
         return;
+      case VectorType.Point:
+        draw.drawPoint(vector);
+        break;
       case VectorType.Line:
         draw.drawLine(vector); //需要修改，有几种情况：测量，校准，基准
         break;
@@ -119,9 +122,9 @@ export default class Render {
       this.drawGeometry(roads[key]);
     }
 
-    let points = dataService.getRoadPoints();
-    for (let key in points) {
-      this.drawGeometry(points[key]);
+    let roadPoints = dataService.getRoadPoints();
+    for (let key in roadPoints) {
+      this.drawGeometry(roadPoints[key]);
     }
 
     let curveRoads = dataService.getCurveRoads();
@@ -134,6 +137,11 @@ export default class Render {
       this.drawGeometry(crossPoints[key]);
     }
 
+    let points = dataService.getPoints();
+    for (let key in points) {
+      this.drawGeometry(points[key]);
+    }
+
     let lines = dataService.getLines();
     for (let key in lines) {
       this.drawGeometry(lines[key]);

src/graphic/Settings.js

@@ -21,5 +21,6 @@ const Settings = {
   pointCategory: VectorCategory.Point.NormalPoint,
   locationMode: Constant.angleLocationMode,
   baseLineId: null, //基准线id，有且只有一条
+  selectBasePointId: null, //选中的基准点
 };
 export default Settings;