diff --git a/mappings/document.js b/mappings/document.js
index 6fc38193..dd568572 100644
--- 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
index eaef2497..83de8d40 100644
--- 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',
diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json
index 06e62dc9..4a473866 100644
--- a/test/fixtures/expected.json
+++ b/test/fixtures/expected.json
@@ -1498,6 +1498,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -1537,6 +1550,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -1787,6 +1813,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -1826,6 +1865,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2076,6 +2128,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2115,6 +2180,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2365,6 +2443,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2404,6 +2495,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2654,6 +2758,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2693,6 +2810,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2943,6 +3073,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -2982,6 +3125,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3232,6 +3388,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3271,6 +3440,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3521,6 +3703,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3560,6 +3755,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3810,6 +4018,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -3849,6 +4070,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4099,6 +4333,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4138,6 +4385,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4388,6 +4648,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4427,6 +4700,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4677,6 +4963,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4716,6 +5015,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -4966,6 +5278,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -5005,6 +5330,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -5255,6 +5593,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -5294,6 +5645,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -5544,6 +5908,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "ocean": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "ocean_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin"
@@ -5583,6 +5960,19 @@
               "index": "not_analyzed",
               "doc_values": false
             },
+            "marinearea": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_a": {
+              "type": "string",
+              "analyzer": "peliasAdmin"
+            },
+            "marinearea_id": {
+              "type": "string",
+              "index": "not_analyzed",
+              "doc_values": false
+            },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin"