diff --git a/NEWS.md b/NEWS.md index 78f590f..3a68fab 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,14 @@ +March XX, 2017 +=================== +* Version XXXXXX of the server and version XXXXXX of the python library + * New optional configuration parameters for external services can be provided through `cdb_conf`: + - In `heremaps_conf`, under `geocoder.service`: `json_url`, `connect_timeout`, `read_timeout`, `max_retries`, `gen` + - In `heremaps_conf`, under `isolines.service`: `base_url`, `connect_timeout`, `read_timeout`, `max_retries`, `isoline_path` + - In `mapzen_conf`, under `geocoder.service`: `base_url`, `connect_timeout`, `read_timeout`, `max_retries` + - In `mapzen_conf`, under `routing.service`: `base_url`, `connect_timeout`, `read_timeout` + - In `mapzen_conf`, under `matrix.service`: `one_to_many_url`, `connect_timeout`, `read_timeout` + - In `mapzen_conf`, under `isochrones.service`: `base_url`, `connect_timeout`, `read_timeout`, `max_retries` + February 2st, 2017 =================== * Version 0.21.0 of the server and version 0.15.0 of the client diff --git a/README.md b/README.md index a9df9fe..a7deeef 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,71 @@ Steps to deploy a new Data Services API version : SELECT CDB_Conf_SetConf('server_conf', '{"environment": "[development|staging|production]"}') ``` +- External services (Mapzen, Here) can have optional configuration, which is only needed for using non-standard services, such + as on-premise installations. We can add the service parameters to an existing configuration like this: + + ``` + # Here geocoder + SELECT CDB_Conf_SetConf( + 'heremaps_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('heremaps_conf')), + '{geocoder, service}', + '{"json_url":"https://geocoder.api.here.com/6.2/geocode.json","gen":9,"read_timeout":60,"connect_timeout":10,"max_retries":1}' + )::json + ); + + # Here isolines + SELECT CDB_Conf_SetConf( + 'heremaps_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('heremaps_conf')), + '{isolines, service}', + '{"base_url":"https://isoline.route.api.here.com","isoline_path":"/routing/7.2/calculateisoline.json","read_timeout":60,"connect_timeout":10,"max_retries":1}' + )::json + ); + + # Mapzen geocoder + SELECT CDB_Conf_SetConf( + 'mapzen_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('mapzen_conf')), + '{geocoder, service}', + '{"base_url":"https://search.mapzen.com/v1/search","read_timeout":60,"connect_timeout":10,"max_retries":1}' + )::json + ); + + # Mapzen isochrones + SELECT CDB_Conf_SetConf( + 'mapzen_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('mapzen_conf')), + '{isochrones, service}', + '{"base_url":"https://matrix.mapzen.com/isochrone","read_timeout":60,"connect_timeout":10,"max_retries":1}' + )::json + ); + + # Mapzen isolines (matrix service) + SELECT CDB_Conf_SetConf( + 'mapzen_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('mapzen_conf')), + '{matrix, service}', + '{"base_url":"https://matrix.mapzen.com/one_to_many","read_timeout":60,"connect_timeout":10}' + )::json + ); + + # Mapzen routing + SELECT CDB_Conf_SetConf( + 'mapzen_conf', + jsonb_set( + to_jsonb(CDB_Conf_GetConf('mapzen_conf')), + '{routing, service}', + '{"base_url":"https://valhalla.mapzen.com/route","read_timeout":60,"connect_timeout":10}' + )::json + ); + ``` + - configure the user DB: ```sql