]> git.openstreetmap.org Git - nominatim.git/blobdiff - lib/Geocode.php
projects / nominatim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #874 from lonvia/check-for-updates
[nominatim.git] / lib / Geocode.php
diff --git a/lib/Geocode.php b/lib/Geocode.php
index 09c1ccb4589742e29a4252a88f4151230c26820e..7566d18b8f45e5ca613468cc71a508536c260aa7 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -12,21 +12,13 @@ class Geocode
 {
     protected $oDB;
 
 {
     protected $oDB;
 
+    protected $oPlaceLookup;
+
     protected $aLangPrefOrder = array();
 
     protected $bIncludeAddressDetails = false;
     protected $aLangPrefOrder = array();
 
     protected $bIncludeAddressDetails = false;
-    protected $bIncludeExtraTags = false;
-    protected $bIncludeNameDetails = false;
-
-    protected $bIncludePolygonAsPoints = false;
-    protected $bIncludePolygonAsText = false;
-    protected $bIncludePolygonAsGeoJSON = false;
-    protected $bIncludePolygonAsKML = false;
-    protected $bIncludePolygonAsSVG = false;
-    protected $fPolygonSimplificationThreshold = 0.0;
 
     protected $aExcludePlaceIDs = array();
 
     protected $aExcludePlaceIDs = array();
-    protected $bDeDupe = true;
     protected $bReverseInPlan = false;
 
     protected $iLimit = 20;
     protected $bReverseInPlan = false;
 
     protected $iLimit = 20;
@@ -57,6 +49,7 @@ class Geocode
     public function __construct(&$oDB)
     {
         $this->oDB =& $oDB;
     public function __construct(&$oDB)
     {
         $this->oDB =& $oDB;
+        $this->oPlaceLookup = new PlaceLookup($this->oDB);
         $this->oNormalizer = \Transliterator::createFromRules(CONST_Term_Normalization_Rules);
     }
 
         $this->oNormalizer = \Transliterator::createFromRules(CONST_Term_Normalization_Rules);
     }
 
@@ -87,69 +80,26 @@ class Geocode
             $aParams = array('q' => $this->sQuery);
         }
 
             $aParams = array('q' => $this->sQuery);
         }
 
+        $aParams = array_merge($aParams, $this->oPlaceLookup->getMoreUrlParams());
+
         if ($this->aExcludePlaceIDs) {
             $aParams['exclude_place_ids'] = implode(',', $this->aExcludePlaceIDs);
         }
 
         if ($this->bIncludeAddressDetails) $aParams['addressdetails'] = '1';
         if ($this->aExcludePlaceIDs) {
             $aParams['exclude_place_ids'] = implode(',', $this->aExcludePlaceIDs);
         }
 
         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->bBoundedSearch) $aParams['bounded'] = '1';
-        if (!$this->bDeDupe) $aParams['dedupe'] = '0';
 
         if ($this->aCountryCodes) {
             $aParams['countrycodes'] = implode(',', $this->aCountryCodes);
         }
 
         if ($this->aViewBox) {
 
         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];
+            $aParams['viewbox'] = join(',', $this->aViewBox);
         }
 
         return $aParams;
     }
 
         }
 
         return $aParams;
     }
 
