继续

src/graphic/Controls/AddCrossRoad.js

@@ -13,20 +13,20 @@ export default class AddCrossRoad {
   //三岔口
   buildThree(position) {
     const len = 300;
-    let start = roadPointService.create(position);
-    let end1 = roadPointService.create({
-      x: start.x,
-      y: start.y + len,
+    let end = roadPointService.create(position);
+    let start1 = roadPointService.create({
+      x: end.x,
+      y: end.y + len,
     });
 
-    let end2 = roadPointService.create({
-      x: start.x + len,
-      y: start.y,
+    let start2 = roadPointService.create({
+      x: end.x + len,
+      y: end.y,
     });
 
-    let end3 = roadPointService.create({
-      x: start.x - len,
-      y: start.y,
+    let start3 = roadPointService.create({
+      x: end.x - len,
+      y: end.y,
     });
 
     //需要设置公路的车道数，是否双向等等
@@ -35,34 +35,34 @@ export default class AddCrossRoad {
     // this.singleRoadDrivewayCount = Setting.singleRoadDrivewayCount;
     // this.way = Setting.wayType;
 
-    roadService.create(start.vectorId, end1.vectorId);
-    roadService.create(start.vectorId, end2.vectorId);
-    roadService.create(start.vectorId, end3.vectorId);
-    edgeService.updateEdgeForMulRoad(start.vectorId);
+    roadService.create(start1.vectorId, end.vectorId);
+    roadService.create(start2.vectorId, end.vectorId);
+    roadService.create(start3.vectorId, end.vectorId);
+    edgeService.updateEdgeForMulRoad(end.vectorId);
   }
 
   //四岔口
   buildFour(position) {
     const len = 300;
-    let start = roadPointService.create(position);
-    let end1 = roadPointService.create({
-      x: start.x,
-      y: start.y + len,
+    let end = roadPointService.create(position);
+    let start1 = roadPointService.create({
+      x: end.x,
+      y: end.y + len,
     });
 
-    let end2 = roadPointService.create({
-      x: start.x,
-      y: start.y - len,
+    let start2 = roadPointService.create({
+      x: end.x,
+      y: end.y - len,
     });
 
-    let end3 = roadPointService.create({
-      x: start.x + len,
-      y: start.y,
+    let start3 = roadPointService.create({
+      x: end.x + len,
+      y: end.y,
     });
 
-    let end4 = roadPointService.create({
-      x: start.x - len,
-      y: start.y,
+    let start4 = roadPointService.create({
+      x: end.x - len,
+      y: end.y,
     });
 
     //需要设置公路的车道数，是否双向等等
@@ -71,29 +71,29 @@ export default class AddCrossRoad {
     // this.singleRoadDrivewayCount = Setting.singleRoadDrivewayCount;
     // this.way = Setting.wayType;
 
-    roadService.create(start.vectorId, end1.vectorId);
-    roadService.create(start.vectorId, end2.vectorId);
-    roadService.create(start.vectorId, end3.vectorId);
-    roadService.create(start.vectorId, end4.vectorId);
-    edgeService.updateEdgeForMulRoad(start.vectorId);
+    roadService.create(start1.vectorId, end.vectorId);
+    roadService.create(start2.vectorId, end.vectorId);
+    roadService.create(start3.vectorId, end.vectorId);
+    roadService.create(start4.vectorId, end.vectorId);
+    edgeService.updateEdgeForMulRoad(end.vectorId);
   }
 
   //五岔口
   buildFive(position) {
     const len = 300;
     const points = mathUtil.createFivePointedStar(position, len);
-    let start = roadPointService.create(position);
-    let end1 = roadPointService.create(points[0]);
-    let end2 = roadPointService.create(points[1]);
-    let end3 = roadPointService.create(points[2]);
-    let end4 = roadPointService.create(points[3]);
-    let end5 = roadPointService.create(points[4]);
-    roadService.create(start.vectorId, end1.vectorId);
-    roadService.create(start.vectorId, end2.vectorId);
-    roadService.create(start.vectorId, end3.vectorId);
-    roadService.create(start.vectorId, end4.vectorId);
-    roadService.create(start.vectorId, end5.vectorId);
-    edgeService.updateEdgeForMulRoad(start.vectorId);
+    let end = roadPointService.create(position);
+    let start1 = roadPointService.create(points[0]);
+    let start2 = roadPointService.create(points[1]);
+    let start3 = roadPointService.create(points[2]);
+    let start4 = roadPointService.create(points[3]);
+    let start5 = roadPointService.create(points[4]);
+    roadService.create(start1.vectorId, end.vectorId);
+    roadService.create(start2.vectorId, end.vectorId);
+    roadService.create(start3.vectorId, end.vectorId);
+    roadService.create(start4.vectorId, end.vectorId);
+    roadService.create(start5.vectorId, end.vectorId);
+    edgeService.updateEdgeForMulRoad(end.vectorId);
   }
 }