cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change heremaps module to support host as parameter

Browse Source
This commit is contained in:
Mario de Frutos
2016-01-25 17:36:18 +01:00
parent 90ba8c88d1
commit 4e53397f1c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/sql/0.1.0/20_geocode_street.sql
+1 -1
View File
@@ -3,7 +3,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_street_point_v2(usern
RETURNS Geometry AS $$ RETURNS Geometry AS $$
plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username)) plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username))
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] 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)] user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
if user_geocoder_config.heremaps_geocoder: if user_geocoder_config.heremaps_geocoder:
server/lib/python/heremaps/heremaps/heremapsgeocoder.py
+5 -4
View File
@@ -13,8 +13,8 @@ from heremaps.heremapsexceptions import MalformedResult
class Geocoder: class Geocoder:
'A Here Maps Geocoder wrapper for python' 'A Here Maps Geocoder wrapper for python'
URL_GEOCODE_JSON = 'http://geocoder.api.here.com/6.2/geocode.json' PRODUCTION_GEOCODE_JSON_URL = 'https://geocoder.api.here.com/6.2/geocode.json'
URL_DEV_GEOCODE_JSON = 'http://localhost:6083/geocode.json' STAGING_GEOCODE_JSON_URL = 'https://geocoder.cit.api.here.com/6.2/geocode.json'
DEFAULT_MAXRESULTS = 1 DEFAULT_MAXRESULTS = 1
DEFAULT_GEN = 9 DEFAULT_GEN = 9
@@ -55,11 +55,12 @@ class Geocoder:
maxresults = '' maxresults = ''
def __init__(self, app_id, app_code, maxresults=DEFAULT_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_id = app_id
self.app_code = app_code self.app_code = app_code
self.maxresults = maxresults self.maxresults = maxresults
self.gen = gen self.gen = gen
self.host = host
def geocode(self, params): def geocode(self, params):
if not set(params.keys()).issubset(set(self.ADDRESS_PARAMS)): if not set(params.keys()).issubset(set(self.ADDRESS_PARAMS)):
@@ -80,7 +81,7 @@ class Geocoder:
'gen': self.gen 'gen': self.gen
} }
request_params.update(params) 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: if response.status_code == requests.codes.ok:
return json.loads(response.text) return json.loads(response.text)
else: else: