Merge pull request #628 from CartoDB/bug/sc-254346/opianalytics-here-isolines-returning-null

fixed gcloud github actions setup

.github/workflows/main.yml

@@ -4,20 +4,24 @@ jobs:
   dataservices-api:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         pg_version: [10, 12]
     env:
-        PG_VERSION: ${{ matrix.pg_version }}
+      PG_VERSION: ${{ matrix.pg_version }}
     steps:
       - uses: actions/checkout@v1
 
+      - name: Set CLOUDSDK_PYTHON path
+        run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV
+
       - name: Setup gcloud authentication
-        uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+        uses: google-github-actions/setup-gcloud@v0
         with:
           service_account_key: ${{ secrets.GCS }}
 
       - name: Pull base image
-        run: gcloud auth configure-docker && docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }}
+        run: docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }}
 
       - name: Checkout ci tools repository
         uses: actions/checkout@v2
@@ -42,15 +46,15 @@ jobs:
       - name: Run python library tests
         run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && MAPBOX_API_KEY=$MAPBOX_API_KEY TOMTOM_API_KEY=$TOMTOM_API_KEY GEOCODIO_API_KEY=$GEOCODIO_API_KEY nosetests lib/python/cartodb_services/test"
         env:
-           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
-           TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }}
-           GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }}
+          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }}
+          GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }}
         timeout-minutes: 5
 
       - name: Run server tests
-        run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/extension/ && sudo make clean all install installcheck || (cat /dataservices-api/server/extension/test_out/regression.diffs && false)"
+        run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/extension/ && sudo make clean all install installcheck || (cat /dataservices-api/server/extension/test/regression.diffs && false)"
         timeout-minutes: 5
 
       - name: Run client tests
-        run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "sudo createuser publicuser --no-createrole --no-createdb --no-superuser -U postgres && cd /dataservices-api/client/ && sudo make clean all install installcheck || (cat /home/ubuntu/dataservices-api/client/test_out/regression.diffs && false)"
+        run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "sudo createuser publicuser --no-createrole --no-createdb --no-superuser -U postgres && cd /dataservices-api/client/ && sudo make clean all install installcheck || (cat /dataservices-api/client/test/regression.diffs && false)"
         timeout-minutes: 5

NEWS.md

@@ -1,3 +1,52 @@
+Sep 5th, 2022
+==============
+* Version `0.24.2` of the Python library
+    * Fix error calculating isolines with HERE
+
+May 26th, 2021
+==============
+* Version `0.40.1` of the server extension
+* Version `0.24.1` of the Python library
+    * Support new HERE API keys
+
+Mar 4th, 2021
+=============
+* Version `0.31.0` of the client extension
+* Version `0.40.0` of the server extension
+* Version `0.24.0` of the Python library
+    * Remove Data Observatory
+
+Jan 26th, 2021
+==============
+* Version `0.39.3` of the server extension
+* Version `0.23.5` of the Python library
+    * Country name conversion to ISO code for TomTom bulk geocoding.
+
+Nov 19th, 2020
+==============
+* Version `0.39.2` of the server extension
+* Version `0.23.4` of the Python library
+    * Better messages on remote errors.
+    * Fix error on unknown status codes.
+    * Here bulk geocoder: Return also errors and no-matches.
+
+Sep 23th, 2020
+==============
+* Version `0.39.1` of the server extension
+    * Allow isolines services for google-geocoding users.
+
+Sep 23th, 2020
+==============
+* Version `0.23.3` of the Python library
+    * Change HERE batch geocoding URL
+
+Apr 7th, 2020
+=============
+* Version `0.30.0` of the client extension
+    * PG12: Use postgis_raster instead of custom geomval.
+* Version `0.39.0` of the server extension
+    * PG12: Use postgis_raster instead of custom geomval.
+
 Mar 17th, 2020
 ==============
 * Version `0.29.0` of the client extension

README.md

@@ -80,28 +80,6 @@ Steps to deploy a new Data Services API version :
      psql -U postgres -d dataservices_db -c "BEGIN;CREATE EXTENSION IF NOT EXISTS cdb_geocoder; COMMIT" -e
      ```
 
-- [optional] install data observatory extension
-   - Make the extension available in postgresql to be installed
-     ```
-     git clone https://github.com/CartoDB/observatory-extension.git
-     cd observatory
-     sudo make install
-     ```
-   - This extension needs data, dumps are not available so we're going to use the test fixtures to make it work. Execute:
-     ```
-     psql -U postgres -d dataservices_db -f src/pg/test/fixtures/load_fixtures.sql
-     ```
-   - Give permission to execute and select to the `geocoder_api` user:
-     ```
-     psql -U postgres -d dataservices_db -c "BEGIN;CREATE EXTENSION IF NOT EXISTS observatory VERSION 'dev'; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT SELECT ON ALL TABLES IN SCHEMA cdb_observatory TO geocoder_api; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_observatory TO geocoder_api; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT USAGE ON SCHEMA cdb_observatory TO geocoder_api; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT SELECT ON ALL TABLES IN SCHEMA observatory TO geocoder_api; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA observatory TO geocoder_api; COMMIT" -e
-     psql -U postgres -d dataservices_db -c "BEGIN;GRANT USAGE ON SCHEMA observatory TO geocoder_api; COMMIT" -e
-     ```
-
 ### Server configuration
 
 Configuration for the different services must be stored in the server database using `CDB_Conf_SetConf()`.
@@ -154,6 +132,15 @@ SELECT CDB_Conf_SetConf(
 );
 ```
 
+Use HERE apikeys 
+
+```sql
+SELECT CDB_Conf_SetConf(
+    'heremaps_conf',
+    '{"geocoder": {"app_id": "here_geocoder_app_id", "app_code": "here_geocoder_app_code", "apikey": "here_geocoder_apikey", "use_apikey": true, "geocoder_cost_per_hit": "1"}, "isolines" : {"app_id": "here_isolines_app_id", "app_code": "here_geocoder_app_code", "apikey": "here_geocoder_apikey", "use_apikey": true}}'
+);
+```
+
 #### Mapzen configuration
 
 ```sql
@@ -190,15 +177,6 @@ SELECT CDB_Conf_SetConf(
 );
 ```
 
-#### Data Observatory
-
-```sql
-SELECT CDB_Conf_SetConf(
-    'data_observatory_conf',
-    '{"connection": {"whitelist": [], "production": "host=localhost port=5432 dbname=dataservices_db user=geocoder_api", "staging": "host=localhost port=5432 dbname=dataservices_db user=geocoder_api"}}'
-);
-```
-
 #### Logger
 
 ```sql

client/.gitignore

@@ -9,3 +9,4 @@ cdb_geocoder_client--0.0.1.sql
 cdb_geocoder_client--0.1.0.sql
 cdb_geocoder_client--0.2.0.sql
 cdb_geocoder_client--0.3.0.sql
+cdb_dataservices_client.control

client/Makefile

@@ -1,27 +1,30 @@
 # Makefile to generate the extension out of separate sql source files.
 # Once a version is released, it is not meant to be changed. E.g: once version 0.0.1 is out, it SHALL NOT be changed.
 EXTENSION = cdb_dataservices_client
-EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
+EXTVERSION = 0.31.0
 
 # The new version to be generated from templates
-SED = sed
-ERB = erb
-REPLACEMENTS = -i 's/$(EXTVERSION)/$(NEW_VERSION)/g'
-NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql
-AWK = awk
+SED ?= sed
+ERB ?= erb
+AWK ?= awk
 
 # Parallel support macros
-PG_CONFIG         = pg_config
+PG_CONFIG        ?= pg_config
 PG_PARALLEL      := $(shell $(PG_CONFIG) --version | ($(AWK) '{$$2*=1000; if ($$2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0))
 
 # PG12 compatibility
 PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print a[1]}')
 PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
 PLPYTHONU := plpythonu
+POSTGIS := postgis
 ifeq ($(PG_12_GE), true)
 PLPYTHONU := plpython3u
+POSTGIS := postgis, postgis_raster
 endif
 
+REPLACEMENTS = -e 's/@@EXTVERSION@@/$(EXTVERSION)/g' -e 's/@@plpythonu@@/$(PLPYTHONU)/g' -e 's/@@postgis@@/$(POSTGIS)/g'
+NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql
+
 # OLD_VERSIONS = $(wildcard old_versions/*.sql)
 # DATA =  $(NEW_EXTENSION_ARTIFACT) \
 #   $(OLD_VERSIONS) \
@@ -51,7 +54,6 @@ TEMPLATE_FILES = $(wildcard $(TEMPLATE_DIR)/*.erb)
 GENERATED_SQL_FILES = $(patsubst $(TEMPLATE_DIR)/%.erb, $(SOURCES_DATA_DIR)/%.sql, $(TEMPLATE_FILES))
 
 # postgres build stuff
-PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
@@ -62,29 +64,21 @@ SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql) $(GENERATED_SQL_FILES)
 
 $(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA)
 	rm -f $@
-	cat $(SOURCES_DATA_DIR)/*.sql | \
-	$(SED) -e 's/@@plpythonu@@/$(PLPYTHONU)/g' >> $@
-ifeq ($(PG_PARALLEL), 0)
-# Remove PARALLEL in aggregates and functions
-	$(eval TMPFILE := $(shell mktemp /tmp/$(basename $0).XXXXXXXX))
-	$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' \
-		-e 's/PARALLEL [A-Z]*/''/g' $@ > $(TMPFILE)
-	mv $(TMPFILE) $@
-endif
+	cat $(SOURCES_DATA_DIR)/*.sql >> $@
 
 .PHONY: all
 all: $(DATA)
 
 .PHONY: release
-release: $(EXTENSION).control $(SOURCES_DATA)
+release: $(SOURCES_DATA)
 	test -n "$(NEW_VERSION)"  # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0
 	git mv *.sql old_versions
-	$(SED) $(REPLACEMENTS) $(EXTENSION).control
-	git add $(EXTENSION).control
 	cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql
 	git add $(EXTENSION)--$(NEW_VERSION).sql
 	$(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql
 	$(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql
+	$(SED) -i -e 's/^EXTVERSION =.*/EXTVERSION = $(NEW_VERSION)/g' Makefile
+	git add Makefile
 	@echo
 	@echo "Please review the file $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql and add any code needed to upgrade $(EXTVERSION) to $(NEW_VERSION)"
 	@echo "Please review the file $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql and add any code needed to downgrade $(NEW_VERSION) to $(EXTVERSION)"
@@ -96,70 +90,29 @@ devclean:
 	rm -f $(NEW_EXTENSION_ARTIFACT)
 	rm -f $(GENERATED_SQL_FILES)
 
-clean: restore_copies
-
-# If needed remove PARALLEL tags from the release files
-release_remove_parallel_deploy:
-ifeq ($(PG_PARALLEL), 0)
+# Replace variables (and PARALLEL tags if necessary) and deploy files
+.PHONY: replace_variables_and_deploy
+replace_variables_and_deploy: $(NEW_EXTENSION_ARTIFACT)
+	mkdir -p '$(DESTDIR)$(datadir)/extension/'; \
 	for n in $(wildcard old_versions/*.sql *.sql); do \
 		$(eval TMPFILE := $(shell mktemp /tmp/XXXXXXXXXX)) \
-		$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' -e 's/PARALLEL [A-Z]*/''/g' $$n > $(TMPFILE); \
-		mv $(TMPFILE) $$n; \
+		if [ "$(PG_PARALLEL)" -eq "0" ]; then \
+			$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' -e 's/PARALLEL [A-Z]*/''/g' $$n > $(TMPFILE); \
+			mv $(TMPFILE) $$n; \
+		fi; \
+		$(SED) $(REPLACEMENTS) $$n > $(TMPFILE); \
+		mv $(TMPFILE) '$(DESTDIR)$(datadir)/extension/'$$(basename $$n); \
 	done
-endif
 
-restore_copies:
-	# tests
-	for f in $(basename $(wildcard test/sql/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	for f in $(basename $(wildcard test/expected/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f test/sql/*.copy;
-	rm -f test/expected/*.copy;
-	# data
-	for f in $(basename $(wildcard sql/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f sql/*.copy;
-	# old_versions
-	for f in $(basename $(wildcard old_versions/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f old_versions/*.copy;
-	# current scripts
-	for f in $(basename $(wildcard *.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f *.copy;
-
-# Replacing variables defined within test files
-replace_variables: restore_copies
-	# tests
-	for f in $(sort $(wildcard test/sql/*test.sql)); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	for f in $(sort $(wildcard test/expected/*test.out)); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# data
-	for f in $(wildcard sql/*.sql); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# old_versions
-	for f in $(wildcard old_versions/*.sql); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# current scripts
-	for f in $(wildcard *.sql); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $(EXTENSION).control;
+.PHONY: $(EXTENSION).control
+$(EXTENSION).control:
+	$(SED) $(REPLACEMENTS) $(EXTENSION).control.in > $(EXTENSION).control
 
 # Install the current release into the PostgreSQL extensions directory
-deploy: release_remove_parallel_deploy
+.PHONY: deploy
+deploy: replace_variables_and_deploy $(EXTENSION).control
 	$(INSTALL_DATA) $(EXTENSION).control '$(DESTDIR)$(datadir)/extension/'
-	$(INSTALL_DATA) old_versions/*.sql *.sql '$(DESTDIR)$(datadir)/extension/'
 
-install: replace_variables deploy
+.PHONY: install
+install: deploy
+	@echo "Install overriden"

client/README.md

@@ -37,7 +37,7 @@ psql -U postgres cartodb_dev_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f_db
 and then:
 
 ```sql
