From c7eb747354a4ffcea6b2604b6e86debb887eb5e6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2017 15:30:17 +0000
Subject: [PATCH 1/2] fix(package): update pelias-model to version 4.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e1a9ceb..d60c0b42 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "pelias-labels": "1.6.0",
     "pelias-logger": "0.2.0",
     "pelias-microservice-wrapper": "1.1.2",
-    "pelias-model": "4.8.1",
+    "pelias-model": "4.9.0",
     "pelias-query": "8.15.0",
     "pelias-sorting": "1.0.1",
     "pelias-text-analyzer": "1.8.3",

From 4271f574abea1bbbdfc01aae17f2825eb52ed3c8 Mon Sep 17 00:00:00 2001
From: Stephen Hess <stephen.k.hess@gmail.com>
Date: Thu, 6 Jul 2017 13:06:01 -0400
Subject: [PATCH 2/2] updated tests for pelias-model 4.9.0 changes

---
 test/unit/controller/placeholder.js | 51 ++++++++++-------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/test/unit/controller/placeholder.js b/test/unit/controller/placeholder.js
index ab64e4c5..74118c8f 100644
--- a/test/unit/controller/placeholder.js
+++ b/test/unit/controller/placeholder.js
@@ -287,8 +287,7 @@ module.exports.tests.success = (test, common) => {
               'default': 'name 3'
             },
             population: 4321,
-            popularity: 8765,
-            parent: { }
+            popularity: 8765
           }
         ]
       };
@@ -352,8 +351,7 @@ module.exports.tests.success = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -413,8 +411,7 @@ module.exports.tests.success = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -472,8 +469,7 @@ module.exports.tests.success = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -538,8 +534,7 @@ module.exports.tests.success = (test, common) => {
               },
               phrase: {
                 'default': 'name 2'
-              },
-              parent: { }
+              }
             }
           ]
         };
@@ -608,8 +603,7 @@ module.exports.tests.success = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -782,8 +776,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           },
           {
             _id: '10',
@@ -800,8 +793,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 10'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -968,8 +960,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           },
           {
             _id: '10',
@@ -986,8 +977,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 10'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -1107,8 +1097,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           },
           {
             _id: '3',
@@ -1125,8 +1114,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 3'
-            },
-            parent: { }
+            }
           },
           {
             _id: '5',
@@ -1143,8 +1131,7 @@ module.exports.tests.result_filtering = (test, common) => {
             },
             phrase: {
               'default': 'name 5'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -1567,8 +1554,7 @@ module.exports.tests.geometry_errors = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: {}
+            }
           }
         ]
       };
@@ -1628,8 +1614,7 @@ module.exports.tests.centroid_errors = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -1689,8 +1674,7 @@ module.exports.tests.centroid_errors = (test, common) => {
             },
             phrase: {
               'default': 'name 1'
-            },
-            parent: { }
+            }
           }
         ]
       };
@@ -1763,8 +1747,7 @@ module.exports.tests.boundingbox_errors = (test, common) => {
               },
               phrase: {
                 'default': 'name 1'
-              },
-              parent: { }
+              }
             }
           ]
         };