X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5042be1b72f9f3ed86b1242be8c93fad4ef87857..13291274e73e1d2fc3582e49fd635f92a9b061e1:/lib/lib.php
diff --git a/lib/lib.php b/lib/lib.php
index e283e836..317ba549 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -14,7 +14,7 @@ function getProcessorCount()
{
$sCPU = file_get_contents('/proc/cpuinfo');
preg_match_all('#processor\s+: [0-9]+#', $sCPU, $aMatches);
- return sizeof($aMatches[0]);
+ return count($aMatches[0]);
}
@@ -426,32 +426,6 @@ function javascript_renderData($xVal, $iOptions = 0)
}
-function _debugDumpGroupedSearches($aData, $aTokens)
-{
- $aWordsIDs = array();
- if ($aTokens) {
- foreach ($aTokens as $sToken => $aWords) {
- if ($aWords) {
- foreach ($aWords as $aToken) {
- $aWordsIDs[$aToken['word_id']] =
- '#'.$sToken.'('.$aToken['word_id'].')#';
- }
- }
- }
- }
- echo '
';
- echo 'rank | Name Tokens | Name Not | ';
- echo 'Address Tokens | Address Not | country | operator | ';
- echo 'class | type | postcode | housenumber |
';
- foreach ($aData as $iRank => $aRankedSet) {
- foreach ($aRankedSet as $aRow) {
- $aRow->dumpAsHtmlTableRow($aWordsIDs);
- }
- }
- echo '
';
-}
-
-
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, $housenumber)";
@@ -585,10 +559,10 @@ function geometryText2Points($geometry_as_text, $fRadius)
//
preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
//
- } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
+/* } 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);