-    public function setIncludePolygonAsPoints($b = true)
-    {
-        $this->bIncludePolygonAsPoints = $b;
-    }
-
-    public function setIncludePolygonAsText($b = true)
-    {
-        $this->bIncludePolygonAsText = $b;
-    }
-
-    public function setIncludePolygonAsGeoJSON($b = true)
-    {
-        $this->bIncludePolygonAsGeoJSON = $b;
-    }
-
-    public function setIncludePolygonAsKML($b = true)
-    {
-        $this->bIncludePolygonAsKML = $b;
-    }
-
-    public function setIncludePolygonAsSVG($b = true)
-    {
-        $this->bIncludePolygonAsSVG = $b;
-    }
-
-    public function setPolygonSimplificationThreshold($f)
-    {
-        $this->fPolygonSimplificationThreshold = $f;
-    }
-
     public function setLimit($iLimit = 10)
     {
         if ($iLimit > 50) $iLimit = 50;
     public function setLimit($iLimit = 10)
     {
         if ($iLimit > 50) $iLimit = 50;
@@ -185,20 +135,39 @@ class Geocode
 
     public function setViewbox($aViewbox)
     {
 
     public function setViewbox($aViewbox)
     {
-        $this->aViewBox = array_map('floatval', $aViewbox);
+        $aBox = array_map('floatval', $aViewbox);
 
 
-        $this->aViewBox[0] = max(-180.0, min(180, $this->aViewBox[0]));
-        $this->aViewBox[1] = max(-90.0, min(90, $this->aViewBox[1]));
-        $this->aViewBox[2] = max(-180.0, min(180, $this->aViewBox[2]));
-        $this->aViewBox[3] = max(-90.0, min(90, $this->aViewBox[3]));
+        $this->aViewBox[0] = max(-180.0, min($aBox[0], $aBox[2]));
+        $this->aViewBox[1] = max(-90.0, min($aBox[1], $aBox[3]));
+        $this->aViewBox[2] = min(180.0, max($aBox[0], $aBox[2]));
+        $this->aViewBox[3] = min(90.0, max($aBox[1], $aBox[3]));
 
 
-        if (abs($this->aViewBox[0] - $this->aViewBox[2]) < 0.000000001
-            || abs($this->aViewBox[1] - $this->aViewBox[3]) < 0.000000001
+        if ($this->aViewBox[2] - $this->aViewBox[0] < 0.000000001
+            || $this->aViewBox[3] - $this->aViewBox[1] < 0.000000001
         ) {
             userError("Bad parameter 'viewbox'. Not a box.");
         }
     }
 
         ) {
             userError("Bad parameter 'viewbox'. Not a box.");
         }
     }
 
+    private function viewboxImportanceFactor($fX, $fY)
+    {
+        $fWidth = ($this->aViewBox[2] - $this->aViewBox[0])/2;
+        $fHeight = ($this->aViewBox[3] - $this->aViewBox[1])/2;
+
+        $fXDist = abs($fX - ($this->aViewBox[0] + $this->aViewBox[2])/2);
+        $fYDist = abs($fY - ($this->aViewBox[1] + $this->aViewBox[3])/2);
+
+        if ($fXDist <= $fWidth && $fYDist <= $fHeight) {
+            return 1;
+        }
+
+        if ($fXDist <= $fWidth * 3 && $fYDist <= 3 * $fHeight) {
+            return 0.5;
+        }
+
+        return 0.25;
+    }
+
     public function setQuery($sQueryString)
     {
         $this->sQuery = $sQueryString;
     public function setQuery($sQueryString)
     {
         $this->sQuery = $sQueryString;
@@ -211,17 +180,12 @@ class Geocode
     }
 
 
     }
 
 
-    public function loadParamArray($oParams)
+    public function loadParamArray($oParams, $sForceGeometryType = null)
     {
         $this->bIncludeAddressDetails
          = $oParams->getBool('addressdetails', $this->bIncludeAddressDetails);
     {
         $this->bIncludeAddressDetails
          = $oParams->getBool('addressdetails', $this->bIncludeAddressDetails);
-        $this->bIncludeExtraTags
-         = $oParams->getBool('extratags', $this->bIncludeExtraTags);
-        $this->bIncludeNameDetails
-         = $oParams->getBool('namedetails', $this->bIncludeNameDetails);
 
         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
 
         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
-        $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);
 
         $this->setLimit($oParams->getInt('limit', $this->iFinalLimit));
         $this->iOffset = $oParams->getInt('offset', $this->iOffset);
 
         $this->setLimit($oParams->getInt('limit', $this->iFinalLimit));
         $this->iOffset = $oParams->getInt('offset', $this->iOffset);
@@ -280,6 +244,10 @@ class Geocode
                 }
             }
         }
                 }
             }
         }
+
+        $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType);
+        $this->oPlaceLookup->setIncludeAddressDetails(false);
+        $this->oPlaceLookup->setIncludePolygonAsPoints($oParams->getBool('polygon'));
     }
 
     public function setQueryFromParams($oParams)
     }
 
     public function setQueryFromParams($oParams)
@@ -364,332 +332,6 @@ class Geocode
         return false;
     }
 
         return false;
     }
 
