10694111447

Committed 04 Sep 2024 02:37AM UTC coverage: 91.797% (+0.1%) from 91.695%

Build # 10694111447

Build Type

push

github

Committed by

web-flow

Commit Message

GPU Aggregation: Support *ScaleType and *Percentile props (#9130)

Run Details

6740 of 7373 branches covered (91.41%)

Branch coverage included in aggregate %.

511 of 522 new or added lines in 11 files covered. (97.89%)

2 existing lines in 2 files now uncovered.

54908 of 59784 relevant lines covered (91.84%)

14684.13 hits per line

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

97.4

/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts

// deck.gl
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {Texture} from '@luma.gl/core';
import {UpdateParameters, Color} from '@deck.gl/core';
import {ColumnLayer} from '@deck.gl/layers';
import {createColorRangeTexture, updateColorRangeTexture} from '../common/utils/color-utils';
import vs from './hexagon-cell-layer-vertex.glsl';
import {HexagonProps, hexagonUniforms} from './hexagon-layer-uniforms';
import type {ScaleType} from '../common/types';

/** Proprties added by HexagonCellLayer. */
export type _HexagonCellLayerProps = {
  hexOriginCommon: [number, number];
  colorDomain: [number, number];
  colorCutoff: [number, number] | null;
  colorRange: Color[];
  colorScaleType: ScaleType;
  elevationDomain: [number, number];
  elevationCutoff: [number, number] | null;
  elevationRange: [number, number];
};

export default class HexagonCellLayer<ExtraPropsT extends {} = {}> extends ColumnLayer<
  null,
  ExtraPropsT & Required<_HexagonCellLayerProps>
> {
  static layerName = 'HexagonCellLayer';

  state!: ColumnLayer['state'] & {
    colorTexture: Texture;
  };

  getShaders() {
    const shaders = super.getShaders();
    shaders.modules.push(hexagonUniforms);
    return {...shaders, vs};
  }

  initializeState() {
    super.initializeState();

    const attributeManager = this.getAttributeManager()!;
    attributeManager.remove([
      'instanceElevations',
      'instanceFillColors',
      'instanceLineColors',
      'instanceStrokeWidths'
    ]);
    attributeManager.addInstanced({
      instancePositions: {
        size: 2,
        type: 'float32',
        accessor: 'getBin'
      },
      instanceColorValues: {
        size: 1,
        type: 'float32',
        accessor: 'getColorValue'
      },
      instanceElevationValues: {
        size: 1,
        type: 'float32',
        accessor: 'getElevationValue'
      }
    });
  }

  updateState(params: UpdateParameters<this>) {
    super.updateState(params);

    const {props, oldProps} = params;
    const model = this.state.fillModel!;

    if (oldProps.colorRange !== props.colorRange) {
      this.state.colorTexture?.destroy();
      this.state.colorTexture = createColorRangeTexture(
        this.context.device,
        props.colorRange,
        props.colorScaleType
      );
      const hexagonProps: Partial<HexagonProps> = {colorRange: this.state.colorTexture};
      model.shaderInputs.setProps({hexagon: hexagonProps});
    } else if (oldProps.colorScaleType !== props.colorScaleType) {
      updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);
    }
  }

  finalizeState(context) {
    super.finalizeState(context);

    this.state.colorTexture?.destroy();
  }

  draw({uniforms}) {
    const {
      radius,
      hexOriginCommon,
      elevationRange,
      elevationScale,
      extruded,
      coverage,
      colorDomain,
      elevationDomain
    } = this.props;
    const colorCutoff = this.props.colorCutoff || [-Infinity, Infinity];
    const elevationCutoff = this.props.elevationCutoff || [-Infinity, Infinity];
    const fillModel = this.state.fillModel!;

    if (fillModel.vertexArray.indexBuffer) {
      // indices are for drawing wireframe, disable them
      // TODO - this should be handled in ColumnLayer?
      fillModel.setIndexBuffer(null);
    }
    fillModel.setVertexCount(this.state.fillVertexCount);

    const hexagonProps: Omit<HexagonProps, 'colorRange'> = {
      colorDomain: [
        Math.max(colorDomain[0], colorCutoff[0]), // instanceColorValue that maps to colorRange[0]
        Math.min(colorDomain[1], colorCutoff[1]), // instanceColorValue that maps to colorRange[colorRange.length - 1]
        Math.max(colorDomain[0] - 1, colorCutoff[0]), // hide cell if instanceColorValue is less than this
        Math.min(colorDomain[1] + 1, colorCutoff[1]) // hide cell if instanceColorValue is greater than this
      ],
      elevationDomain: [
        Math.max(elevationDomain[0], elevationCutoff[0]), // instanceElevationValue that maps to elevationRange[0]
        Math.min(elevationDomain[1], elevationCutoff[1]), // instanceElevationValue that maps to elevationRange[elevationRange.length - 1]
        Math.max(elevationDomain[0] - 1, elevationCutoff[0]), // hide cell if instanceElevationValue is less than this
        Math.min(elevationDomain[1] + 1, elevationCutoff[1]) // hide cell if instanceElevationValue is greater than this
      ],
      elevationRange: [elevationRange[0] * elevationScale, elevationRange[1] * elevationScale],
      originCommon: hexOriginCommon
    };

    fillModel.shaderInputs.setProps({
      column: {extruded, coverage, radius},
      hexagon: hexagonProps
    });
    fillModel.draw(this.context.renderPass);
  }
}

