Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 8d533cc8ae08bf40a32b4bcadaa4d53fc6c23016,cbbcb9db2d0f040dfa802d8140200753de52c270..9ca95a29b0cdd4fd913dfb53f6de2b5d62248260
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -38,7 -38,7 +38,7 @@@ set(WITH_LUA off CACHE BOOL "Build wit
  if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt")
      message(FATAL_ERROR "The osm2pgsql directory is empty.\
      Did you forget to check out Nominatim recursively?\
-     \nTry updating submodules with: git submodules update --init")
+     \nTry updating submodules with: git submodule update --init")
  endif()
  add_subdirectory(osm2pgsql)
  
@@@ -92,14 -92,6 +92,14 @@@ set(CUSTOMFILE
      website/reverse.php
      website/search.php
      website/status.php
 +    website/403.html
 +    website/509.html
 +    website/crossdomain.xml
 +    website/favicon.ico
 +    website/last_update.php
 +    website/nominatim.xml
 +    website/robots.txt
 +    website/taginfo.json
      utils/blocks.php
      utils/country_languages.php
      utils/imports.php

diff --combined lib/Geocode.php
index 62e7a7cfed120da8735b509740cf78f3339d50be,971eb85dab757a70cc4b59af126ede9df75d51bd..252d08e0ff1969be39a70952282f4c5939164580
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -25,7 -25,7 +25,7 @@@ class Geocod
  
      protected $aExcludePlaceIDs = array();
      protected $bDeDupe = true;
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -67,19 -67,45 +67,45 @@@
          $this->aLangPrefOrder = $aLangPref;
      }
  
-     public function getIncludeAddressDetails()
+     public function getMoreUrlParams()
      {
-         return $this->bIncludeAddressDetails;
-     }
+         if ($this->aStructuredQuery) {
+             $aParams = $this->aStructuredQuery;
+         } else {
+             $aParams = array('q' => $this->sQuery);
+         }
  
-     public function getIncludeExtraTags()
-     {
-         return $this->bIncludeExtraTags;
-     }
+         if ($this->aExcludePlaceIDs) {
+             $aParams['exclude_place_ids'] = implode(',', $this->aExcludePlaceIDs);
+         }
  
-     public function getIncludeNameDetails()
-     {
-         return $this->bIncludeNameDetails;
+         if ($this->bIncludeAddressDetails) $aParams['addressdetails'] = '1';
+         if ($this->bIncludeExtraTags) $aParams['extratags'] = '1';
+         if ($this->bIncludeNameDetails) $aParams['namedetails'] = '1';
+ 
+         if ($this->bIncludePolygonAsPoints) $aParams['polygon'] = '1';
+         if ($this->bIncludePolygonAsText) $aParams['polygon_text'] = '1';
+         if ($this->bIncludePolygonAsGeoJSON) $aParams['polygon_geojson'] = '1';
+         if ($this->bIncludePolygonAsKML) $aParams['polygon_kml'] = '1';
+         if ($this->bIncludePolygonAsSVG) $aParams['polygon_svg'] = '1';
+ 
+         if ($this->fPolygonSimplificationThreshold > 0.0) {
+             $aParams['polygon_threshold'] = $this->fPolygonSimplificationThreshold;
+         }
+ 
+         if ($this->bBoundedSearch) $aParams['bounded'] = '1';
+         if (!$this->bDeDupe) $aParams['dedupe'] = '0';
+ 
+         if ($this->aCountryCodes) {
+             $aParams['countrycodes'] = implode(',', $this->aCountryCodes);
+         }
+ 
+         if ($this->aViewBox) {
+             $aParams['viewbox'] = $this->aViewBox[0].','.$this->aViewBox[3]
+                                   .','.$this->aViewBox[2].','.$this->aViewBox[1];
+         }
+ 
+         return $aParams;
      }
  
      public function setIncludePolygonAsPoints($b = true)
@@@ -121,23 -147,6 +147,6 @@@
          $this->iLimit = $iLimit + min($iLimit, 10);
      }
  
