Routing server side working properly

server/extension/cdb_dataservices_server--0.3.0--0.4.0.sql

@@ -1,5 +1,4 @@
-CREATE TYPE isoline AS (center geometry(Geometry,4326), range integer, the_geom geometry(Multipolygon,4326));
+-- Get the Redis configuration from the _conf table --
-
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_routing_config(username text, orgname text)
 RETURNS boolean AS $$
   cache_key = "user_routing_config_{0}".format(username)
@@ -25,50 +24,47 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL) 
+CREATE TYPE cdb_dataservices_server.isoline AS (center geometry(Geometry,4326), data_range integer, the_geom geometry(Multipolygon,4326));
-RETURNS SETOF isoline AS $$
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, data_range integer[], options text[])
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
   import json
   from cartodb_services.here import HereMapsRoutingIsoline
   from cartodb_services.metrics import QuotaService
+  from cartodb_services.here.types import geo_polyline_to_multipolygon
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_routing_config = GD["user_routing_config_{0}".format(username)]
 
-  # -- Check the quota
   quota_service = QuotaService(user_routing_config, redis_conn)
-  if not quota_service.check_user_quota():
-    plpy.error('You have reach the limit of your quota')
 
   try:
-    client = HereMapsRoutingIsoline(user_routing_config.heremaps_app_id, user_routing_config.heremaps_app_code)
+    client = HereMapsRoutingIsoline(user_routing_config.heremaps_app_id, user_routing_config.heremaps_app_code, base_url = HereMapsRoutingIsoline.STAGING_ROUTING_BASE_URL )
 
-    #-- TODO: move this to a module function
     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']
-        start_str = 'geo!%f,%f' % (lat, lon)
+      source_str = 'geo!%f,%f' % (lat, lon)
     else:
-        source_str = None
+      source_str = None
 
     if type == 'isodistance':
-      resp = client.calculate_isodistance(source_str, mode, range, options)
+      resp = client.calculate_isodistance(source_str, mode, data_range, options)
-    else if type == 'isochrone':
+    elif type == 'isochrone':
-      resp = client.calculate_isochrone(source_str, mode, range, options)
+      resp = client.calculate_isochrone(source_str, mode, data_range, options)
 
     if resp:
       result = []
-
       for isoline in resp:
-		range = isoline['range']
+        data_range_n = isoline['range']
         polyline = isoline['geom']
-        multipolygon = cdb.here.types.geo_polyline_to_multipolygon(polyline)
+        multipolygon = geo_polyline_to_multipolygon(polyline)
-        result.append([source_str, mode, range, multipolygon])
+        result.append([source, data_range_n, multipolygon])
-
+      quota_service.increment_success_geocoder_use()
       quota_service.increment_isolines_service_use(len(resp))
       return result
     else:
       quota_service.increment_empty_geocoder_use()
-
   except BaseException as e:
     import sys, traceback
     type_, value_, traceback_ = sys.exc_info()
@@ -76,39 +72,44 @@ RETURNS SETOF isoline AS $$
     error_msg = 'There was an error trying to obtain isodistances using here maps geocoder: {0}'.format(e)
     plpy.notice(traceback.format_tb(traceback_))
     plpy.error(error_msg)
-
   finally:
-      quota_service.increment_total_geocoder_use()
+    quota_service.increment_total_geocoder_use()
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 
-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)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isodistance(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT array[]::text[])
-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", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
-    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[]"])
+  result = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
+  isolines = []
-   else:
+  for element in result:
-    plpy.error('Requested routing service is not available')
+    isoline = element['isoline']
+    isoline = isoline.translate(None, "()").split(',')
+    isolines.append(isoline)
 
+  return isolines
 $$ LANGUAGE plpythonu;
 
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT array[]::text[])
-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 = 'isochrone'
 
-  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", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
-    here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_routing_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
+  result = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
+  isolines = []
-   else:
+  for element in result:
-    plpy.error('Requested routing service is not available')
+    isoline = element['isoline']
+    isoline = isoline.translate(None, "()").split(',')
+    isolines.append(isoline)
 
+  return isolines
 $$ LANGUAGE plpythonu;

server/extension/cdb_dataservices_server--0.4.0--0.3.0.sql

