Merge branch 'tigerlines' of https://github.com/markigail/Nominatim

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index 7cbb17ef29a6460880ab00f41b19419f68778fa1..c7a567552c06afe614cf6ae08b2f0246d31b155f 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Details');
 
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Details');
 

-       require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-website.php');

        require_once(CONST_BasePath.'/lib/log.php');
 
        $sOutputFormat = 'html';
        require_once(CONST_BasePath.'/lib/log.php');
 
        $sOutputFormat = 'html';


@@ -88,30 +89,46 @@
        // Get all alternative names (languages, etc)
        $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
        $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
        // Get all alternative names (languages, etc)
        $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
        $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);

+       if (PEAR::isError($aPointDetails['aNames'])) // possible timeout
+       {
+               $aPointDetails['aNames'] = [];
+       }

 
        // 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);
 
        // 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);

+       if (PEAR::isError($aPointDetails['aExtraTags'])) // possible timeout
+       {
+               $aPointDetails['aExtraTags'] = [];
+       }

 
        // Address
 
        // Address

-       $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
+       $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, 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_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, ";
        $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
 
        // 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_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') 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 .= " from placex, (select centroid 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);
        $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);

+       if (PEAR::isError($aLinkedLines)) // possible timeout
+       {
+               $aLinkedLines = [];
+       }

 
        // All places this is an imediate parent of
        $sSQL = "select obj.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_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, ";
        $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
        $sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex ";
        $sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,";
 
        // All places this is an imediate parent of
        $sSQL = "select obj.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_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, ";
        $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
        $sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex ";
        $sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,";

-       $sSQL .= " (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+       $sSQL .= " (select centroid as placegeometry from placex where place_id = $iPlaceID) as x";

        $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
        $aParentOfLines = $oDB->getAll($sSQL);
        $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
        $aParentOfLines = $oDB->getAll($sSQL);

+       if (PEAR::isError($aParentOfLines)) // possible timeout
+       {
+               $aParentOfLines = [];
+       }

 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;


@@ -119,15 +136,36 @@
        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);
        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);

+               if (PEAR::isError($aPlaceSearchName)) // possible timeout
+               {
+                       $aPlaceSearchName = [];
+               }
+

                $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['name_vector'],1,-1).")";
                $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);

+               if (PEAR::isError($aPlaceSearchNameKeywords)) // possible timeout
+               {
+                       $aPlaceSearchNameKeywords = [];
+               }
+
+

                $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
                $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
                $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
                $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);

+               if (PEAR::isError($aPlaceSearchAddressKeywords)) // possible timeout
+               {
+                       $aPlaceSearchAddressKeywords = [];
+               }
+

        }
 
        logEnd($oDB, $hLog, 1);
 
        }
 
        logEnd($oDB, $hLog, 1);
 

-       $sTileURL = CONST_Map_Tile_URL;
-       $sTileAttribution = CONST_Map_Tile_Attribution;
+       if ($sOutputFormat=='html')
+       {
+               $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+               $sTileURL = CONST_Map_Tile_URL;
+               $sTileAttribution = CONST_Map_Tile_Attribution;
+       }
+

        
        include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
        
        include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');