X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/942ed125d4c7f93a741166cfeacf8d6115623e8d..8204a8b13a1174890ea887405deb75157ec3e24b:/lib/lib.php diff --git a/lib/lib.php b/lib/lib.php index 7f56a1de..74430cf7 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -1,9 +1,34 @@

Internal Server Error

"; + echo '

Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.

'; + echo "

Details: ".$sError,"

"; + echo '

Feel free to report the bug in the OSM bug database. Please include the error message above and the URL you used.

'; + if (CONST_Debug) + { + echo "

Debugging Information

"; + if ($sSQL) { + echo "

SQL query

".$sSQL.""; + } + if ($vDumpVar) { + echo "

Result

";
+				var_dump($vDumpVar);
+				echo "

"; + } + } + echo "\n\n"; + exit; + + } + function fail($sError, $sUserError = false) { if (!$sUserError) $sUserError = $sError; - log('ERROR:'.$sError); + error_log('ERROR: '.$sError); echo $sUserError."\n"; exit; } @@ -32,6 +57,20 @@ return sizeof($aMatches[0]); } + function getTotalMemoryMB() + { + $sCPU = file_get_contents('/proc/meminfo'); + preg_match('#MemTotal: +([0-9]+) kB#', $sCPU, $aMatches); + return (int)($aMatches[1]/1024); + } + + function getCacheMemoryMB() + { + $sCPU = file_get_contents('/proc/meminfo'); + preg_match('#Cached: +([0-9]+) kB#', $sCPU, $aMatches); + return (int)($aMatches[1]/1024); + } + function bySearchRank($a, $b) { if ($a['iSearchRank'] == $b['iSearchRank']) return 0; @@ -40,9 +79,9 @@ function byImportance($a, $b) { -/* if ($a['importance'] != $b['importance']) return ($a['importance'] > $b['importance']?-1:1); +/* if ($a['aPointPolygon']['numfeatures'] != $b['aPointPolygon']['numfeatures']) return ($a['aPointPolygon']['numfeatures'] > $b['aPointPolygon']['numfeatures']?-1:1); if ($a['aPointPolygon']['area'] != $b['aPointPolygon']['area']) @@ -173,56 +212,12 @@ exit; } - if (sizeof($aNearPostcodes)) { return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005)); } - $sSQL = 'select substring(upper(postcode) from \'^[A-Z][A-Z]?[0-9][0-9A-Z]? [0-9]([A-Z][A-Z])$\'),ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from placex where country_code::text = \'gb\'::text AND substring(postcode from \'^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$\') = \''.$sPostcodeSector.'\' and class=\'place\' and type=\'postcode\' '; - $sSQL .= ' union '; - $sSQL .= 'select substring(upper(postcode) from \'^[A-Z][A-Z]?[0-9][0-9A-Z]? [0-9]([A-Z][A-Z])$\'),ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from gb_postcode where substring(postcode from \'^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$\') = \''.$sPostcodeSector.'\''; - $aNearPostcodes = $oDB->getAll($sSQL); - if (PEAR::IsError($aNearPostcodes)) - { - var_dump($sSQL, $aNearPostcodes); - exit; - } - - if (!sizeof($aNearPostcodes)) - { - return false; - } - - $fTotalLat = 0; - $fTotalLon = 0; - $fTotalFac = 0; - foreach($aNearPostcodes as $aPostcode) - { - $iDiff = gbPostcodeAlphaDifference($sPostcodeEnd, $aPostcode['substring'])*2 + 1; - if ($iDiff == 0) - $fFac = 1; - else - $fFac = 1/($iDiff*$iDiff); - - $fTotalFac += $fFac; - $fTotalLat += $aPostcode['lat'] * $fFac; - $fTotalLon += $aPostcode['lon'] * $fFac; - } - if ($fTotalFac) - { - $fLat = $fTotalLat / $fTotalFac; - $fLon = $fTotalLon / $fTotalFac; - $fRadius = min(0.1 / $fTotalFac, 0.02); - return array(array('lat' => $fLat, 'lon' => $fLon, 'radius' => $fRadius)); - } return false; - - /* - $fTotalFac is a suprisingly good indicator of accuracy - $iZoom = 18 + round(log($fTotalFac,32)); - $iZoom = max(13,min(18,$iZoom)); - */ } function usPostcodeCalculate($sPostcode, &$oDB) @@ -339,7 +334,7 @@ 'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,), 'railway:station' => array('label'=>'Station','frequency'=>3431,'icon'=>'transport_train_station2', 'defdiameter' => 0.01,), - 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship3',), + 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship_unknown3',), 'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',), 'amenity:bar' => array('label'=>'Bar','frequency'=>164,'icon'=>'food_bar',), 'amenity:university' => array('label'=>'University','frequency'=>607,'icon'=>'education_university',), @@ -369,7 +364,7 @@ 'tourism:motel' => array('label'=>'Motel','frequency'=>43,'icon'=>'',), 'amenity:cinema' => array('label'=>'Cinema','frequency'=>277,'icon'=>'tourist_cinema',), 'tourism:information' => array('label'=>'Information','frequency'=>224,'icon'=>'amenity_information',), - 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'art_gallery2',), + 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'tourist_art_gallery2',), 'historic:archaeological_site' => array('label'=>'Archaeological Site','frequency'=>407,'icon'=>'tourist_archaeological2',), 'amenity:doctors' => array('label'=>'Doctors','frequency'=>581,'icon'=>'health_doctors',), 'leisure:sports_centre' => array('label'=>'Sports Centre','frequency'=>767,'icon'=>'sport_leisure_centre',), @@ -816,3 +811,102 @@ $aSimilar = $oDB->getAll($sSQL); return $aSimilar; } + + function geocodeReverse($fLat, $fLon, $iZoom=18) + { + $oDB =& getDB(); + + $sPointSQL = "ST_SetSRID(ST_Point($fLon,$fLat),4326)"; + + // Zoom to rank, this could probably be calculated but a lookup gives fine control + $aZoomRank = array( + 0 => 2, // Continent / Sea + 1 => 2, + 2 => 2, + 3 => 4, // Country + 4 => 4, + 5 => 8, // State + 6 => 10, // Region + 7 => 10, + 8 => 12, // County + 9 => 12, + 10 => 17, // City + 11 => 17, + 12 => 18, // Town / Village + 13 => 18, + 14 => 22, // Suburb + 15 => 22, + 16 => 26, // Street, TODO: major street? + 17 => 26, + 18 => 30, // or >, Building + 19 => 30, // or >, Building + ); + $iMaxRank = isset($aZoomRank[$iZoom])?$aZoomRank[$iZoom]:28; + + // Find the nearest point + $fSearchDiam = 0.0001; + $iPlaceID = null; + $aArea = false; + $fMaxAreaDistance = 1; + while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) + { + $fSearchDiam = $fSearchDiam * 2; + + // If we have to expand the search area by a large amount then we need a larger feature + // then there is a limit to how small the feature should be + if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4; + if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8; + if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10; + if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12; + if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17; + if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18; + if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22; + if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26; + + $sSQL = 'select place_id,parent_place_id from placex'; + $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; + $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank; + $sSQL .= ' and (name is not null or housenumber is not null)'; + $sSQL .= ' and class not in (\'waterway\')'; + $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; + $sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))'; + $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1'; +//var_dump($sSQL); + $aPlace = $oDB->getRow($sSQL); + $iPlaceID = $aPlace['place_id']; + if (PEAR::IsError($iPlaceID)) + { + var_Dump($sSQL, $iPlaceID); + exit; + } + } + + // The point we found might be too small - use the address to find what it is a child of + if ($iPlaceID) + { + $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc limit 1"; + $iPlaceID = $oDB->getOne($sSQL); + if (PEAR::IsError($iPlaceID)) + { + var_Dump($sSQL, $iPlaceID); + exit; + } + + if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28) + { + $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc"; + $iPlaceID = $oDB->getOne($sSQL); + if (PEAR::IsError($iPlaceID)) + { + var_Dump($sSQL, $iPlaceID); + exit; + } + } + if (!$iPlaceID) + { + $iPlaceID = $aPlace['place_id']; + } + } + + return $iPlaceID; + }