#9937 - Fix: Circle radius is modified when saving the annotation (#9938

)
geosolutions-it · Jan 31, 2024 · 1dfbf08 · 1dfbf08
1 parent 4cf4769
commit 1dfbf08
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 1 deletion.
diff --git a/web/client/components/map/openlayers/Feature.jsx b/web/client/components/map/openlayers/Feature.jsx
@@ -89,7 +89,7 @@ export default class Feature extends React.Component {
             });
             this._feature.map(f => {
                 let newF = f;
-                if (f.getProperties().isCircle) {
+                if (f.getProperties().isCircle && !f.getProperties().isGeodesic) {
                     newF = transformPolygonToCircle(f, props.crs || 'EPSG:3857', props.featuresCrs);
                     newF.setGeometry(newF.getGeometry().transform(props.crs || 'EPSG:3857', props.featuresCrs));
                 }

diff --git a/web/client/components/map/openlayers/__tests__/Feature-test.jsx b/web/client/components/map/openlayers/__tests__/Feature-test.jsx
@@ -120,6 +120,92 @@ describe('Test Feature', () => {
         count = container.getSource().getFeatures().length;
         expect(count).toBe(0);
     });
+    it('adding a feature of type circle and geodesic', () => {
+        let options = {
+            crs: 'EPSG:4326',
+            features: {
+                type: 'FeatureCollection',
+                crs: {
+                    'type': 'name',
+                    'properties': {
+                        'name': 'EPSG:4326'
+                    }
+                },
+                features: [
+                    {
+                        type: 'Feature',
+                        geometry: {
+                            type: 'Polygon',
+                            coordinates: [[
+                                [13, 43],
+                                [15, 43],
+                                [15, 44],
+                                [13, 44]
+                            ]]
+                        },
+                        properties: {
+                            'name': "some name",
+                            isGeodesic: true,
+                            isCircle: true,
+                            radius: 1000,
+                            center: [13, 43]
+                        }
+                    }
+                ]
+            }
+        };
+        let source = new VectorSource({
+            features: []
+        });
+        const msId = "some value";
+        let container = new VectorLayer({
+            msId,
+            source: source,
+            visible: true,
+            zIndex: 1
+        });
+        const geometry = options.features.features[0].geometry;
+        const type = options.features.features[0].type;
+        let properties = {...options.features.features[0].properties, isGeodesic: false};
+
+        // create layers with feature visible
+        let layer = ReactDOM.render(
+            <Feature
+                options={options}
+                geometry={geometry}
+                type={type}
+                properties={properties}
+                msId={msId}
+                container={container}
+                featuresCrs={"EPSG:4326"}
+                crs={"EPSG:3857"}
+            />, document.getElementById("container"));
+
+        expect(layer).toBeTruthy();
+        // count layers
+        let [feature] = container.getSource().getFeatures();
+        expect(feature).toBeTruthy();
+        expect(feature.getGeometry().getType()).toBe('Circle');
+
+        properties = options.features.features[0].properties;
+        layer = ReactDOM.render(
+            <Feature
+                options={options}
+                geometry={geometry}
+                type={type}
+                properties={properties}
+                msId={msId}
+                container={container}
+                featuresCrs={"EPSG:4326"}
+                crs={"EPSG:3857"}
+            />, document.getElementById("container"));
+
+        expect(layer).toExist();
+
+        [feature] = container.getSource().getFeatures();
+        expect(feature).toBeTruthy();
+        expect(feature.getGeometry().getType()).toBe('Polygon');
+    });
     it('adding a feature without a geometry', () => {
         var options = {
             crs: 'EPSG:4326',