瀏覽代碼

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

xzw 2 年之前
父節點
當前提交
500ad0509b
共有 2 個文件被更改,包括 36 次插入2 次删除
  1. 1 1
      server/test/a0k4xu045_202305311600080410/attach/sceneStore
  2. 35 1
      src/graphic/Load.js

File diff suppressed because it is too large
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 35 - 1
src/graphic/Load.js

@@ -165,6 +165,41 @@ export default class Load {
             dataLocal.roads[key].endId,
             dataLocal.roads[key].vectorId,
           );
+          let leftEdge =null
+          let rightEdge =null
+          if(dataLocal.roadEdges){
+            for(let edgeKey in dataLocal.roadEdges){
+              let roadId = dataLocal.roadEdges[edgeKey].parent
+            
+              if(roadId== key ){
+
+                for(let roadKey in dataLocal.roads[key]){
+                  if( roadKey == 'leftEdgeId' && dataLocal.roads[key][roadKey] ==dataLocal.roadEdges[edgeKey].vectorId){
+                    let leftEdge = dataService.getRoadEdge(road.leftEdgeId);
+                    if(dataLocal.roadEdges[edgeKey].style){
+                      leftEdge.setStyle(dataLocal.roadEdges[edgeKey].style)
+                    }
+                    if(dataLocal.roadEdges[edgeKey].weight){
+                      leftEdge.setWeight(dataLocal.roadEdges[edgeKey].weight)
+                    }
+
+
+                  }else if(roadKey == 'rightEdgeId' && dataLocal.roads[key][roadKey] ==dataLocal.roadEdges[edgeKey].vectorId){
+                    let rightEdge = dataService.getRoadEdge(road.rightEdgeId);
+                    if(dataLocal.roadEdges[edgeKey].style){
+                      rightEdge.setStyle(dataLocal.roadEdges[edgeKey].style)
+                    }
+                    if(dataLocal.roadEdges[edgeKey].weight){
+                      rightEdge.setWeight(dataLocal.roadEdges[edgeKey].weight)
+                    }
+                  }
+                }
+            
+              }
+            
+            }
+          }
+        
         }
       }
       if(dataLocal.curveRoadPoints){
@@ -308,7 +343,6 @@ export default class Load {
 
     const scale = res / (coordinate.zoom / coordinate.defaultZoom);
     dataService.setScale(scale);
-    console.log(Settings)
     return {...dataService.vectorData,Settings};
   }