10635241580

Committed 30 Aug 2024 03:26PM UTC coverage: 86.966% (-2.8%) from 89.766%

Build # 10635241580

Build Type

push

github

Committed by

jailln

Commit Message

feat(3dtiles): add new OGC3DTilesLayer using 3d-tiles-renderer-js

Deprecate C3DTilesLayer (replaced by OGC3DTilesLayer).
Add new iGLTFLoader that loads gltf 1.0 and 2.0 files.

Run Details

2791 of 3694 branches covered (75.55%)

Branch coverage included in aggregate %.

480 of 644 new or added lines in 8 files covered. (74.53%)

2144 existing lines in 111 files now uncovered.

24319 of 27479 relevant lines covered (88.5%)

1024.72 hits per line

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

65.69

/src/Process/FeatureProcessing.js

import LayerUpdateState from 'Layer/LayerUpdateState';
import ObjectRemovalHelper from 'Process/ObjectRemovalHelper';
import handlingError from 'Process/handlerNodeError';
import Coordinates from 'Core/Geographic/Coordinates';
import { geoidLayerIsVisible } from 'Layer/GeoidLayer';

const coord = new Coordinates('EPSG:4326', 0, 0, 0);

export default {
    update(context, layer, node) {
        if (!node.parent && node.children.length) {
            // if node has been removed dispose three.js resource
            ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, node);
            return;
        }
        if (!node.visible) {
            return;
        }

        if (node.layerUpdateState[layer.id] === undefined) {
            node.layerUpdateState[layer.id] = new LayerUpdateState();
        } else if (!node.layerUpdateState[layer.id].canTryUpdate()) {
            // toggle visibility features
            node.link[layer.id]?.forEach((f) => {
                f.layer.object3d.add(f);
                f.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
                f.meshes.updateMatrixWorld();
            });
            return;
        }

        const extentsDestination = node.getExtentsByProjection(layer.source.crs) || [node.extent];

        const zoomDest = extentsDestination[0].zoom;

        // check if it's tile level is equal to display level layer.
        // TO DO updata at all level asked
        // if ((zoomDest < layer.zoom.min && zoomDest > layer.zoom.max) ||
        if (zoomDest != layer.zoom.min ||
        // check if there's data in extent tile.
            !this.source.extentInsideLimit(node.extent, zoomDest) ||
        // In FileSource case, check if the feature center is in extent tile.
            (layer.source.isFileSource && !node.extent.isPointInside(layer.source.extent.center(coord)))) {
        // if not, there's not data to add at this tile.
            node.layerUpdateState[layer.id].noMoreUpdatePossible();
            return;
        }

        node.layerUpdateState[layer.id].newTry();

        const command = {
            layer,
            extentsSource: extentsDestination,
            view: context.view,
            requester: node,
        };

        return context.scheduler.execute(command).then((featureMeshes) => {
            node.layerUpdateState[layer.id].noMoreUpdatePossible();

            featureMeshes.forEach((featureMesh) => {
                if (featureMesh) {
                    node.link[layer.id] = node.link[layer.id] || [];
                    featureMesh.as(context.view.referenceCrs);
                    featureMesh.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
                    featureMesh.updateMatrixWorld();

                    if (layer.onMeshCreated) {
                        layer.onMeshCreated(featureMesh, context);
                    }

                    if (!node.parent) {
                        // TODO: Clean cache needs a refactory, because it isn't really efficient and used
                        ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, featureMesh);
                    } else {
                        layer.object3d.add(featureMesh);
                        node.link[layer.id].push(featureMesh);
                    }
                    featureMesh.layer = layer;
                } else {
                    // TODO: verify if it's possible the featureMesh is undefined.
                    node.layerUpdateState[layer.id].failure(1, true);
                }
            });
        },
        err => handlingError(err, node, layer, node.level, context.view));
    },
};

