Refactor country conversion for TomTom geocoders

server/lib/python/cartodb_services/cartodb_services/tomtom/bulk_geocoder.py

@@ -5,7 +5,6 @@ from cartodb_services.geocoder import geocoder_error_response
 from cartodb_services.tomtom import TomTomGeocoder
 from cartodb_services.tools.qps import qps_retry
 from cartodb_services.tools.exceptions import ServiceException
-from cartodb_services.tools.country import country_to_iso3
 
 
 class TomTomBulkGeocoder(TomTomGeocoder, StreetPointBulkGeocoder):
@@ -37,8 +36,6 @@ class TomTomBulkGeocoder(TomTomGeocoder, StreetPointBulkGeocoder):
         for search in searches:
             (search_id, address, city, state, country) = search
 
-            country = country_to_iso3(country) or country
-
             address = address.encode('utf-8') if address else None
             city = city.encode('utf-8') if city else None
             state = state.encode('utf-8') if state else None

server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py

@@ -10,6 +10,7 @@ from cartodb_services.metrics import Traceable
 from cartodb_services.tools.exceptions import ServiceException
 from cartodb_services.tools.qps import qps_retry
 from cartodb_services.tools.normalize import normalize
+from cartodb_services.tools.country import country_to_iso3
 
 HOST = 'https://api.tomtom.com'
 API_BASEURI = '/search/2'
@@ -48,7 +49,7 @@ class TomTomGeocoder(Traceable):
     def _request_uri(self, searchtext, country=None, apiKey=None):
         baseuri = REQUEST_BASEURI
         if country:
-            baseuri += '&countrySet={}'.format(country)
+            baseuri += '&countrySet={}'.format(country_to_iso3(country) or country)
         baseuri = baseuri + '&key={apiKey}' if apiKey else baseuri
         return URITemplate(baseuri).expand(apiKey=apiKey,
                                            searchtext=searchtext.encode('utf-8'))