fixes AZDL extraction

Author: andobolocco

lib/documentTypes/arizonaDriverLicense.js

@@ -17,15 +17,16 @@ module.exports = {
 
   extractor: (keyValues, rawText) => {
     // first name
-    let first_name = rawText.find((line) => line.match(/^1 (.*)$/g));
-    if (first_name && first_name.substr(0, 2) === '1 ') {
-      first_name = first_name.replace('1 ', '');
+    let first_name = rawText.find((line) => line.match(/^2 (.*)$/g));
+    if (first_name && first_name.substr(0, 2) === '2 ') {
+      first_name = first_name.replace('2 ', '');
     }
+    first_name = first_name.split(' ').shift();
 
     // last name
-    let last_name = rawText.find((line) => line.match(/^2 (.*)$/g));
-    if (last_name && last_name.substr(0, 2) === '2 ') {
-      last_name = last_name.replace('2 ', '');
+    let last_name = rawText.find((line) => line.match(/^1 (.*)$/g));
+    if (last_name && last_name.substr(0, 2) === '1 ') {
+      last_name = last_name.replace('1 ', '');
     }
 
     // street address line 1 & 2
@@ -42,7 +43,7 @@ module.exports = {
     }
 
     // city, state, zip code
-    const lineWithCityStateZipIndex = rawText.findIndex((line) => line.match(/^([A-Za-z\s]+, )?[A-Z]{2} \d+$/g));
+    const lineWithCityStateZipIndex = rawText.findIndex((line) => line.match(/^([A-Za-z\s]+, )?[A-Z]{2} \d+\-?\d+?$/g));
     const lineWithCityStateZip = rawText[lineWithCityStateZipIndex];
 
     if (!street_address_line_1 && lineWithCityStateZipIndex > 0) {
@@ -54,7 +55,7 @@ module.exports = {
       street_address_line_2 = '';
     }
 
-    const matchedCityStateZip = /^([A-Za-z\s]+, )?([A-Z]{2}) (\d+)$/g.exec(lineWithCityStateZip) || [];
+    const matchedCityStateZip = /^([A-Za-z\s]+, )?([A-Z]{2}) (\d+\-?\d+?)$/g.exec(lineWithCityStateZip) || [];
     let [, city] = matchedCityStateZip;
     const [, , state, zip_code] = matchedCityStateZip;
     if (city) {