diff --git a/classifier/WhosOnFirstClassifier.js b/classifier/WhosOnFirstClassifier.js index 14f4c1aa..e865f6b7 100644 --- a/classifier/WhosOnFirstClassifier.js +++ b/classifier/WhosOnFirstClassifier.js @@ -1,6 +1,6 @@ const PhraseClassifier = require('./super/PhraseClassifier') const AreaClassification = require('../classification/AreaClassification') -// const CountryClassification = require('../classification/CountryClassification') +const CountryClassification = require('../classification/CountryClassification') // const DependencyClassification = require('../classification/DependencyClassification') const RegionClassification = require('../classification/RegionClassification') const LocalityClassification = require('../classification/LocalityClassification') @@ -18,15 +18,15 @@ const placetypes = { 'region': { files: ['abrv:eng_x_preferred.txt', 'name:eng_x_preferred.txt'], classifications: [AreaClassification, RegionClassification] - } + }, // 'dependency': { // files: ['wof:shortcode.txt', 'name:eng_x_preferred.txt'], // classifications: [AreaClassification, DependencyClassification] // }, - // 'country': { - // files: ['wof:country.txt', 'wof:shortcode.txt', 'name:eng_x_preferred.txt'], - // classifications: [AreaClassification, CountryClassification] - // }, + 'country': { + files: ['name:eng_x_preferred.txt'], + classifications: [AreaClassification, CountryClassification] + } } class WhosOnFirstClassifier extends PhraseClassifier { diff --git a/test/addressit.usa.test.js b/test/addressit.usa.test.js index 0865069f..20cd86b1 100644 --- a/test/addressit.usa.test.js +++ b/test/addressit.usa.test.js @@ -64,6 +64,11 @@ const testcase = (test, common) => { { locality: 'Atlanta' }, { region: 'Georgia' }, { postcode: '31035' } ], + [ + { housenumber: '754' }, { street: 'Pharr Rd' }, + { locality: 'Atlanta' }, { country: 'Georgia' }, + { postcode: '31035' } + ], [ { housenumber: '754' }, { street: 'Pharr Rd' }, { locality: 'Georgia' }, { postcode: '31035' }