pelias
/
api
mirror of https://github.com/pelias/api.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

refactor text parsing to seperate module

pull/242/head
Peter Johnson 9 years ago
parent
c0f20aabd3
commit
155337eb3f
2 changed files with 112 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      query/search.js
  2. 90
      query/text_parser.js

121
query/search.js
Unescape View File

@ -1,7 +1,7 @@
var peliasQuery = require('pelias-query'), var peliasQuery = require('pelias-query'),
defaults = require('./defaults'), defaults = require('./defaults'),
adminFields = require('../helper/adminFields')(); textParser = require('./text_parser');
//------------------------------ //------------------------------
// general-purpose search query // general-purpose search query
@ -69,13 +69,13 @@ function generateQuery( clean ){
// focus viewport // focus viewport
// @todo: change these to the correct request variable names // @todo: change these to the correct request variable names
// @todo: calculate the centroid from the viewport box // @todo: calculate the centroid from the viewport box
// if( clean.focus.viewport ){ if( clean.focus && clean.focus.viewport ){
// var vp = clean.focus.viewport; var vp = clean.focus.viewport;
// vs.set({ vs.set({
// 'focus:point:lat': vp.min_lat + ( vp.max_lat - vp.min_lat ) / 2, 'focus:point:lat': vp.min_lat + ( vp.max_lat - vp.min_lat ) / 2,
// 'focus:point:lon': vp.min_lon + ( vp.max_lon - vp.min_lon ) / 2 'focus:point:lon': vp.min_lon + ( vp.max_lon - vp.min_lon ) / 2
// }); });
// } }
// boundary rect // boundary rect
if( clean.bbox ){ if( clean.bbox ){
@ -89,102 +89,25 @@ function generateQuery( clean ){
// boundary circle // boundary circle
// @todo: change these to the correct request variable names // @todo: change these to the correct request variable names
// if( clean.boundary.circle ){ if( clean.boundary && clean.boundary.circle ){
// vs.set({ vs.set({
// 'boundary:circle:lat': clean.boundary.circle.lat, 'boundary:circle:lat': clean.boundary.circle.lat,
// 'boundary:circle:lon': clean.boundary.circle.lon, 'boundary:circle:lon': clean.boundary.circle.lon,
// 'boundary:circle:radius': clean.boundary.circle.radius + 'm' 'boundary:circle:radius': clean.boundary.circle.radius + 'm'
// }); });
// } }
// boundary country // boundary country
// @todo: change these to the correct request variable names // @todo: change these to the correct request variable names
// if( clean.boundary.country ){ if( clean.boundary && clean.boundary.country ){
// vs.set({ vs.set({
// 'boundary:country': clean.boundary.country 'boundary:country': clean.boundary.country
// }); });
// } }
// address parsing // run the address parser
if( clean.parsed_text ){ if( clean.parsed_text ){
textParser( clean.parsed_text, vs );
// is it a street address?
var isStreetAddress = clean.parsed_text.hasOwnProperty('number') && clean.parsed_text.hasOwnProperty('street');
if( isStreetAddress ){
vs.var( 'input:name', clean.parsed_text.number + ' ' + clean.parsed_text.street );
}
// I don't understand this
else if( clean.parsed_text.admin_parts ) {
vs.var( 'input:name', clean.parsed_text.name );
}
// or this..
else {
console.warn( 'chaos monkey asks: what happens now?' );
console.log( clean );
try{ throw new Error(); } catch(e){ console.error( e.stack ); } // print a stack trace
}
// ==== add parsed matches [address components] ====
// house number
if( clean.parsed_text.hasOwnProperty('number') ){
vs.var( 'input:housenumber', clean.parsed_text.number );
}
// street name
if( clean.parsed_text.hasOwnProperty('street') ){
vs.var( 'input:street', clean.parsed_text.street );
}
// postal code
if( clean.parsed_text.hasOwnProperty('postalcode') ){
vs.var( 'input:postcode', clean.parsed_text.postalcode );
}
// ==== add parsed matches [admin components] ====
// city
if( clean.parsed_text.hasOwnProperty('city') ){
vs.var( 'input:admin2', clean.parsed_text.city );
}
// state
if( clean.parsed_text.hasOwnProperty('state') ){
vs.var( 'input:admin1_abbr', clean.parsed_text.state );
}
// country
if( clean.parsed_text.hasOwnProperty('country') ){
vs.var( 'input:alpha3', clean.parsed_text.country );
}
// ==== deal with the 'leftover' components ====
// @todo: clean up this code
// a concept called 'leftovers' which is just 'admin_parts' /or 'regions'.
var leftoversString = '';
if( clean.parsed_text.hasOwnProperty('admin_parts') ){
leftoversString = clean.parsed_text.admin_parts;
}
else if( clean.parsed_text.hasOwnProperty('regions') ){
leftoversString = clean.parsed_text.regions.join(' ');
}
// if we have 'leftovers' then assign them to any fields which
// currently don't have a value assigned.
if( leftoversString.length ){
var unmatchedAdminFields = adminFields.slice();
// cycle through fields and set fields which
// are still currently unset
unmatchedAdminFields.forEach( function( key ){
if( !vs.isset( 'input:' + key ) ){
vs.var( 'input:' + key, leftoversString );
}
});
}
} }
return query.render( vs ); return query.render( vs );

90
query/text_parser.js
Unescape View File

@ -0,0 +1,90 @@
var adminFields = require('../helper/adminFields')();
/**
@todo: refactor me
**/
// all the address parsing logic
function addParsedVariablesToQueryVariables( parsed_text, vs ){
// is it a street address?
var isStreetAddress = parsed_text.hasOwnProperty('number') && parsed_text.hasOwnProperty('street');
if( isStreetAddress ){
vs.var( 'input:name', parsed_text.number + ' ' + parsed_text.street );
}
// ?
else if( parsed_text.admin_parts ) {
vs.var( 'input:name', parsed_text.name );
}
// ?
else {
console.warn( 'chaos monkey asks: what happens now?' );
console.log( parsed_text );
try{ throw new Error(); } catch(e){ console.error( e.stack ); } // print a stack trace
}
// ==== add parsed matches [address components] ====
// house number
if( parsed_text.hasOwnProperty('number') ){
vs.var( 'input:housenumber', parsed_text.number );
}
// street name
if( parsed_text.hasOwnProperty('street') ){
vs.var( 'input:street', parsed_text.street );
}
// postal code
if( parsed_text.hasOwnProperty('postalcode') ){
vs.var( 'input:postcode', parsed_text.postalcode );
}
// ==== add parsed matches [admin components] ====
// city
if( parsed_text.hasOwnProperty('city') ){
vs.var( 'input:admin2', parsed_text.city );
}
// state
if( parsed_text.hasOwnProperty('state') ){
vs.var( 'input:admin1_abbr', parsed_text.state );
}
// country
if( parsed_text.hasOwnProperty('country') ){
vs.var( 'input:alpha3', parsed_text.country );
}
// ==== deal with the 'leftover' components ====
// @todo: clean up this code
// a concept called 'leftovers' which is just 'admin_parts' /or 'regions'.
var leftoversString = '';
if( parsed_text.hasOwnProperty('admin_parts') ){
leftoversString = parsed_text.admin_parts;
}
else if( parsed_text.hasOwnProperty('regions') ){
leftoversString = parsed_text.regions.join(' ');
}
// if we have 'leftovers' then assign them to any fields which
// currently don't have a value assigned.
if( leftoversString.length ){
var unmatchedAdminFields = adminFields.slice();
// cycle through fields and set fields which
// are still currently unset
unmatchedAdminFields.forEach( function( key ){
if( !vs.isset( 'input:' + key ) ){
vs.var( 'input:' + key, leftoversString );
}
});
}
}
module.exports = addParsedVariablesToQueryVariables;
Write Preview
Loading…
Cancel
Save