feat(pelias_parser): completely remove "addressit" and references to it

Author: missinglink

middleware/confidenceScore.js

@@ -29,7 +29,7 @@ function computeScores(req, res, next) {
   // do nothing if no result data set or if query is not of the original variety
   if (check.undefined(req.clean) || check.undefined(res) ||
       check.undefined(res.data) || check.undefined(res.meta) ||
-      res.meta.query_type !== 'search_addressit') {
+      res.meta.query_type !== 'search_pelias_parser') {
     return next();
   }
 

package.json

@@ -36,16 +36,15 @@
     "node": ">=8.0.0"
   },
   "dependencies": {
+    "@hapi/joi": "^15.0.0",
     "@mapbox/geojson-extent": "^0.3.1",
-    "addressit": "1.7.0",
     "async": "^3.0.1",
     "check-types": "^10.0.0",
     "elasticsearch": "^16.0.0",
     "express": "^4.8.8",
     "geojson": "^0.5.0",
     "geolib": "^3.0.0",
     "iso-639-3": "^1.0.0",
-    "@hapi/joi": "^15.0.0",
     "locale": "^0.1.0",
     "lodash": "^4.17.4",
     "markdown": "^0.5.0",

query/search.js

@@ -129,7 +129,7 @@ function getQuery(vs) {
     };
   }
 
-  // returning undefined is a signal to a later step that the addressit-parsed
+  // returning undefined is a signal to a later step that a fallback parser
   // query should be queried for
   return undefined;
 

query/search_addressit.js query/search_pelias_parser.js

@@ -8,10 +8,9 @@ const config = require('pelias-config').generate().api;
 var placeTypes = require('../helper/placeTypes');
 var views = { custom_boosts: require('./view/boost_sources_and_layers') };
 
-// region_a is also an admin field. addressit tries to detect
-// region_a, in which case we use a match query specifically for it.
-// but address it doesn't know about all of them so it helps to search
-// against this with the other admin parts as a fallback
+// region_a is also an admin field which can be identified by
+// the pelias_parser. this functionality was inherited from the
+// previous parser we used prior to the creation of pelias_parser.
 var adminFields = placeTypes.concat(['region_a']);
 
 //------------------------------
@@ -138,7 +137,7 @@ function generateQuery( clean ){
   }
 
   return {
-    type: 'search_addressit',
+    type: 'search_pelias_parser',
     body: query.render(vs)
   };
 }

query/text_parser_addressit.js

@@ -38,7 +38,7 @@ var controllers = {
 
 var queries = {
   cascading_fallback: require('../query/search'),
-  search_addressit: require('../query/search_addressit'),
+  search_pelias_parser: require('../query/search_pelias_parser'),
   structured_geocoding: require('../query/structured_geocoding'),
   reverse: require('../query/reverse'),
   autocomplete: require('../query/autocomplete'),
@@ -230,8 +230,8 @@ function addRoutes(app, peliasConfig) {
     not(hasResponseData)
   );
 
-  // call search addressit query if addressit was the parser
-  const searchAddressitShouldExecute = all(
+  // call search_pelias_parser query if pelias_parser was the parser
+  const searchPeliasParserShouldExecute = all(
     not(hasRequestErrors),
     isPeliasParse
   );
@@ -288,11 +288,11 @@ function addRoutes(app, peliasConfig) {
       controllers.libpostal(libpostalService, libpostalShouldExecute),
       controllers.placeholder(placeholderService, geometricFiltersApply, placeholderGeodisambiguationShouldExecute),
       controllers.placeholder(placeholderService, geometricFiltersApply, placeholderIdsLookupShouldExecute),
-      // try 3 different query types: address search using ids, cascading fallback, addressit
+      // try 3 different query types: address search using ids, cascading fallback, pelias parser
       controllers.search(peliasConfig.api, esclient, queries.address_using_ids, searchWithIdsShouldExecute),
       controllers.search(peliasConfig.api, esclient, queries.cascading_fallback, fallbackQueryShouldExecute),
       sanitizers.defer_to_pelias_parser(shouldDeferToPeliasParser), //run additional sanitizers needed for pelias parser
-      controllers.search(peliasConfig.api, esclient, queries.search_addressit, searchAddressitShouldExecute),
+      controllers.search(peliasConfig.api, esclient, queries.search_pelias_parser, searchPeliasParserShouldExecute),
       postProc.trimByGranularity(),
       postProc.distances('focus.point.'),
       postProc.confidenceScores(peliasConfig.api),

routes/v1.js

@@ -60,7 +60,7 @@ function _setup(tm) {
           input = clean.parsed_text.subject;
         }
 
-        // if 'addressit' or 'libpostal' identified input as a street address
+        // if 'pelias_parser' or 'libpostal' identified input as a street address
         else if (isStreetAddress) {
           input = clean.parsed_text.number + ' ' + clean.parsed_text.street;
         }

sanitizer/_address_layer_filter.js

@@ -1,5 +1,5 @@
 {
-  "type": "search_addressit",
+  "type": "search_pelias_parser",
   "body": {
     "query": {
       "bool": {

sanitizer/_text_addressit.js

@@ -47,7 +47,7 @@ module.exports.tests.confidenceScore = function(test, common) {
       }],
       meta: {
         scores: [10],
-        query_type: 'search_addressit'
+        query_type: 'search_pelias_parser'
       }
     };
 
@@ -89,7 +89,7 @@ module.exports.tests.confidenceScore = function(test, common) {
       }],
       meta: {
         scores: [10],
-        query_type: 'search_addressit'
+        query_type: 'search_pelias_parser'
       }
     };
 
@@ -125,7 +125,7 @@ module.exports.tests.confidenceScore = function(test, common) {
       }],
       meta: {
         scores: [10],
-        query_type: 'search_addressit'
+        query_type: 'search_pelias_parser'
       }
     };
 
@@ -134,7 +134,7 @@ module.exports.tests.confidenceScore = function(test, common) {
     t.end();
   });
 
-  test('should only work for search_addressit query_type', function(t) {
+  test('should only work for search_pelias_parser query_type', function(t) {
     var req = {
       clean: {
         text: '123 Main St, City, NM',
@@ -191,7 +191,7 @@ module.exports.tests.confidenceScore = function(test, common) {
       }],
       meta: {
         scores: [10],
-        query_type: 'search_addressit'
+        query_type: 'search_pelias_parser'
       }
     };
 
@@ -223,7 +223,7 @@ module.exports.tests.confidenceScore = function(test, common) {
       }],
       meta: {
         scores: [10],
-        query_type: 'search_addressit'
+        query_type: 'search_pelias_parser'
       }
     };