Fix #2709 minor fixes to annotations and measure tool (#2710)

geosolutions-it · Mar 7, 2018 · 82e6ec2 · 82e6ec2
1 parent 45cad05
commit 82e6ec2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx b/web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx
@@ -239,7 +239,12 @@ class AnnotationsEditor extends React.Component {
                             visible: true,
                             onClick: () => {
                                 if (this.props.unsavedChanges) {
-                                    this.props.onToggleUnsavedChangesModal();
+                                    const errors = this.validate();
+                                    if (Object.keys(errors).length === 0) {
+                                        this.props.onToggleUnsavedChangesModal();
+                                    } else {
+                                        this.props.onError(errors);
+                                    }
                                 } else {
                                     this.cancelEdit();
                                 }}

diff --git a/web/client/components/style/TextStyler.jsx b/web/client/components/style/TextStyler.jsx
@@ -43,7 +43,7 @@ class TextStyler extends React.Component {
         uomValues: [{value: "px"}, {value: "em"}],
         fontWeightValues: [{value: "normal"}, {value: "bold"}],
         alignValues: [{value: "start"}, {value: "center"}, {value: "end"}],
-        fontStyleValues: [{value: "start"}, {value: "center"}, {value: "end"}],
+        fontStyleValues: [{value: "normal"}, {value: "italic"}],
         fontFamilyValues: [{value: "Arial"}, {value: "FontAwesome"}, {value: "Courier"}],
         shapeStyle: {},
         setStyleParameter: () => {}

diff --git a/web/client/reducers/measurement.js b/web/client/reducers/measurement.js
@@ -86,7 +86,8 @@ function measurement(state = defaultState, action) {
                     lineMeasureEnabled: false,
                     areaMeasureEnabled: false,
                     bearingMeasureEnabled: false,
-                    feature: {}
+                    feature: {},
+                    geomType: ""
                 };
             }
         }
@@ -99,7 +100,8 @@ function measurement(state = defaultState, action) {
             lineMeasureEnabled: false,
             areaMeasureEnabled: false,
             bearingMeasureEnabled: false,
-            feature: {}
+            feature: {},
+            geomType: ""
         };
     }
     default: