cartodb4/data-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge postalcodes into cdb_geocoder

Browse Source
This commit is contained in:
Rafa de la Torre
2015-11-03 18:37:58 +01:00
parent 745c0a8b0a
commit 13a94cd3cc
16 changed files with 27 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
geocoder/extension/Makefile
View File

@@ -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

1
geocoder/extension/expected/cdb_geocoder_postalcode_test.out Normal file
View File

@@ -0,0 +1 @@
-- PENDING

21
geocoder/extension/sql/0.0.1/05_types.sql Normal file
View File

@@ -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);

4
geocoder/extension/sql/0.0.1/10_admin0.sql
View File

@@ -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

6
geocoder/extension/sql/0.0.1/20_admin1.sql
View File

@@ -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

3
geocoder/extension/sql/0.0.1/30_ipaddr.sql
View File

@@ -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

5
geocoder/extension/sql/0.0.1/40_namedplaces.sql
View File

@@ -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

13
geocoder/postal-codes/extension/cdb_geocoder_postalcode--0.0.1.sql → geocoder/extension/sql/0.0.1/50_postalcodes.sql
View File

@@ -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

1
geocoder/extension/sql/cdb_geocoder_postalcode_test.sql Normal file
View File

@@ -0,0 +1 @@
-- PENDING

3
geocoder/postal-codes/extension/.gitignore vendored
View File

@@ -1,3 +0,0 @@
results/
regression.diffs
regression.out

8
geocoder/postal-codes/extension/Makefile
View File

@@ -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)

36
geocoder/postal-codes/extension/README.md
View File

@@ -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.

6
geocoder/postal-codes/extension/cdb_geocoder_postalcode.control
View File

@@ -1,6 +0,0 @@
# cdb geocoder postalcode extension
comment = 'CartoDB postalcode internal geocoder'
default_version = '0.0.1'
relocatable = true
requires = cartodb
superuser = false

6
geocoder/postal-codes/extension/expected/cdb_geocoder_postalcode_test.out
View File

@@ -1,6 +0,0 @@
CREATE EXTENSION postgis;
CREATE EXTENSION schema_triggers;
CREATE EXTENSION plpythonu;
CREATE EXTENSION cartodb;
CREATE EXTENSION cdb_geocoder_postalcode;
-- PENDING

7
geocoder/postal-codes/extension/sql/cdb_geocoder_postalcode_test.sql
View File

@@ -1,7 +0,0 @@
CREATE EXTENSION postgis;
CREATE EXTENSION schema_triggers;
CREATE EXTENSION plpythonu;
CREATE EXTENSION cartodb;
CREATE EXTENSION cdb_geocoder_postalcode;
-- PENDING

5
geocoder/setup/postal-codes/response-types.sql
View File

@@ -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);