You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/11/08 07:07:09 UTC

[incubator-echarts] 01/01: move map data to test folder. not included in the npm package.

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a commit to branch remove-map
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 445797e3ad33d35cc1e0133d977b2e3bc4717c59
Author: pissang <bm...@gmail.com>
AuthorDate: Sun Nov 8 14:34:35 2020 +0800

    move map data to test folder. not included in the npm package.
---
 .gitignore                                             | 4 ++--
 {map => test/data/map}/js/china-contour.js             | 0
 {map => test/data/map}/js/china.js                     | 0
 {map => test/data/map}/js/province/anhui.js            | 0
 {map => test/data/map}/js/province/aomen.js            | 0
 {map => test/data/map}/js/province/beijing.js          | 0
 {map => test/data/map}/js/province/chongqing.js        | 0
 {map => test/data/map}/js/province/fujian.js           | 0
 {map => test/data/map}/js/province/gansu.js            | 0
 {map => test/data/map}/js/province/guangdong.js        | 0
 {map => test/data/map}/js/province/guangxi.js          | 0
 {map => test/data/map}/js/province/guizhou.js          | 0
 {map => test/data/map}/js/province/hainan.js           | 0
 {map => test/data/map}/js/province/hebei.js            | 0
 {map => test/data/map}/js/province/heilongjiang.js     | 0
 {map => test/data/map}/js/province/henan.js            | 0
 {map => test/data/map}/js/province/hubei.js            | 0
 {map => test/data/map}/js/province/hunan.js            | 0
 {map => test/data/map}/js/province/jiangsu.js          | 0
 {map => test/data/map}/js/province/jiangxi.js          | 0
 {map => test/data/map}/js/province/jilin.js            | 0
 {map => test/data/map}/js/province/liaoning.js         | 0
 {map => test/data/map}/js/province/neimenggu.js        | 0
 {map => test/data/map}/js/province/ningxia.js          | 0
 {map => test/data/map}/js/province/qinghai.js          | 0
 {map => test/data/map}/js/province/shandong.js         | 0
 {map => test/data/map}/js/province/shanghai.js         | 0
 {map => test/data/map}/js/province/shanxi.js           | 0
 {map => test/data/map}/js/province/shanxi1.js          | 0
 {map => test/data/map}/js/province/sichuan.js          | 0
 {map => test/data/map}/js/province/taiwan.js           | 0
 {map => test/data/map}/js/province/tianjin.js          | 0
 {map => test/data/map}/js/province/xianggang.js        | 0
 {map => test/data/map}/js/province/xinjiang.js         | 0
 {map => test/data/map}/js/province/xizang.js           | 0
 {map => test/data/map}/js/province/yunnan.js           | 0
 {map => test/data/map}/js/province/zhejiang.js         | 0
 {map => test/data/map}/js/world.js                     | 0
 {map => test/data/map}/json/china-cities.json          | 0
 {map => test/data/map}/json/china-contour.json         | 0
 {map => test/data/map}/json/china.json                 | 0
 {map => test/data/map}/json/province/anhui.json        | 0
 {map => test/data/map}/json/province/aomen.json        | 0
 {map => test/data/map}/json/province/beijing.json      | 0
 {map => test/data/map}/json/province/chongqing.json    | 0
 {map => test/data/map}/json/province/fujian.json       | 0
 {map => test/data/map}/json/province/gansu.json        | 0
 {map => test/data/map}/json/province/guangdong.json    | 0
 {map => test/data/map}/json/province/guangxi.json      | 0
 {map => test/data/map}/json/province/guizhou.json      | 0
 {map => test/data/map}/json/province/hainan.json       | 0
 {map => test/data/map}/json/province/hebei.json        | 0
 {map => test/data/map}/json/province/heilongjiang.json | 0
 {map => test/data/map}/json/province/henan.json        | 0
 {map => test/data/map}/json/province/hubei.json        | 0
 {map => test/data/map}/json/province/hunan.json        | 0
 {map => test/data/map}/json/province/jiangsu.json      | 0
 {map => test/data/map}/json/province/jiangxi.json      | 0
 {map => test/data/map}/json/province/jilin.json        | 0
 {map => test/data/map}/json/province/liaoning.json     | 0
 {map => test/data/map}/json/province/neimenggu.json    | 0
 {map => test/data/map}/json/province/ningxia.json      | 0
 {map => test/data/map}/json/province/qinghai.json      | 0
 {map => test/data/map}/json/province/shandong.json     | 0
 {map => test/data/map}/json/province/shanghai.json     | 0
 {map => test/data/map}/json/province/shanxi.json       | 0
 {map => test/data/map}/json/province/shanxi1.json      | 0
 {map => test/data/map}/json/province/sichuan.json      | 0
 {map => test/data/map}/json/province/taiwan.json       | 0
 {map => test/data/map}/json/province/tianjin.json      | 0
 {map => test/data/map}/json/province/xianggang.json    | 0
 {map => test/data/map}/json/province/xinjiang.json     | 0
 {map => test/data/map}/json/province/xizang.json       | 0
 {map => test/data/map}/json/province/yunnan.json       | 0
 {map => test/data/map}/json/province/zhejiang.json     | 0
 {map => test/data/map}/json/world.json                 | 0
 test/effectScatter.html                                | 2 +-
 test/finished-gl.html                                  | 4 ++--
 test/geoLine.html                                      | 2 +-
 test/geoScatter.html                                   | 2 +-
 test/hoverStyle.html                                   | 2 +-
 test/ie8.html                                          | 2 +-
 test/lib/config.js                                     | 4 ++--
 test/lines-flight.html                                 | 2 +-
 test/lines-ny.html                                     | 2 +-
 test/lines-remove.html                                 | 2 +-
 test/lines-stream-large.html                           | 2 +-
 test/lines-stream-not-large.html                       | 2 +-
 test/lines-symbol.html                                 | 2 +-
 test/linesGL-ny-appendData.html                        | 2 +-
 test/map-default.html                                  | 2 +-
 test/map-labels.html                                   | 2 +-
 test/map-province.html                                 | 2 +-
 test/mapWorld.html                                     | 2 +-
 test/node/scatter-gps.js                               | 2 +-
 test/scatter-gps.html                                  | 2 +-
 test/scatter-stream-large.html                         | 2 +-
 test/scatter-stream-not-large.html                     | 2 +-
 test/visualMap-large.html                              | 2 +-
 test/worldPopulationBubble.html                        | 2 +-
 100 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c992a3..d05d719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,8 +169,8 @@ rat.iml
 
 node_modules
 
