Add more placetypes to download

README.md

@@ -31,12 +31,15 @@ Currently, the supported hierarchy types are:
 - county
 - dependency
 - disputed
+- [empire](https://www.youtube.com/watch?v=-bzWSJG93P8)
 - localadmin
 - locality
 - macrocounty
 - macrohood
 - macroregion
+- marinearea
 - neighbourhood
+- ocean
 - region
 - postalcodes (optional, see configuration)
 

src/bundleList.js

@@ -17,7 +17,10 @@ const peliasConfig = require( 'pelias-config' ).generate(require('../schema'));
 //
 // downloading can be done in any order, but the same order might as well be used
 const hierarchyRoles = [
+  'ocean',
+  'marinearea',
   'continent',
+  'empire',
   'country',
   'dependency',
   'disputed',

src/components/extractFields.js

@@ -76,6 +76,21 @@ function getAbbreviation(properties) {
   return properties['wof:abbreviation'];
 }
 
+function getHierarchies(id, properties) {
+  // if there are no hierarchies but there's a placetype, synthesize a hierarchy
+  if (_.isEmpty(_.get(properties, 'wof:hierarchy')) && _.has(properties, 'wof:placetype')) {
+    const hierarchy = {};
+    hierarchy[properties['wof:placetype'] + '_id'] = id;
+
+    return [hierarchy];
+
+  }
+
+  // otherwise just return the hierarchies as-is
+  return _.defaultTo(properties['wof:hierarchy'], []);
+
+}
+
 /*
   This function extracts the fields from the json_object that we're interested
   in for creating Pelias Document objects.  If there is no hierarchy then a
@@ -94,7 +109,7 @@ module.exports.create = function map_fields_stream() {
       bounding_box: getBoundingBox(json_object.properties),
       population: getPopulation(json_object.properties),
       popularity: json_object.properties['misc:photo_sum'],
-      hierarchies: _.get(json_object, 'properties.wof:hierarchy', [])
+      hierarchies: getHierarchies(json_object.id, json_object.properties)
     };
 
     // use the QS altname if US county and available

src/peliasDocGenerators.js

@@ -15,6 +15,10 @@ function assignField(hierarchyElement, wofDoc) {
     case 'county':
     case 'macrocounty':
     case 'macroregion':
+    case 'empire':
+    case 'continent':
+    case 'ocean':
+    case 'marinearea':
     case 'postalcode':
       // the above place_types don't have abbrevations (yet)
       wofDoc.addParent(hierarchyElement.place_type, hierarchyElement.name, hierarchyElement.id.toString());

test/bundleList.js

@@ -9,7 +9,10 @@ proxyquire.noPreserveCache();
 proxyquire.noCallThru();
 
 const ADMIN = [
+  'ocean',
+  'marinearea',
   'continent',
+  'empire',
   'country',
   'dependency',
   'disputed',

test/peliasDocGeneratorsTest.js

@@ -13,7 +13,9 @@ function test_stream(input, testedStream, callback) {
 tape('create', function(test) {
   test.test('non-country place_types should be returned as Document with that place_type', function(t) {
     var place_types = ['neighbourhood', 'locality', 'borough', 'localadmin',
-                        'county', 'macrocounty', 'region', 'macroregion', 'dependency', 'postalcode'];
+                        'county', 'macrocounty', 'region', 'macroregion',
+                        'dependency', 'postalcode', 'ocean', 'marinearea',
+                        'continent', 'empire'];
 
     place_types.forEach(function(place_type) {
       var wofRecords = {

test/readStreamTest.js

@@ -83,7 +83,9 @@ tape('readStream', (test) => {
             bounding_box: '-13.691314,49.909613,1.771169,60.847886',
             population: 98765,
             popularity: 87654,
-            hierarchies: []
+            hierarchies: [
+              { 'place type 1_id': 123 }
+            ]
           },
           '456': {
             id: 456,
@@ -95,7 +97,9 @@ tape('readStream', (test) => {
             bounding_box: '-24.539906,34.815009,69.033946,81.85871',
             population: undefined,
             popularity: undefined,
-            hierarchies: []
+            hierarchies: [
+              { 'place type 2_id': 456 }
+            ]
           }
         });