Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/indices.src.sql
	sql/tables.sql

diff --cc sql/indices.src.sql
index 2e5dde71e66ecb25b0cd6b3be3a4ef51247464f0,ea57e74be1f4174f5e0ac41c881ea60bab866209..4dc23bd250474b76909103926ec338966d9a17af
--- 1/sql/indices.src.sql
--- 2/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@@ -1,30 -1,29 +1,29 @@@
  -- Indices used only during search and update.
  -- These indices are created only after the indexing process is done.
  
 -CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
 +CREATE INDEX idx_word_word_id on word USING BTREE (word_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_search_name_nameaddress_vector ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off);
 -CREATE INDEX idx_search_name_name_vector ON search_name USING GIN (name_vector) WITH (fastupdate = off);
 -CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
 +CREATE INDEX idx_search_name_nameaddress_vector ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off) TABLESPACE ssd;
 +CREATE INDEX idx_search_name_name_vector ON search_name USING GIN (name_vector) WITH (fastupdate = off) TABLESPACE ssd;
 +CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid) TABLESPACE ssd;
  
 -CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
 +CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
 -CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
 +CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id) TABLESPACE ssd;
 +CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline) TABLESPACE ssd;
  
  DROP INDEX IF EXISTS idx_placex_rank_search;
 -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_pendingsector ON placex USING BTREE (rank_search,geometry_sector) where indexed_status > 0;
 -CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
 -CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 and class='place' and type='houses';
 -CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id);
 +CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search) TABLESPACE ssd;
 +CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) TABLESPACE ssd;
 +CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) TABLESPACE ssd where indexed_status > 0;
 +CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) TABLESPACE ssd where parent_place_id IS NOT NULL;
 +CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd where indexed_status > 0 and class='place' and type='houses';
 +CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid);
 +CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) TABLESPACE ssd;
- CREATE INDEX idx_search_name_country_nameaddress_vector ON search_name_country USING GIN (nameaddress_vector) WITH (fastupdate = off) TABLESPACE ssd;
  
  -- start
 -CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid);
 +CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid) TABLESPACE ssd;
  -- end
  
  CREATE UNIQUE INDEX idx_place_osm_unique on place using btree(osm_id,osm_type,class,type);

diff --cc sql/partition-tables.src.sql
index 13b23d9fc1e7b27cc7b60300c93c274910aa6a0b,29e3d28235d1be5b42af21db4d3b1585e3907458..e0b1fae0eb47cfff13c0041c9e7b8070cb32d610
--- 1/sql/partition-tables.src.sql
--- 2/sql/partition-tables.src.sql
+++ b/sql/partition-tables.src.sql
@@@ -24,12 -24,22 +24,22 @@@ create type nearfeaturecentr as 
    centroid GEOMETRY
  );
  
+ drop table IF EXISTS search_name_blank CASCADE;
+ CREATE TABLE search_name_blank (
+   place_id BIGINT,
+   search_rank integer,
+   address_rank integer,
+   name_vector integer[]
+   );
+ SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
+ 
+ 
  CREATE TABLE location_area_country () INHERITS (location_area_large);
 -CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry);
 +CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry) TABLESPACE ssd;
  
  CREATE TABLE search_name_country () INHERITS (search_name_blank);
 -CREATE INDEX idx_search_name_country_place_id ON search_name_country USING BTREE (place_id);
 -CREATE INDEX idx_search_name_country_name_vector ON search_name_country USING GIN (name_vector) WITH (fastupdate = off);
 +CREATE INDEX idx_search_name_country_place_id ON search_name_country USING BTREE (place_id) TABLESPACE ssd;
 +CREATE INDEX idx_search_name_country_name_vector ON search_name_country USING GIN (name_vector) WITH (fastupdate = off) TABLESPACE ssd;
  
  -- start
  CREATE TABLE location_area_large_-partition- () INHERITS (location_area_large);

diff --cc sql/tables.sql
index b5b59c16c1a54f1abfdf4f63ede6377b7e6999a0,3bb41e28f7cf1415be242f223e4d475a60f0a799..244f2036ea3f355894bf07967351a462624031aa
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -62,10 -76,8 +61,8 @@@ CREATE TABLE word 
    country_code varchar(2),
    search_name_count INTEGER,
    operator TEXT
 -  );
 -CREATE INDEX idx_word_word_token on word USING BTREE (word_token);
 +  ) TABLESPACE ssd;
- SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);
 +CREATE INDEX idx_word_word_token on word USING BTREE (word_token) TABLESPACE ssd;
- --CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops) WITH (fastupdate = off);
  GRANT SELECT ON word TO "www-data" ;
  DROP SEQUENCE seq_word;
  CREATE SEQUENCE seq_word start 1;
@@@ -119,11 -131,8 +116,8 @@@ CREATE TABLE search_name 
    name_vector integer[],
    nameaddress_vector integer[]
    );
- SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
- 
- drop table IF EXISTS search_name;
- CREATE TABLE search_name () INHERITS (search_name_blank) TABLESPACE ssd;
+ SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
 -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) TABLESPACE ssd;
  
  drop table IF EXISTS place_addressline;
  CREATE TABLE place_addressline (

diff --cc website/search.php
Simple merge