-map/tool
-map/raw
+test/data/map/tool
+test/data/map/raw
 theme/thumb
 pre-publish-tmp
 todo
diff --git a/map/js/china-contour.js b/test/data/map/js/china-contour.js
similarity index 100%
rename from map/js/china-contour.js
rename to test/data/map/js/china-contour.js
diff --git a/map/js/china.js b/test/data/map/js/china.js
similarity index 100%
rename from map/js/china.js
rename to test/data/map/js/china.js
diff --git a/map/js/province/anhui.js b/test/data/map/js/province/anhui.js
similarity index 100%
rename from map/js/province/anhui.js
rename to test/data/map/js/province/anhui.js
diff --git a/map/js/province/aomen.js b/test/data/map/js/province/aomen.js
similarity index 100%
rename from map/js/province/aomen.js
rename to test/data/map/js/province/aomen.js
diff --git a/map/js/province/beijing.js b/test/data/map/js/province/beijing.js
similarity index 100%
rename from map/js/province/beijing.js
rename to test/data/map/js/province/beijing.js
diff --git a/map/js/province/chongqing.js b/test/data/map/js/province/chongqing.js
similarity index 100%
rename from map/js/province/chongqing.js
rename to test/data/map/js/province/chongqing.js
diff --git a/map/js/province/fujian.js b/test/data/map/js/province/fujian.js
similarity index 100%
rename from map/js/province/fujian.js
rename to test/data/map/js/province/fujian.js
diff --git a/map/js/province/gansu.js b/test/data/map/js/province/gansu.js
similarity index 100%
rename from map/js/province/gansu.js
rename to test/data/map/js/province/gansu.js
diff --git a/map/js/province/guangdong.js b/test/data/map/js/province/guangdong.js
similarity index 100%
rename from map/js/province/guangdong.js
rename to test/data/map/js/province/guangdong.js
diff --git a/map/js/province/guangxi.js b/test/data/map/js/province/guangxi.js
similarity index 100%
rename from map/js/province/guangxi.js
rename to test/data/map/js/province/guangxi.js
diff --git a/map/js/province/guizhou.js b/test/data/map/js/province/guizhou.js
similarity index 100%
rename from map/js/province/guizhou.js
rename to test/data/map/js/province/guizhou.js
diff --git a/map/js/province/hainan.js b/test/data/map/js/province/hainan.js
similarity index 100%
rename from map/js/province/hainan.js
rename to test/data/map/js/province/hainan.js
diff --git a/map/js/province/hebei.js b/test/data/map/js/province/hebei.js
similarity index 100%
rename from map/js/province/hebei.js
rename to test/data/map/js/province/hebei.js
diff --git a/map/js/province/heilongjiang.js b/test/data/map/js/province/heilongjiang.js
similarity index 100%
rename from map/js/province/heilongjiang.js
rename to test/data/map/js/province/heilongjiang.js
diff --git a/map/js/province/henan.js b/test/data/map/js/province/henan.js
similarity index 100%
rename from map/js/province/henan.js
rename to test/data/map/js/province/henan.js
diff --git a/map/js/province/hubei.js b/test/data/map/js/province/hubei.js
similarity index 100%
rename from map/js/province/hubei.js
rename to test/data/map/js/province/hubei.js
diff --git a/map/js/province/hunan.js b/test/data/map/js/province/hunan.js
similarity index 100%
rename from map/js/province/hunan.js
rename to test/data/map/js/province/hunan.js
diff --git a/map/js/province/jiangsu.js b/test/data/map/js/province/jiangsu.js
similarity index 100%
rename from map/js/province/jiangsu.js
rename to test/data/map/js/province/jiangsu.js
diff --git a/map/js/province/jiangxi.js b/test/data/map/js/province/jiangxi.js
similarity index 100%
rename from map/js/province/jiangxi.js
rename to test/data/map/js/province/jiangxi.js
diff --git a/map/js/province/jilin.js b/test/data/map/js/province/jilin.js
similarity index 100%
rename from map/js/province/jilin.js
rename to test/data/map/js/province/jilin.js
diff --git a/map/js/province/liaoning.js b/test/data/map/js/province/liaoning.js
similarity index 100%
rename from map/js/province/liaoning.js
rename to test/data/map/js/province/liaoning.js
diff --git a/map/js/province/neimenggu.js b/test/data/map/js/province/neimenggu.js
similarity index 100%
rename from map/js/province/neimenggu.js
rename to test/data/map/js/province/neimenggu.js
diff --git a/map/js/province/ningxia.js b/test/data/map/js/province/ningxia.js
similarity index 100%
rename from map/js/province/ningxia.js
rename to test/data/map/js/province/ningxia.js
diff --git a/map/js/province/qinghai.js b/test/data/map/js/province/qinghai.js
similarity index 100%
rename from map/js/province/qinghai.js
rename to test/data/map/js/province/qinghai.js
diff --git a/map/js/province/shandong.js b/test/data/map/js/province/shandong.js
similarity index 100%
rename from map/js/province/shandong.js
rename to test/data/map/js/province/shandong.js
diff --git a/map/js/province/shanghai.js b/test/data/map/js/province/shanghai.js
similarity index 100%
rename from map/js/province/shanghai.js
rename to test/data/map/js/province/shanghai.js
diff --git a/map/js/province/shanxi.js b/test/data/map/js/province/shanxi.js
similarity index 100%
rename from map/js/province/shanxi.js
rename to test/data/map/js/province/shanxi.js
diff --git a/map/js/province/shanxi1.js b/test/data/map/js/province/shanxi1.js
similarity index 100%
rename from map/js/province/shanxi1.js
rename to test/data/map/js/province/shanxi1.js
diff --git a/map/js/province/sichuan.js b/test/data/map/js/province/sichuan.js
similarity index 100%
rename from map/js/province/sichuan.js
rename to test/data/map/js/province/sichuan.js
diff --git a/map/js/province/taiwan.js b/test/data/map/js/province/taiwan.js
similarity index 100%
rename from map/js/province/taiwan.js
rename to test/data/map/js/province/taiwan.js
diff --git a/map/js/province/tianjin.js b/test/data/map/js/province/tianjin.js
similarity index 100%
rename from map/js/province/tianjin.js
rename to test/data/map/js/province/tianjin.js
diff --git a/map/js/province/xianggang.js b/test/data/map/js/province/xianggang.js
similarity index 100%
rename from map/js/province/xianggang.js
rename to test/data/map/js/province/xianggang.js
diff --git a/map/js/province/xinjiang.js b/test/data/map/js/province/xinjiang.js
similarity index 100%
rename from map/js/province/xinjiang.js
rename to test/data/map/js/province/xinjiang.js
diff --git a/map/js/province/xizang.js b/test/data/map/js/province/xizang.js
similarity index 100%
rename from map/js/province/xizang.js
rename to test/data/map/js/province/xizang.js
diff --git a/map/js/province/yunnan.js b/test/data/map/js/province/yunnan.js
similarity index 100%
rename from map/js/province/yunnan.js
rename to test/data/map/js/province/yunnan.js
diff --git a/map/js/province/zhejiang.js b/test/data/map/js/province/zhejiang.js
similarity index 100%
rename from map/js/province/zhejiang.js
rename to test/data/map/js/province/zhejiang.js
diff --git a/map/js/world.js b/test/data/map/js/world.js
similarity index 100%
rename from map/js/world.js
rename to test/data/map/js/world.js
diff --git a/map/json/china-cities.json b/test/data/map/json/china-cities.json
similarity index 100%
rename from map/json/china-cities.json
rename to test/data/map/json/china-cities.json
diff --git a/map/json/china-contour.json b/test/data/map/json/china-contour.json
similarity index 100%
rename from map/json/china-contour.json
rename to test/data/map/json/china-contour.json
diff --git a/map/json/china.json b/test/data/map/json/china.json
similarity index 100%
rename from map/json/china.json
rename to test/data/map/json/china.json
diff --git a/map/json/province/anhui.json b/test/data/map/json/province/anhui.json
similarity index 100%
rename from map/json/province/anhui.json
rename to test/data/map/json/province/anhui.json
diff --git a/map/json/province/aomen.json b/test/data/map/json/province/aomen.json
similarity index 100%
rename from map/json/province/aomen.json
rename to test/data/map/json/province/aomen.json
diff --git a/map/json/province/beijing.json b/test/data/map/json/province/beijing.json
similarity index 100%
rename from map/json/province/beijing.json
rename to test/data/map/json/province/beijing.json
diff --git a/map/json/province/chongqing.json b/test/data/map/json/province/chongqing.json
similarity index 100%
rename from map/json/province/chongqing.json
rename to test/data/map/json/province/chongqing.json
diff --git a/map/json/province/fujian.json b/test/data/map/json/province/fujian.json
similarity index 100%
rename from map/json/province/fujian.json
rename to test/data/map/json/province/fujian.json
diff --git a/map/json/province/gansu.json b/test/data/map/json/province/gansu.json
similarity index 100%
rename from map/json/province/gansu.json
rename to test/data/map/json/province/gansu.json
diff --git a/map/json/province/guangdong.json b/test/data/map/json/province/guangdong.json
similarity index 100%
rename from map/json/province/guangdong.json
rename to test/data/map/json/province/guangdong.json
diff --git a/map/json/province/guangxi.json b/test/data/map/json/province/guangxi.json
similarity index 100%
rename from map/json/province/guangxi.json
rename to test/data/map/json/province/guangxi.json
diff --git a/map/json/province/guizhou.json b/test/data/map/json/province/guizhou.json
similarity index 100%
rename from map/json/province/guizhou.json
rename to test/data/map/json/province/guizhou.json
diff --git a/map/json/province/hainan.json b/test/data/map/json/province/hainan.json
similarity index 100%
rename from map/json/province/hainan.json
rename to test/data/map/json/province/hainan.json
diff --git a/map/json/province/hebei.json b/test/data/map/json/province/hebei.json
similarity index 100%
rename from map/json/province/hebei.json
rename to test/data/map/json/province/hebei.json
diff --git a/map/json/province/heilongjiang.json b/test/data/map/json/province/heilongjiang.json
similarity index 100%
rename from map/json/province/heilongjiang.json
rename to test/data/map/json/province/heilongjiang.json
diff --git a/map/json/province/henan.json b/test/data/map/json/province/henan.json
similarity index 100%
rename from map/json/province/henan.json
rename to test/data/map/json/province/henan.json
diff --git a/map/json/province/hubei.json b/test/data/map/json/province/hubei.json
similarity index 100%
rename from map/json/province/hubei.json
rename to test/data/map/json/province/hubei.json
diff --git a/map/json/province/hunan.json b/test/data/map/json/province/hunan.json
similarity index 100%
rename from map/json/province/hunan.json
rename to test/data/map/json/province/hunan.json
diff --git a/map/json/province/jiangsu.json b/test/data/map/json/province/jiangsu.json
similarity index 100%
rename from map/json/province/jiangsu.json
rename to test/data/map/json/province/jiangsu.json
diff --git a/map/json/province/jiangxi.json b/test/data/map/json/province/jiangxi.json
similarity index 100%
rename from map/json/province/jiangxi.json
rename to test/data/map/json/province/jiangxi.json
diff --git a/map/json/province/jilin.json b/test/data/map/json/province/jilin.json
similarity index 100%
rename from map/json/province/jilin.json
rename to test/data/map/json/province/jilin.json
diff --git a/map/json/province/liaoning.json b/test/data/map/json/province/liaoning.json
similarity index 100%
rename from map/json/province/liaoning.json
rename to test/data/map/json/province/liaoning.json
diff --git a/map/json/province/neimenggu.json b/test/data/map/json/province/neimenggu.json
similarity index 100%
rename from map/json/province/neimenggu.json
rename to test/data/map/json/province/neimenggu.json
diff --git a/map/json/province/ningxia.json b/test/data/map/json/province/ningxia.json
similarity index 100%
rename from map/json/province/ningxia.json
rename to test/data/map/json/province/ningxia.json
diff --git a/map/json/province/qinghai.json b/test/data/map/json/province/qinghai.json
similarity index 100%
rename from map/json/province/qinghai.json
rename to test/data/map/json/province/qinghai.json
diff --git a/map/json/province/shandong.json b/test/data/map/json/province/shandong.json
similarity index 100%
rename from map/json/province/shandong.json
rename to test/data/map/json/province/shandong.json
diff --git a/map/json/province/shanghai.json b/test/data/map/json/province/shanghai.json
similarity index 100%
rename from map/json/province/shanghai.json
rename to test/data/map/json/province/shanghai.json
diff --git a/map/json/province/shanxi.json b/test/data/map/json/province/shanxi.json
similarity index 100%
rename from map/json/province/shanxi.json
rename to test/data/map/json/province/shanxi.json
diff --git a/map/json/province/shanxi1.json b/test/data/map/json/province/shanxi1.json
similarity index 100%
rename from map/json/province/shanxi1.json
rename to test/data/map/json/province/shanxi1.json
diff --git a/map/json/province/sichuan.json b/test/data/map/json/province/sichuan.json
similarity index 100%
rename from map/json/province/sichuan.json
rename to test/data/map/json/province/sichuan.json
diff --git a/map/json/province/taiwan.json b/test/data/map/json/province/taiwan.json
similarity index 100%
rename from map/json/province/taiwan.json
rename to test/data/map/json/province/taiwan.json
diff --git a/map/json/province/tianjin.json b/test/data/map/json/province/tianjin.json
similarity index 100%
rename from map/json/province/tianjin.json
rename to test/data/map/json/province/tianjin.json
diff --git a/map/json/province/xianggang.json b/test/data/map/json/province/xianggang.json
similarity index 100%
rename from map/json/province/xianggang.json
rename to test/data/map/json/province/xianggang.json
diff --git a/map/json/province/xinjiang.json b/test/data/map/json/province/xinjiang.json
similarity index 100%
rename from map/json/province/xinjiang.json
rename to test/data/map/json/province/xinjiang.json
diff --git a/map/json/province/xizang.json b/test/data/map/json/province/xizang.json
similarity index 100%
rename from map/json/province/xizang.json
rename to test/data/map/json/province/xizang.json
diff --git a/map/json/province/yunnan.json b/test/data/map/json/province/yunnan.json
similarity index 100%
rename from map/json/province/yunnan.json
rename to test/data/map/json/province/yunnan.json
diff --git a/map/json/province/zhejiang.json b/test/data/map/json/province/zhejiang.json
similarity index 100%
rename from map/json/province/zhejiang.json
rename to test/data/map/json/province/zhejiang.json
diff --git a/map/json/world.json b/test/data/map/json/world.json
similarity index 100%
rename from map/json/world.json
rename to test/data/map/json/world.json
diff --git a/test/effectScatter.html b/test/effectScatter.html
index 41dde93..3d6876f 100644
--- a/test/effectScatter.html
+++ b/test/effectScatter.html
@@ -239,7 +239,7 @@ under the License.
                     {name: '大庆', value: 279}
                 ];
 
