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

Merge pull request #763 from antvis/shihui_dev 

Shihui dev
This commit is contained in:
YiQianYao 2021-09-14 11:20:25 +08:00 committed by GitHub
parent cf78d4b22b 29a11b2196
commit 5befb33f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 84 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -86,4 +86,5 @@ yarn.lock
# npm command lines
publish.sh
latest.sh
beta.sh
beta.sh
mini.sh

22
latest.sh
View File

@ -1,11 +1,11 @@
npm dist-tag add @antv/l7-component@2.5.8 latest
npm dist-tag add @antv/l7-core@2.5.8 latest
npm dist-tag add @antv/l7@2.5.8 latest
npm dist-tag add @antv/l7-layers@2.5.8 latest
npm dist-tag add @antv/l7-map@2.5.8 latest
npm dist-tag add @antv/l7-maps@2.5.8 latest
npm dist-tag add @antv/l7-renderer@2.5.8 latest
npm dist-tag add @antv/l7-scene@2.5.8 latest
npm dist-tag add @antv/l7-source@2.5.8 latest
npm dist-tag add @antv/l7-three@2.5.8 latest
npm dist-tag add @antv/l7-utils@2.5.8 latest
npm dist-tag add @antv/l7-component@2.5.13 latest
npm dist-tag add @antv/l7-core@2.5.13 latest
npm dist-tag add @antv/l7@2.5.13 latest
npm dist-tag add @antv/l7-layers@2.5.13 latest
npm dist-tag add @antv/l7-map@2.5.13 latest
npm dist-tag add @antv/l7-maps@2.5.13 latest
npm dist-tag add @antv/l7-renderer@2.5.13 latest
npm dist-tag add @antv/l7-scene@2.5.13 latest
npm dist-tag add @antv/l7-source@2.5.13 latest
npm dist-tag add @antv/l7-three@2.5.13 latest
npm dist-tag add @antv/l7-utils@2.5.13 latest

2
lerna.json
View File

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

