From 3bbc1eca78b54c5aec8c0e257824104f02e4776b Mon Sep 17 00:00:00 2001 From: "@thinkinggis" Date: Fri, 30 Dec 2022 18:02:59 +0800 Subject: [PATCH 1/8] Publish 2.13.0 (#1559) * fix: docs: lint error * chore: publish --- lerna.json | 2 +- packages/component/package.json | 8 ++++---- packages/core/package.json | 4 ++-- packages/l7/package.json | 16 ++++++++-------- packages/l7/src/version.ts | 2 +- packages/layers/package.json | 10 +++++----- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/mini/package.json | 12 ++++++------ packages/renderer/package.json | 8 ++++---- packages/scene/package.json | 16 ++++++++-------- packages/site/package.json | 2 +- packages/source/package.json | 6 +++--- packages/test-utils/package.json | 8 ++++---- packages/three/package.json | 4 ++-- packages/utils/package.json | 2 +- 16 files changed, 56 insertions(+), 56 deletions(-) diff --git a/lerna.json b/lerna.json index c6012e0f22..fba8d45a9c 100644 --- a/lerna.json +++ b/lerna.json @@ -16,7 +16,7 @@ "registry": "https://registry.npmjs.org" } }, - "version": "2.12.2", + "version": "2.13.0", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index fd0cd9fc84..cb75e30452 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", @@ -36,7 +36,7 @@ "supercluster": "^7.0.0" }, "devDependencies": { - "@antv/l7-test-utils": "2.12.2", + "@antv/l7-test-utils": "2.13.0", "gcoord": "^0.3.2", "less": "^4.1.3" }, diff --git a/packages/core/package.json b/packages/core/package.json index 9431913d70..dafec265e9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,7 +25,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-utils": "2.12.2", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "@turf/helpers": "^6.1.4", "ajv": "^6.10.2", diff --git a/packages/l7/package.json b/packages/l7/package.json index e9372098a7..87090d6449 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.12.2", + "version": "2.13.0", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -26,13 +26,13 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "2.12.2", - "@antv/l7-core": "2.12.2", - "@antv/l7-layers": "2.12.2", - "@antv/l7-maps": "2.12.2", - "@antv/l7-scene": "2.12.2", - "@antv/l7-source": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-component": "2.13.0", + "@antv/l7-core": "2.13.0", + "@antv/l7-layers": "2.13.0", + "@antv/l7-maps": "2.13.0", + "@antv/l7-scene": "2.13.0", + "@antv/l7-source": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 6f573f1c07..0566e4a328 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.12.2'; +const version = '2.13.0'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 88ded70b0c..fe454c049f 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.12.2", + "version": "2.13.0", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -27,10 +27,10 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-core": "2.12.2", - "@antv/l7-maps": "2.12.2", - "@antv/l7-source": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-maps": "2.13.0", + "@antv/l7-source": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/clone": "^6.5.0", diff --git a/packages/map/package.json b/packages/map/package.json index 4efc255611..5c44cce148 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.12.2", + "version": "2.13.0", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "2.12.2", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/maps/package.json b/packages/maps/package.json index 0670b2c3e6..5d92b469ae 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", - "@antv/l7-core": "2.12.2", - "@antv/l7-map": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-map": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/mini/package.json b/packages/mini/package.json index 4eb396605a..d8dc0831b9 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-mini", - "version": "2.12.2", + "version": "2.13.0", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,11 +25,11 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-core": "2.12.2", - "@antv/l7-layers": "2.12.2", - "@antv/l7-maps": "2.12.2", - "@antv/l7-scene": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-layers": "2.13.0", + "@antv/l7-maps": "2.13.0", + "@antv/l7-scene": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 3cdea0d10f..708a78fbfc 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,12 +25,12 @@ "author": "xiaoiver", "license": "ISC", "devDependencies": { - "@antv/l7-test-utils": "2.12.2", + "@antv/l7-test-utils": "2.13.0", "gl": "^5.0.3" }, "dependencies": { - "@antv/l7-core": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.20", diff --git a/packages/scene/package.json b/packages/scene/package.json index a62ec07eb7..69eea5f691 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "2.12.2", - "@antv/l7-core": "2.12.2", - "@antv/l7-layers": "2.12.2", - "@antv/l7-maps": "2.12.2", - "@antv/l7-renderer": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-component": "2.13.0", + "@antv/l7-core": "2.13.0", + "@antv/l7-layers": "2.13.0", + "@antv/l7-maps": "2.13.0", + "@antv/l7-renderer": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.7", "inversify": "^5.0.1", @@ -36,7 +36,7 @@ "reflect-metadata": "^0.1.13" }, "devDependencies": { - "@antv/l7-test-utils": "2.12.2" + "@antv/l7-test-utils": "2.13.0" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "publishConfig": { diff --git a/packages/site/package.json b/packages/site/package.json index 5321107ee2..0fb2cef47e 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@antv/l7-site", - "version": "2.12.2", + "version": "2.13.0", "description": "L7 sites deployed on gh-pages", "keywords": [ "antv", diff --git a/packages/source/package.json b/packages/source/package.json index 2a0a0aa9c1..13368dcf62 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-core": "2.12.2", - "@antv/l7-utils": "2.12.2", + "@antv/l7-core": "2.13.0", + "@antv/l7-utils": "2.13.0", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/vector-tile": "^1.3.1", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 02708de445..403e7488cc 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@antv/l7-test-utils", - "version": "2.12.2", + "version": "2.13.0", "description": "Now I’m the model of a modern major general / The venerated Virginian veteran whose men are all / Lining up, to put me up on a pedestal / Writin’ letters to relatives / Embellishin’ my elegance and eloquence / But the elephant is in the room / The truth is in ya face when ya hear the British cannons go / BOOM", "keywords": [], "author": "lzxue ", @@ -39,9 +39,9 @@ "url": "https://github.com/antvis/L7/issues" }, "devDependencies": { - "@antv/l7-map": "2.12.2", - "@antv/l7-maps": "2.12.2", - "@antv/l7-scene": "2.12.2", + "@antv/l7-map": "2.13.0", + "@antv/l7-maps": "2.13.0", + "@antv/l7-scene": "2.13.0", "gl": "^5.0.3", "l7regl": "^0.0.20" }, diff --git a/packages/three/package.json b/packages/three/package.json index 56532f4475..134dc04df5 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.12.2", + "version": "2.13.0", "description": "three for L7 ", "keywords": [ "3D", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7": "2.12.2", + "@antv/l7": "2.13.0", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index 747902bcb8..bb8ccaa4cb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.12.2", + "version": "2.13.0", "description": "", "main": "lib/index.js", "module": "es/index.js", From 460679aebdf1b719374bfe424c8a90e62c237242 Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+yiiiiiiqianyao@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:21:40 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20gl=20jest-test?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=20(#1562)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: shihui --- .../layers/src/point/__tests__/layer_init.spec.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/layers/src/point/__tests__/layer_init.spec.ts b/packages/layers/src/point/__tests__/layer_init.spec.ts index 7b6bc5e530..cc8e8e320f 100644 --- a/packages/layers/src/point/__tests__/layer_init.spec.ts +++ b/packages/layers/src/point/__tests__/layer_init.spec.ts @@ -3,13 +3,7 @@ import { TestScene } from '@antv/l7-test-utils'; import PointLayer from '../'; describe('template', () => { - - it('1', async () => { - - expect('1').toEqual('1') - - }); - + const el = document.createElement('div'); el.id = 'test-div-id'; const body = document.querySelector('body') as HTMLBodyElement; @@ -67,7 +61,7 @@ describe('template', () => { expect(layer.name).toEqual('text') }) - // scene.addLayer(layer) + scene.addLayer(layer) }); @@ -104,7 +98,9 @@ describe('template', () => { ).shape('simple') .color('red') .size(1) - scene.addLayer(layer) + scene.on('loaded', () =>{ + scene.addLayer(layer) + }) }); From ff90a19e2d1a82209bf2a0f4855d404290cc8e7e Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+yiiiiiiqianyao@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:22:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=B8=BF=E8=92=99?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20webgl=20=E6=89=A9=E5=B1=95=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=94=99=E8=AF=AF=20(#1561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: shihui --- packages/layers/src/line/models/line.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/layers/src/line/models/line.ts b/packages/layers/src/line/models/line.ts index 6559d93374..04f17ccd71 100644 --- a/packages/layers/src/line/models/line.ts +++ b/packages/layers/src/line/models/line.ts @@ -39,14 +39,6 @@ export default class LineModel extends BaseModel { width: 1, height: 1, }); - protected dataTexture: ITexture2D =this.createTexture2D({ - flipY: true, - data: [1], - format: gl.LUMINANCE, - type: gl.FLOAT, - width: 1, - height: 1, - }); public getUninforms(): IModelUniform { const { opacity = 1, From 44d31b8fbc14e999d192d555e17d8a09e133937e Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+yiiiiiiqianyao@users.noreply.github.com> Date: Mon, 9 Jan 2023 11:07:06 +0800 Subject: [PATCH 5/8] chore: publish update version 2.13.0 -> 2.13.1 (#1565) * chore: publish * chore: update version 2.13.0 -> 2.13.1 fix bug Co-authored-by: shihui --- lerna.json | 2 +- packages/component/package.json | 8 ++++---- packages/core/package.json | 4 ++-- packages/l7/package.json | 16 ++++++++-------- packages/l7/src/version.ts | 2 +- packages/layers/package.json | 10 +++++----- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/mini/package.json | 12 ++++++------ packages/renderer/package.json | 8 ++++---- packages/scene/package.json | 16 ++++++++-------- packages/site/package.json | 2 +- packages/source/package.json | 6 +++--- packages/test-utils/package.json | 8 ++++---- packages/three/package.json | 4 ++-- packages/utils/package.json | 2 +- 16 files changed, 56 insertions(+), 56 deletions(-) diff --git a/lerna.json b/lerna.json index fba8d45a9c..044aa35b48 100644 --- a/lerna.json +++ b/lerna.json @@ -16,7 +16,7 @@ "registry": "https://registry.npmjs.org" } }, - "version": "2.13.0", + "version": "2.13.1", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index cb75e30452..c659bfbc17 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", @@ -36,7 +36,7 @@ "supercluster": "^7.0.0" }, "devDependencies": { - "@antv/l7-test-utils": "2.13.0", + "@antv/l7-test-utils": "2.13.1", "gcoord": "^0.3.2", "less": "^4.1.3" }, diff --git a/packages/core/package.json b/packages/core/package.json index dafec265e9..ef41b7acb1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,7 +25,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-utils": "2.13.0", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "@turf/helpers": "^6.1.4", "ajv": "^6.10.2", diff --git a/packages/l7/package.json b/packages/l7/package.json index 87090d6449..9eeb6970a0 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.13.0", + "version": "2.13.1", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -26,13 +26,13 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "2.13.0", - "@antv/l7-core": "2.13.0", - "@antv/l7-layers": "2.13.0", - "@antv/l7-maps": "2.13.0", - "@antv/l7-scene": "2.13.0", - "@antv/l7-source": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-component": "2.13.1", + "@antv/l7-core": "2.13.1", + "@antv/l7-layers": "2.13.1", + "@antv/l7-maps": "2.13.1", + "@antv/l7-scene": "2.13.1", + "@antv/l7-source": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 0566e4a328..18af29085c 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.13.0'; +const version = '2.13.1'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index fe454c049f..1b1e2ef617 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.13.0", + "version": "2.13.1", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -27,10 +27,10 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-core": "2.13.0", - "@antv/l7-maps": "2.13.0", - "@antv/l7-source": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-maps": "2.13.1", + "@antv/l7-source": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/clone": "^6.5.0", diff --git a/packages/map/package.json b/packages/map/package.json index 5c44cce148..84b5569d62 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.13.0", + "version": "2.13.1", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "2.13.0", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/maps/package.json b/packages/maps/package.json index 5d92b469ae..56d2335372 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", - "@antv/l7-core": "2.13.0", - "@antv/l7-map": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-map": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/mini/package.json b/packages/mini/package.json index d8dc0831b9..b3a85409f3 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-mini", - "version": "2.13.0", + "version": "2.13.1", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,11 +25,11 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-core": "2.13.0", - "@antv/l7-layers": "2.13.0", - "@antv/l7-maps": "2.13.0", - "@antv/l7-scene": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-layers": "2.13.1", + "@antv/l7-maps": "2.13.1", + "@antv/l7-scene": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 708a78fbfc..3e994e9300 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,12 +25,12 @@ "author": "xiaoiver", "license": "ISC", "devDependencies": { - "@antv/l7-test-utils": "2.13.0", + "@antv/l7-test-utils": "2.13.1", "gl": "^5.0.3" }, "dependencies": { - "@antv/l7-core": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.20", diff --git a/packages/scene/package.json b/packages/scene/package.json index 69eea5f691..feb47e6e71 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "2.13.0", - "@antv/l7-core": "2.13.0", - "@antv/l7-layers": "2.13.0", - "@antv/l7-maps": "2.13.0", - "@antv/l7-renderer": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-component": "2.13.1", + "@antv/l7-core": "2.13.1", + "@antv/l7-layers": "2.13.1", + "@antv/l7-maps": "2.13.1", + "@antv/l7-renderer": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.7", "inversify": "^5.0.1", @@ -36,7 +36,7 @@ "reflect-metadata": "^0.1.13" }, "devDependencies": { - "@antv/l7-test-utils": "2.13.0" + "@antv/l7-test-utils": "2.13.1" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "publishConfig": { diff --git a/packages/site/package.json b/packages/site/package.json index 0fb2cef47e..6e00ddd684 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@antv/l7-site", - "version": "2.13.0", + "version": "2.13.1", "description": "L7 sites deployed on gh-pages", "keywords": [ "antv", diff --git a/packages/source/package.json b/packages/source/package.json index 13368dcf62..13c93db942 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.2.9", - "@antv/l7-core": "2.13.0", - "@antv/l7-utils": "2.13.0", + "@antv/l7-core": "2.13.1", + "@antv/l7-utils": "2.13.1", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/vector-tile": "^1.3.1", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 403e7488cc..c7c3a1413c 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@antv/l7-test-utils", - "version": "2.13.0", + "version": "2.13.1", "description": "Now I’m the model of a modern major general / The venerated Virginian veteran whose men are all / Lining up, to put me up on a pedestal / Writin’ letters to relatives / Embellishin’ my elegance and eloquence / But the elephant is in the room / The truth is in ya face when ya hear the British cannons go / BOOM", "keywords": [], "author": "lzxue ", @@ -39,9 +39,9 @@ "url": "https://github.com/antvis/L7/issues" }, "devDependencies": { - "@antv/l7-map": "2.13.0", - "@antv/l7-maps": "2.13.0", - "@antv/l7-scene": "2.13.0", + "@antv/l7-map": "2.13.1", + "@antv/l7-maps": "2.13.1", + "@antv/l7-scene": "2.13.1", "gl": "^5.0.3", "l7regl": "^0.0.20" }, diff --git a/packages/three/package.json b/packages/three/package.json index 134dc04df5..d2124b1bb2 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.13.0", + "version": "2.13.1", "description": "three for L7 ", "keywords": [ "3D", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7": "2.13.0", + "@antv/l7": "2.13.1", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index bb8ccaa4cb..1fa66c8a84 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.13.0", + "version": "2.13.1", "description": "", "main": "lib/index.js", "module": "es/index.js", From 0587b41e1b5808da05b7d2b57e7f24586609f136 Mon Sep 17 00:00:00 2001 From: heiyexing <496845051@qq.com> Date: Fri, 13 Jan 2023 14:04:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?docs:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=20(#1569)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: 1.修复文档对 dumi 版本的依赖问题 2.修复图层 Source 示例代码问题 * docs: 新增面图层框选示例 Co-authored-by: yanxiong --- .../site/docs/api/line_layer/source.zh.md | 4 +- .../site/docs/api/polygon_layer/source.zh.md | 4 +- .../tutorial/layer/demo/layer_boxselect.js | 77 +++++++++++++++++++ .../examples/tutorial/layer/demo/meta.json | 5 ++ packages/site/package.json | 2 +- 5 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 packages/site/examples/tutorial/layer/demo/layer_boxselect.js diff --git a/packages/site/docs/api/line_layer/source.zh.md b/packages/site/docs/api/line_layer/source.zh.md index 757553774f..5532c0f1b0 100644 --- a/packages/site/docs/api/line_layer/source.zh.md +++ b/packages/site/docs/api/line_layer/source.zh.md @@ -11,7 +11,7 @@ order: 2 ```js // 传入 GeoJSON 类型数据 *** L7 默认支持，不需要 parser 解析 -var data = { +const data = { type: 'FeatureCollection', features: [ { @@ -28,7 +28,7 @@ var data = { ], }; -var layer = new PointLayer().source(data); +const layer = new LineLayer().source(data); ``` ### CSV diff --git a/packages/site/docs/api/polygon_layer/source.zh.md b/packages/site/docs/api/polygon_layer/source.zh.md index 8814cafaf7..05268a4b68 100644 --- a/packages/site/docs/api/polygon_layer/source.zh.md +++ b/packages/site/docs/api/polygon_layer/source.zh.md @@ -13,7 +13,7 @@ order: 2 ```js // 传入 GeoJSON 类型数据 *** L7 默认支持，不需要 parser 解析 -var data = { +const data = { type: 'FeatureCollection', features: [ { @@ -34,5 +34,5 @@ var data = { ], }; -var layer = new PointLayer().source(data); +const layer = new PolygonLayer().source(data); ``` diff --git a/packages/site/examples/tutorial/layer/demo/layer_boxselect.js b/packages/site/examples/tutorial/layer/demo/layer_boxselect.js new file mode 100644 index 0000000000..9f80479083 --- /dev/null +++ b/packages/site/examples/tutorial/layer/demo/layer_boxselect.js @@ -0,0 +1,77 @@ +import { PolygonLayer, LineLayer, Scene } from '@antv/l7'; +import { GaodeMap } from '@antv/l7-maps'; + +const scene = new Scene({ + id: 'map', + map: new GaodeMap({ + style: 'light', + center: [120.13618469238281, 30.247352897833554], + zoom: 9, + }), +}); +scene.on('loaded', () => { + fetch('https://geo.datav.aliyun.com/areas_v3/bound/330100_full.json') + .then((res) => res.json()) + .then((data) => { + const fillLayer = new PolygonLayer({ + name: 'fill', + autoFit: true, + }) + .source(data) + .shape('fill') + .color('adcode', [ + '#f0f9e8', + '#ccebc5', + '#a8ddb5', + '#7bccc4', + '#43a2ca', + '#0868ac', + ]); + + const lineLayer = new LineLayer({ + zIndex: 1, + name: 'line', + }) + .source(data) + .shape('line') + .size(1) + .color('#fff'); + + const selectLayer = new LineLayer({ + zIndex: 2, + name: 'select', + }) + .source([]) + .shape('line') + .size(2) + .color('#f00'); + + scene.addLayer(fillLayer); + scene.addLayer(lineLayer); + scene.addLayer(selectLayer); + + scene.enableBoxSelect(false); + + const onBoxSelect = (bbox, startEvent, endEvent) => { + const { x: x1, y: y1 } = startEvent; + const { x: x2, y: y2 } = endEvent; + fillLayer.boxSelect( + [ + Math.min(x1, x2), + Math.min(y1, y2), + Math.max(x1, x2), + Math.max(y1, y2), + ], + (features) => { + selectLayer.setData({ + type: 'FeatureCollection', + features: features ?? [], + }); + }, + ); + }; + + scene.on('selecting', onBoxSelect); + scene.on('selectend', onBoxSelect); + }); +}); diff --git a/packages/site/examples/tutorial/layer/demo/meta.json b/packages/site/examples/tutorial/layer/demo/meta.json index 5865f9fd63..c2a6ff2bf7 100644 --- a/packages/site/examples/tutorial/layer/demo/meta.json +++ b/packages/site/examples/tutorial/layer/demo/meta.json @@ -8,6 +8,11 @@ "filename": "layer_highlight.js", "title": "交互高亮图层", "screenshot": "https://gw.alipayobjects.com/mdn/rms_816329/afts/img/A*CnSaSaPwyX8AAAAAAAAAAAAAARQnAQ" + }, + { + "filename": "layer_boxselect.js", + "title": "框选图层", + "screenshot": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*5kzJQYS_N20AAAAAAAAAAAAADmJ7AQ/original" } ] } diff --git a/packages/site/package.json b/packages/site/package.json index 6e00ddd684..cf495926d1 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -44,7 +44,7 @@ "babel-plugin-inline-import": "^3.0.0", "babel-plugin-transform-import-css-l7": "^0.0.6", "cross-env": "^7.0.3", - "dumi": "^2.0.3", + "dumi": "^2.1.3", "gcoord": "^0.3.2", "geotiff": "^2.0.7", "gh-pages": "^2.1.1", From cefe7a71edf9cbf7b6909b811846e03c1210ed52 Mon Sep 17 00:00:00 2001 From: "@thinkinggis" Date: Mon, 16 Jan 2023 16:37:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20scale=20update=20=20=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=20(#1574)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: scale update * docs: scale/filter document * docs: this image is missing a text alternative --- dev-demos/bugs/polygon/demos/polygon.tsx | 13 +- dev-demos/bugs/polygon/demos/scale.tsx | 1 - dev-demos/draw/demo/drawpolygon.tsx | 41 ++++ dev-demos/draw/{index.md => line_area.md} | 2 +- dev-demos/draw/polygon.md | 9 + dev-demos/gallery/scale/index.md | 2 +- .../services/layer/IStyleAttributeService.ts | 1 + .../services/layer/StyleAttributeService.ts | 16 +- packages/layers/src/core/BaseLayer.ts | 6 +- packages/site/docs/api/base_layer/base.zh.md | 1 + .../site/docs/common/layer/layer_encode.md | 161 ++++++++----- .../site/docs/common/layer/layer_texture.md | 2 +- .../site/docs/common/layer/layer_update.md | 30 ++- packages/site/docs/tutorial/scale.en.md | 5 + packages/site/docs/tutorial/scale.zh.md | 212 ++++++++++++++++++ 15 files changed, 431 insertions(+), 71 deletions(-) create mode 100644 dev-demos/draw/demo/drawpolygon.tsx rename dev-demos/draw/{index.md => line_area.md} (87%) create mode 100644 dev-demos/draw/polygon.md create mode 100644 packages/site/docs/tutorial/scale.en.md create mode 100644 packages/site/docs/tutorial/scale.zh.md diff --git a/dev-demos/bugs/polygon/demos/polygon.tsx b/dev-demos/bugs/polygon/demos/polygon.tsx index abe71ce99f..be47c6c891 100644 --- a/dev-demos/bugs/polygon/demos/polygon.tsx +++ b/dev-demos/bugs/polygon/demos/polygon.tsx @@ -2530,6 +2530,9 @@ export default () => { // 'rgb(8,81,156)' // ] // ) + .scale('num',{ + type:'quantile' + }) .color("num", ["#E8F1FF", "#A8BDEC", "#688DE4", "#3461CA", "#23396E"]) .shape("fill") .select({ @@ -2539,7 +2542,7 @@ export default () => { .style({ opacity: 1 }); - + // 默认高亮选中北京 chinaPolygonLayer.on("add", () => { setTimeout(() => { @@ -2567,6 +2570,14 @@ export default () => { scene.addLayer(chinaPolygonLayer); scene.addLayer(layer2); + setTimeout(()=>{ + chinaPolygonLayer.scale('num',{ + type:'quantize' + }) + // chinaPolygonLayer.color('num',['#ffffb2','#fed976','#feb24c','#fd8d3c','#f03b20','#bd0026']) + scene.render() + console.log('render') + },3000) }); fetch( "https://gw.alipayobjects.com/os/bmw-prod/c4a6aa9d-8923-4193-a695-455fd8f6638c.json" // 标注数据 diff --git a/dev-demos/bugs/polygon/demos/scale.tsx b/dev-demos/bugs/polygon/demos/scale.tsx index f50098aae1..96e258e1b6 100644 --- a/dev-demos/bugs/polygon/demos/scale.tsx +++ b/dev-demos/bugs/polygon/demos/scale.tsx @@ -243,7 +243,6 @@ const data = { } ] } -console.log(data); export default () => { useEffect(() => { const scene = new Scene({ diff --git a/dev-demos/draw/demo/drawpolygon.tsx b/dev-demos/draw/demo/drawpolygon.tsx new file mode 100644 index 0000000000..f7699d176d --- /dev/null +++ b/dev-demos/draw/demo/drawpolygon.tsx @@ -0,0 +1,41 @@ +import { Scene } from '@antv/l7'; +import { DrawPolygon } from '@antv/l7-draw'; +import { Map } from '@antv/l7-maps'; +import React, { useEffect, useState } from 'react'; + +const id = String(Math.random()); + +const Demo: React.FC = () => { + const [, setLineDrawer] = useState(null); + + useEffect(() => { + const scene = new Scene({ + id, + map: new Map({ + center: [120.151634, 30.244831], + pitch: 0, + style: 'dark', + zoom: 10, + }), + }); + scene.on('mousedown', () => { + console.log('mousedown'); + }); + + scene.on('loaded', () => { + const drawer = new DrawPolygon(scene, { + // liveUpdate: true, + }); + setLineDrawer(drawer); + drawer.enable(); + }); + }, []); + + return ( +
+
+
+ ); +}; + +export default Demo; diff --git a/dev-demos/draw/index.md b/dev-demos/draw/line_area.md similarity index 87% rename from dev-demos/draw/index.md rename to dev-demos/draw/line_area.md index 49bd9a7afa..6029fe4375 100644 --- a/dev-demos/draw/index.md +++ b/dev-demos/draw/line_area.md @@ -3,7 +3,7 @@ title: 展示距离和面积 order: 3 group: path: /polygon - title: 绘制面 + title: 图形绘制 order: 3 --- diff --git a/dev-demos/draw/polygon.md b/dev-demos/draw/polygon.md new file mode 100644 index 0000000000..1a64562d04 --- /dev/null +++ b/dev-demos/draw/polygon.md @@ -0,0 +1,9 @@ +--- +title: 绘制面 +order: 3 +group: + path: /polygon + order: 3 +--- + + diff --git a/dev-demos/gallery/scale/index.md b/dev-demos/gallery/scale/index.md index 12e0018aef..cd6448609a 100644 --- a/dev-demos/gallery/scale/index.md +++ b/dev-demos/gallery/scale/index.md @@ -15,7 +15,7 @@ Range 和 domain 是 Scale 中非常重要的两个参数 | 分类 | cat、timeCat | | 常量 | identity | -在使用 `L7` 开发过程中默认情况下不需要进行度量的配置，因为 `G2` 代码内部已经根据数据的形式对度量进行了假设，其计算过程如下： +在使用 `L7` 开发过程中默认情况下不需要进行度量的配置，因为 `L7` 代码内部已经根据数据的形式对度量进行了假设，其计算过程如下： 查看用户是否制定了对应字段的数据类型 （`type`) 如果没有，判断字段的第一条数据的字段类型 diff --git a/packages/core/src/services/layer/IStyleAttributeService.ts b/packages/core/src/services/layer/IStyleAttributeService.ts index 74663318bb..9ad3a78a4a 100644 --- a/packages/core/src/services/layer/IStyleAttributeService.ts +++ b/packages/core/src/services/layer/IStyleAttributeService.ts @@ -194,6 +194,7 @@ export interface IStyleAttributeService { registerStyleAttribute( options: Partial, ): IStyleAttribute; + updateScaleAttribute(scale: IScaleOptions):void; updateStyleAttribute( attributeName: string, attributeOptions: Partial, diff --git a/packages/core/src/services/layer/StyleAttributeService.ts b/packages/core/src/services/layer/StyleAttributeService.ts index 206c109537..4b1067c209 100644 --- a/packages/core/src/services/layer/StyleAttributeService.ts +++ b/packages/core/src/services/layer/StyleAttributeService.ts @@ -9,6 +9,7 @@ import { IRendererService } from '../renderer/IRendererService'; import { ILayer, IWorkerOption } from './ILayerService'; import { IAttributeScale, + IScaleOptions, IEncodeFeature, IStyleAttribute, IStyleAttributeInitializationOptions, @@ -70,13 +71,24 @@ export default class StyleAttributeService implements IStyleAttributeService { return attributeToUpdate; } + public updateScaleAttribute(scaleOption: IScaleOptions) { + this.attributes.forEach((attr:IStyleAttribute)=>{ + const name = attr.name; + const field = attr.scale?.field as string; + if(scaleOption[name] || (field && scaleOption[field])) { // 字段类型和映射类型 + attr.needRescale = true; + attr.needRemapping = true; + attr.needRegenerateVertices = true; + } + }) + + } + public updateStyleAttribute( attributeName: string, options: Partial, updateOptions?: Partial, ) { - - let attributeToUpdate = this.getLayerStyleAttribute(attributeName); if (!attributeToUpdate) { attributeToUpdate = this.registerStyleAttribute({ diff --git a/packages/layers/src/core/BaseLayer.ts b/packages/layers/src/core/BaseLayer.ts index aa90f710a0..14feb807d5 100644 --- a/packages/layers/src/core/BaseLayer.ts +++ b/packages/layers/src/core/BaseLayer.ts @@ -672,6 +672,11 @@ export default class BaseLayer } else { this.scaleOptions[field] = cfg; } + if (this.styleAttributeService) { + const scaleOptions = isObject(field) ? field : { [field]: cfg }; + this.styleAttributeService.updateScaleAttribute(scaleOptions); + } + return this; } @@ -1103,7 +1108,6 @@ export default class BaseLayer public getScaleOptions() { return this.scaleOptions; } - public encodeDataLength: number = 0; public setEncodedData(encodedData: IEncodeFeature[]) { this.encodedData = encodedData; diff --git a/packages/site/docs/api/base_layer/base.zh.md b/packages/site/docs/api/base_layer/base.zh.md index dd831f1a25..10542885fc 100644 --- a/packages/site/docs/api/base_layer/base.zh.md +++ b/packages/site/docs/api/base_layer/base.zh.md @@ -14,6 +14,7 @@ L7 Layer 接口设计遵循图形语法，所有图层都继承于基类（baseL ```javascript const layer = new BaseLayer(option) // option - 传入构造函数的参数对象，提供 layer 的初始状态 .source(...) // 传入图层需要的数据以及相关的解析器 + .filter() // 数据过滤方法 .shape(...) // 为图层指定具体的形状，如：circle/triangle 等 .color(...) // 指定图层的颜色配置 .texture(...) // 指定图层引用的纹理 diff --git a/packages/site/docs/common/layer/layer_encode.md b/packages/site/docs/common/layer/layer_encode.md index b74fb1c0a7..c5a3f291a6 100644 --- a/packages/site/docs/common/layer/layer_encode.md +++ b/packages/site/docs/common/layer/layer_encode.md @@ -1,5 +1,5 @@ -### source +### source 数据 设置图层数据以及解析配置 `source(data, config)`。 @@ -38,14 +38,63 @@ layer.source(data, { ], }); ``` +### cluster -### scale(field: string, scaleConfig: IScaleConfig) +我们在使用 `cluster` 配置聚合图之后就可以使用一些聚合方法来获取对应参数。 +#### getClusters(zoom: number): IFeatureCollection +获取指定缩放等级的聚合数据 + +- `zoom` 缩放等级 + +#### getClustersLeaves(id: string): IFeatureCollection + +根据 `id` 获取聚合节点的数据，每个聚合节点会有一个唯一 `ID`。 + +- `id` 聚合节点的 `id` + + +```ts +const source = layer.getSource(); +source.getClustersLeaves(id); +layer.on('click', (e) => { + console.log(source.getClustersLeaves(e.feature.cluster_id)); +}); + +``` + + +## scale 数据度量 + +Scale 度量是将地图数据值（数字、日期、类别等数据）转成视觉值（颜色、大小、形状）。尺度 Scale 是数据可视化的基本组成部分，因为它们决定了视觉编码的性质。 L7 目前支持连续、离散、枚举类型数据的Scale，并支持位置、形状、大小和颜色编码的映射。 + +在使用 L7 过程中，默认情况下不需要进行 Scale 的配置，因为 L7 会根据数据类型对 scale 推断，推断过程如下： + +查看用户是否设置了 Scale，如果没有: + +判断字段的第一条数据的字段类型，如果数据中不存在对应的字段： + +认为是常量为固定值 + +如果是数字则为 'linear'; + +如果是字符串类型 'cat'; + + +### scale + +![Scale 详细介绍](https://mp.weixin.qq.com/s/QyD1_ypu0PDwMxEz45v6Jg) + +参数： (field: string, scaleOptions: IscaleOptions) - `field` 指定 source 中传入的数据中用于映射的字段名 -- `scaleConfig` 列定义配置，对象类型 +- `scaleOptions` 列定义配置，对象类型 + - type scale 类型 + - unknown 未匹配颜色 可选 默认透明 + - domain 值域 可选 + ```javascript -interface IScaleConfig { +interface IscaleOptions { type: ScaleTypeName; domain?: any[]; ... @@ -59,19 +108,23 @@ layer.color('id', ['#f00', '#ff0']) })； ``` -### ScaleTypeName +#### 类型 -`scale` 的类型可以分为 `3` 类 `11` 种，不同 `Scale` 的差异在于 `domain->range` 的转换方法的不同。 -`range` 和 `domain` 是 `Scale` 中非常重要的两个参数。 + +Range 和 domain 是 Scale 中非常重要的两个参数 + +domain: 地图数据值的定义区间 +range：视觉值的区间 +不同Scale 的差异在于 domain->range 的转换方法的不同 - domain: 地图数据值的定义区间 - range：视觉值的区间定义 -| 数据类型 | 度量类型 | -| -------- | ------- | -| 连续 | linear、log、pow、time、sequential、quantize、quantile、threshold | -| 分类 | cat、time | -| 常量 | identity | +|数据类|度量类型| +|-----|------| +| 连续 | linear、log、pow | +| 连续分类 | quantize quantile,threshold,diverging | +| 分类 枚举 | cat | #### Cat @@ -102,7 +155,18 @@ layer.color('t', ['red', 'white', 'blue']); #### identify -常量度量 某个字段是不变的常量。 +数据值和映射值相同 +比如数据中value 字段记录了每个要素的颜色，数值既为要映射的结果值s + +``` +// 设置为 identify +layer.scale('value', { type: 'identify' }); + +// 或者 + +layer.scale('value'); // L7 能够自动推断为 identify + +``` #### linear @@ -131,58 +195,33 @@ layer.color('t', ['red', 'white', 'blue']); 1000 => "blue ``` -#### diverging || Sequential -用于返回给定的颜色数组的统一非有理 B-spline 插值器函数，该数组将转换为RGB颜色。 +#### diverging -```js -const scaleColors = d3interpolate.interpolateRgbBasis(colors); -``` +离散分类通常与两种相反的色调一起使用，以显示从负值到中心到正值的变化。这些类型的地图显示了彼此相关的值的大小。 -#### IScaleConfig -```js -interface IScaleConfig { - type: ScaleTypeName; - domain?: any[]; - range?: any[]; - neutral?: number; - field?: string; - unknown?: string; - ticks?: any[]; - nice?: boolean; - clamp?: boolean; - format?: () => any; -} -``` - -### cluster - -我们在使用 `cluster` 配置聚合图之后就可以使用一些聚合方法来获取对应参数。 -#### getClusters(zoom: number): IFeatureCollection - -获取指定缩放等级的聚合数据 - -- `zoom` 缩放等级 - -#### getClustersLeaves(id: string): IFeatureCollection - -根据 `id` 获取聚合节点的数据，每个聚合节点会有一个唯一 `ID`。 - -- `id` 聚合节点的 `id` - -```javascript -const source = layer.getSource(); -source.getClustersLeaves(id); -layer.on('click', (e) => { - console.log(source.getClustersLeaves(e.feature.cluster_id)); -}); -``` ## 视觉编码方法 可视化编码是将数据转换为可视形式的过程，L7 目前支持形状，大小，颜色 3 种视觉通道，你可以指定数据字段，为不同要素设置不同的图形属性。 案例 +### filter + +数据过滤方法,支持回调函数，将数据映射为true | false, 结果为true 时可见 + +```ts + +pointLayer.size('type', (type) => { + // 回调函数 + if (type === 'a') { + return false; + } + return true ; +}); +``` + + ### size 将数据值映射到图形的大小上的方法，size 方法具体的参数使用可以查看对应图层的详细文档 @@ -250,12 +289,16 @@ layer.color('type*value', (type, value) => { #### color(value) 参数：`value` ：string + 只支持接收一个参数，value 可以是： - 映射至颜色属性的数据源字段名，如果数据源中不存在这个字段名的话，则按照常量进行解析，这个时候会使用 L7 默认提供的颜色。 - 也可以直接指定某一个具体的颜色值 color，如 '#fff', 'white','rgba(255,0,0,0.5)' ,rgb(255,0,1) 等。 +如果数据为映射到颜色，默认为透明色不显示，如果需要设置该颜色，需要在scale 中设置 + + 示例 ```javascript @@ -274,7 +317,11 @@ layer.color('white'); // 指定颜色 colors 的参数有以下情况：  如果为空，即未指定颜色的数组，那么使用内置的全局的颜色；如果需要指定颜色，则需要以数组格式传入，那么分类的颜色按照数组中的颜色确定。 ```javascript -layer.color('name'); // 使用默认的颜色 +layer.scale('name',{ + type:'quantile' + unknown:'#ccc' // 设置无效颜色 +}) +layer.color('name'); // 使用identity layer.color('name', ['red', 'blue']); // 使用传入的指定颜色 ``` diff --git a/packages/site/docs/common/layer/layer_texture.md b/packages/site/docs/common/layer/layer_texture.md index 9ce4b4e2f5..4d187d08e7 100644 --- a/packages/site/docs/common/layer/layer_texture.md +++ b/packages/site/docs/common/layer/layer_texture.md @@ -1,4 +1,4 @@ -### 纹理方法 +### texture 目前只在线图层上支持了纹理方法 diff --git a/packages/site/docs/common/layer/layer_update.md b/packages/site/docs/common/layer/layer_update.md index 4f55c1093f..09e4e9e318 100644 --- a/packages/site/docs/common/layer/layer_update.md +++ b/packages/site/docs/common/layer/layer_update.md @@ -2,21 +2,39 @@ 如果已经添加了图层，需要修改图层显示样式可以再次调用图形映射方法，然后调用 `scene.render()`更新渲染即可 -### 样式更新 +### scale 更新 + +重新调用scale 方法 + +```tsx +layer.scale('value',{ + type:'quantile' +}) +scene.render(); +``` + +### 数据映射 + +重新调用 color/size/filter/shape等方法 ```javascript layer.color('blue'); layer.size(10); -layer.style({}); + scene.render(); ``` -### shape 更新 -在在某些场景下切换 shape 的时候，我们需要重新构建图层元素的顶点构造。这意味着我们简单的改变当前图层的单一属性就达到更新图层的目的。 -L7 已经为某些图层的 shape 切换做了额外的处理，如 PointLayer 的 "circle" 切换 "cylinder" 等，具体哪些图层盒支持直接切换则需要用户查阅具体图层的文档。 +### layer.style -🌟 在不支持直接切换 shape 的时候建议重新创建图层 +```javascript +layer.style({ + opacity:1 + +}); + +scene.render(); +``` ### setData(data, option?: {}) diff --git a/packages/site/docs/tutorial/scale.en.md b/packages/site/docs/tutorial/scale.en.md new file mode 100644 index 0000000000..bd04b67789 --- /dev/null +++ b/packages/site/docs/tutorial/scale.en.md @@ -0,0 +1,5 @@ +--- +title: Scale +order: 1 +--- + \ No newline at end of file diff --git a/packages/site/docs/tutorial/scale.zh.md b/packages/site/docs/tutorial/scale.zh.md new file mode 100644 index 0000000000..1ad106c7f2 --- /dev/null +++ b/packages/site/docs/tutorial/scale.zh.md @@ -0,0 +1,212 @@ +--- +title: Scale 度量 +order: 2 +--- + + +## Scale 简介 + +Scale 度量是用于将地图数据值（数字、日期、类别等数据）转成视觉变量（颜色、大小、形状）。Scale 是数据可视化的基本元素，因为它们决定了数据视觉编码的方式。L7 目前支持连续、离散、枚举类型等常用的 Scale。 + +![L7 Scale](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*AOIvTpmPOmgAAAAAAAAAAAAADmJ7AQ/original) + +## Scale 中的两个重要概念: + +Range 和 Domain + +Domain: 地图数据值的定义区间 + +Range：视觉值的区间定义 + + + +不同 Scale 的差异在于 Domain-> Range 的转换方法不同 + +|数据类|度量类型| +|----|------| +| 连续 | linear、log、pow | +| 连续分类 | quantize quantile,threshold,diverging | +| 分类 枚举| cat | + + +## L7 Scale + +在使用 L7 过程中，默认情况下不需要进行 Scale 的配置，因为 L7 会根据数据类型对 scale 推断，推断过程如下： + +查看用户是否设置了 Scale，如果没有: + +判断字段的第一条数据的字段类型，如果数据中不存在对应的字段： + +认为是常量为固定值 + +如果是数字则为 'linear'; + +如果是字符串类型 'cat'; + +## Cat 枚举 + +Cat 指枚举类型，用于展示分类数据，比如农作物种植区分布图，水稻、玉米、大豆等不同类别需要映射为不同的颜色。在 L7 如果判断字段的值为字符串，将认为是 Cat 类型并自动获取类型的唯一值，设置为 domain 。这样三种作物就会被一一映射成对应的颜色。 + +```tsx + +const data = [ + { + type:'A', + x: 110, + y:30 + }, + { + type:'B', + x: 110, + y:32 + }, + { + type:'C', + x: 110, + y:31 + } + ,{ + type:'D', + x: 111, + y:33 + }， + ,{ + type:'E', + x: 112, + y:30 + } + ,{ + type:'F', + x: 110, + y:30 + } +] +layer.color('type',['red','white','blue','yellow']) +``` + +如上面的代码所示，图层没有设置 Scale, L7 根据第一个数据"A"的类型 ,推断为枚举类型。同时取出该字段的去重后的所有值 ['A','B','C','D','E','F'] 设置为 scale 的 domain, 那么 range 就是对应的颜色 ['red','white','blue','yellow']。 + +![L7 scale Cat映射](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*rO53SYNk8hgAAAAAAAAAAAAADmJ7AQ/original) + +如果不设置 domain，L7 内部会自动计算 domain，domain 顺序跟数据顺序相关。如果希望固定domain 可自己设置 domain。domain 数值 和 range数值 一一对应。 + +``` + +layer.scale('type', { + type: 'cat', + domain: ['B', 'A', 'C', 'D'], +}); +layer.color('type', ['red', 'white', 'blue', 'yellow']); + +``` + +layer.scale('type', { + type: 'cat', + domain: ['B', 'A', 'C', 'D'], +}); +layer.color('type', ['red', 'white', 'blue', 'yellow']); +``` +![L7 Cat ](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*kyP2RpUXdGUAAAAAAAAAAAAADmJ7AQ/original) + +## Linear 连续线性 + +线性是连续数据的映射方法，数据和视觉值是通过线性方法计算的。如数据范围domain [0,1000] 线性映射到 range [red,blue] 渐变色，就是依据线性函完成一一转换。 + +![L7 Scale 线性]('https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*Z_rGRr-jgI0AAAAAAAAAAAAADmJ7AQ/original') + +```tsx +layer.color('rate', ['#ffffcc', '#b6e2b6', '#64c1c0', '#338cbb', '#253494']) +``` +对于连续型 +数据 L7 默认会设置为 linear, domain为数据的min、max值。颜色会根据 range 颜色生成渐变色。linear +默认可不设置 domain 区间 + +``` +layer.scale('value', { + type: 'linear', + domain: [5, 100], // 可定义domain,也可以不设置，自定根据数据计算 +}); +``` + +## quantize 连续等间距 + +等间距分类会根据属性值范围划分为若干个大小相等的子范围。相等间隔最适用于常见的数据范围，如百分比和温度。这种方法强调的是某个属性值相对于其他值的量。 + +![L7 Scale 连续等间距](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*YmwwQ5L-d7QAAAAAAAAAAAAADmJ7AQ/original) + +等间距分类只与数据 mix、max 有关，如果没有设置 domain,将自动计算数据的 min、max 进行分段，分段个数依据 range 颜色的个数。等间距会出现空类，而且每个分类要素分布不均匀。 + +```tsx +layer.color('type', ['red', 'white', 'blue', 'yellow']); +``` +你也可以自定义 domain + +```ts + +layer.scale('value', { + type: 'quantize', + domain: [5, 100], +}); + +layer.color('type', ['red', 'white', 'blue', 'yellow']); + +``` +![L7 scale quantize](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*N61_Q6-U7jIAAAAAAAAAAAAADmJ7AQ/original) + +## quantile 连续等分位 + +等分位要求每个分类区间都含有相等数量的要素。分位数为每个分类分配相等数量数据值，不存在空类，也不存在值过多或过少的类。 + +![L7 scale quantile](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*2SFpSLRD3yYAAAAAAAAAAAAADmJ7AQ/original) + +等分位与数据的分布相关，需要拿到全量数据才能计算，因此等分位的 scale 不能单独设置 domain，只能自动计算。 + +```tsx + +layer.scale('value', { + type: 'quantile', +}); + +layer.color('value', ['red', 'white', 'blue', 'yellow']); +``` + +![L7 Scale quantile](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*EMcjSrYe1l0AAAAAAAAAAAAADmJ7AQ/original) + + +## threshold 自定义分类 + + +自定义分类可以设定任意分类区间映射到对于视觉变量。domain 仍然是连续的，并根据提供的domain 进行分类。range 属性必须有 N+1 个元素，其中 N 是 domain 的个数。 + +threshold 为自定义分段，在使用时必须为 Scale 设置 domain, domain可以依据需求任意设置。 + +```tsx +layer.scale('rate', { + type: 'threshold', + domain: [3, 6, 8, 10], + }) + .color('rate', ['#ffffcc', '#b6e2b6', '#64c1c0', '#338cbb', '#253494']) + +``` + +![ L7 Scale threshold](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*e1YyRKELsjwAAAAAAAAAAAAADmJ7AQ/original) + + +## diverging 离散分类 + +离散分类通常与两种相反的色调一起使用，以显示从负值到中心到正值的变化。这些类型的地图显示了彼此相关的值的大小。 + +![L7 diverging](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*8anRRLJNu6YAAAAAAAAAAAAADmJ7AQ/original) + + +diverging 如果没有设置 domain 会自动根据数据计算min、middle、max 三个值作为domain。range 至少需要设置三个颜色，形成双极色带。 + +```ts +layer.scale('rate', { + type: 'diverging' + domain: [3, 6, 8, 10], // the input domain and output range of a diverging scal + }) + .color('rate', ['#ffffcc', '#b6e2b6', '#64c1c0', '#338cbb', '#253494']) +``` + +![L7 scale diverging](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*4rcDQIRdRdEAAAAAAAAAAAAADmJ7AQ/original) \ No newline at end of file From 56b22369accd8cc0cb66a2eda4c3c311dd28c157 Mon Sep 17 00:00:00 2001 From: "@thinkinggis" Date: Mon, 16 Jan 2023 16:57:51 +0800 Subject: [PATCH 8/8] Fix scale update diff (#1576) * feat: scale update * docs: scale/filter document * docs: this image is missing a text alternative * fix: add scale options diff * fix: lint error --- packages/layers/src/core/BaseLayer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/layers/src/core/BaseLayer.ts b/packages/layers/src/core/BaseLayer.ts index 14feb807d5..866e558a73 100644 --- a/packages/layers/src/core/BaseLayer.ts +++ b/packages/layers/src/core/BaseLayer.ts @@ -664,6 +664,7 @@ export default class BaseLayer return this; } public scale(field: string | number | IScaleOptions, cfg?: IScale) { + const preOption = { ...this.scaleOptions }; if (isObject(field)) { this.scaleOptions = { ...this.scaleOptions, @@ -672,7 +673,7 @@ export default class BaseLayer } else { this.scaleOptions[field] = cfg; } - if (this.styleAttributeService) { + if (this.styleAttributeService && !isEqual(preOption, this.scaleOptions)) { const scaleOptions = isObject(field) ? field : { [field]: cfg }; this.styleAttributeService.updateScaleAttribute(scaleOptions); }