12376179429

Committed 17 Dec 2024 03:30PM UTC coverage: 86.992% (-0.07%) from 87.065%

Build # 12376179429

Build Type

Pull #2477

github

Committed by

web-flow

Commit Message

Merge e873b26c6 into 09a016fcd

Pull Request Pull Request #2477: refactor(LayeredMaterial): migrate to TypeScript

Run Details

2785 of 3700 branches covered (75.27%)

Branch coverage included in aggregate %.

472 of 543 new or added lines in 6 files covered. (86.92%)

12 existing lines in 2 files now uncovered.

25195 of 28464 relevant lines covered (88.52%)

983.58 hits per line

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

89.66

/src/Renderer/ColorLayersOrdering.js

import { ImageryLayers } from 'Layer/Layer';

function updateLayersOrdering(geometryLayer, imageryLayers) {
    const sequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
    const cO = function cO(object) {
        if (object.material?.setSequence) {
            object.material.setSequence(sequence);
        }
    };

    for (const node of geometryLayer.level0Nodes) {
        node.traverse(cO);
    }
}

export const COLOR_LAYERS_ORDER_CHANGED = 'layers-order-changed';

/**
 * Utilitary to organize {@link ColorLayer} in a {@link View}.
 *
 * @module ColorLayersOrdering
 */
export default {
    /**
     * Moves up in the layer list. This function has no effect if the layer is
     * moved to its current index.
     *
     * @param {View} view - The view in which the layer is moved up.
     * @param {string} layerId - The ID of the layer to move.
     *
     * @example
     * itowns.ColorLayersOrdering.moveLayerUp(viewer, 'idLayerToUp');
     */
    moveLayerUp(view, layerId) {
        const imageryLayers = view.getLayers(l => l.isColorLayer);
        const layer = view.getLayerById(layerId);
        if (layer) {
            const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
            ImageryLayers.moveLayerUp(layer, imageryLayers);
            updateLayersOrdering(view.tileLayer, imageryLayers);
            view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,
                previous: { sequence: previousSequence },
                new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },
            });
            view.notifyChange(view.tileLayer);
        } else {
            throw new Error(`${layerId} isn't color layer`);
        }
    },
    /**
     * Moves down in the layer list. This function has no effect if the layer is
     * moved to its current index.
     *
     * @param {View} view - The view in which the layer is moved down.
     * @param {string} layerId - The ID of the layer to move.
     *
     * @example
     * itowns.ColorLayersOrdering.moveLayerDown(viewer, 'idLayerToDown');
     */
    moveLayerDown(view, layerId) {
        const imageryLayers = view.getLayers(l => l.isColorLayer);
        const layer = view.getLayerById(layerId);
        if (layer) {
            const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
            ImageryLayers.moveLayerDown(layer, imageryLayers);
            updateLayersOrdering(view.tileLayer, imageryLayers);
            view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,
                previous: { sequence: previousSequence },
                new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },
            });
            view.notifyChange(view.tileLayer);
        } else {
            throw new Error(`${layerId} isn't color layer`);
        }
    },
    /**
     * Moves a specific layer to a specific index in the layer list. This
     * function has no effect if the layer is moved to its current index.
     *
     * @param {View} view - The view in which the layer is moved.
     * @param {string} layerId - The ID of the layer to move.
     * @param {number} index - The index to move the layer to.
     *
     * @example
     * itowns.ColorLayersOrdering.moveLayerToIndex(viewer, 'idLayerToChangeIndex', 2);
     */
    moveLayerToIndex(view, layerId, index) {
        const imageryLayers = view.getLayers(l => l.isColorLayer);
        const layer = view.getLayerById(layerId);
        if (layer) {
            const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
            ImageryLayers.moveLayerToIndex(layer, index, imageryLayers);
            updateLayersOrdering(view.tileLayer, imageryLayers);
            view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,
                previous: { sequence: previousSequence },
                new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },
            });
            view.notifyChange(view.tileLayer);
        } else {
            throw new Error(`${layerId} isn't color layer`);
        }
    },
};

