fuchengshen
2022-10-19 af3537dcff549431efe653359f1b34c86b77432e
上海遮罩层更改
3个文件已修改
75 ■■■■■ 已修改文件
js/changable_params.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/index.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxiRouteReplay/widget.js 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/changable_params.js
@@ -53,7 +53,11 @@
}
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/index.js
@@ -103,9 +103,12 @@
  //创建三维地球场景
  map = new mars3d.Map("mars3dContainer", mapOptions);
<<<<<<< HEAD
  //上海边界遮罩
=======
>>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
  //构造widget
  initWidget(map);
widgetsTS/taxiRouteReplay/widget.js
@@ -58,33 +58,56 @@
      });
      this.pointLayer.addGraphic(this.endGraphic);
      var Pointsdata = mars3d.global_variables.singleTaxiReplayData
        for (var i = 0, len = Pointsdata.length; i < len; i++) {
      let 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;
          if (lng && lat) {
        var position2 = null;
        if (lng && lat&&lng2&&lat2) {
            position = Cesium.Cartesian3.fromDegrees(lng, lat);
          position2 = Cesium.Cartesian3.fromDegrees(lng2, lat2);
          }
          item = changeNullAndundefinedToEmpty(item)
      let graphic = new mars3d.graphic.PolylineEntity({
        positions: points,
        positions: [position,position2],
        style: {
          width: 10,
          material: new mars3d.material.LineFlowMaterialProperty({
            color:this.viewWindow.getLayerPointColorByQindexandValue(1004,this.qindex, item[this.qindex]),
            image: "./img/textures/arrow2.png",
            repeat: new Cesium.Cartesian2(30, 1),
            speed: 30, //速度,建议取值范围1-100
            repeat: new Cesium.Cartesian2(1, 1),
            speed: 40, //速度,建议取值范围1-100
          })
        },
      });
      this.routeLayer.addGraphic(graphic);
      }
      // console.log(items,"items")
      // let graphic = new mars3d.graphic.PolylineEntity({
      //   positions: points,
      //   style: {
      //     width: 10,
      //     material: new mars3d.material.LineFlowMaterialProperty({
      //       color: Cesium.Color.AQUA,
      //       image: "./img/textures/arrow2.png",
      //       repeat: new Cesium.Cartesian2(50, 1),
      //       speed: 40, //速度,建议取值范围1-100
      //     })
      //   },
      // });
      // this.routeLayer.addGraphic(graphic);
      this.routeLayer.flyTo();
    }}
    }
    addTaxiPointInfoGraphic() {
<<<<<<< HEAD
        var Pointsdata = mars3d.global_variables.singleTaxiReplayData;
        for (var i = 0, len = Pointsdata.length; i < len; i++) {
          var item = Pointsdata[i];
@@ -107,12 +130,35 @@
          //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: {
              with: 50,
              // length: 60.0,
              width: 10.0,
              height: 0,
              diffHeight: this.qindex == "co" ? 1000 * item[this.qindex] : item[this.qindex] || item[qindex] == "/" ? 3000 : item[qindex], //高度
              cornerType: Cesium.CornerType.BEVELED,
              // radius: 8.0,
              diffHeight: this.qindex == "co" ? 300 * item[this.qindex] :  item[this.qindex]  || item[this.qindex] == "/" ? 500 : item[this.qindex], //高度
              color:this.viewWindow.getLayerPointColorByQindexandValue(1004,this.qindex, item[this.qindex]),
              opacity: 0.5,
              opacity: 0.6,
              // rotationDegree: 45,
              highlight: {
                opacity: 1
              }
@@ -133,7 +179,7 @@
            "<tr><td>CO:</td><td align= right>" + item["co"] + '&nbsp' + "</td><td>mg/m³</td></tr>" +
            "</table>" 
          });
          this.routeLayer.addGraphic(CorridorPrimitive);
          this.routeLayer.addGraphic(CircleEntity);
        }
        this.routeLayer.flyTo();
    }