mirror of https://gitee.com/antv-l7/antv-l7
Shihui dev (#804)
* feat: add getModelMatrix into viewport * feat: 新增地球模式 （初步构建） * feat: 完善地球交互 * style: lint style * feat: 调整地球图层缩放的方向 * style: lint style * feat: 增加地球模式的 pointLayer/fill 图层 * style: lint style * feat: 增加地球、太阳的简单运动系统，优化部分代码结构 * fix: 修复时间点击出错 * style: lint style * fix: 修复地图 panBy 方法参数错误 * style: lint style * feat: pointLayer/cylinder 圆柱兼容地球模式 * style: lint style * feat: 修复 pointLayer/fill 在拾取是破面严重的情况 * style: lint style * feat: 增加 arc 弧度调节 * feat: 增加 lineLayer/arc3d 兼容地球模式 * style: lint style * feat: 增加地球图层 - 大气层 * style: lint style * feat: 增加设置可视化层背景色的能力 * style: lint style * feat: 增加地球外发光效果 * style: lint style * feat: 允许用户不使用 layer 的 source 方法 - 地球模式下光晕图层不需要传数据 * style: lint style * feat: 调整光晕的 shader 计算 * chore: update version 2.5.32 -> 2.5.33 * feat: 调整地球大气层的渲染层级 * style: lint style * feat: 调整案例 * style: lint style * chore: update version 2.5.34 -> 2.5.35 * feat: 增加地球图层的默认参数、调整部分代码 * style: lint style * chore: update version 2.5.34 -> 2.5.35 * fix: 修复 amap2 新增样式导致的 marker 失效 * feat: 修复 amap2 的 amap-maps 新增 z-index=0; 引发的marker 显示层级失效 * feat: amap2 的 amap-maps 新增 z-index=0; 样式，让 marker 中 zIndex 失效 * style: lint style
This commit is contained in:
YiQianYao
GitHub
parent
63d6819471
commit
6124cfa9d9
|
|
@ -14,7 +14,7 @@
|
|||
"message": "chore: publish"
|
||||
}
|
||||
},
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"npmClient": "yarn",
|
||||
"useWorkspaces": true,
|
||||
"publishConfig": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-component",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"description": "",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
|
|
@ -25,8 +25,8 @@
|
|||
"author": "lzxue",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@antv/l7-core": "^2.5.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"eventemitter3": "^4.0.0",
|
||||
"inversify": "^5.0.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-core",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.34",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@mapbox/tiny-sdf": "^1.1.1",
|
||||
"ajv": "^6.10.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.5.34",
|
||||
"@antv/l7-core": "^2.5.34",
|
||||
"@antv/l7-layers": "^2.5.34",
|
||||
"@antv/l7-maps": "^2.5.34",
|
||||
"@antv/l7-scene": "^2.5.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-component": "^2.5.35",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-layers": "^2.5.35",
|
||||
"@antv/l7-maps": "^2.5.35",
|
||||
"@antv/l7-scene": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7"
|
||||
},
|
||||
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
const version = '2.5.34';
|
||||
const version = '2.5.35';
|
||||
export { version };
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-layers",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.34",
|
||||
"@antv/l7-source": "^2.5.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-source": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@mapbox/martini": "^0.2.0",
|
||||
"@turf/meta": "^6.0.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-map",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.5.34",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@mapbox/point-geometry": "^0.1.0",
|
||||
"@mapbox/unitbezier": "^0.0.0",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-maps",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.34",
|
||||
"@antv/l7-map": "^2.5.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-map": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@types/amap-js-api": "^1.4.6",
|
||||
"@types/mapbox-gl": "^1.11.2",
|
||||
|
|
|
|||
|
|
@ -151,15 +151,17 @@ export default class AMapService
|
|||
}
|
||||
const mapContainer = this.map.getContainer();
|
||||
if (mapContainer !== null) {
|
||||
// const amap = mapContainer.getElementsByClassName(
|
||||
// 'amap-maps',
|
||||
// )[0] as HTMLElement;
|
||||
// this.markerContainer = DOM.create('div', 'l7-marker-container2', amap);
|
||||
this.markerContainer = DOM.create(
|
||||
'div',
|
||||
'l7-marker-container2',
|
||||
mapContainer,
|
||||
);
|
||||
const amap = mapContainer.getElementsByClassName(
|
||||
'amap-maps',
|
||||
)[0] as HTMLElement;
|
||||
// TODO: amap2 的 amap-maps 新增 z-index=0; 样式，让 marker 中 zIndex 失效
|
||||
amap.style.zIndex = '2';
|
||||
this.markerContainer = DOM.create('div', 'l7-marker-container2', amap);
|
||||
// this.markerContainer = DOM.create(
|
||||
// 'div',
|
||||
// 'l7-marker-container2',
|
||||
// mapContainer,
|
||||
// );
|
||||
// this.markerContainer = mapContainer;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-renderer",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"description": "",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
"gl": "^4.4.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@antv/l7-core": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"inversify": "^5.0.1",
|
||||
"l7regl": "^0.0.14",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-scene",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"description": "",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
|
|
@ -23,12 +23,12 @@
|
|||
"author": "xiaoiver",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@antv/l7-component": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.34",
|
||||
"@antv/l7-layers": "^2.5.34",
|
||||
"@antv/l7-maps": "^2.5.34",
|
||||
"@antv/l7-renderer": "^2.5.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-component": "^2.5.35",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-layers": "^2.5.35",
|
||||
"@antv/l7-maps": "^2.5.35",
|
||||
"@antv/l7-renderer": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"inversify": "^5.0.1",
|
||||
"mapbox-gl": "^1.2.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-source",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"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.34",
|
||||
"@antv/l7-utils": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-utils": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@mapbox/geojson-rewind": "^0.4.0",
|
||||
"@turf/helpers": "^6.1.4",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-three",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"description": "three for L7 ",
|
||||
"keywords": [
|
||||
"3D",
|
||||
|
|
@ -44,9 +44,9 @@
|
|||
},
|
||||
"homepage": "https://github.com/antvis/L7#readme",
|
||||
"dependencies": {
|
||||
"@antv/l7-core": "^2.5.34",
|
||||
"@antv/l7-layers": "^2.5.34",
|
||||
"@antv/l7-scene": "^2.5.34",
|
||||
"@antv/l7-core": "^2.5.35",
|
||||
"@antv/l7-layers": "^2.5.35",
|
||||
"@antv/l7-scene": "^2.5.35",
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"inversify": "^5.0.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@antv/l7-utils",
|
||||
"version": "2.5.34",
|
||||
"version": "2.5.35",
|
||||
"description": "",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
|
|
|
|||
Loading…
Reference in New Issue