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

Multiple fixes

Browse Source
This commit is contained in:
Carla Iriberri
2016-02-10 19:59:00 +01:00
parent e996d3796a
commit d4a2184ce0
6 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/extension/sql/0.4.0/85_isodistance.sql
View File

@@ -1,15 +1,12 @@
CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isodistance(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL)
RETURNS Geometry AS $$
RETURNS SETOF cdb_dataservices_server.isoline AS $$
plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
plpy.execute("SELECT cdb_dataservices_server._get_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
user_isolines_config = GD["user_routing_config_{0}".format(username)]
type = 'isodistance'
if user_isolines_config.heremaps_geocoder:
here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_routing_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
else:
plpy.error('Requested routing service is not available')
here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_routing_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
return = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-- process response
$$ LANGUAGE plpythonu;