Fix geosolutions-it#81 and text changes from form

MV88 · Jun 25, 2018 · b603dfc · b603dfc
1 parent f644e05
commit b603dfc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/web/client/components/mapcontrols/annotations/CoordinatesEditor.jsx b/web/client/components/mapcontrols/annotations/CoordinatesEditor.jsx
@@ -207,7 +207,7 @@ class CoordinateEditor extends React.Component {
                     </Col>
                     <Col xs={1}/>
                 </Row>
-                <Row style={{flex: 1, overflowY: 'auto'}}>
+                <Row style={{flex: 1, overflowY: 'auto', overflowX: 'hidden'}}>
                     {this.props.components.map((component, idx) => <CoordinatesRow
                         format={this.props.format}
                         sortId={idx}

diff --git a/web/client/components/mapcontrols/annotations/CoordinatesRow.jsx b/web/client/components/mapcontrols/annotations/CoordinatesRow.jsx
@@ -27,8 +27,9 @@ class CoordinatesRowComponent extends React.Component {
 
     render() {
         const {idx} = this.props;
+        const rowStyle =/* this.props.type === "LineString" || "Polygon" ? { marginLeft: -5, marginRight: -5} :*/ {marginLeft: -5, marginRight: -5};
         return (
-            <Row style={{marginLeft: 0, marginRight: 0}} onMouseEnter={() => {
+            <Row className="coordinateRow" style={rowStyle} onMouseEnter={() => {
                 this.props.onMouseEnter(this.props.component);
             }} onMouseLeave={this.props.onMouseLeave}>
                 <Col xs={1}>

diff --git a/web/client/epics/annotations.js b/web/client/epics/annotations.js
@@ -479,6 +479,10 @@ module.exports = (viewer) => ({
                 } else {
                     feature = set(`features[${selectedIndex}]`, selected, feature);
                 }
+            } else {
+                if (selectedIndex !== -1) {
+                    feature = set(`features`, feature.features.filter((f, i) => i !== selectedIndex ), feature);
+                }
             }
             const action = changeDrawingStatus("drawOrEdit", "Text", "annotations", [feature], {
                 featureProjection: "EPSG:4326",

diff --git a/web/client/themes/default/less/annotations.less b/web/client/themes/default/less/annotations.less
@@ -42,6 +42,10 @@
 #mapstore-annotations-panel {
     margin-bottom: 0;
 }
+#mapstore-annotations-panel .items-list.row {
+    margin-left: 0px;
+    margin-right: 0px;
+}
 
 
 .mapstore-side-card:hover {
@@ -273,6 +277,8 @@
 
 
         .msSideGrid {
+            height: ~'calc(100% - 161px)';
+            overflow: auto;
             margin: 0 30px;
             .mapstore-side-preview {
                 display: flex;