From 6ae8aa45fd561944587518b7ddf639683a652389 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Wed, 31 Jan 2018 16:13:20 +0100
Subject: [PATCH] CR changes

---
 NEWS.md                                            |  2 +-
 .../cartodb_services/mapbox/geocoder.py            | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 1ab552a..bf9629f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-January 29th, 2018
+January 31th, 2018
 ==================
 * Version `0.16.3` of the python library
     * Fix for Mapbox geocoder to handle empty requests and empty responses
diff --git a/server/lib/python/cartodb_services/cartodb_services/mapbox/geocoder.py b/server/lib/python/cartodb_services/cartodb_services/mapbox/geocoder.py
index caca851..ceba105 100644
--- a/server/lib/python/cartodb_services/cartodb_services/mapbox/geocoder.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapbox/geocoder.py
@@ -60,14 +60,14 @@ class MapboxGeocoder(Traceable):
     @qps_retry(qps=10)
     def geocode(self, searchtext, city=None, state_province=None,
                 country=None):
-        if not searchtext:
-            return []
-        else:
+        if searchtext and searchtext.strip():
             address = [searchtext]
-        if city:
-            address.append(city)
-        if state_province:
-            address.append(state_province)
+            if city:
+                address.append(city)
+            if state_province:
+                address.append(state_province)
+        else:
+            return []
 
         country = [country] if country else None