修正合并代码

zhaoxing

2022-10-20 3a0f8910c002baf14a1b77a2ddb49ceed21f13a2

修正合并代码

 js/changable_params.js

@@ -53,11 +53,7 @@
}
var tiandituArr = ['51915011aa0997aa2ddd7e38504fa8bc', '51915011aa0997aa2ddd7e38504fa8bc']
// http://112.74.77.127:8090/  http://223.167.111.168:7002/
<<<<<<< HEAD
var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://223.167.111.168:7002/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:3};
=======
var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://223.167.111.168:7002/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:0};
>>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};

function bindPopupFunction(event) {

 js/function.js

@@ -233,7 +233,7 @@
function mask_selection(regionCode){
    if(regionCode == 0){
        geoJsonLayer = new mars3d.layer.GeoJsonLayer({
          url: "data/shanghai.json",
          url: "./data/shanghai.json",
          mask: true, //标识为遮罩层【重点参数】
          symbol: {
            styleOptions: {

 js/index.js

@@ -103,12 +103,7 @@
  //创建三维地球场景
  map = new mars3d.Map("mars3dContainer", mapOptions);

<<<<<<< HEAD
  //上海边界遮罩


=======
>>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
  //构造widget
  initWidget(map);


 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();
    }