geosolutions-it#10829: Fix - Issue creating Circle annotation with form radius (geosolutions-it#10845)

dsuren1 · web-flow · commit 798ec3ded6c8 · 2025-02-26T17:43:29.000+01:00
diff --git a/web/client/components/map/cesium/DrawGeometrySupport.jsx b/web/client/components/map/cesium/DrawGeometrySupport.jsx
@@ -74,7 +74,7 @@ function DrawGeometrySupport({
                 draw.current = null;
             }
         };
-    }, [map, active, geometryType, sampleTerrain, coordinatesLength, geodesic]);
+    }, [map, active, geometryType, sampleTerrain, coordinatesLength, geodesic, onDrawEnd]);
 
     return null;
 }
diff --git a/web/client/components/map/openlayers/DrawGeometrySupport.jsx b/web/client/components/map/openlayers/DrawGeometrySupport.jsx
@@ -60,7 +60,7 @@ function DrawGeometrySupport({
                 draw.current = null;
             }
         };
-    }, [map, active, geometryType, coordinatesLength, geodesic]);
+    }, [map, active, geometryType, coordinatesLength, geodesic, onDrawEnd]);
     return null;
 }
 
diff --git a/web/client/plugins/Annotations/containers/AnnotationsMapInteractionsSupport.jsx b/web/client/plugins/Annotations/containers/AnnotationsMapInteractionsSupport.jsx
@@ -33,13 +33,17 @@ function AnnotationsMapInteractionsSupport({
 }) {
 
     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];
     return (
         <Suspense fallback={null}>
@@ -48,7 +52,7 @@ function AnnotationsMapInteractionsSupport({
                     map={map}
                     active={active && feature.geometry === null}
                     depthTestAgainstTerrain={false}
-                    geometryType={selectedAnnotationType}
+                    geometryType={drawGeometryType}
                     geodesic={isGeodesic}
                     getObjectsToExcludeOnPick={() => []}
                     onDrawEnd={({ feature: newFeature }) => {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function DrawGeometrySupport({`
`74`	`74`	`draw.current = null;`
`75`	`75`	`}`
`76`	`76`	`};`
`77`		`- }, [map, active, geometryType, sampleTerrain, coordinatesLength, geodesic]);`
	`77`	`+ }, [map, active, geometryType, sampleTerrain, coordinatesLength, geodesic, onDrawEnd]);`
`78`	`78`
`79`	`79`	`return null;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ function DrawGeometrySupport({`
`60`	`60`	`draw.current = null;`
`61`	`61`	`}`
`62`	`62`	`};`
`63`		`- }, [map, active, geometryType, coordinatesLength, geodesic]);`
	`63`	`+ }, [map, active, geometryType, coordinatesLength, geodesic, onDrawEnd]);`
`64`	`64`	`return null;`
`65`	`65`	`}`
`66`	`66`