13895235737

Committed 17 Mar 2025 08:50AM UTC coverage: 76.969% (+1.7%) from 75.281%

Build # 13895235737

Build Type

push

github

Committed by

web-flow

Commit Message

#10918: Fix issue with measure tool in Cesium map (#10933) (#10939)

(cherry picked from commit 796b1e14d)

Run Details

30986 of 48211 branches covered (64.27%)

0 of 3 new or added lines in 1 file covered. (0.0%)

3 existing lines in 2 files now uncovered.

38496 of 50015 relevant lines covered (76.97%)

35.76 hits per line

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

12.0

/web/client/plugins/Annotations/containers/AnnotationsMapInteractionsSupport.jsx

/*
 * Copyright 2023, GeoSolutions Sas.
 * All rights reserved.
 *
 * This source code is licensed under the BSD-style license found in the
 * LICENSE file in the root directory of this source tree.
 */

import React, { lazy, Suspense, useEffect, useRef } from 'react';
import { MapLibraries } from '../../../utils/MapTypeUtils';
import { validateFeature } from '../utils/AnnotationsUtils';

const drawGeometrySupportSupports = {
    [MapLibraries.OPENLAYERS]: lazy(() => import(/* webpackChunkName: 'supports/olDrawGeometrySupport' */ '../../../components/map/openlayers/DrawGeometrySupport')),
    [MapLibraries.CESIUM]: lazy(() => import(/* webpackChunkName: 'supports/cesiumDrawGeometrySupport' */ '../../../components/map/cesium/DrawGeometrySupport'))
};
const editGeoJSONSupportSupports = {
    [MapLibraries.OPENLAYERS]: lazy(() => import(/* webpackChunkName: 'supports/olEditGeoJSONSupport' */ '../../../components/map/openlayers/EditGeoJSONSupport')),
    [MapLibraries.CESIUM]: lazy(() => import(/* webpackChunkName: 'supports/cesiumEditGeoJSONSupport' */ '../../../components/map/cesium/EditGeoJSONSupport'))
};

export const areAnnotationsMapInteractionsSupported = (mapType) => {
    return drawGeometrySupportSupports[mapType] && editGeoJSONSupportSupports[mapType];
};

function AnnotationsMapInteractionsSupport({
    map,
    active,
    mapType,
    feature,
    geodesic = {},
    onChange = () => {}
}) {

    const getGeometryType = ({ properties } = {}) => properties?.annotationType === 'Text' ? 'Point' : properties?.annotationType;
    const getDrawGeometryType = ({ geometry, properties } = {}) => properties?.annotationType === 'Text'
    || (properties?.radius > 0 && !geometry) ? 'Point' : properties?.annotationType;

    if (!areAnnotationsMapInteractionsSupported(mapType)) {
        return null;
    }
    const DrawGeometrySupport = drawGeometrySupportSupports[mapType];
    const EditFeatureSupport = editGeoJSONSupportSupports[mapType];
    const isFeatureGeometryValid = validateFeature(feature, true);
    const selectedAnnotationType = getGeometryType(feature);
    const drawGeometryType = getDrawGeometryType(feature);
    const isGeodesic = !!geodesic[selectedAnnotationType];

    const featureRef = useRef(feature);
    useEffect(() => {
        // to avoid stale closure in the callback
        featureRef.current = feature;
    }, [feature]);

    return (
        <Suspense fallback={null}>
            <>
                <DrawGeometrySupport
                    map={map}
                    active={active && feature.geometry === null}
                    depthTestAgainstTerrain={false}
                    geometryType={drawGeometryType}
                    geodesic={isGeodesic}
                    getObjectsToExcludeOnPick={() => []}
                    onDrawEnd={({ feature: newFeature }) => {
                        onChange({
                            ...featureRef.current,
                            properties: {
                                ...featureRef.current?.properties,
                                geodesic: isGeodesic,
                                ...(newFeature?.properties?.radius !== undefined && {
                                    radius: newFeature?.properties?.radius
                                })
                            },
                            geometry: newFeature.geometry
                        });
                    }}
                />
                <EditFeatureSupport
                    map={map}
                    active={active && isFeatureGeometryValid}
                    geojson={feature}
                    getGeometryType={getGeometryType}
                    onEditEnd={newFeature => onChange(newFeature)}
                />
            </>
        </Suspense>
    );
}

