Es5 compat

mappings/document.js

@@ -1,9 +1,11 @@
+module.exports = function(config) {
+
 var admin = require('./partial/admin');
 var hash = require('./partial/hash');
 var multiplier = require('./partial/multiplier');
 var literal = require('./partial/literal');
 
-var schema = {
+return {
   properties: {
 
     // data partitioning
@@ -100,7 +102,7 @@ var schema = {
     },
 
     // geography
-    center_point: require('./partial/centroid'),
+    center_point: require('./partial/centroid')(config),
     shape: require('./partial/shape'),
     bounding_box: require('./partial/boundingbox'),
 
@@ -144,4 +146,4 @@ var schema = {
   dynamic: 'true'
 };
 
-module.exports = schema;
+};

mappings/partial/centroid.js

@@ -1,14 +1,25 @@
+module.exports = function(config) {
+
+var es_version = config && config.esclient && config.esclient.apiVersion;
+
 // @ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-geo-point-type.html
-var schema = {
-  'type': 'geo_point',
+var schema = { 'type': 'geo_point' };
 
+// The enclosed options are required for es versions earlier than 5.x
+// Using `!es_version || ` because right now recommended version is 2.3
+// HACK: I want to use semver but check the following link:
+//       https://github.com/mojombo/semver/issues/237
+// This lexicographical ordering should be fine until major version 10
+if(!es_version || es_version < '5.0') {
   /* `lat_lon` enabled since both the geo distance and bounding box filters can either be executed using in memory checks, or using the indexed lat lon values */
-  'lat_lon': true,
+  schema['lat_lon'] = true;
 
   /* store geohashes (with prefixes) in order to facilitate the geohash_cell filter */
-  'geohash': true,
-  'geohash_prefix': true,
-  'geohash_precision': 18
-};
+  schema['geohash'] = true;
+  schema['geohash_prefix'] = true;
+  schema['geohash_precision'] = 18;
+}
 
-module.exports = schema;
+return schema;
+
+};

schema.js

@@ -1,7 +1,9 @@
-var doc = require('./mappings/document');
+var config = require('pelias-config').generate().export(),
+    settings = require('./settings')(config),
+    doc = require('./mappings/document')(config);
 
 var schema = {
-  settings: require('./settings')(),
+  settings: settings,
   mappings: {
     /**
       the _default_ mapping is applied to all new _type dynamically added after

settings.js

@@ -1,13 +1,10 @@
 var Mergeable = require('mergeable');
-var peliasConfig = require('pelias-config');
 var punctuation = require('./punctuation');
 var street_suffix = require('./street_suffix');
 
 var moduleDir = require('path').dirname("../");
 
-function generate(){
-  var config = peliasConfig.generate().export();
-
+function generate(config) {
   // Default settings
   var settings = {
     "analysis": {

test/compile.js

@@ -1,5 +1,8 @@
-var path = require('path'),
-    schema = require('../'),
+var path = require('path');
+
+process.env.PELIAS_CONFIG = path.resolve( __dirname + '/fixtures/config.json' );
+
+var schema = require('../'),
     fixture = require('./fixtures/expected.json');
 
 module.exports.tests = {};
@@ -58,9 +61,10 @@ module.exports.tests.current_schema = function(test, common) {
     // copy schema
     var schemaCopy = JSON.parse( JSON.stringify( schema ) );
 
-    // use the pelias config fixture instead of the local config
-    process.env.PELIAS_CONFIG = path.resolve( __dirname + '/fixtures/config.json' );
-    schemaCopy.settings = require('../settings')();
+    // use a different pelias config fixture with the same apiVersion
+    process.env.PELIAS_CONFIG = path.resolve( __dirname + '/fixtures/alt_config2.json' );
+    var config = require('pelias-config').generate().export();
+    schemaCopy.settings = require('../settings')(config);
     delete process.env.PELIAS_CONFIG;
 
     // code intentionally commented to allow quick debugging of expected.json

test/document.js

@@ -1,4 +1,4 @@
-var schema = require('../mappings/document');
+var schema = require('../mappings/document')();
 
 module.exports.tests = {};
 

test/fixtures/alt_config.json

@@ -0,0 +1,9 @@
+{
+  "elasticsearch": {
+    "settings": {
+      "index": {
+        "number_of_replicas": "999"
+      }
+    }
+  }
+}

test/fixtures/alt_config2.json

@@ -0,0 +1,7 @@
+{
+  "imports": {
+    "whosonfirst": {
+      "datapath": "/path/to/whosonfirst"
+    }
+  }
+}

test/fixtures/config.json

@@ -1,9 +1 @@
-{
-  "elasticsearch": {
-    "settings": {
-      "index": {
-        "number_of_replicas": "999"
-      }
-    }
-  }
-}
+{}

test/fixtures/expected.json

@@ -1565,7 +1565,7 @@
       }
     },
     "index": {
-      "number_of_replicas": "999",
+      "number_of_replicas": "0",
       "number_of_shards": "1",
       "refresh_interval": "1m"
     }

test/partial-centroid.js

@@ -1,5 +1,7 @@
 
-var schema = require('../mappings/partial/centroid');
+var schema_cons = require('../mappings/partial/centroid'),
+    schema = schema_cons(),
+    schema5x = schema_cons({esclient:{apiVersion:'5.0'}});
 
 module.exports.tests = {};
 
@@ -39,6 +41,16 @@ module.exports.tests.geohash = function(test, common) {
   });
 };
 
+module.exports.tests.options_disabled_for_5_x = function(test, common) {
+  test('options disabled for elasticsearch 5.x', function(t) {
+    t.equal(schema5x.lat_lon, undefined, 'correctly unset');
+    t.equal(schema5x.geohash, undefined, 'correctly unset');
+    t.equal(schema5x.geohash_prefix, undefined, 'correctly unset');
+    t.equal(schema5x.geohash_precision, undefined, 'correctly unset');
+    t.end();
+  });
+};
+
 module.exports.all = function (tape, common) {
 
   function test(name, testFunction) {