修正合并代码

zhaoxing

2022-10-20 3a0f8910c002baf14a1b77a2ddb49ceed21f13a2

 widgetsTS/taxiRouteReplay/widget.js

@@ -107,7 +107,6 @@
    }
 
    addTaxiPointInfoGraphic() {
<<<<<<< HEAD
        var Pointsdata = mars3d.global_variables.singleTaxiReplayData;
        for (var i = 0, len = Pointsdata.length; i < len; i++) {
          var item = Pointsdata[i];
@@ -130,25 +129,6 @@
          //points[Pointsdata.length] = [lon,lat]
          var CorridorPrimitive = new mars3d.graphic.CorridorPrimitive({
            positions: points,
=======
        var Pointsdata = mars3d.global_variables.singleTaxiReplayData
        for (var i = 0, len = Pointsdata.length; i < len-1; i++) {
          var item = Pointsdata[i];
          var item2 = Pointsdata[i+1];
          var lng = Number(item["lon"]); //经度
          var lat = Number(item["lat"]); //纬度
          var lng2 = Number(item2["lon"]); //经度
          var lat2 = Number(item2["lat"]); //纬度
          var position = null;
          var position2 = null;
          if (lng && lat&&lng2&&lat2) {
            position = Cesium.Cartesian3.fromDegrees(lng, lat);
            position2 = Cesium.Cartesian3.fromDegrees(lng2, lat2);
          }
          item = changeNullAndundefinedToEmpty(item)
          var CircleEntity = new mars3d.graphic.CorridorEntity({
            positions: [position,position2],
>>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
            style: {
              // length: 60.0,
            width: 10.0,
@@ -179,7 +159,7 @@
            "<tr><td>CO：</td><td align= right>" + item["co"] + '&nbsp' + "</td><td>mg/m³</td></tr>" +
            "</table>" 
          });
          this.routeLayer.addGraphic(CircleEntity);
          this.routeLayer.addGraphic(CorridorPrimitive);
        }
        this.routeLayer.flyTo();
    }