-    public function getDetails($aResults, $oCtx)
-    {
-        // Get the details for display (is this a redundant extra step?)
-        //$aResults is an array of Result objects
-        if (sizeof($aResults) == 0) return array();
-
-        $sLanguagePrefArraySQL = getArraySQL(
-            array_map("getDBQuoted", $this->aLangPrefOrder)
-        );
-
-        $sImportanceSQL = $oCtx->viewboxImportanceSQL('ST_Collect(centroid)');
-        $sImportanceSQLGeom = $oCtx->viewboxImportanceSQL('geometry');
-
-        $aSubSelects = array();
-
-        $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
-        if ($sPlaceIDs) {
-            $sSQL  = "SELECT ";
-            $sSQL .= "    osm_type,";
-            $sSQL .= "    osm_id,";
-            $sSQL .= "    class,";
-            $sSQL .= "    type,";
-            $sSQL .= "    admin_level,";
-            $sSQL .= "    rank_search,";
-            $sSQL .= "    rank_address,";
-            $sSQL .= "    min(place_id) AS place_id, ";
-            $sSQL .= "    min(parent_place_id) AS parent_place_id, ";
-            $sSQL .= "    country_code, ";
-            $sSQL .= "    get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
-            $sSQL .= "    get_name_by_language(name, $sLanguagePrefArraySQL) AS placename,";
-            $sSQL .= "    get_name_by_language(name, ARRAY['ref']) AS ref,";
-            if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
-            if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text AS names,";
-            $sSQL .= "    avg(ST_X(centroid)) AS lon, ";
-            $sSQL .= "    avg(ST_Y(centroid)) AS lat, ";
-            $sSQL .= "    COALESCE(importance,0.75-(rank_search::float/40)) $sImportanceSQL AS importance, ";
-            if ($oCtx->hasNearPoint()) {
-                $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
-            } else {
-                $sSQL .= "    ( ";
-                $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
-                $sSQL .= "       FROM ";
-                $sSQL .= "         place_addressline s, ";
-                $sSQL .= "         placex p";
-                $sSQL .= "       WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
-                $sSQL .= "         AND p.place_id = s.address_place_id ";
-                $sSQL .= "         AND s.isaddress ";
-                $sSQL .= "         AND p.importance is not null ";
-                $sSQL .= "    ) AS addressimportance, ";
-            }
-            $sSQL .= "    (extratags->'place') AS extra_place ";
-            $sSQL .= " FROM placex";
-            $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-            $sSQL .= "   AND (";
-            $sSQL .= "            placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
-            if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
-                $sSQL .= "        OR (extratags->'place') = 'city'";
-            }
-            if ($this->aAddressRankList) {
-                $sSQL .= "        OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
-            }
-            $sSQL .= "       ) ";
-            if ($this->sAllowedTypesSQLList) {
-                $sSQL .= "AND placex.class in $this->sAllowedTypesSQLList ";
-            }
-            $sSQL .= "    AND linked_place_id is null ";
-            $sSQL .= " GROUP BY ";
-            $sSQL .= "     osm_type, ";
-            $sSQL .= "     osm_id, ";
-            $sSQL .= "     class, ";
-            $sSQL .= "     type, ";
-            $sSQL .= "     admin_level, ";
-            $sSQL .= "     rank_search, ";
-            $sSQL .= "     rank_address, ";
-            $sSQL .= "     country_code, ";
-            $sSQL .= "     importance, ";
-            if (!$this->bDeDupe) $sSQL .= "place_id,";
-            $sSQL .= "     langaddress, ";
-            $sSQL .= "     placename, ";
-            $sSQL .= "     ref, ";
-            if ($this->bIncludeExtraTags) $sSQL .= "extratags, ";
-            if ($this->bIncludeNameDetails) $sSQL .= "name, ";
-            $sSQL .= "     extratags->'place' ";
-
-            $aSubSelects[] = $sSQL;
-        }
-
-        // postcode table
-        $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
-        if ($sPlaceIDs) {
-            $sSQL = 'SELECT';
-            $sSQL .= "  'P' as osm_type,";
-            $sSQL .= "  (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,";
-            $sSQL .= "  'place' as class, 'postcode' as type,";
-            $sSQL .= "  null as admin_level, rank_search, rank_address,";
-            $sSQL .= "  place_id, parent_place_id, country_code,";
-            $sSQL .= "  get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
-            $sSQL .= "  postcode as placename,";
-            $sSQL .= "  postcode as ref,";
-            if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
-            if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
-            $sSQL .= "  ST_x(st_centroid(geometry)) AS lon, ST_y(st_centroid(geometry)) AS lat,";
-            $sSQL .= "  (0.75-(rank_search::float/40)) $sImportanceSQLGeom AS importance, ";
-            if ($oCtx->hasNearPoint()) {
-                $sSQL .= $oCtx->distanceSQL('geometry')." AS addressimportance,";
-            } else {
-                $sSQL .= "  (";
-                $sSQL .= "     SELECT max(p.importance*(p.rank_address+2))";
-                $sSQL .= "     FROM ";
-                $sSQL .= "       place_addressline s, ";
-                $sSQL .= "       placex p";
-                $sSQL .= "     WHERE s.place_id = lp.parent_place_id";
-                $sSQL .= "       AND p.place_id = s.address_place_id ";
-                $sSQL .= "       AND s.isaddress";
-                $sSQL .= "       AND p.importance is not null";
-                $sSQL .= "  ) AS addressimportance, ";
-            }
-            $sSQL .= "  null AS extra_place ";
-            $sSQL .= "FROM location_postcode lp";
-            $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-
-            $aSubSelects[] = $sSQL;
-        }
-
-        // All other tables are rank 30 only.
-        if ($this->iMaxAddressRank == 30) {
-            // TIGER table
-            if (CONST_Use_US_Tiger_Data) {
-                $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER);
-                if ($sPlaceIDs) {
-                    $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER);
-                    // Tiger search only if a housenumber was searched and if it was found
-                    // (realized through a join)
-                    $sSQL = " SELECT ";
-                    $sSQL .= "     'T' AS osm_type, ";
-                    $sSQL .= "     (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";
-                    $sSQL .= "     'place' AS class, ";
-                    $sSQL .= "     'house' AS type, ";
-                    $sSQL .= "     null AS admin_level, ";
-                    $sSQL .= "     30 AS rank_search, ";
-                    $sSQL .= "     30 AS rank_address, ";
-                    $sSQL .= "     min(place_id) AS place_id, ";
-                    $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
-                    $sSQL .= "     'us' AS country_code, ";
-                    $sSQL .= "     get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
-                    $sSQL .= "     null AS placename, ";
-                    $sSQL .= "     null AS ref, ";
-                    if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
-                    if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
-                    $sSQL .= "     avg(st_x(centroid)) AS lon, ";
-                    $sSQL .= "     avg(st_y(centroid)) AS lat,";
-                    $sSQL .= "     -1.15".$sImportanceSQL." AS importance, ";
-                    if ($oCtx->hasNearPoint()) {
-                        $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
-                    } else {
-                        $sSQL .= "     (";
-                        $sSQL .= "        SELECT max(p.importance*(p.rank_address+2))";
-                        $sSQL .= "        FROM ";
-                        $sSQL .= "          place_addressline s, ";
-                        $sSQL .= "          placex p";
-                        $sSQL .= "        WHERE s.place_id = min(blub.parent_place_id)";
-                        $sSQL .= "          AND p.place_id = s.address_place_id ";
-                        $sSQL .= "          AND s.isaddress";
-                        $sSQL .= "          AND p.importance is not null";
-                        $sSQL .= "     ) AS addressimportance, ";
-                    }
-                    $sSQL .= "     null AS extra_place ";
-                    $sSQL .= " FROM (";
-                    $sSQL .= "     SELECT place_id, ";    // interpolate the Tiger housenumbers here
-                    $sSQL .= "         ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) AS centroid, ";
-                    $sSQL .= "         parent_place_id, ";
-                    $sSQL .= "         housenumber_for_place";
-                    $sSQL .= "     FROM (";
-                    $sSQL .= "            location_property_tiger ";
-                    $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)) ";
-                    $sSQL .= "     WHERE ";
-                    $sSQL .= "         housenumber_for_place >= startnumber";
-                    $sSQL .= "         AND housenumber_for_place <= endnumber";
-                    $sSQL .= " ) AS blub"; //postgres wants an alias here
-                    $sSQL .= " GROUP BY";
-                    $sSQL .= "      place_id, ";
-                    $sSQL .= "      housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
-                    if (!$this->bDeDupe) $sSQL .= ", place_id ";
-
-                    $aSubSelects[] = $sSQL;
-                }
-            }
-
-            // osmline - interpolated housenumbers
-            $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE);
-            if ($sPlaceIDs) {
-                $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_OSMLINE);
-                // interpolation line search only if a housenumber was searched
-                // (realized through a join)
-                $sSQL = "SELECT ";
-                $sSQL .= "  'W' AS osm_type, ";
-                $sSQL .= "  osm_id, ";
-                $sSQL .= "  'place' AS class, ";
-                $sSQL .= "  'house' AS type, ";
-                $sSQL .= "  null AS admin_level, ";
-                $sSQL .= "  30 AS rank_search, ";
-                $sSQL .= "  30 AS rank_address, ";
-                $sSQL .= "  min(place_id) as place_id, ";
-                $sSQL .= "  min(parent_place_id) AS parent_place_id, ";
-                $sSQL .= "  country_code, ";
-                $sSQL .= "  get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
-                $sSQL .= "  null AS placename, ";
-                $sSQL .= "  null AS ref, ";
-                if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
-                if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
-                $sSQL .= "  AVG(st_x(centroid)) AS lon, ";
-                $sSQL .= "  AVG(st_y(centroid)) AS lat, ";
-                $sSQL .= "  -0.1".$sImportanceSQL." AS importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
-                if ($oCtx->hasNearPoint()) {
-                    $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
-                } else {
-                    $sSQL .= "  (";
-                    $sSQL .= "     SELECT ";
-                    $sSQL .= "       MAX(p.importance*(p.rank_address+2)) ";
-                    $sSQL .= "     FROM";
-                    $sSQL .= "       place_addressline s, ";
-                    $sSQL .= "       placex p";
-                    $sSQL .= "     WHERE s.place_id = min(blub.parent_place_id) ";
-                    $sSQL .= "       AND p.place_id = s.address_place_id ";
-                    $sSQL .= "       AND s.isaddress ";
-                    $sSQL .= "       AND p.importance is not null";
-                    $sSQL .= "  ) AS addressimportance,";
-                }
-                $sSQL .= "  null AS extra_place ";
-                $sSQL .= "  FROM (";
-                $sSQL .= "     SELECT ";
-                $sSQL .= "         osm_id, ";
-                $sSQL .= "         place_id, ";
-                $sSQL .= "         country_code, ";
-                $sSQL .= "         CASE ";             // interpolate the housenumbers here
-                $sSQL .= "           WHEN startnumber != endnumber ";
-                $sSQL .= "           THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
-                $sSQL .= "           ELSE ST_LineInterpolatePoint(linegeo, 0.5) ";
-                $sSQL .= "         END as centroid, ";
-                $sSQL .= "         parent_place_id, ";
-                $sSQL .= "         housenumber_for_place ";
-                $sSQL .= "     FROM (";
-                $sSQL .= "            location_property_osmline ";
-                $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)";
-                $sSQL .= "          ) ";
-                $sSQL .= "     WHERE housenumber_for_place>=0 ";
-                $sSQL .= "       AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
-                $sSQL .= "  ) as blub"; //postgres wants an alias here
-                $sSQL .= "  GROUP BY ";
-                $sSQL .= "    osm_id, ";
-                $sSQL .= "    place_id, ";
-                $sSQL .= "    housenumber_for_place, ";
-                $sSQL .= "    country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
-                if (!$this->bDeDupe) $sSQL .= ", place_id ";
-
-                $aSubSelects[] = $sSQL;
-            }
-
-            if (CONST_Use_Aux_Location_data) {
-                $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_AUX);
-                if ($sPlaceIDs) {
-                    $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_AUX);
-                    $sSQL = "  SELECT ";
-                    $sSQL .= "     'L' AS osm_type, ";
-                    $sSQL .= "     place_id AS osm_id, ";
-                    $sSQL .= "     'place' AS class,";
-                    $sSQL .= "     'house' AS type, ";
-                    $sSQL .= "     null AS admin_level, ";
-                    $sSQL .= "     0 AS rank_search,";
-                    $sSQL .= "     0 AS rank_address, ";
-                    $sSQL .= "     min(place_id) AS place_id,";
-                    $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
-                    $sSQL .= "     'us' AS country_code, ";
-                    $sSQL .= "     get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, ";
-                    $sSQL .= "     null AS placename, ";
-                    $sSQL .= "     null AS ref, ";
-                    if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
-                    if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
-                    $sSQL .= "     avg(ST_X(centroid)) AS lon, ";
-                    $sSQL .= "     avg(ST_Y(centroid)) AS lat, ";
-                    $sSQL .= "     -1.10".$sImportanceSQL." AS importance, ";
-                    if ($oCtx->hasNearPoint()) {
-                        $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
-                    } else {
-                        $sSQL .= "     ( ";
-                        $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
-                        $sSQL .= "       FROM ";
-                        $sSQL .= "          place_addressline s, ";
-                        $sSQL .= "          placex p";
-                        $sSQL .= "       WHERE s.place_id = min(location_property_aux.parent_place_id)";
-                        $sSQL .= "         AND p.place_id = s.address_place_id ";
-                        $sSQL .= "         AND s.isaddress";
-                        $sSQL .= "         AND p.importance is not null";
-                        $sSQL .= "     ) AS addressimportance, ";
-                    }
-                    $sSQL .= "     null AS extra_place ";
-                    $sSQL .= "  FROM location_property_aux ";
-                    $sSQL .= "  WHERE place_id in ($sPlaceIDs) ";
-                    $sSQL .= "    AND 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                    $sSQL .= "  GROUP BY ";
-                    $sSQL .= "     place_id, ";
-                    if (!$this->bDeDupe) $sSQL .= "place_id, ";
-                    $sSQL .= "     langaddress ";
-
-                    $aSubSelects[] = $sSQL;
-                }
-            }
-        }
-
-        if (!sizeof($aSubSelects)) {
-            return array();
-        }
-
-        $sSQL = join(' UNION ', $aSubSelects)." order by importance desc";
-        if (CONST_Debug) {
-            echo "<hr>";
-            var_dump($sSQL);
-        }
-        $aSearchResults = chksql(
-            $this->oDB->getAll($sSQL),
-            "Could not get details for place."
-        );
-
-        return $aSearchResults;
-    }
-
     public function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $bIsStructured)
     {
         /*
     public function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $bIsStructured)
     {
         /*
@@ -703,8 +345,6 @@ class Geocode
 
              Score how good the search is so they can be ordered
          */
 
              Score how good the search is so they can be ordered
          */
-        $iGlobalRank = 0;
-
         foreach ($aPhrases as $iPhrase => $oPhrase) {
             $aNewPhraseSearches = array();
             $sPhraseType = $bIsStructured ? $oPhrase->getPhraseType() : '';
         foreach ($aPhrases as $iPhrase => $oPhrase) {
             $aNewPhraseSearches = array();
             $sPhraseType = $bIsStructured ? $oPhrase->getPhraseType() : '';
@@ -736,8 +376,7 @@ class Geocode
                                     $iToken == 0 && $iPhrase == 0,
                                     $iPhrase == 0,
                                     $iToken + 1 == sizeof($aWordset)
                                     $iToken == 0 && $iPhrase == 0,
                                     $iPhrase == 0,
                                     $iToken + 1 == sizeof($aWordset)
-                                      && $iPhrase + 1 == sizeof($aPhrases),
-                                    $iGlobalRank
+                                      && $iPhrase + 1 == sizeof($aPhrases)
                                 );
 
                                 foreach ($aNewSearches as $oSearch) {
                                 );
 
                                 foreach ($aNewSearches as $oSearch) {
@@ -818,7 +457,7 @@ class Geocode
                 continue;
             }
 
                 continue;
             }
 
-            $iRank = $oSearch->addToRank($iGlobalRank);
+            $iRank = $oSearch->getRank();
             if (!isset($aGroupedSearches[$iRank])) {
                 $aGroupedSearches[$iRank] = array();
             }
             if (!isset($aGroupedSearches[$iRank])) {
                 $aGroupedSearches[$iRank] = array();
             }
@@ -886,12 +525,12 @@ class Geocode
 
         $sNormQuery = $this->normTerm($this->sQuery);
         $sLanguagePrefArraySQL = getArraySQL(
 
         $sNormQuery = $this->normTerm($this->sQuery);
         $sLanguagePrefArraySQL = getArraySQL(
-            array_map("getDBQuoted", $this->aLangPrefOrder)
+            array_map('getDBQuoted', $this->aLangPrefOrder)
         );
 
         $sQuery = $this->sQuery;
         if (!preg_match('//u', $sQuery)) {
         );
 
         $sQuery = $this->sQuery;
         if (!preg_match('//u', $sQuery)) {
-            userError("Query string is not UTF-8 encoded.");
+            userError('Query string is not UTF-8 encoded.');
         }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
@@ -904,7 +543,7 @@ class Geocode
         // Do we have anything that looks like a lat/lon pair?
         $sQuery = $oCtx->setNearPointFromQuery($sQuery);
 
         // Do we have anything that looks like a lat/lon pair?
         $sQuery = $oCtx->setNearPointFromQuery($sQuery);
 
-        $aSearchResults = array();
+        $aResults = array();
         if ($sQuery || $this->aStructuredQuery) {
             // Start with a single blank search
             $aSearches = array(new SearchDescription($oCtx));
         if ($sQuery || $this->aStructuredQuery) {
             // Start with a single blank search
             $aSearches = array(new SearchDescription($oCtx));
@@ -938,7 +577,7 @@ class Geocode
                 $sSpecialTerm = pg_escape_string($sSpecialTerm);
                 $sToken = chksql(
                     $this->oDB->getOne("SELECT make_standard_name('$sSpecialTerm')"),
                 $sSpecialTerm = pg_escape_string($sSpecialTerm);
                 $sToken = chksql(
                     $this->oDB->getOne("SELECT make_standard_name('$sSpecialTerm')"),
-                    "Cannot decode query. Wrong encoding?"
+                    'Cannot decode query. Wrong encoding?'
                 );
                 $sSQL = 'SELECT class, type FROM word ';
                 $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';
                 );
                 $sSQL = 'SELECT class, type FROM word ';
                 $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';
@@ -979,7 +618,7 @@ class Geocode
             foreach ($aInPhrases as $iPhrase => $sPhrase) {
                 $sPhrase = chksql(
                     $this->oDB->getOne('SELECT make_standard_name('.getDBQuoted($sPhrase).')'),
             foreach ($aInPhrases as $iPhrase => $sPhrase) {
                 $sPhrase = chksql(
                     $this->oDB->getOne('SELECT make_standard_name('.getDBQuoted($sPhrase).')'),
-                    "Cannot normalize query string (is it a UTF-8 string?)"
+                    'Cannot normalize query string (is it a UTF-8 string?)'
                 );
                 if (trim($sPhrase)) {
                     $oPhrase = new Phrase($sPhrase, is_string($iPhrase) ? $iPhrase : '');
                 );
                 if (trim($sPhrase)) {
                     $oPhrase = new Phrase($sPhrase, is_string($iPhrase) ? $iPhrase : '');
@@ -992,14 +631,14 @@ class Geocode
                 // Check which tokens we have, get the ID numbers
                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
                 $sSQL .= ' FROM word ';
                 // Check which tokens we have, get the ID numbers
                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
                 $sSQL .= ' FROM word ';
-                $sSQL .= ' WHERE word_token in ('.join(',', array_map("getDBQuoted", $aTokens)).')';
+                $sSQL .= ' WHERE word_token in ('.join(',', array_map('getDBQuoted', $aTokens)).')';
 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();
                 $aDatabaseWords = chksql(
                     $this->oDB->getAll($sSQL),
 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();
                 $aDatabaseWords = chksql(
                     $this->oDB->getAll($sSQL),
-                    "Could not get word tokens."
+                    'Could not get word tokens.'
                 );
                 $aWordFrequencyScores = array();
                 foreach ($aDatabaseWords as $aToken) {
                 );
                 $aWordFrequencyScores = array();
                 foreach ($aDatabaseWords as $aToken) {
@@ -1109,7 +748,6 @@ class Geocode
             if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
 
             // Start the search process
             if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
 
             // Start the search process
-            $aResults = array();
             $iGroupLoop = 0;
             $iQueryLoop = 0;
             foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
             $iGroupLoop = 0;
             $iQueryLoop = 0;
             foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
@@ -1142,15 +780,15 @@ class Geocode
                     if ($sPlaceIds) {
                         $sSQL = 'SELECT place_id FROM placex ';
                         $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
                     if ($sPlaceIds) {
                         $sSQL = 'SELECT place_id FROM placex ';
                         $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
-                        $sSQL .= "  AND (";
+                        $sSQL .= '  AND (';
                         $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                         if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
                             $sSQL .= "     OR (extratags->'place') = 'city'";
                         }
                         if ($this->aAddressRankList) {
                         $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                         if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
                             $sSQL .= "     OR (extratags->'place') = 'city'";
                         }
                         if ($this->aAddressRankList) {
-                            $sSQL .= "     OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
+                            $sSQL .= '     OR placex.rank_address in ('.join(',', $this->aAddressRankList).')';
                         }
                         }
-                        $sSQL .= ")";
+                        $sSQL .= ')';
                         $aFilterSql[] = $sSQL;
                     }
                     $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
                         $aFilterSql[] = $sSQL;
                     }
                     $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
@@ -1159,9 +797,9 @@ class Geocode
                         $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
                         $sSQL .= "  AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                         if ($this->aAddressRankList) {
                         $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
                         $sSQL .= "  AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                         if ($this->aAddressRankList) {
-                            $sSQL .= "     OR lp.rank_address in (".join(',', $this->aAddressRankList).")";
+                            $sSQL .= '     OR lp.rank_address in ('.join(',', $this->aAddressRankList).')';
                         }
                         }
-                        $sSQL .= ") ";
+                        $sSQL .= ') ';
                         $aFilterSql[] = $sSQL;
                     }
 
                         $aFilterSql[] = $sSQL;
                     }
 
@@ -1190,8 +828,6 @@ class Geocode
                 if ($iGroupLoop > 4) break;
                 if ($iQueryLoop > 30) break;
             }
                 if ($iGroupLoop > 4) break;
                 if ($iQueryLoop > 30) break;
             }
-
-            $aSearchResults = $this->getDetails($aResults, $oCtx);
         } else {
             // Just interpret as a reverse geocode
             $oReverse = new ReverseGeocode($this->oDB);
         } else {
             // Just interpret as a reverse geocode
             $oReverse = new ReverseGeocode($this->oDB);
@@ -1199,18 +835,15 @@ class Geocode
 
             $oLookup = $oReverse->lookupPoint($oCtx->sqlNear, false);
 
 
             $oLookup = $oReverse->lookupPoint($oCtx->sqlNear, false);
 
-            if (CONST_Debug) var_dump("Reverse search", $aLookup);
+            if (CONST_Debug) var_dump('Reverse search', $aLookup);
 
             if ($oLookup) {
                 $aResults = array($oLookup->iId => $oLookup);
 
             if ($oLookup) {
                 $aResults = array($oLookup->iId => $oLookup);
-                $aSearchResults = $this->getDetails($aResults, $oCtx);
-            } else {
-                $aSearchResults = array();
             }
         }
 
         // No results? Done
             }
         }
 
         // No results? Done
