diff --git a/lib/streams/unitSplittingMapperStream.js b/lib/streams/unitSplittingMapperStream.js index e9a299683..e1c25a994 100644 --- a/lib/streams/unitSplittingMapperStream.js +++ b/lib/streams/unitSplittingMapperStream.js @@ -30,6 +30,7 @@ const australasian = (doc) =>{ if (solidus) { doc.setAddress('unit', solidus[1]); doc.setAddress('number', solidus[2]); + doc.setName('default', `${doc.getAddress('number')} ${doc.getAddress('street')}`); return; } @@ -38,6 +39,7 @@ const australasian = (doc) =>{ if (verbose) { doc.setAddress('unit', verbose[2]); doc.setAddress('number', verbose[3]); + doc.setName('default', `${doc.getAddress('number')} ${doc.getAddress('street')}`); return; } }; diff --git a/test/data/expected.json b/test/data/expected.json index 0a3f7a112..34dc758b7 100644 --- a/test/data/expected.json +++ b/test/data/expected.json @@ -360,10 +360,10 @@ "_type": "_doc", "data": { "name": { - "default": "10/244 Barkly Street" + "default": "244 Barkly Street" }, "phrase": { - "default": "10/244 Barkly Street" + "default": "244 Barkly Street" }, "address_parts": { "number": "244", @@ -436,10 +436,10 @@ "_type": "_doc", "data": { "name": { - "default": "10/244 Brunswick Street" + "default": "244 Brunswick Street" }, "phrase": { - "default": "10/244 Brunswick Street" + "default": "244 Brunswick Street" }, "address_parts": { "number": "244", @@ -462,10 +462,10 @@ "_type": "_doc", "data": { "name": { - "default": "110/244 Dorcas Street" + "default": "244 Dorcas Street" }, "phrase": { - "default": "110/244 Dorcas Street" + "default": "244 Dorcas Street" }, "address_parts": { "number": "244", @@ -488,10 +488,10 @@ "_type": "_doc", "data": { "name": { - "default": "210/244 Dorcas Street" + "default": "244 Dorcas Street" }, "phrase": { - "default": "210/244 Dorcas Street" + "default": "244 Dorcas Street" }, "address_parts": { "number": "244", @@ -514,10 +514,10 @@ "_type": "_doc", "data": { "name": { - "default": "310/244 Dorcas Street" + "default": "244 Dorcas Street" }, "phrase": { - "default": "310/244 Dorcas Street" + "default": "244 Dorcas Street" }, "address_parts": { "number": "244", @@ -540,10 +540,10 @@ "_type": "_doc", "data": { "name": { - "default": "410/244 Dorcas Street" + "default": "244 Dorcas Street" }, "phrase": { - "default": "410/244 Dorcas Street" + "default": "244 Dorcas Street" }, "address_parts": { "number": "244", @@ -566,10 +566,10 @@ "_type": "_doc", "data": { "name": { - "default": "510/244 Dorcas Street" + "default": "244 Dorcas Street" }, "phrase": { - "default": "510/244 Dorcas Street" + "default": "244 Dorcas Street" }, "address_parts": { "number": "244", @@ -592,10 +592,10 @@ "_type": "_doc", "data": { "name": { - "default": "10/244 Pascoe Vale Road" + "default": "244 Pascoe Vale Road" }, "phrase": { - "default": "10/244 Pascoe Vale Road" + "default": "244 Pascoe Vale Road" }, "address_parts": { "number": "244", diff --git a/test/streams/unitSplittingMapperStream.js b/test/streams/unitSplittingMapperStream.js index c5fd553c9..49c7ae77e 100644 --- a/test/streams/unitSplittingMapperStream.js +++ b/test/streams/unitSplittingMapperStream.js @@ -32,7 +32,7 @@ module.exports.tests.australasian_solidus = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), '2/14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -53,7 +53,7 @@ module.exports.tests.australasian_solidus_with_whitespace = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), '2 / 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -74,7 +74,7 @@ module.exports.tests.australasian_flat_prefix = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'Flat 2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -95,7 +95,7 @@ module.exports.tests.australasian_flat_prefix_abbreviated = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'F 2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -116,7 +116,7 @@ module.exports.tests.australasian_unit_prefix = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'Unit 2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -137,7 +137,7 @@ module.exports.tests.australasian_apartment_prefix = function (test) { test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'Apartment 2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -158,7 +158,7 @@ module.exports.tests.australasian_apartment_prefix_abbreviated = function (test) test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'APT 2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged'); @@ -179,7 +179,7 @@ module.exports.tests.australasian_allow_no_space_after_flat_designation = functi test('maps - split unit from housenumber', t => { var stream = mapper(); stream.pipe(through.obj((doc, enc, next) => { - t.deepEqual(doc.getName('default'), 'APT2 14 Smith Street', 'unchanged'); + t.deepEqual(doc.getName('default'), '14 Smith Street', 'unchanged'); t.deepEqual(doc.getAddress('unit'), '2', 'mapped'); t.deepEqual(doc.getAddress('number'), '14', 'mapped'); t.deepEqual(doc.getAddress('street'), 'Smith Street', 'unchanged');