@mountainpass/addressr 1.1.2 → 1.1.3

package/lib/service/address-service.js

@@ -13,74 +13,41 @@ exports.searchForAddress = searchForAddress;
 exports.loadGnaf = loadGnaf;
 exports.getAddress = getAddress;
 exports.getAddresses = getAddresses;
-
 var _debug = require("debug");
-
 var _debug2 = _interopRequireDefault(_debug);
-
 var _directoryExists = require("directory-exists");
-
 var _directoryExists2 = _interopRequireDefault(_directoryExists);
-
 var _fs = require("fs");
-
 var _fs2 = _interopRequireDefault(_fs);
-
 var _got = require("got");
-
 var _got2 = _interopRequireDefault(_got);
-
 var _httpLinkHeader = require("http-link-header");
-
 var _httpLinkHeader2 = _interopRequireDefault(_httpLinkHeader);
-
 var _papaparse = require("papaparse");
-
 var _papaparse2 = _interopRequireDefault(_papaparse);
-
 var _path = require("path");
-
 var _path2 = _interopRequireDefault(_path);
-
 var _stream = require("stream");
-
 var _stream2 = _interopRequireDefault(_stream);
-
 var _unzipStream = require("unzip-stream");
-
 var _unzipStream2 = _interopRequireDefault(_unzipStream);
-
 var _elasticsearch = require("../client/elasticsearch");
-
 var _streamDown = require("../utils/stream-down");
-
 var _streamDown2 = _interopRequireDefault(_streamDown);
-
 var _setLinkOptions = require("./setLinkOptions");
-
 var _keyv = require("keyv");
-
 var _keyv2 = _interopRequireDefault(_keyv);
-
 var _keyvFile = require("keyv-file");
-
 var _crypto = require("crypto");
-
 var _crypto2 = _interopRequireDefault(_crypto);
-
 var _globPromise = require("glob-promise");
-
 var _globPromise2 = _interopRequireDefault(_globPromise);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable eslint-comments/disable-enable-pair */
-
 /* eslint-disable security/detect-non-literal-regexp */
-
 /* eslint-disable security/detect-object-injection */
-
 /* eslint-disable security/detect-non-literal-fs-filename */
+
 const fsp = _fs2.default.promises;
 var logger = (0, _debug2.default)('api');
 var error = (0, _debug2.default)('error');
@@ -90,37 +57,26 @@ const cache = new _keyv2.default({
   })
 });
 const PAGE_SIZE = process.env.PAGE_SIZE || 8;
-
 function getCoveredStates() {
   const covered = process.env.COVERED_STATES || '';
-
   if (covered == '') {
     return [];
   } else {
     return covered.split(',');
   }
 }
-
 const COVERED_STATES = getCoveredStates();
-const ONE_DAY_S = 60
-/*sec*/
-* 60
-/*min*/
-* 24;
-/*hours*/
+const ONE_DAY_S = 60 /*sec*/ * 60 /*min*/ * 24; /*hours*/
 
 const ONE_DAY_MS = 1000 * ONE_DAY_S;
 const THIRTY_DAYS_MS = ONE_DAY_MS * 30;
 const ES_INDEX_NAME = process.env.ES_INDEX_NAME || 'addressr';
-
 async function dropIndex() {
   await (0, _elasticsearch.dropIndex)(global.esClient);
 }
-
 async function clearAddresses() {
   await (0, _elasticsearch.initIndex)(global.esClient, true);
 }
-
 async function setAddresses(addr) {
   await clearAddresses();
   const indexingBody = [];
@@ -143,39 +99,36 @@ async function setAddresses(addr) {
       confidence: structurted.structurted.confidence
     });
   });
-
   if (indexingBody.length > 0) {
     await sendIndexRequest(indexingBody);
-  } //  addresses = addr;
+  }
+  //  addresses = addr;
   // empty index
   // then index the provided addresses
-  //logger(await searchForAddress('657 The Entrance Road')); //'2/25 TOTTERDE'; // 'UNT 2, BELCONNEN';);
 
-} // need to try proxying this to modify the headers if we want to use got's cache implementation
-// SEE https://data.gov.au/data/dataset/19432f89-dc3a-4ef3-b943-5326ef1dbecc
+  //logger(await searchForAddress('657 The Entrance Road')); //'2/25 TOTTERDE'; // 'UNT 2, BELCONNEN';);
+}
 
+// need to try proxying this to modify the headers if we want to use got's cache implementation
 
+// SEE https://data.gov.au/data/dataset/19432f89-dc3a-4ef3-b943-5326ef1dbecc
 const GNAF_PACKAGE_URL = process.env.GNAF_PACKAGE_URL || 'https://data.gov.au/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc';
-
 async function fetchPackageData() {
-  const packageUrl = GNAF_PACKAGE_URL; // See if we have the value in cache
-
+  const packageUrl = GNAF_PACKAGE_URL;
+  // See if we have the value in cache
   const cachedResponse = await cache.get(packageUrl);
   logger('cached gnaf package data', cachedResponse);
   let age = 0;
-
   if (cachedResponse !== undefined) {
     cachedResponse.headers['x-cache'] = 'HIT';
     const created = new Date(cachedResponse.headers.date);
     logger('created', created);
     age = Date.now() - created;
-
     if (age <= ONE_DAY_MS) {
       return cachedResponse;
     }
-  } // cached value was older than one day, so go fetch
-
-
+  }
+  // cached value was older than one day, so go fetch
   try {
     const response = await _got2.default.get(packageUrl);
     logger('response.isFromCache', response.fromCache);
@@ -196,27 +149,23 @@ async function fetchPackageData() {
         cachedResponse.headers['warning'] = '110	custom/1.0 "Response is Stale"';
         return cachedResponse;
       }
-    } // otherwise, throw the original network error
-
-
+    }
+    // otherwise, throw the original network error
     throw error_;
   }
 }
