Multiple fixes

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

@@ -1,57 +1,51 @@
-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.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)
-   -- 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_isolines_service_use(len(resp))
-      --quota_service.increment_isolines_service_use(len(resp))
       return result
     else:
-      --quota_service.increment_empty_geocoder_use()
+      quota_service.increment_empty_geocoder_use()
-
   except BaseException as e:
     import sys, traceback
     type_, value_, traceback_ = sys.exc_info()
-    --quota_service.increment_failed_geocoder_use()
+    quota_service.increment_failed_geocoder_use()
     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;

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

@@ -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", "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[]"])
+  return = plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
+  -- process response
-   else:
-    plpy.error('Requested routing service is not available')
-
 $$ LANGUAGE plpythonu;

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

@@ -1,15 +1,12 @@
 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)
-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[]"])
+  return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options])
-    return plpy.execute(here_plan, [username, orgname, type, source, mode, range, options], 1)
-   else:
-    plpy.error('Requested routing service is not available')
 
 $$ LANGUAGE plpythonu;

server/lib/python/cartodb_services/cartodb_services/here/routing.py

@@ -56,8 +56,10 @@ class HereMapsRoutingIsoline:
                             if k.lower() in self.OPTIONAL_PARAMS}
         filtered_options.update(source)
         filtered_options.update(mode)
-        filtered_options.update({'range': ",".join(data_range)})
+        filtered_options.update({'range': ",".join(map(str, data_range))})
         filtered_options.update({'rangetype': range_type})
+        filtered_options.update({'app_id': self._app_id})
+        filtered_options.update({'app_code': self._app_code})
 
         return filtered_options
 

server/lib/python/cartodb_services/cartodb_services/metrics/__init__.py

@@ -1,3 +1,3 @@
-from config import GeocoderConfig, InternalGeocoderConfig, ConfigException
+from config import GeocoderConfig, RoutingConfig, InternalGeocoderConfig, ConfigException
 from quota import QuotaService
 from user import UserMetricsService

server/lib/python/cartodb_services/cartodb_services/metrics/config.py

@@ -32,7 +32,7 @@ class RoutingConfig(ServiceConfig):
 
     def __init__(self, redis_connection, username, orgname=None,
                  heremaps_app_id=None, heremaps_app_code=None):
-        super(InternalGeocoderConfig, self).__init__(redis_connection,
+        super(RoutingConfig, self).__init__(redis_connection,
                                                      username, orgname)
         self._heremaps_app_id = heremaps_app_id
         self._heremaps_app_code = heremaps_app_code