7209363465

Committed 14 Dec 2023 01:11PM UTC coverage: 59.572% (-0.1%) from 59.711%

Build # 7209363465

Build Type

Pull #337

github

Committed by

lvisei

Commit Message

fix: 修复 IconImageLayer 支持更新图片资源

Pull Request Pull Request #337: fix: 修复 IconImageLayer 支持更新图片资源

Run Details

1034 of 2469 branches covered (0.0%)

Branch coverage included in aggregate %.

2 of 13 new or added lines in 1 file covered. (15.38%)

15 existing lines in 1 file now uncovered.

3590 of 5293 relevant lines covered (67.83%)

137.99 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

22.5

/packages/composite-layers/src/composite-layers/icon-layer/icon-image.ts

import { isEqual } from 'lodash-es';
import { CompositeLayer } from '../../core/composite-layer';
import { CompositeLayerEvent, LayerGroupEvent } from '../../core/constants';
import { Scene } from '../../types';
import { DEFAULT_OPTIONS } from './constants';
import { IconLayer } from './icon';
import { IconImageLayerOptions } from './types';

export class IconImageLayer extends IconLayer<IconImageLayerOptions> {
  /**
   * 默认配置项
   */
  static DefaultOptions = DEFAULT_OPTIONS;
  /**
   * 复合图层类型
   */
  public type = CompositeLayer.LayerType.IconImageLayer;

  /**
   * 添加到场景
   */
  public addTo(scene: Scene) {
    this.scene = scene;
    this.initAssets().then(() => {
      this.subLayers.once(LayerGroupEvent.INITED_LAYERS, () => {
        this.emit(CompositeLayerEvent.INITED, this);
        this.emit(CompositeLayerEvent.ADD, this);
      });
      this.subLayers.addTo(scene);
    });
  }

  /**
   * 初始化资源
   */
  protected async initAssets() {
    await this.loadIconAtlas();
  }

  /**
   * 更新资源
   */
  private async updateAssets() {
    await this.loadIconAtlas();
  }

  protected updateSubLayers(options: Partial<IconImageLayerOptions>) {
    // 资源发生更新时
    if (options.iconAtlas && !isEqual(options.iconAtlas, this.lastOptions.iconAtlas)) {
      this.updateAssets().then(() => {
        super.updateSubLayers(options);
      });
    } else {
      super.updateSubLayers(options);
    }
  }

  /**
   * load 图片资源
   */
  protected async loadIconAtlas() {
    const iconAtlas = this.options.iconAtlas;
    const scene = this.scene;
    if (!scene) return;

    // 过滤已经加载到 scene 上的图标
    const images = Object.entries(iconAtlas).filter(([imageName]) => scene.hasImage(imageName) === false);
    await Promise.all(images.map(async ([imageName, imageUrl]) => await scene.addImage(imageName, imageUrl)));
  }
}

1	import { isEqual } from 'lodash-es';
2	import { CompositeLayer } from '../../core/composite-layer';	1✔
3	import { CompositeLayerEvent, LayerGroupEvent } from '../../core/constants';	1✔
4	import { Scene } from '../../types';	1✔
5	import { DEFAULT_OPTIONS } from './constants';	1✔
6	import { IconLayer } from './icon';	1✔
7	import { IconImageLayerOptions } from './types';	1✔
8		1✔
9	export class IconImageLayer extends IconLayer<IconImageLayerOptions> {	1✔
10	/**	1✔
11	* 默认配置项	1✔
12	*/
13	static DefaultOptions = DEFAULT_OPTIONS;	×
14	/**
15	* 复合图层类型
16	*/
17	public type = CompositeLayer.LayerType.IconImageLayer;	×
18		×
19	/**
20	* 添加到场景
21	*/
22	public addTo(scene: Scene) {
23	this.scene = scene;	1✔
24	this.initAssets().then(() => {	×
25	this.subLayers.once(LayerGroupEvent.INITED_LAYERS, () => {	×
26	this.emit(CompositeLayerEvent.INITED, this);	×
27	this.emit(CompositeLayerEvent.ADD, this);	×
28	});	×
29	this.subLayers.addTo(scene);	×
30	});
31	}	×
32
33	/**
34	* 初始化资源
35	*/
36	protected async initAssets() {
37	await this.loadIconAtlas();	1✔
38	}	×
39		×
NEW 40	/**	×
NEW 41	* 更新资源	×
42	*/
NEW 43	private async updateAssets() {	×
NEW 44	await this.loadIconAtlas();	×
45	}
46
47	protected updateSubLayers(options: Partial<IconImageLayerOptions>) {
48	// 资源发生更新时
49	if (options.iconAtlas && !isEqual(options.iconAtlas, this.lastOptions.iconAtlas)) {
50	this.updateAssets().then(() => {
51	super.updateSubLayers(options);
52	});	1✔
NEW 53	} else {	×
NEW 54	super.updateSubLayers(options);	×
NEW 55	}	×
NEW 56	}	×
57
58	/**	×
59	* load 图片资源	×
60	*/
61	protected async loadIconAtlas() {
62	const iconAtlas = this.options.iconAtlas;
63	const scene = this.scene;
64	if (!scene) return;	1✔
NEW 65		×
66	// 过滤已经加载到 scene 上的图标
NEW 67	const images = Object.entries(iconAtlas).filter(([imageName]) => scene.hasImage(imageName) === false);	×
NEW 68	await Promise.all(images.map(async ([imageName, imageUrl]) => await scene.addImage(imageName, imageUrl)));	×
UNCOV 69	}	×
70	}

antvis / L7Plot / 7209363465

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous