From 2c8da8ce5d6bbe75f828cba25c3c3487c29d15d3 Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Sun, 29 Dec 2019 14:37:32 +0800 Subject: [PATCH] fix(package): fix package fsevents version --- examples/gallery/basic/demo/meta.json | 12 ++-- examples/line/line/demo/isoline.js | 42 -------------- examples/tutorial/data/demo/data_update.js | 16 +++--- examples/tutorial/map/demo/amapInstance.js | 66 ++++++++++++++++++---- examples/tutorial/map/demo/meta.json | 5 ++ package.json | 3 +- yarn.lock | 53 +++++++++++++---- 7 files changed, 117 insertions(+), 80 deletions(-) delete mode 100644 examples/line/line/demo/isoline.js diff --git a/examples/gallery/basic/demo/meta.json b/examples/gallery/basic/demo/meta.json index 7c0f0e3968..2510cc7524 100644 --- a/examples/gallery/basic/demo/meta.json +++ b/examples/gallery/basic/demo/meta.json @@ -6,33 +6,33 @@ "demos": [ { "filename": "column_dark.js", - "title": "", + "title": "3D柱图深色", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*7COqR4wCc6QAAAAAAAAAAABkARQnAQ" }, { "filename": "arcCircle.js", - "title": "", + "title": "弧线地图", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*6Qm_QY69sBMAAAAAAAAAAABkARQnAQ" }, { "filename": "bus_dark.js", - "title": "", + "title": "公交线路深色", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*j-P8RaJMEvAAAAAAAAAAAABkARQnAQ" }, { "filename": "light.js", - "title": "", + "title": "蜂窝图3D", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*SLcGSbvZoEwAAAAAAAAAAABkARQnAQ" }, { "filename": "point.js", - "title": "", + "title": "海量点", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*ypZCT6pqv84AAAAAAAAAAABkARQnAQ" } , { "filename": "normal.js", - "title": "", + "title": "亮度图", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*xr8BQouXGvoAAAAAAAAAAABkARQnAQ" } ] diff --git a/examples/line/line/demo/isoline.js b/examples/line/line/demo/isoline.js deleted file mode 100644 index feebbd0066..0000000000 --- a/examples/line/line/demo/isoline.js +++ /dev/null @@ -1,42 +0,0 @@ -import { Scene, LineLayer } from '@antv/l7'; -import { GaodeMap } from '@antv/l7-maps'; - -const scene = new Scene({ - id: 'map', - map: new GaodeMap({ - pitch: 0, - style: 'light', - center: [ 104.117492, 36.492696 ], - zoom: 3.89 - }) -}); - -fetch( - 'https://gw.alipayobjects.com/os/basement_prod/9f6afbcd-3aec-4a26-bd4a-2276d3439e0d.json' -) - .then(res => res.json()) - .then(data => { - const layer = new LineLayer({}) - .source(data) - .scale('value', { - type: 'quantile' - }) - .size('value', [ 0.5, 1, 1.5, 2 ]) - .shape('line') - .color( - 'value', - [ - '#0A3663', - '#1558AC', - '#3771D9', - '#4D89E5', - '#64A5D3', - '#72BED6', - '#83CED6', - '#A6E1E0', - '#B8EFE2', - '#D7F9F0' - ].reverse() - ); - scene.addLayer(layer); - }); diff --git a/examples/tutorial/data/demo/data_update.js b/examples/tutorial/data/demo/data_update.js index e7fc86881a..f813bdc4a7 100644 --- a/examples/tutorial/data/demo/data_update.js +++ b/examples/tutorial/data/demo/data_update.js @@ -25,6 +25,10 @@ function pointOnCircle(angle) { }] }; } + +scene.on('loaded', () => { + // animateMarker(0); +}); const layer = new PointLayer() .source(pointOnCircle(0)) .shape('circle') @@ -36,11 +40,7 @@ const layer = new PointLayer() opacity: 1 }); scene.addLayer(layer); -function animateMarker(timestamp) { - layer.setData(pointOnCircle(timestamp / 1000)); - requestAnimationFrame(animateMarker); -} -layer.on('inited', () => { - animateMarker(0); -}); - +// function animateMarker(timestamp) { +// layer.setData(pointOnCircle(timestamp / 1000)); +// requestAnimationFrame(animateMarker); +// } diff --git a/examples/tutorial/map/demo/amapInstance.js b/examples/tutorial/map/demo/amapInstance.js index 25ce7fd595..3d1df3299d 100644 --- a/examples/tutorial/map/demo/amapInstance.js +++ b/examples/tutorial/map/demo/amapInstance.js @@ -1,14 +1,56 @@ -import { Scene } from '@antv/l7'; +import { Scene, PointLayer } from '@antv/l7'; import { GaodeMap } from '@antv/l7-maps'; -const map = new AMap.Map('container', { - resizeEnable: true, // 是否监控地图容器尺寸变化 - zoom: 11, // 初始化地图层级 - center: [ 116.397428, 39.90923 ] // 初始化地图中心点 -}); -new Scene({ - id: 'map', - map: new GaodeMap({ - mapInstance: map - }) -}); +window.onLoad = function() { + const map = new AMap.Map('map', { + viewMode: '3D', + pitch: 0, + mapStyle: 'amap://styles/darkblue', + center: [ 121.435159, 31.256971 ], + zoom: 14.89, + minZoom: 10 + }); + const scene = new Scene({ + id: 'map', + map: new GaodeMap({ + mapInstance: map + }) + }); + fetch( + 'https://gw.alipayobjects.com/os/basement_prod/893d1d5f-11d9-45f3-8322-ee9140d288ae.json' + ) + .then(res => res.json()) + .then(data => { + const pointLayer = new PointLayer() + .source(data, { + parser: { + type: 'json', + x: 'longitude', + y: 'latitude' + } + }) + .shape('name', [ + 'circle', + 'triangle', + 'square', + 'pentagon', + 'hexagon', + 'octogon', + 'hexagram', + 'rhombus', + 'vesica' + ]) + .size('unit_price', [ 10, 25 ]) + .color('name', [ '#5B8FF9', '#5CCEA1', '#5D7092', '#F6BD16', '#E86452' ]) + .style({ + opacity: 0.3, + strokeWidth: 2 + }); + scene.addLayer(pointLayer); + }); +}; +const url = 'https://webapi.amap.com/maps?v=1.4.15&key=15cd8a57710d40c9b7c0e3cc120f1200&callback=onLoad'; +const jsapi = document.createElement('script'); +jsapi.charset = 'utf-8'; +jsapi.src = url; +document.head.appendChild(jsapi); diff --git a/examples/tutorial/map/demo/meta.json b/examples/tutorial/map/demo/meta.json index 17980c8053..329fc51eb9 100644 --- a/examples/tutorial/map/demo/meta.json +++ b/examples/tutorial/map/demo/meta.json @@ -13,6 +13,11 @@ "filename": "mapbox.js", "title": "MapBox底图", "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*_SIYR50bbcoAAAAAAAAAAABkARQnAQ" + }, + { + "filename": "amapInstance.js", + "title": "通过高德地图实例化", + "screenshot": "https://gw.alipayobjects.com/mdn/antv_site/afts/img/A*_SIYR50bbcoAAAAAAAAAAABkARQnAQ" } ] } diff --git a/package.json b/package.json index 6278e6e42c..a1dba99268 100644 --- a/package.json +++ b/package.json @@ -166,8 +166,7 @@ } }, "resolutions": { - "../core-js": "3", - "**/**/fsevents": "^2.1.2" + "../core-js": "3" }, "tnpm": { "mode": "yarn" diff --git a/yarn.lock b/yarn.lock index 6cae1a1bdd..799d9e77b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3908,7 +3908,7 @@ "@typescript-eslint/eslint-plugin@^2.0.0", "@typescript-eslint/eslint-plugin@^2.11.0": version "2.13.0" - resolved "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.13.0.tgz?cache=0&sync_timestamp=1577496664804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Feslint-plugin%2Fdownload%2F%40typescript-eslint%2Feslint-plugin-2.13.0.tgz#57e933fe16a2fc66dbac059af0d6d85d921d748e" + resolved "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.13.0.tgz#57e933fe16a2fc66dbac059af0d6d85d921d748e" integrity sha1-V+kz/hai/GbbrAWa8NbYXZIddI4= dependencies: "@typescript-eslint/experimental-utils" "2.13.0" @@ -3919,7 +3919,7 @@ "@typescript-eslint/experimental-utils@2.13.0": version "2.13.0" - resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.13.0.tgz?cache=0&sync_timestamp=1577496661323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fexperimental-utils%2Fdownload%2F%40typescript-eslint%2Fexperimental-utils-2.13.0.tgz#958614faa6f77599ee2b241740e0ea402482533d" + resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.13.0.tgz#958614faa6f77599ee2b241740e0ea402482533d" integrity sha1-lYYU+qb3dZnuKyQXQODqQCSCUz0= dependencies: "@types/json-schema" "^7.0.3" @@ -3928,7 +3928,7 @@ "@typescript-eslint/parser@^2.0.0", "@typescript-eslint/parser@^2.11.0": version "2.13.0" - resolved "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.13.0.tgz?cache=0&sync_timestamp=1577496663922&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fparser%2Fdownload%2F%40typescript-eslint%2Fparser-2.13.0.tgz#ea1ab394cf9ca17467e3da7f96eca9309f57c326" + resolved "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.13.0.tgz#ea1ab394cf9ca17467e3da7f96eca9309f57c326" integrity sha1-6hqzlM+coXRn49p/luypMJ9XwyY= dependencies: "@types/eslint-visitor-keys" "^1.0.0" @@ -8359,7 +8359,7 @@ detect-indent@^5.0.0: resolved "https://registry.npm.taobao.org/detect-indent/download/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.3: +detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.npm.taobao.org/detect-libc/download/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -10496,7 +10496,15 @@ fs.realpath@^1.0.0: resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.2.7, fsevents@^2.1.2, fsevents@~2.1.1: +fsevents@^1.2.7: + version "1.2.11" + resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha1-Z79X9HWPAu3oj7KhcS/vTRU1i+M= + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +fsevents@~2.1.1: version "2.1.2" resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" integrity sha1-TAofs0vGjlQ7S4Kp7Dkr+9qECAU= @@ -12467,7 +12475,7 @@ i18next@^19.0.0: dependencies: "@babel/runtime" "^7.3.1" -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= @@ -15909,7 +15917,7 @@ name-all-modules-plugin@^1.0.1: resolved "https://registry.npm.taobao.org/name-all-modules-plugin/download/name-all-modules-plugin-1.0.1.tgz#0abfb6ad835718b9fb4def0674e06657a954375c" integrity sha1-Cr+2rYNXGLn7Te8GdOBmV6lUN1w= -nan@^2.13.2, nan@^2.14.0: +nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: version "2.14.0" resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw= @@ -15971,6 +15979,15 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.npm.taobao.org/needle/download/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha1-aDPnSXXERGQlkOFadQKIxfk5tXw= + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -16173,6 +16190,22 @@ node-object-hash@^2.0.0: resolved "https://registry.npm.taobao.org/node-object-hash/download/node-object-hash-2.0.0.tgz#9971fcdb7d254f05016bd9ccf508352bee11116b" integrity sha1-mXH8230lTwUBa9nM9Qg1K+4REWs= +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha1-mgWWUzuHcom8rU4UOYLKPZBN3IM= + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.29, node-releases@^1.1.42: version "1.1.44" resolved "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.44.tgz?cache=0&sync_timestamp=1577230945218&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7" @@ -16358,7 +16391,7 @@ npm-package-arg@^5.1.2: semver "^5.1.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.4.4: +npm-packlist@^1.1.6, npm-packlist@^1.4.4: version "1.4.7" resolved "https://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" integrity sha1-npVDZaBrgLGBEeqQCUWvT4jtSEg= @@ -16419,7 +16452,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha1-CKfyqL9zRgR3mp76StXMcXq7lUs= @@ -22217,7 +22250,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.npm.taobao.org/tar/download/tar-4.4.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftar%2Fdownload%2Ftar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha1-Q7NkvFKIjVVSmGN7ENYHkCVKtSU=