8
packages/component/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-component",
"version": "2.5.12",
"version": "2.5.13",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,14 +25,14 @@
"author": "lzxue",
"license": "ISC",
"dependencies": {
"@antv/l7-core": "^2.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-core": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0",
"inversify": "^5.0.1",
"reflect-metadata": "^0.1.13"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

6
packages/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-core",
"version": "2.5.12",
"version": "2.5.13",
"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.5.12",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"@mapbox/tiny-sdf": "^1.1.1",
"ajv": "^6.10.2",
@ -46,7 +46,7 @@
"@types/lodash": "^4.14.138",
"@types/viewport-mercator-project": "^6.1.0"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

16
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7",
"version": "2.5.12",
"version": "2.5.13",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,15 +25,15 @@
"author": "antv",
"license": "MIT",
"dependencies": {
"@antv/l7-component": "^2.5.12",
"@antv/l7-core": "^2.5.12",
"@antv/l7-layers": "^2.5.12",
"@antv/l7-maps": "^2.5.12",
"@antv/l7-scene": "^2.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-component": "^2.5.13",
"@antv/l7-core": "^2.5.13",
"@antv/l7-layers": "^2.5.13",
"@antv/l7-maps": "^2.5.13",
"@antv/l7-scene": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

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

@ -1,2 +1,2 @@
const version = '2.5.12';
const version = '2.5.13';
export { version };

10
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-layers",
"version": "2.5.12",
"version": "2.5.13",
"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.5.12",
"@antv/l7-source": "^2.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-core": "^2.5.13",
"@antv/l7-source": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.2.0",
"@turf/meta": "^6.0.2",
@ -52,7 +52,7 @@
"@types/gl-matrix": "^2.4.5",
"@types/lodash": "^4.14.138"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

36
packages/layers/src/plugins/DataMappingPlugin.ts
View File

@ -150,24 +150,30 @@ export default class DataMappingPlugin implements ILayerPlugin {
if (typeof mappedData[0].coordinates[0] === 'number') {
// 单个的点数据
// @ts-ignore
mappedData.map((d) => {
d.version = 'GAODE2.x';
// @ts-ignore
d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
// @ts-ignore
d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
// d.coordinates = this.mapService.lngLatToCoord(unProjectFlat(d.coordinates));
});
mappedData
// TODO: 避免经纬度被重复计算导致坐标位置偏移
.filter((d) => !d.originCoordinates)
.map((d) => {
d.version = 'GAODE2.x';
// @ts-ignore
d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
// @ts-ignore
d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
// d.coordinates = this.mapService.lngLatToCoord(unProjectFlat(d.coordinates));
});
} else {
// 连续的线、面数据
// @ts-ignore
mappedData.map((d) => {
d.version = 'GAODE2.x';
// @ts-ignore
d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
// @ts-ignore
d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
});
mappedData
// TODO: 避免经纬度被重复计算导致坐标位置偏移
.filter((d) => !d.originCoordinates)
.map((d) => {
d.version = 'GAODE2.x';
// @ts-ignore
d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
// @ts-ignore
d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
});
}
}
// console.log('mappedData', mappedData)

6
packages/map/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-map",
"version": "2.5.12",
"version": "2.5.13",
"description": "l7 map",
"keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>",
@ -37,12 +37,12 @@
},
"homepage": "https://github.com/antvis/L7#readme",
"dependencies": {
"@antv/l7-utils": "^2.5.12",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0",
"eventemitter3": "^4.0.4",
"lodash": "^4.17.15"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e"
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545"
}

10
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-maps",
"version": "2.5.12",
"version": "2.5.13",
"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.5.12",
"@antv/l7-map": "^2.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-core": "^2.5.13",
"@antv/l7-map": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2",
@ -43,7 +43,7 @@
"@types/gl-matrix": "^2.4.5",
"@types/viewport-mercator-project": "^6.1.0"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

6
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-renderer",
"version": "2.5.12",
"version": "2.5.13",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -26,14 +26,14 @@
"gl": "^4.4.0"
},
"dependencies": {
"@antv/l7-core": "^2.5.12",
"@antv/l7-core": "^2.5.13",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"l7regl": "^0.0.14",
"lodash": "^4.17.15",
"reflect-metadata": "^0.1.13"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

16
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-scene",
"version": "2.5.12",
"version": "2.5.13",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -23,18 +23,18 @@
"author": "xiaoiver",
"license": "ISC",
"dependencies": {
"@antv/l7-component": "^2.5.12",
"@antv/l7-core": "^2.5.12",
"@antv/l7-layers": "^2.5.12",
"@antv/l7-maps": "^2.5.12",
"@antv/l7-renderer": "^2.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-component": "^2.5.13",
"@antv/l7-core": "^2.5.13",
"@antv/l7-layers": "^2.5.13",
"@antv/l7-maps": "^2.5.13",
"@antv/l7-renderer": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"mapbox-gl": "^1.2.1",
"reflect-metadata": "^0.1.13"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

8
packages/source/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-source",
"version": "2.5.12",
"version": "2.5.13",
"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.5.12",
"@antv/l7-utils": "^2.5.12",
"@antv/l7-core": "^2.5.13",
"@antv/l7-utils": "^2.5.13",
"@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4",
@ -46,7 +46,7 @@
"@types/d3-hexbin": "^0.2.3",
"@types/lodash": "^4.14.138"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

6
packages/three/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-three",
"version": "2.5.12",
"version": "2.5.13",
"description": "three for L7 ",
"keywords": [
"3D",
@ -44,7 +44,7 @@
},
"homepage": "https://github.com/antvis/L7#readme",
"dependencies": {
"@antv/l7": "^2.5.12",
"@antv/l7": "^2.5.13",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"reflect-metadata": "^0.1.13",
@ -54,7 +54,7 @@
"devDependencies": {
"three": "^0.115.0"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}

4
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-utils",
"version": "2.5.12",
"version": "2.5.13",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -30,7 +30,7 @@
"devDependencies": {
"@types/d3-color": "^1.2.2"
},
"gitHead": "0cdffbe23137f4e7e0973e333d61923a22f7841e",
"gitHead": "347dc9a3a502ae8837625c1347830b7e9a334545",
"publishConfig": {
"access": "public"
}