1	import LayerUpdateState from 'Layer/LayerUpdateState';	1✔
2	import ObjectRemovalHelper from 'Process/ObjectRemovalHelper';	1✔
3	import handlingError from 'Process/handlerNodeError';	1✔
4	import Coordinates from 'Core/Geographic/Coordinates';	1✔
5	import { geoidLayerIsVisible } from 'Layer/GeoidLayer';	1✔
6		1✔
7	const coord = new Coordinates('EPSG:4326', 0, 0, 0);	1✔
8		1✔
9	export default {	1✔
10	update(context, layer, node) {	1✔
11	if (!node.parent && node.children.length) {	10!
UNCOV 12	// if node has been removed dispose three.js resource	×
13	ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, node);	×
UNCOV 14	return;	×
UNCOV 15	}	×
16	if (!node.visible) {	10!
UNCOV 17	return;	×
UNCOV 18	}	×
19		10✔
20	if (node.layerUpdateState[layer.id] === undefined) {	10✔
21	node.layerUpdateState[layer.id] = new LayerUpdateState();	10✔
22	} else if (!node.layerUpdateState[layer.id].canTryUpdate()) {	10!
23	// toggle visibility features	×
24	node.link[layer.id]?.forEach((f) => {	×
25	f.layer.object3d.add(f);	×
UNCOV 26	f.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;	×
UNCOV 27	f.meshes.updateMatrixWorld();	×
UNCOV 28	});	×
UNCOV 29	return;	×
UNCOV 30	}	×
31		10✔
32	const extentsDestination = node.getExtentsByProjection(layer.source.crs) \|\| [node.extent];	10!
33		10✔
34	const zoomDest = extentsDestination[0].zoom;	10✔
35		10✔
36	// check if it's tile level is equal to display level layer.	10✔
37	// TO DO updata at all level asked	10✔
38	// if ((zoomDest < layer.zoom.min && zoomDest > layer.zoom.max) \|\|	10✔
39	if (zoomDest != layer.zoom.min \|\|	10✔
40	// check if there's data in extent tile.	10✔
41	!this.source.extentInsideLimit(node.extent, zoomDest) \|\|	10✔
42	// In FileSource case, check if the feature center is in extent tile.	10✔
43	(layer.source.isFileSource && !node.extent.isPointInside(layer.source.extent.center(coord)))) {	10!
UNCOV 44	// if not, there's not data to add at this tile.	×
UNCOV 45	node.layerUpdateState[layer.id].noMoreUpdatePossible();	×
UNCOV 46	return;	×
UNCOV 47	}	×
48		10✔
49	node.layerUpdateState[layer.id].newTry();	10✔
50		10✔
51	const command = {	10✔
52	layer,	10✔
53	extentsSource: extentsDestination,	10✔
54	view: context.view,	10✔
55	requester: node,	10✔
56	};	10✔
57		10✔
58	return context.scheduler.execute(command).then((featureMeshes) => {	10✔
59	node.layerUpdateState[layer.id].noMoreUpdatePossible();	8✔
60		8✔
61	featureMeshes.forEach((featureMesh) => {	8✔
62	if (featureMesh) {	8✔
63	node.link[layer.id] = node.link[layer.id] \|\| [];	8✔
64	featureMesh.as(context.view.referenceCrs);	8✔
65	featureMesh.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;	8!
66	featureMesh.updateMatrixWorld();	8✔
67		8✔
68	if (layer.onMeshCreated) {	8!
UNCOV 69	layer.onMeshCreated(featureMesh, context);	×
UNCOV 70	}	×
71		8✔
72	if (!node.parent) {	8!
UNCOV 73	// TODO: Clean cache needs a refactory, because it isn't really efficient and used	×
UNCOV 74	ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, featureMesh);	×
75	} else {	8✔
76	layer.object3d.add(featureMesh);	8✔
77	node.link[layer.id].push(featureMesh);	8✔
78	}	8✔
79	featureMesh.layer = layer;	8✔
80	} else {	8!
UNCOV 81	// TODO: verify if it's possible the featureMesh is undefined.	×
UNCOV 82	node.layerUpdateState[layer.id].failure(1, true);	×
UNCOV 83	}	×
84	});	8✔
85	},	10✔
86	err => handlingError(err, node, layer, node.level, context.view));	10✔
87	},	10✔
88	};	1✔

iTowns / itowns / 10635241580

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