Modified wfsquery epic structure

geosolutions-it · Apr 28, 2017 · c90c628 · c90c628
1 parent fef5734
commit c90c628
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/web/client/epics/wfsquery.js b/web/client/epics/wfsquery.js
@@ -7,9 +7,9 @@
  */
 
 const Rx = require('rxjs');
+const axios = require('../libs/ajax');
 const {changeSpatialAttribute} = require('../actions/queryform');
 const {FEATURE_TYPE_SELECTED, featureTypeLoaded, featureTypeError} = require('../actions/wfsquery');
-const axios = require('../libs/ajax');
 
 const types = {
     'xsd:string': 'string',
@@ -51,27 +51,27 @@ const extractInfo = (data) => {
     };
 };
 
-const addGeometryFieldEpic = action$ =>
+const featureTypeSelectedEpic = action$ =>
     action$.ofType(FEATURE_TYPE_SELECTED).switchMap(action => {
         return Rx.Observable.defer( () =>
             axios.get(action.url + '?service=WFS&version=1.1.0&request=DescribeFeatureType&typeName=' + action.typeName + '&outputFormat=application/json'))
         .map((response) => {
             if (typeof response.data === 'object' && response.data.featureTypes && response.data.featureTypes[0]) {
                 const info = extractInfo(response.data);
                 const geometry = info.geometry[0] && info.geometry[0].attribute ? info.geometry[0].attribute : 'the_geom';
-                return [featureTypeLoaded(action.typeName, info), changeSpatialAttribute(geometry)];
+                return Rx.Observable.from([featureTypeLoaded(action.typeName, info), changeSpatialAttribute(geometry)]);
             }
             try {
                 JSON.parse(response.data);
             } catch(e) {
-                return [featureTypeError(action.typeName, 'Error from WFS: ' + e.message)];
+                return Rx.Observable.from([featureTypeError(action.typeName, 'Error from WFS: ' + e.message)]);
             }
-            return [featureTypeError(action.typeName, 'Error: feature types are empty')];
+            return Rx.Observable.from([featureTypeError(action.typeName, 'Error: feature types are empty')]);
         })
         .mergeAll()
         .catch(e => Rx.Observable.of(featureTypeError(action.typeName, e.message)));
     });
 
 module.exports = {
-    addGeometryFieldEpic
+    featureTypeSelectedEpic
 };
diff --git a/web/client/plugins/QueryPanel.jsx b/web/client/plugins/QueryPanel.jsx
@@ -24,7 +24,7 @@ const LayersUtils = require('../utils/LayersUtils');
 // include application component
 const QueryBuilder = require('../components/data/query/QueryBuilder');
 
-const {addGeometryFieldEpic} = require('../epics/wfsquery');
+const {featureTypeSelectedEpic} = require('../epics/wfsquery');
 
 const {bindActionCreators} = require('redux');
 const {
@@ -237,5 +237,5 @@ module.exports = {
         queryform: require('../reducers/queryform'),
         query: require('../reducers/query')
     },
-    epics: {addGeometryFieldEpic}
+    epics: {featureTypeSelectedEpic}
 };