Merge branch 'continent' of https://github.com/datendelphin/Nominatim

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index a4a2ae5e1d06d93d50d66db22aa057c22d944eea..7c6ad8ad4f17cc1428cc11afa7485698ec51b603 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -48,11 +48,11 @@
        $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";
        $aPointDetails = $oDB->getRow($sSQL);
-       IF (PEAR::IsError($aPointDetails))
+       if (PEAR::IsError($aPointDetails))
        {
-               var_dump($aPointDetails);
-               exit;
+               failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
        }
+
         $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
        $fLon = $aPointDetails['lon'];
        $fLat = $aPointDetails['lat'];
@@ -71,14 +71,13 @@
 
        // Get the bounding box and outline polygon
        $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 .= "ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,";
+       $sSQL .= "ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon";
        $sSQL .= " from placex where place_id = $iPlaceID";
        $aPointPolygon = $oDB->getRow($sSQL);
        IF (PEAR::IsError($aPointPolygon))
        {
-               var_dump($aPointPolygon);
-               exit;
+               failInternalError("Could not get bounding box of place object.", $sSQL, $aPointPolygon);
        }
        if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
        {
@@ -110,15 +109,34 @@
        // Address
        $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
 
+       // Linked places
+       $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 .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+       $sSQL .= " where linked_place_id = $iPlaceID";
+       $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
+       $aLinkedLines = $oDB->getAll($sSQL);
+
        // 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 .= " 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);
 
+       $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');