<?php
- function failInternalError($sError, $sSQL = false, $vDumpVar = false)
+ function failInternalError($sError, $sSQL = false, $vDumpVar = false)
{
header('HTTP/1.0 500 Internal Server Error');
header('Content-type: text/html; charset=utf-8');
if (CONST_Debug)
{
echo "<hr><h2>Debugging Information</h2><br>";
- if ($sSQL) {
+ if ($sSQL)
+ {
echo "<h3>SQL query</h3><code>".$sSQL."</code>";
}
- if ($vDumpVar) {
+ if ($vDumpVar)
+ {
echo "<h3>Result</h3> <code>";
var_dump($vDumpVar);
echo "</code>";
}
echo "\n</body></html>\n";
exit;
-
}
- function userError($sError)
+
+ function userError($sError)
{
header('HTTP/1.0 400 Bad Request');
header('Content-type: text/html; charset=utf-8');
echo '<p>If you feel this error is incorrect feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
echo "\n</body></html>\n";
exit;
-
}
+
function fail($sError, $sUserError = false)
{
if (!$sUserError) $sUserError = $sError;
exit;
}
+
function getBlockingProcesses()
{
- $sStats = file_get_contents('/proc/stat');
- if (preg_match('/procs_blocked ([0-9]+)/i', $sStats, $aMatches))
- {
+ $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');
- $aLoadAverage = explode(' ',$sLoadAverage);
+ $aLoadAverage = explode(' ',$sLoadAverage);
return (float)$aLoadAverage[0];
}
+
function getProcessorCount()
{
$sCPU = file_get_contents('/proc/cpuinfo');
return sizeof($aMatches[0]);
}
+
function getTotalMemoryMB()
{
$sCPU = file_get_contents('/proc/meminfo');
return (int)($aMatches[1]/1024);
}
+
function getCacheMemoryMB()
{
$sCPU = file_get_contents('/proc/meminfo');
return (int)($aMatches[1]/1024);
}
+
function bySearchRank($a, $b)
{
if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
return ($a['iSearchRank'] < $b['iSearchRank']?-1:1);
}
+
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'])
- return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1);
-// if ($a['levenshtein'] != $b['levenshtein'])
-// return ($a['levenshtein'] < $b['levenshtein']?-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['rank_search'] < $b['rank_search']?-1:1);
+ */
return ($a['foundorder'] < $b['foundorder']?-1:1);
}
+
function getPreferredLanguages()
{
// If we have been provided the value in $_GET it overrides browser value
}
$aLanguages = array();
- if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
+ if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
{
- foreach($aLanguagesParse as $iLang => $aLanguage)
+ if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
{
- $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
- if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
+ foreach($aLanguagesParse as $iLang => $aLanguage)
+ {
+ $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
+ if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
+ }
+ arsort($aLanguages);
}
- arsort($aLanguages);
}
- if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1);
+ if (!sizeof($aLanguages) && CONST_Default_Language) $aLanguages = array(CONST_Default_Language=>1);
foreach($aLanguages as $sLangauge => $fLangauagePref)
{
$aLangPrefOrder['short_name:'.$sLangauge] = 'short_name:'.$sLangauge;
return $aLangPrefOrder;
}
- function getWordSets($aWords)
+
+ function getWordSets($aWords, $iDepth)
{
$aResult = array(array(join(' ',$aWords)));
$sFirstToken = '';
- while(sizeof($aWords) > 1)
- {
- $sWord = array_shift($aWords);
- $sFirstToken .= ($sFirstToken?' ':'').$sWord;
- $aRest = getWordSets($aWords);
- foreach($aRest as $aSet)
+ if ($iDepth < 8) {
+ while(sizeof($aWords) > 1)
{
- $aResult[] = array_merge(array($sFirstToken),$aSet);
+ $sWord = array_shift($aWords);
+ $sFirstToken .= ($sFirstToken?' ':'').$sWord;
+ $aRest = getWordSets($aWords, $iDepth+1);
+ foreach($aRest as $aSet)
+ {
+ $aResult[] = array_merge(array($sFirstToken),$aSet);
+ }
}
}
return $aResult;
}
+
function getTokensFromSets($aSets)
{
$aTokens = array();
return $aTokens;
}
+
/*
- GB Postcode functions
- */
+ 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);
+ '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
var_dump($sSQL, $aNearPostcodes);
exit;
}
-
+
if (sizeof($aNearPostcodes))
{
return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005));
return false;
}
+
function usPostcodeCalculate($sPostcode, &$oDB)
{
$iZipcode = (int)$sPostcode;
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';
+ $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))
{
$fFac = 1;
else
$fFac = 1/($iDiff*$iDiff);
-
+
$fTotalFac += $fFac;
$fTotalLat += $aPostcode['lat'] * $fFac;
$fTotalLon += $aPostcode['lon'] * $fFac;
return false;
/*
- $fTotalFac is a surprisingly good indicator of accuracy
- $iZoom = 18 + round(log($fTotalFac,32));
- $iZoom = max(13,min(18,$iZoom));
- */
+ $fTotalFac is a surprisingly good indicator of accuracy
+ $iZoom = 18 + round(log($fTotalFac,32));
+ $iZoom = max(13,min(18,$iZoom));
+ */
}
+
function getClassTypes()
{
return array(
'place:region' => array('label'=>'Region','frequency'=>0,'icon'=>'poi_boundary_administrative','defzoom'=>8, 'defdiameter' => 0.04,),
'place:island' => array('label'=>'Island','frequency'=>288,'icon'=>'','defzoom'=>11, 'defdiameter' => 0.64,),
'boundary:administrative' => array('label'=>'Administrative','frequency'=>413,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
+ 'boundary:postal_code' => array('label'=>'Postcode','frequency'=>413,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
'place:town' => array('label'=>'Town','frequency'=>1497,'icon'=>'poi_place_town','defzoom'=>14, 'defdiameter' => 0.08,),
'place:village' => array('label'=>'Village','frequency'=>11230,'icon'=>'poi_place_village','defzoom'=>15, 'defdiameter' => 0.04,),
'place:hamlet' => array('label'=>'Hamlet','frequency'=>7075,'icon'=>'poi_place_village','defzoom'=>15, 'defdiameter' => 0.04,),
'place:house_number' => array('label'=>'House Number','frequency'=>2086,'icon'=>'','defzoom'=>18,),
'place:country_code' => array('label'=>'Country Code','frequency'=>2086,'icon'=>'','defzoom'=>18,),
-//
+ //
'leisure:pitch' => array('label'=>'Pitch','frequency'=>762,'icon'=>'',),
'highway:unsurfaced' => array('label'=>'Unsurfaced','frequency'=>492,'icon'=>'',),
'natural:scrub' => array('label'=>'Scrub','frequency'=>20,'icon'=>'',),
'natural:fen' => array('label'=>'Fen','frequency'=>20,'icon'=>'',),
'building:yes' => array('label'=>'Building','frequency'=>200,'icon'=>'',),
+ 'mountain_pass:yes' => array('label'=>'Mountain Pass','frequency'=>200,'icon'=>'',),
'amenity:parking' => array('label'=>'Parking','frequency'=>3157,'icon'=>'',),
'highway:bus_stop' => array('label'=>'Bus Stop','frequency'=>35777,'icon'=>'transport_bus_stop2',),
'railway:disused_station' => array('label'=>'Disused Station','frequency'=>114,'icon'=>'',),
'railway:abandoned' => array('label'=>'Abandoned','frequency'=>641,'icon'=>'',),
'railway:disused' => array('label'=>'Disused','frequency'=>72,'icon'=>'',),
- );
+ );
}
+
function getClassTypesWithImportance()
{
$aOrders = getClassTypes();
return $aOrders;
}
- function javascript_renderData($xVal)
- {
- header("Access-Control-Allow-Origin: *");
- $jsonout = json_encode($xVal);
+ function javascript_renderData($xVal)
+ {
+ header("Access-Control-Allow-Origin: *");
+ $jsonout = json_encode($xVal);
- if( ! isset($_GET['json_callback'])) {
+ if( ! isset($_GET['json_callback']))
+ {
header("Content-Type: application/json; charset=UTF-8");
echo $jsonout;
- } else {
- if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback'])) {
+ } else
+ {
+ if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback']))
+ {
header("Content-Type: application/javascript; charset=UTF-8");
echo $_GET['json_callback'].'('.$jsonout.')';
- } else {
+ }
+ else
+ {
header('HTTP/1.0 400 Bad Request');
}
}
- }
+ }
+
function _debugDumpGroupedSearches($aData, $aTokens)
{
}
}
echo "<table border=\"1\">";
- echo "<tr><th>rank</th><th>Name Tokens</th><th>Address Tokens</th><th>country</th><th>operator</th><th>class</th><th>type</th><th>house#</th><th>Lat</th><th>Lon</th><th>Radius</th></tr>";
+ echo "<tr><th>rank</th><th>Name Tokens</th><th>Name Not</th><th>Address Tokens</th><th>Address Not</th><th>country</th><th>operator</th><th>class</th><th>type</th><th>house#</th><th>Lat</th><th>Lon</th><th>Radius</th></tr>";
foreach($aData as $iRank => $aRankedSet)
{
foreach($aRankedSet as $aRow)
- {
+ {
echo "<tr>";
echo "<td>$iRank</td>";
}
echo "</td>";
+ echo "<td>";
+ $sSep = '';
+ foreach($aRow['aNameNonSearch'] as $iWordID)
+ {
+ echo $sSep.'#'.$aWordsIDs[$iWordID].'#';
+ $sSep = ', ';
+ }
+ echo "</td>";
+
echo "<td>";
$sSep = '';
foreach($aRow['aAddress'] as $iWordID)
}
echo "</td>";
+ echo "<td>";
+ $sSep = '';
+ foreach($aRow['aAddressNonSearch'] as $iWordID)
+ {
+ echo $sSep.'#'.$aWordsIDs[$iWordID].'#';
+ $sSep = ', ';
+ }
+ echo "</td>";
+
echo "<td>".$aRow['sCountryCode']."</td>";
echo "<td>".$aRow['sOperator']."</td>";
echo "<td>".$aRow['fLat']."</td>";
echo "<td>".$aRow['fLon']."</td>";
echo "<td>".$aRow['fRadius']."</td>";
-
+
echo "</tr>";
}
}
function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $bRaw = false)
{
$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID)";
- IF (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
+ if (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
$sSQL .= " order by rank_address desc,isaddress desc";
- $aAddressLines = $oDB->getAll($sSQL);
- if (PEAR::IsError($aAddressLines))
- {
- var_dump($aAddressLines);
- exit;
- }
+ $aAddressLines = $oDB->getAll($sSQL);
+ if (PEAR::IsError($aAddressLines))
+ {
+ var_dump($aAddressLines);
+ exit;
+ }
if ($bRaw) return $aAddressLines;
-//echo "<pre>";
-//var_dump($aAddressLines);
+ //var_dump($aAddressLines);
$aAddress = array();
+ $aFallback = array();
$aClassType = getClassTypes();
foreach($aAddressLines as $aLine)
{
+ $bFallback = false;
$aTypeLabel = false;
if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
- elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
- else $aTypeLabel = array('simplelabel'=>$aLine['class']);
+ elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]))
+ {
+ $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
+ $bFallback = true;
+ }
+ else
+ {
+ $aTypeLabel = array('simplelabel'=>'address'.$aLine['rank_address']);
+ $bFallback = true;
+ }
if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])))
{
$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
$sTypeLabel = str_replace(' ','_',$sTypeLabel);
- if (!isset($aAddress[$sTypeLabel]) && $aLine['localname']) $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
- }
- }
-
- return $aAddress;
-
- $aHouseNumber = $oDB->getRow('select housenumber, get_name_by_language(name,ARRAY[\'addr:housename\']) as housename,rank_search,postcode from placex where place_id = '.$iPlaceID);
- $sHouseNumber = $aHouseNumber['housenumber'];
- $sHouseName = $aHouseNumber['housename'];
- $sPostcode = $aHouseNumber['postcode'];
- $iRank = $aHouseNumber['rank_search'];
-
- // Address
- $sSQL = "select country_code, placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, ";
- $sSQL .= "get_searchrank_label(rank_search) as rank_search_label, fromarea, isaddress, distance, ";
- $sSQL .= " CASE WHEN type = 'postcode' THEN postcode ELSE get_name_by_language(name,$sLanguagePrefArraySQL) END as localname, ";
- $sSQL .= " length(name::text) as namelength ";
- $sSQL .= " from place_addressline join placex on (address_place_id = placex.place_id)";
- $sSQL .= " where place_addressline.place_id = $iPlaceID and (rank_address > 0 OR address_place_id = $iPlaceID)";
- if (!$bRaw) $sSQL .= " and isaddress";
- $sSQL .= " order by cached_rank_address desc,isaddress desc,fromarea desc,distance asc,rank_search desc,namelength desc";
-//var_dump($sSQL);
- $aAddressLines = $oDB->getAll($sSQL);
- if (PEAR::IsError($aAddressLines))
- {
- var_dump($aAddressLines);
- exit;
- }
- if ($bRaw) return $aAddressLines;
-
- $aClassType = getClassTypes();
-
- $iMinRank = 100;
- $aAddress = array();
- if ($iRank >= 28 && $sHouseNumber) $aAddress['house_number'] = $sHouseNumber;
- if ($iRank >= 28 && $sHouseName) $aAddress['house_name'] = $sHouseName;
- foreach($aAddressLines as $aLine)
- {
- if (!$sCountryCode) $sCountryCode = $aLine['country_code'];
- if ($aLine['rank_address'] < $iMinRank)
- {
- $aTypeLabel = false;
- if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
- elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
- else $aTypeLabel = array('simplelabel'=>$aLine['class']);
- if ($aTypeLabel && ($aLine['localname'] || $aLine['housenumber']))
+ if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]))
{
- $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
- $sTypeLabel = str_replace(' ','_',$sTypeLabel);
- if (!isset($aAddress[$sTypeLabel]) && $aLine['localname']) $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
+ $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
}
- $iMinRank = $aLine['rank_address'];
+ $aFallback[$sTypeLabel] = $bFallback;
}
}
-
- if ($sPostcode)
- {
- $aAddress['postcode'] = $sPostcode;
- }
-
- if ($iMinRank > 4 && $sCountryCode)
- {
- $sSQL = "select get_name_by_language(country_name.name,$sLanguagePrefArraySQL) as name";
- $sSQL .= " from country_name where country_code = '$sCountryCode'";
- $sCountryName = $oDB->getOne($sSQL);
- if ($sCountryName)
- {
- $aAddress['country'] = $sCountryName;
- }
- }
- if ($sCountryCode)
- {
- $aAddress['country_code'] = $sCountryCode;
- }
-
return $aAddress;
}
- function getWordSuggestions(&$oDB, $sWord)
- {
- $sWordQuoted = getDBQuoted(trim($sWord));
- $sSQL = "select *,levenshtein($sWordQuoted,word) from test_token ";
- $sSQL .= "where (metaphone = dmetaphone($sWordQuoted) or metaphonealt = dmetaphone($sWordQuoted) or ";
- $sSQL .= "metaphone = dmetaphone_alt($sWordQuoted) or metaphonealt = dmetaphone_alt($sWordQuoted)) ";
- $sSQL .= "and len between length($sWordQuoted)-2 and length($sWordQuoted)+2 ";
- $sSQL .= "and levenshtein($sWordQuoted,word) < 3 ";
- $sSQL .= "order by levenshtein($sWordQuoted,word) asc, abs(len - length($sWordQuoted)) asc limit 20";
- $aSimilar = $oDB->getAll($sSQL);
- return $aSimilar;
- }
function geocodeReverse($fLat, $fLon, $iZoom=18)
{
// 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
- );
+ 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
$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);
+ //var_dump($sSQL);
$aPlace = $oDB->getRow($sSQL);
$iPlaceID = $aPlace['place_id'];
if (PEAR::IsError($iPlaceID))
{
- var_Dump($sSQL, $iPlaceID);
+ var_Dump($sSQL, $iPlaceID);
exit;
}
}
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
- var_Dump($sSQL, $iPlaceID);
+ var_Dump($sSQL, $iPlaceID);
exit;
}
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
- var_Dump($sSQL, $iPlaceID);
+ var_Dump($sSQL, $iPlaceID);
exit;
}
}
return $iPlaceID;
}
- function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
- {
- if (!isset($_GET[$sKey])) return false;
- $sValue = trim($_GET[$sKey]);
- if (!$sValue) return false;
- $aStructuredQuery[$sKey] = $sValue;
- if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) {
- $iMinAddressRank = $iNewMinAddressRank;
- $iMaxAddressRank = $iNewMaxAddressRank;
- }
- return true;
- }
+ function addQuotes($s)
+ {
+ return "'".$s."'";
+ }
projects / nominatim.git / blobdiff