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

Shihuidev (#871) 

* feat: 修复 texture 重复销毁问题

* style: lint style
This commit is contained in:
YiQianYao 2021-12-08 15:40:54 +08:00 committed by GitHub
parent 5b10e163ed
commit 0b2673f8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 75 additions and 66 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.6.8",
"version": "2.6.9",
"npmClient": "yarn",
"useWorkspaces": true,
"publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-component",
"version": "2.6.8",
"version": "2.6.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,8 +25,8 @@
"author": "lzxue",
"license": "ISC",
"dependencies": {
"@antv/l7-core": "^2.6.8",
"@antv/l7-utils": "^2.6.8",
"@antv/l7-core": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@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.6.8",
"version": "2.6.9",
"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.6.8",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7",
"ajv": "^6.10.2",
"element-resize-event": "^3.0.3",

16
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7",
"version": "2.6.8",
"version": "2.6.9",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,13 +25,13 @@
"author": "antv",
"license": "MIT",
"dependencies": {
"@antv/l7-component": "^2.6.7",
"@antv/l7-core": "^2.6.7",
"@antv/l7-source": "^2.6.7",
"@antv/l7-layers": "^2.6.7",
"@antv/l7-maps": "^2.6.7",
"@antv/l7-scene": "^2.6.7",
"@antv/l7-utils": "^2.6.7",
"@antv/l7-component": "^2.6.9",
"@antv/l7-core": "^2.6.9",
"@antv/l7-layers": "^2.6.9",
"@antv/l7-maps": "^2.6.9",
"@antv/l7-scene": "^2.6.9",
"@antv/l7-source": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7"
},
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

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

@ -1,2 +1,2 @@
const version = '2.6.8';
const version = '2.6.9';
export { version };

8
packages/layers/package.json
View File

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

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-map",
"version": "2.6.8",
"version": "2.6.9",
"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.6.8",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7",
"@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0",

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-maps",
"version": "2.6.8",
"version": "2.6.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -27,9 +27,9 @@
"license": "ISC",
"dependencies": {
"@amap/amap-jsapi-loader": "^0.0.3",
"@antv/l7-core": "^2.6.8",
"@antv/l7-map": "^2.6.8",
"@antv/l7-utils": "^2.6.8",
"@antv/l7-core": "^2.6.9",
"@antv/l7-map": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2",

12
packages/mini/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-mini",
"version": "2.6.8",
"version": "2.6.9",
"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.6.8",
"@antv/l7-layers": "^2.6.8",
"@antv/l7-maps": "^2.6.8",
"@antv/l7-scene": "^2.6.8",
"@antv/l7-utils": "^2.6.8",
"@antv/l7-core": "^2.6.9",
"@antv/l7-layers": "^2.6.9",
"@antv/l7-maps": "^2.6.9",
"@antv/l7-scene": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7"
},
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

4
packages/renderer/package.json
View File

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

6
packages/renderer/src/regl/ReglTexture2D.ts
View File

@ -17,6 +17,7 @@ export default class ReglTexture2D implements ITexture2D {
private texture: regl.Texture2D;
private width: number;
private height: number;
private isDistroy: boolean = false;
constructor(reGl: regl.Regl, options: ITexture2DInitializationOptions) {
const {
@ -89,6 +90,9 @@ export default class ReglTexture2D implements ITexture2D {
}
public destroy() {
this.texture.destroy();
if (!this.isDistroy) {
this.texture.destroy();
}
this.isDistroy = true;
}
}

14
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-scene",
"version": "2.6.8",
"version": "2.6.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -23,12 +23,12 @@
"author": "xiaoiver",
"license": "ISC",
"dependencies": {
"@antv/l7-component": "^2.6.8",
"@antv/l7-core": "^2.6.8",
"@antv/l7-layers": "^2.6.8",
"@antv/l7-maps": "^2.6.8",
"@antv/l7-renderer": "^2.6.8",
"@antv/l7-utils": "^2.6.8",
"@antv/l7-component": "^2.6.9",
"@antv/l7-core": "^2.6.9",
"@antv/l7-layers": "^2.6.9",
"@antv/l7-maps": "^2.6.9",
"@antv/l7-renderer": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@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.6.8",
"version": "2.6.9",
"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.6.8",
"@antv/l7-utils": "^2.6.8",
"@antv/l7-core": "^2.6.9",
"@antv/l7-utils": "^2.6.9",
"@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4",

8
packages/three/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-three",
"version": "2.6.8",
"version": "2.6.9",
"description": "three for L7 ",
"keywords": [
"3D",
@ -44,9 +44,9 @@
},
"homepage": "https://github.com/antvis/L7#readme",
"dependencies": {
"@antv/l7-core": "^2.6.8",
"@antv/l7-layers": "^2.6.8",
"@antv/l7-scene": "^2.6.8",
"@antv/l7-core": "^2.6.9",
"@antv/l7-layers": "^2.6.9",
"@antv/l7-scene": "^2.6.9",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"reflect-metadata": "^0.1.13",

2
packages/utils/package.json
View File

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

18
stories/Map/components/mapCenter.tsx
View File

@ -17,7 +17,7 @@ export default class GaodeMapComponent extends React.Component {
map: new GaodeMap({
center: [121.107846, 30.267069],
pitch: 0,
// style: 'normal',
style: 'dark',
zoom: 20,
animateEnable: false,
}),
@ -28,7 +28,7 @@ export default class GaodeMapComponent extends React.Component {
// min = 'min',
// max = 'max',
// none = 'none',
const layer = new PointLayer({ zIndex: 2 })
const layer = new PointLayer({ zIndex: 2, blend: 'additive' })
.source(
[
{
@ -50,17 +50,16 @@ export default class GaodeMapComponent extends React.Component {
)
.shape('circle')
// .shape('normal')
.color('blue')
.size(10)
.color('#1990FF')
.size(20)
.style({
stroke: '#fff',
storkeWidth: 2,
// offsets: [100, 100],
});
this.scene = scene;
const linelayer = new LineLayer({})
const linelayer = new LineLayer({ blend: 'additive' })
.source({
type: 'FeatureCollection',
features: [
@ -80,14 +79,17 @@ export default class GaodeMapComponent extends React.Component {
],
})
.shape('line')
.color('#0ff')
.color('#78FFFF')
.size(10);
scene.on('loaded', () => {
scene.addLayer(linelayer);
// scene.addLayer(linelayer);
scene.addLayer(layer);
});
layer.on('click', () => console.log('point click'));
layer.on('mousemove', (e) => {
console.log(e.feature);
});
linelayer.on('click', () => console.log('line click'));
}

21
stories/customMap/components/Map.tsx
View File

@ -1,7 +1,7 @@
import { Scene, PolygonLayer, PointLayer, Map } from '@antv/l7-mini';
// import { Scene } from '@antv/l7';
// import { PolygonLayer, PointLayer } from '@antv/l7-layers';
import { GaodeMap } from '@antv/l7-maps';
import { GaodeMap, Mapbox } from '@antv/l7-maps';
import * as React from 'react';
export default class ScaleComponent extends React.Component {
@ -9,7 +9,6 @@ export default class ScaleComponent extends React.Component {
const scene = new Scene({
id: 'map',
map: new GaodeMap({
hash: true,
center: [105, 32],
pitch: 0,
zoom: 3,
@ -42,12 +41,6 @@ export default class ScaleComponent extends React.Component {
dir: 'in', // in - out
},
});
scene.addLayer(layer);
scene.fitBounds([
[48.073279, 3.067261],
[160.573279, 54.003394],
]);
const layer2 = new PolygonLayer({ blend: 'normal' })
.source(data)
@ -65,7 +58,17 @@ export default class ScaleComponent extends React.Component {
.style({
opacity: 1.0,
});
scene.addLayer(layer2);
scene.on('loaded', () => {
scene.addLayer(layer);
scene.addLayer(layer2);
scene.fitBounds([
[48.073279, 3.067261],
[160.573279, 54.003394],
]);
console.log('getBounds', scene.getBounds());
});
});
}