p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix_storybook

This commit is contained in:
thinkinggis 2020-05-27 15:08:29 +08:00
parent 6113c46617 3996a22292
commit 6a6fa222a3
18 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/api/layer/layer.en.md
View File

@ -10,7 +10,12 @@ L7 Layer 接口设计遵循图形语法，所有图层都继承于该基类。
语法示例 语法示例
```javascript ```javascript
const layer = new Layer(option).source().color().size().shape().style(); const layer = new Layer(option)
.source()
.color()
.size()
.shape()
.style();
scene.addLayer(layer); scene.addLayer(layer);
``` ```
@ -78,7 +83,7 @@ layer.source(data, {
transforms: [ transforms: [
{ {
type: 'map', type: 'map',
callback: function (item) { callback: function(item) {
const [x, y] = item.coordinates; const [x, y] = item.coordinates;
item.lat = item.lat * 1; item.lat = item.lat * 1;
item.lng = item.lng * 1; item.lng = item.lng * 1;

9
docs/api/layer/layer.zh.md
View File

@ -10,7 +10,12 @@ L7 Layer 接口设计遵循图形语法，所有图层都继承于该基类。
语法示例 语法示例
```javascript ```javascript
const layer = new Layer(option).source().color().size().shape().style(); const layer = new Layer(option)
.source()
.color()
.size()
.shape()
.style();
scene.addLayer(layer); scene.addLayer(layer);
``` ```
@ -82,7 +87,7 @@ layer.source(data, {
transforms: [ transforms: [
{ {
type: 'map', type: 'map',
callback: function (item) { callback: function(item) {
const [x, y] = item.coordinates; const [x, y] = item.coordinates;
item.lat = item.lat * 1; item.lat = item.lat * 1;
item.lng = item.lng * 1; item.lng = item.lng * 1;

2
lerna.json
View File

@ -14,7 +14,7 @@
"message": "chore: publish" "message": "chore: publish"
} }
}, },
"version": "2.2.8", "version": "2.2.9",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"publishConfig": { "publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-component", "name": "@antv/l7-component",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,8 +24,8 @@
"author": "lzxue", "author": "lzxue",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-core", "name": "@antv/l7-core",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -23,7 +23,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/tiny-sdf": "^1.1.1", "@mapbox/tiny-sdf": "^1.1.1",
"ajv": "^6.10.2", "ajv": "^6.10.2",

4
packages/district/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-district", "name": "@antv/l7-district",
"version": "2.2.8", "version": "2.2.9",
"description": "L7 district moudules", "description": "L7 district moudules",
"keywords": [], "keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>", "author": "thinkinggis <lzx199065@gmail.com>",
@ -34,7 +34,7 @@
"test": "jest" "test": "jest"
}, },
"dependencies": { "dependencies": {
"@antv/l7": "2.2.8", "@antv/l7": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@turf/circle": "^6.0.1", "@turf/circle": "^6.0.1",
"@turf/distance": "^6.0.1", "@turf/distance": "^6.0.1",

4
packages/draw/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-draw", "name": "@antv/l7-draw",
"version": "2.2.8", "version": "2.2.9",
"description": "L7 Draw moudules", "description": "L7 Draw moudules",
"keywords": [], "keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>", "author": "thinkinggis <lzx199065@gmail.com>",
@ -35,7 +35,7 @@
"test": "jest" "test": "jest"
}, },
"dependencies": { "dependencies": {
"@antv/l7": "2.2.8", "@antv/l7": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@turf/circle": "^6.0.1", "@turf/circle": "^6.0.1",
"@turf/distance": "^6.0.1", "@turf/distance": "^6.0.1",

14
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "2.2.8", "version": "2.2.9",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,12 +24,12 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-component": "2.2.8", "@antv/l7-component": "2.2.9",
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-layers": "2.2.8", "@antv/l7-layers": "2.2.9",
"@antv/l7-maps": "2.2.8", "@antv/l7-maps": "2.2.9",
"@antv/l7-scene": "2.2.8", "@antv/l7-scene": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "532ade40831b35b04a677b351d092e54c00613d8", "gitHead": "532ade40831b35b04a677b351d092e54c00613d8",

2
packages/l7/src/version.ts
View File

@ -1,2 +1,2 @@
const version = '2.2.8'; const version = '2.2.9';
export { version }; export { version };

8
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-layers", "name": "@antv/l7-layers",
"version": "2.2.8", "version": "2.2.9",
"description": "L7's collection of built-in layers", "description": "L7's collection of built-in layers",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -23,9 +23,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-source": "2.2.8", "@antv/l7-source": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.2.0", "@mapbox/martini": "^0.2.0",
"@turf/meta": "^6.0.2", "@turf/meta": "^6.0.2",

6
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-maps", "name": "@antv/l7-maps",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,8 +25,8 @@
"author": "xiaoiver", "author": "xiaoiver",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6", "@types/amap-js-api": "^1.4.6",
"antd": "4.2.5", "antd": "4.2.5",

6
packages/react/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-react", "name": "@antv/l7-react",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,8 +24,8 @@
"author": "lzxue", "author": "lzxue",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7": "2.2.8", "@antv/l7": "2.2.9",
"@antv/l7-maps": "2.2.8", "@antv/l7-maps": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"load-styles": "^2.0.0" "load-styles": "^2.0.0"
}, },

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-renderer", "name": "@antv/l7-renderer",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,7 +25,7 @@
"gl": "^4.4.0" "gl": "^4.4.0"
}, },
"dependencies": { "dependencies": {
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",

12
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-scene", "name": "@antv/l7-scene",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -22,11 +22,11 @@
"author": "xiaoiver", "author": "xiaoiver",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-component": "2.2.8", "@antv/l7-component": "2.2.9",
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-maps": "2.2.8", "@antv/l7-maps": "2.2.9",
"@antv/l7-renderer": "2.2.8", "@antv/l7-renderer": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"mapbox-gl": "^1.2.1", "mapbox-gl": "^1.2.1",

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-source", "name": "@antv/l7-source",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,8 +25,8 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "2.2.8", "@antv/l7-core": "2.2.9",
"@antv/l7-utils": "2.2.8", "@antv/l7-utils": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0", "@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4", "@turf/helpers": "^6.1.4",

4
packages/three/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-three", "name": "@antv/l7-three",
"version": "2.2.8", "version": "2.2.9",
"description": "three for L7 ", "description": "three for L7 ",
"keywords": [ "keywords": [
"3D", "3D",
@ -43,7 +43,7 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7": "2.2.8", "@antv/l7": "2.2.9",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"rollup": "^2.3.3", "rollup": "^2.3.3",
"rollup-plugin-less": "^1.1.2" "rollup-plugin-less": "^1.1.2"

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-utils", "name": "@antv/l7-utils",
"version": "2.2.8", "version": "2.2.9",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",

7
stories/Components/components/Zoom.tsx
View File

@ -30,7 +30,12 @@ export default class ZoomComponent extends React.Component {
this.scene = scene; this.scene = scene;
const layer = new PolygonLayer({}); const layer = new PolygonLayer({});
layer.source(data).color('#fff').shape('name', 'text').size(16).style({ layer
.source(data)
.color('#fff')
.shape('name', 'text')
.size(16)
.style({
opacity: 1.0, opacity: 1.0,
}); });
scene.addLayer(layer); scene.addLayer(layer);