Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/partition-functions.src.sql
	sql/partition-tables.src.sql

diff --cc sql/partition-tables.src.sql
index 0000000000000000000000000000000000000000,554c3b04fdfabda39447b31292456e9d3627398e..13b23d9fc1e7b27cc7b60300c93c274910aa6a0b
mode 000000,100644..100644
--- /dev/null
--- 2/sql/partition-tables.src.sql
+++ b/sql/partition-tables.src.sql
@@@ -1,0 -1,58 +1,58 @@@
 -CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry);
+ drop type nearplace cascade;
+ create type nearplace as (
+   place_id BIGINT
+ );
+ 
+ drop type nearfeature cascade;
+ create type nearfeature as (
+   place_id BIGINT,
+   keywords int[],
+   rank_address integer,
+   rank_search integer,
+   distance float,
+   isguess boolean
+ );
+ 
+ drop type nearfeaturecentr cascade;
+ create type nearfeaturecentr as (
+   place_id BIGINT,
+   keywords int[],
+   rank_address integer,
+   rank_search integer,
+   distance float,
+   isguess boolean,
+   centroid GEOMETRY
+ );
+ 
+ CREATE TABLE location_area_country () INHERITS (location_area_large);
 -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_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_location_area_large_-partition-_place_id ON location_area_large_-partition- USING BTREE (place_id);
 -CREATE INDEX idx_location_area_large_-partition-_geometry ON location_area_large_-partition- USING GIST (geometry);
++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);
 -CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USING BTREE (place_id);
 -CREATE INDEX idx_search_name_-partition-_centroid ON search_name_-partition- USING GIST (centroid);
 -CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition- USING GIN (name_vector) WITH (fastupdate = off);
++CREATE INDEX idx_location_area_large_-partition-_place_id ON location_area_large_-partition- USING BTREE (place_id) TABLESPACE ssd;
++CREATE INDEX idx_location_area_large_-partition-_geometry ON location_area_large_-partition- USING GIST (geometry) TABLESPACE ssd;
+ 
+ CREATE TABLE search_name_-partition- () INHERITS (search_name_blank);
 -CREATE INDEX idx_location_road_-partition-_geometry ON location_road_-partition- USING GIST (geometry);
 -CREATE INDEX idx_location_road_-partition-_place_id ON location_road_-partition- USING BTREE (place_id);
++CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USING BTREE (place_id) TABLESPACE ssd;
++CREATE INDEX idx_search_name_-partition-_centroid ON search_name_-partition- USING GIST (centroid) TABLESPACE ssd;
++CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition- USING GIN (name_vector) WITH (fastupdate = off) TABLESPACE ssd;
+ 
+ CREATE TABLE location_property_-partition- () INHERITS (location_property);
+ CREATE INDEX idx_location_property_-partition-_place_id ON location_property_-partition- USING BTREE (place_id);
+ CREATE INDEX idx_location_property_-partition-_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id);
+ CREATE INDEX idx_location_property_-partition-_housenumber_parent_place_id ON location_property_-partition- USING BTREE (parent_place_id, housenumber);
+ 
+ CREATE TABLE location_road_-partition- (
+   partition integer,
+   place_id BIGINT,
+   country_code VARCHAR(2)
+   );
+ SELECT AddGeometryColumn('location_road_-partition-', 'geometry', 4326, 'GEOMETRY', 2);
++CREATE INDEX idx_location_road_-partition-_geometry ON location_road_-partition- USING GIST (geometry) TABLESPACE ssd;
++CREATE INDEX idx_location_road_-partition-_place_id ON location_road_-partition- USING BTREE (place_id) TABLESPACE ssd;
+ 
+ -- end

diff --cc utils/setup.php
Simple merge