munin graph for request counts

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index ea0d41b33a33b4615980cc6f2908836e4640d658..110fdc07a06f01d3cab9fa157162ff735909a475 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -43,7 +43,7 @@
        //$oDB->query($sSQL);
 
        // Get the details for this point
-       $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, ";
+       $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, importance,";
        $sSQL .= " parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
        $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,ST_GeometryType(geometry) as geotype, ST_Y(ST_Centroid(geometry)) as lat,ST_X(ST_Centroid(geometry)) as lon ";
        $sSQL .= " from placex where place_id = $iPlaceID";
@@ -70,7 +70,10 @@
        $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))
        {
@@ -81,10 +84,16 @@
        {
                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;
-               $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)
@@ -110,6 +119,18 @@
        $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
        $aParentOfLines = $oDB->getAll($sSQL);
 
+       $aPlaceSearchNameKeywords = false;
+       $aPlaceSearchAddressKeywords = false;
+       if (isset($_GET['keywords']) && $_GET['keywords'])
+       {
+               $sSQL = "select * from search_name where place_id = $iPlaceID";
+               $aPlaceSearchName = $oDB->getRow($sSQL);
+               $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
+               $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
+               $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
+               $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
+       }
+
        logEnd($oDB, $hLog, 1);
 
        include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');