export default AnnotationsMapInteractionsSupport;

1	/*
2	* Copyright 2023, GeoSolutions Sas.
3	* All rights reserved.
4	*
5	* This source code is licensed under the BSD-style license found in the
6	* LICENSE file in the root directory of this source tree.
7	*/
8
9	import React, { lazy, Suspense, useEffect, useRef } from 'react';
10	import { MapLibraries } from '../../../utils/MapTypeUtils';
11	import { validateFeature } from '../utils/AnnotationsUtils';
12
13	const drawGeometrySupportSupports = {	1✔
14	[MapLibraries.OPENLAYERS]: lazy(() => import(/* webpackChunkName: 'supports/olDrawGeometrySupport' */ '../../../components/map/openlayers/DrawGeometrySupport')),	×
15	[MapLibraries.CESIUM]: lazy(() => import(/* webpackChunkName: 'supports/cesiumDrawGeometrySupport' */ '../../../components/map/cesium/DrawGeometrySupport'))	×
16	};
17	const editGeoJSONSupportSupports = {	1✔
18	[MapLibraries.OPENLAYERS]: lazy(() => import(/* webpackChunkName: 'supports/olEditGeoJSONSupport' */ '../../../components/map/openlayers/EditGeoJSONSupport')),	×
19	[MapLibraries.CESIUM]: lazy(() => import(/* webpackChunkName: 'supports/cesiumEditGeoJSONSupport' */ '../../../components/map/cesium/EditGeoJSONSupport'))	×
20	};
21
22	export const areAnnotationsMapInteractionsSupported = (mapType) => {	1✔
23	return drawGeometrySupportSupports[mapType] && editGeoJSONSupportSupports[mapType];	×
24	};
25
26	function AnnotationsMapInteractionsSupport({
27	map,
28	active,
29	mapType,
30	feature,
31	geodesic = {},	×
32	onChange = () => {}	×
33	}) {
34
35	const getGeometryType = ({ properties } = {}) => properties?.annotationType === 'Text' ? 'Point' : properties?.annotationType;	×
36	const getDrawGeometryType = ({ geometry, properties } = {}) => properties?.annotationType === 'Text'	×
37	\|\| (properties?.radius > 0 && !geometry) ? 'Point' : properties?.annotationType;
38
39	if (!areAnnotationsMapInteractionsSupported(mapType)) {	×
40	return null;	×
41	}
42	const DrawGeometrySupport = drawGeometrySupportSupports[mapType];	×
43	const EditFeatureSupport = editGeoJSONSupportSupports[mapType];	×
44	const isFeatureGeometryValid = validateFeature(feature, true);	×
45	const selectedAnnotationType = getGeometryType(feature);	×
46	const drawGeometryType = getDrawGeometryType(feature);	×
47	const isGeodesic = !!geodesic[selectedAnnotationType];	×
48
NEW 49	const featureRef = useRef(feature);	×
NEW 50	useEffect(() => {	×
51	// to avoid stale closure in the callback
NEW 52	featureRef.current = feature;	×
53	}, [feature]);
54
UNCOV 55	return (	×
56	<Suspense fallback={null}>
57	<>
58	<DrawGeometrySupport
59	map={map}
60	active={active && feature.geometry === null}	×
61	depthTestAgainstTerrain={false}
62	geometryType={drawGeometryType}
63	geodesic={isGeodesic}
64	getObjectsToExcludeOnPick={() => []}	×
65	onDrawEnd={({ feature: newFeature }) => {
66	onChange({	×
67	...featureRef.current,
68	properties: {
69	...featureRef.current?.properties,
70	geodesic: isGeodesic,
71	...(newFeature?.properties?.radius !== undefined && {	×
72	radius: newFeature?.properties?.radius
73	})
74	},
75	geometry: newFeature.geometry
76	});
77	}}
78	/>
79	<EditFeatureSupport
80	map={map}
81	active={active && isFeatureGeometryValid}	×
82	geojson={feature}
83	getGeometryType={getGeometryType}
84	onEditEnd={newFeature => onChange(newFeature)}	×
85	/>
86	</>
87	</Suspense>
88	);
89	}
90
91	export default AnnotationsMapInteractionsSupport;

geosolutions-it / MapStore2 / 13895235737

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