Integrate isodistance into SQL API

client/renderer/interface.yaml

@@ -113,6 +113,16 @@
     - { name: range, type: "integer[]" }
     - { name: options, type: "text[]", default: 'ARRAY[]::text[]' }
 
+- name: cdb_mapzen_distance
+  return_type: SETOF cdb_dataservices_client.isoline
+  multi_row: true
+  multi_field: true
+  params:
+    - { name: source,  type: "geometry(Geometry, 4326)" }
+    - { name: mode, type: text }
+    - { name: range, type: "integer[]" }
+    - { name: options, type: "text[]", default: 'ARRAY[]::text[]' }
+
 - name: cdb_route_point_to_point
   return_type: cdb_dataservices_client.simple_route
   multi_field: true

server/extension/sql/80_isolines_helper.sql

@@ -68,7 +68,6 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   from cartodb_services.mapzen import MatrixClient
   from cartodb_services.mapzen import MapzenIsolines
   from cartodb_services.metrics import QuotaService
-  from cartodb_services.here.types import geo_polyline_to_multipolygon # TODO do we use the same types?
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_mapzen_isolines_routing_config = GD["user_mapzen_isolines_routing_config_{0}".format(username)]
@@ -92,9 +91,9 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
     # -- TODO Support options properly
     isolines = {}
     if isotype == 'isodistance':
-      # -- TODO implement
-      raise 'not implemented'
-      resp = mapzen_isolines.calculate_isodistance(origin, mode, data_range)
+      for r in data_range:
+          isoline = mapzen_isolines.calculate_isodistance(origin, mode, r)
+          isolines[r] = (isoline)
     elif isotype == 'isochrone':
       for r in data_range:
           isoline = mapzen_isolines.calculate_isochrone(origin, mode, r)

server/extension/sql/85_isodistance.sql

@@ -19,3 +19,18 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
 
   return isolines
 $$ LANGUAGE plpythonu;
+
+-- mapzen isodistance
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_mapzen_isodistance(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT array[]::text[])
+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_mapzen_isolines_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_mapzen_isolines_routing_config_{0}".format(username)]
+  type = 'isodistance'
+
+  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])
+
+  return result
+$$ LANGUAGE plpythonu;

server/extension/sql/90_isochrone.sql

@@ -30,17 +30,8 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   user_isolines_config = GD["user_mapzen_isolines_routing_config_{0}".format(username)]
   type = 'isochrone'
 
-  # If we were to add a config check, it'll go here
-  #if user_isolines_config.google_services_user:
-  #  plpy.error('This service is not available for google service users.')
-
   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])
-  isolines = []
-  for element in result:
-    isoline = element['isoline']
-    isoline = isoline.translate(None, "()").split(',')
-    isolines.append(isoline)
 
-  return isolines
+  return result
 $$ LANGUAGE plpythonu;