fix(PDBReader): Apply uniform reader API

BREAKING CHANGE: PDBReader: parseText => parseAsText
Kitware · Feb 7, 2018 · d0329a4 · d0329a4
1 parent a89299e
commit d0329a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -29,6 +29,7 @@ Add more consistency in Readers
   - ElevationReader 
   - MTLReader
   - OBJReader
+  - PDBReader
 
 
 ## From 4.x to 5

diff --git a/Sources/IO/Misc/PDBReader/index.js b/Sources/IO/Misc/PDBReader/index.js
@@ -18,16 +18,12 @@ function vtkPDBReader(publicAPI, model) {
   }
 
   // Internal method to fetch Array
-  function fetchPDB(url) {
-    const { compression, progressCallback } = model;
-    return model.dataAccessHelper.fetchText(publicAPI, url, {
-      compression,
-      progressCallback,
-    });
+  function fetchPDB(url, option) {
+    return model.dataAccessHelper.fetchText(publicAPI, url, option);
   }
 
   // Set DataSet url
-  publicAPI.setUrl = (url) => {
+  publicAPI.setUrl = (url, option) => {
     if (url.indexOf('.pdb') === -1) {
       model.baseURL = url;
       model.url = `${url}`; // `${url}/index.pdb`;
@@ -41,13 +37,14 @@ function vtkPDBReader(publicAPI, model) {
     }
 
     // Fetch metadata
-    return publicAPI.loadData();
+    return publicAPI.loadData(option);
   };
 
   // Fetch the actual data arrays
-  publicAPI.loadData = () => fetchPDB(model.url).then(publicAPI.parseText);
+  publicAPI.loadData = (option) =>
+    fetchPDB(model.url, option).then(publicAPI.parseAsText);
 
-  publicAPI.parseText = (txt) => {
+  publicAPI.parseAsText = (txt) => {
     model.pdb = txt;
     model.molecule = [];
     model.molecule = model.pdb.split('\n');
@@ -183,14 +180,6 @@ export function extend(publicAPI, model, initialValues = {}) {
 
   // Object methods
   vtkPDBReader(publicAPI, model);
-
-  // To support destructuring
-  if (!model.compression) {
-    model.compression = null;
-  }
-  if (!model.progressCallback) {
-    model.progressCallback = null;
-  }
 }
 
 // ----------------------------------------------------------------------------