Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index e5a787b24e6c89165724dd18358eeb30f5fe01a1..ceba8581851e6d01c4b5ae1236241d58e0120536 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -1,18 +1,18 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Details');
 
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Details');
 

-        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';
 
        $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();


@@ -63,7 +63,7 @@
        $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
        $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, 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, ";
        $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
        $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, 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, ";

-//     $sSQL .= " ST_Area(geometry::geography) as area, ";
+       //$sSQL .= " ST_Area(geometry::geography) as area, ";

        $sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,";
        $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
        $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
        $sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,";
        $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
        $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";


@@ -73,7 +73,7 @@
        {
                failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
        }
        {
                failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
        }

-        $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
+       $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];

 
        $aClassType = getClassTypesWithImportance();
        $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
 
        $aClassType = getClassTypesWithImportance();
        $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];