X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1217083146862f5533e812c74d677895ffbd1757..af06d31d21032670a944ca27023c6d12a5b18e8b:/lib/lib.php?ds=sidebyside diff --git a/lib/lib.php b/lib/lib.php index 1b499005..897db8e7 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -39,6 +39,12 @@ exit; } + function getParamBool($name, $default=false) + { + if (!isset($_GET[$name])) return $default; + + return (bool) $_GET[$name]; + } function fail($sError, $sUserError = false) { @@ -49,17 +55,6 @@ } - function getBlockingProcesses() - { - $sStats = file_get_contents('/proc/stat'); - if (preg_match('/procs_blocked ([0-9]+)/i', $sStats, $aMatches)) - { - return (int)$aMatches[1]; - } - return 0; - } - - function getLoadAverage() { $sLoadAverage = file_get_contents('/proc/loadavg'); @@ -71,7 +66,7 @@ function getProcessorCount() { $sCPU = file_get_contents('/proc/cpuinfo'); - preg_match_all('#processor : [0-9]+#', $sCPU, $aMatches); + preg_match_all('#processor\s+: [0-9]+#', $sCPU, $aMatches); return sizeof($aMatches[0]); } @@ -95,7 +90,7 @@ function bySearchRank($a, $b) { if ($a['iSearchRank'] == $b['iSearchRank']) - return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']); + return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']); return ($a['iSearchRank'] < $b['iSearchRank']?-1:1); } @@ -104,16 +99,7 @@ { 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']) - return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1); - // if ($a['levenshtein'] != $b['levenshtein']) - // return ($a['levenshtein'] < $b['levenshtein']?-1:1); - if ($a['rank_search'] != $b['rank_search']) - return ($a['rank_search'] < $b['rank_search']?-1:1); - */ + return ($a['foundorder'] < $b['foundorder']?-1:1); } @@ -193,6 +179,26 @@ return $aResult; } + function getInverseWordSets($aWords, $iDepth) + { + $aResult = array(array(join(' ',$aWords))); + $sFirstToken = ''; + if ($iDepth < 8) + { + while(sizeof($aWords) > 1) + { + $sWord = array_pop($aWords); + $sFirstToken = $sWord.($sFirstToken?' ':'').$sFirstToken; + $aRest = getInverseWordSets($aWords, $iDepth+1); + foreach($aRest as $aSet) + { + $aResult[] = array_merge(array($sFirstToken),$aSet); + } + } + } + return $aResult; + } + function getTokensFromSets($aSets) { @@ -203,7 +209,6 @@ { $aTokens[' '.$sWord] = ' '.$sWord; $aTokens[$sWord] = $sWord; - //if (!strpos($sWord,' ')) $aTokens[$sWord] = $sWord; } } return $aTokens; @@ -214,34 +219,6 @@ GB Postcode functions */ - function gbPostcodeAlphaDifference($s1, $s2) - { - $aValues = array( - 'A'=>0, - 'B'=>1, - 'D'=>2, - 'E'=>3, - 'F'=>4, - 'G'=>5, - 'H'=>6, - 'J'=>7, - 'L'=>8, - 'N'=>9, - 'O'=>10, - 'P'=>11, - 'Q'=>12, - 'R'=>13, - 'S'=>14, - 'T'=>15, - 'U'=>16, - 'W'=>17, - 'X'=>18, - 'Y'=>19, - 'Z'=>20); - return abs(($aValues[$s1[0]]*21+$aValues[$s1[1]]) - ($aValues[$s2[0]]*21+$aValues[$s2[1]])); - } - - function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB) { // Try an exact match on the gb_postcode table @@ -268,66 +245,6 @@ } - function usPostcodeCalculate($sPostcode, &$oDB) - { - $iZipcode = (int)$sPostcode; - - // Try an exact match on the us_zippostcode table - $sSQL = 'select zipcode, ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode = '.$iZipcode; - $aNearPostcodes = $oDB->getAll($sSQL); - if (PEAR::IsError($aNearPostcodes)) - { - var_dump($sSQL, $aNearPostcodes); - exit; - } - - if (!sizeof($aNearPostcodes)) - { - $sSQL = 'select zipcode,ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode between '.($iZipcode-100).' and '.($iZipcode+100).' order by abs(zipcode - '.$iZipcode.') asc limit 5'; - $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 = abs($aPostcode['zipcode'] - $iZipcode) + 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; - return array(array('lat' => $fLat, 'lon' => $fLon, 'radius' => 0.2)); - } - return false; - - /* - $fTotalFac is a surprisingly good indicator of accuracy - $iZoom = 18 + round(log($fTotalFac,32)); - $iZoom = max(13,min(18,$iZoom)); - */ - } - - function getClassTypes() { return array( @@ -358,7 +275,7 @@ 'landuse:farm' => array('label'=>'Farm','frequency'=>1201,'icon'=>'', 'defdiameter' => 0.02,), 'place:farm' => array('label'=>'Farm','frequency'=>1162,'icon'=>'', 'defdiameter' => 0.02,), - 'highway:motorway_junction' => array('label'=>'Motorway Junction','frequency'=>1126,'icon'=>'','simplelabel'=>'Road',), + 'highway:motorway_junction' => array('label'=>'Motorway Junction','frequency'=>1126,'icon'=>'','simplelabel'=>'Junction',), 'highway:motorway' => array('label'=>'Motorway','frequency'=>4627,'icon'=>'','simplelabel'=>'Road',), 'highway:trunk' => array('label'=>'Trunk','frequency'=>23084,'icon'=>'','simplelabel'=>'Road',), 'highway:primary' => array('label'=>'Primary','frequency'=>32138,'icon'=>'','simplelabel'=>'Road',), @@ -418,7 +335,6 @@ 'tourism:hotel' => array('label'=>'Hotel','frequency'=>2150,'icon'=>'accommodation_hotel2',), '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'=>'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',), @@ -460,7 +376,7 @@ 'shop:electronics' => array('label'=>'Electronics','frequency'=>96,'icon'=>'',), 'shop:department_store' => array('label'=>'Department Store','frequency'=>86,'icon'=>'',), 'shop:books' => array('label'=>'Books','frequency'=>85,'icon'=>'',), - 'shop:yes' => array('label'=>'Yes','frequency'=>68,'icon'=>'',), + 'shop:yes' => array('label'=>'Shop','frequency'=>68,'icon'=>'',), 'shop:outdoor' => array('label'=>'Outdoor','frequency'=>67,'icon'=>'',), 'shop:mall' => array('label'=>'Mall','frequency'=>63,'icon'=>'',), 'shop:florist' => array('label'=>'Florist','frequency'=>61,'icon'=>'',), @@ -492,6 +408,7 @@ 'shop:travel_agency' => array('label'=>'Travel Agency','frequency'=>21,'icon'=>'',), 'shop:hifi' => array('label'=>'Hifi','frequency'=>21,'icon'=>'',), 'amenity:shop' => array('label'=>'Shop','frequency'=>61,'icon'=>'',), + 'tourism:information' => array('label'=>'Information','frequency'=>224,'icon'=>'amenity_information',), 'place:house' => array('label'=>'House','frequency'=>2086,'icon'=>'','defzoom'=>18,), 'place:house_name' => array('label'=>'House','frequency'=>2086,'icon'=>'','defzoom'=>18,), @@ -605,7 +522,7 @@ 'historic:roman_road' => array('label'=>'Roman Road','frequency'=>27,'icon'=>'',), 'historic:fort' => array('label'=>'Fort','frequency'=>26,'icon'=>'',), 'railway:subway_entrance' => array('label'=>'Subway Entrance','frequency'=>26,'icon'=>'',), - 'historic:yes' => array('label'=>'Yes','frequency'=>25,'icon'=>'',), + 'historic:yes' => array('label'=>'Historic','frequency'=>25,'icon'=>'',), 'highway:gate' => array('label'=>'Gate','frequency'=>25,'icon'=>'',), 'leisure:fishing' => array('label'=>'Fishing','frequency'=>24,'icon'=>'',), 'historic:museum' => array('label'=>'Museum','frequency'=>24,'icon'=>'',), @@ -627,7 +544,7 @@ 'place:houses' => array('label'=>'Houses','frequency'=>85,'icon'=>'',), 'railway:preserved' => array('label'=>'Preserved','frequency'=>227,'icon'=>'',), - 'waterway:derelict canal' => array('label'=>'Derelict Canal','frequency'=>21,'icon'=>'',), + 'waterway:derelict_canal' => array('label'=>'Derelict Canal','frequency'=>21,'icon'=>'',), 'amenity:dead_pub' => array('label'=>'Dead Pub','frequency'=>20,'icon'=>'',), 'railway:disused_station' => array('label'=>'Disused Station','frequency'=>114,'icon'=>'',), 'railway:abandoned' => array('label'=>'Abandoned','frequency'=>641,'icon'=>'',), @@ -647,11 +564,37 @@ return $aOrders; } + function getResultDiameter($aResult) + { + $aClassType = getClassTypes(); + + $fDiameter = 0.0001; + + if (isset($aResult['class']) + && isset($aResult['type']) + && isset($aResult['admin_level']) + && isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) + && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) + { + $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']; + } + elseif (isset($aResult['class']) + && isset($aResult['type']) + && isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) + && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) + { + $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']; + } + + return $fDiameter; + } + - function javascript_renderData($xVal) + function javascript_renderData($xVal, $iOptions = 0) { - header("Access-Control-Allow-Origin: *"); - $jsonout = json_encode($xVal); + if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) + $iOptions |= JSON_UNESCAPED_UNICODE; + $jsonout = json_encode($xVal, $iOptions); if( ! isset($_GET['json_callback'])) { @@ -752,9 +695,9 @@ } - function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $bRaw = false) + function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber = -1, $bRaw = false) { - $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID)"; + $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID, $housenumber)"; if (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'"; $sSQL .= " order by rank_address desc,isaddress desc"; @@ -942,7 +885,7 @@ } // degrees decimal seconds // N 40 26 46 W 79 58 56 - // N 40° 26′ 46″ W, 79° 58′ 56″ + // N 40° 26′ 46″, W 79° 58′ 56″ // 1 2 3 4 5 6 7 8 elseif (preg_match('/\\b([NS])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*[, ]+([EW])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*\\b/', $sQuery, $aData)) { @@ -994,3 +937,49 @@ return array('lat' => $fQueryLat, 'lon' => $fQueryLon, 'query' => $sQuery); } + + + function geometryText2Points($geometry_as_text, $fRadius) + { + $aPolyPoints = NULL; + if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) + { + preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER); + } + elseif (preg_match('#LINESTRING\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) + { + preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER); + } + elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) + { + preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER); + } + elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#', $geometry_as_text, $aMatch)) + { + $aPolyPoints = createPointsAroundCenter($aMatch[1], $aMatch[2], $fRadius); + } + + if (isset($aPolyPoints)) + { + $aResultPoints = array(); + foreach($aPolyPoints as $aPoint) + { + $aResultPoints[] = array($aPoint[1], $aPoint[2]); + } + return $aResultPoints; + } + + return; + } + + function createPointsAroundCenter($fLon, $fLat, $fRadius) + { + $iSteps = max(8, min(100, ($fRadius * 40000)^2)); + $fStepSize = (2*pi())/$iSteps; + $aPolyPoints = array(); + for($f = 0; $f < 2*pi(); $f += $fStepSize) + { + $aPolyPoints[] = array('', $fLon+($fRadius*sin($f)), $fLat+($fRadius*cos($f)) ); + } + return $aPolyPoints; + }