Add Draw Support for spatial filter for #1104

- Improves the style of the contained components (spatial filter details) - Allows drawing for query form.
geosolutions-it · Dec 13, 2016 · 4437456 · 4437456
1 parent 7c110f9
commit 4437456
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/web/client/components/TOC/DefaultLayer.jsx b/web/client/components/TOC/DefaultLayer.jsx
@@ -126,6 +126,7 @@ var DefaultLayer = React.createClass({
                 <LayersTool key="toolquery"
                         tooltip="toc.searchFeatures"
                         className="toc-queryTool"
+                        node={this.props.node}
                         ref="target"
                         style={{"float": "right", cursor: "pointer"}}
                         glyph="search"

diff --git a/web/client/components/data/query/queryform.css b/web/client/components/data/query/queryform.css
@@ -31,10 +31,6 @@
 /*****************************/
 /* DRAWER MENU ***************/
 /*****************************/
-#mapstore-drawermenu #queryFormPanel .querypanel {
-    height: 100%;
-    max-height: 100%;
-}
 #mapstore-drawermenu #queryFormPanel .queryFormToolbar button:disabled{
     color: gray;
 }
@@ -72,6 +68,25 @@
     margin-left: 3px;
     margin-bottom: 3px;
 }
+
+/* Spatial Selector */
+#mapstore-drawermenu #queryFormPanel .panel.details-panel {
+    width: auto;
+    height: auto;
+}
+#mapstore-drawermenu #queryFormPanel .details-panel .panel-body {
+    padding: 15px;
+}
+#mapstore-drawermenu #queryFormPanel .details-panel.panel{
+    border: 1px solid transparent;
+    border-radius: 4px;
+    -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5);
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5);
+}
+#mapstore-drawermenu #queryFormPanel .details-panel.panel-primary {
+    border-color: #078aa3;
+}
+
 /*****************************/
 /* DRAWER MENU END ***********/
 /*****************************/

diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -224,6 +224,7 @@
   "desktop": [{
       "name": "Map",
       "cfg": {
+        "tools": ["measurement", "locate", "overview", "scalebar", "draw", "highlight"],
         "toolsOptions": {
           "scalebar": {
             "leaflet": {

diff --git a/web/client/plugins/Map.jsx b/web/client/plugins/Map.jsx
@@ -150,5 +150,5 @@ const selector = createSelector(
 );
 module.exports = {
     MapPlugin: connect(selector)(MapPlugin),
-    reducers: {}
+    reducers: { draw: require('../reducers/draw') }
 };
diff --git a/web/client/plugins/drawer/drawer.css b/web/client/plugins/drawer/drawer.css
@@ -51,8 +51,8 @@
 }
 
 #mapstore-drawermenu .panel {
-    border: none !important;
-    box-shadow: none !important;
+    border: none;
+    box-shadow: none;
 }
 
 div.nav-menu {