@@ -1,6 +1,5 @@
-DROP TYPE IF EXISTS isoline;
+DROP FUNCTION IF EXISTS cdb_dataservices_server.cdb_isochrone(TEXT, TEXT, geometry(Geometry, 4326), TEXT, integer[], text[]);
-
+DROP FUNCTION IF EXISTS cdb_dataservices_server.cdb_isodistance(TEXT, TEXT, geometry(Geometry, 4326), TEXT, integer[], text[]);
-DROP FUNCTION IF EXISTS cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._cdb_here_routing_isolines(TEXT, TEXT, TEXT, geometry(Geometry, 4326), TEXT, integer[], text[]);
-DROP FUNCTION IF EXISTS cdb_dataservices_server.cdb_isodistance(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._get_routing_config(text, text);
-DROP FUNCTION IF EXISTS cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL);
+DROP TYPE IF EXISTS cdb_dataservices_server.isoline;
-DROP FUNCTION IF EXISTS cdb_dataservices_server._get_routing_config(username text, orgname text)

server/extension/cdb_dataservices_server--0.4.0.sql

@@ -84,17 +84,6 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 
-CREATE OR REPLACE FUNCTION _cdb_configure_heremaps(app_id text, app_code text)
-RETURNS void AS $$
-DECLARE
-    conf json;
-BEGIN
-    conf := format('{"app_id": "%s", "app_code": "%s"}', app_id, app_code);
-    PERFORM cartodb.CDB_Conf_SetConf('heremaps', conf);
-END
-$$ LANGUAGE plpgsql;
-
-routing, key cambia, clase cambia, routingconfim routing_here
 -- Get the Redis configuration from the _conf table --
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_routing_config(username text, orgname text)
 RETURNS boolean AS $$
@@ -815,52 +804,47 @@ RETURNS Geometry AS $$
     RETURN ret;
 END
 $$ LANGUAGE plpgsql;
-CREATE TYPE isoline AS (center geometry(Geometry,4326), range integer, the_geom geometry(Multipolygon,4326));
+CREATE TYPE cdb_dataservices_server.isoline AS (center geometry(Geometry,4326), data_range integer, the_geom geometry(Multipolygon,4326));
 
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL) 
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, data_range integer[], options text[])
-RETURNS SETOF isoline AS $$
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
   import json
   from cartodb_services.here import HereMapsRoutingIsoline
   from cartodb_services.metrics import QuotaService
+  from cartodb_services.here.types import geo_polyline_to_multipolygon
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_routing_config = GD["user_routing_config_{0}".format(username)]
 
-  # -- Check the quota
   quota_service = QuotaService(user_routing_config, redis_conn)
-  if not quota_service.check_user_quota():
-    plpy.error('You have reach the limit of your quota')
 
   try:
-    client = HereMapsRoutingIsoline(user_routing_config.heremaps_app_id, user_routing_config.heremaps_app_code)
+    client = HereMapsRoutingIsoline(user_routing_config.heremaps_app_id, user_routing_config.heremaps_app_code, base_url = HereMapsRoutingIsoline.STAGING_ROUTING_BASE_URL )
 
-    #-- TODO: move this to a module function
     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']
-        start_str = 'geo!%f,%f' % (lat, lon)
+      source_str = 'geo!%f,%f' % (lat, lon)
     else:
-        source_str = None
+      source_str = None
 
     if type == 'isodistance':
-      resp = client.calculate_isodistance(source_str, mode, range, options)
+      resp = client.calculate_isodistance(source_str, mode, data_range, options)
-    else if type == 'isochrone':
+    elif type == 'isochrone':
-      resp = client.calculate_isochrone(source_str, mode, range, options)
+      resp = client.calculate_isochrone(source_str, mode, data_range, options)
 
     if resp:
       result = []
-
       for isoline in resp:
-		range = isoline['range']
+        data_range_n = isoline['range']
         polyline = isoline['geom']
-        multipolygon = cdb.here.types.geo_polyline_to_multipolygon(polyline)
+        multipolygon = geo_polyline_to_multipolygon(polyline)
-        result.append([source_str, mode, range, multipolygon])
+        result.append([source, data_range_n, multipolygon])
-
+      quota_service.increment_success_geocoder_use()
       quota_service.increment_isolines_service_use(len(resp))
       return result
     else:
       quota_service.increment_empty_geocoder_use()
