diff --git a/mappings/document.js b/mappings/document.js index 7408acc4..d5828636 100644 --- a/mappings/document.js +++ b/mappings/document.js @@ -1,10 +1,12 @@ const admin = require('./partial/admin'); +const admin_ngram = require('./partial/admin_ngram'); const postalcode = require('./partial/postalcode'); const hash = require('./partial/hash'); const multiplier = require('./partial/multiplier'); const literal = require('./partial/literal'); const literal_with_doc_values = require('./partial/literal_with_doc_values'); const config = require('pelias-config').generate(); +const merge = require('lodash.merge'); var schema = { properties: { @@ -53,79 +55,94 @@ var schema = { dynamic: 'strict', properties: { // https://github.com/whosonfirst/whosonfirst-placetypes#continent - continent: admin, - continent_a: admin, + continent: merge({ copy_to: 'parent.continent_ngram' }, admin), + continent_a: merge({ copy_to: 'parent.continent_ngram' }, admin), continent_id: literal, + continent_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#ocean - ocean: admin, - ocean_a: admin, + ocean: merge({ copy_to: 'parent.ocean_ngram' }, admin), + ocean_a: merge({ copy_to: 'parent.ocean_ngram' }, admin), ocean_id: literal, + ocean_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#empire - empire: admin, - empire_a: admin, + empire: merge({ copy_to: 'parent.empire_ngram' }, admin), + empire_a: merge({ copy_to: 'parent.empire_ngram' }, admin), empire_id: literal, + empire_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#country - country: admin, - country_a: admin, + country: merge({ copy_to: 'parent.country_ngram' }, admin), + country_a: merge({ copy_to: 'parent.country_ngram' }, admin), country_id: literal, + country_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#dependency - dependency: admin, - dependency_a: admin, + dependency: merge({ copy_to: 'parent.dependency_ngram' }, admin), + dependency_a: merge({ copy_to: 'parent.dependency_ngram' }, admin), dependency_id: literal, + dependency_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#marinearea - marinearea: admin, - marinearea_a: admin, + marinearea: merge({ copy_to: 'parent.marinearea_ngram' }, admin), + marinearea_a: merge({ copy_to: 'parent.marinearea_ngram' }, admin), marinearea_id: literal, + marinearea_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#macroregion - macroregion: admin, - macroregion_a: admin, + macroregion: merge({ copy_to: 'parent.macroregion_ngram' }, admin), + macroregion_a: merge({ copy_to: 'parent.macroregion_ngram' }, admin), macroregion_id: literal, + macroregion_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#region - region: admin, - region_a: admin, + region: merge({ copy_to: 'parent.region_ngram' }, admin), + region_a: merge({ copy_to: 'parent.region_ngram' }, admin), region_id: literal, + region_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#macrocounty - macrocounty: admin, - macrocounty_a: admin, + macrocounty: merge({ copy_to: 'parent.macrocounty_ngram' }, admin), + macrocounty_a: merge({ copy_to: 'parent.macrocounty_ngram' }, admin), macrocounty_id: literal, + macrocounty_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#county - county: admin, - county_a: admin, + county: merge({ copy_to: 'parent.county_ngram' }, admin), + county_a: merge({ copy_to: 'parent.county_ngram' }, admin), county_id: literal, + county_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#locality - locality: admin, - locality_a: admin, + locality: merge({ copy_to: 'parent.locality_ngram' }, admin), + locality_a: merge({ copy_to: 'parent.locality_ngram' }, admin), locality_id: literal, + locality_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#borough - borough: admin, - borough_a: admin, + borough: merge({ copy_to: 'parent.borough_ngram' }, admin), + borough_a: merge({ copy_to: 'parent.borough_ngram' }, admin), borough_id: literal, + borough_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#localadmin - localadmin: admin, - localadmin_a: admin, + localadmin: merge({ copy_to: 'parent.localadmin_ngram' }, admin), + localadmin_a: merge({ copy_to: 'parent.localadmin_ngram' }, admin), localadmin_id: literal, + localadmin_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#neighbourhood - neighbourhood: admin, - neighbourhood_a: admin, + neighbourhood: merge({ copy_to: 'parent.neighbourhood_ngram' }, admin), + neighbourhood_a: merge({ copy_to: 'parent.neighbourhood_ngram' }, admin), neighbourhood_id: literal, + neighbourhood_ngram: admin_ngram, // https://github.com/whosonfirst/whosonfirst-placetypes#postalcode - postalcode: postalcode, - postalcode_a: postalcode, - postalcode_id: literal + postalcode: merge({ copy_to: 'parent.postalcode_ngram' }, postalcode), + postalcode_a: merge({ copy_to: 'parent.postalcode_ngram' }, postalcode), + postalcode_id: literal, + postalcode_ngram: admin_ngram } }, diff --git a/mappings/partial/admin.json b/mappings/partial/admin.json index fa0480b9..bb4ae6e0 100644 --- a/mappings/partial/admin.json +++ b/mappings/partial/admin.json @@ -1,4 +1,4 @@ { "type": "string", "analyzer": "peliasAdmin" -} +} \ No newline at end of file diff --git a/mappings/partial/admin_ngram.json b/mappings/partial/admin_ngram.json new file mode 100644 index 00000000..1fbd3e90 --- /dev/null +++ b/mappings/partial/admin_ngram.json @@ -0,0 +1,8 @@ +{ + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata" : { + "format": "disabled" + } +} \ No newline at end of file diff --git a/test/document.js b/test/document.js index 99d8489d..27651446 100644 --- a/test/document.js +++ b/test/document.js @@ -85,21 +85,21 @@ module.exports.tests.address_analysis = function(test, common) { // should contain the correct parent field definitions module.exports.tests.parent_fields = function(test, common) { var fields = [ - 'continent', 'continent_a', 'continent_id', - 'ocean', 'ocean_a', 'ocean_id', - 'empire', 'empire_a', 'empire_id', - 'country', 'country_a', 'country_id', - 'dependency', 'dependency_a', 'dependency_id', - 'marinearea', 'marinearea_a', 'marinearea_id', - 'macroregion', 'macroregion_a', 'macroregion_id', - 'region', 'region_a', 'region_id', - 'macrocounty', 'macrocounty_a', 'macrocounty_id', - 'county', 'county_a', 'county_id', - 'locality', 'locality_a', 'locality_id', - 'borough', 'borough_a', 'borough_id', - 'localadmin', 'localadmin_a', 'localadmin_id', - 'neighbourhood', 'neighbourhood_a', 'neighbourhood_id', - 'postalcode', 'postalcode_a', 'postalcode_id' + 'continent', 'continent_a', 'continent_id', 'continent_ngram', + 'ocean', 'ocean_a', 'ocean_id', 'ocean_ngram', + 'empire', 'empire_a', 'empire_id', 'empire_ngram', + 'country', 'country_a', 'country_id', 'country_ngram', + 'dependency', 'dependency_a', 'dependency_id', 'dependency_ngram', + 'marinearea', 'marinearea_a', 'marinearea_id', 'marinearea_ngram', + 'macroregion', 'macroregion_a', 'macroregion_id', 'macroregion_ngram', + 'region', 'region_a', 'region_id', 'region_ngram', + 'macrocounty', 'macrocounty_a', 'macrocounty_id', 'macrocounty_ngram', + 'county', 'county_a', 'county_id', 'county_ngram', + 'locality', 'locality_a', 'locality_id', 'locality_ngram', + 'borough', 'borough_a', 'borough_id', 'borough_ngram', + 'localadmin', 'localadmin_a', 'localadmin_id', 'localadmin_ngram', + 'neighbourhood', 'neighbourhood_a', 'neighbourhood_id', 'neighbourhood_ngram', + 'postalcode', 'postalcode_a', 'postalcode_id', 'postalcode_ngram' ]; test('parent fields specified', function(t) { t.deepEqual(Object.keys(schema.properties.parent.properties), fields); @@ -111,15 +111,23 @@ module.exports.tests.parent_fields = function(test, common) { // ref: https://github.com/pelias/schema/pull/95 module.exports.tests.parent_analysis = function(test, common) { var prop = schema.properties.parent.properties; - var fields = ['country','region','county','locality','localadmin','neighbourhood']; + var fields = [ + 'continent', 'ocean', 'empire', 'country', 'dependency', 'marinearea', + 'macroregion', 'region', 'macrocounty', 'county', 'locality', 'borough', + 'localadmin', 'neighbourhood' + ]; fields.forEach( function( field ){ test(field, function(t) { t.equal(prop[field].type, 'string'); t.equal(prop[field].analyzer, 'peliasAdmin'); + t.equal(prop[field].copy_to, `parent.${field}_ngram`); t.equal(prop[field+'_a'].type, 'string'); t.equal(prop[field+'_a'].analyzer, 'peliasAdmin'); + t.equal(prop[field+'_a'].copy_to, `parent.${field}_ngram`); t.equal(prop[field+'_id'].type, 'string'); t.equal(prop[field+'_id'].index, 'not_analyzed'); + t.equal(prop[field+'_ngram'].type, 'string'); + t.equal(prop[field+'_ngram'].analyzer, 'peliasIndexOneEdgeGram'); t.end(); }); diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json index 60c35b67..258fe43e 100644 --- a/test/fixtures/expected.json +++ b/test/fixtures/expected.json @@ -724,198 +724,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -1057,198 +1207,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -1390,198 +1690,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -1723,198 +2173,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -2056,198 +2656,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -2389,198 +3139,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -2722,198 +3622,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -3055,198 +4105,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, - "country": { - "type": "string", - "analyzer": "peliasAdmin" - }, - "country_a": { + "empire_ngram": { "type": "string", - "analyzer": "peliasAdmin" - }, + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, + "country": { + "type": "string", + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" + }, + "country_a": { + "type": "string", + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" + }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -3388,198 +4588,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -3721,198 +5071,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -4054,198 +5554,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -4387,198 +6037,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -4720,198 +6520,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -5053,198 +7003,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, @@ -5386,198 +7486,348 @@ "properties": { "continent": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.continent_ngram" }, "continent_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "continent_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "ocean": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.ocean_ngram" }, "ocean_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "ocean_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "empire": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.empire_ngram" }, "empire_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "empire_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "country": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.country_ngram" }, "country_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "country_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "dependency": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.dependency_ngram" }, "dependency_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "dependency_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "marinearea": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.marinearea_ngram" }, "marinearea_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "marinearea_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macroregion": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macroregion_ngram" }, "macroregion_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macroregion_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "region": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.region_ngram" }, "region_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "region_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "macrocounty": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.macrocounty_ngram" }, "macrocounty_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "macrocounty_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "county": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.county_ngram" }, "county_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "county_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "locality": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.locality_ngram" }, "locality_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "locality_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "borough": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.borough_ngram" }, "borough_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "borough_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "localadmin": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.localadmin_ngram" }, "localadmin_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "localadmin_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "neighbourhood": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_a": { "type": "string", - "analyzer": "peliasAdmin" + "analyzer": "peliasAdmin", + "copy_to": "parent.neighbourhood_ngram" }, "neighbourhood_id": { "type": "string", "index": "not_analyzed", "doc_values": false }, + "neighbourhood_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } + }, "postalcode": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_a": { "type": "string", - "analyzer": "peliasZip" + "analyzer": "peliasZip", + "copy_to": "parent.postalcode_ngram" }, "postalcode_id": { "type": "string", "index": "not_analyzed", "doc_values": false + }, + "postalcode_ngram": { + "type": "string", + "analyzer": "peliasIndexOneEdgeGram", + "doc_values": false, + "fielddata": { + "format": "disabled" + } } } }, diff --git a/test/partial-admin-ngram.js b/test/partial-admin-ngram.js new file mode 100644 index 00000000..acee606d --- /dev/null +++ b/test/partial-admin-ngram.js @@ -0,0 +1,69 @@ +var schema = require('../mappings/partial/admin_ngram'); + +module.exports.tests = {}; + +module.exports.tests.compile = function (test, common) { + test('valid schema file', function (t) { + t.equal(typeof schema, 'object', 'schema generated'); + t.equal(Object.keys(schema).length > 0, true, 'schema has body'); + t.end(); + }); +}; + +// this should never need to change +module.exports.tests.type = function (test, common) { + test('correct type', function (t) { + t.equal(schema.type, 'string', 'correct value'); + t.end(); + }); +}; + +module.exports.tests.store = function (test, common) { + test('store unset (will not be stored)', function (t) { + t.equal(schema.store, undefined, 'unset'); + t.end(); + }); +}; + +module.exports.tests.doc_values = function (test, common) { + test('doc_values are not required', function (t) { + t.false(schema.doc_values); + t.end(); + }); +}; + +module.exports.tests.fielddata = function (test, common) { + test('fielddata is not required', function (t) { + t.deepEqual(schema.fielddata, { + format: 'disabled' + }); + t.end(); + }); +}; + +// this should be enabled to allow 'exists' filters to work +module.exports.tests.index = function (test, common) { + test('index enabled', function (t) { + t.notEqual(schema.index, 'no', 'should not be disabled'); + t.end(); + }); +}; + +// this should be a ngram-style analysis +module.exports.tests.analysis = function (test, common) { + test('index analysis', function (t) { + t.equal(schema.analyzer, 'peliasIndexOneEdgeGram', 'should be peliasIndexOneEdgeGram'); + t.end(); + }); +}; + +module.exports.all = function (tape, common) { + + function test(name, testFunction) { + return tape('admin_ngram: ' + name, testFunction); + } + + for (var testCase in module.exports.tests) { + module.exports.tests[testCase](test, common); + } +}; diff --git a/test/run.js b/test/run.js index b0c1a87e..18141e1e 100644 --- a/test/run.js +++ b/test/run.js @@ -13,6 +13,7 @@ var tests = [ require('./document.js'), require('./partial-centroid.js'), require('./partial-admin.js'), + require('./partial-admin-ngram.js'), require('./partial-literal.js'), require('./partial-hash.js'), require('./settings.js'),