From 4cb1a6f80b558da56eac8110e345be07ed47bdb1 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Thu, 8 Mar 2018 23:00:21 +0200
Subject: [PATCH] SearchPage: fix undefined origin

---
 src/containers/SearchPage/SearchPage.js                    | 7 ++++---
 .../SearchPage/__snapshots__/SearchPage.test.js.snap       | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/containers/SearchPage/SearchPage.js b/src/containers/SearchPage/SearchPage.js
index 9e348ec8..9134a95b 100644
--- a/src/containers/SearchPage/SearchPage.js
+++ b/src/containers/SearchPage/SearchPage.js
@@ -86,9 +86,10 @@ const validURLParamsForExtendedData = params => {
 // extract search parameters, including a custom attribute named category
 const pickSearchParamsOnly = params => {
   const { address, origin, bounds, country, ...rest } = params || {};
-  const originMaybe = config.sortSearchByDistance ? { origin } : {};
+  const boundsMaybe = bounds ? { bounds } : {};
+  const originMaybe = config.sortSearchByDistance && origin ? { origin } : {};
   return {
-    bounds,
+    ...boundsMaybe,
     ...originMaybe,
     ...validURLParamForExtendedData(CATEGORY_URL_PARAM, rest),
     ...validURLParamForExtendedData(AMENITIES_URL_PARAM, rest),
@@ -552,7 +553,7 @@ SearchPage.loadData = (params, search) => {
     latlngBounds: ['bounds'],
   });
   const { page = 1, address, country, origin, ...rest } = queryParams;
-  const originMaybe = config.sortSearchByDistance ? { origin } : {};
+  const originMaybe = config.sortSearchByDistance && origin ? { origin } : {};
   return searchListings({
     ...rest,
     ...originMaybe,
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index c18f31ec..b72b4352 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -19,11 +19,7 @@ exports[`SearchPageComponent matches snapshot 1`] = `
 >
   <withRouter(Connect(TopbarContainerComponent))
     currentPage="SearchPage"
-    currentSearchParams={
-      Object {
-        "bounds": undefined,
-      }
-    }
+    currentSearchParams={Object {}}
   />
   <div>
     <div>