-
   except BaseException as e:
     import sys, traceback
     type_, value_, traceback_ = sys.exc_info()
@@ -868,38 +852,44 @@ RETURNS SETOF isoline AS $$
     error_msg = 'There was an error trying to obtain isodistances using here maps geocoder: {0}'.format(e)
     plpy.notice(traceback.format_tb(traceback_))
     plpy.error(error_msg)
-
   finally:
-      quota_service.increment_total_geocoder_use()
+    quota_service.increment_total_geocoder_use()
-$$ LANGUAGE plpythonu SECURITY DEFINER;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)
+$$ LANGUAGE plpythonu SECURITY DEFINER;
-RETURNS Geometry AS $$
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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_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", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
-    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[]"])
+  result = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
+  isolines = []
-   else:
+  for element in result:
-    plpy.error('Requested routing service is not available')
+    isoline = element['isoline']
+    isoline = isoline.translate(None, "()").split(',')
+    isolines.append(isoline)
 
+  return isolines
 $$ LANGUAGE plpythonu;
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT array[]::text[])
-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 = 'isochrone'
 
-  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", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
-    here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_routing_isolines($1, $2, $3, $4, $5, $6, $7) as isoline; ", ["text", "text", "text", "text", "geometry(Geometry, 4326)", "text", "integer[]", "text[]"])
+  result = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
+  isolines = []
-   else:
+  for element in result:
-    plpy.error('Requested routing service is not available')
+    isoline = element['isoline']
+    isoline = isoline.translate(None, "()").split(',')
+    isolines.append(isoline)
 
+  return isolines
 $$ LANGUAGE plpythonu;
 DO $$
 BEGIN

server/extension/sql/0.4.0/80_routing_helper.sql

@@ -29,12 +29,12 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
 
     if resp:
       result = []
-
       for isoline in resp:
         data_range_n = isoline['range']
         polyline = isoline['geom']
         multipolygon = geo_polyline_to_multipolygon(polyline)
         result.append([source, data_range_n, multipolygon])
+      quota_service.increment_success_geocoder_use()
       quota_service.increment_isolines_service_use(len(resp))
       return result
     else:

server/extension/sql/0.4.0/85_isodistance.sql

@@ -1,4 +1,4 @@
-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)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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']
@@ -7,6 +7,12 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   type = 'isodistance'
 
   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])
+  result = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-  -- process response
+  isolines = []
+  for element in result:
+    isoline = element['isoline']
+    isoline = isoline.translate(None, "()").split(',')
+    isolines.append(isoline)
+
+  return isolines
 $$ LANGUAGE plpythonu;

server/extension/sql/0.4.0/90_isochrone.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(username TEXT, orgname TEXT, source geometry(Geometry, 4326), mode TEXT, range integer[], options text[] DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_isochrone(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']
@@ -7,6 +7,12 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   type = 'isochrone'
 
   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])
+  result = plpy.execute(here_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
 $$ LANGUAGE plpythonu;

server/extension/test/0.4.0/expected/85_isodistance_test.out

@@ -0,0 +1,12 @@
+-- Check for isodistance signatures
+SELECT exists(SELECT *
+              FROM pg_proc p
+              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
+              WHERE ns.nspname = 'cdb_dataservices_server'
+              AND proname = 'cdb_isodistance'
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
+ exists 
+--------
+ t
+(1 row)
+

server/extension/test/0.4.0/expected/90_isochrone_test.out

@@ -0,0 +1,12 @@
+-- Check for isochrone signatures
+SELECT exists(SELECT *
+              FROM pg_proc p
+              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
+              WHERE ns.nspname = 'cdb_dataservices_server'
+              AND proname = 'cdb_isochrone'
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
+ exists 
+--------
+ t
+(1 row)
+

server/extension/test/0.4.0/sql/85_isodistance_test.sql

@@ -4,4 +4,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isodistance'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry(Geometry, 4326), text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');

server/extension/test/0.4.0/sql/90_isochrone_test.sql

@@ -4,4 +4,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isochrone'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry(Geometry, 4326), text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');