lots of little bug fixes and missing files

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index 6eaa4adb26fd9f96531d761de2f27b1bd05c4441..3c4581d5262d63aa6aed28fd561075c06a9c0bd7 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -2,13 +2,15 @@
         require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
         require_once(CONST_BasePath.'/lib/log.php');
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
         require_once(CONST_BasePath.'/lib/log.php');
 

+       $sOutputFormat = 'html';
+/*

         $fLoadAvg = getLoadAverage();
         if ($fLoadAvg > 3)
         {
                echo "Page temporarily blocked due to high server load\n";
                 exit;
         }
         $fLoadAvg = getLoadAverage();
         if ($fLoadAvg > 3)
         {
                echo "Page temporarily blocked due to high server load\n";
                 exit;
         }

-
+*/

        ini_set('memory_limit', '200M');
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
        $oDB =& getDB();


@@ -26,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))."]";
 


@@ -55,18 +62,18 @@
        $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
 
        // Get all alternative names (languages, etc)
        $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
 
        // Get all alternative names (languages, etc)

-       $aPointDetails['aNames'] = array();
-/*
-       for($i = 1; $i <= $aPointDetails['numnames']; $i++)
-       {
-               $sSQL = "select name[$i].key, name[$i].value from placex where place_id = $iPlaceID limit 1";
-               $aNameItem = $oDB->getRow($sSQL);
-               if (substr($aNameItem['key'],0,5) == 'name:') $aNameItem['key'] = substr($aNameItem['key'],5);
-               $aPointDetails['aNames'][$aNameItem['key']] = $aNameItem['value'];
-       }
-*/
+       $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
+       $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
+
+       // Extra tags
+       $sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key";
+       $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
+

        // Get the bounding box and outline polygon
        // 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))
        {


@@ -80,7 +87,8 @@
        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)


@@ -94,45 +102,18 @@
                $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
        }
 
                $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
        }
 

-       // If it is a road then force all nearby buildings to be indexed (so we can show then in the list)
-/*
-       if ($aPointDetails['rank_address'] == 26)
-       {
-               $sSQL = "UPDATE placex set indexed = true from placex as srcplace where placex.indexed = false";
-               $sSQL .= " and ST_DWithin(placex.geometry, srcplace.geometry, 0.0005) and srcplace.place_id = $iPlaceID";
-               $oDB->query($sSQL);
-       }
-*/

        // Address
        $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
        // Address
        $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);

-/*
-       $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, ";
-       $sSQL .= "get_searchrank_label(rank_search) as rank_search_label, fromarea, distance, ";
-       $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-       $sSQL .= " from place_addressline join placex on (address_place_id = placex.place_id)";
-       $sSQL .= " where place_addressline.place_id = $iPlaceID and ((rank_address > 0 AND rank_address < ".$aPointDetails['rank_address'].") OR address_place_id = $iPlaceID) and placex.place_id != $iPlaceID";
-       if ($aPointDetails['country_code'])
-       {
-               $sSQL .= " and (placex.country_code IS NULL OR placex.country_code = '".$aPointDetails['country_code']."' OR rank_address < 4)";
-       }
-       $sSQL .= " order by cached_rank_address desc,rank_search desc,fromarea desc,distance asc,namelength desc";
-       $aAddressLines = $oDB->getAll($sSQL);
-       IF (PEAR::IsError($aAddressLines))
-       {
-               var_dump($aAddressLines);
-               exit;
-       }
-*/
-       // All places this is a parent of
-       $iMaxRankAddress = $aPointDetails['rank_address']+13;
-       $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, cached_rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, distance, ";
+
+       // All places this is an imediate parent of
+       $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";

        $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
        $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";

-       $sSQL .= " from (select * from place_addressline where address_place_id = $iPlaceID and cached_rank_address < $iMaxRankAddress) as place_addressline join placex on (place_addressline.place_id = placex.place_id)";
-       $sSQL .= " where place_addressline.address_place_id = $iPlaceID and placex.rank_address < $iMaxRankAddress and cached_rank_address > 0 and placex.place_id != $iPlaceID";
-       $sSQL .= " and type != 'postcode'";
-       $sSQL .= " order by cached_rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber limit 1000";
+       $sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+       $sSQL .= " where parent_place_id = $iPlaceID";
+//     $sSQL .= " and type != 'postcode'";
+       $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";

        $aParentOfLines = $oDB->getAll($sSQL);
 
        logEnd($oDB, $hLog, 1);
 
        $aParentOfLines = $oDB->getAll($sSQL);
 
        logEnd($oDB, $hLog, 1);
 

-       include('.htlib/output/details-html.php');
+       include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');