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/10 16:43:55 UTC
[incubator-echarts-examples] branch next updated: fix gl examples.
remove map
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-examples.git
The following commit(s) were added to refs/heads/next by this push:
new ebdbe90 fix gl examples. remove map
ebdbe90 is described below
commit ebdbe90070167645d21f63825c946e904cbffe9d
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Nov 11 00:33:24 2020 +0800
fix gl examples. remove map
---
public/data-gl/animating-contour-on-globe.js | 7 ++++---
public/data-gl/globe-contour-paint.js | 7 ++++---
src/data/chart-list-data-gl.js | 18 +++++++++---------
src/editor/Preview.vue | 2 --
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/public/data-gl/animating-contour-on-globe.js b/public/data-gl/animating-contour-on-globe.js
index 584a4ce..407718f 100644
--- a/public/data-gl/animating-contour-on-globe.js
+++ b/public/data-gl/animating-contour-on-globe.js
@@ -23,9 +23,10 @@ context.fillStyle = config.color;
context.shadowColor = config.color;
$.when(
- $.getScript(ROOT_PATH + '/vendors/d3/d3-contour.js'),
- $.getScript(ROOT_PATH + '/vendors/d3/d3-geo.js'),
- $.getScript(ROOT_PATH + '/vendors/d3/d3-timer.js')
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-array@2.8.0/dist/d3-array.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-contour@2.0.0/dist/d3-contour.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-geo@2.0.1/dist/d3-geo.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-timer@2.0.0/dist/d3-timer.js')
).done(function () {
image(ROOT_PATH + '/data-gl/asset/bathymetry_bw_composite_4k.jpg').then(function(image) {
diff --git a/public/data-gl/globe-contour-paint.js b/public/data-gl/globe-contour-paint.js
index 679ce40..30a9815 100644
--- a/public/data-gl/globe-contour-paint.js
+++ b/public/data-gl/globe-contour-paint.js
@@ -23,9 +23,10 @@ context.fillStyle = config.color;
context.shadowColor = config.color;
$.when(
- $.getScript(ROOT_PATH + '/vendors/d3/d3-contour.js'),
- $.getScript(ROOT_PATH + '/vendors/d3/d3-geo.js'),
- $.getScript(ROOT_PATH + '/vendors/d3/d3-timer.js')
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-array@2.8.0/dist/d3-array.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-contour@2.0.0/dist/d3-contour.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-geo@2.0.1/dist/d3-geo.js'),
+ $.getScript('https://cdn.jsdelivr.net/npm/d3-timer@2.0.0/dist/d3-timer.js')
).done(function () {
image(ROOT_PATH + '/data-gl/asset/bathymetry_bw_composite_4k.jpg').then(function(image) {
diff --git a/src/data/chart-list-data-gl.js b/src/data/chart-list-data-gl.js
index 1f58210..e27f438 100644
--- a/src/data/chart-list-data-gl.js
+++ b/src/data/chart-list-data-gl.js
@@ -20,15 +20,15 @@ export default [
"title": "3D Bar with Dataset",
"difficulty": 10
},
- {
- "category": [
- "bar3D"
- ],
- "id": "bar3d-global-population",
- "tags": [],
- "title": "Bar3D - Global Population",
- "difficulty": 10
- },
+ // {
+ // "category": [
+ // "bar3D"
+ // ],
+ // "id": "bar3d-global-population",
+ // "tags": [],
+ // "title": "Bar3D - Global Population",
+ // "difficulty": 10
+ // },
{
"category": [
"bar3D"
diff --git a/src/editor/Preview.vue b/src/editor/Preview.vue
index 9066f4d..8da1ebd 100644
--- a/src/editor/Preview.vue
+++ b/src/editor/Preview.vue
@@ -96,8 +96,6 @@ export function ensureECharts() {
'local' in URL_PARAMS
? SCRIPT_URLS.localEChartsMinJS : SCRIPT_URLS.echartsMinJS,
SCRIPT_URLS.echartsDir + '/dist/extension/dataTool.js',
- SCRIPT_URLS.echartsDir + '/map/js/world.js',
- SCRIPT_URLS.echartsDir + '/map/js/china.js',
SCRIPT_URLS.echartsStatMinJS,
...URL_PARAMS.gl ? [SCRIPT_URLS.echartsGLMinJS] : [],
...hasBmap ? [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org