Fixed CR suggestions

NEWS.md

@@ -1,8 +1,20 @@
 
+March 16th, 2018
+================
+* Version `0.30.4` of server side
+    * Added ST_CollectionExtract to ST_MakeValid for Mapbox isolines to avoid non-polygonal geometries
+
+March 16th, 2018
+================
+* Version `0.30.3` of server side
+    * Fix problem with invalid Mapbox isolines
+
 March 14th, 2018
-==================
+================
-* Version `0.30.3` of server side
+* Version `0.17.4` of the python library
-    * Avoid reaching provider for empty geocodings. Stopping in the server side PL/Python functions
+    * Fix bug with previous version when checking quotas
+* Version `0.17.3` of the python library
+    * Fix bug with Mapbox routing not using the proper quota value
 
 February 22th, 2018
 ==================

server/extension/cdb_dataservices_server--0.30.2--0.30.3.sql

@@ -1,177 +0,0 @@
---DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
--- Complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.3'" to load this file. \quit
-
--- HERE goes your code to upgrade/downgrade
--- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import LegacyServiceManager
-  from cartodb_services.tools import QuotaExceededException
-  from cartodb_services.here import HereMapsGeocoder
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
-    geocoder = HereMapsGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using here maps', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using here maps')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import LegacyServiceManager, QuotaExceededException
-  from cartodb_services.google import GoogleMapsGeocoder
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits(quota=False)
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
-    geocoder = GoogleMapsGeocoder(service_manager.config.google_client_id, service_manager.config.google_api_key, service_manager.logger)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using google maps', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using google maps')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import ServiceManager, QuotaExceededException
-  from cartodb_services.mapzen import MapzenGeocoder
-  from cartodb_services.tools.country import country_to_iso3
-  from cartodb_services.refactor.service.mapzen_geocoder_config import MapzenGeocoderConfigBuilder
-
-  import cartodb_services
-  cartodb_services.init(plpy, GD)
-
-  service_manager = ServiceManager('geocoder', MapzenGeocoderConfigBuilder, username, orgname)
-
-  try:
-    service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
-    geocoder = MapzenGeocoder(service_manager.config.mapzen_api_key, service_manager.logger, service_manager.config.service_params)
-    country_iso3 = None
-    if country:
-      country_iso3 = country_to_iso3(country)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city,
-                                   state_province=state_province,
-                                   country=country_iso3, search_type='address')
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using mapzen', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using mapzen')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from iso3166 import countries
-  from cartodb_services.tools import ServiceManager, QuotaExceededException
-  from cartodb_services.mapbox import MapboxGeocoder
-  from cartodb_services.tools.country import country_to_iso3
-  from cartodb_services.refactor.service.mapbox_geocoder_config import MapboxGeocoderConfigBuilder
-
-  import cartodb_services
-  cartodb_services.init(plpy, GD)
-
-  service_manager = ServiceManager('geocoder', MapboxGeocoderConfigBuilder, username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
-    geocoder = MapboxGeocoder(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
-
-    country_iso3166 = None
-    if country:
-      country_iso3 = country_to_iso3(country)
-      if country_iso3:
-        country_iso3166 = countries.get(country_iso3).alpha2.lower()
-
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city,
-                                   state_province=state_province,
-                                   country=country_iso3166)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using mapbox', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using mapbox')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server--0.30.3--0.30.2.sql

