Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/test/a0k4xu045_202305311600080410/attach/sceneStore
bill 2 years ago
parent
commit
e61d45f177

+ 2 - 0
src/graphic/Geometry/CurveRoad.js

@@ -1,6 +1,7 @@
 import VectorType from "../enum/VectorType.js";
 import Road from "./Road.js";
 import Settings from "../Settings";
+import Constant from "../Constant.js";
 
 export default class CurveRoad extends Road {
   constructor(startId, endId, vectorId) {
@@ -27,6 +28,7 @@ export default class CurveRoad extends Road {
     this.singleCurveRoadWidth =
       Settings.singleCurveRoadDrivewayCount * Settings.singleLaneWidth* window.coordinate.ratio;
     this.geoType = VectorType.CurveRoad;
+    this.setWay(Constant.twoWay)
     this.setId(vectorId);
   }
 

+ 0 - 1
src/graphic/Layer.js

@@ -705,7 +705,6 @@ export default class Layer {
             y: listenLayer.modifyPoint.y,
           };
         }
-
         elementService.execute(addRoad.startInfo.position, position);
         elementService.setPoint(position);
         elementService.setNewRoad(addRoad.startInfo.position, position);

+ 0 - 1
src/graphic/Service/ElementService.js

@@ -174,7 +174,6 @@ export class ElementService {
     this.newRoad.start.setPosition(point1);
     this.newRoad.end.setPosition(point2);
     this.newRoad.setWay(Settings.wayType);
-
     //需要更新Edge坐标
     if (!mathUtil.equalPoint(point1, point2)) {
       let edgePoints = null;