X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d1f266509a9fb6869b5921e7427fcad29ccadd66..97c572b92f5e09d646ce045a949e40d53f87243a:/website/details.php?ds=sidebyside diff --git a/website/details.php b/website/details.php index 8c838d46..ceba8581 100755 --- a/website/details.php +++ b/website/details.php @@ -1,18 +1,18 @@ 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(); @@ -60,10 +60,10 @@ //$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, importance, wikipedia,"; + $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"; @@ -73,7 +73,7 @@ { 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'];