@@ -1,160 +0,0 @@
---DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
--- Complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.2'" to load this file. \quit
-
--- HERE goes your code to upgrade/downgrade
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import LegacyServiceManager
-  from cartodb_services.tools import QuotaExceededException
-  from cartodb_services.here import HereMapsGeocoder
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits()
-
-    geocoder = HereMapsGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using here maps', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using here maps')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import LegacyServiceManager, QuotaExceededException
-  from cartodb_services.google import GoogleMapsGeocoder
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits(quota=False)
-
-    geocoder = GoogleMapsGeocoder(service_manager.config.google_client_id, service_manager.config.google_api_key, service_manager.logger)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using google maps', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using google maps')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from cartodb_services.tools import ServiceManager, QuotaExceededException
-  from cartodb_services.mapzen import MapzenGeocoder
-  from cartodb_services.tools.country import country_to_iso3
-  from cartodb_services.refactor.service.mapzen_geocoder_config import MapzenGeocoderConfigBuilder
-
-  import cartodb_services
-  cartodb_services.init(plpy, GD)
-
-  service_manager = ServiceManager('geocoder', MapzenGeocoderConfigBuilder, username, orgname)
-
-  try:
-    service_manager.assert_within_limits()
-
-    geocoder = MapzenGeocoder(service_manager.config.mapzen_api_key, service_manager.logger, service_manager.config.service_params)
-    country_iso3 = None
-    if country:
-      country_iso3 = country_to_iso3(country)
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city,
-                                   state_province=state_province,
-                                   country=country_iso3, search_type='address')
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using mapzen', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using mapzen')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
-RETURNS Geometry AS $$
-  from iso3166 import countries
-  from cartodb_services.tools import ServiceManager, QuotaExceededException
-  from cartodb_services.mapbox import MapboxGeocoder
-  from cartodb_services.tools.country import country_to_iso3
-  from cartodb_services.refactor.service.mapbox_geocoder_config import MapboxGeocoderConfigBuilder
-
-  import cartodb_services
-  cartodb_services.init(plpy, GD)
-
-  service_manager = ServiceManager('geocoder', MapboxGeocoderConfigBuilder, username, orgname, GD)
-
-  try:
-    service_manager.assert_within_limits()
-
-    geocoder = MapboxGeocoder(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
-
-    country_iso3166 = None
-    if country:
-      country_iso3 = country_to_iso3(country)
-      if country_iso3:
-        country_iso3166 = countries.get(country_iso3).alpha2.lower()
-
-    coordinates = geocoder.geocode(searchtext=searchtext, city=city,
-                                   state_province=state_province,
-                                   country=country_iso3166)
-    if coordinates:
-      service_manager.quota_service.increment_success_service_use()
-      plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
-      point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
-      return point['st_setsrid']
-    else:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-  except QuotaExceededException as qe:
-    service_manager.quota_service.increment_failed_service_use()
-    return None
-  except BaseException as e:
-    import sys
-    service_manager.quota_service.increment_failed_service_use()
-    service_manager.logger.error('Error trying to geocode street point using mapbox', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to geocode street point using mapbox')
-  finally:
-    service_manager.quota_service.increment_total_service_use()
-$$ LANGUAGE plpythonu STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server--0.30.3--0.30.4.sql

@@ -0,0 +1,69 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.4'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_isodistance(
+   username TEXT,
+   orgname TEXT,
+   source geometry(Geometry, 4326),
+   mode TEXT,
+   data_range integer[],
+   options text[])
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxMatrixClient, MapboxIsolines
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.refactor.service.mapbox_isolines_config import MapboxIsolinesConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('isolines', MapboxIsolinesConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxMatrixClient(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+    mapbox_isolines = MapboxIsolines(client, service_manager.logger)
+
+    if source:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon']
+      origin = Coordinate(lon,lat)
+    else:
+      raise Exception('source is NULL')
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+
+    # -- TODO Support options properly
+    isolines = {}
+    for r in data_range:
+        isoline = mapbox_isolines.calculate_isodistance(origin, r, profile)
+        isolines[r] = isoline
+
+    result = []
+    for r in data_range:
+
+      if len(isolines[r]) >= 3:
+        # -- TODO encapsulate this block into a func/method
+        locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
+        wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
+        sql = "SELECT ST_CollectionExtract(ST_MakeValid(ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326)),3) as geom".format(wkt_coordinates)
+        multipolygon = plpy.execute(sql, 1)[0]['geom']
+      else:
+        multipolygon = None
+
+      result.append([source, r, multipolygon])
+
+    service_manager.quota_service.increment_success_service_use()
+    service_manager.quota_service.increment_isolines_service_use(len(isolines))
+    return result
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to get Mapbox isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get Mapbox isolines')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server--0.30.4--0.30.3.sql

@@ -0,0 +1,69 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.3'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_isodistance(
+   username TEXT,
+   orgname TEXT,
+   source geometry(Geometry, 4326),
+   mode TEXT,
+   data_range integer[],
+   options text[])
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxMatrixClient, MapboxIsolines
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.refactor.service.mapbox_isolines_config import MapboxIsolinesConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('isolines', MapboxIsolinesConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxMatrixClient(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+    mapbox_isolines = MapboxIsolines(client, service_manager.logger)
+
+    if source:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon']
+      origin = Coordinate(lon,lat)
+    else:
+      raise Exception('source is NULL')
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+
+    # -- TODO Support options properly
+    isolines = {}
+    for r in data_range:
+        isoline = mapbox_isolines.calculate_isodistance(origin, r, profile)
+        isolines[r] = isoline
+
+    result = []
+    for r in data_range:
+
+      if len(isolines[r]) >= 3:
+        # -- TODO encapsulate this block into a func/method
+        locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
+        wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
+        sql = "SELECT ST_MakeValid(ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326)) as geom".format(wkt_coordinates)
+        multipolygon = plpy.execute(sql, 1)[0]['geom']
+      else:
+        multipolygon = None
+
+      result.append([source, r, multipolygon])
+
+    service_manager.quota_service.increment_success_service_use()
+    service_manager.quota_service.increment_isolines_service_use(len(isolines))
+    return result
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to get Mapbox isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get Mapbox isolines')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server.control

@@ -1,5 +1,5 @@
 comment = 'CartoDB dataservices server extension'
-default_version = '0.30.3'
+default_version = '0.30.4'
 requires = 'plpythonu, plproxy, postgis, cdb_geocoder'
 superuser = true
 schema = cdb_dataservices_server

server/extension/old_versions/cdb_dataservices_server--0.30.2--0.30.3.sql

@@ -0,0 +1,70 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.3'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_isodistance(
+   username TEXT,
+   orgname TEXT,
+   source geometry(Geometry, 4326),
+   mode TEXT,
+   data_range integer[],
+   options text[])
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxMatrixClient, MapboxIsolines
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.refactor.service.mapbox_isolines_config import MapboxIsolinesConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('isolines', MapboxIsolinesConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxMatrixClient(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+    mapbox_isolines = MapboxIsolines(client, service_manager.logger)
+
+    if source:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon']
+      origin = Coordinate(lon,lat)
+    else:
+      raise Exception('source is NULL')
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+
+    # -- TODO Support options properly
+    isolines = {}
+    for r in data_range:
+        isoline = mapbox_isolines.calculate_isodistance(origin, r, profile)
+        isolines[r] = isoline
+
+    result = []
+    for r in data_range:
+
+      if len(isolines[r]) >= 3:
+        # -- TODO encapsulate this block into a func/method
+        locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
+        wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
+        sql = "SELECT ST_MakeValid(ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326)) as geom".format(wkt_coordinates)
+        multipolygon = plpy.execute(sql, 1)[0]['geom']
+      else:
+        multipolygon = None
+
+      result.append([source, r, multipolygon])
+
+    service_manager.quota_service.increment_success_service_use()
+    service_manager.quota_service.increment_isolines_service_use(len(isolines))
+    return result
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to get Mapbox isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get Mapbox isolines')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.30.3--0.30.2.sql

@@ -0,0 +1,70 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.30.2'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_isodistance(
+   username TEXT,
+   orgname TEXT,
+   source geometry(Geometry, 4326),
+   mode TEXT,
+   data_range integer[],
+   options text[])
+RETURNS SETOF cdb_dataservices_server.isoline AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxMatrixClient, MapboxIsolines
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.refactor.service.mapbox_isolines_config import MapboxIsolinesConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('isolines', MapboxIsolinesConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxMatrixClient(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+    mapbox_isolines = MapboxIsolines(client, service_manager.logger)
+
+    if source:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % source)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % source)[0]['lon']
+      origin = Coordinate(lon,lat)
+    else:
+      raise Exception('source is NULL')
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+
+    # -- TODO Support options properly
+    isolines = {}
+    for r in data_range:
+        isoline = mapbox_isolines.calculate_isodistance(origin, r, profile)
+        isolines[r] = isoline
+
+    result = []
+    for r in data_range:
+
+      if len(isolines[r]) >= 3:
+        # -- TODO encapsulate this block into a func/method
+        locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
+        wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
+        sql = "SELECT ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326) as geom".format(wkt_coordinates)
+        multipolygon = plpy.execute(sql, 1)[0]['geom']
+      else:
+        multipolygon = None
+
+      result.append([source, r, multipolygon])
+
+    service_manager.quota_service.increment_success_service_use()
+    service_manager.quota_service.increment_isolines_service_use(len(isolines))
+    return result
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to get Mapbox isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get Mapbox isolines')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.30.3.sql

@@ -1973,11 +1973,6 @@ RETURNS Geometry AS $$
 
   try:
     service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = HereMapsGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
     coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
     if coordinates:
@@ -2010,11 +2005,6 @@ RETURNS Geometry AS $$
 
   try:
     service_manager.assert_within_limits(quota=False)
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = GoogleMapsGeocoder(service_manager.config.google_client_id, service_manager.config.google_api_key, service_manager.logger)
     coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
     if coordinates:
@@ -2051,11 +2041,6 @@ RETURNS Geometry AS $$
 
   try:
     service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = MapzenGeocoder(service_manager.config.mapzen_api_key, service_manager.logger, service_manager.config.service_params)
     country_iso3 = None
     if country:
@@ -2098,11 +2083,6 @@ RETURNS Geometry AS $$
 
   try:
     service_manager.assert_within_limits()
-
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = MapboxGeocoder(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
 
     country_iso3166 = None
@@ -3079,7 +3059,7 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
         # -- TODO encapsulate this block into a func/method
         locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
         wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
-        sql = "SELECT ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326) as geom".format(wkt_coordinates)
+        sql = "SELECT ST_MakeValid(ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326)) as geom".format(wkt_coordinates)
         multipolygon = plpy.execute(sql, 1)[0]['geom']
       else:
         multipolygon = None

server/extension/sql/20_geocode_street.sql

@@ -99,10 +99,6 @@ RETURNS Geometry AS $$
   try:
     service_manager.assert_within_limits()
 
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = HereMapsGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
     coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
     if coordinates:
@@ -136,10 +132,6 @@ RETURNS Geometry AS $$
   try:
     service_manager.assert_within_limits(quota=False)
 
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = GoogleMapsGeocoder(service_manager.config.google_client_id, service_manager.config.google_api_key, service_manager.logger)
     coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
     if coordinates:
@@ -177,10 +169,6 @@ RETURNS Geometry AS $$
   try:
     service_manager.assert_within_limits()
 
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = MapzenGeocoder(service_manager.config.mapzen_api_key, service_manager.logger, service_manager.config.service_params)
     country_iso3 = None
     if country:
@@ -224,10 +212,6 @@ RETURNS Geometry AS $$
   try:
     service_manager.assert_within_limits()
 
-    if not searchtext and not city and not state_province and not country:
-      service_manager.quota_service.increment_empty_service_use()
-      return None
-
     geocoder = MapboxGeocoder(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
 
     country_iso3166 = None

server/extension/sql/80_isolines_helper.sql

@@ -169,7 +169,7 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
         # -- TODO encapsulate this block into a func/method
         locations = isolines[r] + [ isolines[r][0] ] # close the polygon repeating the first point
         wkt_coordinates = ','.join(["%f %f" % (l.longitude, l.latitude) for l in locations])
-        sql = "SELECT ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326) as geom".format(wkt_coordinates)
+        sql = "SELECT ST_CollectionExtract(ST_MakeValid(ST_MPolyFromText('MULTIPOLYGON((({0})))', 4326)),3) as geom".format(wkt_coordinates)
         multipolygon = plpy.execute(sql, 1)[0]['geom']
       else:
         multipolygon = None

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

@@ -153,7 +153,7 @@ class RoutingConfig(ServiceConfig):
         elif self._routing_provider == self.MAPBOX_PROVIDER:
             self._mapbox_api_keys = self._db_config.mapbox_routing_api_keys
             self._mapbox_service_params = self._db_config.mapbox_routing_service_params
-        self._set_monthly_quota()
+        self._routing_quota = self._get_effective_monthly_quota(self.QUOTA_KEY)
         self._set_soft_limit()
         self._period_end_date = date_parse(self._redis_config[self.PERIOD_END_DATE])
 
@@ -192,9 +192,13 @@ class RoutingConfig(ServiceConfig):
     def mapbox_service_params(self):
         return self._mapbox_service_params
 
+    @property
+    def routing_quota(self):
+        return self._routing_quota
+
     @property
     def monthly_quota(self):
-        return self._monthly_quota
+        return self._routing_quota
 
     @property
     def period_end_date(self):
@@ -204,9 +208,6 @@ class RoutingConfig(ServiceConfig):
     def soft_limit(self):
         return self._soft_limit
 
-    def _set_monthly_quota(self):
-        self._monthly_quota = self._get_effective_monthly_quota(self.QUOTA_KEY)
-
     def _set_soft_limit(self):
         if self.SOFT_LIMIT_KEY in self._redis_config and self._redis_config[self.SOFT_LIMIT_KEY].lower() == 'true':
             self._soft_limit = True

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

@@ -122,7 +122,7 @@ class QuotaChecker:
             return False
 
     def __check_routing_quota(self):
-        user_quota = self._user_service_config.monthly_quota
+        user_quota = self._user_service_config.routing_quota
         today = date.today()
         service_type = self._user_service_config.service_type
         current_used = self._user_service.used_quota(service_type, today)

server/lib/python/cartodb_services/setup.py

@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
 setup(
     name='cartodb_services',
 
-    version='0.17.2',
+    version='0.17.4',
 
     description='CartoDB Services API Python Library',
 

server/lib/python/cartodb_services/test/metrics/test_config.py

@@ -301,7 +301,7 @@ class TestRoutingConfig(TestCase):
         self._redis_conn.hset(self._user_key, 'mapzen_routing_quota', 1000)
         orgname = None
         config = RoutingConfig(self._redis_conn, self._db_conn, self._username, orgname)
-        assert config.monthly_quota == 1000
+        assert config.routing_quota == 1000
 
     def test_org_quota_overrides_user_quota(self):
         self._redis_conn.hset(self._user_key, 'mapzen_routing_quota', 1000)
@@ -315,7 +315,7 @@ class TestRoutingConfig(TestCase):
         self._redis_conn.hset(orgname_key, 'here_isolines_quota', 0)
 
         config = RoutingConfig(self._redis_conn, self._db_conn, self._username, orgname)
-        assert config.monthly_quota == 5000
+        assert config.routing_quota == 5000
 
     def test_should_have_soft_limit_false_by_default(self):
         orgname = None

server/lib/python/cartodb_services/test/metrics/test_quota.py

@@ -30,7 +30,7 @@ class TestQuotaChecker(TestCase):
             username = self.username,
             organization = None,
             service_type = self.service_type,
-            monthly_quota = 1000,
+            routing_quota = 1000,
             period_end_date = datetime.today(),
             soft_limit = False
         )
@@ -43,7 +43,7 @@ class TestQuotaChecker(TestCase):
             username = self.username,
             organization = None,
             service_type = self.service_type,
-            monthly_quota = 1000,
+            routing_quota = 1000,
             period_end_date = datetime.today(),
             soft_limit = False
         )
@@ -61,7 +61,7 @@ class TestQuotaChecker(TestCase):
             username = self.username,
             organization = None,
             service_type = self.service_type,
-            monthly_quota = 1000,
+            routing_quota = 1000,
             period_end_date = datetime.today(),
             soft_limit = False
         )
@@ -75,7 +75,7 @@ class TestQuotaChecker(TestCase):
             username = self.username,
             organization = None,
             service_type = self.service_type,
-            monthly_quota = 1000,
+            routing_quota = 1000,
             period_end_date = datetime.today(),
             soft_limit = True
         )