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/function.js

@@ -232,7 +232,25 @@

function mask_selection(regionCode){
    if(regionCode == 0){
      return
        geoJsonLayer = new mars3d.layer.GeoJsonLayer({
          url: "data/shanghai.json",
          mask: true, //标识为遮罩层【重点参数】
          symbol: {
            styleOptions: {
              fill: true,
              color: "rgb(2,26,79)",
              outline: true,
              outlineColor: "#39E09B",
              outlineWidth: 8,
              outlineOpacity: 0.8,
              arcType: Cesium.ArcType.GEODESIC,
              clampToGround: true,
            },
          },
          zIndex: 99999999999,
        });
        map.addLayer(geoJsonLayer);
      // return
    }
    //geojson 各行政区边界线
      geoJsonLayer = new mars3d.layer.GeoJsonLayer({

 js/index.js

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

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


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


 widgets/manageLayers_style/view.js

@@ -1,4 +1,4 @@
"use script"; //开发环境建议开启严格模式
"use script"; //开发环境建议开启严格模式

//对应widget.js中MyWidget实例化后的对象
var thisWidget;

 widgetsTS/taxiRouteReplay/widget.js

@@ -13,7 +13,7 @@
    }
 
    reloadData(new_taxi_sn) {
      // this.viewWindow.resetStartQueryTaxiDataText(new_taxi_sn);
      this.viewWindow.resetStartQueryTaxiDataText(new_taxi_sn);
      this.taxi_sn = new_taxi_sn;
 
      if (this.startGraphic) {
@@ -107,6 +107,30 @@
    }
 
    addTaxiPointInfoGraphic() {
<<<<<<< HEAD
        var Pointsdata = mars3d.global_variables.singleTaxiReplayData;
        for (var i = 0, len = Pointsdata.length; i < len; i++) {
          var item = Pointsdata[i];
          // var lng = Number(item["lon"]); //经度
          // var lat = Number(item["lat"]); //纬度
          // var position = null;
          // if (lng && lat) {
          //   position = Cesium.Cartesian3.fromDegrees(lng, lat);
          // }
          let keys = ["lon","lat"]
          let array = []
          Pointsdata.map(item => {
            array.push(keys.reduce((result, key) => ({ ...result, [key]: item[key] }), {}))
          })
          let points = []
          array.map(item => {
            points.push(Object.values(item))
          })
          item = changeNullAndundefinedToEmpty(item)
          //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];
@@ -124,6 +148,7 @@
          item = changeNullAndundefinedToEmpty(item)
          var CircleEntity = new mars3d.graphic.CorridorEntity({
            positions: [position,position2],
>>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
            style: {
              // length: 60.0,
              width: 10.0,