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 feature_fix

This commit is contained in:
thinkinggis 2020-08-12 15:22:01 +08:00
parent a055a5e723 01dfe1343a
commit 582105e9a8
19 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

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

4
packages/boundary/package.json
View File

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

6
packages/component/package.json
View File

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

4
packages/core/package.json
View File

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

4
packages/draw/package.json
View File

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

14
packages/l7/package.json
View File

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

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

@ -1,2 +1,2 @@
const version = '2.2.28';
const version = '2.2.29';
export { version };

8
packages/layers/package.json
View File

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

3
packages/layers/src/point/models/image.ts
View File

@ -38,6 +38,9 @@ export default class ImageModel extends BaseModel {
}
public clearModels() {
if (this.texture) {
this.texture.destroy();
}
this.iconService.off('imageUpdate', this.updateTexture);
}

2
packages/layers/src/point/shaders/image_frag.glsl
View File

@ -20,7 +20,7 @@ float r = 1.0 - smoothstep(radius-(radius*0.01),
radius+(radius*0.01),
distanceSqrd);
vec4 textureColor=texture2D(u_texture,pos);
if(v_color == vec4(1.0)){
if(all(lessThan(v_color, vec4(1.0+0.00001))) && all(greaterThan(v_color, vec4(1.0-0.00001))) || v_color==vec4(1.0)){
gl_FragColor= vec4(textureColor.xyz, textureColor.w);
}else {
gl_FragColor= step(0.01, textureColor.z) * v_color;

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-map",
"version": "2.2.28",
"version": "2.2.30",
"description": "l7 map",
"keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>",
@ -37,7 +37,7 @@
},
"homepage": "https://github.com/antvis/L7#readme",
"dependencies": {
"@antv/l7-utils": "2.2.28",
"@antv/l7-utils": "2.2.30",
"@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0",
"eventemitter3": "^4.0.4",

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-maps",
"version": "2.2.28",
"version": "2.2.30",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -26,9 +26,9 @@
"author": "xiaoiver",
"license": "ISC",
"dependencies": {
"@antv/l7-core": "2.2.28",
"@antv/l7-utils": "2.2.28",
"@antv/l7-map": "2.2.28",
"@antv/l7-core": "2.2.30",
"@antv/l7-map": "2.2.30",
"@antv/l7-utils": "2.2.30",
"@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6",
"gl-matrix": "^3.1.0",

6
packages/react/package.json
View File

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

4
packages/renderer/package.json
View File

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

12
packages/scene/package.json
View File

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

6
packages/source/package.json
View File

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

4
packages/three/package.json
View File

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

2
packages/utils/package.json
View File

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

14
yarn.lock
View File

@ -6330,6 +6330,11 @@ arrify@^2.0.1:
resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
as-number@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/as-number/-/as-number-1.0.0.tgz#acb27e34f8f9d8ab0da9e376f3b8959860f80a66"
integrity sha1-rLJ+NPj52KsNqeN287iVmGD4CmY=
asap@^2.0.0, asap@~2.0.3, asap@~2.0.6:
version "2.0.6"
resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@ -11575,6 +11580,15 @@ extract-zip@^1.0.3:
mkdirp "^0.5.4"
yauzl "^2.10.0"
extrude-polyline@^1.0.6:
version "1.0.6"
resolved "https://registry.npmjs.org/extrude-polyline/-/extrude-polyline-1.0.6.tgz#7e6afe1f349a4182fa3f61a00d93979b95f18b20"
integrity sha1-fmr+HzSaQYL6P2GgDZOXm5XxiyA=
dependencies:
as-number "^1.0.0"
gl-vec2 "^1.0.0"
polyline-miter-util "^1.0.1"
extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"