7140885331

Committed 08 Dec 2023 11:39AM UTC coverage: 59.711% (+0.2%) from 59.535%

Build # 7140885331

Build Type

Pull #336

github

Committed by

lvisei

Commit Message

fix: 修复图层 scale 更新问题

Pull Request Pull Request #336: fix: 修复图层 scale 更新问题

Run Details

1034 of 2465 branches covered (0.0%)

Branch coverage included in aggregate %.

21 of 21 new or added lines in 1 file covered. (100.0%)

2 existing lines in 1 file now uncovered.

3587 of 5274 relevant lines covered (68.01%)

137.84 hits per line

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

89.47

/packages/composite-layers/src/utils/index.ts

import { Source } from '@antv/l7';
import { isEqual, isPlainObject } from '@antv/util';

export * from './keypress';

function deepMix(dist: Record<string, any>, src: Record<string, any>, level: number = 0, maxLevel: number = 5) {
  for (const key in src) {
    if (Object.prototype.hasOwnProperty.call(src, key)) {
      const value = src[key];
      if (value !== null && isPlainObject(value)) {
        if (!isPlainObject(dist[key])) {
          dist[key] = {};
        }
        if (level < maxLevel) {
          deepMix(dist[key], value, level + 1, maxLevel);
        } else {
          dist[key] = src[key];
        }
      } else if (Array.isArray(value)) {
        dist[key] = [];
        dist[key] = dist[key].concat(value);
      } else if (value !== undefined) {
        dist[key] = value;
      }
    }
  }
}

const deepMixOptions = (rst: any, ...args: any[]) => {
  for (let i = 0; i < args.length; i += 1) {
    // 只进行最大 1 level 合并
    deepMix(rst, args[i], 0, 1);
  }
  return rst;
};

/**
 * 深克隆图层配置项
 */
export const deepMergeLayerOptions = <O extends { source: any }>(options: Partial<O>, srcOptions: Partial<O>): O => {
  const { source, ...restOptions } = options;
  const { source: srcSource, ...restSrcOptions } = srcOptions;
  const target = deepMixOptions({}, restOptions, restSrcOptions);

  // source 是实例的情况
  if ((srcSource as any) instanceof Source) {
    target.source = srcSource;
  } else if ((source as any) instanceof Source) {
    target.source = source;
  } else {
    target.source = { ...source, ...srcSource };
  }

  return target;
};

/**
 * 判断 source 数据是否发生改变
 */
export const isSourceChanged = <S extends { data: any } = { data: any }>(source: S, currentSource: S) => {
  // source 是实例的情况
  if (source instanceof Source && currentSource instanceof Source) {
    return source !== currentSource;
  }

  const { data, ...restOptions } = source;
  const { data: currentData, ...restCurrentOptions } = currentSource;
  const changed = data !== currentData || !isEqual(restOptions, restCurrentOptions);

  return changed;
};

1	import { Source } from '@antv/l7';
2	import { isEqual, isPlainObject } from '@antv/util';	84✔
3		84✔
4	export * from './keypress';	84✔
5		84✔
6	function deepMix(dist: Record<string, any>, src: Record<string, any>, level: number = 0, maxLevel: number = 5) {	84✔
7	for (const key in src) {	84✔
8	if (Object.prototype.hasOwnProperty.call(src, key)) {
9	const value = src[key];	1,727!
10	if (value !== null && isPlainObject(value)) {	1,727!
11	if (!isPlainObject(dist[key])) {	1,727✔
12	dist[key] = {};	5,772!
13	}	5,772✔
14	if (level < maxLevel) {	5,772✔
15	deepMix(dist[key], value, level + 1, maxLevel);	905✔
16	} else {	861✔
17	dist[key] = src[key];
18	}	905✔
19	} else if (Array.isArray(value)) {	693✔
20	dist[key] = [];
21	dist[key] = dist[key].concat(value);
22	} else if (value !== undefined) {	212✔
23	dist[key] = value;
24	}
25	}	4,867✔
26	}	248✔
27	}	248✔
28
29	const deepMixOptions = (rst: any, ...args: any[]) => {	4,619✔
30	for (let i = 0; i < args.length; i += 1) {	3,749✔
31	// 只进行最大 1 level 合并
32	deepMix(rst, args[i], 0, 1);
33	}
34	return rst;
35	};	84✔
36		517✔
37	/**	517✔
38	* 深克隆图层配置项	1,034✔
39	*/
40	export const deepMergeLayerOptions = <O extends { source: any }>(options: Partial<O>, srcOptions: Partial<O>): O => {	517✔
41	const { source, ...restOptions } = options;
42	const { source: srcSource, ...restSrcOptions } = srcOptions;	1,034✔
43	const target = deepMixOptions({}, restOptions, restSrcOptions);
44		517✔
45	// source 是实例的情况
46	if ((srcSource as any) instanceof Source) {
47	target.source = srcSource;
48	} else if ((source as any) instanceof Source) {
49	target.source = source;	84✔
50	} else {	517✔
51	target.source = { ...source, ...srcSource };	517✔
52	}	517✔
53
54	return target;	517✔
55	};	81✔
56
57	/**	436!
UNCOV 58	* 判断 source 数据是否发生改变	×
59	*/
60	export const isSourceChanged = <S extends { data: any } = { data: any }>(source: S, currentSource: S) => {
61	// source 是实例的情况	436✔
62	if (source instanceof Source && currentSource instanceof Source) {
63	return source !== currentSource;	517✔
64	}
65		84✔
66	const { data, ...restOptions } = source;
67	const { data: currentData, ...restCurrentOptions } = currentSource;
68	const changed = data !== currentData \|\| !isEqual(restOptions, restCurrentOptions);
69		84✔
70	return changed;
71	};	90!

antvis / L7Plot / 7140885331

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