Fix support to Multiple result in serach services

geosolutions-it · Jul 14, 2017 · 51039aa · 51039aa
1 parent cff72bf
commit 51039aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/web/client/components/mapcontrols/search/SearchResult.jsx b/web/client/components/mapcontrols/search/SearchResult.jsx
@@ -45,7 +45,7 @@ let SearchResult = React.createClass({
         }
         let item = this.props.item;
         return (
-            <div key={item.osm_id} className="search-result" onClick={this.onClick}>
+            <div key={item.osm_id} className="search-result" style={item.resultCssStyle} onClick={this.onClick}>
                 <div className="icon"> <img src={item.icon} /></div>
                 <div className="text-result-title">{get(item, this.props.displayName) || generateTemplateString(this.props.displayName || "")(item) }</div>
                 <small className="text-info">{this.props.subTitle && get(item, this.props.subTitle) || generateTemplateString(this.props.subTitle || "")(item) }</small>

diff --git a/web/client/epics/search.js b/web/client/epics/search.js
@@ -93,7 +93,7 @@ const searchItemSelected = action$ =>
                     // retrieve geometry from geomService or pass the item directly
                     return Rx.Observable.fromPromise(
                         API.Utils.getService(item.__SERVICE__.geomService.type)("", assign( {}, item.__SERVICE__.geomService.options, { staticFilter } ))
-                            .then(res => assign({}, item, {geometry: res[0].geometry} ) )
+                            .then(res => assign({}, item, {geometry: CoordinatesUtils.mergeToPolyGeom(res)} ) )
                     );
                 }
                 return Rx.Observable.of(action.item);

diff --git a/web/client/utils/CoordinatesUtils.js b/web/client/utils/CoordinatesUtils.js
@@ -373,6 +373,15 @@ const CoordinatesUtils = {
 
         points[0].push(points[0][0]);
         return points;
+    },
+    mergeToPolyGeom(features) {
+        if (features.length === 1) {
+            return features[0].geometry;
+        }
+        return {
+            type: "GeometryCollection",
+            geometries: features.map( ({geometry}) => geometry)
+        };
     }
 };