feat: Merge pull request #226 from pelias/switch-to-all-in-one-admin-…

…lookup

Switch to all-in-one admin lookup

.gitignore

@@ -1 +1,2 @@
 node_modules
+*.log

import.js

@@ -11,10 +11,9 @@ var logger = require( 'pelias-logger' ).get( 'openaddresses' );
 var parameters = require( './lib/parameters' );
 var importPipeline = require( './lib/importPipeline' );
 
-var adminLookupStream = require('./lib/streams/adminLookupStream');
+const adminLookupStream = require('pelias-wof-admin-lookup');
 var deduplicatorStream = require('./lib/streams/deduplicatorStream');
 
-var wofAdminLookup = require('pelias-wof-admin-lookup');
 var addressDeduplicator = require('pelias-address-deduplicator');
 
 
@@ -37,10 +36,14 @@ if( 'exitCode' in args ){
 } else {
   startTiming();
 
+  if (peliasConfig.imports.openaddresses.hasOwnProperty('adminLookup')) {
+    logger.info('imports.openaddresses.adminLookup has been deprecated, ' +
+                'enabled adminLookup using imports.adminLookup.enabled = true');
+  }
+
   var files = parameters.getFileList(peliasConfig, args);
 
   var deduplicator = deduplicatorStream.create(peliasConfig, addressDeduplicator);
-  var adminLookup = adminLookupStream.create(peliasConfig, wofAdminLookup);
 
-  importPipeline.create( files, args.dirPath, deduplicator, adminLookup );
+  importPipeline.create( files, args.dirPath, deduplicator, adminLookupStream.create() );
 }

package.json

@@ -18,7 +18,7 @@
     "pelias-dbclient": "2.0.0",
     "pelias-logger": "0.1.0",
     "pelias-model": "4.4.0",
-    "pelias-wof-admin-lookup": "2.11.0",
+    "pelias-wof-admin-lookup": "3.0.0",
     "through2": "^2.0.3",
     "through2-filter": "^2.0.0",
     "through2-map": "^3.0.0",

test/test.js

@@ -6,7 +6,6 @@
 
 require( './schema' );
 require( './isValidCsvRecord' );
-require( './streams/adminLookupStream');
 require( './import');
 require( './importPipeline');
 require( './parameters' );