-        if (!sizeof($aSearchResults)) {
+        if (!sizeof($aResults)) {
             if ($this->bFallback) {
                 if ($this->fallbackStructuredQuery()) {
                     return $this->lookup();
             if ($this->bFallback) {
                 if ($this->fallbackStructuredQuery()) {
                     return $this->lookup();
@@ -1220,6 +853,17 @@ class Geocode
             return array();
         }
 
             return array();
         }
 
+        if ($this->aAddressRankList) {
+            $this->oPlaceLookup->setAddressRankList($this->aAddressRankList);
+        }
+        $this->oPlaceLookup->setAllowedTypesSQLList($this->sAllowedTypesSQLList);
+        $this->oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
+        if ($oCtx->hasNearPoint()) {
+            $this->oPlaceLookup->setAnchorSql($oCtx->sqlNear);
+        }
+
+        $aSearchResults = $this->oPlaceLookup->lookup($aResults);
+
         $aClassType = getClassTypesWithImportance();
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
         $aClassType = getClassTypesWithImportance();
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
@@ -1231,23 +875,15 @@ class Geocode
             var_dump($aRecheckWords);
         }
 
             var_dump($aRecheckWords);
         }
 
-        $oPlaceLookup = new PlaceLookup($this->oDB);
-        $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
-        $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
-        $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
-        $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
-        $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
-        $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
-
-        foreach ($aSearchResults as $iResNum => $aResult) {
+        foreach ($aSearchResults as $iIdx => $aResult) {
             // Default
             $fDiameter = getResultDiameter($aResult);
 
             // Default
             $fDiameter = getResultDiameter($aResult);
 
-            $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
+            $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
-            
+
             if ($aResult['extra_place'] == 'city') {
                 $aResult['class'] = 'place';
                 $aResult['type'] = 'city';
             if ($aResult['extra_place'] == 'city') {
                 $aResult['class'] = 'place';
                 $aResult['type'] = 'city';
@@ -1279,22 +915,6 @@ class Geocode
                 }
             }
 
                 }
             }
 
-            if ($this->bIncludeExtraTags) {
-                if ($aResult['extra']) {
-                    $aResult['sExtraTags'] = json_decode($aResult['extra']);
-                } else {
-                    $aResult['sExtraTags'] = (object) array();
-                }
-            }
-
-            if ($this->bIncludeNameDetails) {
-                if ($aResult['names']) {
-                    $aResult['sNameDetails'] = json_decode($aResult['names']);
-                } else {
-                    $aResult['sNameDetails'] = (object) array();
-                }
-            }
-
             $aResult['name'] = $aResult['langaddress'];
 
             if ($oCtx->hasNearPoint()) {
             $aResult['name'] = $aResult['langaddress'];
 
             if ($oCtx->hasNearPoint()) {
@@ -1302,13 +922,17 @@ class Geocode
                 $aResult['foundorder'] = $aResult['addressimportance'];
             } else {
                 // Adjust importance for the number of exact string matches in the result
                 $aResult['foundorder'] = $aResult['addressimportance'];
             } else {
                 // Adjust importance for the number of exact string matches in the result
+                $aResult['importance'] *= $this->viewboxImportanceFactor(
+                    $aResult['lon'],
+                    $aResult['lat']
+                );
                 $aResult['importance'] = max(0.001, $aResult['importance']);
                 $iCountWords = 0;
                 $sAddress = $aResult['langaddress'];
                 foreach ($aRecheckWords as $i => $sWord) {
                     if (stripos($sAddress, $sWord)!==false) {
                         $iCountWords++;
                 $aResult['importance'] = max(0.001, $aResult['importance']);
                 $iCountWords = 0;
                 $sAddress = $aResult['langaddress'];
                 foreach ($aRecheckWords as $i => $sWord) {
                     if (stripos($sAddress, $sWord)!==false) {
                         $iCountWords++;
-                        if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
+                        if (preg_match('/(^|,)\s*'.preg_quote($sWord, '/').'\s*(,|$)/', $sAddress)) $iCountWords += 0.1;
                     }
                 }
 
                     }
                 }
 
@@ -1329,7 +953,7 @@ class Geocode
                 }
             }
             if (CONST_Debug) var_dump($aResult);
                 }
             }
             if (CONST_Debug) var_dump($aResult);