1	import { ImageryLayers } from 'Layer/Layer';	1✔
2		1✔
3	function updateLayersOrdering(geometryLayer, imageryLayers) {	3✔
4	const sequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);	3✔
5	const cO = function cO(object) {	3✔
6	if (object.material?.setSequence) {	6!
UNCOV 7	object.material.setSequence(sequence);	×
UNCOV 8	}	×
9	};	3✔
10		3✔
11	for (const node of geometryLayer.level0Nodes) {	3✔
12	node.traverse(cO);	6✔
13	}	6✔
14	}	3✔
15		1✔
16	export const COLOR_LAYERS_ORDER_CHANGED = 'layers-order-changed';	1✔
17		1✔
18	/**	1✔
19	* Utilitary to organize {@link ColorLayer} in a {@link View}.	1✔
20	*	1✔
21	* @module ColorLayersOrdering	1✔
22	*/	1✔
23	export default {	1✔
24	/**	1✔
25	* Moves up in the layer list. This function has no effect if the layer is	1✔
26	* moved to its current index.	1✔
27	*	1✔
28	* @param {View} view - The view in which the layer is moved up.	1✔
29	* @param {string} layerId - The ID of the layer to move.	1✔
30	*	1✔
31	* @example	1✔
32	* itowns.ColorLayersOrdering.moveLayerUp(viewer, 'idLayerToUp');	1✔
33	*/	1✔
34	moveLayerUp(view, layerId) {	1✔
35	const imageryLayers = view.getLayers(l => l.isColorLayer);	1✔
36	const layer = view.getLayerById(layerId);	1✔
37	if (layer) {	1✔
38	const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);	1✔
39	ImageryLayers.moveLayerUp(layer, imageryLayers);	1✔
40	updateLayersOrdering(view.tileLayer, imageryLayers);	1✔
41	view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,	1✔
42	previous: { sequence: previousSequence },	1✔
43	new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },	1✔
44	});	1✔
45	view.notifyChange(view.tileLayer);	1✔
46	} else {	1!
47	throw new Error(`${layerId} isn't color layer`);	×
48	}	×
49	},	1✔
50	/**	1✔
51	* Moves down in the layer list. This function has no effect if the layer is	1✔
52	* moved to its current index.	1✔
53	*	1✔
54	* @param {View} view - The view in which the layer is moved down.	1✔
55	* @param {string} layerId - The ID of the layer to move.	1✔
56	*	1✔
57	* @example	1✔
58	* itowns.ColorLayersOrdering.moveLayerDown(viewer, 'idLayerToDown');	1✔
59	*/	1✔
60	moveLayerDown(view, layerId) {	1✔
61	const imageryLayers = view.getLayers(l => l.isColorLayer);	1✔
62	const layer = view.getLayerById(layerId);	1✔
63	if (layer) {	1✔
64	const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);	1✔
65	ImageryLayers.moveLayerDown(layer, imageryLayers);	1✔
66	updateLayersOrdering(view.tileLayer, imageryLayers);	1✔
67	view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,	1✔
68	previous: { sequence: previousSequence },	1✔
69	new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },	1✔
70	});	1✔
71	view.notifyChange(view.tileLayer);	1✔
72	} else {	1!
73	throw new Error(`${layerId} isn't color layer`);	×
74	}	×
75	},	1✔
76	/**	1✔
77	* Moves a specific layer to a specific index in the layer list. This	1✔
78	* function has no effect if the layer is moved to its current index.	1✔
79	*	1✔
80	* @param {View} view - The view in which the layer is moved.	1✔
81	* @param {string} layerId - The ID of the layer to move.	1✔
82	* @param {number} index - The index to move the layer to.	1✔
83	*	1✔
84	* @example	1✔
85	* itowns.ColorLayersOrdering.moveLayerToIndex(viewer, 'idLayerToChangeIndex', 2);	1✔
86	*/	1✔
87	moveLayerToIndex(view, layerId, index) {	1✔
88	const imageryLayers = view.getLayers(l => l.isColorLayer);	1✔
89	const layer = view.getLayerById(layerId);	1✔
90	if (layer) {	1✔
91	const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);	1✔
92	ImageryLayers.moveLayerToIndex(layer, index, imageryLayers);	1✔
93	updateLayersOrdering(view.tileLayer, imageryLayers);	1✔
94	view.dispatchEvent({ type: COLOR_LAYERS_ORDER_CHANGED,	1✔
95	previous: { sequence: previousSequence },	1✔
96	new: { sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers) },	1✔
97	});	1✔
98	view.notifyChange(view.tileLayer);	1✔
99	} else {	1!
100	throw new Error(`${layerId} isn't color layer`);	×
101	}	×
102	},	1✔
103	};	1✔

iTowns / itowns / 12376179429

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