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

Merge branch 'layer' of https://github.com/antvis/L7 into layer

This commit is contained in:
thinkinggis 2019-12-18 14:33:28 +08:00
parent 81c2e4eee3 8cd422ab14
commit 84d78cdda7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/maps/src/mapbox/index.ts
View File

@ -202,20 +202,28 @@ export default class MapboxService
* TODO: 使用 mapbox v0.53.x 版本 custom layer，需要共享 gl context * TODO: 使用 mapbox v0.53.x 版本 custom layer，需要共享 gl context
* @see https://github.com/mapbox/mapbox-gl-js/blob/master/debug/threejs.html#L61-L64 * @see https://github.com/mapbox/mapbox-gl-js/blob/master/debug/threejs.html#L61-L64
*/ */
if (!mapboxgl) {
// 判断全局 mapboxgl 对象的加载
if (!('mapInstance' in this.config) && !mapboxgl) {
// 用户有时传递进来的实例是继承于 mapbox 实例化的，不一定是 mapboxgl 对象。
this.logger.error(this.configService.getSceneWarninfo('SDK')); this.logger.error(this.configService.getSceneWarninfo('SDK'));
} }
if ( if (
token === MAPBOX_API_KEY && token === MAPBOX_API_KEY &&
style !== 'blank' && style !== 'blank' &&
!mapboxgl.accessToken !mapboxgl.accessToken &&
!('mapInstance' in this.config) // 如果用户传递了 mapInstance，应该不去干预实例的 accessToken。
) { ) {
this.logger.warn(this.configService.getSceneWarninfo('MapToken')); this.logger.warn(this.configService.getSceneWarninfo('MapToken'));
} }
if (!mapboxgl.accessToken) { // 判断是否设置了 accessToken
if ('mapInstance' in this.config && !mapboxgl.accessToken) {
// 用户有时传递进来的实例是继承于 mapbox 实例化的，不一定是 mapboxgl 对象。
mapboxgl.accessToken = token; mapboxgl.accessToken = token;
} }
if (mapInstance) { if (mapInstance) {
// @ts-ignore // @ts-ignore
this.map = mapInstance; this.map = mapInstance;