Fix default constraints, validation of center for the Circle

MV88 · MV88 · commit 86154e669279 · 2018-06-15T17:38:03.000+02:00
diff --git a/web/client/components/mapcontrols/annotations/CoordinatesRow.jsx b/web/client/components/mapcontrols/annotations/CoordinatesRow.jsx
@@ -58,38 +58,6 @@ class CoordinatesRowComponent extends React.Component {
                                     min: -180,
                                     max: 180
                                 }
-                            },
-                            aeronautical: {
-                                lat: {
-                                    degree: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    minutes: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    seconds: {
-                                        min: 0,
-                                        max: 60,
-                                        precision: 3
-                                    }
-                                },
-                                lon: {
-                                    degree: {
-                                        min: 0,
-                                        max: 180
-                                    },
-                                    minutes: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    seconds: {
-                                        min: 0,
-                                        max: 60,
-                                        precision: 3
-                                    }
-                                }
                             }
                         }}
                     />
@@ -111,38 +79,6 @@ class CoordinatesRowComponent extends React.Component {
                                     min: -180,
                                     max: 180
                                 }
-                            },
-                            aeronautical: {
-                                lat: {
-                                    degree: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    minutes: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    seconds: {
-                                        min: 0,
-                                        max: 60,
-                                        precision: 3
-                                    }
-                                },
-                                lon: {
-                                    degree: {
-                                        min: 0,
-                                        max: 180
-                                    },
-                                    minutes: {
-                                        min: 0,
-                                        max: 60
-                                    },
-                                    seconds: {
-                                        min: 0,
-                                        max: 60,
-                                        precision: 3
-                                    }
-                                }
                             }
                         }}
                     />
diff --git a/web/client/components/mapcontrols/annotations/editors/DecimalCoordinateEditor.jsx b/web/client/components/mapcontrols/annotations/editors/DecimalCoordinateEditor.jsx
@@ -29,38 +29,6 @@ class DecimalCoordinateEditor extends React.Component {
                     min: -180,
                     max: 180
                 }
-            },
-            aeronautical: {
-                lat: {
-                    degree: {
-                        min: 0,
-                        max: 60
-                    },
-                    minutes: {
-                        min: 0,
-                        max: 60
-                    },
-                    seconds: {
-                        min: 0,
-                        max: 60,
-                        precision: 3
-                    }
-                },
-                lon: {
-                    degree: {
-                        min: 0,
-                        max: 180
-                    },
-                    minutes: {
-                        min: 0,
-                        max: 60
-                    },
-                    seconds: {
-                        min: 0,
-                        max: 60,
-                        precision: 3
-                    }
-                }
             }
         }
     }
diff --git a/web/client/reducers/annotations.js b/web/client/reducers/annotations.js
@@ -89,7 +89,7 @@ function annotations(state = { validationErrors: {} }, action) {
                 let centerOL;
                 let c = [[[]]];
                 // polygonGeom setting
-                if ([selected.properties.center].filter(validateCoordsArray).length) {
+                if (validateCoordsArray(selected.properties.center)) {
                     centerOL = reproject(selected.properties.center, "EPSG:4326", "EPSG:3857");
                     c = ol.geom.Polygon.fromCircle(new ol.geom.Circle([centerOL.x, centerOL.y], radius), 100).getCoordinates();
                 } else {
