Browse Source

removed support for alpha3 since it's not used anywhere

pull/850/head
Stephen Hess 8 years ago
parent
commit
83101505c0
  1. 7
      controller/placeholder.js
  2. 75
      test/unit/controller/placeholder.js

7
controller/placeholder.js

@ -61,18 +61,11 @@ function synthesizeDocs(result) {
.filter(doc.isSupportedParent) .filter(doc.isSupportedParent)
.filter((placetype) => { return !_.isEmpty(_.trim(hierarchy[placetype].name)); } ) .filter((placetype) => { return !_.isEmpty(_.trim(hierarchy[placetype].name)); } )
.forEach((placetype) => { .forEach((placetype) => {
if (placetype === 'country' &&
hierarchy[placetype].hasOwnProperty('abbr') &&
hierarchy[placetype].abbr.match(/^[a-zA-Z]{3}$/)) {
doc.setAlpha3(hierarchy[placetype].abbr);
}
doc.addParent( doc.addParent(
placetype, placetype,
hierarchy[placetype].name, hierarchy[placetype].name,
hierarchy[placetype].id.toString(), hierarchy[placetype].id.toString(),
hierarchy[placetype].abbr); hierarchy[placetype].abbr);
}); });
}); });

75
test/unit/controller/placeholder.js

@ -228,7 +228,6 @@ module.exports.tests.success = (test, common) => {
phrase: { phrase: {
'default': 'name 1' 'default': 'name 1'
}, },
alpha3: 'XYZ',
parent: { parent: {
neighbourhood: ['neighbourhood name 1', 'neighbourhood name 2'], neighbourhood: ['neighbourhood name 1', 'neighbourhood name 2'],
neighbourhood_id: ['10', '20'], neighbourhood_id: ['10', '20'],
@ -421,78 +420,6 @@ module.exports.tests.success = (test, common) => {
}); });
test('results with non-3-character country abbreviation should not set alpha3', (t) => {
['AB', 'ABCD'].forEach((country_abbr) => {
const logger = require('pelias-mock-logger')();
const placeholder_service = (req, callback) => {
t.deepEqual(req, { param1: 'param1 value' });
const response = [
{
id: 123,
name: 'name 1',
placetype: 'neighbourhood',
geom: {
area: 12.34
},
lineage: [
{
country: {
id: 1,
name: 'country name 1',
abbr: country_abbr
}
}
]
}
];
callback(null, response);
};
const controller = proxyquire('../../../controller/placeholder', {
'pelias-logger': logger
})(placeholder_service, _.constant(true));
const req = { param1: 'param1 value' };
const res = { };
controller(req, res, () => {
const expected_res = {
meta: {},
data: [
{
_id: '123',
_type: 'neighbourhood',
layer: 'neighbourhood',
source: 'whosonfirst',
source_id: '123',
name: {
'default': 'name 1'
},
phrase: {
'default': 'name 1'
},
parent: {
country: ['country name 1'],
country_id: ['1'],
country_a: [country_abbr]
}
}
]
};
t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]'));
});
});
t.end();
});
test('results with string geom.lat/geom.lon should convert to numbers', (t) => { test('results with string geom.lat/geom.lon should convert to numbers', (t) => {
const logger = require('pelias-mock-logger')(); const logger = require('pelias-mock-logger')();
@ -819,7 +746,6 @@ module.exports.tests.result_filtering = (test, common) => {
phrase: { phrase: {
'default': 'name 1' 'default': 'name 1'
}, },
alpha3: 'DEF',
parent: { parent: {
country: ['country name 1', 'country name 2'], country: ['country name 1', 'country name 2'],
country_id: ['1', '2'], country_id: ['1', '2'],
@ -842,7 +768,6 @@ module.exports.tests.result_filtering = (test, common) => {
phrase: { phrase: {
'default': 'name 4' 'default': 'name 4'
}, },
alpha3: 'ABC',
parent: { parent: {
country: ['country name 4'], country: ['country name 4'],
country_id: ['4'], country_id: ['4'],

Loading…
Cancel
Save