6899286635

Committed 17 Nov 2023 02:54AM UTC coverage: 37.728% (-40.9%) from 78.595%

Build # 6899286635

Build Type

Pull #2436

github

Committed by

web-flow

Commit Message

Merge d28035020 into d975ea1e0

Pull Request Pull Request #2436: [chore] Refactored cloud provider flow for performance and multi provider support

Run Details

1752 of 7712 branches covered (0.0%)

Branch coverage included in aggregate %.

310 of 384 new or added lines in 29 files covered. (80.73%)

5660 existing lines in 319 files now uncovered.

6566 of 14335 relevant lines covered (45.8%)

13.94 hits per line

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

44.68

/src/layers/src/line-layer/line-layer.ts

// Copyright (c) 2023 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import {BrushingExtension} from '@deck.gl/extensions';

import {EnhancedLineLayer} from '@kepler.gl/deckgl-layers';
import LineLayerIcon from './line-layer-icon';
import ArcLayer, {ArcLayerConfig} from '../arc-layer/arc-layer';
import {LayerColumn} from '../base-layer';
import {LAYER_VIS_CONFIGS, ColorRange, PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';
import {
  Merge,
  RGBColor,
  VisConfigColorRange,
  VisConfigColorSelect,
  VisConfigNumber,
  VisConfigRange
} from '@kepler.gl/types';
import {default as KeplerTable} from '@kepler.gl/table';
import {DataContainerInterface} from '@kepler.gl/utils';

export type LineLayerVisConfigSettings = {
  opacity: VisConfigNumber;
  thickness: VisConfigNumber;
  colorRange: VisConfigColorRange;
  sizeRange: VisConfigRange;
  targetColor: VisConfigColorSelect;
  elevationScale: VisConfigNumber;
};

export type LineLayerColumnsConfig = {
  lat0: LayerColumn;
  lng0: LayerColumn;
  lat1: LayerColumn;
  lng1: LayerColumn;
  alt0?: LayerColumn;
  alt1?: LayerColumn;
};

export type LineLayerVisConfig = {
  colorRange: ColorRange;
  opacity: number;
  sizeRange: [number, number];
  targetColor: RGBColor;
  thickness: number;
  elevationScale: number;
};

export type LineLayerConfig = Merge<
  ArcLayerConfig,
  {columns: LineLayerColumnsConfig; visConfig: LineLayerVisConfig}
>;

export const linePosAccessor = ({lat0, lng0, lat1, lng1, alt0, alt1}: LineLayerColumnsConfig) => (
  dc: DataContainerInterface
) => d => [
  dc.valueAt(d.index, lng0.fieldIdx),
  dc.valueAt(d.index, lat0.fieldIdx),
  alt0 && alt0.fieldIdx > -1 ? dc.valueAt(d.index, alt0.fieldIdx) : 0,
  dc.valueAt(d.index, lng1.fieldIdx),
  dc.valueAt(d.index, lat1.fieldIdx),
  alt1 && alt1?.fieldIdx > -1 ? dc.valueAt(d.index, alt1.fieldIdx) : 0
];

export const lineRequiredColumns: ['lat0', 'lng0', 'lat1', 'lng1'] = [
  'lat0',
  'lng0',
  'lat1',
  'lng1'
];
export const lineOptionalColumns: ['alt0', 'alt1'] = ['alt0', 'alt1'];

export const lineColumnLabels = {
  lat0: 'arc.lat0',
  lng0: 'arc.lng0',
  lat1: 'arc.lat1',
  lng1: 'arc.lng1',
  alt0: 'line.alt0',
  alt1: 'line.alt1'
};

export const lineVisConfigs: {
  opacity: 'opacity';
  thickness: 'thickness';
  colorRange: 'colorRange';
  sizeRange: 'strokeWidthRange';
  targetColor: 'targetColor';
  elevationScale: VisConfigNumber;
} = {
  opacity: 'opacity',
  thickness: 'thickness',
  colorRange: 'colorRange',
  sizeRange: 'strokeWidthRange',
  targetColor: 'targetColor',
  elevationScale: {
    ...LAYER_VIS_CONFIGS.elevationScale,
    defaultValue: 1
  }
};

export default class LineLayer extends ArcLayer {
  declare visConfigSettings: LineLayerVisConfigSettings;
  declare config: LineLayerConfig;

  constructor(props) {
    super(props);

    this.registerVisConfig(lineVisConfigs);
    this.getPositionAccessor = (dataContainer: DataContainerInterface) =>
      linePosAccessor(this.config.columns)(dataContainer);
  }

  get type() {
    return 'line';
  }

  get layerIcon() {
    return LineLayerIcon;
  }

  get requiredLayerColumns() {
    return lineRequiredColumns;
  }

  get optionalColumns() {
    return lineOptionalColumns;
  }

  get columnLabels() {
    return lineColumnLabels;
  }

  get visualChannels() {
    const visualChannels = super.visualChannels;
    return {
      ...visualChannels,
      sourceColor: {
        ...visualChannels.sourceColor,
        accessor: 'getColor'
      }
    };
  }

  static findDefaultLayerProps({fieldPairs = []}: KeplerTable) {
    if (fieldPairs.length < 2) {
      return {props: []};
    }
    const props: {columns: LineLayerColumnsConfig; label: string} = {
      // connect the first two point layer with line
      columns: {
        lat0: fieldPairs[0].pair.lat,
        lng0: fieldPairs[0].pair.lng,
        alt0: {value: null, fieldIdx: -1, optional: true},
        lat1: fieldPairs[1].pair.lat,
        lng1: fieldPairs[1].pair.lng,
        alt1: {value: null, fieldIdx: -1, optional: true}
      },
      label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`
    };

    return {props: [props]};
  }

  renderLayer(opts) {
    const {data, gpuFilter, objectHovered, interactionConfig} = opts;

    const layerProps = {
      widthScale: this.config.visConfig.thickness * PROJECTED_PIXEL_SIZE_MULTIPLIER,
      elevationScale: this.config.visConfig.elevationScale
    };

    const updateTriggers = {
      getPosition: this.config.columns,
      getFilterValue: gpuFilter.filterValueUpdateTriggers,
      ...this.getVisualChannelUpdateTriggers()
    };
    const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
    const hoveredObject = this.hasHoveredObject(objectHovered);

    return [
      // base layer
      new EnhancedLineLayer({
        ...defaultLayerProps,
        ...this.getBrushingExtensionProps(interactionConfig, 'source_target'),
        ...data,
        ...layerProps,
        updateTriggers,
        extensions: [...defaultLayerProps.extensions, new BrushingExtension()]
      }),
      // hover layer
      ...(hoveredObject
        ? [
            new EnhancedLineLayer({
              ...this.getDefaultHoverLayerProps(),
              ...layerProps,
              data: [hoveredObject],
              getColor: this.config.highlightColor,
              getTargetColor: this.config.highlightColor,
              getWidth: data.getWidth
            })
          ]
        : [])
    ];
  }
}

1	// Copyright (c) 2023 Uber Technologies, Inc.
2	//
3	// Permission is hereby granted, free of charge, to any person obtaining a copy
4	// of this software and associated documentation files (the "Software"), to deal
5	// in the Software without restriction, including without limitation the rights
6	// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7	// copies of the Software, and to permit persons to whom the Software is
8	// furnished to do so, subject to the following conditions:
9	//
10	// The above copyright notice and this permission notice shall be included in
11	// all copies or substantial portions of the Software.
12	//
13	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14	// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15	// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16	// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17	// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18	// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19	// THE SOFTWARE.
20
21	import {BrushingExtension} from '@deck.gl/extensions';
22
23	import {EnhancedLineLayer} from '@kepler.gl/deckgl-layers';	9✔
24	import LineLayerIcon from './line-layer-icon';	9✔
25	import ArcLayer, {ArcLayerConfig} from '../arc-layer/arc-layer';	9✔
26	import {LayerColumn} from '../base-layer';
27	import {LAYER_VIS_CONFIGS, ColorRange, PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';	9✔
28	import {
29	Merge,
30	RGBColor,
31	VisConfigColorRange,
32	VisConfigColorSelect,
33	VisConfigNumber,
34	VisConfigRange
35	} from '@kepler.gl/types';
36	import {default as KeplerTable} from '@kepler.gl/table';
37	import {DataContainerInterface} from '@kepler.gl/utils';
38
39	export type LineLayerVisConfigSettings = {
40	opacity: VisConfigNumber;
41	thickness: VisConfigNumber;
42	colorRange: VisConfigColorRange;
43	sizeRange: VisConfigRange;
44	targetColor: VisConfigColorSelect;
45	elevationScale: VisConfigNumber;
46	};
47
48	export type LineLayerColumnsConfig = {
49	lat0: LayerColumn;
50	lng0: LayerColumn;
51	lat1: LayerColumn;
52	lng1: LayerColumn;
53	alt0?: LayerColumn;
54	alt1?: LayerColumn;
55	};
56
57	export type LineLayerVisConfig = {
58	colorRange: ColorRange;
59	opacity: number;
60	sizeRange: [number, number];
61	targetColor: RGBColor;
62	thickness: number;
63	elevationScale: number;
64	};
65
66	export type LineLayerConfig = Merge<
67	ArcLayerConfig,
68	{columns: LineLayerColumnsConfig; visConfig: LineLayerVisConfig}
69	>;
70
71	export const linePosAccessor = ({lat0, lng0, lat1, lng1, alt0, alt1}: LineLayerColumnsConfig) => (	33!
72	dc: DataContainerInterface
73	) => d => [	9✔
74	dc.valueAt(d.index, lng0.fieldIdx),
75	dc.valueAt(d.index, lat0.fieldIdx),
76	alt0 && alt0.fieldIdx > -1 ? dc.valueAt(d.index, alt0.fieldIdx) : 0,
77	dc.valueAt(d.index, lng1.fieldIdx),
78	dc.valueAt(d.index, lat1.fieldIdx),
79	alt1 && alt1?.fieldIdx > -1 ? dc.valueAt(d.index, alt1.fieldIdx) : 0
80	];
81
82	export const lineRequiredColumns: ['lat0', 'lng0', 'lat1', 'lng1'] = [
83	'lat0',
84	'lng0',
85	'lat1',
86	'lng1'
87	];
88	export const lineOptionalColumns: ['alt0', 'alt1'] = ['alt0', 'alt1'];
89
90	export const lineColumnLabels = {	9✔
91	lat0: 'arc.lat0',
UNCOV 92	lng0: 'arc.lng0',	×
UNCOV 93	lat1: 'arc.lat1',	×
UNCOV 94	lng1: 'arc.lng1',	×
UNCOV 95	alt0: 'line.alt0',	×
UNCOV 96	alt1: 'line.alt1'	×
97	};
98
99	export const lineVisConfigs: {	9✔
100	opacity: 'opacity';
101	thickness: 'thickness';
102	colorRange: 'colorRange';
103	sizeRange: 'strokeWidthRange';
104	targetColor: 'targetColor';
105	elevationScale: VisConfigNumber;
106	} = {	×
UNCOV 107	opacity: 'opacity',	×
108	thickness: 'thickness',
109	colorRange: 'colorRange',
110	sizeRange: 'strokeWidthRange',
111	targetColor: 'targetColor',
112	elevationScale: {	9✔
113	...LAYER_VIS_CONFIGS.elevationScale,
114	defaultValue: 1	9✔
115	}
116	};
117
118	export default class LineLayer extends ArcLayer {
119	declare visConfigSettings: LineLayerVisConfigSettings;
120	declare config: LineLayerConfig;
121
122	constructor(props) {	9✔
123	super(props);
124
125	this.registerVisConfig(lineVisConfigs);
126	this.getPositionAccessor = (dataContainer: DataContainerInterface) =>
127	linePosAccessor(this.config.columns)(dataContainer);
128	}	9✔
129
130	get type() {
131	return 'line';	9✔
132	}
133
134	get layerIcon() {
135	return LineLayerIcon;	3✔
136	}	3✔
137
138	get requiredLayerColumns() {
139	return lineRequiredColumns;
UNCOV 140	}	×
141
142	get optionalColumns() {	3✔
143	return lineOptionalColumns;
144	}
145
146	get columnLabels() {
147	return lineColumnLabels;	3✔
148	}
149
150	get visualChannels() {
151	const visualChannels = super.visualChannels;	3✔
152	return {	3✔
153	...visualChannels,
154	sourceColor: {
155	...visualChannels.sourceColor,
156	accessor: 'getColor'
157	}
158	};
159	}
160
161	static findDefaultLayerProps({fieldPairs = []}: KeplerTable) {
162	if (fieldPairs.length < 2) {
UNCOV 163	return {props: []};	×
164	}
165	const props: {columns: LineLayerColumnsConfig; label: string} = {
166	// connect the first two point layer with line	×
167	columns: {
168	lat0: fieldPairs[0].pair.lat,
169	lng0: fieldPairs[0].pair.lng,
170	alt0: {value: null, fieldIdx: -1, optional: true},
171	lat1: fieldPairs[1].pair.lat,
UNCOV 172	lng1: fieldPairs[1].pair.lng,	×
UNCOV 173	alt1: {value: null, fieldIdx: -1, optional: true}	×
174	},
175	label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`
176	};
177
178	return {props: [props]};
179	}
180
181	renderLayer(opts) {	3✔
182	const {data, gpuFilter, objectHovered, interactionConfig} = opts;
183
184	const layerProps = {
185	widthScale: this.config.visConfig.thickness * PROJECTED_PIXEL_SIZE_MULTIPLIER,	×
186	elevationScale: this.config.visConfig.elevationScale
187	};
188
189	const updateTriggers = {
UNCOV 190	getPosition: this.config.columns,	×
UNCOV 191	getFilterValue: gpuFilter.filterValueUpdateTriggers,	×
192	...this.getVisualChannelUpdateTriggers()
193	};
194	const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
195	const hoveredObject = this.hasHoveredObject(objectHovered);
196
UNCOV 197	return [	×
198	// base layer
199	new EnhancedLineLayer({
200	...defaultLayerProps,
201	...this.getBrushingExtensionProps(interactionConfig, 'source_target'),
202	...data,
203	...layerProps,
204	updateTriggers,
205	extensions: [...defaultLayerProps.extensions, new BrushingExtension()]
206	}),
207	// hover layer
208	...(hoveredObject
209	? [
210	new EnhancedLineLayer({
211	...this.getDefaultHoverLayerProps(),
212	...layerProps,
UNCOV 213	data: [hoveredObject],	×
UNCOV 214	getColor: this.config.highlightColor,	×
UNCOV 215	getTargetColor: this.config.highlightColor,	×
216	getWidth: data.getWidth
217	})
218	]
219	: [])
220	];
221	}
222	}

keplergl / kepler.gl / 6899286635

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