-            $aSearchResults[$iResNum] = $aResult;
+            $aSearchResults[$iIdx] = $aResult;
         }
         uasort($aSearchResults, 'byImportance');
 
         }
         uasort($aSearchResults, 'byImportance');
 
@@ -1338,8 +962,10 @@ class Geocode
         $aToFilter = $aSearchResults;
         $aSearchResults = array();
 
         $aToFilter = $aSearchResults;
         $aSearchResults = array();
 
+        if (CONST_Debug) var_dump($aToFilter);
+
         $bFirst = true;
         $bFirst = true;
-        foreach ($aToFilter as $iResNum => $aResult) {
+        foreach ($aToFilter as $aResult) {
             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
             if ($bFirst) {
                 $fLat = $aResult['lat'];
             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
             if ($bFirst) {
                 $fLat = $aResult['lat'];
@@ -1347,7 +973,7 @@ class Geocode
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $bFirst = false;
             }
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $bFirst = false;
             }
-            if (!$this->bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
+            if (!$this->oPlaceLookup->doDeDupe() || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
                 && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
                 && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
@@ -1359,6 +985,7 @@ class Geocode
             if (sizeof($aSearchResults) >= $this->iFinalLimit) break;
         }
 
             if (sizeof($aSearchResults) >= $this->iFinalLimit) break;
         }
 
+        if (CONST_Debug) var_dump($aSearchResults);
         return $aSearchResults;
     } // end lookup()
 } // end class
         return $aSearchResults;
     } // end lookup()
 } // end class
Open Source search based on OpenStreetMap data