From 7db847bee80556aa6d6436e2708b528129d0bb28 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 22 Nov 2023 15:38:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A3=9E=E7=BA=BF?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/chart/mock/flyMap-country.json | 64 ++++++------- .../src/main/resources/chart/mock/flyMap.json | 96 +++++++++---------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json index b8aa705b..a5af565b 100644 --- a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json @@ -3,50 +3,50 @@ "data": [ { "from": "青海", - "lat1": 95.2402, - "lat2": 115.4004, - "lng1": 35.4199, - "lng2": 39.4688, + "lng1": 95.2402, + "lng2": 115.4004, + "lat1": 35.4199, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 90 }, { "from": "安徽省", - "lat1": 117.2461, - "lat2": 115.4004, - "lng1": 32.0361, - "lng2": 39.4688, + "lng1": 117.2461, + "lng2": 115.4004, + "lat1": 32.0361, + "lat2": 39.4688, "to": "河北省", "type": "move_in", "value": 10 }, { "from": "新疆", - "lat1": 87.9688, - "lat2": 115.4004, - "lng1": 39.7467, - "lng2": 39.4688, + "lng1": 87.9688, + "lng2": 115.4004, + "lat1": 39.7467, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 }, { "from": "云南", - "lat1": 101.8652, - "lat2": 115.4004, - "lng1": 25.1807, - "lng2": 39.4688, + "lng1": 101.8652, + "lng2": 115.4004, + "lat1": 25.1807, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 }, { "from": "黑龙江", - "lat1": 128.1445, - "lat2": 115.4004, - "lng1": 48.5156, - "lng2": 39.4688, + "lng1": 128.1445, + "lng2": 115.4004, + "lat1": 48.5156, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 @@ -61,36 +61,36 @@ "alias": "from", "remark": "起点" }, - "lat1": { + "lng1": { "type": "double", "tableName": "", - "originalColumn": "lat1", + "originalColumn": "lng1", "aggregate": "", - "alias": "lat1", + "alias": "lng1", "remark": "起点纬度" }, - "lat2": { + "lng2": { "type": "double", "tableName": "", - "originalColumn": "lat2", + "originalColumn": "lng2", "aggregate": "", - "alias": "lat2", + "alias": "lng2", "remark": "终点纬度" }, - "lng1": { + "lat1": { "type": "double", "tableName": "", - "originalColumn": "lng1", + "originalColumn": "lat1", "aggregate": "", - "alias": "lng1", + "alias": "lat1", "remark": "起点经度" }, - "lng2": { + "lat2": { "type": "double", "tableName": "", - "originalColumn": "lng2", + "originalColumn": "lat2", "aggregate": "", - "alias": "lng2", + "alias": "lat2", "remark": "终点经度" }, "to": { diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json index 9519289a..7e1102a5 100644 --- a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json @@ -3,90 +3,90 @@ "data": [ { "from": "青海", - "lat1": 95.2402, - "lat2": 115.4004, - "lng1": 35.4199, - "lng2": 39.4688, + "lng1": 95.2402, + "lng2": 115.4004, + "lat1": 35.4199, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 90 }, { "from": "安徽省", - "lat1": 117.2461, - "lat2": 115.4004, - "lng1": 32.0361, - "lng2": 39.4688, + "lng1": 117.2461, + "lng2": 115.4004, + "lat1": 32.0361, + "lat2": 39.4688, "to": "河北省", "type": "move_in", "value": 10 }, { "from": "新疆", - "lat1": 87.9688, - "lat2": 115.4004, - "lng1": 39.7467, - "lng2": 39.4688, + "lng1": 87.9688, + "lng2": 115.4004, + "lat1": 39.7467, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 }, { "from": "云南", - "lat1": 101.8652, - "lat2": 115.4004, - "lng1": 25.1807, - "lng2": 39.4688, + "lng1": 101.8652, + "lng2": 115.4004, + "lat1": 25.1807, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 }, { "from": "黑龙江", - "lat1": 128.1445, - "lat2": 115.4004, - "lng1": 48.5156, - "lng2": 39.4688, + "lng1": 128.1445, + "lng2": 115.4004, + "lat1": 48.5156, + "lat2": 39.4688, "to": "河北", "type": "move_in", "value": 10 }, { "from": "加拿大", - "lat1": -95.7129, - "lat2": 29.80475, - "lng1": 56.1304, - "lng2": 50.0577, + "lng1": -95.7129, + "lng2": 29.80475, + "lat1": 56.1304, + "lat2": 50.0577, "to": "乌克兰", "type": "move_in", "value": 10 }, { "from": "中非", - "lat1": 20.6796, - "lng1": 6.3646, - "lat2": 29.80475, - "lng2": 50.0577, + "lng1": 20.6796, + "lat1": 6.3646, + "lng2": 29.80475, + "lat2": 50.0577, "to": "乌克兰", "type": "move_in", "value": 10 }, { "from": "巴西", - "lat1": -53.6453, - "lng1": -10.8921, - "lat2": 29.80475, - "lng2": 50.0577, + "lng1": -53.6453, + "lat1": -10.8921, + "lng2": 29.80475, + "lat2": 50.0577, "to": "乌克兰", "type": "move_in", "value": 10 }, { "from": "俄罗斯", - "lat1": 85.7325, - "lng1": 67.4894, - "lat2": 29.80475, - "lng2": 50.0577, + "lng1": 85.7325, + "lat1": 67.4894, + "lng2": 29.80475, + "lat2": 50.0577, "to": "乌克兰", "type": "move_in", "value": 10 @@ -101,36 +101,36 @@ "alias": "from", "remark": "起点" }, - "lat1": { + "lng1": { "type": "double", "tableName": "", - "originalColumn": "lat1", + "originalColumn": "lng1", "aggregate": "", - "alias": "lat1", + "alias": "lng1", "remark": "起点纬度" }, - "lat2": { + "lng2": { "type": "double", "tableName": "", - "originalColumn": "lat2", + "originalColumn": "lng2", "aggregate": "", - "alias": "lat2", + "alias": "lng2", "remark": "终点纬度" }, - "lng1": { + "lat1": { "type": "double", "tableName": "", - "originalColumn": "lng1", + "originalColumn": "lat1", "aggregate": "", - "alias": "lng1", + "alias": "lat1", "remark": "起点经度" }, - "lng2": { + "lat2": { "type": "double", "tableName": "", - "originalColumn": "lng2", + "originalColumn": "lat2", "aggregate": "", - "alias": "lng2", + "alias": "lat2", "remark": "终点经度" }, "to": {