fix(ElevationReader): Apply uniform reader API

BREAKING CHANGE: ElevationReader: Add option for network calls and add parseAsText method
Kitware · Feb 7, 2018 · fa37a72 · fa37a72
1 parent 0d5a5d5
commit fa37a72
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 31 deletions.
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -25,7 +25,8 @@ Add more consistency in Readers
 - Affected readers:
   - STLReader
   - Legacy/PolyDataReader
-
+  - ElevationReader 
+
 
 ## From 4.x to 5
 

diff --git a/Sources/IO/Misc/ElevationReader/index.js b/Sources/IO/Misc/ElevationReader/index.js
@@ -18,45 +18,35 @@ function vtkElevationReader(publicAPI, model) {
   }
 
   // Internal method to fetch Array
-  function fetchCSV(url) {
-    return model.dataAccessHelper.fetchText(publicAPI, url);
+  function fetchCSV(url, options) {
+    return model.dataAccessHelper.fetchText(publicAPI, url, options);
   }
 
   // Set DataSet url
-  publicAPI.setUrl = (url) => {
-    if (url.indexOf('.csv') === -1) {
-      model.baseURL = url;
-      model.url = `${url}/index.csv`;
-    } else {
-      model.url = url;
-
-      // Remove the file in the URL
-      const path = url.split('/');
-      path.pop();
-      model.baseURL = path.join('/');
-    }
+  publicAPI.setUrl = (url, options) => {
+    model.url = url;
 
     // Fetch metadata
-    return publicAPI.loadData();
+    return publicAPI.loadData(options);
   };
 
   // Fetch the actual data arrays
-  publicAPI.loadData = () => {
-    const promise = fetchCSV(model.url);
+  publicAPI.loadData = (options) =>
+    fetchCSV(model.url, options).then((csv) => {
+      publicAPI.parseAsText(csv);
+      return true;
+    });
 
-    promise.then((csv) => {
-      model.csv = csv;
-      model.elevation = [];
+  publicAPI.parseAsText = (csv) => {
+    model.csv = csv;
+    model.elevation = [];
 
-      // Parse data
-      const lines = model.csv.split('\n');
-      lines.forEach((line, lineIdx) => {
-        model.elevation.push(line.split(',').map((str) => Number(str)));
-      });
-      publicAPI.modified();
+    // Parse data
+    const lines = model.csv.split('\n');
+    lines.forEach((line, lineIdx) => {
+      model.elevation.push(line.split(',').map((str) => Number(str)));
     });
-
-    return promise;
+    publicAPI.modified();
   };
 
   publicAPI.requestData = (inData, outData) => {
@@ -135,7 +125,6 @@ const DEFAULT_VALUES = {
   xDirection: 1,
   yDirection: -1,
   requestCount: 0,
-  // baseURL: null,
   // dataAccessHelper: null,
   // url: null,
 };
@@ -147,7 +136,7 @@ export function extend(publicAPI, model, initialValues = {}) {
 
   // Build VTK API
   macro.obj(publicAPI, model);
-  macro.get(publicAPI, model, ['url', 'baseURL']);
+  macro.get(publicAPI, model, ['url']);
   macro.setGet(publicAPI, model, [
     'dataAccessHelper',
     'xSpacing',