From 4e53397f1ce16a06e2f055ff9e66128d058326cd Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 25 Jan 2016 17:36:18 +0100 Subject: [PATCH] Change heremaps module to support host as parameter --- server/extension/sql/0.1.0/20_geocode_street.sql | 2 +- server/lib/python/heremaps/heremaps/heremapsgeocoder.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/extension/sql/0.1.0/20_geocode_street.sql b/server/extension/sql/0.1.0/20_geocode_street.sql index 3eac170..b396ef3 100644 --- a/server/extension/sql/0.1.0/20_geocode_street.sql +++ b/server/extension/sql/0.1.0/20_geocode_street.sql @@ -3,7 +3,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_street_point_v2(usern RETURNS Geometry AS $$ plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username)) redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] - plpy.execute("SELECT cdb_geocoder_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quota_nullable(orgname))) + plpy.execute("SELECT cdb_geocoder_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname))) user_geocoder_config = GD["user_geocoder_config_{0}".format(username)] if user_geocoder_config.heremaps_geocoder: diff --git a/server/lib/python/heremaps/heremaps/heremapsgeocoder.py b/server/lib/python/heremaps/heremaps/heremapsgeocoder.py index 0e7852d..9ebe1df 100644 --- a/server/lib/python/heremaps/heremaps/heremapsgeocoder.py +++ b/server/lib/python/heremaps/heremaps/heremapsgeocoder.py @@ -13,8 +13,8 @@ from heremaps.heremapsexceptions import MalformedResult class Geocoder: 'A Here Maps Geocoder wrapper for python' - URL_GEOCODE_JSON = 'http://geocoder.api.here.com/6.2/geocode.json' - URL_DEV_GEOCODE_JSON = 'http://localhost:6083/geocode.json' + PRODUCTION_GEOCODE_JSON_URL = 'https://geocoder.api.here.com/6.2/geocode.json' + STAGING_GEOCODE_JSON_URL = 'https://geocoder.cit.api.here.com/6.2/geocode.json' DEFAULT_MAXRESULTS = 1 DEFAULT_GEN = 9 @@ -55,11 +55,12 @@ class Geocoder: maxresults = '' def __init__(self, app_id, app_code, maxresults=DEFAULT_MAXRESULTS, - gen=DEFAULT_GEN): + gen=DEFAULT_GEN, host=PRODUCTION_GEOCODE_JSON_URL): self.app_id = app_id self.app_code = app_code self.maxresults = maxresults self.gen = gen + self.host = host def geocode(self, params): if not set(params.keys()).issubset(set(self.ADDRESS_PARAMS)): @@ -80,7 +81,7 @@ class Geocoder: 'gen': self.gen } request_params.update(params) - response = requests.get(self.URL_GEOCODE_JSON, params=request_params) + response = requests.get(self.host, params=request_params) if response.status_code == requests.codes.ok: return json.loads(response.text) else: