-drop table import_status;
+drop table if exists import_status;
CREATE TABLE import_status (
- lastimportdate timestamp NOT NULL
+ lastimportdate timestamp NOT NULL,
+ sequence_id integer,
+ indexed boolean
);
-GRANT SELECT ON import_status TO "www-data" ;
+GRANT SELECT ON import_status TO "{www-user}" ;
-drop table import_osmosis_log;
+drop table if exists import_osmosis_log;
CREATE TABLE import_osmosis_log (
batchend timestamp,
+ batchseq integer,
batchsize integer,
starttime timestamp,
endtime timestamp,
event text
);
---drop table IF EXISTS query_log;
-CREATE TABLE query_log (
- starttime timestamp,
- query text,
- ipaddress text,
- endtime timestamp,
- results integer
- );
-CREATE INDEX idx_query_log ON query_log USING BTREE (starttime);
-GRANT INSERT ON query_log TO "www-data" ;
-
CREATE TABLE new_query_log (
type text,
starttime timestamp,
useragent text,
language text,
query text,
+ searchterm text,
endtime timestamp,
results integer,
format text,
secret text
);
CREATE INDEX idx_new_query_log_starttime ON new_query_log USING BTREE (starttime);
-GRANT INSERT ON new_query_log TO "www-data" ;
-GRANT UPDATE ON new_query_log TO "www-data" ;
-GRANT SELECT ON new_query_log TO "www-data" ;
+GRANT INSERT ON new_query_log TO "{www-user}" ;
+GRANT UPDATE ON new_query_log TO "{www-user}" ;
+GRANT SELECT ON new_query_log TO "{www-user}" ;
-create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as
-useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
-
---drop table IF EXISTS report_log;
-CREATE TABLE report_log (
- starttime timestamp,
- ipaddress text,
- query text,
- description text,
- email text
- );
-GRANT INSERT ON report_log TO "www-data" ;
+GRANT SELECT ON TABLE country_name TO "{www-user}";
+GRANT SELECT ON TABLE gb_postcode TO "{www-user}";
drop table IF EXISTS word;
CREATE TABLE word (
word_id INTEGER,
word_token text,
- word_trigram text,
word text,
class text,
type text,
country_code varchar(2),
- search_name_count INTEGER
- );
-SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
-CREATE INDEX idx_word_word_token on word USING BTREE (word_token);
-CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops);
-GRANT SELECT ON word TO "www-data" ;
-DROP SEQUENCE seq_word;
+ search_name_count INTEGER,
+ operator TEXT
+ ) {ts:search-data};
+CREATE INDEX idx_word_word_token on word USING BTREE (word_token) {ts:search-index};
+GRANT SELECT ON word TO "{www-user}" ;
+DROP SEQUENCE IF EXISTS seq_word;
CREATE SEQUENCE seq_word start 1;
drop table IF EXISTS location_area CASCADE;
CREATE TABLE location_area (
- partition varchar(10),
- place_id bigint,
+ place_id BIGINT,
keywords INTEGER[],
- rank_search INTEGER NOT NULL,
- rank_address INTEGER NOT NULL,
+ partition SMALLINT,
+ rank_search SMALLINT NOT NULL,
+ rank_address SMALLINT NOT NULL,
+ country_code VARCHAR(2),
isguess BOOL
);
SELECT AddGeometryColumn('location_area', 'centroid', 4326, 'POINT', 2);
SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2);
CREATE TABLE location_area_large () INHERITS (location_area);
-CREATE TABLE location_area_roadnear () INHERITS (location_area);
-CREATE TABLE location_area_roadfar () INHERITS (location_area);
+
+drop table IF EXISTS location_property CASCADE;
+CREATE TABLE location_property (
+ place_id BIGINT,
+ parent_place_id BIGINT,
+ partition SMALLINT,
+ housenumber TEXT,
+ postcode TEXT
+ );
+SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2);
+
+CREATE TABLE location_property_aux () INHERITS (location_property);
+CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
+CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id);
+CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);
+GRANT SELECT ON location_property_aux TO "{www-user}";
+
+CREATE TABLE location_property_tiger (
+ place_id BIGINT,
+ parent_place_id BIGINT,
+ startnumber INTEGER,
+ endnumber INTEGER,
+ partition SMALLINT,
+ linegeo GEOMETRY,
+ interpolationtype TEXT,
+ postcode TEXT);
+GRANT SELECT ON location_property_tiger TO "{www-user}";
+
+drop table if exists location_property_osmline;
+CREATE TABLE location_property_osmline (
+ place_id BIGINT NOT NULL,
+ osm_id BIGINT,
+ parent_place_id BIGINT,
+ geometry_sector INTEGER,
+ indexed_date TIMESTAMP,
+ startnumber INTEGER,
+ endnumber INTEGER,
+ partition SMALLINT,
+ indexed_status SMALLINT,
+ linegeo GEOMETRY,
+ interpolationtype TEXT,
+ address HSTORE,
+ postcode TEXT,
+ country_code VARCHAR(2)
+ ){ts:search-data};
+CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline USING BTREE (place_id) {ts:search-index};
+CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline USING BTREE (geometry_sector) {ts:address-index};
+CREATE INDEX idx_osmline_linegeo ON location_property_osmline USING GIST (linegeo) {ts:search-index};
+GRANT SELECT ON location_property_osmline TO "{www-user}";
drop table IF EXISTS search_name;
CREATE TABLE search_name (
- place_id bigint,
- search_rank integer,
- address_rank integer,
- country_code varchar(2),
+ place_id BIGINT,
+ importance FLOAT,
+ search_rank SMALLINT,
+ address_rank SMALLINT,
name_vector integer[],
- nameaddress_vector integer[]
- );
-CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops);
-CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops);
+ nameaddress_vector integer[],
+ country_code varchar(2)
+ ) {ts:search-data};
SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
-CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id);
+CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index};
drop table IF EXISTS place_addressline;
CREATE TABLE place_addressline (
- place_id bigint,
- address_place_id bigint,
+ place_id BIGINT,
+ address_place_id BIGINT,
+ distance FLOAT,
+ cached_rank_address SMALLINT,
fromarea boolean,
- isaddress boolean,
- distance float,
- cached_rank_address integer
- );
-CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id);
-CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
-
-drop table IF EXISTS place_boundingbox CASCADE;
-CREATE TABLE place_boundingbox (
- place_id bigint,
- minlat float,
- maxlat float,
- minlon float,
- maxlon float,
- numfeatures integer,
- area float
- );
-CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
-SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
-GRANT SELECT on place_boundingbox to "www-data" ;
-GRANT INSERT on place_boundingbox to "www-data" ;
-
-drop table IF EXISTS reverse_cache;
-CREATE TABLE reverse_cache (
- latlonzoomid integer,
- country_code varchar(2),
- place_id bigint
- );
-GRANT SELECT on reverse_cache to "www-data" ;
-GRANT INSERT on reverse_cache to "www-data" ;
-CREATE INDEX idx_reverse_cache_latlonzoomid ON reverse_cache USING BTREE (latlonzoomid);
-
-drop table country;
-CREATE TABLE country (
- country_code varchar(2),
- country_name hstore,
- country_default_language_code varchar(2)
- );
-SELECT AddGeometryColumn('country', 'geometry', 4326, 'POLYGON', 2);
-insert into country select iso3166::varchar(2), ARRAY[ROW('name:en',cntry_name)::keyvalue], null,
- ST_Transform(geometryn(the_geom, generate_series(1, numgeometries(the_geom))), 4326) from worldboundaries;
-CREATE INDEX idx_country_country_code ON country USING BTREE (country_code);
-CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
+ isaddress boolean
+ ) {ts:search-data};
+CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) {ts:search-index};
-drop table placex;
+drop table if exists placex;
CREATE TABLE placex (
- place_id bigint NOT NULL,
- partition varchar(10),
- osm_type char(1),
- osm_id bigint,
- class TEXT NOT NULL,
- type TEXT NOT NULL,
- name HSTORE,
- admin_level integer,
- housenumber TEXT,
- street TEXT,
- isin TEXT,
- postcode TEXT,
- country_code varchar(2),
- street_place_id bigint,
- rank_address INTEGER,
- rank_search INTEGER,
- indexed_status INTEGER,
+ place_id BIGINT NOT NULL,
+ parent_place_id BIGINT,
+ linked_place_id BIGINT,
+ importance FLOAT,
indexed_date TIMESTAMP,
- geometry_sector INTEGER
- );
-SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
-CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
-CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);
-CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search);
-CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address);
-CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry);
-CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed);
-CREATE INDEX idx_placex_pending ON placex USING BTREE (rank_search) where name IS NOT NULL and indexed = false;
-CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search)
- where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
-CREATE INDEX idx_placex_street_place_id ON placex USING BTREE (street_place_id) where street_place_id IS NOT NULL;
-CREATE INDEX idx_placex_gb_postcodesector ON placex USING BTREE (substring(upper(postcode) from '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$'))
- where country_code = 'gb' and substring(upper(postcode) from '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$') is not null;
-CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed = false and class='place' and type='houses';
-CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id);
-CLUSTER placex USING idx_placex_sector;
-
-DROP SEQUENCE seq_place;
+ geometry_sector INTEGER,
+ rank_address SMALLINT,
+ rank_search SMALLINT,
+ partition SMALLINT,
+ indexed_status SMALLINT,
+ LIKE place INCLUDING CONSTRAINTS,
+ wikipedia TEXT, -- calculated wikipedia article name (language:title)
+ country_code varchar(2),
+ housenumber TEXT,
+ postcode TEXT
+ ) {ts:search-data};
+SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
+CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index};
+CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index};
+CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index} WHERE linked_place_id IS NOT NULL;
+CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index};
+CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index};
+CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26;
+
+DROP SEQUENCE IF EXISTS seq_place;
CREATE SEQUENCE seq_place start 1;
-GRANT SELECT on placex to "www-data" ;
-GRANT UPDATE ON placex to "www-data" ;
-GRANT SELECT ON search_name to "www-data" ;
-GRANT DELETE on search_name to "www-data" ;
-GRANT INSERT on search_name to "www-data" ;
-GRANT SELECT on place_addressline to "www-data" ;
-GRANT INSERT ON place_addressline to "www-data" ;
-GRANT DELETE on place_addressline to "www-data" ;
-GRANT SELECT on location_point to "www-data" ;
-GRANT SELECT ON seq_word to "www-data" ;
-GRANT UPDATE ON seq_word to "www-data" ;
-GRANT INSERT ON word to "www-data" ;
-GRANT SELECT ON planet_osm_ways to "www-data" ;
-GRANT SELECT ON planet_osm_rels to "www-data" ;
-GRANT SELECT on location_point to "www-data" ;
-GRANT SELECT on location_area to "www-data" ;
-GRANT SELECT on location_point_26 to "www-data" ;
-GRANT SELECT on location_point_25 to "www-data" ;
-GRANT SELECT on location_point_24 to "www-data" ;
-GRANT SELECT on location_point_23 to "www-data" ;
-GRANT SELECT on location_point_22 to "www-data" ;
-GRANT SELECT on location_point_21 to "www-data" ;
-GRANT SELECT on location_point_20 to "www-data" ;
-GRANT SELECT on location_point_19 to "www-data" ;
-GRANT SELECT on location_point_18 to "www-data" ;
-GRANT SELECT on location_point_17 to "www-data" ;
-GRANT SELECT on location_point_16 to "www-data" ;
-GRANT SELECT on location_point_15 to "www-data" ;
-GRANT SELECT on location_point_14 to "www-data" ;
-GRANT SELECT on location_point_13 to "www-data" ;
-GRANT SELECT on location_point_12 to "www-data" ;
-GRANT SELECT on location_point_11 to "www-data" ;
-GRANT SELECT on location_point_10 to "www-data" ;
-GRANT SELECT on location_point_9 to "www-data" ;
-GRANT SELECT on location_point_8 to "www-data" ;
-GRANT SELECT on location_point_7 to "www-data" ;
-GRANT SELECT on location_point_6 to "www-data" ;
-GRANT SELECT on location_point_5 to "www-data" ;
-GRANT SELECT on location_point_4 to "www-data" ;
-GRANT SELECT on location_point_3 to "www-data" ;
-GRANT SELECT on location_point_2 to "www-data" ;
-GRANT SELECT on location_point_1 to "www-data" ;
-GRANT SELECT on country to "www-data" ;
-
--- insert creates the location tagbles, creates location indexes if indexed == true
+GRANT SELECT on placex to "{www-user}" ;
+GRANT SELECT ON search_name to "{www-user}" ;
+GRANT SELECT on place_addressline to "{www-user}" ;
+GRANT SELECT ON seq_word to "{www-user}" ;
+GRANT SELECT ON planet_osm_ways to "{www-user}" ;
+GRANT SELECT ON planet_osm_rels to "{www-user}" ;
+GRANT SELECT on location_area to "{www-user}" ;
+
+-- insert creates the location tables, creates location indexes if indexed == true
CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex
FOR EACH ROW EXECUTE PROCEDURE placex_insert();
+CREATE TRIGGER osmline_before_insert BEFORE INSERT ON location_property_osmline
+ FOR EACH ROW EXECUTE PROCEDURE osmline_insert();
-- update insert creates the location tables
CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex
FOR EACH ROW EXECUTE PROCEDURE placex_update();
+CREATE TRIGGER osmline_before_update BEFORE UPDATE ON location_property_osmline
+ FOR EACH ROW EXECUTE PROCEDURE osmline_update();
-- diff update triggers
CREATE TRIGGER placex_before_delete AFTER DELETE ON placex
CREATE TRIGGER place_before_insert BEFORE INSERT ON place
FOR EACH ROW EXECUTE PROCEDURE place_insert();
-alter table placex add column geometry_sector INTEGER;
-alter table placex add column indexed_status INTEGER;
-alter table placex add column indexed_date TIMESTAMP;
+DROP SEQUENCE IF EXISTS seq_postcodes;
+CREATE SEQUENCE seq_postcodes start 1;
+
+DROP TABLE IF EXISTS import_polygon_error;
+CREATE TABLE import_polygon_error (
+ osm_id BIGINT,
+ osm_type CHAR(1),
+ class TEXT NOT NULL,
+ type TEXT NOT NULL,
+ name HSTORE,
+ country_code varchar(2),
+ updated timestamp,
+ errormessage text
+ );
+SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2);
+SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2);
+CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id);
+GRANT SELECT ON import_polygon_error TO "{www-user}";
+
+DROP TABLE IF EXISTS import_polygon_delete;
+CREATE TABLE import_polygon_delete (
+ osm_id BIGINT,
+ osm_type CHAR(1),
+ class TEXT NOT NULL,
+ type TEXT NOT NULL
+ );
+CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id);
+GRANT SELECT ON import_polygon_delete TO "{www-user}";
+
+DROP SEQUENCE IF EXISTS file;
+CREATE SEQUENCE file start 1;
+
+-- null table so it won't error
+-- deliberately no drop - importing the table is expensive and static, if it is already there better to avoid removing it
+CREATE TABLE wikipedia_article (
+ language text NOT NULL,
+ title text NOT NULL,
+ langcount integer,
+ othercount integer,
+ totalcount integer,
+ lat double precision,
+ lon double precision,
+ importance double precision,
+ osm_type character(1),
+ osm_id bigint
+);
+ALTER TABLE ONLY wikipedia_article ADD CONSTRAINT wikipedia_article_pkey PRIMARY KEY (language, title);
+CREATE INDEX idx_wikipedia_article_osm_id ON wikipedia_article USING btree (osm_type, osm_id);
+
+CREATE TABLE wikipedia_redirect (
+ language text,
+ from_title text,
+ to_title text
+);
+ALTER TABLE ONLY wikipedia_redirect ADD CONSTRAINT wikipedia_redirect_pkey PRIMARY KEY (language, from_title);
-update placex set geometry_sector = geometry_sector(geometry);
-drop index idx_placex_pendingbylatlon;
-drop index idx_placex_interpolation;
-drop index idx_placex_sector;
-CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search)
- where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
-CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed = false and class='place' and type='houses';
-CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id);
projects / nominatim.git / blobdiff