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

Jump to bottom

do not set name field for addresses #424

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

do not set name field for addresses #424

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
feat(remove_name_for_addresses): do not set name field for addresses
  • Loading branch information
@missinglink
missinglink committed May 24, 2019
commit 7cdd796a92a4fd59d3c9ab87a40475bffcbc3919
2 changes: 1 addition & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"quotmark": "single",
"undef": true,
"unused": true,
"maxparams": 4,
"maxparams": 5,
"maxdepth": 4,
"maxlen": 120
}
1 change: 0 additions & 1 deletion lib/streams/documentStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ function createDocumentStream(id_prefix, stats) {

try {
const addrDoc = new peliasModel.Document( 'openaddresses', 'address', model_id )
.setName( 'default', (record.NUMBER + ' ' + record.STREET) )
.setCentroid( { lon: record.LON, lat: record.LAT } );

addrDoc.setAddress( 'number', record.NUMBER );
Expand Down
72 changes: 18 additions & 54 deletions test/data/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
"_type": "address",
"_id": "data/input_file_1:0",
"data": {
"name": {
"default": "100 Main St"
},
"phrase": {
"default": "100 Main St"
},
"name": {},
"phrase": {},
"parent": {
"country": [
"override country"
Expand Down Expand Up @@ -112,12 +108,8 @@
"_type": "address",
"_id": "data/input_file_1:1",
"data": {
"name": {
"default": "200 Main St"
},
"phrase": {
"default": "200 Main St"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "200",
"street": "Main St"
Expand All @@ -136,12 +128,8 @@
"_type": "address",
"_id": "data/input_file_1:2",
"data": {
"name": {
"default": "0 Main St"
},
"phrase": {
"default": "0 Main St"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "0",
"street": "Main St"
Expand All @@ -160,12 +148,8 @@
"_type": "address",
"_id": "data/input_file_1:3",
"data": {
"name": {
"default": "00 Elm St"
},
"phrase": {
"default": "00 Elm St"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "00",
"street": "Elm St"
Expand All @@ -184,12 +168,8 @@
"_type": "address",
"_id": "data/input_file_1:4",
"data": {
"name": {
"default": "00300 Main St"
},
"phrase": {
"default": "00300 Main St"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "00300",
"street": "Main St"
Expand All @@ -208,12 +188,8 @@
"_type": "address",
"_id": "data/input_file_2:0",
"data": {
"name": {
"default": "400 Vireo Rd"
},
"phrase": {
"default": "400 Vireo Rd"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "400",
"street": "Vireo Rd"
Expand All @@ -232,12 +208,8 @@
"_type": "address",
"_id": "data/input_file_2:1",
"data": {
"name": {
"default": "00000 Vireo Rd"
},
"phrase": {
"default": "00000 Vireo Rd"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "00000",
"street": "Vireo Rd"
Expand All @@ -256,12 +228,8 @@
"_type": "address",
"_id": "data/input_file_2:2",
"data": {
"name": {
"default": "00500 Calle De Lago"
},
"phrase": {
"default": "00500 Calle De Lago"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "00500",
"street": "Calle De Lago"
Expand All @@ -280,12 +248,8 @@
"_type": "address",
"_id": "data/input_file_2:3",
"data": {
"name": {
"default": "00500 Calle De Lago"
},
"phrase": {
"default": "00500 Calle De Lago"
},
"name": {},
"phrase": {},
"address_parts": {
"number": "00500",
"street": "Calle De Lago"
Expand Down
18 changes: 9 additions & 9 deletions test/openaddresses_sample.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
LON, LAT, NUMBER, STREET,FOOOOBAR
-118.0170157,55.546026835788886,23042,Twp Road 755 A,,,,
-118.75318353,55.14959214890181,712046,Rge Road 34,,
-118.8218384,55.15506788763259,712078,Rge Road 34,,
-118.79719936,55.153343057595535,712068,Rge Road 34,,,,,
-118.66743097,55.151807043809917,712060,Rge Road 34,,,,
-118.74783569,55.155320792497442,712082,Rge Road 35,,,,
1,2,number,too many spaces,
1,2,trim , multiple spaces,,,,
LON, LAT, POSTCODE, STREET,NUMBER
-118.0170157,55.546026835788886,23042,Twp Road, 755 A,,,,
-118.75318353,55.14959214890181,712046,Rge Road, 34,,
-118.8218384,55.15506788763259,712078,Rge Road, 34,,
-118.79719936,55.153343057595535,712068,Rge Road, 34,,,,,
-118.66743097,55.151807043809917,712060,Rge Road, 34,,,,
-118.74783569,55.155320792497442,712082,Rge Road, 35,,,,
1,2,number,too many spaces, 36,,,,
1,2,trim , multiple spaces, 37,,,,
54 changes: 31 additions & 23 deletions test/streams/recordStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
var tape = require( 'tape' );
var through = require( 'through2' );

var peliasModel = require( 'pelias-model' );

var recordStream = require( '../../lib/streams/recordStream' );
const tape = require( 'tape' );
const through = require( 'through2' );
const peliasModel = require( 'pelias-model' );
const recordStream = require( '../../lib/streams/recordStream' );

/**
* Tests whether records read from `test/openaddresses_sample.csv` are created
Expand All @@ -12,36 +10,46 @@ var recordStream = require( '../../lib/streams/recordStream' );
tape(
'importPipelines.createRecordStream() creates Document objects with expected values.',
function ( test ){
function createTestRec( lon, lat, name ){
return { lon: lon, lat: lat, name: name };
function createTestRec( lon, lat, postcode, street, number ){
return { lon: lon, lat: lat, postcode: postcode, street: street, number: number };
}

var expectedRecords = [
createTestRec( -118.0170157, 55.546026835788886, '23042 Twp Road 755 A' ),
createTestRec( -118.75318353, 55.14959214890181, '712046 Rge Road 34' ),
createTestRec( -118.8218384, 55.15506788763259, '712078 Rge Road 34' ),
createTestRec( -118.79719936, 55.153343057595535, '712068 Rge Road 34' ),
createTestRec( -118.66743097, 55.151807043809917, '712060 Rge Road 34' ),
createTestRec( -118.74783569, 55.155320792497442, '712082 Rge Road 35' ),
createTestRec( 1, 2, 'number Too Many Spaces' ),
createTestRec( 1, 2, 'trim Multiple Spaces' )
let expectedRecords = [
createTestRec( -118.0170157, 55.546026835788886, '23042', 'Twp Road', '755 A' ),
createTestRec( -118.75318353, 55.14959214890181, '712046', 'Rge Road', '34' ),
createTestRec( -118.8218384, 55.15506788763259, '712078', 'Rge Road', '34' ),
createTestRec( -118.79719936, 55.153343057595535, '712068', 'Rge Road', '34' ),
createTestRec( -118.66743097, 55.151807043809917, '712060', 'Rge Road', '34' ),
createTestRec( -118.74783569, 55.155320792497442, '712082', 'Rge Road', '35' ),
createTestRec( 1, 2, 'number', 'Too Many Spaces', '36' ),
createTestRec( 1, 2, 'trim', 'Multiple Spaces', '37' )
];
test.plan( expectedRecords.length * 4 + 1);
test.plan(( expectedRecords.length * 7 ) + 1);

var dataStream = recordStream.create(['test/openaddresses_sample.csv']);
let dataStream = recordStream.create(['test/openaddresses_sample.csv']);
test.ok( dataStream.readable, 'Stream is readable.' );
var testStream = through.obj(function ( data, enc, next ){

let currentTestRecord = 0;
let testStream = through.obj(( data, _, next ) => {
test.ok(
data instanceof peliasModel.Document, 'Data is a Document object.'
);

var expected = expectedRecords.splice( 0, 1 )[ 0 ];
var centroid = data.getCentroid();
let expected = expectedRecords[ currentTestRecord ];
let centroid = data.getCentroid();
test.ok( expected.lon - centroid.lon < 1e-6, 'Longitude matches.' );
test.ok( expected.lat - centroid.lat < 1e-6, 'Latitude matches.' );
test.equal( data.getName( 'default' ), expected.name , 'Name matches.' );
test.false( data.getName( 'default' ) , 'Name not set.' );
test.equal( data.getAddress( 'zip' ), expected.postcode , 'Postcode matches.' );
test.equal( data.getAddress( 'street' ), expected.street , 'Street matches.' );
test.equal( data.getAddress( 'number' ), expected.number , 'Number matches.' );

currentTestRecord++;
next();
}, () => {
test.end();
});

dataStream.pipe( testStream );
}
);
Expand Down