Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unit-number-extractor: remove unit number from name.default #504

Merged
merged 1 commit into from
Mar 1, 2022
Merged

unit-number-extractor: remove unit number from name.default #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/streams/unitSplittingMapperStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
};
Expand Down
32 changes: 16 additions & 16 deletions test/data/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions test/streams/unitSplittingMapperStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand Down