add peliasDefaultSimilarity

mappings/document.js

@@ -26,32 +26,38 @@ var schema = {
         name: {
           type: 'text',
           analyzer: 'keyword',
-          search_analyzer: 'keyword'
+          search_analyzer: 'keyword',
+          similarity: 'peliasDefaultSimilarity'
         },
         unit: {
           type: 'text',
           analyzer: 'peliasUnit',
-          search_analyzer: 'peliasUnit'
+          search_analyzer: 'peliasUnit',
+          similarity: 'peliasDefaultSimilarity'
         },
         number: {
           type: 'text',
           analyzer: 'peliasHousenumber',
-          search_analyzer: 'peliasHousenumber'
+          search_analyzer: 'peliasHousenumber',
+          similarity: 'peliasDefaultSimilarity'
         },
         street: {
           type: 'text',
           analyzer: 'peliasStreet',
-          search_analyzer: 'peliasStreet'
+          search_analyzer: 'peliasStreet',
+          similarity: 'peliasDefaultSimilarity'
         },
         cross_street: {
           type: 'text',
           analyzer: 'peliasStreet',
-          search_analyzer: 'peliasStreet'
+          search_analyzer: 'peliasStreet',
+          similarity: 'peliasDefaultSimilarity'
         },
         zip: {
           type: 'text',
           analyzer: 'peliasZip',
-          search_analyzer: 'peliasZip'
+          search_analyzer: 'peliasZip',
+          similarity: 'peliasDefaultSimilarity'
         },
       }
     },
@@ -159,7 +165,8 @@ var schema = {
       mapping: {
         type: 'text',
         analyzer: 'peliasIndexOneEdgeGram',
-        search_analyzer: 'peliasQuery'
+        search_analyzer: 'peliasQuery',
+        similarity: 'peliasDefaultSimilarity'
       }
     },
   },{
@@ -169,7 +176,8 @@ var schema = {
       mapping: {
         type: 'text',
         analyzer: 'peliasPhrase',
-        search_analyzer: 'peliasQuery'
+        search_analyzer: 'peliasQuery',
+        similarity: 'peliasDefaultSimilarity'
       }
     }
   },{

mappings/partial/admin.json

@@ -2,11 +2,13 @@
   "type": "text",
   "analyzer": "peliasAdmin",
   "search_analyzer": "peliasAdmin",
+  "similarity": "peliasDefaultSimilarity",
   "fields": {
     "ngram": {
       "type": "text",
       "analyzer": "peliasIndexOneEdgeGram",
       "search_analyzer": "peliasAdmin",
+      "similarity": "peliasDefaultSimilarity",
       "doc_values": false
     }
   }

mappings/partial/postalcode.json

@@ -2,11 +2,13 @@
   "type": "text",
   "analyzer": "peliasZip",
   "search_analyzer": "peliasZip",
+  "similarity": "peliasDefaultSimilarity",
   "fields": {
     "ngram": {
       "type": "text",
       "analyzer": "peliasIndexOneEdgeGram",
-      "search_analyzer": "peliasZip"
+      "search_analyzer": "peliasZip",
+      "similarity": "peliasDefaultSimilarity"
     }
   }
 }

settings.js

@@ -23,6 +23,15 @@ function generate(){
 
   // Default settings
   var settings = {
+    "index": {
+      "similarity": {
+        "peliasDefaultSimilarity": {
+          "type": "BM25",
+          "k1": 1.2,
+          "b": 0.75
+        }
+      }
+    },
     "analysis": {
       "tokenizer": {
         "peliasNameTokenizer": {
@@ -211,19 +220,15 @@ function generate(){
 
   // dynamically create filters for all synonym files in the ./synonyms directory.
   // each filter is given the same name as the file, minus the extension.
-  for( var key in synonyms ){
+  _.each(synonyms, (synonym, key) => {
     settings.analysis.filter[key] = {
       "type": "synonym",
-      "synonyms": !!synonyms[key].length ? synonyms[key] : ['']
+      "synonyms": !_.isEmpty(synonym) ? synonym : ['']
     };
-  }
+  })
 
   // Merge settings from pelias/config
-  if( 'object' === typeof config &&
-      'object' === typeof config.elasticsearch &&
-      'object' === typeof config.elasticsearch.settings ){
-    return _.merge({}, settings, config.elasticsearch.settings);
-  }
+  settings = _.merge({}, settings, _.get(config, 'elasticsearch.settings', {}));
 
   return settings;
 }

test/compile.js

@@ -43,7 +43,8 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'text',
       analyzer: 'peliasIndexOneEdgeGram',
-      search_analyzer: 'peliasQuery'
+      search_analyzer: 'peliasQuery',
+      similarity: 'peliasDefaultSimilarity'
     });
     t.end();
   });
@@ -55,7 +56,8 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'text',
       analyzer: 'peliasPhrase',
-      search_analyzer: 'peliasQuery'
+      search_analyzer: 'peliasQuery',
+      similarity: 'peliasDefaultSimilarity'
     });
     t.end();
   });

test/fixtures/empty.json

@@ -0,0 +1 @@
+{}