8549900043

Committed 04 Apr 2024 05:48AM UTC coverage: 89.982% (-0.06%) from 90.042%

Build # 8549900043

Build Type

push

github

Committed by

web-flow

Commit Message

fix(arcgis): remove dependency on @luma.gl/webgl (#8747)

Run Details

6302 of 6934 branches covered (90.89%)

Branch coverage included in aggregate %.

5 of 90 new or added lines in 3 files covered. (5.56%)

2 existing lines in 2 files now uncovered.

51593 of 57407 relevant lines covered (89.87%)

6703.82 hits per line

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

40.0

/modules/arcgis/src/deck-renderer.ts

/* eslint-disable no-invalid-this */
import {initializeResources, render, finalizeResources, RenderResources} from './commons';

import SceneView from '@arcgis/core/views/SceneView';
import type {DeckProps} from '@deck.gl/core';

/** Convert ArcGIS FOV to WebMercatorViewport altitude */
function arcgisFOVToDeckAltitude(fov: number, aspectRatio: number): number {
  // ArcGIS fov is corner-to-corner
  const D = Math.sqrt(1 + aspectRatio ** 2);
  const halfFOV = (fov / 2 / 180) * Math.PI;
  return D / 2 / Math.tan(halfFOV);
}

export default function createDeckRenderer(DeckProps, externalRenderers) {
  class DeckRenderer {
    view: SceneView;
    deck: any;
    resources: RenderResources | null = null;
    cancelInitialization: (() => void) | null = null;

    constructor(view: SceneView, props: DeckProps) {
      this.view = view;
      this.deck = new DeckProps(props);
    }

    async setup(context) {
      const gl = context.gl;

      let cancelled = false;
      this.cancelInitialization = () => (cancelled = true);
      const resources = await initializeResources.call(this, gl);
      // If the renderer got disposed while awaiting, do not proceed
      if (cancelled) {
        finalizeResources(resources);
        return;
      }

      this.deck.on('change', props => resources.deck.setProps(props));

      resources.deck.setProps(this.deck.toJSON());
      this.resources = resources;
    }

    dispose() {
      this.cancelInitialization?.();
      if (this.resources) {
        finalizeResources(this.resources);
      }
    }

    redraw() {
      externalRenderers.requestRender(this.view);
    }

    render() {
      const [width, height] = this.view.size;

      render(this.resources!, {
        width,
        height,
        latitude: this.view.center.latitude,
        longitude: this.view.center.longitude,
        altitude: arcgisFOVToDeckAltitude(this.view.camera.fov, width / height),
        zoom: this.view.zoom,
        bearing: this.view.camera.heading,
        pitch: this.view.camera.tilt
      });
    }
  }

  return DeckRenderer;
}

1	/* eslint-disable no-invalid-this */	1✔
2	import {initializeResources, render, finalizeResources, RenderResources} from './commons';	1✔
3		1✔
4	import SceneView from '@arcgis/core/views/SceneView';	1✔
5	import type {DeckProps} from '@deck.gl/core';	1✔
6		1✔
7	/** Convert ArcGIS FOV to WebMercatorViewport altitude */	1✔
8	function arcgisFOVToDeckAltitude(fov: number, aspectRatio: number): number {	×
9	// ArcGIS fov is corner-to-corner	×
10	const D = Math.sqrt(1 + aspectRatio ** 2);	×
11	const halfFOV = (fov / 2 / 180) * Math.PI;	×
12	return D / 2 / Math.tan(halfFOV);	×
13	}	×
14		1✔
15	export default function createDeckRenderer(DeckProps, externalRenderers) {	1✔
16	class DeckRenderer {	1✔
17	view: SceneView;	1✔
18	deck: any;	1✔
19	resources: RenderResources \| null = null;	1✔
20	cancelInitialization: (() => void) \| null = null;	1✔
21		1✔
22	constructor(view: SceneView, props: DeckProps) {	1✔
23	this.view = view;	×
24	this.deck = new DeckProps(props);	×
25	}	×
26		1✔
27	async setup(context) {	1✔
28	const gl = context.gl;	×
NEW 29		×
NEW 30	let cancelled = false;	×
NEW 31	this.cancelInitialization = () => (cancelled = true);	×
NEW 32	const resources = await initializeResources.call(this, gl);	×
NEW 33	// If the renderer got disposed while awaiting, do not proceed	×
NEW 34	if (cancelled) {	×
NEW 35	finalizeResources(resources);	×
NEW 36	return;	×
NEW 37	}	×
38		×
39	this.deck.on('change', props => resources.deck.setProps(props));	×
40		×
41	resources.deck.setProps(this.deck.toJSON());	×
42	this.resources = resources;	×
43	}	×
44		1✔
45	dispose() {	1✔
NEW 46	this.cancelInitialization?.();	×
47	if (this.resources) {	×
48	finalizeResources(this.resources);	×
49	}	×
50	}	×
51		1✔
52	redraw() {	1✔
53	externalRenderers.requestRender(this.view);	×
54	}	×
55		1✔
56	render() {	1✔
57	const [width, height] = this.view.size;	×
58		×
59	render(this.resources!, {	×
60	width,	×
61	height,	×
62	latitude: this.view.center.latitude,	×
63	longitude: this.view.center.longitude,	×
64	altitude: arcgisFOVToDeckAltitude(this.view.camera.fov, width / height),	×
65	zoom: this.view.zoom,	×
66	bearing: this.view.camera.heading,	×
67	pitch: this.view.camera.tilt	×
68	});	×
69	}	×
70	}	1✔
71		1✔
72	return DeckRenderer;	1✔
73	}	1✔

visgl / deck.gl / 8549900043

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