diff --git a/lerna.json b/lerna.json index 550efe586a..3b71d955fe 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.2.28", + "version": "2.2.30", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/boundary/package.json b/packages/boundary/package.json index aff7a21482..25182d6598 100644 --- a/packages/boundary/package.json +++ b/packages/boundary/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-district", - "version": "2.2.28", + "version": "2.2.30", "description": "L7 district moudules", "keywords": [], "author": "thinkinggis ", @@ -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", diff --git a/packages/component/package.json b/packages/component/package.json index 4736cd302b..e3f3830265 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -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", diff --git a/packages/core/package.json b/packages/core/package.json index d08e56bd88..8e78e69905 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -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", diff --git a/packages/draw/package.json b/packages/draw/package.json index 1ff5edfa58..c847fbde0b 100644 --- a/packages/draw/package.json +++ b/packages/draw/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-draw", - "version": "2.2.28", + "version": "2.2.30", "description": "L7 Draw moudules", "keywords": [], "author": "thinkinggis ", @@ -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", diff --git a/packages/l7/package.json b/packages/l7/package.json index a2c56fdd6f..4af9f78771 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -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", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 708b7b781b..98a8d18455 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.2.28'; +const version = '2.2.29'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 895851ddd9..1351493994 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -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", diff --git a/packages/layers/src/point/models/image.ts b/packages/layers/src/point/models/image.ts index 5f878940a2..ef03fe3d68 100644 --- a/packages/layers/src/point/models/image.ts +++ b/packages/layers/src/point/models/image.ts @@ -38,6 +38,9 @@ export default class ImageModel extends BaseModel { } public clearModels() { + if (this.texture) { + this.texture.destroy(); + } this.iconService.off('imageUpdate', this.updateTexture); } diff --git a/packages/layers/src/point/shaders/image_frag.glsl b/packages/layers/src/point/shaders/image_frag.glsl index 581ac037b9..199266be52 100644 --- a/packages/layers/src/point/shaders/image_frag.glsl +++ b/packages/layers/src/point/shaders/image_frag.glsl @@ -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; diff --git a/packages/map/package.json b/packages/map/package.json index ba234254b1..ff8aa38c8d 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.2.28", + "version": "2.2.30", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -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", diff --git a/packages/maps/package.json b/packages/maps/package.json index 3022756706..ab3b08d5d1 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -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", diff --git a/packages/react/package.json b/packages/react/package.json index e2d8a92f37..8419ae8f3f 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -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" }, diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 7d892caafb..e45cd2a750 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -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", diff --git a/packages/scene/package.json b/packages/scene/package.json index 15f5c0afae..8bd1a88986 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -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", diff --git a/packages/source/package.json b/packages/source/package.json index 5078af3b08..25dec93462 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -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", diff --git a/packages/three/package.json b/packages/three/package.json index ddd119cfab..81719a5a54 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -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" diff --git a/packages/utils/package.json b/packages/utils/package.json index 5b1e738817..bad8c36d14 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index 0a04619928..6d580cdf71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"