Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/tables.sql
	utils/setup.php
	website/search.php

diff --cc settings/settings.php
Simple merge

diff --cc sql/tables.sql
index a0ad66a8353d814754d5cd6e576c976865f8b7c1,212d78c60752718ea1caf84926ec28ff0a9a4c7c..b5b59c16c1a54f1abfdf4f63ede6377b7e6999a0
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -234,18 -249,8 +234,8 @@@ CREATE TRIGGER place_before_delete BEFO
  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;
- 
- 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) TABLESPACE ssd
-   where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
- CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd 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);
 +CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id) TABLESPACE ssd;
  
  DROP SEQUENCE seq_postcodes;
  CREATE SEQUENCE seq_postcodes start 1;
@@@ -263,7 -268,8 +253,8 @@@ CREATE TABLE import_polygon_error 
    );
  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);
 +CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id) TABLESPACE ssd;
+ GRANT SELECT ON import_polygon_error TO "www-data";
  
  drop table import_polygon_delete;
  CREATE TABLE import_polygon_delete (
@@@ -272,7 -278,8 +263,8 @@@
    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);
 +CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id) TABLESPACE ssd;
+ GRANT SELECT ON import_polygon_delete TO "www-data";
  
  drop sequence file;
  CREATE SEQUENCE file start 1;

diff --cc utils/setup.php
Simple merge

diff --cc website/search.php
Simple merge