Merge pull request #1180 from siiky/fix/lam-1062/pdf417-parsing

LAM-1062 fix: PDF417 parsing

lib/compliance/parsepdf417.js

@@ -2,8 +2,6 @@ module.exports = {parse}
 
 const crypto = require('crypto')
 
-const _ = require('lodash/fp')
-
 const parsers = [
   require('./parsepdf417-us'),
   require('./parsepdf417-ca-bc'),
@@ -16,19 +14,13 @@ function generateUID (subfile) {
 }
 
 function parse (data) {
-  let result = null
-
-  const dataStr = data.toString()
-
-  const singleParse = parser => {
-    const r = parser.parse(dataStr)
-    if (!r) return true
-
-    result = r
-    return false
+  data = data.toString()
+  const result = parsers
+    .map(parser => parser.parse(data))
+    .find(result => !!result) || null
+  if (result) {
+    result.uid = generateUID(data)
+    result.raw = data
   }
-
-  _.forEach(singleParse, parsers)
-
-  return _.set('uid', generateUID(dataStr), result)
+  return result
 }

lib/scanner.js

@@ -194,13 +194,10 @@ const scanPDF417 = (callback, idCardStillsCallback) => {
         return result
       })
       .then(result => Promise.all([
-        result,
-        Pdf417Parser.parse(result),
+        result ? Pdf417Parser.parse(result) : null,
         saveFailedScans(tmpdirs)
       ]))
-      .then(([result, parsed, _]) => {
-        parsed = parsed || null
-        if (parsed) parsed.raw = result.toString()
+      .then(([parsed, _]) => {
         callback(null, parsed)
       })
       .catch(err => {