-
 const GNAF_DIR = process.env.GNAF_DIR || `target/gnaf`;
-
 async function fetchGnafFile() {
   const response = await fetchPackageData();
-  const pack = JSON.parse(response.body); // id as of 16/07 for zip is 4b084096-65e4-4c8e-abbe-5e54ff85f42f
-
-  const dataResource = pack.result.resources.find(r => r.state === 'active' && r.mimetype === 'application/zip'); // id as of 16/07/2019 for zip is 4b084096-65e4-4c8e-abbe-5e54ff85f42f
+  const pack = JSON.parse(response.body);
+  // id as of 16/07 for zip is 4b084096-65e4-4c8e-abbe-5e54ff85f42f
+  const dataResource = pack.result.resources.find(r => r.state === 'active' && r.mimetype === 'application/zip');
 
+  // id as of 16/07/2019 for zip is 4b084096-65e4-4c8e-abbe-5e54ff85f42f
   logger('dataResource', JSON.stringify(dataResource, undefined, 2));
   logger('url', dataResource.url);
   logger('headers', JSON.stringify(response.headers, undefined, 2));
-
   const basename = _path2.default.basename(dataResource.url);
-
   logger('basename', basename);
   const complete_path = GNAF_DIR;
   const incomplete_path = `${complete_path}/incomplete`;
@@ -234,20 +183,19 @@ async function fetchGnafFile() {
     }, error_ => {
       if (error_) reject(error_);else resolve();
     });
-  }); // see if the file exists already
-
+  });
+  // see if the file exists already
   try {
     await new Promise((resolve, reject) => {
       _fs2.default.access(destination, _fs2.default.constants.R_OK, error_ => {
         if (error_) reject(error_);else resolve();
       });
-    }); // it does exist, so don't bother trying to download it again
-
+    });
+    // it does exist, so don't bother trying to download it again
     return destination;
   } catch {
     // file doesn't exist, so we need to download it.
     logger('Starting G-NAF download');
-
     try {
       await (0, _streamDown2.default)(dataResource.url, `${incomplete_path}/${basename}`, dataResource.size);
       await fsp.rename(`${incomplete_path}/${basename}`, destination);
@@ -259,19 +207,15 @@ async function fetchGnafFile() {
     }
   }
 }
