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

Code to glue together pg and python (WIP)

Browse Source
This commit is contained in:
Rafa de la Torre
2016-07-05 20:56:15 +02:00
parent b78bd05754
commit 6810dc0ff0
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/sql/80_isolines_helper.sql
+19 -8
View File
@@ -55,7 +55,7 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
$$ LANGUAGE plpythonu SECURITY DEFINER; $$ LANGUAGE plpythonu SECURITY DEFINER;
CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_routing_isolines( CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_isolines(
username TEXT, username TEXT,
orgname TEXT, orgname TEXT,
isotype TEXT, isotype TEXT,
@@ -65,6 +65,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_routing_isolines(
options text[]) options text[])
RETURNS SETOF cdb_dataservices_server.isoline AS $$ RETURNS SETOF cdb_dataservices_server.isoline AS $$
import json import json
from cartodb_services.mapzen import MatrixClient
from cartodb_services.mapzen import MapzenIsolines from cartodb_services.mapzen import MapzenIsolines
from cartodb_services.metrics import QuotaService from cartodb_services.metrics import QuotaService
from cartodb_services.here.types import geo_polyline_to_multipolygon # TODO do we use the same types? from cartodb_services.here.types import geo_polyline_to_multipolygon # TODO do we use the same types?
@@ -82,24 +83,34 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
mapzen_conf_str = plpy.execute("SELECT * FROM CDB_Conf_Getconf('mapzen_conf') AS mapzen_conf")[0]['mapzen_conf'] mapzen_conf_str = plpy.execute("SELECT * FROM CDB_Conf_Getconf('mapzen_conf') AS mapzen_conf")[0]['mapzen_conf']
mapzen_conf = json.loads(mapzen_conf_str) mapzen_conf = json.loads(mapzen_conf_str)
client = MapzenIsolines(mapzen_conf['routing']['api_key'])
client = MatrixClient(mapzen_conf['matrix']['api_key'])
mapzen_isolines = MapzenIsolines(client)
if source: if source:
lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat'] lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat']
lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon'] lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon']
source_str = 'geo!%f,%f' % (lat, lon) origin = {'lat': lat, 'lon': lon}
else: else:
source_str = None raise Exception('source is NULL')
# -- TODO Support options properly # -- TODO Support options properly
isolines = []
if isotype == 'isodistance': if isotype == 'isodistance':
resp = client.calculate_isodistance(source_str, mode, data_range) # -- TODO implement
raise 'not implemented'
resp = mapzen_isolines.calculate_isodistance(origin, mode, data_range)
elif isotype == 'isochrone': elif isotype == 'isochrone':
resp = client.calculate_isochrone(source_str, mode, data_range) for r in data_range:
isoline = mapzen_isolines.calculate_isochrone(origin, mode, r)
isolines.append(isoline)
if resp: return [] # -- TODO delete this
# -- TODO rewrite this block
if isolines:
result = [] result = []
for isoline in resp: for isoline in isolines:
data_range_n = isoline['range'] data_range_n = isoline['range']
polyline = isoline['geom'] polyline = isoline['geom']
multipolygon = geo_polyline_to_multipolygon(polyline) multipolygon = geo_polyline_to_multipolygon(polyline)
server/extension/sql/90_isochrone.sql
+1 -1
View File
@@ -34,7 +34,7 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
#if user_isolines_config.google_services_user: #if user_isolines_config.google_services_user:
# plpy.error('This service is not available for google service users.') # plpy.error('This service is not available for google service users.')
mapzen_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_mapzen_routing_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"]) mapzen_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_mapzen_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
result = plpy.execute(mapzen_plan, [username, orgname, type, source, mode, range, options]) result = plpy.execute(mapzen_plan, [username, orgname, type, source, mode, range, options])
isolines = [] isolines = []
for element in result: for element in result: