Prechádzať zdrojové kódy

Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

bill 2 rokov pred
rodič
commit
36a5782706
1 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 2 2
      src/graphic/Service/RoadService.js

+ 2 - 2
src/graphic/Service/RoadService.js

@@ -225,6 +225,7 @@ export default class RoadService {
     if (road.way == Constant.oneWay) {
       newRoad.setWay(road.way);
       newRoad.singleRoadDrivewayCount = road.singleRoadDrivewayCount;
+      newRoad.singleRoadWidth = road.singleRoadWidth;
     } else if (road.way == Constant.twoWay) {
       newRoad.setWay(road.way);
       newRoad.leftDrivewayCount = road.leftDrivewayCount;
@@ -1650,7 +1651,7 @@ export default class RoadService {
       rightEdge.end
     );
     if (
-      CrossPointStartDistance > leftEdgeDistance &&
+      CrossPointStartDistance > leftEdgeDistance ||
       CrossPointStartDistance > righttEdgeDistance
     ) {
       let satrtEdgeLine = mathUtil.createLine1(leftEdge.start, rightEdge.start);
@@ -1664,7 +1665,6 @@ export default class RoadService {
         roadLine
       );
 
-      console.log(satrtEdgeCrossPoint, endEdgeCrossPoint);
       roadLineCrossPoint = mathUtil.getLineEndPointPos(
         satrtEdgeCrossPoint,
         endEdgeCrossPoint