-
 async function unzipFile(file) {
   const extname = _path2.default.extname(file);
-
   const basenameWithoutExtention = _path2.default.basename(file, extname);
-
   const incomplete_path = `${GNAF_DIR}/incomplete/${basenameWithoutExtention}`;
   const complete_path = `${GNAF_DIR}/${basenameWithoutExtention}`;
   const exists = await (0, _directoryExists2.default)(complete_path);
-
   if (exists) {
-    logger('directory exits. Skipping extract', complete_path); // already extracted. Move along.
-
+    logger('directory exits. Skipping extract', complete_path);
+    // already extracted. Move along.
     return complete_path;
   } else {
     await new Promise((resolve, reject) => {
@@ -281,16 +225,13 @@ async function unzipFile(file) {
         if (error_) reject(error_);else resolve();
       });
     });
-
     const readStream = _fs2.default.createReadStream(file);
-
     logger('before pipe');
     let prom = new Promise((resolve, reject) => {
       readStream.pipe(_unzipStream2.default.Parse()).pipe(_stream2.default.Transform({
         objectMode: true,
         transform: function (entry, encoding, callback) {
           const entryPath = `${incomplete_path}/${entry.path}`;
-
           if (entry.isDirectory) {
             _fs2.default.mkdir(entryPath, {
               recursive: true
@@ -305,7 +246,6 @@ async function unzipFile(file) {
             });
           } else {
             const dirname = _path2.default.dirname(entryPath);
-
             _fs2.default.mkdir(dirname, {
               recursive: true
             }, error_ => {
@@ -320,7 +260,6 @@ async function unzipFile(file) {
                     callback(error_);
                     return;
                   }
-
                   if (stats != undefined && stats.size === entry.size) {
                     // no need to extract again. Skip
                     logger('skipping extract for', entryPath);
@@ -357,120 +296,95 @@ async function unzipFile(file) {
       });
     });
   }
-} // function cleanProperty(p, v) {
+}
+
+// function cleanProperty(p, v) {
 //   v !== '' && {
 //     [p]: v,
 //   };
 // }
 
-
 function levelTypeCodeToName(code, context, address) {
   const found = context['Authority_Code_LEVEL_TYPE_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Level Type Code: '${code}'`);
   error({
     address
   });
   return;
 }
-
 function flatTypeCodeToName(code, context, address) {
   const found = context['Authority_Code_FLAT_TYPE_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Flat Type Code: '${code}'`);
   error({
     address
   });
   return;
 }
-
 function streetTypeCodeToName(code, context) {
   const found = context['Authority_Code_STREET_TYPE_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Street Type Code: '${code}'`);
   return;
 }
-
 function streetClassCodeToName(code, context) {
   const found = context['Authority_Code_STREET_CLASS_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Street Class Code: '${code}'`);
   return;
 }
-
 function localityClassCodeToName(code, context) {
   const found = context['Authority_Code_LOCALITY_CLASS_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Locality Class Code: '${code}'`);
   return;
 }
-
 function streetSuffixCodeToName(code, context) {
   const found = context['Authority_Code_STREET_SUFFIX_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Street Suffix Code: '${code}'`);
   return;
 }
-
 function geocodeReliabilityCodeToName(code, context) {
   const found = context['Authority_Code_GEOCODE_RELIABILITY_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Geocode Reliability Code: '${code}'`);
   return;
 }
-
 function geocodeTypeCodeToName(code, context) {
   const found = context['Authority_Code_GEOCODE_TYPE_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Geocode Type Code: '${code}'`);
   return;
 }
-
 function levelGeocodedCodeToName(code, context) {
   const found = context['Authority_Code_GEOCODED_LEVEL_TYPE_AUT_psv'].find(entry => entry.CODE === code);
-
   if (found) {
     return found.NAME;
   }
-
   error(`Unknown Geocoded Level Type Code: '${code}' in:\n${JSON.stringify(context['Authority_Code_GEOCODED_LEVEL_TYPE_AUT_psv'], undefined, 2)}`);
   return;
 }
-
 function mapLocality(l, context) {
-  return { ...(l.LOCALITY_NAME !== '' && {
+  return {
+    ...(l.LOCALITY_NAME !== '' && {
       name: l.LOCALITY_NAME
     }),
     ...(l.LOCALITY_CLASS_CODE !== '' && {
@@ -481,9 +395,9 @@ function mapLocality(l, context) {
     })
   };
 }
-
 function mapStreetLocality(l, context) {
-  return { ...(l.STREET_NAME !== '' && {
+  return {
+    ...(l.STREET_NAME !== '' && {
       name: l.STREET_NAME
     }),
     ...(l.STREET_TYPE_CODE !== '' && {
@@ -506,10 +420,8 @@ function mapStreetLocality(l, context) {
     })
   };
 }
-
 function mapGeo(geoSite, context, geoDefault) {
   let foundDefault = false;
-
   if (geoSite && geoDefault) {
     geoSite.forEach(geo => {
       if (geo.GEOCODE_TYPE_CODE === geoDefault[0].GEOCODE_TYPE_CODE && geo.LATITUDE === geoDefault[0].LATITUDE && geo.LONGITUDE === geoDefault[0].LONGITUDE) {
@@ -520,28 +432,23 @@ function mapGeo(geoSite, context, geoDefault) {
       }
     });
   }
-
   const sites = geoSite ? geoSite.map(geo => {
     if (geo.BOUNDARY_EXTENT !== '') {
       console.log('be', geo);
       throw new Error('encounterd geo.BOUNDARY_EXTENT');
     }
-
     if (geo.PLANIMETRIC_ACCURACY !== '') {
       console.log('pa', geo);
       throw new Error('encounterd geo.PLANIMETRIC_ACCURACY');
     }
-
     if (geo.ELEVATION !== '') {
       console.log('e', geo);
       throw new Error('encounterd geo.ELEVATION');
     }
-
     if (geo.GEOCODE_SITE_NAME !== '') {
       console.log('gsn', geo);
       throw new Error('encounterd geo.GEOCODE_SITE_NAME');
     }
-
     return {
       default: geo.default || false,
       ...(geo.GEOCODE_TYPE_CODE !== '' && {
@@ -586,105 +493,88 @@ function mapGeo(geoSite, context, geoDefault) {
   }) : [];
   return sites.concat(def);
 }
-
 function mapToSla(fla) {
   return fla.join(', ');
-} // eslint-disable-next-line complexity
-
+}
 
+// eslint-disable-next-line complexity
 function mapToMla(s) {
   const fla = [];
-
   if (s.level) {
     fla.push(`${s.level.type.name || ''} ${s.level.prefix || ''}${s.level.number || ''}${s.level.suffix || ''}`);
   }
-
   if (s.flat) {
     fla.push(`${s.flat.type.name || ''} ${s.flat.prefix || ''}${s.flat.number || ''}${s.flat.suffix || ''}`);
   }
-
   if (s.buildingName) {
     fla.push(s.buildingName);
   }
-
   if (fla.length === 3) {
     fla[1] = `${fla[0]}, ${fla[1]}`;
     fla.shift();
   }
-
   let number = '';
-
   if (s.lotNumber && s.number === undefined) {
     number = `LOT ${s.lotNumber.prefix || ''}${s.lotNumber.number || ''}${s.lotNumber.suffix || ''}`;
   } else if (s.number) {
     number = `${s.number.prefix || ''}${s.number.number || ''}${s.number.suffix || ''}`;
-
     if (s.number.last) {
       number = `${number}-${s.number.last.prefix || ''}${s.number.last.number || ''}${s.number.last.suffix || ''}`;
     }
   }
-
   const streetType = s.street.type ? ` ${s.street.type.name}` : '';
   const streetSuffix = s.street.suffix ? ` ${s.street.suffix.name}` : '';
   const street = `${s.street.name}${streetType}${streetSuffix}`;
   fla.push(`${number} ${street}`);
   fla.push(`${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
-
   if (fla.length > 4) {
     logger('FLA TOO LONG', fla, s);
     throw new Error('FLA TOO LONG');
   }
-
   return fla;
-} // eslint-disable-next-line complexity
-
+}
 
+// eslint-disable-next-line complexity
 function mapToShortMla(s) {
   const fla = [];
-
   if (s.level) {
     fla.push(`${s.level.type.code || ''}${s.level.prefix || ''}${s.level.number || ''}${s.level.suffix || ''}`);
   }
-
   let number = '';
-
   if (s.flat) {
     number = `${s.flat.prefix || ''}${s.flat.number || ''}${s.flat.suffix || ''}/`;
   }
-
   if (s.lotNumber && s.number === undefined) {
     number = `${number}${s.lotNumber.prefix || ''}${s.lotNumber.number || ''}${s.lotNumber.suffix || ''}`;
   } else {
     number = `${number}${s.number.prefix || ''}${s.number.number || ''}${s.number.suffix || ''}`;
-
     if (s.number.last) {
       number = `${number}-${s.number.last.prefix || ''}${s.number.last.number || ''}${s.number.last.suffix || ''}`;
     }
   }
-
   const streetType = s.street.type ? ` ${s.street.type.name}` : '';
   const streetSuffix = s.street.suffix ? ` ${s.street.suffix.code}` : '';
   const street = `${s.street.name}${streetType}${streetSuffix}`;
   fla.push(`${number} ${street}`);
   fla.push(`${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
-
   if (fla.length > 4) {
     logger('FLA TOO LONG', fla, s);
     throw new Error('FLA TOO LONG');
   }
-
   return fla;
-} // eslint-disable-next-line complexity
-
+}
 
+// eslint-disable-next-line complexity
 function mapAddressDetails(d, context, i, count) {
   const streetLocality = context.streetLocalityIndexed[d.STREET_LOCALITY_PID];
   const locality = context.localityIndexed[d.LOCALITY_PID];
   const geoSite = context.geoIndexed ? context.geoIndexed[d.ADDRESS_SITE_PID] : undefined;
   const geoDefault = context.geoDefaultIndexed ? context.geoDefaultIndexed[d.ADDRESS_DETAIL_PID] : undefined;
   const hasGeo = d.LEVEL_GEOCODED_CODE != '' && (geoSite !== undefined && geoSite.length > 0 || geoDefault !== undefined && geoDefault.length > 0);
-  const rval = { ...(d.LEVEL_GEOCODED_CODE != '' && hasGeo && {
-      geocoding: { ...(d.LEVEL_GEOCODED_CODE !== '' && {
+  const rval = {
+    ...(d.LEVEL_GEOCODED_CODE != '' && hasGeo && {
+      geocoding: {
+        ...(d.LEVEL_GEOCODED_CODE !== '' && {
           level: {
             code: d.LEVEL_GEOCODED_CODE,
             name: levelGeocodedCodeToName(d.LEVEL_GEOCODED_CODE, context)
@@ -695,11 +585,13 @@ function mapAddressDetails(d, context, i, count) {
         })
       }
     }),
-    structured: { ...(d.BUILDING_NAME !== '' && {
+    structured: {
+      ...(d.BUILDING_NAME !== '' && {
         buildingName: d.BUILDING_NAME
       }),
       ...((d.NUMBER_FIRST_PREFIX !== '' || d.NUMBER_FIRST !== '' || d.NUMBER_FIRST_SUFFIX !== '') && {
-        number: { ...(d.NUMBER_FIRST_PREFIX !== '' && {
+        number: {
+          ...(d.NUMBER_FIRST_PREFIX !== '' && {
             prefix: d.NUMBER_FIRST_PREFIX
           }),
           ...(d.NUMBER_FIRST !== '' && {
@@ -709,7 +601,8 @@ function mapAddressDetails(d, context, i, count) {
             suffix: d.NUMBER_FIRST_SUFFIX
           }),
           ...((d.NUMBER_LAST_PREFIX !== '' || d.NUMBER_LAST !== '' || d.NUMBER_LAST_SUFFIX !== '') && {
-            last: { ...(d.NUMBER_LAST_PREFIX !== '' && {
+            last: {
+              ...(d.NUMBER_LAST_PREFIX !== '' && {
                 prefix: d.NUMBER_LAST_PREFIX
               }),
               ...(d.NUMBER_LAST !== '' && {
@@ -723,7 +616,8 @@ function mapAddressDetails(d, context, i, count) {
         }
       }),
       ...((d.LEVEL_TYPE_CODE !== '' || d.LEVEL_NUMBER_PREFIX !== '' || d.LEVEL_NUMBER !== '' || d.LEVEL_NUMBER_SUFFIX !== '') && {
-        level: { ...(d.LEVEL_TYPE_CODE !== '' && {
+        level: {
+          ...(d.LEVEL_TYPE_CODE !== '' && {
             type: {
               code: d.LEVEL_TYPE_CODE,
               name: levelTypeCodeToName(d.LEVEL_TYPE_CODE, context, d)
@@ -741,7 +635,8 @@ function mapAddressDetails(d, context, i, count) {
         }
       }),
       ...((d.FLAT_TYPE_CODE !== '' || d.FLAT_NUMBER_PREFIX !== '' || d.FLAT_NUMBER !== '' || d.FLAT_NUMBER_SUFFIX !== '') && {
-        flat: { ...(d.FLAT_TYPE_CODE !== '' && {
+        flat: {
+          ...(d.FLAT_TYPE_CODE !== '' && {
             type: {
               code: d.FLAT_TYPE_CODE,
               name: flatTypeCodeToName(d.FLAT_TYPE_CODE, context, d)
@@ -768,7 +663,8 @@ function mapAddressDetails(d, context, i, count) {
         postcode: d.POSTCODE
       }),
       ...((d.LOT_NUMBER_PREFIX !== '' || d.LOT_NUMBER !== '' || d.LOT_NUMBER_SUFFIX !== '') && {
-        lotNumber: { ...(d.LOT_NUMBER_PREFIX !== '' && {
+        lotNumber: {
+          ...(d.LOT_NUMBER_PREFIX !== '' && {
             prefix: d.LOT_NUMBER_PREFIX
           }),
           ...(d.LOT_NUMBER !== '' && {
@@ -791,12 +687,10 @@ function mapAddressDetails(d, context, i, count) {
   };
   rval.mla = mapToMla(rval.structured);
   rval.sla = mapToSla(rval.mla);
-
   if (rval.structured.flat != undefined) {
     rval.smla = mapToShortMla(rval.structured);
     rval.ssla = mapToSla(rval.smla);
   }
-
   if (count) {
     if (i % Math.ceil(count / 100) === 0) {
       logger('addr', JSON.stringify(rval, undefined, 2));
@@ -808,10 +702,8 @@ function mapAddressDetails(d, context, i, count) {
       logger(`${i} rows`);
     }
   }
-
   return rval;
 }
-
 async function loadAddressDetails(file, expectedCount, context, {
   refresh = false
 } = {}) {
@@ -824,14 +716,12 @@ async function loadAddressDetails(file, expectedCount, context, {
       chunk: function (chunk, parser) {
         parser.pause();
         const items = [];
-
         if (chunk.errors.length > 0) {
           error(`Errors reading '${file}': ${chunk.errors}`);
           error({
             errors: chunk.errors
           });
         }
-
         const indexingBody = [];
         chunk.data.forEach(row => {
           const item = mapAddressDetails(row, context, actualCount, expectedCount);
@@ -855,7 +745,6 @@ async function loadAddressDetails(file, expectedCount, context, {
             confidence: structured.structured.confidence
           });
         });
-
         if (indexingBody.length > 0) {
           sendIndexRequest(indexingBody, undefined, {
             refresh
@@ -881,7 +770,8 @@ async function loadAddressDetails(file, expectedCount, context, {
       // },
       complete: function () {
         logger('Address details loaded', context.state, expectedCount || '');
-        resolve(); // global.esClient.indices
+        resolve();
+        // global.esClient.indices
         //   .refresh({
         //     index: ['addressr'],
         //   })
@@ -904,12 +794,13 @@ async function loadAddressDetails(file, expectedCount, context, {
       }
     });
   });
-
   if (expectedCount !== undefined && actualCount != expectedCount) {
     error(`Error loading '${file}'. Expected '${expectedCount}' rows, got '${actualCount}'`);
   } else {
     logger(`loaded '${actualCount}' rows from '${file}'`);
-  } // const BATCH_SIZE = 4096;
+  }
+
+  // const BATCH_SIZE = 4096;
   // const batches = Math.ceil(details.length / BATCH_SIZE);
   // for (let j = 0; j < batches; j++) {
   //   logger(`INDEXING... batch ${j} of ${batches}`);
@@ -943,9 +834,7 @@ async function loadAddressDetails(file, expectedCount, context, {
   //   }
   // }
   //await searchForAddress('657 The Entrance Road'); //'2/25 TOTTERDE'; // 'UNT 2, BELCONNEN';);
-
 }
-
 async function searchForAddress(searchString, p, pageSize = PAGE_SIZE) {
   //  const searchString = '657 The Entrance Road'; //'2/25 TOTTERDE'; // 'UNT 2, BELCONNEN';
   const searchResp = await global.esClient.search({
@@ -954,7 +843,8 @@ async function searchForAddress(searchString, p, pageSize = PAGE_SIZE) {
       from: (p - 1 || 0) * pageSize,
       size: pageSize,
       query: {
-        bool: { ...(searchString && {
+        bool: {
+          ...(searchString && {
             should: [{
               multi_match: {
                 fields: ['sla', 'ssla'],
@@ -1003,12 +893,11 @@ async function searchForAddress(searchString, p, pageSize = PAGE_SIZE) {
   logger('hits', JSON.stringify(searchResp.body.hits, undefined, 2));
   return searchResp;
 }
-
 async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(process.env.ADDRESSR_INDEX_BACKOFF || '30000'), {
   refresh = false
 } = {}) {
-  let backoff = initialBackoff; // eslint-disable-next-line no-constant-condition
-
+  let backoff = initialBackoff;
+  // eslint-disable-next-line no-constant-condition
   for (let count = 0; true; count++) {
     try {
       const resp = await global.esClient.bulk({
@@ -1016,9 +905,9 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
         body: indexingBody,
         timeout: process.env.ADDRESSR_INDEX_TIMEOUT || '300s'
       });
-
       if (resp.errors || resp.body && resp.body.errors) {
-        throw resp; // // error(resp);
+        throw resp;
+        // // error(resp);
         // // error(resp.items[0].index);
         // error(`backing off for ${backoff}ms`);
         // // parser.pause();
@@ -1031,18 +920,17 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
         // });
         // backoff = Math.max(10000, backoff * 2);
         // continue;
-      } // if (paused) {
+      }
+      // if (paused) {
       //   error(`resuming`);
       //   parser.resume();
       // }
-
-
       return;
     } catch (error_) {
       error('Indexing error', JSON.stringify(error_, undefined, 2));
-      error(`backing off for ${backoff}ms`); // parser.pause();
+      error(`backing off for ${backoff}ms`);
+      // parser.pause();
       // paused = true;
-
       await new Promise(resolve => {
         // eslint-disable-next-line no-undef
         setTimeout(() => {
@@ -1056,7 +944,6 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
     }
   }
 }
-
 async function getStateName(abbr, file) {
   return await new Promise((resolve, reject) => {
     _papaparse2.default.parse(_fs2.default.createReadStream(file), {
@@ -1072,7 +959,6 @@ async function getStateName(abbr, file) {
     });
   });
 }
-
 function mapAuthCodeTableToSynonymList(table) {
   return table.filter(type => {
     return type.CODE !== type.NAME;
@@ -1080,7 +966,6 @@ function mapAuthCodeTableToSynonymList(table) {
     return `${type.CODE} => ${type.NAME}`;
   });
 }
-
 function buildSynonyms(context) {
   //example synonym format [
   //       'SUPER, super, superannuation',
@@ -1093,14 +978,11 @@ function buildSynonyms(context) {
   const synonyms = [...streetTypes, ...flatTypes, ...levelTypes, ...streetSuffixTypes];
   return synonyms;
 }
-
 const {
   readdir
 } = require('fs').promises;
-
 async function getFiles(currentDir, baseDir) {
   const dir = _path2.default.resolve(baseDir, currentDir);
-
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
   const dirents = await readdir(dir, {
     withFileTypes: true
@@ -1111,11 +993,9 @@ async function getFiles(currentDir, baseDir) {
   }));
   return Array.prototype.concat(...files);
 }
-
 function countFileLines(filePath) {
   return new Promise((resolve, reject) => {
     const readStream = _fs2.default.createReadStream(filePath, 'utf-8');
-
     let lines = 0;
     let last = undefined;
     readStream.on('data', function (chunk) {
@@ -1126,7 +1006,6 @@ function countFileLines(filePath) {
       if (last !== '\n') {
         ++lines;
       }
-
       resolve(lines);
     });
     readStream.on('error', function (err) {
@@ -1134,15 +1013,14 @@ function countFileLines(filePath) {
     });
   });
 }
-
 async function loadGnafData(directory, {
   refresh = false
 } = {}) {
   const countsFile = `${directory}/Counts.csv`;
   let countsFileExists = await fileExists(countsFile);
   let filesCounts = {},
-      files = []; // before may21 there was a counts file
-
+    files = [];
+  // before may21 there was a counts file
   if (countsFileExists) {
     filesCounts = await loadFileCounts(countsFile);
     files = Object.keys(filesCounts);
@@ -1150,53 +1028,46 @@ async function loadGnafData(directory, {
   } else {
     // may21 was missing the counts file
     files = await getFiles('.', directory);
-
     for (const file of files) {
       const lines = await countFileLines(`${directory}/${file}`);
       filesCounts[file] = lines - 1;
-    } // const contentsFile = `${directory}/Contents.txt`
+    }
+    // const contentsFile = `${directory}/Contents.txt`
     // const contentsFileExists = await fileExists(contentsFile)
     // if (contentsFileExists) {
     //   files = await loadFileContents(contentsFile)
     // } else {
     //   throw new Error(`Cannot file '${countsFile}' or '${contentsFile}'`)
     // }
-
   }
-
   const loadContext = {};
-  await loadAuthFiles(files, directory, loadContext, filesCounts); // loadContext now contains all the auth files, so we can build the synonyms
-
+  await loadAuthFiles(files, directory, loadContext, filesCounts);
+  // loadContext now contains all the auth files, so we can build the synonyms
   const synonyms = buildSynonyms(loadContext);
   await (0, _elasticsearch.initIndex)(global.esClient, process.env.ES_CLEAR_INDEX || false, synonyms);
   const addressDetailFiles = files.filter(f => f.match(/ADDRESS_DETAIL/) && f.match(/\/Standard\//));
   logger('addressDetailFiles', addressDetailFiles);
-
   for (const detailFile of addressDetailFiles) {
     const state = _path2.default.basename(detailFile, _path2.default.extname(detailFile)).replace(/_.*/, '');
-
     if (COVERED_STATES.length === 0 || COVERED_STATES.includes(state)) {
       loadContext.state = state;
       loadContext.stateName = await loadState(files, directory, state);
       logger('Loading streets', state);
       const streetLocality = await loadStreetLocality(files, directory, state);
       loadContext.streetLocalityIndexed = {};
-
       for (const sl of streetLocality) {
         loadContext.streetLocalityIndexed[sl.STREET_LOCALITY_PID] = sl;
       }
-
       logger('Loading suburbs', state);
       const locality = await loadLocality(files, directory, state);
       loadContext.localityIndexed = {};
-
       for (const l of locality) {
         loadContext.localityIndexed[l.LOCALITY_PID] = l;
       }
-
       if (process.env.ADDRESSR_ENABLE_GEO) {
         loadContext.geoIndexed = {};
-        await loadSiteGeo(files, directory, state, loadContext, filesCounts); // logger('indexing site geos', state, geo.length);
+        await loadSiteGeo(files, directory, state, loadContext, filesCounts);
+        // logger('indexing site geos', state, geo.length);
         // for (let index = 0; index < geo.length; index++) {
         //   if (index % 10000 === 0) {
         //     logger(`${(index / geo.length) * 100.0}%`);
@@ -1214,14 +1085,12 @@ async function loadGnafData(directory, {
       } else {
         logger(`Skipping geos. set 'ADDRESSR_ENABLE_GEO' env var to enable`);
       }
-
       await loadAddressDetails(`${directory}/${detailFile}`, filesCounts[detailFile], loadContext, {
         refresh
       });
     }
   }
 }
-
 async function fileExists(countsFile) {
   try {
     await fsp.access(countsFile, _fs2.default.constants.F_OK);
@@ -1231,7 +1100,6 @@ async function fileExists(countsFile) {
     return false;
   }
 }
-
 async function loadFileCounts(countsFile) {
   const filesCounts = {};
   await new Promise((resolve, reject) => {
@@ -1245,7 +1113,6 @@ async function loadFileCounts(countsFile) {
             errors: row.errors
           });
         }
-
         const psvFile = row.data.File.replace(/\\/g, '/').replace(/\.zip$/, '.psv');
         filesCounts[psvFile] = row.data.Count;
       },
@@ -1262,15 +1129,12 @@ async function loadFileCounts(countsFile) {
   logger('filesCounts', filesCounts);
   return filesCounts;
 }
-
 async function loadFileContents(contentsFile) {
   const contents = await fsp.readFile(contentsFile);
   return contents.toString().split('\n').map(line => line.trim());
 }
-
 async function loadState(files, directory, state) {
   const stateFile = files.find(f => f.match(new RegExp(`${state}_STATE_psv`)));
-
   if (stateFile === undefined) {
     error(`Could not find state file '${state}_STATE_psv.psv'`);
     return;
@@ -1279,10 +1143,8 @@ async function loadState(files, directory, state) {
     return name;
   }
 }
-
 async function loadStreetLocality(files, directory, state) {
   const localityFile = files.find(f => f.match(new RegExp(`${state}_STREET_LOCALITY_psv`)));
-
   if (localityFile === undefined) {
     error(`Could not find street locality file '${state}_STREET_LOCALITY_psv.psv'`);
     return [];
@@ -1302,10 +1164,8 @@ async function loadStreetLocality(files, directory, state) {
     });
   }
 }
-
 async function loadLocality(files, directory, state) {
   const localityFile = files.find(f => f.match(new RegExp(`${state}_LOCALITY_psv`)));
-
   if (localityFile === undefined) {
     error(`Could not find locality file '${state}_LOCALITY_psv.psv'`);
     return [];
@@ -1325,11 +1185,9 @@ async function loadLocality(files, directory, state) {
     });
   }
 }
-
 async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
   logger('Loading site geos');
   const geoFile = files.find(f => f.match(new RegExp(`${state}_ADDRESS_SITE_GEOCODE_psv`)));
-
   if (geoFile === undefined) {
     error(`Could not find address site geocode file '${state}_ADDRESS_SITE_GEOCODE_psv.psv'`);
     return [];
@@ -1342,7 +1200,6 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
         delimiter: '|',
         chunk: function (chunk, parser) {
           parser.pause();
-
           if (chunk.errors.length > 0) {
             error(`Errors reading '${directory}/${geoFile}': ${chunk.errors}`);
             error({
@@ -1355,15 +1212,12 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
                   logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
                 }
               }
-
               const g = row;
-
               if (loadContext.geoIndexed[g.ADDRESS_SITE_PID] === undefined) {
                 loadContext.geoIndexed[g.ADDRESS_SITE_PID] = [g];
               } else {
                 loadContext.geoIndexed[g.ADDRESS_SITE_PID].push(g);
               }
-
               count += 1;
             });
             parser.resume();
@@ -1380,11 +1234,9 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
     });
   }
 }
-
 async function loadDefaultGeo(files, directory, state, loadContext, filesCounts) {
   logger('Loading default geos');
   const geoFile = files.find(f => f.match(new RegExp(`${state}_ADDRESS_DEFAULT_GEOCODE_psv`)));
-
   if (geoFile === undefined) {
     error(`Could not find address site geocode file '${state}_ADDRESS_DEFAULT_GEOCODE_psv.psv'`);
     return [];
@@ -1397,7 +1249,6 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
         delimiter: '|',
         chunk: function (chunk, parser) {
           parser.pause();
-
           if (chunk.errors.length > 0) {
             error(`Errors reading '${directory}/${geoFile}': ${chunk.errors}`);
             error({
@@ -1410,15 +1261,12 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
                   logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
                 }
               }
-
               const g = row;
-
               if (loadContext.geoDefaultIndexed[g.ADDRESS_DETAIL_PID] === undefined) {
                 loadContext.geoDefaultIndexed[g.ADDRESS_DETAIL_PID] = [g];
               } else {
                 loadContext.geoDefaultIndexed[g.ADDRESS_DETAIL_PID].push(g);
               }
-
               count += 1;
             });
             parser.resume();
@@ -1435,21 +1283,17 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
     });
   }
 }
-
 async function loadAuthFiles(files, directory, loadContext, filesCounts) {
   const authCodeFiles = files.filter(f => f.match(/Authority Code/));
   logger('authCodeFiles', authCodeFiles);
-
   for (const authFile of authCodeFiles) {
     const contextKey = _path2.default.basename(authFile, _path2.default.extname(authFile));
-
     await new Promise((resolve, reject) => {
       _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${authFile}`), {
         delimiter: '|',
         header: true,
         complete: function (results) {
           loadContext[contextKey] = results.data;
-
           if (filesCounts) {
             if (results.data.length != filesCounts[authFile]) {
               error(`Error loading '${directory}/${authFile}'. Expected '${filesCounts[authFile]}' rows, got '${results.data.length}'`);
@@ -1467,10 +1311,8 @@ async function loadAuthFiles(files, directory, loadContext, filesCounts) {
       });
     });
   }
-
   logger('AUTH', loadContext);
 }
-
 async function loadGnaf({
   refresh = false
 } = {}) {
@@ -1479,27 +1321,23 @@ async function loadGnaf({
   logger('Data dir', unzipped);
   const contents = await fsp.readdir(unzipped);
   logger('Data dir contents', contents);
-
   if (contents.length == 0) {
     throw new Error(`Data dir '${unzipped}' is empty`);
   }
-
   const gnafDir = await (0, _globPromise2.default)('**/G-NAF/', {
     cwd: unzipped
   });
   console.log(gnafDir);
-
   if (gnafDir.length === 0) {
     throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
   }
-
   const mainDirectory = _path2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
-
   logger('Main Data dir', mainDirectory);
   await loadGnafData(mainDirectory, {
     refresh
   });
 }
+
 /**
  * Get Addresses
  * returns detailed information about a specific address
@@ -1507,8 +1345,6 @@ async function loadGnaf({
  * addressId String ID of the address.
  * returns Address
  **/
-
-
 async function getAddress(addressId) {
   try {
     const jsonX = await global.esClient.get({
@@ -1516,7 +1352,8 @@ async function getAddress(addressId) {
       id: `/addresses/${addressId}`
     });
     logger('jsonX', jsonX);
-    const json = { ...jsonX.body._source.structured,
+    const json = {
+      ...jsonX.body._source.structured,
       sla: jsonX.body._source.sla
     };
     logger('json', json);
@@ -1525,10 +1362,9 @@ async function getAddress(addressId) {
     link.set({
       rel: 'self',
       uri: `/addresses/${addressId}`
-    }); // TODO: store hash in address
-
+    });
+    // TODO: store hash in address
     const hash = _crypto2.default.createHash('md5').update(JSON.stringify(json)).digest('hex');
-
     return {
       link,
       json,
@@ -1536,7 +1372,6 @@ async function getAddress(addressId) {
     };
   } catch (error_) {
     error('error getting record from elastic search', error_);
-
     if (error_.body.found === false) {
       return {
         statusCode: 404,
@@ -1561,6 +1396,7 @@ async function getAddress(addressId) {
     }
   }
 }
+
 /**
  * Get List of Addresses
  * returns a list of addresses matching the search string
@@ -1569,8 +1405,6 @@ async function getAddress(addressId) {
  * p Integer page number (optional)
  * returns List
  **/
-
-
 async function getAddresses(url, swagger, q, p = 1) {
   try {
     const foundAddresses = await searchForAddress(q, p);
@@ -1582,7 +1416,8 @@ async function getAddresses(url, swagger, q, p = 1) {
       title: `${swagger.path.get.operationId} API Docs`,
       type: 'text/html'
     });
-    const sp = new URLSearchParams({ ...(q !== undefined && {
+    const sp = new URLSearchParams({
+      ...(q !== undefined && {
         q
       }),
       ...(p !== 1 && {
@@ -1596,16 +1431,17 @@ async function getAddresses(url, swagger, q, p = 1) {
     });
     link.set({
       rel: 'first',
-      uri: `${url}${q === undefined ? '' : '?'}${new URLSearchParams({ ...(q !== undefined && {
+      uri: `${url}${q === undefined ? '' : '?'}${new URLSearchParams({
+        ...(q !== undefined && {
           q
         })
       }).toString()}`
     });
-
     if (p > 1) {
       link.set({
         rel: 'prev',
-        uri: `${url}${q === undefined && p == 2 ? '' : '?'}${new URLSearchParams({ ...(q !== undefined && {
+        uri: `${url}${q === undefined && p == 2 ? '' : '?'}${new URLSearchParams({
+          ...(q !== undefined && {
             q
           }),
           ...(p > 2 && {
@@ -1614,22 +1450,20 @@ async function getAddresses(url, swagger, q, p = 1) {
         }).toString()}`
       });
     }
-
     logger('TOTAL', foundAddresses.body.hits.total.value);
     logger('PAGE_SIZE * p', PAGE_SIZE * p);
     logger('next?', foundAddresses.body.hits.total.value > PAGE_SIZE * p);
-
     if (foundAddresses.body.hits.total.value > PAGE_SIZE * p) {
       link.set({
         rel: 'next',
-        uri: `${url}?${new URLSearchParams({ ...(q !== undefined && {
+        uri: `${url}?${new URLSearchParams({
+          ...(q !== undefined && {
             q
           }),
           p: p + 1
         }).toString()}`
       });
     }
-
     const responseBody = mapToSearchAddressResponse(foundAddresses);
     logger('responseBody', JSON.stringify(responseBody, undefined, 2));
     const linkTemplate = new _httpLinkHeader2.default();
@@ -1642,7 +1476,6 @@ async function getAddresses(url, swagger, q, p = 1) {
     };
   } catch (error_) {
     error('error querying elastic search', error_);
-
     if (error_.body && error_.body.error && error_.body.error.type === 'index_not_found_exception') {
       return {
         statusCode: 503,
@@ -1667,7 +1500,6 @@ async function getAddresses(url, swagger, q, p = 1) {
     }
   }
 }
-
 function mapToSearchAddressResponse(foundAddresses) {
   return foundAddresses.body.hits.hits.map(h => {
     return {