-     public function getExcludedPlaceIDs()
-     {
-         return $this->aExcludePlaceIDs;
-     }
- 
- 
-     public function getCountryCodes()
-     {
-         return $this->aCountryCodes;
-     }
- 
-     public function getViewBoxString()
-     {
-         if (!$this->aViewBox) return null;
-         return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
-     }
- 
      public function setFeatureType($sFeatureType)
      {
          switch ($sFeatureType) {
@@@ -341,7 -350,7 +350,7 @@@
          return true;
      }
  
-     public function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
+     public function setStructuredQuery($sAmenity = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
      {
          $this->sQuery = false;
  
@@@ -353,7 -362,7 +362,7 @@@
          $this->aStructuredQuery = array();
          $this->sAllowedTypesSQLList = '';
  
-         $this->loadStructuredAddressElement($sAmentiy, 'amenity', 26, 30, false);
+         $this->loadStructuredAddressElement($sAmenity, 'amenity', 26, 30, false);
          $this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false);
          $this->loadStructuredAddressElement($sCity, 'city', 14, 24, false);
          $this->loadStructuredAddressElement($sCounty, 'county', 9, 13, false);
@@@ -902,7 -911,7 +911,7 @@@
  
      public function lookup()
      {
-         if (!$this->sQuery && !$this->aStructuredQuery) return false;
+         if (!$this->sQuery && !$this->aStructuredQuery) return array();
  
          $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";
          $sCountryCodesSQL = false;
@@@ -1325,20 -1334,19 +1334,20 @@@
                          // TODO: filter out the pointless search terms (2 letter name tokens and less)
                          // they might be right - but they are just too darned expensive to run
                          if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'], ",")."]";
 -                        if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";
 +                        //if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";
                          if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) {
                              // For infrequent name terms disable index usage for address
                              if (CONST_Search_NameOnlySearchFrequencyThreshold
                                  && sizeof($aSearch['aName']) == 1
                                  && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold
                              ) {
 -                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
 +                                //$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
 +                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddress'],",")."]";
                              } else {
                                  $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";
 -                                if (sizeof($aSearch['aAddressNonSearch'])) {
 +                                /*if (sizeof($aSearch['aAddressNonSearch'])) {
                                      $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'], ",")."]";
 -                                }
 +                                }*/
                              }
                          }
                          if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";

diff --combined sql/functions.sql
index f8ec472a0d6464ad94e64e9a0ae955ad726dbdf0,1db32d1d50973827d24ba9a194d632e45b67ffbf..54b28ce7a88e20239e925dbbaaca16eea7aa03e4
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -1026,7 -1026,7 +1026,7 @@@ BEGI
    select nodes from planet_osm_ways where id = NEW.osm_id INTO waynodes;
  
    IF array_upper(waynodes, 1) IS NULL THEN
-     RETURN 0;
+     RETURN NEW;
    END IF;
  
    linegeo := NEW.linegeo;
@@@ -1681,8 -1681,10 +1681,10 @@@ BEGI
    -- RAISE WARNING '  getNearFeatures(%,''%'',%,''%'')',NEW.partition, place_centroid, search_maxrank, isin_tokens;
    FOR location IN
      SELECT * from getNearFeatures(NEW.partition,
-                                   CASE WHEN NEW.rank_search >= 26 THEN NEW.geometry
-                                   ELSE place_centroid END,
+                                   CASE WHEN NEW.rank_search >= 26
+                                              AND NEW.rank_search < 30
+                                        THEN NEW.geometry
+                                        ELSE place_centroid END,
                                    search_maxrank, isin_tokens)
    LOOP
  
@@@ -2422,7 -2424,7 +2424,7 @@@ BEGI
        CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as name,
        CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
        CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
 -      admin_level, fromarea, isaddress,
 +      admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
        CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
        distance,calculated_country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id)