-CREATE EXTENSION cdb_dataservices_client;
+CREATE EXTENSION cdb_dataservices_client CASCADE;
 ```
 
 The extension creation in the user's db requires **superuser** privileges.

client/cdb_dataservices_client--0.30.0--0.31.0.sql

@@ -0,0 +1,187 @@
+--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_client UPDATE TO '0.31.0'" to load this file. \quit
+
+-- Make sure we have a sane search path to create/update the extension
+SET search_path = "$user",cartodb,public,cdb_dataservices_client;
+
+-- HERE goes your code to upgrade/downgrade
+
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_get_demographic_snapshot(geom public.geometry(Geometry, 4326), time_span text, geometry_level text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_get_demographic_snapshot_exception_safe(geom public.geometry(Geometry, 4326), time_span text, geometry_level text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_get_segment_snapshot(geom public.geometry(Geometry, 4326), geometry_level text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_get_segment_snapshot_exception_safe(geom public.geometry(Geometry, 4326), geometry_level text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getdemographicsnapshot(geom public.geometry(Geometry, 4326), time_span text, geometry_level text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getdemographicsnapshot_exception_safe(geom public.geometry(Geometry, 4326), time_span text, geometry_level text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getsegmentsnapshot(geom public.geometry(Geometry, 4326), geometry_level text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getsegmentsnapshot_exception_safe(geom public.geometry(Geometry, 4326), geometry_level text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getboundary(geom public.geometry(Geometry, 4326), boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getboundary_exception_safe(geom public.geometry(Geometry, 4326), boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getboundaryid(geom public.geometry(Geometry, 4326), boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getboundaryid_exception_safe(geom public.geometry(Geometry, 4326), boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getboundarybyid(geometry_id text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getboundarybyid_exception_safe(geometry_id text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getboundariesbygeometry(geom public.geometry(Geometry, 4326), boundary_id text, time_span text, overlap_type text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getboundariesbygeometry_exception_safe(geom public.geometry(Geometry, 4326), boundary_id text, time_span text, overlap_type text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getboundariesbypointandradius(geom public.geometry(Geometry, 4326), radius numeric, boundary_id text, time_span text, overlap_type text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getboundariesbypointandradius_exception_safe(geom public.geometry(Geometry, 4326), radius numeric, boundary_id text, time_span text, overlap_type text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getpointsbygeometry(geom public.geometry(Geometry, 4326), boundary_id text, time_span text, overlap_type text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getpointsbygeometry_exception_safe(geom public.geometry(Geometry, 4326), boundary_id text, time_span text, overlap_type text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getpointsbypointandradius(geom public.geometry(Geometry, 4326), radius numeric, boundary_id text, time_span text, overlap_type text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getpointsbypointandradius_exception_safe(geom public.geometry(Geometry, 4326), radius numeric, boundary_id text, time_span text, overlap_type text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getmeasure(geom public.Geometry, measure_id text, normalize text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getmeasure_exception_safe(geom public.Geometry, measure_id text, normalize text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getmeasurebyid(geom_ref text, measure_id text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getmeasurebyid_exception_safe(geom_ref text, measure_id text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getdata(geomvals geomval[], params json, merge boolean) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getdata_exception_safe(geomvals geomval[], params json, merge boolean )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getdata(geomrefs text[], params json) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getdata_exception_safe(geomrefs text[], params json )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getmeta(geom_ref public.Geometry(Geometry, 4326), params json, max_timespan_rank integer, max_score_rank integer, target_geoms integer) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getmeta_exception_safe(geom_ref public.Geometry(Geometry, 4326), params json, max_timespan_rank integer, max_score_rank integer, target_geoms integer )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_metadatavalidation(geom_extent public.Geometry(Geometry, 4326), geom_type text, params json, target_geoms integer) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_metadatavalidation_exception_safe(geom_extent public.Geometry(Geometry, 4326), geom_type text, params json, target_geoms integer )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getcategory(geom public.Geometry, category_id text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getcategory_exception_safe(geom public.Geometry, category_id text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getuscensusmeasure(geom public.Geometry, name text, normalize text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getuscensusmeasure_exception_safe(geom public.Geometry, name text, normalize text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getuscensuscategory(geom public.Geometry, name text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getuscensuscategory_exception_safe(geom public.Geometry, name text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getpopulation(geom public.Geometry, normalize text, boundary_id text, time_span text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getpopulation_exception_safe(geom public.Geometry, normalize text, boundary_id text, time_span text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_search(search_term text, relevant_boundary text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_search_exception_safe(search_term text, relevant_boundary text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getavailableboundaries(geom public.Geometry, timespan text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getavailableboundaries_exception_safe(geom public.Geometry, timespan text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_dumpversion() FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_dumpversion_exception_safe( )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getavailablenumerators(bounds public.geometry(Geometry, 4326), filter_tags text[], denom_id text, geom_id text, timespan text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getavailablenumerators_exception_safe(bounds public.geometry(Geometry, 4326), filter_tags text[], denom_id text, geom_id text, timespan text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getnumerators(bounds public.geometry(Geometry, 4326), section_tags text[], subsection_tags text[], other_tags text[], ids text[], name text, denom_id text, geom_id text, timespan text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.__obs_getnumerators_exception_safe(bounds public.geometry(Geometry, 4326), section_tags text[], subsection_tags text[], other_tags text[], ids text[], name text, denom_id text, geom_id text, timespan text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getavailabledenominators(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, geom_id text, timespan text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getavailabledenominators_exception_safe(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, geom_id text, timespan text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getavailablegeometries(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, denom_id text, timespan text, number_geometries integer) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getavailablegeometries_exception_safe(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, denom_id text, timespan text, number_geometries integer )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_getavailabletimespans(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, denom_id text, geom_id text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_getavailabletimespans_exception_safe(bounds public.geometry(Geometry, 4326), filter_tags text[], numer_id text, denom_id text, geom_id text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client.obs_legacybuildermetadata(aggregate_type text) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._obs_legacybuildermetadata_exception_safe(aggregate_type text )  FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure(output_table_name text, params json) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure(table_name text, output_table_name text, params json) FROM publicuser;
+REVOKE EXECUTE ON FUNCTION cdb_dataservices_client._OBS_PreCheck(source_query text, params JSON) FROM publicuser;
+
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_get_demographic_snapshot (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_get_segment_snapshot (geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getdemographicsnapshot (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getsegmentsnapshot (geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getboundary (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getboundaryid (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getboundarybyid (TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getboundariesbygeometry (geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getboundariesbypointandradius (geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getpointsbygeometry (geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getpointsbypointandradius (geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getmeasure (geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getmeasurebyid (TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getdata (geomval[], JSON, BOOLEAN);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getdata (TEXT[], JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getmeta (geometry(Geometry, 4326), JSON, INTEGER, INTEGER, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_metadatavalidation (geometry(Geometry, 4326), TEXT, JSON, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getcategory (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getuscensusmeasure (geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getuscensuscategory (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getpopulation (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_search (TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getavailableboundaries (geometry, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_dumpversion ();
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getavailablenumerators (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getnumerators (geometry(Geometry, 4326), TEXT[], TEXT[], TEXT[], TEXT[], TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getavailabledenominators (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getavailablegeometries (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_getavailabletimespans (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.obs_legacybuildermetadata (TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure (TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure (TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.__DST_PrepareTableOBS_GetMeasure (TEXT, TEXT, TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure (TEXT, TEXT, TEXT, TEXT, TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_ConnectUserTable (TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_GetReturnMetadata (TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_FetchJoinFdwTableData (TEXT, TEXT, TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._DST_DisconnectUserTable (TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_get_demographic_snapshot_exception_safe (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_get_segment_snapshot_exception_safe (geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdemographicsnapshot_exception_safe (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getsegmentsnapshot_exception_safe (geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundary_exception_safe (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundaryid_exception_safe (geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundarybyid_exception_safe (TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundariesbygeometry_exception_safe (geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundariesbypointandradius_exception_safe (geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpointsbygeometry_exception_safe (geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpointsbypointandradius_exception_safe (geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeasure_exception_safe (geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeasurebyid_exception_safe (TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdata_exception_safe (geomval[], JSON, BOOLEAN);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdata_exception_safe (TEXT[], JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeta_exception_safe (geometry(Geometry, 4326), JSON, INTEGER, INTEGER, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_metadatavalidation_exception_safe (geometry(Geometry, 4326), TEXT, JSON, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getcategory_exception_safe (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getuscensusmeasure_exception_safe (geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getuscensuscategory_exception_safe (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpopulation_exception_safe (geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_search_exception_safe (TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailableboundaries_exception_safe (geometry, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_dumpversion_exception_safe ();
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailablenumerators_exception_safe (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.__obs_getnumerators_exception_safe (geometry(Geometry, 4326), TEXT[], TEXT[], TEXT[], TEXT[], TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailabledenominators_exception_safe (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailablegeometries_exception_safe (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailabletimespans_exception_safe (geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_legacybuildermetadata_exception_safe (TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_get_demographic_snapshot (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_get_segment_snapshot (TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdemographicsnapshot (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getsegmentsnapshot (TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundary (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundaryid (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundarybyid (TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundariesbygeometry (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getboundariesbypointandradius (TEXT, TEXT, geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpointsbygeometry (TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpointsbypointandradius (TEXT, TEXT, geometry(Geometry, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeasure (TEXT, TEXT, geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeasurebyid (TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdata (TEXT, TEXT, geomval[], JSON, BOOLEAN);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getdata (TEXT, TEXT, TEXT[], JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getmeta (TEXT, TEXT, geometry(Geometry, 4326), JSON, INTEGER, INTEGER, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_metadatavalidation (TEXT, TEXT, geometry(Geometry, 4326), TEXT, JSON, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getcategory (TEXT, TEXT, geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getuscensusmeasure (TEXT, TEXT, geometry, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getuscensuscategory (TEXT, TEXT, geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getpopulation (TEXT, TEXT, geometry, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_search (TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailableboundaries (TEXT, TEXT, geometry, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_dumpversion (TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailablenumerators (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client.__obs_getnumerators (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT[], TEXT[], TEXT[], TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailabledenominators (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailablegeometries (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_getavailabletimespans (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._obs_legacybuildermetadata (TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_client._OBS_PreCheck (TEXT, JSON);
+
+DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_numerator;
+DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_denominator;
+DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_geometry;
+DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_timespan;
+DROP TYPE IF EXISTS cdb_dataservices_client.ds_fdw_metadata;
+DROP TYPE IF EXISTS cdb_dataservices_client.ds_return_metadata;
+
+DELETE FROM pg_enum
+WHERE enumlabel = 'observatory'
+AND enumtypid = (
+  SELECT pg_type.oid
+  FROM pg_type INNER JOIN pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
+  WHERE pg_type.typname = 'service_type' AND pg_namespace.nspname = 'cdb_dataservices_client'
+);

client/cdb_dataservices_client.control.in

@@ -1,5 +1,5 @@
 comment = 'CartoDB dataservices client API extension'
-default_version = '0.29.0'
-requires = 'plproxy, cartodb'
+default_version = '@@EXTVERSION@@'
+requires = 'plproxy, cartodb, @@plpythonu@@, @@postgis@@'
 superuser = true
 schema = cdb_dataservices_client

client/old_versions/cdb_dataservices_client--0.29.0--0.30.0.sql

@@ -0,0 +1,14 @@
+--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_client UPDATE TO '0.30.0'" to load this file. \quit
+
+-- Make sure we have a sane search path to create/update the extension
+SET search_path = "$user",cartodb,public,cdb_dataservices_client;
+
+-- HERE goes your code to upgrade/downgrade
+
+-- In 0.30.0 we removed cdb_dataservices_client.geomval and rely on postgis_raster if necessary
+DO $$
+BEGIN
+  DROP TYPE IF EXISTS cdb_dataservices_client.geomval RESTRICT;
+END$$;

client/old_versions/cdb_dataservices_client--0.30.0--0.29.0.sql

@@ -0,0 +1,19 @@
+--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_client UPDATE TO '0.29.0'" to load this file. \quit
+
+-- Make sure we have a sane search path to create/update the extension
+SET search_path = "$user",cartodb,public,cdb_dataservices_client;
+
+-- HERE goes your code to upgrade/downgrade
+
+-- Create cdb_dataservices_client.geomval if it doesn't exist (in postgis 3+ it only exists in postgis_raster)
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'geomval') THEN
+        CREATE TYPE cdb_dataservices_client.geomval AS (
+            geom geometry,
+            val double precision
+        );
+    END IF;
+END$$;

client/renderer/interface.yaml

@@ -311,390 +311,6 @@
     - { name: options, type: "text[]", default: 'ARRAY[]::text[]' }
     - { name: units, type: "text", default: "'kilometers'"}
 
-- name: obs_get_demographic_snapshot
-  return_type: json
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: time_span,  type: "text", default: "'2009 - 2013'::text" }
-    - { name: geometry_level, type: text, default: 'NULL' }
-
-- name: obs_get_segment_snapshot
-  return_type: json
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: geometry_level, type: text, default: 'NULL' }
-
-- name: obs_getdemographicsnapshot
-  return_type: SETOF JSON
-  multi_row: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: time_span,  type: "text", default: 'NULL' }
-    - { name: geometry_level, type: text, default: 'NULL' }
-
-- name: obs_getsegmentsnapshot
-  return_type: SETOF JSON
-  multi_row: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: geometry_level, type: text, default: 'NULL' }
-
-- name: obs_getboundary
-  return_type: public.Geometry
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getboundaryid
-  return_type: text
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getboundarybyid
-  return_type: public.Geometry
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geometry_id,  type: text }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getboundariesbygeometry
-  return_type: TABLE(the_geom geometry, geom_refs text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: the_geom, type: geometry }
-    - { name: geom_refs, type: text }
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-    - { name: overlap_type, type: text, default: 'NULL'}
-
-- name: obs_getboundariesbypointandradius
-  return_type: TABLE(the_geom geometry, geom_refs text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: the_geom, type: geometry }
-    - { name: geom_refs, type: text }
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: radius, type: numeric }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-    - { name: overlap_type, type: text, default: 'NULL'}
-
-- name: obs_getpointsbygeometry
-  return_type: TABLE(the_geom geometry, geom_refs text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: the_geom, type: geometry }
-    - { name: geom_refs, type: text }
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-    - { name: overlap_type, type: text, default: 'NULL'}
-
-- name: obs_getpointsbypointandradius
-  return_type: TABLE(the_geom geometry, geom_refs text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: the_geom, type: geometry }
-    - { name: geom_refs, type: text }
-  params:
-    - { name: geom,  type: "public.geometry(Geometry, 4326)" }
-    - { name: radius, type: numeric }
-    - { name: boundary_id, type: text }
-    - { name: time_span, type: text, default: 'NULL'}
-    - { name: overlap_type, type: text, default: 'NULL'}
-
-- name: obs_getmeasure
-  return_type: numeric
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: measure_id, type: text }
-    - { name: normalize, type: text, default: 'NULL'}
-    - { name: boundary_id, type: text, default: 'NULL' }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getmeasurebyid
-  return_type: numeric
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom_ref,  type: text }
-    - { name: measure_id, type: text }
-    - { name: boundary_id, type: text}
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getdata
-  return_type: TABLE(id int, data json)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: id, type: integer }
-    - { name: data, type: json }
-  params:
-    - { name: geomvals,  type: "geomval[]" }
-    - { name: params, type: json }
-    - { name: merge, type: boolean, default: true }
-
-- name: obs_getdata
-  return_type: TABLE(id text, data json)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: id, type: text }
-    - { name: data, type: json }
-  params:
-    - { name: geomrefs,  type: "text[]" }
-    - { name: params, type: json }
-
-- name: obs_getmeta
-  return_type: json
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom_ref,  type: "public.Geometry(Geometry, 4326)" }
-    - { name: params, type: json }
-    - { name: max_timespan_rank, type: integer, default: 'NULL' }
-    - { name: max_score_rank, type: integer, default: 'NULL' }
-    - { name: target_geoms, type: integer, default: 'NULL' }
-
-- name: obs_metadatavalidation
-  return_type: TABLE(valid boolean, errors text[])
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom_extent,  type: "public.Geometry(Geometry, 4326)" }
-    - { name: geom_type,  type: text }
-    - { name: params, type: json }
-    - { name: target_geoms, type: integer, default: 'NULL' }
-
-- name: obs_getcategory
-  return_type: text
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: category_id, type: text }
-    - { name: boundary_id, type: text, default: 'NULL' }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getuscensusmeasure
-  return_type: numeric
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: name, type: text }
-    - { name: normalize, type: text, default: 'NULL'}
-    - { name: boundary_id, type: text, default: 'NULL' }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getuscensuscategory
-  return_type: text
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: name, type: text }
-    - { name: boundary_id, type: text, default: 'NULL' }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_getpopulation
-  return_type: numeric
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: normalize, type: text, default: 'NULL'}
-    - { name: boundary_id, type: text, default: 'NULL' }
-    - { name: time_span, type: text, default: 'NULL'}
-
-- name: obs_search
-  return_type: TABLE(id text, description text, name text, aggregate text, source text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: id, type: text }
-    - { name: description, type: text }
-    - { name: name, type: text }
-    - { name: aggregate, type: text }
-    - { name: source, type: text }
-  params:
-    - { name: search_term, type: text }
-    - { name: relevant_boundary, type: text, default: 'NULL' }
-
-- name: obs_getavailableboundaries
-  return_type: TABLE(boundary_id text, description text, time_span text, tablename text)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  table_fields:
-    - { name: boundary_id, type: text }
-    - { name: description, type: text }
-    - { name: time_span, type: text }
-    - { name: tablename, type: text }
-  params:
-    - { name: geom,  type: public.Geometry }
-    - { name: timespan, type: text, default: 'NULL'}
-
-- name: obs_dumpversion
-  return_type: text
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - {}
-
-- name: obs_getavailablenumerators
-  return_type: SETOF cdb_dataservices_client.obs_meta_numerator
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: bounds, type: "public.geometry(Geometry, 4326)", default: 'NULL' }
-    - { name: filter_tags, type: "text[]", default: 'NULL' }
-    - { name: denom_id, type: text, default: 'NULL' }
-    - { name: geom_id, type: text, default: 'NULL' }
-    - { name: timespan, type: text, default: 'NULL'}
-
-- name: _obs_getnumerators
-  return_type: SETOF cdb_dataservices_client.obs_meta_numerator
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: bounds, type: "public.geometry(Geometry, 4326)", default: 'NULL' }
-    - { name: section_tags, type: "text[]", default: 'ARRAY[]::TEXT[]' }
-    - { name: subsection_tags, type: "text[]", default: 'ARRAY[]::TEXT[]' }
-    - { name: other_tags, type: "text[]", default: 'ARRAY[]::TEXT[]' }
-    - { name: ids, type: "text[]", default: 'ARRAY[]::TEXT[]' }
-    - { name: name, type: text, default: 'NULL' }
-    - { name: denom_id, type: text, default: "''" }
-    - { name: geom_id, type: text, default: "''" }
-    - { name: timespan, type: text, default: "''"}
-
-- name: obs_getavailabledenominators
-  return_type: SETOF cdb_dataservices_client.obs_meta_denominator
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: bounds, type: "public.geometry(Geometry, 4326)", default: 'NULL' }
-    - { name: filter_tags, type: "text[]", default: 'NULL' }
-    - { name: numer_id, type: text, default: 'NULL' }
-    - { name: geom_id, type: text, default: 'NULL' }
-    - { name: timespan, type: text, default: 'NULL'}
-
-- name: obs_getavailablegeometries
-  return_type: SETOF cdb_dataservices_client.obs_meta_geometry
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: bounds, type: "public.geometry(Geometry, 4326)", default: 'NULL' }
-    - { name: filter_tags, type: "text[]", default: 'NULL' }
-    - { name: numer_id, type: text, default: 'NULL' }
-    - { name: denom_id, type: text, default: 'NULL' }
-    - { name: timespan, type: text, default: 'NULL'}
-    - { name: number_geometries, type: integer, default: 'NULL'}
-
-- name: obs_getavailabletimespans
-  return_type: SETOF cdb_dataservices_client.obs_meta_timespan
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: bounds, type: "public.geometry(Geometry, 4326)", default: 'NULL' }
-    - { name: filter_tags, type: "text[]", default: 'NULL' }
-    - { name: numer_id, type: text, default: 'NULL' }
-    - { name: denom_id, type: text, default: 'NULL' }
-    - { name: geom_id, type: text, default: 'NULL'}
-
-- name: obs_legacybuildermetadata
-  return_type: TABLE(name text, subsection json)
-  multi_row: true
-  multi_field: true
-  requires_permission: true
-  permission_name: observatory
-  permission_error: Data Observatory permission denied
-  params:
-    - { name: aggregate_type, type: text, default: 'NULL' }
-
 - name: cdb_service_quota_info
   return_type: SETOF service_quota_info
   multi_row: true

client/sql/05_utils.sql

@@ -18,16 +18,3 @@ $func$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_jsonb_array_casttext(jsonb) RETURNS text[] AS $f$
     SELECT array_agg(x) || ARRAY[]::text[] FROM jsonb_array_elements_text($1) t(x);
 $f$ LANGUAGE sql IMMUTABLE;
-
-
--- PG12_DEPRECATED
--- Create geomval if it doesn't exist (in postgis 3+ it only exists in postgis_raster)
-DO $$
-BEGIN
-    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'geomval') THEN
-        CREATE TYPE cdb_dataservices_client.geomval AS (
-            geom geometry,
-            val double precision
-        );
-    END IF;
-END$$;

client/sql/16_custom_types.sql

@@ -16,22 +16,11 @@ CREATE TYPE cdb_dataservices_client.simple_route AS (
     duration integer
 );
 
--- For the OBS_Meta functions
-CREATE TYPE cdb_dataservices_client.obs_meta_numerator AS (numer_id text, numer_name text, numer_description text, numer_weight text, numer_license text, numer_source text, numer_type text, numer_aggregate text, numer_extra jsonb, numer_tags jsonb, valid_denom boolean, valid_geom boolean, valid_timespan boolean);
-
-CREATE TYPE cdb_dataservices_client.obs_meta_denominator AS (denom_id text, denom_name text, denom_description text, denom_weight text, denom_license text, denom_source text, denom_type text, denom_aggregate text, denom_extra jsonb, denom_tags jsonb, valid_numer boolean, valid_geom boolean, valid_timespan boolean);
-
-CREATE TYPE cdb_dataservices_client.obs_meta_geometry AS (geom_id text, geom_name text, geom_description text, geom_weight text, geom_aggregate text, geom_license text, geom_source text, valid_numer boolean, valid_denom boolean, valid_timespan boolean, score numeric, numtiles bigint, notnull_percent numeric, numgeoms numeric, percentfill numeric, estnumgeoms numeric, meanmediansize numeric, geom_type text, geom_extra jsonb, geom_tags jsonb);
-
-CREATE TYPE cdb_dataservices_client.obs_meta_timespan AS (timespan_id text, timespan_name text, timespan_description text, timespan_weight text, timespan_aggregate text, timespan_license text, timespan_source text, valid_numer boolean, valid_denom boolean, valid_geom boolean, timespan_type text, timespan_extra jsonb, timespan_tags jsonb);
-
-
 -- For quotas and services configuration
 CREATE TYPE cdb_dataservices_client.service_type AS ENUM (
     'isolines',
     'hires_geocoder',
-    'routing',
-    'observatory'
+    'routing'
 );
 
 CREATE TYPE cdb_dataservices_client.service_quota_info AS (

client/sql/20_table_augmentation.sql

@@ -1,279 +0,0 @@
-CREATE TYPE cdb_dataservices_client.ds_fdw_metadata as (schemaname text, tabname text, servername text);
-CREATE TYPE cdb_dataservices_client.ds_return_metadata as (colnames text[], coltypes text[]);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure(
-    output_table_name text,
-    params json
-) RETURNS boolean AS $$
-DECLARE
-  username text;
-  user_db_role text;
-  orgname text;
-  user_schema text;
-  result boolean;
-BEGIN
-  IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
-    RAISE EXCEPTION 'The api_key must be provided';
-  END IF;
-
-  SELECT session_user INTO user_db_role;
-
-  SELECT u, o INTO username, orgname FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text, p json);
-  -- JSON value stored "" is taken as literal
-  IF username IS NULL OR username = '' OR username = '""' THEN
-    RAISE EXCEPTION 'Username is a mandatory argument';
-  END IF;
-
-  IF orgname IS NULL OR orgname = '' OR orgname = '""' THEN
-    user_schema := 'public';
-  ELSE
-    user_schema := username;
-  END IF;
-
-  SELECT cdb_dataservices_client.__DST_PrepareTableOBS_GetMeasure(
-      username,
-      orgname,
-      user_db_role,
-      user_schema,
-      output_table_name,
-      params
-  ) INTO result;
-
-  RETURN result;
-END;
-$$  LANGUAGE 'plpgsql' SECURITY DEFINER VOLATILE PARALLEL UNSAFE
-    SET search_path = pg_temp;
-
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure(
-    table_name text,
-    output_table_name text,
-    params json
-) RETURNS boolean AS $$
-DECLARE
-  username text;
-  user_db_role text;
-  orgname text;
-  dbname text;
-  user_schema text;
-  result boolean;
-BEGIN
-  IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
-    RAISE EXCEPTION 'The api_key must be provided';
-  END IF;
-
-  SELECT session_user INTO user_db_role;
-
-  SELECT u, o INTO username, orgname FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text, p json);
-  -- JSON value stored "" is taken as literal
-  IF username IS NULL OR username = '' OR username = '""' THEN
-    RAISE EXCEPTION 'Username is a mandatory argument';
-  END IF;
-
-  IF orgname IS NULL OR orgname = '' OR orgname = '""' THEN
-    user_schema := 'public';
-  ELSE
-    user_schema := username;
-  END IF;
-
-  SELECT current_database() INTO dbname;
-
-  SELECT cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
-      username,
-      orgname,
-      user_db_role,
-      user_schema,
-      dbname,
-      table_name,
-      output_table_name,
-      params
-  ) INTO result;
-
-  RETURN result;
-END;
-$$  LANGUAGE 'plpgsql' SECURITY DEFINER VOLATILE PARALLEL UNSAFE
-    SET search_path = pg_temp;
-
-
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeasure(
-    username text,
-    orgname text,
-    user_db_role text,
-    user_schema text,
-    output_table_name text,
-    params json
-) RETURNS boolean AS $$
-    function_name = 'OBS_GetMeasure'
-    # Obtain return types for augmentation procedure
-    ds_return_metadata = plpy.execute("SELECT colnames, coltypes "
-        "FROM cdb_dataservices_client._DST_GetReturnMetadata({username}::text, {orgname}::text, {function_name}::text, {params}::json);"
-        .format(
-            username=plpy.quote_nullable(username),
-            orgname=plpy.quote_nullable(orgname),
-            function_name=plpy.quote_literal(function_name),
-            params=plpy.quote_literal(params)
-            )
-        )
-    if ds_return_metadata[0]["colnames"]:
-        colnames_arr = ds_return_metadata[0]["colnames"]
-        coltypes_arr = ds_return_metadata[0]["coltypes"]
-    else:
-        raise Exception('Error retrieving OBS_GetMeasure metadata')
-
-
-    # Prepare column and type strings required in the SQL queries
-    columns_with_types_arr = [colnames_arr[i] + ' ' + coltypes_arr[i] for i in range(0,len(colnames_arr))]
-    columns_with_types = ','.join(columns_with_types_arr)
-
-    # Create a new table with the required columns
-    plpy.execute('CREATE TABLE "{schema}".{table_name} ( '
-        'cartodb_id int, the_geom public.geometry, {columns_with_types} '
-        ');'
-        .format(schema=user_schema, table_name=output_table_name, columns_with_types=columns_with_types)
-        )
-
-    plpy.execute('ALTER TABLE "{schema}".{table_name} OWNER TO "{user}";'
-        .format(schema=user_schema, table_name=output_table_name, user=user_db_role)
-        )
-
-    return True
-$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
-    username text,
-    orgname text,
-    user_db_role text,
-    user_schema text,
-    dbname text,
-    table_name text,
-    output_table_name text,
-    params json
-) RETURNS boolean AS $$
-    function_name = 'OBS_GetMeasure'
-    # Obtain return types for augmentation procedure
-    ds_return_metadata = plpy.execute(
-        "SELECT colnames, coltypes "
-        "FROM cdb_dataservices_client._DST_GetReturnMetadata({username}::text, {orgname}::text, {function_name}::text, {params}::json);" .format(
-            username=plpy.quote_nullable(username),
-            orgname=plpy.quote_nullable(orgname),
-            function_name=plpy.quote_literal(function_name),
-            params=plpy.quote_literal(params)))
-
-    if ds_return_metadata[0]["colnames"]:
-        colnames_arr = ds_return_metadata[0]["colnames"]
-        coltypes_arr = ds_return_metadata[0]["coltypes"]
-    else:
-        raise Exception('Error retrieving OBS_GetMeasure metadata')
-
-    # Prepare column and type strings required in the SQL queries
-    columns_with_types_arr = [
-        colnames_arr[i] +
-        ' ' +
-        coltypes_arr[i] for i in range(
-            0,
-            len(colnames_arr))]
-    columns_with_types = ','.join(columns_with_types_arr)
-    aliased_colname_list = ','.join(
-        ['result.' + name for name in colnames_arr])
-
-    # Instruct the OBS server side to establish a FDW
-    # The metadata is obtained as well in order to:
-    #   - (a) be able to write the query to grab the actual data to be executed in the remote server via pl/proxy,
-    #   - (b) be able to tell OBS to free resources when done.
-    ds_fdw_metadata = plpy.execute(
-        "SELECT schemaname, tabname, servername "
-        "FROM cdb_dataservices_client._DST_ConnectUserTable({username}::text, {orgname}::text, {user_db_role}::text, "
-        "{schema}::text, {dbname}::text, {table_name}::text);" .format(
-            username=plpy.quote_nullable(username),
-            orgname=plpy.quote_nullable(orgname),
-            user_db_role=plpy.quote_literal(user_db_role),
-            schema=plpy.quote_literal(user_schema),
-            dbname=plpy.quote_literal(dbname),
-            table_name=plpy.quote_literal(table_name)))
-
-    if ds_fdw_metadata[0]["schemaname"]:
-        server_schema = ds_fdw_metadata[0]["schemaname"]
-        server_table_name = ds_fdw_metadata[0]["tabname"]
-        server_name = ds_fdw_metadata[0]["servername"]
-    else:
-        raise Exception('Error connecting dataset via FDW')
-
-    # Create a new table with the required columns
-    plpy.execute(
-        'INSERT INTO "{schema}".{analysis_table_name} '
-        'SELECT ut.cartodb_id, ut.the_geom, {colname_list} '
-        'FROM "{schema}".{table_name} ut '
-        'LEFT JOIN cdb_dataservices_client._DST_FetchJoinFdwTableData({username}::text, {orgname}::text, {server_schema}::text, {server_table_name}::text, '
-        '{function_name}::text, {params}::json) '
-        'AS result ({columns_with_types}, cartodb_id int)  '
-        'ON result.cartodb_id = ut.cartodb_id;' .format(
-            schema=user_schema,
-            analysis_table_name=output_table_name,
-            colname_list=aliased_colname_list,
-            table_name=table_name,
-            username=plpy.quote_nullable(username),
-            orgname=plpy.quote_nullable(orgname),
-            server_schema=plpy.quote_literal(server_schema),
-            server_table_name=plpy.quote_literal(server_table_name),
-            function_name=plpy.quote_literal(function_name),
-            params=plpy.quote_literal(params),
-            columns_with_types=columns_with_types))
-
-    # Wipe user FDW data from the server
-    wiped = plpy.execute(
-        "SELECT cdb_dataservices_client._DST_DisconnectUserTable({username}::text, {orgname}::text, {server_schema}::text, "
-        "{server_table_name}::text, {fdw_server}::text)" .format(
-            username=plpy.quote_nullable(username),
-            orgname=plpy.quote_nullable(orgname),
-            server_schema=plpy.quote_literal(server_schema),
-            server_table_name=plpy.quote_literal(server_table_name),
-            fdw_server=plpy.quote_literal(server_name)))
-
-    return True
-$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
-    username text,
-    orgname text,
-    user_db_role text,
-    user_schema text,
-    dbname text,
-    table_name text
-)RETURNS cdb_dataservices_client.ds_fdw_metadata AS $$
-    CONNECT cdb_dataservices_client._server_conn_str();
-    TARGET cdb_dataservices_server._DST_ConnectUserTable;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_GetReturnMetadata(
-    username text,
-    orgname text,
-    function_name text,
-    params json
-) RETURNS cdb_dataservices_client.ds_return_metadata AS $$
-    CONNECT cdb_dataservices_client._server_conn_str();
-    TARGET cdb_dataservices_server._DST_GetReturnMetadata;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_FetchJoinFdwTableData(
-    username text,
-    orgname text,
-    table_schema text,
-    table_name text,
-    function_name text,
-    params json
-) RETURNS SETOF record AS $$
-    CONNECT cdb_dataservices_client._server_conn_str();
-    TARGET cdb_dataservices_server._DST_FetchJoinFdwTableData;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_DisconnectUserTable(
-    username text,
-    orgname text,
-    table_schema text,
-    table_name text,
-    server_name text
-) RETURNS boolean AS $$
-    CONNECT cdb_dataservices_client._server_conn_str();
-    TARGET cdb_dataservices_server._DST_DisconnectUserTable;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;

client/sql/35_precheck_functions.sql

@@ -1,54 +0,0 @@
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_PreCheck(
-    source_query text,
-    parameters json
-) RETURNS boolean AS $$
-DECLARE
-    errors text[];
-    validator_errors text[];
-    validator_error text;
-    valid boolean;
-    geoms record;
-BEGIN
-    errors := (ARRAY[])::TEXT[];
-    FOR geoms IN EXECUTE format('SELECT ST_GeometryType(the_geom) as geom_type,
-                                 bool_and(st_isvalid(the_geom)) as valid,
-                                 avg(st_npoints(the_geom)) as avg_vertex,
-                                 ST_SetSRID(ST_Extent(the_geom), 4326) as extent,
-                                 count(*)::INT as numgeoms
-                                 FROM (%s) as _source
-                                 GROUP BY ST_GeometryType(the_geom)', source_query)
-    LOOP
-        IF geoms.geom_type NOT IN ('ST_Polygon', 'ST_MultiPolygon', 'ST_Point') THEN
-            errors := array_append(errors, format($data$'Geometry type %s not supported'$data$, geoms.geom_type));
-        END IF;
-
-        IF geoms.valid IS FALSE THEN
-            errors := array_append(errors, 'There are invalid geometries in the input data, please try to fix them');
-        END IF;
-
-        -- 1000 vertex for a geometry is a limit we have in the obs_getdata function. You can check here
-        -- https://github.com/CartoDB/observatory-extension/blob/1.6.0/src/pg/sql/41_observatory_augmentation.sql#L813
-        IF geoms.avg_vertex > 1000 THEN
-            errors := array_append(errors, 'The average number of vertices per geometry is greater than 1000, please try to simplify them');
-        END IF;
-
-        -- OBS specific part
-        EXECUTE 'SELECT valid, errors
-        FROM cdb_dataservices_client.OBS_MetadataValidation($1, $2, $3, $4)'
-        INTO valid, validator_errors
-        USING geoms.extent, geoms.geom_type, parameters, geoms.numgeoms;
-        IF valid is FALSE THEN
-            FOR validator_error IN EXECUTE 'SELECT unnest($1)' USING validator_errors
-            LOOP
-                errors := array_append(errors, validator_error);
-            END LOOP;
-        END IF;
-    END LOOP;
-
-    IF CARDINALITY(errors) > 0 THEN
-        RAISE EXCEPTION '%', errors;
-    END IF;
-
-    RETURN TRUE;
-END;
-$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;

client/sql/95_grant_execute_manual.sql

@@ -1,6 +1,3 @@
-GRANT EXECUTE ON FUNCTION cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure(output_table_name text, params json) TO publicuser;
-GRANT EXECUTE ON FUNCTION cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure(table_name text, output_table_name text, params json) TO publicuser;
-GRANT EXECUTE ON FUNCTION cdb_dataservices_client._OBS_PreCheck(source_query text, params JSON) TO publicuser;
 GRANT EXECUTE ON FUNCTION cdb_dataservices_client.cdb_bulk_geocode_street_point(query text, street_column text, city_column text, state_column text, country_column text, batch_size integer) TO publicuser;
 
 GRANT EXECUTE ON FUNCTION cdb_dataservices_client.cdb_count_estimate(query text) TO publicuser;

client/test/expected/00_installation_test.out

@@ -1,30 +1,17 @@
 -- Only show warning or error messages in the tests output
-SET client_min_messages TO WARNING;
--- Install dependencies
-CREATE EXTENSION postgis;
-CREATE EXTENSION @@plpythonu@@;
-CREATE EXTENSION cartodb;
-CREATE EXTENSION plproxy;
--- Install the extension
-CREATE EXTENSION cdb_dataservices_client;
--- Mock the server connection to point to this very test db
-SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');
+\set ECHO none
  cdb_conf_setconf 
 ------------------
  
 (1 row)
 
--- Mock the user configuration
-SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "entity_name": "test_user"}');
  cdb_conf_setconf 
 ------------------
  
 (1 row)
 
--- Mock the server schema
-CREATE SCHEMA cdb_dataservices_server;
--- Create a test user to check permissions
-DROP ROLE IF EXISTS test_regular_user;
-CREATE ROLE test_regular_user;
-GRANT publicuser TO test_regular_user;
-ALTER ROLE test_regular_user SET search_path TO public,cartodb,cdb_dataservices_client;
+CREATE SCHEMA
+DROP ROLE
+CREATE ROLE
+GRANT ROLE
+ALTER ROLE

client/test/expected/95_data_observatory_tables_test.out

@@ -1,77 +0,0 @@
--- Add to the search path the schema
-SET search_path TO public,cartodb,cdb_dataservices_client;
-CREATE TABLE my_table(cartodb_id int);
-INSERT INTO my_table (cartodb_id) VALUES (1);
--- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_ConnectUserTable(username text, orgname text, user_db_role text, input_schema text, dbname text, table_name text)
-RETURNS cdb_dataservices_client.ds_fdw_metadata AS $$
-BEGIN
-  RETURN ('dummy_schema'::text, 'dummy_table'::text, 'dummy_server'::text);
-END;
-$$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_GetReturnMetadata(username text, orgname text, function_name text, params json)
-RETURNS cdb_dataservices_client.ds_return_metadata AS $$
-BEGIN
-  RETURN (Array['total_pop'], Array['double precision']);
-END;
-$$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_FetchJoinFdwTableData(username text, orgname text, table_schema text, table_name text, function_name text, params json)
-RETURNS RECORD AS $$
-BEGIN
-  RETURN (23.4::double precision, 1::int);
-END;
-$$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_DisconnectUserTable(username text, orgname text, table_schema text, table_name text, servername text)
-RETURNS boolean AS $$
-BEGIN
-  RETURN true;
-END;
-$$ LANGUAGE 'plpgsql';
-SELECT CDB_Conf_SetConf('api_keys_postgres', '{"username": "test_user", "permissions": [""]}');
- cdb_conf_setconf 
-------------------
- 
-(1 row)
-
--- Create a sample user table
-CREATE TABLE user_table (cartodb_id int, the_geom geometry);
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (1, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (2, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (3, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
--- Prepare a table with the total_pop column
-SELECT cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure('my_table_dst', '{"dummy":"dummy"}'::json);
- _dst_preparetableobs_getmeasure 
----------------------------------
- t
-(1 row)
-
--- The table should now exist and be empty
-SELECT * FROM my_table_dst;
- cartodb_id | the_geom | total_pop 
-------------+----------+-----------
-(0 rows)
-
--- Populate the table with measurement data
-SELECT cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure('user_table', 'my_table_dst', '{"dummy":"dummy"}'::json);
- _dst_populatetableobs_getmeasure 
-----------------------------------
- t
-(1 row)
-
--- The table should now show the results
-SELECT * FROM my_table_dst;
- cartodb_id |                      the_geom                      | total_pop 
-------------+----------------------------------------------------+-----------
-          1 | 0101000020E6100000F74FC902E07D52C05FE24CC7654B4440 |      23.4
-          2 | 0101000020E6100000F74FC902E07D52C05FE24CC7654B4440 |          
-          3 | 0101000020E6100000F74FC902E07D52C05FE24CC7654B4440 |          
-(3 rows)
-
--- Clean tables
-DROP TABLE my_table_dst;
-SELECT CDB_Conf_RemoveConf('api_keys_postgres');
- cdb_conf_removeconf 
----------------------
- 
-(1 row)
-

client/test/sql/00_installation_test.sql

@@ -1,13 +1,13 @@
 -- Only show warning or error messages in the tests output
+\set ECHO none
+\set QUIET on
 SET client_min_messages TO WARNING;
--- Install dependencies
-CREATE EXTENSION postgis;
-CREATE EXTENSION @@plpythonu@@;
-CREATE EXTENSION cartodb;
-CREATE EXTENSION plproxy;
 
 -- Install the extension
-CREATE EXTENSION cdb_dataservices_client;
+CREATE EXTENSION cdb_dataservices_client CASCADE;
+
+\unset ECHO
+\unset QUIET
 
 -- Mock the server connection to point to this very test db
 SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');

client/test/sql/95_data_observatory_tables_test.sql

@@ -1,60 +0,0 @@
--- Add to the search path the schema
-SET search_path TO public,cartodb,cdb_dataservices_client;
-
-CREATE TABLE my_table(cartodb_id int);
-
-INSERT INTO my_table (cartodb_id) VALUES (1);
-
--- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_ConnectUserTable(username text, orgname text, user_db_role text, input_schema text, dbname text, table_name text)
-RETURNS cdb_dataservices_client.ds_fdw_metadata AS $$
-BEGIN
-  RETURN ('dummy_schema'::text, 'dummy_table'::text, 'dummy_server'::text);
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_GetReturnMetadata(username text, orgname text, function_name text, params json)
-RETURNS cdb_dataservices_client.ds_return_metadata AS $$
-BEGIN
-  RETURN (Array['total_pop'], Array['double precision']);
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_FetchJoinFdwTableData(username text, orgname text, table_schema text, table_name text, function_name text, params json)
-RETURNS RECORD AS $$
-BEGIN
-  RETURN (23.4::double precision, 1::int);
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_DisconnectUserTable(username text, orgname text, table_schema text, table_name text, servername text)
-RETURNS boolean AS $$
-BEGIN
-  RETURN true;
-END;
-$$ LANGUAGE 'plpgsql';
-
-SELECT CDB_Conf_SetConf('api_keys_postgres', '{"username": "test_user", "permissions": [""]}');
-
--- Create a sample user table
-CREATE TABLE user_table (cartodb_id int, the_geom geometry);
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (1, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (2, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
-INSERT INTO user_table(cartodb_id, the_geom) VALUES (3, '0101000020E6100000F74FC902E07D52C05FE24CC7654B4440');
-
--- Prepare a table with the total_pop column
-SELECT cdb_dataservices_client._DST_PrepareTableOBS_GetMeasure('my_table_dst', '{"dummy":"dummy"}'::json);
-
--- The table should now exist and be empty
-SELECT * FROM my_table_dst;
-
--- Populate the table with measurement data
-SELECT cdb_dataservices_client._DST_PopulateTableOBS_GetMeasure('user_table', 'my_table_dst', '{"dummy":"dummy"}'::json);
-
--- The table should now show the results
-SELECT * FROM my_table_dst;
-
--- Clean tables
-DROP TABLE my_table_dst;
-
-SELECT CDB_Conf_RemoveConf('api_keys_postgres');

docs/developer-center/reference/07-demographic-functions.md

@@ -1,155 +0,0 @@
-### Demographic Functions
-
-The Demographic Snapshot enables you to collect demographic reports around a point location. For example, you can take the coordinates of a coffee shop and find the average population characteristics, such as total population, educational attainment, housing and income information around that location. You can use raw street addresses by combining the Demographic Snapshot with CARTO's geocoding features. If you need help creating coordinates from addresses, see the [Geocoding Functions]({{site.dataservicesapi_docs}}/reference/#geocoding-functions) documentation.
-
-_**Note:** The Demographic Snapshot functions are only available for the United States._
-
-#### OBS_GetDemographicSnapshot( point geometry )
-
-Fields returned include information about income, education, transportation, race, and more. Not all fields will have information for every coordinate queried.
-
-##### Arguments
-
-Name | Description | Example Values
---- | --- | ---
-point geometry | A point geometry. You can use the helper function, `CDB_LatLng` to quickly generate one from latitude and longitude | `CDB_LatLng(40.760410,-73.964242)`
-
-##### Returns
-
-The Demographic Snapshot contains a broad subset of demographic measures in the Data Observatory. Over 80 measurements are returned by a single API request. For each demographic measure, the API returns the following values.
-
-Value | Name | Tablename | Aggregate | Type | Description
------ | ---- | --------- | --------- | ---- |------------
-The value of the measure at the point you requested | The name of the measure | The table it was drawn from | Indicated if the measure is a count or median. | postgresql | A description of the measure
-
-For example the "Female Population" measure returns
-
-```json
-obs_getdemographicsnapshot: {
-   "value": 32.5395066379175,
-   "name": "Female Population",
-   "tablename": "obs_1a098da56badf5f32e336002b0a81708c40d29cd",
-   "aggregate": "sum",
-   "type": "Numeric",
-   "description": "The number of people within each geography who are female."
-}
-```
-
-**For details, see the [Glossary of Demographic Measures](#glossary-of-demographic-measures).**
-
-##### Examples
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetDemographicSnapshot({{point geometry}})
-```
-
-####### Get the Geographic Snapshot of a Demographic
-
-__Get the Demographic Snapshot at Camp David__
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetDemographicSnapshot(CDB_LatLng(39.648333, -77.465))
-```
-
-__Get the Demographic Snapshot in the Upper West Side__
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetDemographicSnapshot(CDB_LatLng(40.80, -73.960))
-```
-
-#### Glossary of Demographic Measures
-
-This list contains the demographic measures and response names for results from the ```OBS_GetDemographicSnapshot``` function.
-
- Measure name | Measure Description | Response Mame | Response Units
---- | --- | --- | ---
-Total Population | The total number of all people living in a given geographic area. This is a very useful catch-all denominator when calculating rates. | total_pop | Count per sq. km
-Male Population | The number of people within each geography who are male. | male_pop | Count per sq. km
-Female Population | The number of people within each geography who are female.| female_pop | Count per sq. km
-Population not Hispanic	| The number of people not identifying as Hispanic or Latino in each geography. | not_hispanic_pop | Count per sq. km
-White Population | The number of people identifying as white, non-Hispanic in each geography. | white_pop | Count per sq. km
-Black or African American Population| The number of people identifying as black or African American, non-Hispanic in each geography. | black_pop | Count per sq. km
-American Indian and Alaska Native Population | The number of people identifying as American Indian or Alaska native in each geography.| amerindian_pop| Count per sq. km
-Asian Population | The number of people identifying as Asian, non-Hispanic in each geography.| asian_pop | Count per sq. km
-Other Race population | The number of people identifying as another race in each geography. | other_race_pop | Count per sq. km
-Two or more races population| The number of people identifying as two or more races in each geography | two_or_more_races_pop | Count per sq. km
-Hispanic Population | The number of people identifying as Hispanic or Latino in each geography. | hispanic_pop | Count per sq. km
-Not a U.S. Citizen Population | The number of people within each geography who indicated that they are not U.S. citizens. | not_us_citizen_pop | Count per sq. km
-Median Age | The median age of all people in a given geographic area.| median_age | Years
-Children under 18 Years of Age | The number of people within each geography who are under 18 years of age.| children | Count per sq. km
-Population 15 Years and Over | The number of people in a geographic area who are over the age of 15. This is used mostly as a denominator of marital status. | pop_15_and_over | Count per sq. km
-Population 3 Years and Over | The total number of people in each geography age 3 years and over. This denominator is mostly used to calculate rates of school enrollment. | population_3_years_over | Count per sq. km
-Population 5 Years and Over | The number of people in a geographic area who are over the age of 5. This is primarily used as a denominator of measures of language spoken at home.| pop_5_years_over | Count per sq. km
-Workers over the Age of 16 | The number of people in each geography who work. Workers include those employed at private for-profit companies, the self-employed, government workers and non-profit employees. | workers_16_and_over | Count per sq. km
-Workers age 16 and over who do not work from home| The number of workers over the age of 16 who do not work from home in a geographic area| commuters_16_over | Count per sq. km
-Commuters by Car, Truck, or Van | The number of workers age 16 years and over within a geographic area who primarily traveled to work by car, truck or  van. This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. | commuters_by_car_truck_van | Count per sq. km
-Commuters who drove alone | The number of workers age 16 years and over within a geographic area who primarily traveled by car driving alone. This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. | commuters_drove_alone | Count per sq. km
-Commuters by Carpool| The number of workers age 16 years and over within a geographic area who primarily traveled to work by carpool. This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. | commuters_by_carpool | Count per sq. km
-Commuters by Public Transportation 	| The number of workers age 16 years and over within a geographic area who primarily traveled to work by public transportation.  This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. | commuters_by_public_transportation 	| Count per sq. km 	|
-Commuters by Bus | The number of workers age 16 years and over within a geographic area who primarily traveled to work by bus.  This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. This is a subset of workers who commuted by public transport. | commuters_by_bus| Count per sq. km
-Commuters by Subway or Elevated | The number of workers age 16 years and over within a geographic area who primarily traveled to work by subway or elevated train. This is the principal mode of travel or type of conveyance, by distance rather than time, that the worker usually used to get from home to work. This is a subset of workers who commuted by public transport. | commuters_by_subway_or_elevated | Count per sq. km
-Walked to Work | The number of workers age 16 years and over within a geographic area who primarily walked to work. This would mean that of any way of getting to work, they travelled the most distance walking. | walked_to_work | Count per sq. km
-Worked at Home | The count within a geographical area of workers over the age of 16 who worked at home. | worked_at_home | Count per sq. km
-Number of workers with less than 10 minute commute | The number of workers over the age of 16 who do not work from home and commute in less than 10 minutes in a geographic area. | commute_less_10_mins | Count per sq. km
-Number of workers with a commute between 10 and 14 minutes| The number of workers over the age of 16 who do not work from home and commute in between 10 and 14 minutes in a geographic area. | commute_10_14_mins | Count per sq. km
-Number of workers with a commute between 15 and 19 minutes | The number of workers over the age of 16 who do not work from home and commute in between 15 and 19 minutes in a geographic area. | commute_15_19_mins | Count per sq. km
-Number of workers with a commute between 20 and 24 minutes | The number of workers over the age of 16 who do not work from home and commute in between 20 and 24 minutes in a geographic area. | commute_20_24_mins | Count per sq. km
-Number of workers with a commute between 25 and 29 minutes | The number of workers over the age of 16 who do not work from home and commute in between 25 and 29 minutes in a geographic area. | commute_25_29_mins| Count per sq. km
-Number of workers with a commute between 30 and 34 minutes | The number of workers over the age of 16 who do not work from home and commute in between 30 and 34 minutes in a geographic area. | commute_30_34_mins | Count per sq. km
-Number of workers with a commute between 35 and 44 minutes | The number of workers over the age of 16 who do not work from home and commute in between 35 and 44 minutes in a geographic area. | commute_35_44_mins | Count per sq. km
-Number of workers with a commute between 45 and 59 minutes | The number of workers over the age of 16 who do not work from home and commute in between 45 and 59 minutes in a geographic area. | commute_45_59_mins | Count per sq. km
-Number of workers with a commute of over 60 minutes | The number of workers over the age of 16 who do not work from home and commute in over 60 minutes in a geographic area.| commute_60_more_mins | Count per sq. km
-Aggregate travel time to work | The total number of minutes every worker over the age of 16 who did not work from home spent spent commuting to work in one day in a geographic area. | aggregate_travel_time_to_work | Minutes
-Households | A count of the number of households in each geography. A household consists of one or more people who live in the same dwelling and also share at meals or living accommodation, and may consist of a single family or some other grouping of people. | households | Count per sq. km
-Never Married | The number of people in a geographic area who have never been married. | pop_never_married | Count per sq. km
-Currently married| The number of people in a geographic area who are currently married. | pop_now_married | Count per sq. km
-Married but separated | The number of people in a geographic area who are married but separated.| pop_separated | Count per sq. km
-Widowed | The number of people in a geographic area who are widowed.| pop_widowed | Count per sq. km
-Divorced | The number of people in a geographic area who are divorced. | pop_divorced | Count per sq. km
-Students Enrolled in School | The total number of people in each geography currently enrolled at any level of school, from nursery or pre-school to advanced post-graduate education. Only includes those over the age of 3. | in_school | Count per sq. km
-Students Enrolled in Grades 1 to 4 | The total number of people in each geography currently enrolled in grades 1 through 4 inclusive.  This corresponds roughly to elementary school. | in_grades_1_to_4 | Count per sq. km
-Students Enrolled in Grades 5 to 8 | The total number of people in each geography currently enrolled in grades 5 through 8 inclusive.  This corresponds roughly to middle school. | in_grades_5_to_8 | Count per sq. km
-Students Enrolled in Grades 9 to 12 | The total number of people in each geography currently enrolled in grades 9 through 12 inclusive.  This corresponds roughly to high school. | in_grades_9_to_12 | Count per sq. km
-Students Enrolled as Undergraduate in College | The number of people in a geographic area who are enrolled in college at the undergraduate level. Enrollment refers to being registered or listed as a student in an educational program leading to a college degree. This may be a public school or college, a private school or college. | in_undergrad_college | Count per sq. km
-Population 25 Years and Over | The number of people in a geographic area who are over the age of 25. This is used mostly as a denominator of educational attainment. | pop_25_years_over | Count per sq. km
-Population Completed High School | The number of people in a geographic area over the age of 25 who completed high school, and did not complete a more advanced degree.	| high_school_diploma| Count per sq. km
-Population completed less than one year of college, no degree | The number of people in a geographic area over the age of 25 who attended college for less than one year and no further. | less_one_year_college | Count per sq. km
-Population completed more than one year of college, no degree | The number of people in a geographic area over the age of 25 who attended college for more than one year but did not obtain a degree. | one_year_more_college | Count per sq. km
-Population Completed Associate's Degree | The number of people in a geographic area over the age of 25 who obtained a associate's degree, and did not complete a more advanced degree.| associates_degree | Count per sq. km
-Population Completed Bachelor's Degree| The number of people in a geographic area over the age of 25 who obtained a bachelor's degree, and did not complete a more advanced degree. | bachelors_degree| Count per sq. km
-Population Completed Master's Degree | The number of people in a geographic area over the age of 25 who obtained a master's degree, but did not complete a more advanced degree. | masters_degree | Count per sq. km
-Speaks only English at Home | The number of people in a geographic area over age 5 who speak only English at home. | speak_only_english_at_home | Count per sq. km
-Speaks Spanish at Home | The number of people in a geographic area over age 5 who speak Spanish at home, possibly in addition to other languages. | speak_spanish_at_home | Count per sq. km
-Population for Whom Poverty Status Determined | The number of people in each geography who could be identified as either living in poverty or not.  This should be used as the denominator when calculating poverty rates, as it excludes people for whom it was not possible to determine poverty. | pop_determined_poverty_status | Count per sq. km
-Income In The Past 12 Months Below Poverty Level | The number of people in a geographic area who are part of a family (which could be just them as an individual) determined to be "in poverty" following the [Office of Management and Budget's Directive 14](https://www.census.gov/hhes/povmeas/methodology/ombdir14.html). | poverty | Count per sq. km
-Households with income less than $10,000 | The number of households in a geographic area whose annual income was less than $10,000. | income_less_10000 | Count per sq. km
-Households with income of $10,000 to $14,999 | The number of households in a geographic area whose annual income was between $10,000 and $14,999. | income_10000_14999 | Count per sq. km
-Households with income of $15,000 to $19,999 | The number of households in a geographic area whose annual income was between $15,000 and $19,999. | income_15000_19999 | Count per sq. km
-Households with income of $20,000 To $24,999 | The number of households in a geographic area whose annual income was between $20,000 and $24,999. | income_20000_24999 | Count per sq. km
-Households with income of $25,000 To $29,999 | The number of households in a geographic area whose annual income was between $20,000 and $24,999. | income_25000_29999 | Count per sq. km
-Households with income of $30,000 To $34,999 | The number of households in a geographic area whose annual income was between $30,000 and $34,999. | income_30000_34999 | Count per sq. km
-Households with income of $35,000 To $39,999 | The number of households in a geographic area whose annual income was between $35,000 and $39,999. | income_35000_39999 | Count per sq. km
-Households with income of $40,000 To $44,999 | The number of households in a geographic area whose annual income was between $40,000 and $44,999. | income_40000_44999| Count per sq. km
-Households with income of $45,000 To $49,999 | The number of households in a geographic area whose annual income was between $45,000 and $49,999. | income_45000_49999 | Count per sq. km
-Households with income of $50,000 To $59,999 | The number of households in a geographic area whose annual income was between $50,000 and $59,999. | income_50000_59999 | Count per sq. km
-Households with income of $60,000 To $74,999 | The number of households in a geographic area whose annual income was between $60,000 and $74,999. | income_60000_74999 | Count per sq. km
-Households with income of $75,000 To $99,999 | The number of households in a geographic area whose annual income was between $75,000 and $99,999. | income_75000_99999 | Count per sq. km
-Households with income of $100,000 To $124,999 | The number of households in a geographic area whose annual income was between $100,000 and $124,999. | income_100000_124999 | Count per sq. km
-Households with income of $125,000 To $149,999 | The number of households in a geographic area whose annual income was between $125,000 and $149,999. | income_125000_149999 | Count per sq. km
-Households with income of $150,000 To $199,999 | The number of households in a geographic area whose annual income was between $150,000 and $1999,999. | income_150000_199999 | Count per sq. km
-Households with income of $200,000 Or More | The number of households in a geographic area whose annual income was more than $200,000. | income_200000_or_more | Count per sq. km
-Median Household Income in the past 12 Months | Within a geographic area, the median income received by every household on a regular basis before payments for personal income taxes, social security, union dues, medicare deductions, etc.  It includes income received from wages, salary, commissions, bonuses, and tips; self-employment income from own nonfarm or farm businesses, including proprietorships and partnerships; interest, dividends, net rental income, royalty income, or income from estates and trusts; Social Security or Railroad Retirement income; Supplemental Security Income (SSI); any cash public assistance or welfare payments from the state or local welfare office; retirement, survivor, or disability benefits; and any other sources of income received regularly such as Veterans' (VA) payments, unemployment and/or worker's compensation, child support, and alimony. | median_income | USD
-Per Capita Income in the past 12 Months |  	| income_per_capita | USD
-Gini Index | A measurement of the income distribution of a country's residents. | gini_index | None
-Housing Units | A count of housing units in each geography. A housing unit is a house, an apartment, a mobile home or trailer, a group of rooms, or a single room occupied as separate living quarters, or if vacant, intended for occupancy as separate living quarters. | housing_units | Count per sq. km
-Vacant Housing Units | The count of vacant housing units in a geographic area. A housing unit is vacant if no one is living in it at the time of enumeration, unless its occupants are only temporarily absent. Units temporarily occupied at the time of enumeration entirely by people who have a usual residence elsewhere are also classified as vacant. | vacant_housing_units | Count per sq. km
-Vacant Housing Units for Rent | The count of vacant housing units in a geographic area that are for rent. A housing unit is vacant if no one is living in it at the time of enumeration, unless its occupants are only temporarily absent. Units temporarily occupied at the time of enumeration entirely by people who have a usual residence elsewhere are also classified as vacant. | vacant_housing_units_for_rent | Count per sq. km
-Vacant Housing Units for Sale| The count of vacant housing units in a geographic area that are for sale. A housing unit is vacant if no one is living in it at the time of enumeration, unless its occupants are only temporarily absent. Units temporarily occupied at the time of enumeration entirely by people who have a usual residence elsewhere are also classified as vacant. | vacant_housing_units_for_sale | Count per sq. km
-Owner-occupied Housing Units | The count of owner occupied housing units in a geographic area. | owner_occupied_housing_units | Count per sq. km
-Owner-occupied Housing Units valued at $1,000,000 or more. | The count of owner occupied housing units in a geographic area that are valued at $1,000,000 or more. Value is the respondent's estimate of how much the property (house and lot, mobile home and lot, or condominium unit) would sell for if it were for sale. | million_dollar_housing_units | Count per sq. km
-Owner-occupied Housing Units with a Mortgage | The count of housing units within a geographic area that are mortagaged. "Mortgage" refers to all forms of debt where the property is pledged as security for repayment of the debt, including deeds of trust, trust deed, contracts to purchase, land contracts, junior mortgages, and home equity loans. | mortgaged_housing_units | Count per sq. km
-Median Rent | The median contract rent within a geographic area. The contract rent is the monthly rent agreed to or contracted for, regardless of any furnishings, utilities, fees, meals, or services that may be included. For vacant units, it is the monthly rent asked for the rental unit at the time of interview.| median_rent | USD
-Percent of Household Income Spent on Rent | Within a geographic area, the median percentage of household income which was spent on gross rent.  Gross rent is the amount of the contract rent plus the estimated average monthly cost of utilities (electricity, gas, water, sewer etc.) and fuels (oil, coal, wood, etc.) if these are paid by the renter. Household income is the sum of the income of all people 15 years and older living in the household. | percent_income_spent_on_rent | Percent

docs/developer-center/reference/07-routing-functions.md

@@ -12,7 +12,7 @@ Name | Type | Description | Accepted values
 --- | --- | --- | ---
 `origin` | `geometry(Point)` | Origin point, in 4326 projection, which defines the start location. |
 `destination` | `geometry(Point)` | Destination point, in 4326 projection, which defines the end location. |
-`mode` | `text` | Type of transport used to calculate the routes. | `car`, `walk`, `bicycle` or `public_transport`
+`mode` | `text` | Type of transport used to calculate the routes. | `car`, `walk` or `bicycle`
 `options` | `text[]` | (Optional) Multiple options to add more capabilities to the analysis. See [Optional routing parameters](#optional-routing-parameters) for details.
 `units` | `text` | (Optional) Unit used to represent the length of the route. | `kilometers`, `miles`. By default is `kilometers`. This option is not supported by Mapbox provider
 
@@ -47,7 +47,7 @@ Returns a route that goes from origin to destination and whose path travels thro
 Name | Type | Description | Accepted values
 --- | --- | --- | ---
 `waypoints` | `geometry(Point)[]` | Array of ordered points, in 4326 projection, which defines the origin point, one or more locations for the route path to travel through, and the destination. The first element of the array defines the origin and the last element the destination of the route. |
-`mode` | `text` | Type of transport used to calculate the routes. | `car`, `walk`, `bicycle` or `public_transport`
+`mode` | `text` | Type of transport used to calculate the routes. | `car`, `walk` or `bicycle`
 `options` | `text[]` | (Optional) Multiple options to add more capabilities to the analysis. See [Optional routing parameters](#optional-routing-parameters) for details.
 `units` | `text` | (Optional) Unit used to represent the length of the route. | `kilometers`, `miles`. By default is `kilometers`. This option is not supported by Mapbox provider
 

docs/developer-center/reference/09-segmentation-functions.md

@@ -1,181 +0,0 @@
-## Segmentation Functions
-
-The Segmentation Snapshot functions enable you to determine the pre-calculated population segment for a location. Segmentation is a method that divides a populations into subclassifications based on common traits. For example, you can take the a store location and determine what classification of population exists around that location. If you need help creating coordinates from addresses, see the [Geocoding Functions]({{site.dataservicesapi_docs}}/reference/#geocoding-functions) documentation.
-
-_**Note:** The Segmentation Snapshot functions are only available for the United States. Our first release (May 18, 2016) is derived from Census 2010 variables. Our next release will be based on Census 2014 data. For the latest information, see the [Open Segments](https://github.com/CartoDB/open-segments) project repository._
-
-### OBS_GetSegmentSnapshot( Point Geometry )
-
-#### Arguments
-
-Name | Description | Example Values
---- |  --- | ---
-point geometry | A point geometry. You can use the helper function, `CDB_LatLng` to quickly generate one from latitude and longitude | `CDB_LatLng(40.760410,-73.964242)`
-
-#### Returns
-
-The segmentation function returns two segment levels for the point you requests, the x10\_segment and x55\_segment. These segmentation levels contain different classifications of population within with each segment. The function also returns the quantile of a number of census variables. For example, if total_poulation is at 90% quantile level then this tract has a higher total population than 90% of the other tracts. 
-
-Name | Type | Description
----- | ---- | -----------
-x10\_segment | text | The demographic segment location at the 10 segment level, containing populations at high-levels, broken down into 10 broad categories
-x55\_segment | text | The demographic segment location at the 55 segment level, containing more granular sub-levels to categorize the population
-
-An example response appears as follows:
-
-```json 
-obs_getsegmentsnapshot: {
-  "x10_segment": "Wealthy, urban without Kids",
-  "x55_segment": "Wealthy city commuters",
-  "us.census.acs.B01001001_quantile": "0.0180540540540541",
-  "us.census.acs.B01001002_quantile": "0.0279864864864865",
-  "us.census.acs.B01001026_quantile": "0.016527027027027",
-  "us.census.acs.B01002001_quantile": "0.507297297297297",
-  "us.census.acs.B03002003_quantile": "0.133162162162162",
-  "us.census.acs.B03002004_quantile": "0.283743243243243",
-  "us.census.acs.B03002006_quantile": "0.683945945945946",
-  "us.census.acs.B03002012_quantile": "0.494594594594595",
-  "us.census.acs.B05001006_quantile": "0.670972972972973",
-  "us.census.acs.B08006001_quantile": "0.0607567567567568",
-  "us.census.acs.B08006002_quantile": "0.0684324324324324",
-  "us.census.acs.B08006008_quantile": "0.565135135135135",
-  "us.census.acs.B08006009_quantile": "0.638081081081081",
-  "us.census.acs.B08006011_quantile": "0",
-  "us.census.acs.B08006015_quantile": "0.900932432432432",
-  "us.census.acs.B08006017_quantile": "0.186648648648649",
-  "us.census.acs.B09001001_quantile": "0.0193513513513514",
-  "us.census.acs.B11001001_quantile": "0.0617972972972973",
-  "us.census.acs.B14001001_quantile": "0.0179594594594595",
-  "us.census.acs.B14001002_quantile": "0.0140405405405405",
-  "us.census.acs.B14001005_quantile": "0",
-  "us.census.acs.B14001006_quantile": "0",
-  "us.census.acs.B14001007_quantile": "0",
-  "us.census.acs.B14001008_quantile": "0.0609054054054054",
-  "us.census.acs.B15003001_quantile": "0.0314594594594595",
-  "us.census.acs.B15003017_quantile": "0.0403378378378378",
-  "us.census.acs.B15003022_quantile": "0.285972972972973",
-  "us.census.acs.B15003023_quantile": "0.214567567567568",
-  "us.census.acs.B16001001_quantile": "0.0181621621621622",
-  "us.census.acs.B16001002_quantile": "0.0463108108108108",
-  "us.census.acs.B16001003_quantile": "0.540540540540541",
-  "us.census.acs.B17001001_quantile": "0.0237567567567568",
-  "us.census.acs.B17001002_quantile": "0.155972972972973",
-  "us.census.acs.B19013001_quantile": "0.380662162162162",
-  "us.census.acs.B19083001_quantile": "0.986891891891892",
-  "us.census.acs.B19301001_quantile": "0.989594594594595",
-  "us.census.acs.B25001001_quantile": "0.998418918918919",
-  "us.census.acs.B25002003_quantile": "0.999824324324324",
-  "us.census.acs.B25004002_quantile": "0.999986486486486",
-  "us.census.acs.B25004004_quantile": "0.999662162162162",
-  "us.census.acs.B25058001_quantile": "0.679054054054054",
-  "us.census.acs.B25071001_quantile": "0.569716216216216",
-  "us.census.acs.B25075001_quantile": "0.0415",
-  "us.census.acs.B25075025_quantile": "0.891702702702703"
-}
-```
-
-The possible segments are:
-
-<table>
-  <tr><th> X10 segment</th> <th> X55 Segment </th></tr>
-  
-  <tr><td> Hispanic and kids</td><td></td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #99C945'></div> Middle Class, Educated, Suburban, Mixed Race </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #a3ce57'></div> Low Income on Urban Periphery</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #add468'></div> Suburban, Young and Low-income  </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #b7d978'></div> low-income, urban, young, unmarried  </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #c1df88'></div> Low education, mainly suburban </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #cbe598'></div> Young, working class and rural  </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #d5eba8'></div> Low-Income with gentrification  </td></tr>
-    
-  <tr><td>Low Income and Diverse</td><td></td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #52BCA3'></div> High school education Long Commuters, Black, White Hispanic mix</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #66c5ae'></div> Rural, Bachelors or college degree, Rent owned mix</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #79cdb7'></div> Rural,High School Education, Owns property</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #8bd5c1'></div> Young, City based renters in Sparse neighborhoods, Low poverty   </td></tr>
-    
-  <tr><td>Low income, minority mix</td><td></td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #5D69B1'></div> Predominantly black, high high school attainment, home owners </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #7b83c6'></div> White and minority mix multilingual, mixed income / education. Married </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #9095d2'></div> Hispanic Black mix multilingual, high poverty, renters, uses public transport</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #a3a7df'></div>  Predominantly black renters, rent own mix </td></tr>
-    
-  <tr><td>Middle income, single family homes</td><td></td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #E58606'></div> Lower Middle Income with higher rent burden </td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #f0983b'></div> Black and mixed community with rent burden</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #f4a24e'></div> Lower Middle Income with affordable housing</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #f8ab5f'></div> Relatively affordable, satisfied lower middle class</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #fcb470'></div> Satisfied Lower Middle Income Higher Rent Costs</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #ffbe81'></div> Suburban/Rural Satisfied, decently educated lower middle class</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #ffc792'></div> Struggling lower middle class with rent burden</td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #ffd0a3'></div> Older white home owners, less comfortable financially </td></tr>
-    <tr><td></td> <td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #ffdab4'></div> Older home owners, more financially comfortable, some diversity</td></tr>
-    
-  <tr><td>Native American</td><td></td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #2F8AC4'></div>Younger, poorer,single parent family Native Americans</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background: #77b8ee'></div>Older, middle income Native Americans once married and Educated </td></tr>
-    
-  <tr><td>Old Wealthy, White</td><td></td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#24796C'></div> Older, mixed race professionals</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#388d7e'></div> Works from home, Highly Educated, Super Wealthy </td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#4ca191'></div> Retired Grandparents</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#60b5a5'></div> Wealthy and Rural Living</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#73c9b8'></div> Wealthy, Retired Mountains/Coasts</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#87decc'></div> Wealthy Diverse Suburbanites On the Coasts</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#9bf3e1'></div> Retirement Communitties</td></tr>
-    
-  <tr><td>Low Income African American</td><td></td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#c23a7e'></div>Urban - Inner city</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#d86298'></div>Rural families</td></tr>
-  <tr><td>Residential institutions, young people</td><td></td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#764e9f'></div>College towns</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#8a64b1'></div>College town with poverty</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#9e7ac3'></div>University campus wider area</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#b491d5'></div>City Outskirt University Campuses</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#c9a8e8'></div>City Center University Campuses</td></tr>
-    
-  <tr><td>Wealthy Nuclear Families</td><td></td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ed645a'></div>Lower educational attainment, Homeowner, Low rent</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ee7655'></div>Younger, Long Commuter in dense neighborhood</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#f38060'></div>Long commuters White black mix</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#f98a6b'></div>Low rent in built up neighborhoods</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#fe9576'></div>Renters within cities, mixed income areas, White/Hispanic mix, Unmarried</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ff9f82'></div>Older Home owners with high income</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ffa98d'></div>Older home owners and very high income</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ffb399'></div>White Asian Mix Big City Burbs Dwellers</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ffbda5'></div>Bachelors degree Mid income With Mortgages</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ffc8b1'></div>Asian Hispanic Mix, Mid income</td></tr>
-    <tr><td></td><td><div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ffd2bd'></div>Bachelors degree Higher income Home Owners</td></tr>
-    
-  <tr><td>Wealthy, urban, and kid-free</td><td></td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#CC61B0'></div>Wealthy city commuters </td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#d975bd'></div>New Developments</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#e488c9'></div>Very wealthy, multiple million dollar homes</td></tr>
-    <tr><td></td> <td> <div  style='float:left;margin-right:10px;width:20px; height:20px; border-radius:20px;background:#ee9ad4'></div>High rise, dense urbanites</td></tr>
-</table>
-
-
-#### Examples
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetSegmentSnapshot({{point geometry}})
-```
-
-###### Get the Geographic Snapshot of a Segmentation
-
-__Get the Segmentation Snapshot around the MGM Grand__
-
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetSegmentSnapshot(CDB_LatLng(36.10222, -115.169516))
-```
-
-__Get the Segmentation Snapshot at CARTO's NYC HQ__
-
-
-```bash
-https://{username}.carto.com/api/v2/sql?q=SELECT * FROM
-OBS_GetSegmentSnapshot(CDB_LatLng(40.704512, -73.936669))
-```

docs/developer-center/support/03-quota-information.md

@@ -39,7 +39,6 @@ Service Types:
 * `'isolines'` [Isoline/Isochrones (isochrone/isodistance lines) service]({{site.dataservicesapi_docs}}/reference/#isoline_functions/)
 * `'hires_geocoder'` [Street level geocoding]({{site.dataservicesapi_docs}}/reference/#street-level-geocoder)
 * `'routing'` [Routing functions]({{site.dataservicesapi_docs}}/reference/#routing_functions/)
-* `'observatory'` Data Observatory services ([demographic]({{site.dataservicesapi_docs}}/reference/#demographic_functions/) and [segmentation]({{site.dataservicesapi_docs}}/reference/#segmentation_functions/) functions)
 
 **Notes**
 
@@ -62,12 +61,11 @@ Result:
  isolines       |           100 |          0 | f          | tomtom
  hires_geocoder |           100 |          0 | f          | tomtom
  routing        |            50 |          0 | f          | tomtom
- observatory    |             0 |          0 | f          | data observatory
 (4 rows)
 
 ```
 
-In this case, notice that the user has no access to the observatory services. All quotas are *hard-limited* (no soft limits), and no quota has been used in the present period.
+All quotas are *hard-limited* (no soft limits), and no quota has been used in the present period.
 
 ### cdb_enough_quota(service text ,input_size numeric)
 

docs/internal/quota_management.md

@@ -56,11 +56,9 @@ This operation could be done through the rails console:
 
   - Geocoding (street level): `geocoding_quota`, `soft_geocoding_limit`
   - Isolines: `here_isolines_quota`, `soft_here_isolines_limit`
-  - Data observatory snapshot: `obs_snapshot_quota`, `soft_obs_snapshot_limit`
-  - Data observatory general: `obs_general_quota`, `soft_obs_general_limit`
 
 ### How is the quota spent?###
 
-Almost in all the services: geocoding, data observatory snapshot and general the number of spent credits is calculated per request made (either successful or empty request).
+Almost in all the services: geocoding and general the number of spent credits is calculated per request made (either successful or empty request).
 
 In the case of the isolines service, the number of credits is calculated based on the number of isolines generated by the request. Ie. If your query generates 3 isolines for the request, you've spent 3 isolines credits.

server/extension/.gitignore

@@ -6,4 +6,6 @@ cdb_geocoder_server--0.1.0.sql
 cdb_geocoder_server--0.2.0.sql
 cdb_geocoder_server--0.3.0.sql
 cdb_geocoder_server--0.4.0.sql
-cdb_geocoder_server--0.5.0.sql
+cdb_geocoder_server--0.5.0.sql
+cdb_dataservices_server.control
+./test/sql/366_empty_table_test.sql

server/extension/Makefile

@@ -1,17 +1,32 @@
 # Makefile to generate the extension out of separate sql source files.
 # Once a version is released, it is not meant to be changed. E.g: once version 0.0.1 is out, it SHALL NOT be changed.
 EXTENSION = cdb_dataservices_server
-EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
+EXTVERSION = 0.40.1
+
 # The new version to be generated from templates
-SED = sed
-ERB = erb
-NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql
-AWK = awk
+SED ?= sed
+ERB ?= erb
+AWK ?= awk
+PG_CONFIG ?= pg_config
 
 # Parallel support macros
-PG_CONFIG         = pg_config
+PG_CONFIG        ?= pg_config
 PG_PARALLEL      := $(shell $(PG_CONFIG) --version | ($(AWK) '{$$2*=1000; if ($$2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0))
 
+# PG12 compatibility
+PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print a[1]}')
+PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
+PLPYTHONU := plpythonu
+POSTGIS := postgis
+ifeq ($(PG_12_GE), true)
+PLPYTHONU := plpython3u
+POSTGIS := postgis, postgis_raster
+endif
+
+REPLACEMENTS = -e 's/@@EXTVERSION@@/$(EXTVERSION)/g' -e 's/@@plpythonu@@/$(PLPYTHONU)/g' -e 's/@@postgis@@/$(POSTGIS)/g'
+REPLACEMENTS_TEST_REVERSE = -e 's/$(PLPYTHONU)/@@plpythonu@@/g'
+NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql
+
 REGRESS = $(notdir $(basename $(sort $(wildcard test/sql/*test.sql))))
 REGRESS_EXPEC = $(notdir $(basename $(sort $(wildcard test/expected/*test.out))))
 TEST_DIR = test
@@ -29,52 +44,35 @@ SOURCES_DATA_DIR = sql/
 SOURCES_DATA = $(wildcard sql/*.sql)
 
 # postgres build stuff
-PG_CONFIG = pg_config
+
+# The targets listed under REGRESS_PREP are executed before regress
+PYTHON_TESTS = ./test/sql/366_empty_table_test.sql
+REGRESS_PREP = $(PYTHON_TESTS)
+
+./test/sql/366_empty_table_test.sql: ./test/sql/366_empty_table_test.sql.template
+	$(SED) $(REPLACEMENTS) $@.template > $@
+
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-# PG12 compatibility
-PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print a[1]}')
-PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
-PLPYTHONU := plpythonu
-ifeq ($(PG_12_GE), true)
-PLPYTHONU := plpython3u
-endif
-
-REPLACEMENTS = -e 's/@@plpythonu@@/$(PLPYTHONU)/g'
-ifneq ($(NEW_VERSION),)
-REPLACEMENTS += -e 's/$(EXTVERSION)/$(NEW_VERSION)/g'
-endif
 
 $(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA)
 	rm -f $@
 	cat $(SOURCES_DATA_DIR)/*.sql >> $@
-ifeq ($(PG_PARALLEL), 0)
-# Remove PARALLEL in aggregates and functions
-	$(eval TMPFILE := $(shell mktemp /tmp/$(basename $0).XXXXXXXX))
-	$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' \
-		-e 's/PARALLEL [A-Z]*/''/g' $@ > $(TMPFILE)
-	mv $(TMPFILE) $@
-endif
-
-# $(EXTENSION).control: $(EXTENSION).control.in Makefile
-# 	$(SED) $(REPLACEMENTS)  $< > $@
 
 .PHONY: all
 all: $(DATA)
 
 .PHONY: release
-release: $(EXTENSION).control $(SOURCES_DATA)
+release: $(SOURCES_DATA)
 	test -n "$(NEW_VERSION)"  # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0
-	for f in $(wildcard *.sql); do \
-		git mv $${f} old_versions/$${f}; \
-	done
-	$(SED) -i 's/$(EXTVERSION)/$(NEW_VERSION)/g' $(EXTENSION).control
-	git add $(EXTENSION).control
+	git mv *.sql old_versions
 	cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql
 	$(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql
 	$(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql
 	git add $(EXTENSION)--$(NEW_VERSION).sql
+	$(SED) -i -e 's/^EXTVERSION =.*/EXTVERSION = $(NEW_VERSION)/g' Makefile
+	git add Makefile
 	@echo
 	@echo "Please review the file $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql.in and add any code needed to upgrade $(EXTVERSION) to $(NEW_VERSION)"
 	@echo "Please review the file $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql.in and add any code needed to downgrade $(NEW_VERSION) to $(EXTVERSION)"
@@ -84,78 +82,32 @@ release: $(EXTENSION).control $(SOURCES_DATA)
 .PHONY: devclean
 devclean:
 	rm -f $(NEW_EXTENSION_ARTIFACT)
+	rm -f $(PYTHON_TESTS)
 
-clean: restore_copies
-
-# If needed remove PARALLEL tags from the release files
-release_remove_parallel_deploy:
-ifeq ($(PG_PARALLEL), 0)
+# Replace variables (and PARALLEL tags if necessary) and deploy files
+.PHONY: replace_variables_and_deploy
+replace_variables_and_deploy: $(NEW_EXTENSION_ARTIFACT)
+	mkdir -p '$(DESTDIR)$(datadir)/extension/'; \
 	for n in $(wildcard old_versions/*.sql *.sql); do \
 		$(eval TMPFILE := $(shell mktemp /tmp/XXXXXXXXXX)) \
-		$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' -e 's/PARALLEL [A-Z]*/''/g' $$n > $(TMPFILE); \
-		mv $(TMPFILE) $$n; \
+		if [ "$(PG_PARALLEL)" -eq "0" ]; then \
+			$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' -e 's/PARALLEL [A-Z]*/''/g' $$n > $(TMPFILE); \
+			mv $(TMPFILE) $$n; \
+		fi; \
+		$(SED) $(REPLACEMENTS) $$n > $(TMPFILE); \
+		mv $(TMPFILE) '$(DESTDIR)$(datadir)/extension/'$$(basename $$n); \
 	done
-endif
+	
+
+.PHONY: $(EXTENSION).control
+$(EXTENSION).control:
+	$(SED) $(REPLACEMENTS) $(EXTENSION).control.in > $(EXTENSION).control
 
 # Install the current release into the PostgreSQL extensions directory
-deploy: release_remove_parallel_deploy
+.PHONY: deploy
+deploy: replace_variables_and_deploy $(EXTENSION).control
 	$(INSTALL_DATA) $(EXTENSION).control '$(DESTDIR)$(datadir)/extension/'
-	$(INSTALL_DATA) old_versions/*.sql *.sql '$(DESTDIR)$(datadir)/extension/'
 
-restore_copies:
-	# tests
-	for f in $(basename $(wildcard test/sql/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	for f in $(basename $(wildcard test/expected/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f test/sql/*.copy;
-	rm -f test/expected/*.copy;
-	# data
-	for f in $(basename $(wildcard sql/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f sql/*.copy;
-	# old_versions
-	for f in $(basename $(wildcard old_versions/*.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f old_versions/*.copy;
-	# current scripts
-	for f in $(basename $(wildcard *.copy)); do \
-		cat $${f}.copy > $${f}; \
-	done
-	rm -f *.copy;
-
-
-# %.sql:
-# 	$(SED) $(REPLACEMENTS)  $< > $@
-
-# Replacing variables defined within test files
-replace_variables: restore_copies
-	# tests
-	for f in $(sort $(wildcard test/sql/*test.sql)); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	for f in $(sort $(wildcard test/expected/*test.out)); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# data
-	for f in $(SOURCES_DATA); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# old_versions
-	for f in $(wildcard old_versions/*.sql); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	# current scripts
-	for f in $(wildcard *.sql); do \
-		sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \
-	done
-	sed --in-place=.copy -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $(EXTENSION).control;
-
-install: replace_variables deploy
-
-reinstall: install
-	psql -U postgres -d dataservices_db -c "drop extension if exists cdb_dataservices_server; create extension cdb_dataservices_server;"
+.PHONY: install
+install: deploy
+	@echo "Install overriden"

server/extension/carto-package.json

@@ -7,8 +7,7 @@
       "carto_postgresql_ext": "^0.36.0"
     },
     "works_with": {
-      "dataservices-api-server-python-lib": "^0.23.1",
-      "observatory-server-extension": "^1.9.0"
+      "dataservices-api-server-python-lib": "^0.23.1"
     }
   }
 }

server/extension/cdb_dataservices_server--0.40.0--0.40.1.sql

@@ -0,0 +1,110 @@
+--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.40.1'" 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 get_geocoder
+
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
+
+  try:
+    service_manager.assert_within_limits()
+    geocoder = get_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False)
+    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_bulk_heremaps_geocode_street_point(username TEXT, orgname TEXT, searches jsonb)
+RETURNS SETOF cdb_dataservices_server.geocoding AS $$
+  from cartodb_services import run_street_point_geocoder
+  from cartodb_services.tools import LegacyServiceManager
+  from cartodb_services.here import get_bulk_geocoder
+
+  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
+  geocoder = get_bulk_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False)
+  return run_street_point_geocoder(plpy, GD, geocoder, service_manager, username, orgname, searches)
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
+
+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 get_routing_isoline
+  from cartodb_services.metrics import QuotaService
+  from cartodb_services.here.types import geo_polyline_to_multipolygon
+  from cartodb_services.tools import Logger,LoggerConfig
+
+  redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
+  user_isolines_routing_config = GD["user_isolines_routing_config_{0}".format(username)]
+
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+  # -- Check the quota
+  quota_service = QuotaService(user_isolines_routing_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
+
+  try:
+    client = get_routing_isoline(app_id=user_isolines_routing_config.heremaps_app_id or None,
+      app_code=user_isolines_routing_config.heremaps_app_code or None, logger=logger, 
+      apikey=user_isolines_routing_config.heremaps_apikey or None,
+      use_apikey=user_isolines_routing_config.heremaps_use_apikey or False)
+    client_api_version = client.get_api_version()
+    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']
+      if client_api_version == 7:
+        source_str = 'geo!%f,%f' % (lat, lon)
+      else:
+        source_str = '%f,%f' % (lat, lon)
+    else:
+      source_str = None
+
+    if type == 'isodistance':
+      resp = client.calculate_isodistance(source_str, mode, data_range, options)
+    elif type == 'isochrone':
+      resp = client.calculate_isochrone(source_str, mode, data_range, options)
+
+    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_service_use()
+      quota_service.increment_isolines_service_use(len(resp))
+      return result
+    else:
+      quota_service.increment_empty_service_use()
+      return []
+  except BaseException as e:
+    import sys
+    quota_service.increment_failed_service_use()
+    logger.error('Error trying to get mapzen isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get mapzen isolines')
+  finally:
+    quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server--0.40.1--0.40.0.sql

@@ -0,0 +1,105 @@
+--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.40.0'" 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_bulk_heremaps_geocode_street_point(username TEXT, orgname TEXT, searches jsonb)
+RETURNS SETOF cdb_dataservices_server.geocoding AS $$
+  from cartodb_services import run_street_point_geocoder
+  from cartodb_services.tools import LegacyServiceManager
+  from cartodb_services.here import HereMapsBulkGeocoder
+
+  service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
+  geocoder = HereMapsBulkGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
+  return run_street_point_geocoder(plpy, GD, geocoder, service_manager, username, orgname, searches)
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
+
+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
+  from cartodb_services.tools import Logger,LoggerConfig
+
+  redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
+  user_isolines_routing_config = GD["user_isolines_routing_config_{0}".format(username)]
+
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+  # -- Check the quota
+  quota_service = QuotaService(user_isolines_routing_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
+
+  try:
+    client = HereMapsRoutingIsoline(user_isolines_routing_config.heremaps_app_id,
+      user_isolines_routing_config.heremaps_app_code, 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']
+      source_str = 'geo!%f,%f' % (lat, lon)
+    else:
+      source_str = None
+
+    if type == 'isodistance':
+      resp = client.calculate_isodistance(source_str, mode, data_range, options)
+    elif type == 'isochrone':
+      resp = client.calculate_isochrone(source_str, mode, data_range, options)
+
+    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_service_use()
+      quota_service.increment_isolines_service_use(len(resp))
+      return result
+    else:
+      quota_service.increment_empty_service_use()
+      return []
+  except BaseException as e:
+    import sys
+    quota_service.increment_failed_service_use()
+    logger.error('Error trying to get mapzen isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get mapzen isolines')
+  finally:
+    quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/cdb_dataservices_server.control.in

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

server/extension/old_versions/cdb_dataservices_server--0.38.0--0.39.0.sql

@@ -0,0 +1,11 @@
+--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.39.0'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+-- In 0.39.0 we removed cdb_dataservices_client.geomval and rely on postgis_raster if necessary
+DO $$
+BEGIN
+  DROP TYPE IF EXISTS cdb_dataservices_server.geomval RESTRICT;
+END$$;

server/extension/old_versions/cdb_dataservices_server--0.39.0--0.38.0.sql

@@ -1,4 +1,9 @@
--- PG12_DEPRECATED
+--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.38.0'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
 -- Create geomval if it doesn't exist (in postgis 3+ it only exists in postgis_raster)
 DO $$
 BEGIN
@@ -8,4 +13,4 @@ BEGIN
             val double precision
         );
     END IF;
-END$$;
+END$$;

server/extension/old_versions/cdb_dataservices_server--0.39.0--0.39.1.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.39.1'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+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 $$
+  from cartodb_services.metrics import metrics
+  from cartodb_services.tools import Logger
+
+  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_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)]
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+
+  params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
+
+  with metrics('cdb_isodistance', user_isolines_config, logger, params):
+    if user_isolines_config.heremaps_provider:
+      here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(here_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapzen_provider:
+      mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapbox_provider:
+      mapbox_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapbox_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapbox_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.tomtom_provider:
+      tomtom_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_tomtom_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(tomtom_plan, [username, orgname, source, mode, range, options])
+    else:
+      raise Exception('Requested isolines provider is not available')
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
+
+
+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 $$
+  from cartodb_services.metrics import metrics
+  from cartodb_services.tools import Logger
+
+  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_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)]
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+
+  params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
+
+  with metrics('cdb_isochrone', user_isolines_config, logger, params):
+    if user_isolines_config.heremaps_provider:
+      here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(here_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapzen_provider:
+      mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapbox_provider:
+      mapbox_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapbox_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapbox_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.tomtom_provider:
+      tomtom_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_tomtom_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(tomtom_plan, [username, orgname, source, mode, range, options])
+    else:
+      raise Exception('Requested isolines provider is not available')
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.1--0.39.0.sql

@@ -0,0 +1,76 @@
+--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.39.0'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+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 $$
+  from cartodb_services.metrics import metrics
+  from cartodb_services.tools import Logger
+
+  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_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)]
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+
+  if user_isolines_config.google_services_user:
+    raise Exception('This service is not available for google service users.')
+
+  params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
+
+  with metrics('cdb_isodistance', user_isolines_config, logger, params):
+    if user_isolines_config.heremaps_provider:
+      here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(here_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapzen_provider:
+      mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapbox_provider:
+      mapbox_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapbox_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapbox_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.tomtom_provider:
+      tomtom_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_tomtom_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(tomtom_plan, [username, orgname, source, mode, range, options])
+    else:
+      raise Exception('Requested isolines provider is not available')
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
+
+
+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 $$
+  from cartodb_services.metrics import metrics
+  from cartodb_services.tools import Logger
+
+  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_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)]
+  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
+  logger_config = GD["logger_config"]
+  logger = Logger(logger_config)
+
+  if user_isolines_config.google_services_user:
+    raise Exception('This service is not available for google service users.')
+
+  params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
+
+  with metrics('cdb_isochrone', user_isolines_config, logger, params):
+    if user_isolines_config.heremaps_provider:
+      here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(here_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapzen_provider:
+      mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.mapbox_provider:
+      mapbox_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapbox_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(mapbox_plan, [username, orgname, source, mode, range, options])
+    elif user_isolines_config.tomtom_provider:
+      tomtom_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_tomtom_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
+      return plpy.execute(tomtom_plan, [username, orgname, source, mode, range, options])
+    else:
+      raise Exception('Requested isolines provider is not available')
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.1--0.39.2.sql

@@ -0,0 +1,140 @@
+--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.39.2'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_route_with_waypoints(
+  username TEXT,
+  orgname TEXT,
+  waypoints geometry(Point, 4326)[],
+  mode TEXT,
+  options text[] DEFAULT ARRAY[]::text[],
+  units text DEFAULT 'kilometers')
+RETURNS cdb_dataservices_server.simple_route AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxRouting
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.tools.polyline import polyline_to_linestring
+  from cartodb_services.tools.normalize import options_to_dict
+  from cartodb_services.refactor.service.mapbox_routing_config import MapboxRoutingConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('routing', MapboxRoutingConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxRouting(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+
+    if not waypoints or len(waypoints) < 2:
+      service_manager.logger.info("Empty origin or destination")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    if len(waypoints) > 25:
+      service_manager.logger.info("Too many waypoints (max 25)")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    waypoint_coords = []
+    for waypoint in waypoints:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % waypoint)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % waypoint)[0]['lon']
+      waypoint_coords.append(Coordinate(lon,lat))
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+    options_dict = options_to_dict(options)
+    if 'mode_type' in options_dict:
+      plpy.warning('Mapbox provider doesnt support route type parameter')
+
+    resp = client.directions(waypoint_coords, profile)
+    if resp and resp.shape:
+      shape_linestring = polyline_to_linestring(resp.shape)
+      if shape_linestring:
+        service_manager.quota_service.increment_success_service_use()
+        return [shape_linestring, resp.length, int(round(resp.duration))]
+      else:
+        service_manager.quota_service.increment_empty_service_use()
+        return [None, None, None]
+    else:
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to calculate Mapbox routing', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to calculate Mapbox routing: ' + str(e))
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;
+
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_route_with_waypoints(
+  username TEXT,
+  orgname TEXT,
+  waypoints geometry(Point, 4326)[],
+  mode TEXT,
+  options text[] DEFAULT ARRAY[]::text[],
+  units text DEFAULT 'kilometers')
+RETURNS cdb_dataservices_server.simple_route AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.tomtom import TomTomRouting
+  from cartodb_services.tomtom.types import TRANSPORT_MODE_TO_TOMTOM, DEFAULT_ROUTE_TYPE, MODE_TYPE_TO_TOMTOM
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.tools.polyline import polyline_to_linestring
+  from cartodb_services.tools.normalize import options_to_dict
+  from cartodb_services.refactor.service.tomtom_routing_config import TomTomRoutingConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('routing', TomTomRoutingConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = TomTomRouting(service_manager.config.tomtom_api_key, service_manager.logger, service_manager.config.service_params)
+
+    if not waypoints or len(waypoints) < 2:
+      service_manager.logger.info("Empty origin or destination")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    if len(waypoints) > 25:
+      service_manager.logger.info("Too many waypoints (max 25)")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    waypoint_coords = []
+    for waypoint in waypoints:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % waypoint)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % waypoint)[0]['lon']
+      waypoint_coords.append(Coordinate(lon,lat))
+
+    profile = TRANSPORT_MODE_TO_TOMTOM.get(mode)
+    route_type = DEFAULT_ROUTE_TYPE
+    options_dict = options_to_dict(options)
+    if 'mode_type' in options_dict:
+      route_type = MODE_TYPE_TO_TOMTOM.get(options_dict['mode_type'])
+
+    resp = client.directions(waypoint_coords, profile=profile, route_type=route_type)
+    if resp and resp.shape:
+      shape_linestring = polyline_to_linestring(resp.shape)
+      if shape_linestring:
+        service_manager.quota_service.increment_success_service_use()
+        return [shape_linestring, resp.length, int(round(resp.duration))]
+      else:
+        service_manager.quota_service.increment_empty_service_use()
+        return [None, None, None]
+    else:
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to calculate TomTom routing', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to calculate TomTom routing: ' + str(e))
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.2--0.39.1.sql

@@ -0,0 +1,139 @@
+--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.39.1'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapbox_route_with_waypoints(
+  username TEXT,
+  orgname TEXT,
+  waypoints geometry(Point, 4326)[],
+  mode TEXT,
+  options text[] DEFAULT ARRAY[]::text[],
+  units text DEFAULT 'kilometers')
+RETURNS cdb_dataservices_server.simple_route AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.mapbox import MapboxRouting
+  from cartodb_services.mapbox.types import TRANSPORT_MODE_TO_MAPBOX
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.tools.polyline import polyline_to_linestring
+  from cartodb_services.tools.normalize import options_to_dict
+  from cartodb_services.refactor.service.mapbox_routing_config import MapboxRoutingConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('routing', MapboxRoutingConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = MapboxRouting(service_manager.config.mapbox_api_key, service_manager.logger, service_manager.config.service_params)
+
+    if not waypoints or len(waypoints) < 2:
+      service_manager.logger.info("Empty origin or destination")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    if len(waypoints) > 25:
+      service_manager.logger.info("Too many waypoints (max 25)")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    waypoint_coords = []
+    for waypoint in waypoints:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % waypoint)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % waypoint)[0]['lon']
+      waypoint_coords.append(Coordinate(lon,lat))
+
+    profile = TRANSPORT_MODE_TO_MAPBOX.get(mode)
+    options_dict = options_to_dict(options)
+    if 'mode_type' in options_dict:
+      plpy.warning('Mapbox provider doesnt support route type parameter')
+
+    resp = client.directions(waypoint_coords, profile)
+    if resp and resp.shape:
+      shape_linestring = polyline_to_linestring(resp.shape)
+      if shape_linestring:
+        service_manager.quota_service.increment_success_service_use()
+        return [shape_linestring, resp.length, int(round(resp.duration))]
+      else:
+        service_manager.quota_service.increment_empty_service_use()
+        return [None, None, None]
+    else:
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to calculate Mapbox routing', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to calculate Mapbox routing')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_route_with_waypoints(
+  username TEXT,
+  orgname TEXT,
+  waypoints geometry(Point, 4326)[],
+  mode TEXT,
+  options text[] DEFAULT ARRAY[]::text[],
+  units text DEFAULT 'kilometers')
+RETURNS cdb_dataservices_server.simple_route AS $$
+  from cartodb_services.tools import ServiceManager
+  from cartodb_services.tomtom import TomTomRouting
+  from cartodb_services.tomtom.types import TRANSPORT_MODE_TO_TOMTOM, DEFAULT_ROUTE_TYPE, MODE_TYPE_TO_TOMTOM
+  from cartodb_services.tools import Coordinate
+  from cartodb_services.tools.polyline import polyline_to_linestring
+  from cartodb_services.tools.normalize import options_to_dict
+  from cartodb_services.refactor.service.tomtom_routing_config import TomTomRoutingConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('routing', TomTomRoutingConfigBuilder, username, orgname, GD)
+  service_manager.assert_within_limits()
+
+  try:
+    client = TomTomRouting(service_manager.config.tomtom_api_key, service_manager.logger, service_manager.config.service_params)
+
+    if not waypoints or len(waypoints) < 2:
+      service_manager.logger.info("Empty origin or destination")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    if len(waypoints) > 25:
+      service_manager.logger.info("Too many waypoints (max 25)")
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+
+    waypoint_coords = []
+    for waypoint in waypoints:
+      lat = plpy.execute("SELECT ST_Y('%s') AS lat" % waypoint)[0]['lat']
+      lon = plpy.execute("SELECT ST_X('%s') AS lon" % waypoint)[0]['lon']
+      waypoint_coords.append(Coordinate(lon,lat))
+
+    profile = TRANSPORT_MODE_TO_TOMTOM.get(mode)
+    route_type = DEFAULT_ROUTE_TYPE
+    options_dict = options_to_dict(options)
+    if 'mode_type' in options_dict:
+      route_type = MODE_TYPE_TO_TOMTOM.get(options_dict['mode_type'])
+
+    resp = client.directions(waypoint_coords, profile=profile, route_type=route_type)
+    if resp and resp.shape:
+      shape_linestring = polyline_to_linestring(resp.shape)
+      if shape_linestring:
+        service_manager.quota_service.increment_success_service_use()
+        return [shape_linestring, resp.length, int(round(resp.duration))]
+      else:
+        service_manager.quota_service.increment_empty_service_use()
+        return [None, None, None]
+    else:
+      service_manager.quota_service.increment_empty_service_use()
+      return [None, None, None]
+  except BaseException as e:
+    import sys
+    service_manager.quota_service.increment_failed_service_use()
+    service_manager.logger.error('Error trying to calculate TomTom routing', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to calculate TomTom routing')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.2--0.39.3.sql

@@ -0,0 +1,42 @@
+--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.39.3'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_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.tomtom import TomTomGeocoder
+  from cartodb_services.refactor.service.tomtom_geocoder_config import TomTomGeocoderConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('geocoder', TomTomGeocoderConfigBuilder, username, orgname, GD)
+
+  try:
+    service_manager.assert_within_limits()
+    geocoder = TomTomGeocoder(service_manager.config.tomtom_api_key, service_manager.logger, service_manager.config.service_params)
+
+    coordinates = geocoder.geocode(searchtext=searchtext, city=city,
+                                   state_province=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 TomTom', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to geocode street point using TomTom')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.3--0.39.2.sql

@@ -0,0 +1,50 @@
+--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.39.2'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_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.tomtom import TomTomGeocoder
+  from cartodb_services.tools.country import country_to_iso3
+  from cartodb_services.refactor.service.tomtom_geocoder_config import TomTomGeocoderConfigBuilder
+
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+  service_manager = ServiceManager('geocoder', TomTomGeocoderConfigBuilder, username, orgname, GD)
+
+  try:
+    service_manager.assert_within_limits()
+    geocoder = TomTomGeocoder(service_manager.config.tomtom_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 TomTom', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to geocode street point using TomTom')
+  finally:
+    service_manager.quota_service.increment_total_service_use()
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/old_versions/cdb_dataservices_server--0.39.3--0.40.0.sql

@@ -0,0 +1,133 @@
+--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.40.0'" to load this file. \quit
+
+-- HERE goes your code to upgrade/downgrade
+
+DROP FUNCTION IF EXISTS cdb_dataservices_server._obs_server_conn_str(TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_get_demographic_snapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetDemographicSnapshotJSON(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetDemographicSnapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetDemographicSnapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_get_segment_snapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetSegmentSnapshotJSON(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetSegmentSnapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetSegmentSnapshot(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetMeasure(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetMeasure(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetCategory(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetCategory(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetUSCensusMeasure(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetUSCensusMeasure(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetUSCensusCategory(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetUSCensusCategory(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetPopulation(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetPopulation(TEXT, TEXT, geometry(Geometry, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetMeasureById(TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetMeasureById(TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetData(TEXT, TEXT, geomval[], JSON, BOOLEAN);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetData(TEXT, TEXT, geomval[], JSON, BOOLEAN);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetData(TEXT, TEXT, TEXT[], JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetData(TEXT, TEXT, TEXT[], JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetMeta(TEXT, TEXT, geometry(Geometry, 4326), JSON, INTEGER, INTEGER, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetMeta(TEXT, TEXT, geometry(Geometry, 4326), JSON, INTEGER, INTEGER, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_MetadataValidation(TEXT, TEXT, geometry(Geometry, 4326), TEXT, JSON, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_MetadataValidation(TEXT, TEXT, geometry(Geometry, 4326), TEXT, JSON, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_Search(TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_Search(TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetAvailableBoundaries(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetAvailableBoundaries(TEXT, TEXT, geometry(Geometry, 4326), TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetBoundary(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetBoundary(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetBoundaryId(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetBoundaryId(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetBoundaryById(TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetBoundaryById(TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetBoundariesByGeometry(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetBoundariesByGeometry(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetBoundariesByPointAndRadius(TEXT, TEXT, geometry(Point, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetBoundariesByPointAndRadius(TEXT, TEXT, geometry(Point, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetPointsByGeometry(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetPointsByGeometry(TEXT, TEXT, geometry(Point, 4326), TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetPointsByPointAndRadius(TEXT, TEXT, geometry(Point, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetPointsByPointAndRadius(TEXT, TEXT, geometry(Point, 4326), NUMERIC, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._DST_ConnectUserTable(TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.__DST_ConnectUserTable(TEXT, TEXT, TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._DST_GetReturnMetadata(TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._DST_FetchJoinFdwTableData(TEXT, TEXT, TEXT, TEXT, TEXT, JSON);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._DST_DisconnectUserTable(TEXT, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_DumpVersion(TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetAvailableNumerators(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetAvailableDenominators(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetAvailableGeometries(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT, INTEGER);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_GetAvailableTimespans(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_LegacyBuilderMetadata(TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetNumerators (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT[] , TEXT[], TEXT[] , TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS cdb_dataservices_server._get_obs_config(TEXT, TEXT);
+
+DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_numerator;
+DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_denominator;
+DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_geometry;
+DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_timespan;
+DROP TYPE IF EXISTS cdb_dataservices_server.ds_fdw_metadata;
+DROP TYPE IF EXISTS cdb_dataservices_server.ds_return_metadata;
+
+DELETE FROM pg_enum
+WHERE enumlabel = 'observatory'
+AND enumtypid = (
+  SELECT pg_type.oid
+  FROM pg_type INNER JOIN pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
+  WHERE pg_type.typname = 'service_type' AND pg_namespace.nspname = 'cdb_dataservices_server'
+);
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_service_quota_info(
+  username TEXT,
+  orgname TEXT)
+RETURNS SETOF cdb_dataservices_server.service_quota_info AS $$
+  from cartodb_services.metrics.user import UserMetricsService
+  from datetime import date
+
+  plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
+  redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
+
+  today = date.today()
+  ret = []
+
+  #-- Isolines
+  service = 'isolines'
+  plpy.execute("SELECT cdb_dataservices_server._get_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)]
+  user_service = UserMetricsService(user_isolines_config, redis_conn)
+
+  monthly_quota = user_isolines_config.isolines_quota
+  used_quota = user_service.used_quota(user_isolines_config.service_type, today)
+  soft_limit = user_isolines_config.soft_isolines_limit
+  provider = user_isolines_config.provider
+  ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
+
+  #-- Hires Geocoder
+  service = 'hires_geocoder'
+  plpy.execute("SELECT cdb_dataservices_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
+  user_service = UserMetricsService(user_geocoder_config, redis_conn)
+
+  monthly_quota = user_geocoder_config.geocoding_quota
+  used_quota = user_service.used_quota(user_geocoder_config.service_type, today)
+  soft_limit = user_geocoder_config.soft_geocoding_limit
+  provider = user_geocoder_config.provider
+  ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
+
+  #-- Routing
+  service = 'routing'
+  plpy.execute("SELECT cdb_dataservices_server._get_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+  user_routing_config = GD["user_routing_config_{0}".format(username)]
+  user_service = UserMetricsService(user_routing_config, redis_conn)
+
+  monthly_quota = user_routing_config.monthly_quota
+  used_quota = user_service.used_quota(user_routing_config.service_type, today)
+  soft_limit = user_routing_config.soft_limit
+  provider = user_routing_config.provider
+  ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
+
+  return ret
+$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/sql/100_routing_helper.sql

@@ -66,11 +66,12 @@ RETURNS cdb_dataservices_server.simple_route AS $$
     import sys
     service_manager.quota_service.increment_failed_service_use()
     service_manager.logger.error('Error trying to calculate Mapbox routing', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to calculate Mapbox routing')
+    raise Exception('Error trying to calculate Mapbox routing: ' + str(e))
   finally:
     service_manager.quota_service.increment_total_service_use()
 $$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;
 
+
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_route_with_waypoints(
   username TEXT,
   orgname TEXT,
@@ -134,7 +135,7 @@ RETURNS cdb_dataservices_server.simple_route AS $$
     import sys
     service_manager.quota_service.increment_failed_service_use()
     service_manager.logger.error('Error trying to calculate TomTom routing', sys.exc_info(), data={"username": username, "orgname": orgname})
-    raise Exception('Error trying to calculate TomTom routing')
+    raise Exception('Error trying to calculate TomTom routing: ' + str(e))
   finally:
     service_manager.quota_service.increment_total_service_use()
 $$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/sql/110_data_observatory_augmentation.sql

@@ -1,785 +0,0 @@
---
--- Observatory connection config
---
--- The purpose of this function is provide to the PL/Proxy functions
--- the connection string needed to connect with the current production database
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._obs_server_conn_str(
-  username TEXT,
-  orgname TEXT)
-RETURNS text 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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  return user_obs_config.connection_str
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetDemographicSnapshotJSON(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL,
-  geometry_level TEXT DEFAULT NULL)
-RETURNS json AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetDemographicSnapshot(geom, time_span, geometry_level);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.obs_get_demographic_snapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL,
-  geometry_level TEXT DEFAULT NULL)
-RETURNS json AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-  import json
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getdemographicsnapshot', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetDemographicSnapshotJSON($1, $2, $3, $4, $5) as snapshot;", ["text", "text", "geometry(Geometry, 4326)", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, time_span, geometry_level])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['snapshot']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to obs_get_demographic_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to obs_get_demographic_snapshot')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetDemographicSnapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL,
-  geometry_level TEXT DEFAULT NULL)
-RETURNS SETOF json AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetDemographicSnapshot(geom, time_span, geometry_level);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetDemographicSnapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL,
-  geometry_level TEXT DEFAULT NULL)
-RETURNS SETOF JSON AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getdemographicsnapshot', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetDemographicSnapshot($1, $2, $3, $4, $5) as snapshot;", ["text", "text", "geometry(Geometry, 4326)", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, time_span, geometry_level])
-        if result:
-          resp = []
-          for element in result:
-            value = element['snapshot']
-            resp.append(value)
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to obs_get_demographic_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to obs_get_demographic_snapshot')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetSegmentSnapshotJSON(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  geometry_level TEXT DEFAULT NULL)
-RETURNS json AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetSegmentSnapshot(geom, geometry_level);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.obs_get_segment_snapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  geometry_level TEXT DEFAULT NULL)
-RETURNS json AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-  import json
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getsegmentsnapshot', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetSegmentSnapshotJSON($1, $2, $3, $4) as snapshot;", ["text", "text", "geometry(Geometry, 4326)", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, geometry_level])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['snapshot']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to obs_get_segment_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to obs_get_segment_snapshot')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetSegmentSnapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  geometry_level TEXT DEFAULT NULL)
-RETURNS SETOF json AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetSegmentSnapshot(geom, geometry_level);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetSegmentSnapshot(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  geometry_level TEXT DEFAULT NULL)
-RETURNS SETOF JSON AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getsegmentsnapshot', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetSegmentSnapshot($1, $2, $3, $4) as snapshot;", ["text", "text", "geometry(Geometry, 4326)", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, geometry_level])
-        if result:
-          resp = []
-          for element in result:
-            value = element['snapshot']
-            resp.append(value)
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetSegmentSnapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetSegmentSnapshot')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeasure(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  measure_id TEXT,
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetMeasure(geom, measure_id, normalize, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetMeasure(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  measure_id TEXT,
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getmeasure', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetMeasure($1, $2, $3, $4, $5, $6, $7) as measure;", ["text", "text", "geometry(Geometry, 4326)", "text", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, measure_id, normalize, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['measure']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetMeasure', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetMeasure')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetCategory(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  category_id TEXT,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetCategory(geom, category_id, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetCategory(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  category_id TEXT,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getcategory', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetCategory($1, $2, $3, $4, $5, $6) as category;", ["text", "text", "geometry(Geometry, 4326)", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, category_id, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['category']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetCategory', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetCategory')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetUSCensusMeasure(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  name TEXT,
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetUSCensusMeasure(geom, name, normalize, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetUSCensusMeasure(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  name TEXT,
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getuscensusmeasure', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetUSCensusMeasure($1, $2, $3, $4, $5, $6, $7) as census_measure;", ["text", "text", "geometry(Geometry, 4326)", "text", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, name, normalize, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['census_measure']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetUSCensusMeasure', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetUSCensusMeasure')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetUSCensusCategory(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  name TEXT,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetUSCensusCategory(geom, name, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetUSCensusCategory(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  name TEXT,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getuscensuscategory', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetUSCensusCategory($1, $2, $3, $4, $5, $6) as census_category;", ["text", "text", "geometry(Geometry, 4326)", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, name, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['census_category']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetUSCensusCategory', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetUSCensusCategory')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetPopulation(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetPopulation(geom, normalize, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetPopulation(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  normalize TEXT DEFAULT NULL,
-  boundary_id TEXT DEFAULT NULL,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getpopulation', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetPopulation($1, $2, $3, $4, $5, $6) as population;", ["text", "text", "geometry(Geometry, 4326)", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, normalize, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['population']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetPopulation', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetPopulation')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeasureById(
-  username TEXT,
-  orgname TEXT,
-  geom_ref TEXT,
-  measure_id TEXT,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetMeasureById(geom_ref, measure_id, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetMeasureById(
-  username TEXT,
-  orgname TEXT,
-  geom_ref TEXT,
-  measure_id TEXT,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS NUMERIC AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getmeasurebyid', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetMeasureById($1, $2, $3, $4, $5, $6) as measure;", ["text", "text", "text", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom_ref, measure_id, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['measure']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetMeasureById', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetMeasureById')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetData(
-  username TEXT,
-  orgname TEXT,
-  geomvals geomval[],
-  params JSON,
-  merge BOOLEAN DEFAULT True)
-RETURNS TABLE (
-  id INT,
-  data JSON
-) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetData(geomvals, params, merge);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetData(
-  username TEXT,
-  orgname TEXT,
-  geomvals geomval[],
-  params JSON,
-  merge BOOLEAN DEFAULT True)
-RETURNS TABLE (
-  id INT,
-  data JSON
-) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getdata', user_obs_config, logger, params):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4, $5);", ["text", "text", "geomval[]", "json", "boolean"])
-        result = plpy.execute(obs_plan, [username, orgname, geomvals, params, merge])
-        empty_results = len(geomvals) - len(result)
-        if empty_results > 0:
-          quota_service.increment_empty_service_use(empty_results)
-        if result:
-          quota_service.increment_success_service_use(len(result))
-          return result
-        else:
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use(len(geomvals))
-        logger.error('Error trying to OBS_GetData', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetData')
-    finally:
-        quota_service.increment_total_service_use(len(geomvals))
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetData(
-  username TEXT,
-  orgname TEXT,
-  geomrefs TEXT[],
-  params JSON)
-RETURNS TABLE (
-  id TEXT,
-  data JSON
-) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetData(geomrefs, params);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetData(
-  username TEXT,
-  orgname TEXT,
-  geomrefs TEXT[],
-  params JSON)
-RETURNS TABLE (
-  id TEXT,
-  data JSON
-) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getdata', user_obs_config, logger, params):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4);", ["text", "text", "text[]", "json"])
-        result = plpy.execute(obs_plan, [username, orgname, geomrefs, params])
-        empty_results = len(geomrefs) - len(result)
-        if empty_results > 0:
-          quota_service.increment_empty_service_use(empty_results)
-        if result:
-          quota_service.increment_success_service_use(len(result))
-          return result
-        else:
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use(len(geomrefs))
-        exc_info = sys.exc_info()
-        logger.error('%s, %s, %s' % (exc_info[0], exc_info[1], exc_info[2]))
-        logger.error('Error trying to OBS_GetData', exc_info, data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetData')
-    finally:
-        quota_service.increment_total_service_use(len(geomrefs))
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeta(
-  username TEXT,
-  orgname TEXT,
-  geom Geometry(Geometry, 4326),
-  params JSON,
-  max_timespan_rank INTEGER DEFAULT NULL,
-  max_score_rank INTEGER DEFAULT NULL,
-  target_geoms INTEGER DEFAULT NULL)
-RETURNS JSON AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetMeta(geom, params, max_timespan_rank, max_score_rank, target_geoms);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetMeta(
-  username TEXT,
-  orgname TEXT,
-  geom Geometry(Geometry, 4326),
-  params JSON,
-  max_timespan_rank INTEGER DEFAULT NULL,
-  max_score_rank INTEGER DEFAULT NULL,
-  target_geoms INTEGER DEFAULT NULL)
-RETURNS JSON AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-
-  with metrics('obs_getmeta', user_obs_config, logger, params):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetMeta($1, $2, $3, $4, $5, $6, $7) as meta;", ["text", "text", "Geometry (Geometry, 4326)", "json", "integer", "integer", "integer"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, params, max_timespan_rank, max_score_rank, target_geoms])
-        if result:
-          return result[0]['meta']
-        else:
-          return None
-    except BaseException as e:
-        import sys
-        logger.error('Error trying to OBS_GetMeta', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetMeta')
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_MetadataValidation(
-  username TEXT,
-  orgname TEXT,
-  geometry_extent Geometry(Geometry, 4326),
-  geometry_type text,
-  params JSON,
-  target_geoms INTEGER DEFAULT NULL)
-RETURNS TABLE(valid boolean, errors text[]) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_MetadataValidation(geometry_extent, geometry_type, params, target_geoms);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_MetadataValidation(
-  username TEXT,
-  orgname TEXT,
-  geometry_extent Geometry(Geometry, 4326),
-  geometry_type text,
-  params JSON,
-  target_geoms INTEGER DEFAULT NULL)
-RETURNS TABLE(valid boolean, errors text[]) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-
-  with metrics('obs_metadatavalidation', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_MetadataValidation($1, $2, $3, $4, $5, $6);", ["text", "text", "Geometry (Geometry, 4326)",  "text", "json", "integer"])
-        result = plpy.execute(obs_plan, [username, orgname, geometry_extent, geometry_type, params, target_geoms])
-        if result:
-          return result
-        else:
-          return []
-    except BaseException as e:
-        import sys
-        logger.error('Error trying to OBS_MetadataValidation', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_MetadataValidation')
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/sql/115_data_observatory_exploration.sql

@@ -1,116 +0,0 @@
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_Search(
-  username TEXT,
-  orgname TEXT,
-  search_term TEXT,
-  relevant_boundary TEXT DEFAULT NULL)
-RETURNS TABLE(id text, description text, name text, aggregate text, source text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_Search(search_term, relevant_boundary);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_Search(
-  username TEXT,
-  orgname TEXT,
-  search_term TEXT,
-  relevant_boundary TEXT DEFAULT NULL)
-RETURNS TABLE(id text, description text, name text, aggregate text, source text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_search', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_Search($1, $2, $3, $4);", ["text", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, search_term, relevant_boundary])
-        if result:
-          resp = []
-          for element in result:
-            id = element['id']
-            description = element['description']
-            name = element['name']
-            aggregate = element['aggregate']
-            source = element['source']
-            resp.append([id, description, name, aggregate, source])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return [None, None, None, None, None]
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_Search', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_Search')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetAvailableBoundaries(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL)
-RETURNS TABLE(boundary_id text, description text, time_span text, tablename text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetAvailableBoundaries(geom, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableBoundaries(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Geometry, 4326),
-  time_span TEXT DEFAULT NULL)
-RETURNS TABLE(boundary_id text, description text, time_span text, tablename text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getavailableboundaries', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetAvailableBoundaries($1, $2, $3, $4) as available_boundaries;", ["text", "text", "geometry(Geometry, 4326)", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, time_span])
-        if result:
-          resp = []
-          for element in result:
-            id = element['boundary_id']
-            description = element['description']
-            tspan = element['time_span']
-            tablename = element['tablename']
-            resp.append([id, description, tspan, tablename])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetMeasureById', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetMeasureById')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/sql/120_data_observatory_geometries.sql

@@ -1,402 +0,0 @@
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetBoundary(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS geometry(Geometry, 4326) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetBoundary(geom, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetBoundary(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS geometry(Geometry, 4326) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getboundary', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetBoundary($1, $2, $3, $4) as boundary;", ["text", "text", "geometry(Point, 4326)", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['boundary']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetBoundary', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetBoundary')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetBoundaryId(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetBoundaryId(geom, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetBoundaryId(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS TEXT AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getboundaryid', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetBoundaryId($1, $2, $3, $4, $5) as boundary;", ["text", "text", "geometry(Point, 4326)", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['boundary']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetBoundaryId', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetBoundaryId')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetBoundaryById(
-  username TEXT,
-  orgname TEXT,
-  geometry_id TEXT,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS geometry(Geometry, 4326) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.OBS_GetBoundaryById(geometry_id, boundary_id, time_span);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetBoundaryById(
-  username TEXT,
-  orgname TEXT,
-  geometry_id TEXT,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL)
-RETURNS geometry(Geometry, 4326) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getboundarybyid', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT cdb_dataservices_server._OBS_GetBoundaryById($1, $2, $3, $4, $5) as boundary;", ["text", "text", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geometry_id, boundary_id, time_span])
-        if result:
-          quota_service.increment_success_service_use()
-          return result[0]['boundary']
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetBoundaryById', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetBoundaryById')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetBoundariesByGeometry(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type text DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetBoundariesByGeometry(geom, boundary_id, time_span, overlap_type);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetBoundariesByGeometry(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getboundariesbygeometry', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetBoundariesByGeometry($1, $2, $3, $4, $5, $6) as boundary;", ["text", "text", "geometry(Point, 4326)", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, boundary_id, time_span, overlap_type])
-        if result:
-          resp = []
-          for element in result:
-            the_geom = element['the_geom']
-            geom_refs = element['geom_refs']
-            resp.append([the_geom, geom_refs])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetBoundariesByGeometry', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetBoundariesByGeometry')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetBoundariesByPointAndRadius(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  radius NUMERIC,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetBoundariesByPointAndRadius(geom, radius, boundary_id, time_span, overlap_type);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetBoundariesByPointAndRadius(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  radius NUMERIC,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getboundariesbypointandradius', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetBoundariesByPointAndRadius($1, $2, $3, $4, $5, $6, $7) as boundary;", ["text", "text", "geometry(Point, 4326)", "numeric", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, radius, boundary_id, time_span, overlap_type])
-        if result:
-          resp = []
-          for element in result:
-            the_geom = element['the_geom']
-            geom_refs = element['geom_refs']
-            resp.append([the_geom, geom_refs])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetBoundariesByPointAndRadius', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetBoundariesByPointAndRadius')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetPointsByGeometry(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetPointsByGeometry(geom, boundary_id, time_span, overlap_type);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetPointsByGeometry(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getpointsbygeometry', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetPointsByGeometry($1, $2, $3, $4, $5, $6) as boundary;", ["text", "text", "geometry(Point, 4326)", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, boundary_id, time_span, overlap_type])
-        if result:
-          resp = []
-          for element in result:
-            the_geom = element['the_geom']
-            geom_refs = element['geom_refs']
-            resp.append([the_geom, geom_refs])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return []
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetPointsByGeometry', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetPointsByGeometry')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetPointsByPointAndRadius(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  radius NUMERIC,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetPointsByPointAndRadius(geom, radius, boundary_id, time_span, overlap_type);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetPointsByPointAndRadius(
-  username TEXT,
-  orgname TEXT,
-  geom geometry(Point, 4326),
-  radius NUMERIC,
-  boundary_id TEXT,
-  time_span TEXT DEFAULT NULL,
-  overlap_type TEXT DEFAULT NULL)
-RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
-  from cartodb_services.metrics import metrics
-  from cartodb_services.metrics import QuotaService
-  from cartodb_services.tools import Logger,LoggerConfig
-
-  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_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-
-  plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
-  logger_config = GD["logger_config"]
-  logger = Logger(logger_config)
-  quota_service = QuotaService(user_obs_config, redis_conn)
-  if not quota_service.check_user_quota():
-    raise Exception('You have reached the limit of your quota')
-
-  with metrics('obs_getpointsbypointandradius', user_obs_config, logger):
-    try:
-        obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetPointsByPointAndRadius($1, $2, $3, $4, $5, $6, $7) as boundary;", ["text", "text", "geometry(Point, 4326)", "numeric", "text", "text", "text"])
-        result = plpy.execute(obs_plan, [username, orgname, geom, radius, boundary_id, time_span, overlap_type])
-        if result:
-          resp = []
-          for element in result:
-            the_geom = element['the_geom']
-            geom_refs = element['geom_refs']
-            resp.append([the_geom, geom_refs])
-          quota_service.increment_success_service_use()
-          return resp
-        else:
-          quota_service.increment_empty_service_use()
-          return None
-    except BaseException as e:
-        import sys
-        quota_service.increment_failed_service_use()
-        logger.error('Error trying to OBS_GetPointsByPointAndRadius', sys.exc_info(), data={"username": username, "orgname": orgname})
-        raise Exception('Error trying to OBS_GetPointsByPointAndRadius')
-    finally:
-        quota_service.increment_total_service_use()
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;

server/extension/sql/125_data_observatory_table_augment.sql

@@ -1,36 +0,0 @@
-CREATE TYPE cdb_dataservices_server.ds_fdw_metadata as (schemaname text, tabname text, servername text);
-
-CREATE TYPE cdb_dataservices_server.ds_return_metadata as (colnames text[], coltypes text[]);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_ConnectUserTable(username text, orgname text, user_db_role text, input_schema text, dbname text, table_name text)
-RETURNS cdb_dataservices_server.ds_fdw_metadata AS $$
-    host_addr = plpy.execute("SELECT split_part(inet_client_addr()::text, '/', 1) as user_host")[0]['user_host']
-    return plpy.execute("SELECT * FROM cdb_dataservices_server.__DST_ConnectUserTable({username}::text, {orgname}::text, {user_db_role}::text, {schema}::text, {dbname}::text, {host_addr}::text, {table_name}::text)"
-        .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), user_db_role=plpy.quote_literal(user_db_role), schema=plpy.quote_literal(input_schema), dbname=plpy.quote_literal(dbname), table_name=plpy.quote_literal(table_name), host_addr=plpy.quote_literal(host_addr))
-        )[0]
-$$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.__DST_ConnectUserTable(username text, orgname text, user_db_role text, input_schema text, dbname text, host_addr text, table_name text)
-RETURNS cdb_dataservices_server.ds_fdw_metadata AS $$
-    CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-    TARGET cdb_observatory._OBS_ConnectUserTable;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_GetReturnMetadata(username text, orgname text, function_name text, params json)
-RETURNS cdb_dataservices_server.ds_return_metadata AS $$
-    CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-    TARGET cdb_observatory._OBS_GetReturnMetadata;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_FetchJoinFdwTableData(username text, orgname text, table_schema text, table_name text, function_name text, params json)
-RETURNS SETOF record AS $$
-    CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-    TARGET cdb_observatory._OBS_FetchJoinFdwTableData;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_DisconnectUserTable(username text, orgname text, table_schema text, table_name text, servername text)
-RETURNS boolean AS $$
-    CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-    TARGET cdb_observatory._OBS_DisconnectUserTable;
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;

server/extension/sql/130_data_observatory_helper.sql

@@ -1,93 +0,0 @@
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.obs_dumpversion(username text, orgname text)
-RETURNS text AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT cdb_observatory.obs_dumpversion();
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
--- We could create a super type for the common data like id, name and so on but we need to parse inside the functions because the -- the return data tha comes from OBS is a TABLE() with them
-CREATE TYPE cdb_dataservices_server.obs_meta_numerator AS (numer_id text, numer_name text, numer_description text, numer_weight text, numer_license text, numer_source text, numer_type text, numer_aggregate text, numer_extra jsonb, numer_tags jsonb, valid_denom boolean, valid_geom boolean, valid_timespan boolean);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableNumerators(
-  username TEXT,
-  orgname TEXT,
-  bounds geometry(Geometry, 4326) DEFAULT NULL,
-  filter_tags TEXT[] DEFAULT NULL,
-  denom_id TEXT DEFAULT NULL,
-  geom_id TEXT DEFAULT NULL,
-  timespan TEXT DEFAULT NULL)
-RETURNS SETOF cdb_dataservices_server.obs_meta_numerator AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetAvailableNumerators(bounds, filter_tags, denom_id, geom_id, timespan);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetNumerators(
-  username TEXT,
-  orgname TEXT,
-  bounds geometry(Geometry, 4326) DEFAULT NULL,
-  section_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
-  subsection_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
-  other_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
-  ids TEXT[] DEFAULT ARRAY[]::TEXT[],
-  name TEXT DEFAULT NULL,
-  denom_id TEXT DEFAULT '',
-  geom_id TEXT DEFAULT '',
-  timespan TEXT DEFAULT '')
-RETURNS SETOF cdb_dataservices_server.obs_meta_numerator AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory._OBS_GetNumerators(bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE TYPE cdb_dataservices_server.obs_meta_denominator AS (denom_id text, denom_name text, denom_description text, denom_weight text, denom_license text, denom_source text, denom_type text, denom_aggregate text, denom_extra jsonb, denom_tags jsonb, valid_numer boolean, valid_geom boolean, valid_timespan boolean);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableDenominators(
-  username TEXT,
-  orgname TEXT,
-  bounds geometry(Geometry, 4326) DEFAULT NULL,
-  filter_tags TEXT[] DEFAULT NULL,
-  numer_id TEXT DEFAULT NULL,
-  geom_id TEXT DEFAULT NULL,
-  timespan TEXT DEFAULT NULL)
-RETURNS SETOF cdb_dataservices_server.obs_meta_denominator AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetAvailableDenominators(bounds, filter_tags, numer_id, geom_id, timespan);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE TYPE cdb_dataservices_server.obs_meta_geometry AS (geom_id text, geom_name text, geom_description text, geom_weight text, geom_aggregate text, geom_license text, geom_source text, valid_numer boolean, valid_denom boolean, valid_timespan boolean, score numeric, numtiles bigint, notnull_percent numeric, numgeoms numeric, percentfill numeric, estnumgeoms numeric, meanmediansize numeric, geom_type text, geom_extra jsonb, geom_tags jsonb);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries(
-  username TEXT,
-  orgname TEXT,
-  bounds geometry(Geometry, 4326) DEFAULT NULL,
-  filter_tags TEXT[] DEFAULT NULL,
-  numer_id TEXT DEFAULT NULL,
-  denom_id TEXT DEFAULT NULL,
-  timespan TEXT DEFAULT NULL,
-  number_geometries INTEGER DEFAULT NULL)
-RETURNS SETOF cdb_dataservices_server.obs_meta_geometry AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetAvailableGeometries(bounds, filter_tags, numer_id, denom_id, timespan, number_geometries);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE TYPE cdb_dataservices_server.obs_meta_timespan AS (timespan_id text, timespan_name text, timespan_description text, timespan_weight text, timespan_aggregate text, timespan_license text, timespan_source text, valid_numer boolean, valid_denom boolean, valid_geom boolean, timespan_type text, timespan_extra jsonb, timespan_tags jsonb);
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableTimespans(
-  username TEXT,
-  orgname TEXT,
-  bounds geometry(Geometry, 4326) DEFAULT NULL,
-  filter_tags TEXT[] DEFAULT NULL,
-  numer_id TEXT DEFAULT NULL,
-  denom_id TEXT DEFAULT NULL,
-  geom_id TEXT DEFAULT NULL)
-RETURNS SETOF cdb_dataservices_server.obs_meta_timespan AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_GetAvailableTimespans(bounds, filter_tags, numer_id, denom_id, geom_id);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_LegacyBuilderMetadata(
-  username TEXT,
-  orgname TEXT,
-  aggregate_type TEXT DEFAULT NULL)
-RETURNS TABLE(name TEXT, subsection JSON) AS $$
-  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
-  SELECT * FROM cdb_observatory.OBS_LegacyBuilderMetadata(aggregate_type);
-$$ LANGUAGE plproxy VOLATILE PARALLEL UNSAFE;

server/extension/sql/15_config_helper.sql

@@ -89,17 +89,3 @@ RETURNS boolean AS $$
     GD[cache_key] = routing_config
     return True
 $$ LANGUAGE @@plpythonu@@ SECURITY DEFINER;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_obs_config(username text, orgname text)
-RETURNS boolean AS $$
-  cache_key = "user_obs_config_{0}".format(username)
-  if cache_key in GD:
-    return False
-  else:
-    from cartodb_services.metrics import ObservatoryConfig
-    plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
-    redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
-    obs_config = ObservatoryConfig(redis_conn, plpy, username, orgname)
-    GD[cache_key] = obs_config
-    return True
-$$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;

server/extension/sql/200_quotas.sql

@@ -6,8 +6,7 @@ BEGIN
     CREATE TYPE cdb_dataservices_server.service_type AS ENUM (
       'isolines',
       'hires_geocoder',
-      'routing',
-      'observatory'
+      'routing'
     );
   END IF;
 END $$;
@@ -93,18 +92,6 @@ RETURNS SETOF cdb_dataservices_server.service_quota_info AS $$
   provider = user_routing_config.provider
   ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
 
-  #-- Observatory
-  service = 'observatory'
-  plpy.execute("SELECT cdb_dataservices_server._get_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_obs_config = GD["user_obs_config_{0}".format(username)]
-  user_service = UserMetricsService(user_obs_config, redis_conn)
-
-  monthly_quota = user_obs_config.monthly_quota
-  used_quota = user_service.used_quota(user_obs_config.service_type, today)
-  soft_limit = user_obs_config.soft_limit
-  provider = user_obs_config.provider
-  ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
-
   return ret
 $$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
 

server/extension/sql/20_geocode_street.sql

@@ -125,14 +125,14 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_geocode_street_poin
 RETURNS Geometry AS $$
   from cartodb_services.tools import LegacyServiceManager
   from cartodb_services.tools import QuotaExceededException
-  from cartodb_services.here import HereMapsGeocoder
+  from cartodb_services.here import get_geocoder
 
   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)
+    geocoder = get_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False)
     coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
     if coordinates:
       service_manager.quota_service.increment_success_service_use()
@@ -275,10 +275,8 @@ $$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_tomtom_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.tomtom import TomTomGeocoder
-  from cartodb_services.tools.country import country_to_iso3
   from cartodb_services.refactor.service.tomtom_geocoder_config import TomTomGeocoderConfigBuilder
 
   import cartodb_services
@@ -290,15 +288,9 @@ RETURNS Geometry AS $$
     service_manager.assert_within_limits()
     geocoder = TomTomGeocoder(service_manager.config.tomtom_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)
+                                   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"])

server/extension/sql/21_bulk_geocode_street.sql

@@ -57,10 +57,10 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_bulk_heremaps_geocode_st
 RETURNS SETOF cdb_dataservices_server.geocoding AS $$
   from cartodb_services import run_street_point_geocoder
   from cartodb_services.tools import LegacyServiceManager
-  from cartodb_services.here import HereMapsBulkGeocoder
+  from cartodb_services.here import get_bulk_geocoder
 
   service_manager = LegacyServiceManager('geocoder', username, orgname, GD)
-  geocoder = HereMapsBulkGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params)
+  geocoder = get_bulk_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False)
   return run_street_point_geocoder(plpy, GD, geocoder, service_manager, username, orgname, searches)
 $$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;
 

server/extension/sql/80_isolines_helper.sql

@@ -3,7 +3,7 @@ CREATE TYPE cdb_dataservices_server.isoline AS (center geometry(Geometry,4326),
 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.here import get_routing_isoline
   from cartodb_services.metrics import QuotaService
   from cartodb_services.here.types import geo_polyline_to_multipolygon
   from cartodb_services.tools import Logger,LoggerConfig
@@ -20,13 +20,18 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
     raise Exception('You have reached the limit of your quota')
 
   try:
-    client = HereMapsRoutingIsoline(user_isolines_routing_config.heremaps_app_id,
-      user_isolines_routing_config.heremaps_app_code, logger)
-
+    client = get_routing_isoline(app_id=user_isolines_routing_config.heremaps_app_id or None,
+      app_code=user_isolines_routing_config.heremaps_app_code or None, logger=logger, 
+      apikey=user_isolines_routing_config.heremaps_apikey or None,
+      use_apikey=user_isolines_routing_config.heremaps_use_apikey or False)
+    client_api_version = client.get_api_version()
     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']
-      source_str = 'geo!%f,%f' % (lat, lon)
+      if client_api_version == 7:
+        source_str = 'geo!%f,%f' % (lat, lon)
+      else:
+        source_str = '%f,%f' % (lat, lon)
     else:
       source_str = None
 

server/extension/sql/85_isodistance.sql

@@ -11,9 +11,6 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
 
-  if user_isolines_config.google_services_user:
-    raise Exception('This service is not available for google service users.')
-
   params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
 
   with metrics('cdb_isodistance', user_isolines_config, logger, params):

server/extension/sql/90_isochrone.sql

@@ -11,9 +11,6 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
 
-  if user_isolines_config.google_services_user:
-    raise Exception('This service is not available for google service users.')
-
   params = {'username': username, 'orgname': orgname, 'source': source, 'mode': mode, 'range': range, 'options': options}
 
   with metrics('cdb_isochrone', user_isolines_config, logger, params):

server/extension/test/expected/00_install_test.out

@@ -1,13 +1,9 @@
 -- Only show warning or error messages in the tests output
+\set QUIET on
 SET client_min_messages TO WARNING;
--- Install dependencies
-CREATE EXTENSION postgis;
-CREATE EXTENSION @@plpythonu@@;
-CREATE EXTENSION plproxy;
-CREATE EXTENSION cartodb;
-CREATE EXTENSION cdb_geocoder;
 -- Install the extension
-CREATE EXTENSION cdb_dataservices_server;
+CREATE EXTENSION cdb_dataservices_server CASCADE;
+\unset QUIET
 -- Mock the redis server connection to point to this very test db
 SELECT cartodb.cdb_conf_setconf('redis_metrics_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}');
  cdb_conf_setconf 
@@ -57,12 +53,6 @@ SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/dev/null
  
 (1 row)
 
-SELECT cartodb.cdb_conf_setconf('data_observatory_conf', '{"connection": {"whitelist": ["ethervoid"], "production": "host=localhost port=5432 dbname=contrib_regression user=geocoder_api", "staging": "host=localhost port=5432 dbname=dataservices_db user=geocoder_api"}, "monthly_quota": 100000}');
- cdb_conf_setconf 
-------------------
- 
-(1 row)
-
 -- Mock the varnish invalidation function
 -- (used by cdb_geocoder tests)
 CREATE OR REPLACE FUNCTION public.cdb_invalidate_varnish(table_name text) RETURNS void AS $$
@@ -71,6 +61,7 @@ BEGIN
 END
 $$
 LANGUAGE plpgsql;
+CREATE FUNCTION
 -- Set user quota
 SELECT cartodb.CDB_SetUserQuotaInBytes(0);
  cdb_setuserquotainbytes 

server/extension/test/expected/100_data_observatory_tables_test.out

@@ -1,44 +0,0 @@
-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 = '_dst_connectusertable'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = '_dst_getreturnmetadata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, json');
- exists 
---------
- t
-(1 row)
-
-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 = '_dst_fetchjoinfdwtabledata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, json');
- exists 
---------
- t
-(1 row)
-
-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 = '_dst_disconnectusertable'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
- exists 
---------
- t
-(1 row)
-

server/extension/test/expected/100_data_observatory_test.out

@@ -1,287 +0,0 @@
-\set ECHO none
-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 = 'obs_getdemographicsnapshot'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getsegmentsnapshot'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getmeasure'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getmeasurebyid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getcategory'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getuscensusmeasure'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getuscensuscategory'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getpopulation'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_search'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getavailableboundaries'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getboundary'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getboundaryid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getboundarybyid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getmeta'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, json, integer, integer, integer');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getdata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geomval[], json, boolean');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getdata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text[], json');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getboundariesbygeometry'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getboundariesbypointandradius'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, numeric, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getpointsbygeometry'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getpointsbypointandradius'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, numeric, text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getavailablenumerators'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getavailabledenominators'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getavailablegeometries'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text, integer');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_getavailabletimespans'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_legacybuildermetadata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
- exists 
---------
- t
-(1 row)
-
-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 = 'obs_metadatavalidation'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, json, integer');
- exists 
---------
- t
-(1 row)
-

server/extension/test/sql/00_install_test.sql

@@ -1,14 +1,10 @@
 -- Only show warning or error messages in the tests output
+\set QUIET on
 SET client_min_messages TO WARNING;
--- Install dependencies
-CREATE EXTENSION postgis;
-CREATE EXTENSION @@plpythonu@@;
-CREATE EXTENSION plproxy;
-CREATE EXTENSION cartodb;
-CREATE EXTENSION cdb_geocoder;
 
 -- Install the extension
-CREATE EXTENSION cdb_dataservices_server;
+CREATE EXTENSION cdb_dataservices_server CASCADE;
+\unset QUIET
 
 -- Mock the redis server connection to point to this very test db
 SELECT cartodb.cdb_conf_setconf('redis_metrics_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}');
@@ -19,7 +15,6 @@ SELECT cartodb.cdb_conf_setconf('mapbox_conf', '{"routing": {"api_keys": ["routi
 SELECT cartodb.cdb_conf_setconf('tomtom_conf', '{"routing": {"api_keys": ["routing_dummy_api_key"], "monthly_quota": 1500000}, "geocoder": {"api_keys": ["geocoder_dummy_api_key"], "monthly_quota": 1500000}, "isolines": {"api_keys": ["isolines_dummy_api_key"], "monthly_quota": 1500000}}');
 SELECT cartodb.cdb_conf_setconf('geocodio_conf', '{"geocoder": {"api_keys": ["geocoder_dummy_api_key"], "monthly_quota": 1500000}}');
 SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/dev/null"}');
-SELECT cartodb.cdb_conf_setconf('data_observatory_conf', '{"connection": {"whitelist": ["ethervoid"], "production": "host=localhost port=5432 dbname=contrib_regression user=geocoder_api", "staging": "host=localhost port=5432 dbname=dataservices_db user=geocoder_api"}, "monthly_quota": 100000}');
 
 -- Mock the varnish invalidation function
 -- (used by cdb_geocoder tests)

server/extension/test/sql/100_data_observatory_tables_test.sql

@@ -1,28 +0,0 @@
-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 = '_dst_connectusertable'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
-
-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 = '_dst_getreturnmetadata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, json');
-
-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 = '_dst_fetchjoinfdwtabledata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, json');
-
-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 = '_dst_disconnectusertable'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
-

server/extension/test/sql/100_data_observatory_test.sql

@@ -1,188 +0,0 @@
-\set ECHO none
--- add the schema cdb_dataservices_server to the SEARCH_PATH
-DO $$ BEGIN
-    PERFORM set_config('search_path', current_setting('search_path')||', cdb_dataservices_server', false);
-END $$;
-\set ECHO all
-
-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 = 'obs_getdemographicsnapshot'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
-
-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 = 'obs_getsegmentsnapshot'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text');
-
-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 = 'obs_getmeasure'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text, text');
-
-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 = 'obs_getmeasurebyid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
-
-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 = 'obs_getcategory'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
-
-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 = 'obs_getuscensusmeasure'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text, text');
-
-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 = 'obs_getuscensuscategory'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
-
-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 = 'obs_getpopulation'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
-
-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 = 'obs_search'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
-
-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 = 'obs_getavailableboundaries'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text');
-
-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 = 'obs_getboundary'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
-
-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 = 'obs_getboundaryid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text');
-
-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 = 'obs_getboundarybyid'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
-
-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 = 'obs_getmeta'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, json, integer, integer, integer');
-
-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 = 'obs_getdata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geomval[], json, boolean');
-
-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 = 'obs_getdata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text[], json');
-
-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 = 'obs_getboundariesbygeometry'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
-
-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 = 'obs_getboundariesbypointandradius'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, numeric, text, text, text');
-
-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 = 'obs_getpointsbygeometry'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, text, text');
-
-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 = 'obs_getpointsbypointandradius'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, numeric, text, text, text');
-
-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 = 'obs_getavailablenumerators'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
-
-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 = 'obs_getavailabledenominators'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
-
-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 = 'obs_getavailablegeometries'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text, integer');
-
-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 = 'obs_getavailabletimespans'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text[], text, text, text');
-
-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 = 'obs_legacybuildermetadata'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
-
-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 = 'obs_metadatavalidation'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, json, integer');

server/extension/test/sql/366_empty_table_test.sql

@@ -1,70 +0,0 @@
-\set ECHO none
-\set VERBOSITY verbose
-SET client_min_messages TO error;
-
--- add the schema cdb_dataservices_server to the SEARCH_PATH
-DO $$ BEGIN
-    PERFORM set_config('search_path', current_setting('search_path')||', cdb_dataservices_server', false);
-END $$;
-
--- Set configuration for a user 'foo'
-DO $$
-  import json
-  from cartodb_services.config import ServiceConfiguration
-
-  import cartodb_services
-  cartodb_services.init(plpy, GD)
-
-  service_config = ServiceConfiguration('observatory', 'foo', None)
-  service_config.user.set('soft_obs_general_limit', True)
-  service_config.user.set('period_end_date', '20170516')
-
-$$ LANGUAGE @@plpythonu@@;
-
-
--- Mock Observatory backend function
-CREATE SCHEMA cdb_observatory;
-CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetData(geomvals geomval[], params JSON, merge BOOLEAN DEFAULT TRUE)
-RETURNS TABLE (
-  id INT,
-  data JSON
-) AS $$
-BEGIN
-  -- this will return an empty set
-  RAISE NOTICE 'Mocked OBS_GetData()';
-END;
-$$ LANGUAGE plpgsql;
-GRANT USAGE ON SCHEMA cdb_observatory TO geocoder_api;
-GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_observatory TO geocoder_api;
-
-
--- Test it
-SELECT * FROM cdb_dataservices_server.OBS_GetData(
-    'foo',
-    NULL,
-    '{"(0103000020E61000000100000005000000010000E0F67F52C096D88AE6B25F4440010000E0238052C0BF6D8A1A8D5D4440010000D0DA7E52C05F03F3CC265D444001000020F47E52C0F2DD78AB5D5F4440010000E0F67F52C096D88AE6B25F4440,1)"}'::_geomval,
-    '[{"id": 1, "score": 52.7515548093083898758340051256007949661290516400338, "geom_id": "us.census.tiger.census_tract", "denom_id": "us.census.acs.B01003001", "numer_id": "us.census.acs.B03002003", "geom_name": "US Census Tracts", "geom_type": "Geometry", "num_geoms": 2.86483076549783307739486952736, "denom_name": "Total Population", "denom_type": "Numeric", "numer_name": "White Population", "numer_type": "Numeric", "score_rank": 1, "target_area": 0.000307374806576033, "geom_colname": "the_geom", "score_rownum": 1, "target_geoms": null, "denom_colname": "total_pop", "denom_reltype": '
-         '"denominator", "geom_timespan": "2015", "normalization": "prenormalized", "numer_colname": "white_pop", "timespan_rank": 1, "geom_tablename": "obs_87a814e485deabe3b12545a537f693d16ca702c2", "max_score_rank": null, "numer_timespan": "2010 - 2014", "suggested_name": "white_pop_2010_2014", "denom_aggregate": "sum", "denom_tablename": "obs_b393b5b88c6adda634b2071a8005b03c551b609a", "numer_aggregate": "sum", "numer_tablename": "obs_b393b5b88c6adda634b2071a8005b03c551b609a", "timespan_rownum": 1, "geom_description": "Census tracts are small, relatively permanent statistical subdivisions of a county or equivalent entity that are updated by local participants prior to each decennial census as part of the Census Bureau’s Participant Statistical Areas Program. The Census Bureau delineates census tracts in situations where no local participant existed or where state, local, or tribal governments'
-         'declined to participate. The primary purpose of census tracts is to provide a stable set of geographic units for the presentation of statistical data.\r\n\r\nCensus tracts generally have a population size between 1,200 and 8,000 people, with an optimum size of 4,000 people. A census tract usually covers a contiguous area; however, the spatial size of census tracts varies widely depending on the density of settlement. Census tract boundaries are delineated with the intention of being maintained over a long time so that statistical comparisons can be made from census to census. Census tracts occasionally are split due to population growth or merged as a result of substantial population decline.\r\n\r\nCensus tract boundaries generally follow visible and identifiable features. They may follow nonvisible legal boundaries, such as minor civil division (MCD) or incorporated place boundaries'
-         'in some states and situations, to allow for census-tract-to-governmental-unit relationships where the governmental boundaries tend to remain unchanged between censuses. State and county boundaries always are census tract boundaries in the standard census geographic hierarchy. Tribal census tracts are a unique geographic entity defined within federally recognized American Indian reservations and off-reservation trust lands and can cross state and county boundaries. Tribal census tracts may be completely different from the census tracts and block groups defined by state and county (see “Tribal Census Tract”).", "denom_description": "The total number of all people living in a given geographic area.  This is a very useful catch-all denominator when calculating rates.", "max_timespan_rank": null, "numer_description": "The number of people identifying as white, non-Hispanic in each'
-         'geography.", "geom_t_description": null, "denom_t_description": null, "numer_t_description": null, "geom_geomref_colname": "geoid", "denom_geomref_colname": "geoid", "numer_geomref_colname": "geoid"}]'::json,
-     true);
-
-
-
--- Mock another observatory backend function (overloaded, different params)
-CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetData(geomrefs TEXT[], params JSON)
-RETURNS TABLE (
-  id INT,
-  data JSON
-) AS $$
-BEGIN
-  -- this will return an empty set
-  RAISE NOTICE 'Mocked OBS_GetData()';
-END;
-$$ LANGUAGE plpgsql;
-GRANT USAGE ON SCHEMA cdb_observatory TO geocoder_api;
-GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_observatory TO geocoder_api;
-
--- Test it
-SELECT * FROM cdb_dataservices_server.OBS_GetData('foo', NULL, '{bar, baz}'::TEXT[], '[]'::JSON);

server/extension/test/sql/366_empty_table_test.sql.template

@@ -0,0 +1,15 @@
+\set ECHO none
+\set VERBOSITY verbose
+SET client_min_messages TO error;
+
+-- add the schema cdb_dataservices_server to the SEARCH_PATH
+DO $$ BEGIN
+    PERFORM set_config('search_path', current_setting('search_path')||', cdb_dataservices_server', false);
+END $$;
+
+-- Set configuration for a user 'foo'
+DO $$
+  import cartodb_services
+  cartodb_services.init(plpy, GD)
+
+$$ LANGUAGE @@plpythonu@@;

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

@@ -1,3 +1,4 @@
-from cartodb_services.here.geocoder import HereMapsGeocoder
-from cartodb_services.here.bulk_geocoder import HereMapsBulkGeocoder
+from cartodb_services.here.geocoder import HereMapsGeocoder, HereMapsGeocoderV7
+from cartodb_services.here.bulk_geocoder import HereMapsBulkGeocoder, HereMapsBulkGeocoderV7
+from cartodb_services.here.service_factory import get_geocoder, get_bulk_geocoder, get_routing_isoline
 from cartodb_services.here.routing import HereMapsRoutingIsoline

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

@@ -7,7 +7,7 @@ import xml.etree.ElementTree as ET
 from collections import namedtuple
 from requests.adapters import HTTPAdapter
 from cartodb_services import StreetPointBulkGeocoder
-from cartodb_services.here import HereMapsGeocoder
+from cartodb_services.here import HereMapsGeocoder, HereMapsGeocoderV7
 from cartodb_services.geocoder import geocoder_metadata, geocoder_error_response, PRECISION_INTERPOLATED
 from cartodb_services.metrics import Traceable
 from cartodb_services.tools.exceptions import ServiceException
@@ -18,7 +18,7 @@ HereJobStatus = namedtuple('HereJobStatus', 'total_count processed_count status'
 class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder):
     MAX_BATCH_SIZE = 1000000  # From the docs
     MIN_BATCHED_SEARCH = 100  # Under this, serial will be used
-    BATCH_URL = 'https://batch.geocoder.cit.api.here.com/6.2/jobs'
+    BATCH_URL = 'https://batch.geocoder.api.here.com/6.2/jobs'
     # https://developer.here.com/documentation/batch-geocoder/topics/read-batch-request-output.html
     META_COLS = ['relevance', 'matchType', 'matchCode', 'matchLevel', 'matchQualityStreet']
     MAX_STALLED_RETRIES = 100
@@ -26,7 +26,7 @@ class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder):
     JOB_FINAL_STATES = ['completed', 'cancelled', 'deleted', 'failed']
 
     def __init__(self, app_id, app_code, logger, service_params=None, maxresults=HereMapsGeocoder.DEFAULT_MAXRESULTS):
-        HereMapsGeocoder.__init__(self, app_id, app_code, logger, service_params, maxresults)
+        HereMapsGeocoder.__init__(self, app_id=app_id, app_code=app_code, logger=logger, service_params=service_params, maxresults=maxresults)
         self.session = requests.Session()
         self.session.mount(self.BATCH_URL,
                            HTTPAdapter(max_retries=self.max_retries))
@@ -126,7 +126,7 @@ class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder):
             status=polling_root.find('./Response/Status').text)
 
     def _download_results(self, job_id):
-        result_r = self.session.get("{}/{}/result".format(self.BATCH_URL, job_id),
+        result_r = self.session.get("{}/{}/all".format(self.BATCH_URL, job_id),
                                     params=self.credentials_params,
                                     timeout=(self.connect_timeout, self.read_timeout))
         root_zip = zipfile.ZipFile(io.BytesIO(result_r.content))
@@ -147,6 +147,146 @@ class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder):
                                             precision,
                                             [match_type] if match_type else []
                                         )))
+                    elif row['matchLevel'] == 'NOMATCH':
+                        results.append((row['recId'], [], {}))
+                    elif row['matchLevel'] == 'FAILED':
+                        results.append((row['recId'], [], {'error': 'Bulk geocoder failed'}))
+        return results
+
+
+class HereMapsBulkGeocoderV7(HereMapsGeocoderV7, StreetPointBulkGeocoder):
+    MAX_BATCH_SIZE = 1000000  # From the docs
+    MIN_BATCHED_SEARCH = 100  # Under this, serial will be used
+    BATCH_URL = 'https://batch.geocoder.ls.hereapi.com/6.2/jobs'
+    # https://developer.here.com/documentation/batch-geocoder/topics/read-batch-request-output.html
+    META_COLS = ['relevance', 'matchType', 'matchCode', 'matchLevel', 'matchQualityStreet']
+    MAX_STALLED_RETRIES = 100
+    BATCH_RETRY_SLEEP_S = 5
+    JOB_FINAL_STATES = ['completed', 'cancelled', 'deleted', 'failed']
+
+    def __init__(self, apikey, logger, service_params=None, maxresults=HereMapsGeocoder.DEFAULT_MAXRESULTS):
+        HereMapsGeocoderV7.__init__(self, apikey=apikey, logger=logger, service_params=service_params, limit=maxresults)
+        self.apikey = apikey
+        self.session = requests.Session()
+        self.session.mount(self.BATCH_URL,
+                           HTTPAdapter(max_retries=self.max_retries))
+        self.credentials_params = {
+            'apikey': self.apikey
+        }
+
+    def _should_use_batch(self, searches):
+        return len(searches) >= self.MIN_BATCHED_SEARCH
+
+    def _serial_geocode(self, searches):
+        results = []
+        for search in searches:
+            (search_id, address, city, state, country) = search
+            try:
+                result = self.geocode_meta(searchtext=address, city=city, state=state, country=country)
+            except Exception as e:
+                self._logger.error("Error geocoding", e)
+                result = geocoder_error_response("Error geocoding")
+            results.append((search_id, result[0], result[1]))
+        return results
+
+    def _batch_geocode(self, searches):
+        request_id = self._send_batch(self._searches_to_csv(searches))
+
+        last_processed = 0
+        stalled_retries = 0
+        # https://developer.here.com/documentation/batch-geocoder/topics/job-status.html
+        while True:
+            job_info = self._job_status(request_id)
+            if job_info.processed_count == last_processed:
+                stalled_retries += 1
+                if stalled_retries > self.MAX_STALLED_RETRIES:
+                    raise Exception('Too many retries for job {}'.format(request_id))
+            else:
+                stalled_retries = 0
+                last_processed = job_info.processed_count
+
+            if job_info.status in self.JOB_FINAL_STATES:
+                break
+            else:
+                time.sleep(self.BATCH_RETRY_SLEEP_S)
+
+        results = self._download_results(request_id)
 
         return results
 
+    def _searches_to_csv(self, searches):
+        queue = cStringIO.StringIO()
+        writer = csv.writer(queue, delimiter='|')
+        writer.writerow(['recId', 'searchText', 'country'])
+
+        for search in searches:
+            fields = [search.address, search.city, search.state]
+            search_text = ', '.join(filter(None, fields))
+            row = [s.encode("utf-8") if s else ''
+                   for s in [str(search.id), search_text, search.country]]
+            writer.writerow(row)
+
+        return queue.getvalue()
+
+    def _send_batch(self, data):
+        cols = 'displayLatitude,displayLongitude,' + ','.join(self.META_COLS)
+        request_params = self.credentials_params.copy()
+        request_params.update({
+            'gen': 8,
+            'action': 'run',
+            'header': 'true',
+            'inDelim': '|',
+            'outDelim': '|',
+            'outCols': cols,
+            'outputcombined': 'true'
+        })
+
+        response = self.session.post(self.BATCH_URL, data=data,
+                                     params=request_params,
+                                     timeout=(self.connect_timeout, self.read_timeout))
+
+        if response.status_code == 200:
+            root = ET.fromstring(response.text)
+            return root.find('./Response/MetaInfo/RequestId').text
+        else:
+            raise ServiceException("Error sending HERE batch", response)
+
+    def _job_status(self, request_id):
+        polling_params = self.credentials_params.copy()
+        polling_params.update({'action': 'status'})
+        polling_r = self.session.get("{}/{}".format(self.BATCH_URL, request_id),
+                                params=polling_params,
+                                timeout=(self.connect_timeout, self.read_timeout))
+        polling_root = ET.fromstring(polling_r.text)
+        return HereJobStatus(
+            total_count=int(polling_root.find('./Response/TotalCount').text),
+            processed_count=int(polling_root.find('./Response/ProcessedCount').text),
+            status=polling_root.find('./Response/Status').text)
+
+    def _download_results(self, job_id):
+        result_r = self.session.get("{}/{}/all".format(self.BATCH_URL, job_id),
+                                    params=self.credentials_params,
+                                    timeout=(self.connect_timeout, self.read_timeout))
+        root_zip = zipfile.ZipFile(io.BytesIO(result_r.content))
+
+        results = []
+        for name in root_zip.namelist():
+            if name.endswith('_out.txt'):
+                reader = csv.DictReader(root_zip.open(name), delimiter='|')
+                for row in reader:
+                    if row['SeqNumber'] == '1':  # First per requested data
+                        precision = self.PRECISION_BY_MATCH_TYPE.get(
+                            row.get('matchType'), PRECISION_INTERPOLATED)
+                        match_type = self.MATCH_TYPE_BY_MATCH_LEVEL.get(row['matchLevel'], None)
+                        results.append((row['recId'],
+                                        [row['displayLongitude'], row['displayLatitude']],
+                                        geocoder_metadata(
+                                            float(row['relevance']),
+                                            precision,
+                                            [match_type] if match_type else []
+                                        )))
+                    elif row['matchLevel'] == 'NOMATCH':
+                        results.append((row['recId'], [], {}))
+                    elif row['matchLevel'] == 'FAILED':
+                        results.append((row['recId'], [], {'error': 'Bulk geocoder failed'}))
+        return results

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

@@ -8,9 +8,10 @@ from requests.adapters import HTTPAdapter
 from exceptions import *
 from cartodb_services.geocoder import PRECISION_PRECISE, PRECISION_INTERPOLATED, geocoder_metadata, EMPTY_RESPONSE
 from cartodb_services.metrics import Traceable
+from cartodb_services.tools.country import country_to_iso3
 
 class HereMapsGeocoder(Traceable):
-    'A Here Maps Geocoder wrapper for python'
+    'A Here Maps v6 Geocoder wrapper for python'
 
     PRODUCTION_GEOCODE_JSON_URL = 'https://geocoder.api.here.com/6.2/geocode.json'
     STAGING_GEOCODE_JSON_URL = 'https://geocoder.cit.api.here.com/6.2/geocode.json'
@@ -30,7 +31,7 @@ class HereMapsGeocoder(Traceable):
         'searchtext',
         'state',
         'street'
-        ]
+    ]
 
     ADMITTED_PARAMS = [
         'additionaldata',
@@ -50,7 +51,7 @@ class HereMapsGeocoder(Traceable):
         'politicalview',
         'prox',
         'strictlanguagemode'
-        ] + ADDRESS_PARAMS
+    ] + ADDRESS_PARAMS
 
     PRECISION_BY_MATCH_TYPE = {
         'pointAddress': PRECISION_PRECISE,
@@ -151,3 +152,181 @@ class HereMapsGeocoder(Traceable):
             precision,
             [match_type] if match_type else []
         )
+
+class HereMapsGeocoderV7(Traceable):
+    'A Here Maps Geocoder v7 wrapper for python'
+
+    PRODUCTION_GEOCODE_JSON_URL = 'https://geocode.search.hereapi.com/v1/geocode'
+    DEFAULT_MAXRESULTS = 1
+    READ_TIMEOUT = 60
+    CONNECT_TIMEOUT = 10
+    MAX_RETRIES=1
+    COUNTRY_ISO3_LENGTH = 3
+
+    ADDRESS_PARAMS = [
+        'city',
+        'country',
+        'county',
+        'district',
+        'housenumber',
+        'postalcode',
+        'searchtext',
+        'state',
+        'street'
+    ]
+
+    QUALIFIED_PARAMS = [
+        'state',
+        'city',
+        'county',
+        'district',
+        'postalcode',
+        'housenumber',
+        'street'
+    ]
+
+    PRECISION_BY_MATCH_TYPE = {
+        'PA': PRECISION_PRECISE,
+        'interpolated': PRECISION_INTERPOLATED
+    }
+    MATCH_TYPE_BY_MATCH_LEVEL = {
+        'landmark': 'point_of_interest',
+        'country': 'country',
+        'state': 'state',
+        'county': 'county',
+        'city': 'locality',
+        'district': 'district',
+        'street': 'street',
+        'intersection': 'intersection',
+        'houseNumber': 'street_number',
+        'postalCode': 'postal_code'
+    }
+
+    def __init__(self, apikey, logger, service_params=None, limit=DEFAULT_MAXRESULTS):
+        service_params = service_params or {}
+        self.apikey = apikey
+        self._logger = logger
+        self.limit = limit
+        self.host = service_params.get('json_url', self.PRODUCTION_GEOCODE_JSON_URL)
+        self.connect_timeout = service_params.get('connect_timeout', self.CONNECT_TIMEOUT)
+        self.read_timeout = service_params.get('read_timeout', self.READ_TIMEOUT)
+        self.max_retries = service_params.get('max_retries', self.MAX_RETRIES)
+
+    def geocode(self, **kwargs):
+        return self.geocode_meta(**kwargs)[0]
+
+    def geocode_meta(self, **kwargs):
+        params = {}
+        for key, value in kwargs.iteritems():
+            if value and value.strip():
+                params[key] = value
+        if not params:
+            return EMPTY_RESPONSE
+        return self._execute_geocode(params)
+
+    def _execute_geocode(self, params):
+        if not set(params.keys()).issubset(set(self.ADDRESS_PARAMS)):
+            raise BadGeocodingParams(params)
+        try:
+            response = self._perform_request(params)
+            result = response['items'][0]
+            return [self._extract_lng_lat_from_result(result),
+                    self._extract_metadata_from_result(result)]
+        except IndexError:
+            return EMPTY_RESPONSE
+        except KeyError as e:
+            self._logger.error('params: {}'.format(params), e)
+            raise MalformedResult()
+
+    def _get_v7param(self, param, reverse=False):
+        mapping = {
+            'city': 'city',
+            'country': 'in',
+            'county': 'county',
+            'district': 'district',
+            'housenumber': 'houseNumber',
+            'postalcode': 'postalCode',
+            'state': 'state',
+            'street': 'street',
+            'searchtext': 'q'
+        }
+
+        if reverse is True:
+            mapping = {v:k for k,v in mapping.items()}
+
+        return mapping.get(param)
+
+    def _is_iso3_country(self, country):
+        return len(country) == self.COUNTRY_ISO3_LENGTH
+
+    def _parse_country(self, country):
+        country_iso3 = country_to_iso3(country) or country
+
+        parsed_country = "countryCode:{0}".format(country_iso3) if (country_iso3 and self._is_iso3_country(country_iso3)) else None
+
+        return parsed_country
+
+    def _get_qq(self, params):
+        qualified_params = ['{0}={1}'.format(self._get_v7param(k), v) for k,v in params.items() if k in self.QUALIFIED_PARAMS]
+
+        qq = '&'.join(qualified_params) if qualified_params else None
+
+        return qq
+
+    def _parse_params(self, params):
+        country, q = (params.get(value) for value in ('country', 'searchtext'))
+
+        parsed_params = {'q': q}
+
+        qq = self._get_qq(params)
+
+        parsed_country = self._parse_country(country)
+
+        parsed_params.update({k:v for k, v in (('qq', qq), ('in', parsed_country)) if v is not None})
+
+        return parsed_params
+
+    def _perform_request(self, params):
+        request_params = {
+            'apikey': self.apikey,
+            'limit': self.limit,
+        }
+        parsed_params = self._parse_params(params)
+        request_params.update(parsed_params)
+        # TODO Extract HTTP client wrapper
+        session = requests.Session()
+        session.mount(self.host, HTTPAdapter(max_retries=self.max_retries))
+        response = session.get(self.host, params=request_params,
+                                timeout=(self.connect_timeout, self.read_timeout))
+        self.add_response_data(response, self._logger)
+        if response.status_code == requests.codes.ok:
+            return json.loads(response.text)
+        elif response.status_code == requests.codes.bad_request:
+            self._logger.warning('Error 4xx trying to geocode street using HERE',
+                               data={"response": response.json(), "params":
+                                     parsed_params})
+            return EMPTY_RESPONSE
+        else:
+            self._logger.error('Error trying to geocode street using HERE',
+                               data={"response": response.json(), "params":
+                                     parsed_params})
+            raise Exception('Error trying to geocode street using Here')
+
+
+    def _extract_lng_lat_from_result(self, result):
+        position = result['position']
+        longitude = position['lng']
+        latitude = position['lat']
+
+        return [longitude, latitude]
+
+    def _extract_metadata_from_result(self, result):
+        # See https://stackoverflow.com/questions/51285622/missing-matchtype-at-here-geocoding-responses
+        precision = self.PRECISION_BY_MATCH_TYPE.get(
+            result.get('houseNumberType'), PRECISION_INTERPOLATED)
+        match_type = self.MATCH_TYPE_BY_MATCH_LEVEL.get(result.get('resultType'), None)
+        return geocoder_metadata(
+            result['scoring']['queryScore'],
+            precision,
+            [match_type] if match_type else []
+        )

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

@@ -1,5 +1,6 @@
 import requests
 import json
+import flexpolyline as fp
 
 from cartodb_services.here.exceptions import WrongParams
 from requests.adapters import HTTPAdapter
@@ -7,11 +8,12 @@ from cartodb_services.metrics import Traceable
 
 
 class HereMapsRoutingIsoline(Traceable):
-    'A Here Maps Routing wrapper for python'
+    'A Here Maps Routing v7 wrapper for python'
 
     PRODUCTION_ROUTING_BASE_URL = 'https://isoline.route.api.here.com'
     STAGING_ROUTING_BASE_URL = 'https://isoline.route.cit.api.here.com'
     ISOLINE_PATH = '/routing/7.2/calculateisoline.json'
+    API_VERSION = 7
     READ_TIMEOUT = 60
     CONNECT_TIMEOUT = 10
     MAX_RETRIES = 1
@@ -42,6 +44,9 @@ class HereMapsRoutingIsoline(Traceable):
         self.max_retries = service_params.get('max_retries', self.MAX_RETRIES)
         self._url = "{0}{1}".format(base_url, isoline_path)
 
+    def get_api_version(self):
+        return self.API_VERSION
+
     def calculate_isodistance(self, source, mode, data_range, options=[]):
         return self.__calculate_isolines(source, mode, data_range, 'distance',
                                          options)
@@ -51,7 +56,8 @@ class HereMapsRoutingIsoline(Traceable):
                                          options)
 
     def __calculate_isolines(self, source, mode, data_range, range_type,
-                             options=[]):
+                             options=None):
+        options = options or []
         parsed_options = self.__parse_options(options)
         source_param = self.__parse_source_param(source, parsed_options)
         mode_param = self.__parse_mode_param(mode, parsed_options)
@@ -115,7 +121,7 @@ class HereMapsRoutingIsoline(Traceable):
 
     def __parse_source_param(self, source, options):
         key = 'start'
-        if 'is_destination' in options and options['is_destination']:
+        if 'is_destination' in options and options['is_destination'].lower() == 'true':
             key = 'destination'
 
         return {key: source}
@@ -150,3 +156,198 @@ class HereMapsRoutingIsoline(Traceable):
             mode_param = "{0};{1}".format(mode_param, mode_feature)
 
         return {'mode': mode_param}
+
+class HereMapsRoutingIsolineV8(Traceable):
+    'A Here Maps Routing v8 wrapper for python'
+
+    PRODUCTION_ROUTING_BASE_URL = 'https://isoline.router.hereapi.com/v8/isolines'
+    API_VERSION = 8
+    READ_TIMEOUT = 60
+    CONNECT_TIMEOUT = 10
+    MAX_RETRIES = 1
+    QUALITY_PARAM_V7 = 'quality'
+    DEFAULT_OPTIMIZEFOR = 'quality'
+    DEFAULT_ROUTINGMODE = 'short'
+    HERE_WALK_MODE = "pedestrian"
+    HERE_CAR_MODE = "car"
+
+    ACCEPTED_MODES = {
+        "walk": HERE_WALK_MODE,
+        "car": HERE_CAR_MODE
+    }
+
+    OPTIONAL_PARAMS = [
+        'departure',
+        'arrival',
+        'maxpoints',
+        'quality'
+    ]
+
+    def __init__(self, apikey, logger, service_params=None):
+        service_params = service_params or {}
+        self._apikey = apikey
+        self._logger = logger
+        self._url = service_params.get('base_url', self.PRODUCTION_ROUTING_BASE_URL)
+        self.connect_timeout = service_params.get('connect_timeout', self.CONNECT_TIMEOUT)
+        self.read_timeout = service_params.get('read_timeout', self.READ_TIMEOUT)
+        self.max_retries = service_params.get('max_retries', self.MAX_RETRIES)
+
+    def get_api_version(self):
+        return self.API_VERSION
+
+    def calculate_isodistance(self, source, mode, data_range, options=None):
+        options = options or []
+        return self.__calculate_isolines(source, mode, data_range, 'distance',
+                                         options)
+
+    def calculate_isochrone(self, source, mode, data_range, options=None):
+        options = options or []
+        return self.__calculate_isolines(source, mode, data_range, 'time',
+                                         options)
+
+    def __calculate_isolines(self, source, mode, data_range, range_type,
+                             options=None):
+        options = options or []
+        parsed_options = self.__parse_options(options)
+        source_param = self.__parse_source_param(source, parsed_options)
+        mode_params = self.__get_mode_params(mode, parsed_options)
+        request_params = self.__parse_request_parameters(source_param,
+                                                         mode_params,
+                                                         data_range,
+                                                         range_type,
+                                                         parsed_options)
+        # TODO Extract HTTP client wrapper
+        session = requests.Session()
+        session.mount(self._url, HTTPAdapter(max_retries=self.max_retries))
+        response = requests.get(self._url, params=request_params,
+                                timeout=(self.connect_timeout, self.read_timeout))
+        self.add_response_data(response, self._logger)
+        if response.status_code == requests.codes.ok:
+            return self.__parse_isolines_response(response.text)
+        elif response.status_code == requests.codes.bad_request:
+            return []
+        else:
+            self._logger.error('Error trying to calculate HERE isolines',
+                               data={"response_status": response.status_code,
+                                     "response_reason": response.reason,
+                                     "response_content": response.text,
+                                     "reponse_url": response.url,
+                                     "response_headers": response.headers,
+                                     "source": source, "mode": mode,
+                                     "data_range": data_range,
+                                     "range_type": range_type,
+                                     "options": options})
+            raise Exception('Error trying to calculate HERE isolines')
+
+    def __parse_options(self, options):
+        return dict(option.split('=') for option in options)
+
+    def __get_v8_param(self, param, reverse=False):
+        mapping = {
+            'range': 'range[values]',
+            'rangetype': 'range[type]',
+            'mode': {
+                'type': 'routingmode',
+                'transportmodes': 'transportmode',
+                'trafficmode': None,
+                'feature': 'avoid[feature]'
+                },
+            'quality': 'optimizefor',
+            'maxpoints': 'shape[maxpoints]',
+            'start': 'origin',
+            'destination': 'destination',
+            'departure': 'departuretime',
+            'arrival': 'arrivaltime'
+        }
+
+        if reverse is True:
+            mapping = {v:k for k,v in mapping.items()}
+
+        return mapping.get(param)
+
+    def __get_v8_optimizefor_value(self, quality, reverse=False):
+        mapping = {
+            1: 'quality',
+            2: 'balanced',
+            3: 'performance'
+        }
+
+        if reverse is True:
+            mapping = {v:k for k,v in mapping.items()}
+
+        return mapping.get(quality, self.DEFAULT_OPTIMIZEFOR)
+
+    def __get_v8_routingmode_value(self, mode_type, reverse=False):
+        mapping = {
+            'fastest': 'fast',
+            'shortest': 'short'
+        }
+
+        if reverse is True:
+            mapping = {v:k for k,v in mapping.items()}
+
+        return mapping.get(mode_type, self.DEFAULT_ROUTINGMODE)
+
+    def __parse_request_parameters(self, source, mode, data_range, range_type,
+                                   options):
+        quality = self.QUALITY_PARAM_V7
+
+        if quality in options.keys():
+            options[quality] = self.__get_v8_optimizefor_value(options[quality])
+
+        filtered_options = {self.__get_v8_param(k): v for k, v in options.iteritems()
+                            if k.lower() in self.OPTIONAL_PARAMS}
+
+        filtered_options.update(source)
+        filtered_options.update(mode)
+        filtered_options.update({'range[values]': ",".join(map(str, data_range))})
+        filtered_options.update({'range[type]': range_type})
+        filtered_options.update({'apikey': self._apikey})
+
+        return filtered_options
+
+    def __parse_isolines_response(self, response):
+        parsed_response = json.loads(response)
+        isolines_response = parsed_response['isolines']
+        isolines = []
+        for isoline in isolines_response:
+            if not isoline['polygons']:
+                geom_value = []
+            else:
+                geom_value = fp.decode(isoline['polygons'][0]['outer'])
+            isolines.append({'range': isoline['range']['value'],
+                             'geom': geom_value})
+
+        return isolines
+
+    def __parse_source_param(self, source, options):
+        key = 'origin'
+        if 'is_destination' in options and options['is_destination'].lower() == 'true':
+            key = 'destination'
+
+        return {key: source}
+
+    def __get_mode_params(self, mode, options):
+        mode_params = {}
+        if mode in self.ACCEPTED_MODES:
+            mode_source = self.ACCEPTED_MODES[mode]
+            mode_params.update({'transportmode': mode_source})
+        else:
+            raise WrongParams("{0} is not an accepted mode type".format(mode))
+
+        if 'mode_type' in options:
+            mode_type = self.__get_v8_routingmode_value(options['mode_type'])
+        else:
+            mode_type = self.DEFAULT_ROUTINGMODE
+
+        # Do not set routingmode if transportmode value is equivalent to 'walk' mode
+        if mode_source != self.HERE_WALK_MODE:
+            mode_params.update({'routingmode': mode_type})
+
+        if not ('mode_traffic' in options and options['mode_traffic'] == 'enabled'):
+            if 'is_destination' in options and options['is_destination'].lower() == 'true':
+                mode_params.update({'arrivaltime': 'any'})
+            else:
+                mode_params.update({'departuretime': 'any'})
+
+        return mode_params

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

@@ -0,0 +1,35 @@
+from cartodb_services.here.geocoder import HereMapsGeocoder, HereMapsGeocoderV7
+from cartodb_services.here.bulk_geocoder import HereMapsBulkGeocoder, HereMapsBulkGeocoderV7
+from cartodb_services.here.routing import HereMapsRoutingIsoline, HereMapsRoutingIsolineV8
+
+GEOCODING_DEFAULT_MAXRESULTS = 1
+
+def get_geocoder(logger, app_id=None, app_code=None, service_params=None, maxresults=GEOCODING_DEFAULT_MAXRESULTS, use_apikey=False, apikey=None):
+    if use_apikey is True:
+        return HereMapsGeocoderV7(apikey=apikey, logger=logger,
+                                    service_params=service_params,
+                                    limit=maxresults)
+    else:
+        return HereMapsGeocoder(app_id=app_id, app_code=app_code,
+                                    logger=logger,
+                                    service_params=service_params,
+                                    maxresults=maxresults)
+
+
+def get_bulk_geocoder(logger, app_id=None, app_code=None, service_params=None, use_apikey=False, apikey=None):
+    if use_apikey is True:
+        return HereMapsBulkGeocoderV7(apikey=apikey, logger=logger,
+                                    service_params=service_params)
+    else:
+        return HereMapsBulkGeocoder(app_id=app_id, app_code=app_code,
+                                    logger=logger,
+                                    service_params=service_params)
+
+def get_routing_isoline(logger, app_id=None, app_code=None, service_params=None, use_apikey=False, apikey=None):
+    if use_apikey is True:
+        return HereMapsRoutingIsolineV8(apikey=apikey, logger=logger,
+                                    service_params=service_params)
+    else:
+        return HereMapsRoutingIsoline(app_id=app_id, app_code=app_code,
+                                    logger=logger,
+                                    service_params=service_params)

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

@@ -11,7 +11,10 @@ def geo_polyline_to_multipolygon(polyline):
     else:
         coordinates = []
         for point in polyline:
-            lat, lon = point.split(',')
+            if isinstance(point, tuple):
+                lat, lon = point
+            else:
+                lat, lon = point.split(',') 
             coordinates.append("%s %s" % (lon, lat))
         wkt_coordinates = ','.join(coordinates)
 

server/lib/python/cartodb_services/cartodb_services/mapbox/isolines.py

@@ -105,7 +105,7 @@ class MapboxIsolines():
             elif response.status_code == requests.codes.unprocessable_entity:
                 return []
             else:
-                raise ServiceException(response.status_code, response)
+                raise ServiceException('Unexpected response (' + str(response.status_code) + '): ' + str(response.content), response)
         except requests.Timeout as te:
             # In case of timeout we want to stop the job because the server
             # could be down

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

@@ -94,7 +94,7 @@ class MapboxRouting(Traceable):
             elif response.status_code == requests.codes.unprocessable_entity:
                 return MapboxRoutingResponse(None, None, None)
             else:
-                raise ServiceException(response.status_code, response)
+                raise ServiceException('Unexpected response (' + str(response.status_code) + '): ' + str(response.content), response)
         except requests.Timeout as te:
             # In case of timeout we want to stop the job because the server
             # could be down

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

@@ -1,4 +1,4 @@
-from cartodb_services.metrics.config import GeocoderConfig, IsolinesRoutingConfig, InternalGeocoderConfig, RoutingConfig, ConfigException, ObservatoryConfig
+from cartodb_services.metrics.config import GeocoderConfig, IsolinesRoutingConfig, InternalGeocoderConfig, RoutingConfig, ConfigException
 from cartodb_services.metrics.quota import QuotaService
 from cartodb_services.metrics.user import UserMetricsService
 from cartodb_services.metrics.log import metrics, MetricsDataGatherer, Traceable

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

@@ -57,57 +57,6 @@ class ServiceConfig(object):
             return None
 
 
-class DataObservatoryConfig(ServiceConfig):
-
-    METRICS_LOG_KEY = 'do_log_path'
-
-    def __init__(self, redis_connection, db_conn, username, orgname=None):
-        super(DataObservatoryConfig, self).__init__(redis_connection, db_conn,
-                                            username, orgname)
-
-    @property
-    def monthly_quota(self):
-        return self._monthly_quota
-
-    @property
-    def period_end_date(self):
-        return self._period_end_date
-
-    @property
-    def soft_limit(self):
-        return self._soft_limit
-
-    @property
-    def connection_str(self):
-        return self._connection_str
-
-    @property
-    def provider(self):
-        return 'data observatory'
-
-
-class ObservatoryConfig(DataObservatoryConfig):
-
-    SOFT_LIMIT_KEY = 'soft_obs_general_limit'
-    QUOTA_KEY = 'obs_general_quota'
-    PERIOD_END_DATE = 'period_end_date'
-
-    def __init__(self, redis_connection, db_conn, username, orgname=None):
-        super(ObservatoryConfig, self).__init__(redis_connection, db_conn,
-                                            username, orgname)
-        self._period_end_date = date_parse(self._redis_config[self.PERIOD_END_DATE])
-        if self.SOFT_LIMIT_KEY in self._redis_config and self._redis_config[self.SOFT_LIMIT_KEY].lower() == 'true':
-            self._soft_limit = True
-        else:
-            self._soft_limit = False
-        self._monthly_quota = self._get_effective_monthly_quota(self.QUOTA_KEY)
-        self._connection_str = self._db_config.data_observatory_connection_str
-
-    @property
-    def service_type(self):
-        return 'obs_general'
-
-
 class RoutingConfig(ServiceConfig):
 
     PERIOD_END_DATE = 'period_end_date'
@@ -249,6 +198,8 @@ class IsolinesRoutingConfig(ServiceConfig):
         if self._isolines_provider == self.HEREMAPS_PROVIDER:
             self._heremaps_app_id = db_config.heremaps_isolines_app_id
             self._heremaps_app_code = db_config.heremaps_isolines_app_code
+            self._heremaps_apikey = db_config.heremaps_isolines_apikey
+            self._heremaps_use_apikey = db_config.heremaps_isolines_use_apikey
             self._heremaps_service_params = db_config.heremaps_isolines_service_params
         elif self._isolines_provider == self.MAPZEN_PROVIDER:
             self._mapzen_matrix_api_key = self._db_config.mapzen_matrix_api_key
@@ -301,6 +252,14 @@ class IsolinesRoutingConfig(ServiceConfig):
     def heremaps_service_params(self):
         return self._heremaps_service_params
 
+    @property
+    def heremaps_apikey(self):
+        return self._heremaps_apikey
+
+    @property
+    def heremaps_use_apikey(self):
+        return self._heremaps_use_apikey
+
     @property
     def mapzen_matrix_api_key(self):
         return self._mapzen_matrix_api_key
@@ -424,8 +383,12 @@ class GeocoderConfig(ServiceConfig):
 
     def __check_config(self, filtered_config):
         if self._geocoder_provider == self.NOKIA_GEOCODER:
-            if not set(self.NOKIA_GEOCODER_REDIS_MANDATORY_KEYS).issubset(set(filtered_config.keys())) or \
-            not self.heremaps_app_id or not self.heremaps_app_code:
+            if not set(self.NOKIA_GEOCODER_REDIS_MANDATORY_KEYS).issubset(set(filtered_config.keys())):
+                raise ConfigException("""Heremaps config is not set up""")
+            if self.heremaps_use_apikey is True:
+                if not self.heremaps_apikey:
+                    raise ConfigException("""Heremaps apikey is not set up""")
+            elif not self.heremaps_app_id or not self.heremaps_app_code:
                 raise ConfigException("""Heremaps app id or app code is not set up""")
         elif self._geocoder_provider == self.GOOGLE_GEOCODER:
             if self.GOOGLE_GEOCODER_API_KEY not in filtered_config.keys():
@@ -463,6 +426,8 @@ class GeocoderConfig(ServiceConfig):
         if self._geocoder_provider == self.NOKIA_GEOCODER:
             self._heremaps_app_id = db_config.heremaps_geocoder_app_id
             self._heremaps_app_code = db_config.heremaps_geocoder_app_code
+            self._heremaps_apikey = db_config.heremaps_geocoder_apikey
+            self._heremaps_use_apikey = db_config.heremaps_geocoder_use_apikey
             self._cost_per_hit = db_config.heremaps_geocoder_cost_per_hit
             self._heremaps_service_params = db_config.heremaps_geocoder_service_params
         elif self._geocoder_provider == self.GOOGLE_GEOCODER:
@@ -556,6 +521,14 @@ class GeocoderConfig(ServiceConfig):
     def heremaps_app_code(self):
         return self._heremaps_app_code
 
+    @property
+    def heremaps_apikey(self):
+        return self._heremaps_apikey
+
+    @property
+    def heremaps_use_apikey(self):
+        return self._heremaps_use_apikey
+
     @property
     def heremaps_service_params(self):
         return self._heremaps_service_params
@@ -624,7 +597,6 @@ class ServicesDBConfig:
         self._get_mapbox_config()
         self._get_tomtom_config()
         self._get_geocodio_config()
-        self._get_data_observatory_config()
 
     def _get_server_config(self):
         server_config_json = self._get_conf('server_conf')
@@ -645,11 +617,15 @@ class ServicesDBConfig:
         heremaps_conf = json.loads(heremaps_conf_json)
         self._heremaps_geocoder_app_id = heremaps_conf['geocoder']['app_id']
         self._heremaps_geocoder_app_code = heremaps_conf['geocoder']['app_code']
+        self._heremaps_geocoder_apikey = heremaps_conf['geocoder'].get('apikey')
+        self._heremaps_geocoder_use_apikey = heremaps_conf['geocoder'].get('use_apikey', False)
         self._heremaps_geocoder_cost_per_hit = heremaps_conf['geocoder'][
             'geocoder_cost_per_hit']
         self._heremaps_geocoder_service_params = heremaps_conf['geocoder'].get('service', {})
         self._heremaps_isolines_app_id = heremaps_conf['isolines']['app_id']
         self._heremaps_isolines_app_code = heremaps_conf['isolines']['app_code']
+        self._heremaps_isolines_apikey = heremaps_conf['isolines'].get('apikey')
+        self._heremaps_isolines_use_apikey = heremaps_conf['isolines'].get('use_apikey', False)
         self._heremaps_isolines_service_params = heremaps_conf['isolines'].get('service', {})
 
     def _get_mapzen_config(self):
@@ -716,19 +692,6 @@ class ServicesDBConfig:
             self._geocodio_geocoder_quota = geocodio_conf['geocoder']['monthly_quota']
             self._geocodio_geocoder_service_params = geocodio_conf['geocoder'].get('service', {})
 
-    def _get_data_observatory_config(self):
-        do_conf_json = self._get_conf('data_observatory_conf')
-        if not do_conf_json:
-            raise ConfigException('Data Observatory configuration missing')
-        else:
-            do_conf = json.loads(do_conf_json)
-            if self._orgname and self._orgname in do_conf['connection']['whitelist']:
-                self._data_observatory_connection_str = do_conf['connection']['staging']
-            elif self._username in do_conf['connection']['whitelist']:
-                self._data_observatory_connection_str = do_conf['connection']['staging']
-            else:
-                self._data_observatory_connection_str = do_conf['connection']['production']
-
     def _get_conf(self, key):
         try:
             sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(key)
@@ -749,6 +712,14 @@ class ServicesDBConfig:
     def heremaps_isolines_app_code(self):
         return self._heremaps_isolines_app_code
 
+    @property
+    def heremaps_isolines_apikey(self):
+        return self._heremaps_isolines_apikey
+
+    @property
+    def heremaps_isolines_use_apikey(self):
+        return self._heremaps_isolines_use_apikey
+
     @property
     def heremaps_isolines_service_params(self):
         return self._heremaps_isolines_service_params
@@ -761,6 +732,14 @@ class ServicesDBConfig:
     def heremaps_geocoder_app_code(self):
         return self._heremaps_geocoder_app_code
 
+    @property
+    def heremaps_geocoder_apikey(self):
+        return self._heremaps_geocoder_apikey
+
+    @property
+    def heremaps_geocoder_use_apikey(self):
+        return self._heremaps_geocoder_use_apikey
+
     @property
     def heremaps_geocoder_cost_per_hit(self):
         return self._heremaps_geocoder_cost_per_hit
@@ -897,10 +876,6 @@ class ServicesDBConfig:
     def geocodio_geocoder_service_params(self):
         return self._geocodio_geocoder_service_params
 
-    @property
-    def data_observatory_connection_str(self):
-        return self._data_observatory_connection_str
-
     @property
     def logger_config(self):
         logger_conf_json = self._get_conf('logger_conf')
@@ -917,7 +892,6 @@ class ServicesRedisConfig:
     QUOTA_KEY = 'geocoding_quota'
     ISOLINES_QUOTA_KEY = 'here_isolines_quota'
     ROUTING_QUOTA_KEY = 'mapzen_routing_quota'
-    OBS_GENERAL_QUOTA_KEY = 'obs_general_quota'
     PERIOD_END_DATE = 'period_end_date'
     GEOCODER_PROVIDER_KEY = 'geocoder_provider'
     ISOLINES_PROVIDER_KEY = 'isolines_provider'
@@ -960,8 +934,6 @@ class ServicesRedisConfig:
                 user_config[self.ISOLINES_QUOTA_KEY] = org_config[self.ISOLINES_QUOTA_KEY]
             if self.ROUTING_QUOTA_KEY in org_config:
                 user_config[self.ROUTING_QUOTA_KEY] = org_config[self.ROUTING_QUOTA_KEY]
-            if self.OBS_GENERAL_QUOTA_KEY in org_config:
-                user_config[self.OBS_GENERAL_QUOTA_KEY] = org_config[self.OBS_GENERAL_QUOTA_KEY]
             if self.PERIOD_END_DATE in org_config:
                 user_config[self.PERIOD_END_DATE] = org_config[self.PERIOD_END_DATE]
             if self.GOOGLE_GEOCODER_CLIENT_ID in org_config:

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

@@ -127,8 +127,6 @@ class MetricsServiceLoggerFactory:
             return MetricsGenericLogger(service_config, logger)
         elif re.search('_isolines$', service_config.service_type):
             return MetricsIsolinesLogger(service_config, logger)
-        elif re.search('^obs_*', service_config.service_type):
-            return MetricsGenericLogger(service_config, logger)
         else:
             return None
 

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

@@ -78,9 +78,6 @@ class QuotaChecker:
         elif re.match('^routing_',
                       self._user_service_config.service_type) is not None:
             return self.__check_routing_quota()
-        elif re.match('^obs_',
-                      self._user_service_config.service_type) is not None:
-            return self.__check_data_observatory_quota()
         else:
             return False
 
@@ -123,18 +120,3 @@ class QuotaChecker:
             return True
         else:
             return False
-
-    def __check_data_observatory_quota(self):
-        user_quota = self._user_service_config.monthly_quota
-        soft_limit = self._user_service_config.soft_limit
-        today = date.today()
-        service_type = self._user_service_config.service_type
-        current_used = self._user_service.used_quota(service_type, today)
-
-        # Quick workaround so we don't take into account numer of credits
-        # spent for users that have defined the quota.
-        # See https://github.com/CartoDB/bigmetadata/issues/215
-        if soft_limit or (user_quota > 0):
-            return True
-        else:
-            return False

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

@@ -26,7 +26,6 @@ class UserMetricsService:
     SERVICE_MAPZEN_ROUTING = 'routing_mapzen'
     SERVICE_MAPBOX_ROUTING = 'routing_mapbox'
     SERVICE_TOMTOM_ROUTING = 'routing_tomtom'
-    SERVICE_OBSERVATORY = 'obs_general'
     DAY_OF_MONTH_ZERO_PADDED = '%d'
 
     def __init__(self, user_geocoder_config, redis_connection):
@@ -45,8 +44,6 @@ class UserMetricsService:
                               self.SERVICE_MAPBOX_ROUTING,
                               self.SERVICE_TOMTOM_ROUTING]:
             return self.__used_routing_quota(service_type, date)
-        elif service_type == self.SERVICE_OBSERVATORY:
-            return self.__used_observatory_quota(service_type, date)
         else:
             return self.__used_geocoding_quota(service_type, date)
 
@@ -97,19 +94,6 @@ class UserMetricsService:
 
         return current_use
 
-    def __used_observatory_quota(self, service_type, date):
-        date_from, date_to = self.__current_billing_cycle()
-        current_use = 0
-        success_responses = self.get_metrics(service_type,
-                                             'success_responses', date_from,
-                                             date_to)
-        empty_responses = self.get_metrics(service_type,
-                                           'empty_responses', date_from,
-                                           date_to)
-        current_use += (success_responses + empty_responses)
-
-        return current_use
-
     def increment_service_use(self, service_type, metric, date=date.today(),
                               amount=1):
         """ Increment the services uses in monthly and daily basis"""

server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py

@@ -10,6 +10,7 @@ from cartodb_services.metrics import Traceable
 from cartodb_services.tools.exceptions import ServiceException
 from cartodb_services.tools.qps import qps_retry
 from cartodb_services.tools.normalize import normalize
+from cartodb_services.tools.country import country_to_iso3
 
 HOST = 'https://api.tomtom.com'
 API_BASEURI = '/search/2'
@@ -48,7 +49,7 @@ class TomTomGeocoder(Traceable):
     def _request_uri(self, searchtext, country=None, apiKey=None):
         baseuri = REQUEST_BASEURI
         if country:
-            baseuri += '&countrySet={}'.format(country)
+            baseuri += '&countrySet={}'.format(country_to_iso3(country) or country)
         baseuri = baseuri + '&key={apiKey}' if apiKey else baseuri
         return URITemplate(baseuri).expand(apiKey=apiKey,
                                            searchtext=searchtext.encode('utf-8'))

server/lib/python/cartodb_services/cartodb_services/tomtom/isolines.py

@@ -82,7 +82,7 @@ class TomTomIsolines():
             elif response.status_code == requests.codes.unprocessable_entity:
                 return []
             else:
-                raise ServiceException(response.status_code, response)
+                raise ServiceException('Unexpected response (' + str(response.status_code) + '): ' + str(response.content), response)
         except requests.Timeout as te:
             # In case of timeout we want to stop the job because the server
             # could be down

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

@@ -120,7 +120,7 @@ class TomTomRouting(Traceable):
             elif response.status_code == requests.codes.unprocessable_entity:
                 return TomTomRoutingResponse(None, None, None)
             else:
-                raise ServiceException(response.status_code, response)
+                raise ServiceException('Unexpected response (' + str(response.status_code) + '): ' + str(response.content), response)
         except requests.Timeout as te:
             # In case of timeout we want to stop the job because the server
             # could be down

server/lib/python/cartodb_services/requirements.txt

@@ -6,12 +6,16 @@ rollbar==0.13.2
 # Dependency for googlemaps package
 requests==2.20.0
 rratelimit==0.0.4
+# botocore 1.19.0 introduced an error `ImportError: cannot import name 'IPV6_ADDRZ_RE'`
+# and mapbox depends on botocore<=1.19.0 so forcing 1.18.18
+botocore==1.18.18
 mapbox==0.14.0
 pygeocodio==0.11.1
+flexpolyline==0.1.0
 
 # Test
 mock==1.3.0
 mockredispy==2.9.0.11
 nose==1.3.7
 requests-mock==0.7.0
-freezegun==0.3.7
+freezegun==0.3.7

server/lib/python/cartodb_services/setup.py

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