Merge remote-tracking branch 'upstream/master'

diff --combined settings/settings.php
index e99b6173b91ad75e6d3bd9f2060b77c0fe76c817,1d91b61c1907ca56f1e47af3c47f42e0755a1fa6..694c8352990fe29d859933e7149451ebe5515832
--- 1/settings/settings.php
--- 2/settings/settings.php
+++ b/settings/settings.php
@@@ -18,6 -18,7 +18,7 @@@
        @define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
+       @define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
  
        // osm2pgsql settings
        @define('CONST_Osm2pgsql_Flatnode_File', null);
@@@ -70,15 -71,13 +71,15 @@@
  
        // Website settings
        @define('CONST_NoAccessControl', true);
 -      @define('CONST_ClosedForIndexing', false);
 -      @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
 +      @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
 +      @define('CONST_WhitelistedIPs', '');
 +      @define('CONST_BlockedUserAgents', '');
 +      @define('CONST_BlockReverseMaxLoad', 15);
        @define('CONST_BulkUserIPs', '');
        @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
  
 -      @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 +      @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
  
        @define('CONST_Default_Language', false);

diff --combined sql/functions.sql
index e1ec138a9d54e966094019af11ba376098f630ca,3c8f16e0831a5696d7974f48889183bc79b9fc10..1efb189938fffdbc1d97f95d166b0e101647656a
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -1403,6 -1403,26 +1403,26 @@@ BEGI
          select * from search_name where place_id = NEW.parent_place_id INTO location;
          NEW.calculated_country_code := location.country_code;
  
+         -- Merge the postcode into the parent's address if necessary XXXX
+         IF NEW.postcode IS NOT NULL THEN
+           isin_tokens := '{}'::int[];
+           address_street_word_id := getorcreate_word_id(make_standard_name(NEW.postcode));
+           IF address_street_word_id is not null
+              and not ARRAY[address_street_word_id] <@ location.nameaddress_vector THEN
+              isin_tokens := isin_tokens || address_street_word_id;
+           END IF;
+           address_street_word_id := getorcreate_name_id(make_standard_name(NEW.postcode));
+           IF address_street_word_id is not null
+              and not ARRAY[address_street_word_id] <@ location.nameaddress_vector THEN
+              isin_tokens := isin_tokens || address_street_word_id;
+           END IF;
+           IF isin_tokens != '{}'::int[] THEN
+              UPDATE search_name
+                 SET nameaddress_vector = search_name.nameaddress_vector || isin_tokens
+               WHERE place_id = NEW.parent_place_id;
+           END IF;
+         END IF;
+ 
  --RAISE WARNING '%', NEW.name;
          -- If there is no name it isn't searchable, don't bother to create a search record
          IF NEW.name is NULL THEN
@@@ -2035,12 -2055,6 +2055,12 @@@ BEGI
    END IF;
  
  
 +  -- refuse to update multiplpoygons with too many objects, too much of a performance hit
 +  IF ST_NumGeometries(NEW.geometry) > 2000 THEN
 +    RAISE WARNING 'Dropping update of % % because of geometry complexity.', NEW.osm_type, NEW.osm_id;
 +    RETURN NULL;
 +  END IF;
 +
    IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '')
       OR coalesce(existing.extratags::text, '') != coalesce(NEW.extratags::text, '')
       OR coalesce(existing.housenumber, '') != coalesce(NEW.housenumber, '')
@@@ -2251,7 -2265,6 +2271,6 @@@ BEGI
             housenumber, rank_search, postcode, null
        from placex where place_id = in_place_id
        INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename;
-       RAISE WARNING '% fffff %', in_place_id, for_place_id;
    END IF;
  
  --RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode;

diff --combined utils/setup.php
index 3b04b1617c749b02f6d40a51b0f78cce433035dd,b49813a8ab7f056603e469b8fd8e7fcdfd2c1258..08e3d34150423ff9a3743358d375da7bed94e552
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -199,7 -199,7 +199,7 @@@
                if (CONST_Tablespace_Place_Index)
                        $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -              $osm2pgsql .= ' -C '.$iCacheMemory;
 +              $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
@@@ -484,7 -484,7 +484,7 @@@
                        $aDBInstances[$i] =& getDB(true);
                }
  
-               foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
+               foreach(glob(CONST_Tiger_Data_Path.'/*.sql') as $sFile)
                {
                        echo $sFile.': ';
                        $hFile = fopen($sFile, "r");
@@@ -546,7 -546,7 +546,7 @@@
                $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
                $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
                $sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
 -              $sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
 +              $sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
                if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
  
                $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";