calculate search position based to 'importance' rather than address rank

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index caccd503a39edd04b3b5fcf1626eed0f5d81959a..2e5a6c9fe35de5ee09e0243e5b7be101f5509112 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -28,6 +28,11 @@
 
        $iPlaceID = (int)$_GET['place_id'];
 
 
        $iPlaceID = (int)$_GET['place_id'];
 

+       $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
+       if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+       $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
+       if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+

        $aLangPrefOrder = getPrefferedLangauges();
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        $aLangPrefOrder = getPrefferedLangauges();
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 


@@ -65,7 +70,10 @@
        $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
 
        // Get the bounding box and outline polygon
        $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
 
        // Get the bounding box and outline polygon

-       $sSQL = "select *,ST_AsText(outline) as outlinestring from get_place_boundingbox($iPlaceID)";
+       $sSQL = "select ST_AsText(geometry) as outlinestring,";
+       $sSQL .= "ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)) as maxlat,";
+       $sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)) as maxlon";
+       $sSQL .= " from placex where place_id = $iPlaceID";

        $aPointPolygon = $oDB->getRow($sSQL);
        IF (PEAR::IsError($aPointPolygon))
        {
        $aPointPolygon = $oDB->getRow($sSQL);
        IF (PEAR::IsError($aPointPolygon))
        {


@@ -76,10 +84,16 @@
        {
                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
        }
        {
                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
        }

+       elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
+       {
+               // TODO: this just takes the first ring
+               preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
+       }

        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch))
        {
                $fRadius = 0.01;
        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch))
        {
                $fRadius = 0.01;

-               $iSteps = ($fRadius * 40000)^2;
+               if ($aPointDetails['rank_search'] > 20) $fRadius = 0.0001;
+               $iSteps = min(max(($fRadius * 40000)^2,16),100);

                $fStepSize = (2*pi())/$iSteps;
                $aPolyPoints = array();
                for($f = 0; $f < 2*pi(); $f += $fStepSize)
                $fStepSize = (2*pi())/$iSteps;
                $aPolyPoints = array();
                for($f = 0; $f < 2*pi(); $f += $fStepSize)