Merge pull request #334 from pelias/add-water-placetypes

fix(parent): Add ocean and marinearea to parent fields
pelias · Nov 5, 2018 · 666cc16 · 666cc16
2 parents b679d16 + b7a2d88
commit 666cc16
Show file tree

Hide file tree

Showing 3 changed files with 402 additions and 0 deletions.
diff --git a/mappings/document.js b/mappings/document.js
@@ -57,6 +57,11 @@ var schema = {
         continent_a: admin,
         continent_id: literal,
 
+        // https://github.com/whosonfirst/whosonfirst-placetypes#ocean
+        ocean: admin,
+        ocean_a: admin,
+        ocean_id: literal,
+
         // https://github.com/whosonfirst/whosonfirst-placetypes#empire
         empire: admin,
         empire_a: admin,
@@ -72,6 +77,11 @@ var schema = {
         dependency_a: admin,
         dependency_id: literal,
 
+        // https://github.com/whosonfirst/whosonfirst-placetypes#marinearea
+        marinearea: admin,
+        marinearea_a: admin,
+        marinearea_id: literal,
+
         // https://github.com/whosonfirst/whosonfirst-placetypes#macroregion
         macroregion: admin,
         macroregion_a: admin,

diff --git a/test/document.js b/test/document.js
@@ -86,9 +86,11 @@ module.exports.tests.address_analysis = function(test, common) {
 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',