Merge pull request #316 from onaio/handle-geo-points-from-superset

Handle geo points from superset
onaio · Jul 23, 2019 · 33c4563 · 33c4563
2 parents 18d93d7 + 87c1aad
commit 33c4563
Show file tree

Hide file tree

Showing 4 changed files with 2,415 additions and 2,405 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.3",
-    "@onaio/superset-connector": "^0.0.9",
+    "@onaio/superset-connector": "^0.0.13",
     "babel-core": "v6.25.0",
     "babel-loader": "^7.1.2",
     "babel-polyfill": "^6.26.0",

diff --git a/src/map/prepareLayer.js b/src/map/prepareLayer.js
@@ -285,7 +285,18 @@ function readData(mapId, layer, dispatch, doUpdateTsLayer) {
       res => res,
     ) // pass in callback func to process response
       .then((data) => {
-        layerObj.source.data = superset.processData(data); // assign processed data to layerObj
+        const processedData = superset.processData(data);
+        let parsedData;
+        if (layerObj.source.type === 'geojson') {
+          parsedData = csvToGEOjson(layerObj, processedData);
+        } else {
+          parsedData = [...processedData];
+        }
+
+        layerObj.source.data = Array.isArray(parsedData)
+          ? [...parsedData]
+          : { ...parsedData };
+
         if (layerObj.aggregate && layerObj.aggregate.type) {
           layerObj.source.data = aggregateFormData(layerObj);
         }