diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile index d390592..f5ec3b8 100644 --- a/geocoder/extension/Makefile +++ b/geocoder/extension/Makefile @@ -9,7 +9,8 @@ REGRESS = \ cdb_geocoder_admin0_test \ cdb_geocoder_admin1_test \ cdb_geocoder_ipaddr_test \ - cdb_geocoder_namedplaces_test + cdb_geocoder_namedplaces_test \ + cdb_geocoder_postalcode_test # postgres build stuff PG_CONFIG = pg_config diff --git a/geocoder/extension/expected/cdb_geocoder_postalcode_test.out b/geocoder/extension/expected/cdb_geocoder_postalcode_test.out new file mode 100644 index 0000000..4c317ad --- /dev/null +++ b/geocoder/extension/expected/cdb_geocoder_postalcode_test.out @@ -0,0 +1 @@ +-- PENDING diff --git a/geocoder/extension/sql/0.0.1/05_types.sql b/geocoder/extension/sql/0.0.1/05_types.sql new file mode 100644 index 0000000..360a926 --- /dev/null +++ b/geocoder/extension/sql/0.0.1/05_types.sql @@ -0,0 +1,21 @@ +-- Response types for admin0 geocoder +CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN); +CREATE TYPE synonym_lookup_v1 AS (q TEXT, adm0_a3 TEXT); + +-- Response types for admin1 geocoder +CREATE TYPE geocode_admin_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); + +-- Response types for IP addresses geocoder +CREATE TYPE geocode_ip_v1 AS (q text, geom geometry, success boolean); + +-- Response types for namedplaces geocoder +CREATE TYPE geocode_namedplace_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); +CREATE TYPE geocode_namedplace_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN); +CREATE TYPE geocode_admin1_country_v1 AS (q text, a1 text, c text, geom geometry, success boolean); + +-- Response types for postalcodes geocoder +CREATE TYPE geocode_postalint_country_v1 AS (q INT, c TEXT, geom GEOMETRY, success BOOLEAN); +CREATE TYPE geocode_place_country_iso_v1 AS (q TEXT, c TEXT, iso3 TEXT, geom GEOMETRY, success BOOLEAN); + + +CREATE TYPE available_services_v1 AS (q text, adm0_a3 text, postal_code_points boolean, postal_code_polygons boolean); diff --git a/geocoder/extension/sql/0.0.1/10_admin0.sql b/geocoder/extension/sql/0.0.1/10_admin0.sql index 100ff49..216d37e 100644 --- a/geocoder/extension/sql/0.0.1/10_admin0.sql +++ b/geocoder/extension/sql/0.0.1/10_admin0.sql @@ -1,7 +1,3 @@ --- Response types for admin0 geocoder -CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE synonym_lookup_v1 AS (q TEXT, adm0_a3 TEXT); - -- Public API functions -- --- Geocoding function --- -- TODO: deal with permissions diff --git a/geocoder/extension/sql/0.0.1/20_admin1.sql b/geocoder/extension/sql/0.0.1/20_admin1.sql index 1d04c63..283798e 100644 --- a/geocoder/extension/sql/0.0.1/20_admin1.sql +++ b/geocoder/extension/sql/0.0.1/20_admin1.sql @@ -1,9 +1,3 @@ --- Response types for admin1 geocoder --- TODO: check if the types exist already in the db - -CREATE TYPE geocode_admin_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); - - -- Public API functions -- --- Geocoding function --- -- TODO: deal with permissions diff --git a/geocoder/extension/sql/0.0.1/30_ipaddr.sql b/geocoder/extension/sql/0.0.1/30_ipaddr.sql index 8560aeb..1018179 100644 --- a/geocoder/extension/sql/0.0.1/30_ipaddr.sql +++ b/geocoder/extension/sql/0.0.1/30_ipaddr.sql @@ -1,6 +1,3 @@ --- Response types for IP addresses geocoder -CREATE TYPE geocode_ip_v1 AS (q text, geom geometry, success boolean); - -- Public API functions -- --- Geocoding function --- -- TODO: deal with permissions diff --git a/geocoder/extension/sql/0.0.1/40_namedplaces.sql b/geocoder/extension/sql/0.0.1/40_namedplaces.sql index 26e0f64..39eed32 100644 --- a/geocoder/extension/sql/0.0.1/40_namedplaces.sql +++ b/geocoder/extension/sql/0.0.1/40_namedplaces.sql @@ -1,8 +1,3 @@ --- Response types for namedplaces geocoder -CREATE TYPE geocode_namedplace_country_v1 AS (q text, c text, geom geometry, success boolean); -CREATE TYPE geocode_namedplace_v1 AS (q text, geom geometry, success boolean); -CREATE TYPE geocode_admin1_country_v1 AS (q text, a1 text, c text, geom geometry, success boolean); - -- Public API functions -- --- Geocoding function --- -- TODO: deal with permissions diff --git a/geocoder/postal-codes/extension/cdb_geocoder_postalcode--0.0.1.sql b/geocoder/extension/sql/0.0.1/50_postalcodes.sql similarity index 94% rename from geocoder/postal-codes/extension/cdb_geocoder_postalcode--0.0.1.sql rename to geocoder/extension/sql/0.0.1/50_postalcodes.sql index be91673..c6b78ed 100644 --- a/geocoder/postal-codes/extension/cdb_geocoder_postalcode--0.0.1.sql +++ b/geocoder/extension/sql/0.0.1/50_postalcodes.sql @@ -1,12 +1,3 @@ --- Complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "CREATE EXTENSION cdb_geocoder_postalcode" to load this file. \quit - --- Response types for admin0 geocoder -CREATE TYPE geocode_namedplace_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE geocode_postalint_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE geocode_namedplace_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE available_services_v1 AS (q text, adm0_a3 text, postal_code_points boolean, postal_code_polygons boolean); - -- Public API functions -- --- Geocoding function --- -- TODO: deal with permissions @@ -391,8 +382,8 @@ CREATE SEQUENCE available_services_cartodb_id_seq NO MAXVALUE CACHE 1; -ALTER SEQUENCE available_services_cartodb_id_seq_cartodb_id_seq OWNED BY available_services.cartodb_id; -ALTER TABLE ONLY available_services ALTER COLUMN cartodb_id SET DEFAULT nextval('available_services_cartodb_id_seq_cartodb_id_seq'::regclass); +ALTER SEQUENCE available_services_cartodb_id_seq OWNED BY available_services.cartodb_id; +ALTER TABLE ONLY available_services ALTER COLUMN cartodb_id SET DEFAULT nextval('available_services_cartodb_id_seq'::regclass); ALTER TABLE ONLY available_services diff --git a/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql b/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql new file mode 100644 index 0000000..4c317ad --- /dev/null +++ b/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql @@ -0,0 +1 @@ +-- PENDING diff --git a/geocoder/postal-codes/extension/.gitignore b/geocoder/postal-codes/extension/.gitignore deleted file mode 100644 index e710f0e..0000000 --- a/geocoder/postal-codes/extension/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -results/ -regression.diffs -regression.out diff --git a/geocoder/postal-codes/extension/Makefile b/geocoder/postal-codes/extension/Makefile deleted file mode 100644 index dcff338..0000000 --- a/geocoder/postal-codes/extension/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -EXTENSION = cdb_geocoder_postalcode -DATA = cdb_geocoder_postalcode--0.0.1.sql -REGRESS = cdb_geocoder_postalcode_test - -# postgres build stuff -PG_CONFIG = pg_config -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) diff --git a/geocoder/postal-codes/extension/README.md b/geocoder/postal-codes/extension/README.md deleted file mode 100644 index b2afd35..0000000 --- a/geocoder/postal-codes/extension/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# CartoDB postal code geocoder extension -Postgres extension for the CartoDB postal code geocoder. It is meant to contain the functions and related objects needed to geocode by postal codes. It is not meant to contain the actual data used to geocode them. - -## Dependencies -This extension is thought to be used on top of CartoDB platform. Therefore a cartodb user is required to install the extension onto it. - -The following is a non-comprehensive list of dependencies: - -- Postgres 9.3+ -- Postgis extension -- Schema triggers extension -- CartoDB extension - -## Installation into the db cluster -This requires root privileges -``` -sudo make all install -``` - -## Execute tests -``` -PGUSER=postgres make installcheck -``` - -## Install onto a user's database -``` -psql -U development_cartodb_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f cartodb_dev_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f_db -``` - -and then: - -```sql -CREATE EXTENSION cdb_geocoder_postalcode; -``` - -The extension creation in the user's db does not require special privileges. It can be even created from the sql api. diff --git a/geocoder/postal-codes/extension/cdb_geocoder_postalcode.control b/geocoder/postal-codes/extension/cdb_geocoder_postalcode.control deleted file mode 100644 index 70f249c..0000000 --- a/geocoder/postal-codes/extension/cdb_geocoder_postalcode.control +++ /dev/null @@ -1,6 +0,0 @@ -# cdb geocoder postalcode extension -comment = 'CartoDB postalcode internal geocoder' -default_version = '0.0.1' -relocatable = true -requires = cartodb -superuser = false diff --git a/geocoder/postal-codes/extension/expected/cdb_geocoder_postalcode_test.out b/geocoder/postal-codes/extension/expected/cdb_geocoder_postalcode_test.out deleted file mode 100644 index 6824cae..0000000 --- a/geocoder/postal-codes/extension/expected/cdb_geocoder_postalcode_test.out +++ /dev/null @@ -1,6 +0,0 @@ -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION cdb_geocoder_postalcode; --- PENDING diff --git a/geocoder/postal-codes/extension/sql/cdb_geocoder_postalcode_test.sql b/geocoder/postal-codes/extension/sql/cdb_geocoder_postalcode_test.sql deleted file mode 100644 index 314eb72..0000000 --- a/geocoder/postal-codes/extension/sql/cdb_geocoder_postalcode_test.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION cdb_geocoder_postalcode; - --- PENDING diff --git a/geocoder/setup/postal-codes/response-types.sql b/geocoder/setup/postal-codes/response-types.sql deleted file mode 100644 index 4a5bea5..0000000 --- a/geocoder/setup/postal-codes/response-types.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Response types for postal codes geocoder -CREATE TYPE geocode_namedplace_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE geocode_place_country_iso_v1 AS (q TEXT, c TEXT, iso3 TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE geocode_namedplace_country_v1 AS (q TEXT, c TEXT, geom GEOMETRY, success BOOLEAN); -CREATE TYPE geocode_postalint_country_v1 AS (q INT, c TEXT, geom GEOMETRY, success BOOLEAN);