改进

src/graphic/Controls/AddPoint.js

@@ -19,13 +19,13 @@ export default class AddPoint {
 
   buildPoint(position) {
     let newPoint;
-    if (Settings.pointCategory == VectorCategory.Point.BasePoint) {
+    if (Settings.selectPointCategory == VectorCategory.Point.BasePoint) {
       newPoint = pointService.create(position);
       Settings.selectBasePointId = newPoint.vectorId;
     } else {
       if (
         Settings.selectBasePointId != null &&
-        Settings.locationMode == Constant.angleLocationMode
+        Settings.selectLocationMode == Constant.angleLocationMode
       ) {
         newPoint = pointService.create(position);
         this.setLocationByAngle(newPoint.vectorId);
@@ -33,20 +33,20 @@ export default class AddPoint {
         stateService.setEventName(LayerEvents.AddPoint);
       } else if (
         Settings.selectBasePointId != null &&
-        Settings.locationMode == Constant.allLocationMode
+        Settings.selectLocationMode == Constant.allLocationMode
       ) {
         newPoint = pointService.create(position);
         this.setLocationByAll(newPoint.vectorId);
         newPoint.setLocationMode(Constant.allLocationMode);
         stateService.setEventName(LayerEvents.AddPoint);
-      } else if (Settings.locationMode == Constant.normalLocationMode) {
+      } else if (Settings.selectLocationMode == Constant.normalLocationMode) {
         newPoint = pointService.create(position);
         this.setLocationByNormal(newPoint.vectorId);
         newPoint.setLocationMode(Constant.normalLocationMode);
       } else if (
         Settings.selectBasePointId == null &&
-        (Settings.locationMode == Constant.angleLocationMode ||
-          Settings.locationMode == Constant.allLocationMode)
+        (Settings.selectLocationMode == Constant.angleLocationMode ||
+          Settings.selectLocationMode == Constant.allLocationMode)
       ) {
         return null;
       }

src/graphic/Controls/UIControl.js

@@ -153,8 +153,8 @@ export default class UIControl {
         break;
     }
     this.layer.exit();
-    uiService.setLineCategory(VectorCategory.Line.NormalLine);
-    uiService.setPointCategory(VectorCategory.Point.NormalPoint);
+    uiService.setSelectLineCategory(VectorCategory.Line.NormalLine);
+    uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
     this.focusVector = null;
   }
 
@@ -292,7 +292,7 @@ export default class UIControl {
 
   menu_clear() {
     dataService.clear();
-    Settings.locationMode = null;
+    Settings.selectLocationMode = null;
     Settings.baseLineId = null;
     Settings.selectBasePointId = null;
     elementService.hideAll();
@@ -318,9 +318,8 @@ export default class UIControl {
     console.log("确认");
     this.graphicStateUI.continuedMode = false;
     this.layer.exit();
-    uiService.setLineCategory(VectorCategory.Line.NormalLine);
-    uiService.setPointCategory(VectorCategory.Point.NormalPoint);
-    this.focusVector = null;
+    uiService.setSelectLineCategory(VectorCategory.Line.NormalLine);
+    uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
     this.layer.history.save();
     this.layer.renderer.autoRedraw();
   }
@@ -329,9 +328,8 @@ export default class UIControl {
     this.graphicStateUI.continuedMode = false;
     addPoint.deleteTestPoints();
     this.layer.exit();
-    uiService.setLineCategory(VectorCategory.Line.NormalLine);
-    uiService.setPointCategory(VectorCategory.Point.NormalPoint);
-    this.focusVector = null;
+    uiService.setSelectLineCategory(VectorCategory.Line.NormalLine);
+    uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
     this.layer.history.save();
     this.layer.renderer.autoRedraw();
   }

src/graphic/Geometry/Line.js

@@ -11,7 +11,7 @@ export default class Line extends Geometry {
     super();
     this.startId = startId;
     this.endId = endId;
-    this.category = Settings.lineCategory;
+    this.category = Settings.selectLineCategory;
     this.color = Style.ArrowLine.strokeStyle; //箭头类型会用到
     this.value = null; //测量线会用到
     this.geoType = VectorType.Line;
@@ -21,7 +21,7 @@ export default class Line extends Geometry {
   //NormalLine,GuideLine，MeasureLine，BaseLine
   setCategory(value) {
     if (!value) {
-      this.category = Settings.lineCategory;
+      this.category = Settings.selectLineCategory;
     } else {
     }
     this.category = value;

src/graphic/Geometry/Point.js

@@ -12,7 +12,7 @@ export default class Point extends Geometry {
     this.linkedBasePointId = null; //关联基准点
     this.linkedTestPointId = null; //关联待测点
     this.locationMode = null; //如果该点是待测点，采用的定位法是哪种
-    this.category = Settings.pointCategory;
+    this.category = Settings.selectPointCategory;
     this.geoType = VectorType.Point;
     this.setId(vectorId);
 
@@ -47,7 +47,7 @@ export default class Point extends Geometry {
   //基准点：BasePoint
   setCategory(value) {
     if (!value) {
-      this.category = Settings.pointCategory;
+      this.category = Settings.selectPointCategory;
     } else {
       this.category = value;
     }

src/graphic/History/HistoryUtil.js

@@ -250,9 +250,9 @@ export default class HistoryUtil {
 
   isDifferentForSettings(settings1, settings2) {
     if (
-      settings1.lineCategory == settings2.lineCategory &&
-      settings1.pointCategory == settings2.pointCategory &&
-      settings1.locationMode == settings2.locationMode &&
+      settings1.selectLineCategory == settings2.selectLineCategory &&
+      settings1.selectPointCategory == settings2.selectPointCategory &&
+      settings1.selectLocationMode == settings2.selectLocationMode &&
       settings1.baseLineId == settings2.baseLineId &&
       settings1.selectBasePointId == settings2.selectBasePointId
     ) {
@@ -488,9 +488,9 @@ export default class HistoryUtil {
   }
 
   assignSettingsFromSettings(settings1, settings2) {
-    settings1.lineCategory = settings2.lineCategory;
-    settings1.pointCategory = settings2.pointCategory;
-    settings1.locationMode = settings2.locationMode;
+    settings1.selectLineCategory = settings2.selectLineCategory;
+    settings1.selectPointCategory = settings2.selectPointCategory;
+    settings1.selectLocationMode = settings2.selectLocationMode;
     settings1.baseLineId = settings2.baseLineId;
     settings1.selectBasePointId = settings2.selectBasePointId;
   }
@@ -715,9 +715,9 @@ export default class HistoryUtil {
 
   getDataForSettings(settings) {
     const data = {};
-    data.lineCategory = settings.lineCategory;
-    data.pointCategory = settings.pointCategory;
-    data.locationMode = settings.locationMode;
+    data.selectLineCategory = settings.selectLineCategory;
+    data.selectPointCategory = settings.selectPointCategory;
+    data.selectLocationMode = settings.selectLocationMode;
     data.baseLineId = settings.baseLineId;
     data.selectBasePointId = settings.selectBasePointId;
     return data;

src/graphic/Layer.js

@@ -312,13 +312,11 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.hideAll();
+        //鼠标样式
         elementService.setPoint(position);
         elementService.showPoint();
-        if (listenLayer.modifyPoint) {
-          elementService.execute(listenLayer.modifyPoint, position);
-        }
+        this.showElementLine(position);
         break;
       case LayerEvents.AddLine:
         needAutoRedraw = true;
@@ -329,13 +327,10 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.hideAll();
         elementService.setPoint(position);
         elementService.showPoint();
-        if (listenLayer.modifyPoint) {
-          elementService.execute(listenLayer.modifyPoint, position);
-        }
+        this.showElementLine(position);
         break;
       case LayerEvents.AddCurveLine:
         needAutoRedraw = true;
@@ -346,13 +341,10 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.hideAll();
         elementService.setPoint(position);
         elementService.showPoint();
-        if (listenLayer.modifyPoint) {
-          elementService.execute(listenLayer.modifyPoint, position);
-        }
+        this.showElementLine(position);
         break;
       case LayerEvents.AddCircle:
         needAutoRedraw = true;
@@ -363,13 +355,10 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.hideAll();
         elementService.setPoint(position);
         elementService.showPoint();
-        if (listenLayer.modifyPoint) {
-          elementService.execute(listenLayer.modifyPoint, position);
-        }
+        this.showElementLine(position);
         break;
       case LayerEvents.AddingRoad:
         needAutoRedraw = true;
@@ -393,6 +382,8 @@ export default class Layer {
         } else {
           elementService.setNewRoadState("normal");
         }
+        elementService.showPoint();
+        this.showElementLine(position);
         break;
       case LayerEvents.AddingLine:
         needAutoRedraw = true;
@@ -412,13 +403,17 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-        elementService.execute(addLine.startInfo.position, position);
-        elementService.setPoint(position);
+        // elementService.execute(addLine.startInfo.position, position);
+        // elementService.setPoint(position);
         if (addLine.newLine == null) {
           addLine.buildLine(position);
         } else {
           addLine.updateLine(position);
         }
+        elementService.hideAll();
+        elementService.setPoint(position);
+        elementService.showPoint();
+        this.showElementLine(position);
         break;
       case LayerEvents.AddingCurveLine:
         needAutoRedraw = true;
@@ -438,13 +433,17 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-        elementService.execute(addLine.startInfo.position, position);
-        elementService.setPoint(position);
+        // elementService.execute(addLine.startInfo.position, position);
+        // elementService.setPoint(position);
         if (addLine.newLine == null) {
           addLine.buildCurveLine(position);
         } else {
           addLine.updateCurveLine(position);
         }
+        elementService.hideAll();
+        elementService.setPoint(position);
+        elementService.showPoint();
+        this.showElementLine(position);
         break;
       case LayerEvents.AddingCircle:
         needAutoRedraw = true;
@@ -459,13 +458,17 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-        elementService.execute(addCircle.center, position);
-        elementService.setPoint(position);
+        // elementService.execute(addCircle.center, position);
+        // elementService.setPoint(position);
         if (addCircle.newCircle == null) {
           addCircle.buildCircle(position);
         } else {
           addCircle.updateCircle(position);
         }
+        elementService.hideAll();
+        elementService.setPoint(position);
+        elementService.showPoint();
+        this.showElementLine(position);
         break;
       case LayerEvents.MoveRoad:
         needAutoRedraw = true;
@@ -506,36 +509,7 @@ export default class Layer {
         if (!flag) {
           elementService.hideAll();
         } else {
-          // point = dataService.getRoadPoint(draggingItem.vectorId);
-          // listenLayer.start(point, {
-          //   exceptRoadPointId: draggingItem.vectorId,
-          //   exceptRoadIds: point.parent,
-          // });
-          let otherPoint = null;
-          if (
-            listenLayer.modifyPoint &&
-            listenLayer.modifyPoint.linkedRoadPointId
-          ) {
-            otherPoint = dataService.getRoadPoint(
-              listenLayer.modifyPoint.linkedRoadPointId
-            );
-          } else if (
-            listenLayer.modifyPoint &&
-            listenLayer.modifyPoint.linkedRoadPointIdX
-          ) {
-            otherPoint = dataService.getRoadPoint(
-              listenLayer.modifyPoint.linkedRoadPointIdX
-            );
-          } else if (
-            listenLayer.modifyPoint &&
-            listenLayer.modifyPoint.linkedRoadPointIdY
-          ) {
-            otherPoint = dataService.getRoadPoint(
-              listenLayer.modifyPoint.linkedRoadPointIdY
-            );
-          }
-
-          elementService.execute(otherPoint, point);
+          this.showElementLine(point);
         }
         needAutoRedraw = true;
         break;
@@ -548,13 +522,10 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.hideAll();
         elementService.setPoint(position);
         elementService.showPoint();
-        if (listenLayer.modifyPoint) {
-          elementService.execute(listenLayer.modifyPoint, position);
-        }
+        this.showElementLine(position);
         break;
       case LayerEvents.AddingCurveRoad:
         needAutoRedraw = true;
@@ -578,6 +549,8 @@ export default class Layer {
         } else {
           elementService.setNewRoadState("normal");
         }
+        elementService.showPoint();
+        this.showElementLine(position);
         break;
       case LayerEvents.MoveCurveRoad:
         needAutoRedraw = true;
@@ -603,6 +576,7 @@ export default class Layer {
           };
         }
         moveRoad.moveCurveRoadPoint(draggingItem.vectorId, position);
+        this.showElementLine(point);
         needAutoRedraw = true;
         break;
       case LayerEvents.MoveCrossPoint:
@@ -650,6 +624,7 @@ export default class Layer {
             };
           }
           movePoint.movePoint(position, draggingItem.vectorId);
+          this.showElementLine(point);
           needAutoRedraw = true;
         }
         break;
@@ -667,6 +642,7 @@ export default class Layer {
             };
           }
           movePoint.moveCurvePoint(position, draggingItem.vectorId);
+          this.showElementLine(curvePoint);
           needAutoRedraw = true;
         }
         break;
@@ -941,7 +917,7 @@ export default class Layer {
         needAutoRedraw = true;
         if (draggingItem && draggingItem.vectorId) {
           movePoint.finish(draggingItem.vectorId);
-          uiService.setPointCategory(VectorCategory.Point.NormalPoint);
+          uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
         }
         this.history.save();
         break;
@@ -960,12 +936,11 @@ export default class Layer {
       case LayerEvents.AddPoint:
         if (
           Settings.selectBasePointId != null &&
-          (Settings.locationMode == Constant.angleLocationMode ||
-            Settings.locationMode == Constant.allLocationMode)
+          (Settings.selectLocationMode == Constant.angleLocationMode ||
+            Settings.selectLocationMode == Constant.allLocationMode)
         ) {
           this.uiControl.showConfirm();
           needAutoRedraw = true;
-          this.history.save();
           elementService.hideAll();
         }
         break;
@@ -1244,7 +1219,7 @@ export default class Layer {
         if (Settings.isMobile) {
           stateService.clearEventName();
           this.exit();
-          uiService.setLineCategory(VectorCategory.Line.NormalLine);
+          uiService.setSelectLineCategory(VectorCategory.Line.NormalLine);
         } else {
           stateService.setEventName(LayerEvents.AddLine);
         }
@@ -1260,8 +1235,8 @@ export default class Layer {
       } else if (
         eventName == LayerEvents.AddPoint &&
         Settings.selectBasePointId != null &&
-        (Settings.locationMode == Constant.angleLocationMode ||
-          Settings.locationMode == Constant.allLocationMode)
+        (Settings.selectLocationMode == Constant.angleLocationMode ||
+          Settings.selectLocationMode == Constant.allLocationMode)
       ) {
       } else {
         stateService.clearEventName();
@@ -1313,4 +1288,76 @@ export default class Layer {
       this.uiControl.graphicStateUI.existsBaseLine = false;
     }
   }
+
+  showElementLine(point) {
+    let otherPoint1 = null;
+    let otherPoint2 = null;
+    if (listenLayer.modifyPoint && listenLayer.modifyPoint.linkedRoadPointIdX) {
+      otherPoint1 = dataService.getRoadPoint(
+        listenLayer.modifyPoint.linkedRoadPointIdX
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedCurvePointIdX
+    ) {
+      otherPoint1 = dataService.getCurveRoadPoint(
+        listenLayer.modifyPoint.linkedCurvePointIdX
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedPointIdX
+    ) {
+      otherPoint1 = dataService.getPoint(
+        listenLayer.modifyPoint.linkedPointIdX
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedCurvePointIdX
+    ) {
+      otherPoint1 = dataService.getCurvePoint(
+        listenLayer.modifyPoint.linkedCurvePointIdX
+      );
+    }
+
+    if (listenLayer.modifyPoint && listenLayer.modifyPoint.linkedRoadPointIdY) {
+      otherPoint2 = dataService.getRoadPoint(
+        listenLayer.modifyPoint.linkedRoadPointIdY
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedCurvePointIdY
+    ) {
+      otherPoint2 = dataService.getCurveRoadPoint(
+        listenLayer.modifyPoint.linkedCurvePointIdY
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedPointIdY
+    ) {
+      otherPoint2 = dataService.getPoint(
+        listenLayer.modifyPoint.linkedPointIdY
+      );
+    } else if (
+      listenLayer.modifyPoint &&
+      listenLayer.modifyPoint.linkedCurvePointIdY
+    ) {
+      otherPoint2 = dataService.getCurvePoint(
+        listenLayer.modifyPoint.linkedCurvePointIdY
+      );
+    }
+
+    let otherPoint = {};
+    if (otherPoint1) {
+      otherPoint.x = otherPoint1.x;
+      otherPoint.y = otherPoint1.y;
+    }
+    if (otherPoint2) {
+      otherPoint.y = otherPoint2.y;
+      if (!otherPoint.hasOwnProperty("x")) {
+        otherPoint.x = otherPoint2.x;
+      }
+    }
+
+    elementService.execute(otherPoint, point);
+  }
 }

src/graphic/ListenLayer.js

@@ -290,7 +290,7 @@ export default class ListenLayer {
     return pointInfo;
   }
 
-  isSelectLine(position, exceptLineIds) {
+  isSelectLine(position, exceptLineId) {
     let lineInfo = {
       lineId: null,
       type: null,
@@ -298,7 +298,7 @@ export default class ListenLayer {
     };
     const lines = dataService.getLines();
     for (const lineId in lines) {
-      if (exceptLineIds && exceptLineIds.hasOwnProperty(lineId)) {
+      if (exceptLineId == lineId) {
         continue;
       }
       const line = dataService.getLine(lineId);

src/graphic/Renderer/Draw.js

@@ -184,9 +184,7 @@ const help = {
     ctx.save();
     ctx.translate(center.x, center.y);
     ctx.rotate((angle * Math.PI) / 180);
-    ctx.font = `${
-      (style.fontSize || 10) * coordinate.ratio
-    }px Microsoft YaHei`;
+    ctx.font = `${(style.fontSize || 10) * coordinate.ratio}px Microsoft YaHei`;
     const textCenter = help.getTextCenter(ctx, text);
     const padding = style.padding;
     help.roundRect(
@@ -611,16 +609,16 @@ export default class Draw {
   }
 
   drawCircle(element) {
-    const [_, label] = help.getVectorStyle(element)
+    const [_, label] = help.getVectorStyle(element);
     this.drawPoint({
       ...element,
-      radius: help.getReal(element.radius),
+      // radius: help.getReal(element.radius),
+      radius: (element.radius * coordinate.zoom) / coordinate.defaultZoom,
       geoType: "Circle",
       ...element.center,
     });
 
-
-    console.log(label)
+    console.log(label);
     label && element.points.forEach((point) => this.drawPoint(point));
   }
 
@@ -712,7 +710,12 @@ export default class Draw {
     this.context.font = `${
       vector.fontSize * coordinate.ratio
     }px Microsoft YaHei`;
-    this.drawTextByInfo(vector.center, vector.value, -(vector.angle || 0), false);
+    this.drawTextByInfo(
+      vector.center,
+      vector.value,
+      -(vector.angle || 0),
+      false
+    );
 
     const ctx = this.context;
     const pt = coordinate.getScreenXY(vector.center);
@@ -741,7 +744,6 @@ export default class Draw {
   }
 
   drawLineText(vector, style) {
-
     const startReal = dataService.getPoint(vector.startId);
     const endReal = dataService.getPoint(vector.endId);
     help.drawLineText(

src/graphic/Service/UIService.js

@@ -65,16 +65,16 @@ export default class UIService {
 
   isBelongLine(ui) {
     if (ui == UIEvents.Arrow) {
-      this.setLineCategory(VectorCategory.Line.ArrowLine);
+      this.setSelectLineCategory(VectorCategory.Line.ArrowLine);
       return true;
     } else if (ui == UIEvents.MeasureLine) {
-      this.setLineCategory(VectorCategory.Line.MeasureLine);
+      this.setSelectLineCategory(VectorCategory.Line.MeasureLine);
       return true;
     } else if (ui == UIEvents.Line) {
-      this.setLineCategory(VectorCategory.Line.NormalLine);
+      this.setSelectLineCategory(VectorCategory.Line.NormalLine);
       return true;
     } else if (ui == UIEvents.BaseLine) {
-      this.setLineCategory(VectorCategory.Line.BaseLine);
+      this.setSelectLineCategory(VectorCategory.Line.BaseLine);
       return true;
     }
     return false;
@@ -82,20 +82,20 @@ export default class UIService {
 
   isBelongPoint(ui) {
     if (ui == UIEvents.NormalLocationMode) {
-      this.setPointCategory(VectorCategory.Point.TestPoint);
-      this.setLocationMode(Constant.normalLocationMode);
+      this.setSelectPointCategory(VectorCategory.Point.TestPoint);
+      this.setSelectLocationMode(Constant.normalLocationMode);
       return true;
     } else if (ui == UIEvents.AngleLocationMode) {
-      this.setPointCategory(VectorCategory.Point.TestPoint);
-      this.setLocationMode(Constant.angleLocationMode);
+      this.setSelectPointCategory(VectorCategory.Point.TestPoint);
+      this.setSelectLocationMode(Constant.angleLocationMode);
       return true;
     } else if (ui == UIEvents.AllLocationMode) {
-      this.setPointCategory(VectorCategory.Point.TestPoint);
-      this.setLocationMode(Constant.allLocationMode);
+      this.setSelectPointCategory(VectorCategory.Point.TestPoint);
+      this.setSelectLocationMode(Constant.allLocationMode);
       return true;
     } else if (ui == UIEvents.BasePoint) {
-      this.setPointCategory(VectorCategory.Point.BasePoint);
-      this.setLocationMode(null);
+      this.setSelectPointCategory(VectorCategory.Point.BasePoint);
+      this.setSelectLocationMode(null);
       return true;
     }
     return false;
@@ -144,21 +144,17 @@ export default class UIService {
     Settings.rightRoadWidth = value;
   }
 
-  setLineCategory(value) {
-    Settings.lineCategory = value;
+  setSelectLineCategory(value) {
+    Settings.selectLineCategory = value;
   }
 
-  setPointCategory(value) {
-    Settings.pointCategory = value;
+  setSelectPointCategory(value) {
+    Settings.selectPointCategory = value;
   }
 
   //设置定位法
-  setLocationMode(value) {
-    Settings.locationMode = value;
-  }
-
-  getLocationMode() {
-    return Settings.locationMode;
+  setSelectLocationMode(value) {
+    Settings.selectLocationMode = value;
   }
 
   setSelectSVGType(value) {

src/graphic/Settings.js

@@ -19,12 +19,12 @@ const Settings = {
   roadMidDivideWidth: Constant.defaultMidDivideWidth,
   curveRoadMidDivideWidth: Constant.defaultMidDivideWidth,
   wayType: Constant.twoWay, //one表示单向，two表示双向
-  lineCategory: VectorCategory.Line.NormalLine,
-  pointCategory: VectorCategory.Point.NormalPoint,
-  locationMode: null,
+  isMobile: !os.isPc,
   baseLineId: null, //基准线id，有且只有一条
+  selectLineCategory: VectorCategory.Line.NormalLine,
+  selectPointCategory: VectorCategory.Point.NormalPoint,
+  selectLocationMode: null,
   selectBasePointId: null, //选中的基准点
-  isMobile: !os.isPc,
   selectSVGType: null,
 };
 export default Settings;