1	// deck.gl	1✔
2	// SPDX-License-Identifier: MIT	1✔
3	// Copyright (c) vis.gl contributors	1✔
4		1✔
5	import {Texture} from '@luma.gl/core';	1✔
6	import {UpdateParameters, Color} from '@deck.gl/core';	1✔
7	import {ColumnLayer} from '@deck.gl/layers';	1✔
8	import {createColorRangeTexture, updateColorRangeTexture} from '../common/utils/color-utils';	1✔
9	import vs from './hexagon-cell-layer-vertex.glsl';	1✔
10	import {HexagonProps, hexagonUniforms} from './hexagon-layer-uniforms';	1✔
11	import type {ScaleType} from '../common/types';	1✔
12		1✔
13	/** Proprties added by HexagonCellLayer. */	1✔
14	export type _HexagonCellLayerProps = {	1✔
15	hexOriginCommon: [number, number];	1✔
16	colorDomain: [number, number];	1✔
17	colorCutoff: [number, number] \| null;	1✔
18	colorRange: Color[];	1✔
19	colorScaleType: ScaleType;	1✔
20	elevationDomain: [number, number];	1✔
21	elevationCutoff: [number, number] \| null;	1✔
22	elevationRange: [number, number];	1✔
23	};	1✔
24		1✔
25	export default class HexagonCellLayer<ExtraPropsT extends {} = {}> extends ColumnLayer<	1✔
26	null,	1✔
27	ExtraPropsT & Required<_HexagonCellLayerProps>	1✔
28	> {	1✔
29	static layerName = 'HexagonCellLayer';	1✔
30		1✔
31	state!: ColumnLayer['state'] & {	1✔
32	colorTexture: Texture;	1✔
33	};	1✔
34		1✔
35	getShaders() {	1✔
36	const shaders = super.getShaders();	6✔
37	shaders.modules.push(hexagonUniforms);	6✔
38	return {...shaders, vs};	6✔
39	}	6✔
40		1✔
41	initializeState() {	1✔
42	super.initializeState();	6✔
43		6✔
44	const attributeManager = this.getAttributeManager()!;	6✔
45	attributeManager.remove([	6✔
46	'instanceElevations',	6✔
47	'instanceFillColors',	6✔
48	'instanceLineColors',	6✔
49	'instanceStrokeWidths'	6✔
50	]);	6✔
51	attributeManager.addInstanced({	6✔
52	instancePositions: {	6✔
53	size: 2,	6✔
54	type: 'float32',	6✔
55	accessor: 'getBin'	6✔
56	},	6✔
57	instanceColorValues: {	6✔
58	size: 1,	6✔
59	type: 'float32',	6✔
60	accessor: 'getColorValue'	6✔
61	},	6✔
62	instanceElevationValues: {	6✔
63	size: 1,	6✔
64	type: 'float32',	6✔
65	accessor: 'getElevationValue'	6✔
66	}	6✔
67	});	6✔
68	}	6✔
69		1✔
70	updateState(params: UpdateParameters<this>) {	1✔
71	super.updateState(params);	35✔
72		35✔
73	const {props, oldProps} = params;	35✔
74	const model = this.state.fillModel!;	35✔
75		35✔
76	if (oldProps.colorRange !== props.colorRange) {	35✔
77	this.state.colorTexture?.destroy();	6!
78	this.state.colorTexture = createColorRangeTexture(	6✔
79	this.context.device,	6✔
80	props.colorRange,	6✔
81	props.colorScaleType	6✔
82	);	6✔
83	const hexagonProps: Partial<HexagonProps> = {colorRange: this.state.colorTexture};	6✔
84	model.shaderInputs.setProps({hexagon: hexagonProps});	6✔
85	} else if (oldProps.colorScaleType !== props.colorScaleType) {	35!
NEW 86	updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);	×
UNCOV 87	}	×
88	}	35✔
89		1✔
90	finalizeState(context) {	1✔
91	super.finalizeState(context);	6✔
92		6✔
93	this.state.colorTexture?.destroy();	6✔
94	}	6✔
95		1✔
96	draw({uniforms}) {	1✔
97	const {	36✔
98	radius,	36✔
99	hexOriginCommon,	36✔
100	elevationRange,	36✔
101	elevationScale,	36✔
102	extruded,	36✔
103	coverage,	36✔
104	colorDomain,	36✔
105	elevationDomain	36✔
106	} = this.props;	36✔
107	const colorCutoff = this.props.colorCutoff \|\| [-Infinity, Infinity];	36✔
108	const elevationCutoff = this.props.elevationCutoff \|\| [-Infinity, Infinity];	36✔
109	const fillModel = this.state.fillModel!;	36✔
110		36✔
111	if (fillModel.vertexArray.indexBuffer) {	36✔
112	// indices are for drawing wireframe, disable them	5✔
113	// TODO - this should be handled in ColumnLayer?	5✔
114	fillModel.setIndexBuffer(null);	5✔
115	}	5✔
116	fillModel.setVertexCount(this.state.fillVertexCount);	36✔
117		36✔
118	const hexagonProps: Omit<HexagonProps, 'colorRange'> = {	36✔
119	colorDomain: [	36✔
120	Math.max(colorDomain[0], colorCutoff[0]), // instanceColorValue that maps to colorRange[0]	36✔
121	Math.min(colorDomain[1], colorCutoff[1]), // instanceColorValue that maps to colorRange[colorRange.length - 1]	36✔
122	Math.max(colorDomain[0] - 1, colorCutoff[0]), // hide cell if instanceColorValue is less than this	36✔
123	Math.min(colorDomain[1] + 1, colorCutoff[1]) // hide cell if instanceColorValue is greater than this	36✔
124	],	36✔
125	elevationDomain: [	36✔
126	Math.max(elevationDomain[0], elevationCutoff[0]), // instanceElevationValue that maps to elevationRange[0]	36✔
127	Math.min(elevationDomain[1], elevationCutoff[1]), // instanceElevationValue that maps to elevationRange[elevationRange.length - 1]	36✔
128	Math.max(elevationDomain[0] - 1, elevationCutoff[0]), // hide cell if instanceElevationValue is less than this	36✔
129	Math.min(elevationDomain[1] + 1, elevationCutoff[1]) // hide cell if instanceElevationValue is greater than this	36✔
130	],	36✔
131	elevationRange: [elevationRange[0] * elevationScale, elevationRange[1] * elevationScale],	36✔
132	originCommon: hexOriginCommon	36✔
133	};	36✔
134		36✔
135	fillModel.shaderInputs.setProps({	36✔
136	column: {extruded, coverage, radius},	36✔
137	hexagon: hexagonProps	36✔
138	});	36✔
139	fillModel.draw(this.context.renderPass);	36✔
140	}	36✔
141	}	1✔

visgl / deck.gl / 10694111447

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