From e6469383d21c75ecd29c676220574db42420980a Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期四, 30 九月 2021 11:27:33 +0800
Subject: [PATCH] do not get wind data from server. from weather info
---
js/function_wind.js | 60 +++++++++++++++---------------------------------------------
1 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/js/function_wind.js b/js/function_wind.js
index 2a2ca64..fea5db5 100644
--- a/js/function_wind.js
+++ b/js/function_wind.js
@@ -2,11 +2,7 @@
//绯荤粺 鍔熻兘鍏ュ彛
function addWindLayer(item) {
-
- $.getJSON("data/getWindParametersByTime.json", { datatype: mars3d.global_variables.queryDataType, datatime: mars3d.global_variables.queryDataTStart }, (result) => {
- console.log(result);
-
- var layer_wind = new mars3d.layer.CanvasWindLayer({
+ var layer_wind = new mars3d.layer.CanvasWindLayer({
id: item.id,
pid: item.pid,
name: item.name,
@@ -16,60 +12,34 @@
particlesNumber: 1000,
maxAge: 60,
lineWidth: 1,
- reverseY: true
+ reverseY: true,
+ show:item.show
});
- layer_wind.show = item.show;
map.addLayer(layer_wind);
-
- layer_wind.data = convertWindData(result.data);
- });
+ layer_wind.data = createWindData();
+
}
-function convertWindData(arr) {
+function createWindData() {
var arrU = [];
var arrV = [];
-
- var xmin = arr[0].x;
- var xmax = arr[0].x;
- var ymin = arr[0].y;
- var ymax = arr[0].y;
-
// 椋庡悜鏄互y杞存鏂瑰悜涓洪浂搴﹂『鏃堕拡杞紝0搴﹁〃绀哄寳椋庛��90搴﹁〃绀轰笢椋庛��
// u琛ㄧず缁忓害鏂瑰悜涓婄殑椋庯紝u涓烘锛岃〃绀鸿タ椋庯紝浠庤タ杈瑰惞鏉ョ殑椋庛��
// v琛ㄧず绾害鏂瑰悜涓婄殑椋庯紝v涓烘锛岃〃绀哄崡椋庯紝浠庡崡杈瑰惞鏉ョ殑椋庛��
- for (let i = 0, len = arr.length; i < len; i++) {
- const item = arr[i];
- if (xmin > item.x) {
- xmin = item.x;
- }
- if (xmax < item.x) {
- xmax = item.x;
- }
- if (ymin > item.y) {
- ymin = item.y;
- }
- if (ymax < item.y) {
- ymax = item.y;
- }
-
- var u = mars3d.WindUtil.getU(item.speed, item.dir);
+ var u = mars3d.WindUtil.getU(mars3d.global_variables.windSpeed, mars3d.global_variables.wind360);
+ var v = mars3d.WindUtil.getV(mars3d.global_variables.windSpeed, mars3d.global_variables.wind360);
+ for (let i = 0; i < 9; i++) {
arrU.push(u);
-
- var v = mars3d.WindUtil.getV(item.speed, item.dir);
arrV.push(v);
}
-
- var rows = getKeyNumCount(arr, "y"); //璁＄畻 琛屾暟
- var cols = getKeyNumCount(arr, "x"); //璁＄畻 鍒楁暟
-
return {
- xmin: xmin,
- xmax: xmax,
- ymax: ymax,
- ymin: ymin,
- rows: rows,
- cols: cols,
+ xmin: 120,
+ xmax: 122,
+ ymax: 32,
+ ymin: 30,
+ rows: 3,
+ cols: 3,
udata: arrU, //妯悜椋庨��
vdata: arrV, //绾靛悜椋庨��
};
--
Gitblit v1.9.1