-                $.get('../map/json/china.json', function (chinaJson) {
+                $.get('./data/map/json/china.json', function (chinaJson) {
                     echarts.registerMap('china', chinaJson);
                     var geoCoordMap = {
                         '海门':[121.15,31.89],
diff --git a/test/finished-gl.html b/test/finished-gl.html
index 684abef..10fb606 100644
--- a/test/finished-gl.html
+++ b/test/finished-gl.html
@@ -24,8 +24,8 @@ under the License.
         <meta charset="utf-8">
         <title>ECharts</title>
         <script src="../dist/echarts.js"></script>
-        <script src="../map/js/china.js"></script>
-        <script src="../map/js/world.js"></script>
+        <script src="./data/map/js/china.js"></script>
+        <script src="./data/map/js/world.js"></script>
         <script src="../../echarts-www/dist/echarts-gl.min.js"></script>
 
         <style>
diff --git a/test/geoLine.html b/test/geoLine.html
index 01042cf..40dc9c5 100644
--- a/test/geoLine.html
+++ b/test/geoLine.html
@@ -236,7 +236,7 @@ under the License.
                     }
                     return res;
                 };
-                $.get('../map/json/china.json', function (chinaJson) {
+                $.get('./data/map/json/china.json', function (chinaJson) {
                     echarts.registerMap('china', chinaJson);
 
                     var myChart = echarts.init(document.getElementById('main'));
diff --git a/test/geoScatter.html b/test/geoScatter.html
index e502525..ac2bf18 100644
--- a/test/geoScatter.html
+++ b/test/geoScatter.html
@@ -45,7 +45,7 @@ under the License.
                 // 'echarts/component/geo'
             ], function (echarts) {
 
-                $.get('../map/json/china.json', function (chinaJson) {
+                $.get('./data/map/json/china.json', function (chinaJson) {
                     if (typeof chinaJson === 'string') {
                         chinaJson = eval('(' + chinaJson + ')');
                     }
diff --git a/test/hoverStyle.html b/test/hoverStyle.html
index 48ddc8e..ad615bb 100644
--- a/test/hoverStyle.html
+++ b/test/hoverStyle.html
@@ -1122,7 +1122,7 @@ under the License.
 
 
         <script>
-            $.get('../map/json/china.json', function (chinaJson) {
+            $.get('./data/map/json/china.json', function (chinaJson) {
                 if (typeof chinaJson === 'string') {
                     chinaJson = eval('(' + chinaJson + ')');
                 }
diff --git a/test/ie8.html b/test/ie8.html
index 179782e..9c04f56 100644
--- a/test/ie8.html
+++ b/test/ie8.html
@@ -22,7 +22,7 @@ under the License.
     <head>
         <meta charset="utf-8">
         <script src="../dist/echarts.js"></script>
-        <script src="../map/js/china.js"></script>
+        <script src="./data/map/js/china.js"></script>
     </head>
     <body>
         <style>
diff --git a/test/lib/config.js b/test/lib/config.js
index f5db7b5..5966c4b 100644
--- a/test/lib/config.js
+++ b/test/lib/config.js
@@ -68,7 +68,7 @@
                 'geoJson': '../geoData/geoJson',
                 'theme': 'theme',
                 'data': 'test/data',
-                'map': 'map',
+                'map': 'test/data/map',
                 'extension': 'dist/extension',
             }
             // urlArgs will prevent break point on init in debug tool.
@@ -85,7 +85,7 @@
                 'geoJson': 'geoData/geoJson',
                 'theme': 'theme',
                 'data': 'test/data',
-                'map': 'map',
+                'map': 'test/data/map',
                 'extension': 'extension'
             },
             // urlArgs: '_v_=' + (+new Date()),
diff --git a/test/lines-flight.html b/test/lines-flight.html
index e1acc08..87a730f 100644
--- a/test/lines-flight.html
+++ b/test/lines-flight.html
@@ -51,7 +51,7 @@ under the License.
             // 'extension/bmap'
         ], function (echarts) {
 
-            $.get('../map/json/world.json', function (worldJson) {
+            $.get('./data/map/json/world.json', function (worldJson) {
                 echarts.registerMap('world', worldJson);
 
                 $.get(dataURL, function (data) {
diff --git a/test/lines-ny.html b/test/lines-ny.html
index d661e98..ec19c78 100644
--- a/test/lines-ny.html
+++ b/test/lines-ny.html
@@ -23,7 +23,7 @@ under the License.
         <meta charset='utf-8'>
         <script src='../dist/echarts.js'></script>
         <script src="../../echarts-gl/dist/echarts-gl.js"></script>
-        <script src='../map/js/world.js'></script>
+        <script src='./data/map/js/world.js'></script>
         <meta name='viewport' content='width=device-width, initial-scale=1' />
     </head>
     <body>
diff --git a/test/lines-remove.html b/test/lines-remove.html
index 1361413..b1d0ef4 100644
--- a/test/lines-remove.html
+++ b/test/lines-remove.html
@@ -46,7 +46,7 @@ under the License.
                 // 'echarts/chart/effectScatter',
                 'extension/bmap'
             ], function (echarts) {
-                $.get('../map/json/china.json', function (json) {
+                $.get('./data/map/json/china.json', function (json) {
                     echarts.registerMap('china', json);
 
                     var myChart = echarts.init(document.getElementById('main'));
diff --git a/test/lines-stream-large.html b/test/lines-stream-large.html
index fb21826..4f9ba2f 100644
--- a/test/lines-stream-large.html
+++ b/test/lines-stream-large.html
@@ -46,7 +46,7 @@ under the License.
             'echarts'
         ], function (echarts) {
 
-            $.get('../map/json/world.json', function (worldJson) {
+            $.get('./data/map/json/world.json', function (worldJson) {
                 echarts.registerMap('world', worldJson);
 
                 var linesCount = 35663;
diff --git a/test/lines-stream-not-large.html b/test/lines-stream-not-large.html
index f6a995a..d98d1e1 100644
--- a/test/lines-stream-not-large.html
+++ b/test/lines-stream-not-large.html
@@ -62,7 +62,7 @@ under the License.
             // 'extension/bmap'
         ], function (echarts) {
 
-            $.get('../map/json/world.json', function (worldJson) {
+            $.get('./data/map/json/world.json', function (worldJson) {
                 echarts.registerMap('world', worldJson);
 
                 $.get(dataURL, function (data) {
diff --git a/test/lines-symbol.html b/test/lines-symbol.html
index 10b75d5..ce94253 100644
--- a/test/lines-symbol.html
+++ b/test/lines-symbol.html
@@ -46,7 +46,7 @@ under the License.
                 // 'echarts/component/geo'
             ], function (echarts) {
 
-                $.get('../map/json/china.json', function (chinaJson) {
+                $.get('./data/map/json/china.json', function (chinaJson) {
                     echarts.registerMap('china', chinaJson);
 
                     var myChart = echarts.init(document.getElementById('main'));
diff --git a/test/linesGL-ny-appendData.html b/test/linesGL-ny-appendData.html
index 7a68142..55e62c6 100644
--- a/test/linesGL-ny-appendData.html
+++ b/test/linesGL-ny-appendData.html
@@ -23,7 +23,7 @@ under the License.
         <meta charset='utf-8'>
         <script src='../dist/echarts.js'></script>
         <script src="../../echarts-gl/dist/echarts-gl.js"></script>
-        <script src='../map/js/world.js'></script>
+        <script src='./data/map/js/world.js'></script>
         <meta name='viewport' content='width=device-width, initial-scale=1' />
     </head>
     <body>
diff --git a/test/map-default.html b/test/map-default.html
index 426471e..e87c67b 100644
--- a/test/map-default.html
+++ b/test/map-default.html
@@ -29,7 +29,7 @@ under the License.
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>
         <script src="../dist/echarts.js"></script>
-        <script src="../map/js/china.js"></script>
+        <script src="./data/map/js/china.js"></script>
 
         <link rel="stylesheet" href="lib/reset.css">
     </head>
diff --git a/test/map-labels.html b/test/map-labels.html
index 87f90a8..794ab00 100644
--- a/test/map-labels.html
+++ b/test/map-labels.html
@@ -63,7 +63,7 @@ under the License.
                 colorTool = echarts.color;
                 chart = myChart = echarts.init(document.getElementById('main'));
 
-                $.get('../map/json/world.json', function (worldJson) {
+                $.get('./data/map/json/world.json', function (worldJson) {
                     echarts.registerMap('world', worldJson);
 
                     option = {
diff --git a/test/map-province.html b/test/map-province.html
index 80fa0a3..3ad15fe 100644
--- a/test/map-province.html
+++ b/test/map-province.html
@@ -59,7 +59,7 @@ under the License.
 
                     // myChart.showLoading();
 
-                    $.get('../map/json/province/' + name + '.json', function (geoJson) {
+                    $.get('./data/map/json/province/' + name + '.json', function (geoJson) {
 
                         // myChart.hideLoading();
 
diff --git a/test/mapWorld.html b/test/mapWorld.html
index ce961f4..04e9b1d 100644
--- a/test/mapWorld.html
+++ b/test/mapWorld.html
@@ -45,7 +45,7 @@ under the License.
                 // 'echarts/component/visualMap'
             ], function (echarts) {
 
-                $.get('../map/json/world.json', function (worldJson) {
+                $.get('./data/map/json/world.json', function (worldJson) {
                     echarts.registerMap('world', worldJson);
 
                     var chart = echarts.init(document.getElementById('main'), null, {
diff --git a/test/node/scatter-gps.js b/test/node/scatter-gps.js
index 086283c..d33c42f 100644
--- a/test/node/scatter-gps.js
+++ b/test/node/scatter-gps.js
@@ -33,7 +33,7 @@ var canvas = createCanvas();
 canvas.width = 2048;
 canvas.height = 1024;
 
-var worldJson = JSON.parse(fs.readFileSync('../../map/json/world.json', 'utf-8'));
+var worldJson = JSON.parse(fs.readFileSync('.././data/map/json/world.json', 'utf-8'));
 echarts.registerMap('world', worldJson);
 
 var chart = echarts.init(canvas);
diff --git a/test/scatter-gps.html b/test/scatter-gps.html
index 2cc8b28..da91910 100644
--- a/test/scatter-gps.html
+++ b/test/scatter-gps.html
@@ -54,7 +54,7 @@ under the License.
             }
         </style>
         <script src="../dist/echarts.js"></script>
-        <script src="../map/js/world.js"></script>
+        <script src="./data/map/js/world.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/countup.js"></script>
         <script>
diff --git a/test/scatter-stream-large.html b/test/scatter-stream-large.html
index 7580d8b..0c2499b 100644
--- a/test/scatter-stream-large.html
+++ b/test/scatter-stream-large.html
@@ -46,7 +46,7 @@ under the License.
             'echarts'
         ], function (echarts) {
 
-            $.get('../map/json/world.json', function (worldJson) {
+            $.get('./data/map/json/world.json', function (worldJson) {
                 echarts.registerMap('world', worldJson);
 
                 var count = 35663;
diff --git a/test/scatter-stream-not-large.html b/test/scatter-stream-not-large.html
index 533c2bf..34b73d3 100644
--- a/test/scatter-stream-not-large.html
+++ b/test/scatter-stream-not-large.html
@@ -46,7 +46,7 @@ under the License.
             'echarts'
         ], function (echarts) {
 
-            $.get('../map/json/world.json', function (worldJson) {
+            $.get('./data/map/json/world.json', function (worldJson) {
                 echarts.registerMap('world', worldJson);
 
                 var count = 35663;
diff --git a/test/visualMap-large.html b/test/visualMap-large.html
index d209fc2..f8b144e 100644
--- a/test/visualMap-large.html
+++ b/test/visualMap-large.html
@@ -74,7 +74,7 @@ under the License.
 
                 echarts = ec;
 
-                $.get('../map/json/world.json', function (worldJson) {
+                $.get('./data/map/json/world.json', function (worldJson) {
                     echarts.registerMap('world', worldJson);
 
                     $.getJSON('./data/global-wind.json', function (windData) {
diff --git a/test/worldPopulationBubble.html b/test/worldPopulationBubble.html
index 99fecc8..0df5d9a 100644
--- a/test/worldPopulationBubble.html
+++ b/test/worldPopulationBubble.html
@@ -46,7 +46,7 @@ under the License.
                 // 'echarts/component/visualMap'
             ], function (echarts) {
 
-                $.get('../map/json/world.json', function (worldJson) {
+                $.get('./data/map/json/world.json', function (worldJson) {
                     echarts.registerMap('world', worldJson);
 
                     var latlong = {};


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org