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

Nokia geocoder config moved to the config helper

Browse Source
This commit is contained in:
Mario de Frutos
2016-01-21 08:23:41 +01:00
parent fc35911b91
commit ad9c16b4df
3 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/extension/sql/0.1.0/15_config_helper.sql
View File

@@ -5,10 +5,19 @@ RETURNS boolean AS $$
if cache_key in GD:
return False
else:
import json
from cartodb_geocoder import config_helper
plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username))
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
geocoder_config = config_helper.GeocoderConfig(redis_conn, username, orgname)
heremaps_conf_json = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as heremaps_conf", 1)[0]['heremaps_conf']
if not heremaps_conf_json:
heremaps_app_id = None
heremaps_app_code = None
else:
heremaps_conf = json.loads(heremaps_conf_json)
heremaps_app_id = heremaps_conf['app_id']
heremaps_app_code = heremaps_conf['app_code']
geocoder_config = config_helper.GeocoderConfig(redis_conn, username, orgname, heremaps_app_id, heremaps_app_code)
# --Think about the security concerns with this kind of global cache, it should be only available
# --for this user session but...
GD[cache_key] = geocoder_config

9
server/extension/sql/0.1.0/20_geocode_street.sql
View File

@@ -2,7 +2,6 @@
DROP FUNCTION IF EXISTS cdb_geocoder_server.cdb_geocode_street_point(TEXT, TEXT, TEXT, TEXT);
CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
RETURNS Geometry AS $$
import json
from heremaps import heremapsgeocoder
from cartodb_geocoder import quota_service
@@ -14,13 +13,9 @@ RETURNS Geometry AS $$
# -- Check the quota
quota_service = quota_service.QuotaService(user_geocoder_config, redis_conn, username, orgname)
if not quota_service.check_user_quota():
plpy.error('You have reach limit of your quota')
plpy.error('You have reach the limit of your quota')
heremaps_conf = json.loads(plpy.execute("SELECT cdb_geocoder_server._get_conf('heremaps')", 1)[0]['get_conf'])
app_id = heremaps_conf['geocoder']['app_id']
app_code = heremaps_conf['geocoder']['app_code']
geocoder = heremapsgeocoder.Geocoder(app_id, app_code)
geocoder = heremapsgeocoder.Geocoder(user_geocoder_config.heremaps_app_id, user_geocoder_config.heremaps_app_code)
results = geocoder.geocode_address(searchtext=searchtext, city=city, state=state_province, country=country)
coordinates = geocoder.extract_lng_lat_from_result(results[0])
plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])