X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3852096c80d5461eab21ec8c7e2452a85d631d7d..97c572b92f5e09d646ce045a949e40d53f87243a:/lib/lib.php diff --git a/lib/lib.php b/lib/lib.php index 9d1120cb..50cf3dc4 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -1,6 +1,6 @@

Debugging Information


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

SQL query

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

Result

"; var_dump($vDumpVar); echo ""; @@ -22,10 +24,10 @@ } echo "\n\n"; exit; - } - function userError($sError) + + function userError($sError) { header('HTTP/1.0 400 Bad Request'); header('Content-type: text/html; charset=utf-8'); @@ -35,7 +37,13 @@ echo '

If you feel this error is incorrect feel free to report the bug in the OSM bug database. Please include the error message above and the URL you used.

'; echo "\n\n"; exit; + } + + function getParamBool($name, $default=false) + { + if (!isset($_GET[$name])) return $default; + return (bool) $_GET[$name]; } function fail($sError, $sUserError = false) @@ -43,26 +51,29 @@ if (!$sUserError) $sUserError = $sError; error_log('ERROR: '.$sError); echo $sUserError."\n"; - exit; + exit(-1); } + 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'); @@ -70,6 +81,7 @@ return sizeof($aMatches[0]); } + function getTotalMemoryMB() { $sCPU = file_get_contents('/proc/meminfo'); @@ -77,6 +89,7 @@ return (int)($aMatches[1]/1024); } + function getCacheMemoryMB() { $sCPU = file_get_contents('/proc/meminfo'); @@ -84,40 +97,53 @@ return (int)($aMatches[1]/1024); } + function bySearchRank($a, $b) { - if ($a['iSearchRank'] == $b['iSearchRank']) return 0; + if ($a['iSearchRank'] == $b['iSearchRank']) + return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']); 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() + + function getPreferredLanguages($sLangString=false) { - // If we have been provided the value in $_GET it overrides browser value - if (isset($_GET['accept-language']) && $_GET['accept-language']) + if (!$sLangString) { - $_SERVER["HTTP_ACCEPT_LANGUAGE"] = $_GET['accept-language']; + // If we have been provided the value in $_GET it overrides browser value + if (isset($_GET['accept-language']) && $_GET['accept-language']) + { + $_SERVER["HTTP_ACCEPT_LANGUAGE"] = $_GET['accept-language']; + $sLangString = $_GET['accept-language']; + } + else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) + { + $sLangString = $_SERVER["HTTP_ACCEPT_LANGUAGE"]; + } } $aLanguages = array(); - if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { - 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 ($sLangString) + { + if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) { foreach($aLanguagesParse as $iLang => $aLanguage) { @@ -126,8 +152,8 @@ } 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; @@ -153,23 +179,47 @@ return $aLangPrefOrder; } - function getWordSets($aWords) + + function getWordSets($aWords, $iDepth) + { + $aResult = array(array(join(' ',$aWords))); + $sFirstToken = ''; + if ($iDepth < 8) { + while(sizeof($aWords) > 1) + { + $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 getInverseWordSets($aWords, $iDepth) { $aResult = array(array(join(' ',$aWords))); $sFirstToken = ''; - while(sizeof($aWords) > 1) + if ($iDepth < 8) { - $sWord = array_shift($aWords); - $sFirstToken .= ($sFirstToken?' ':'').$sWord; - $aRest = getWordSets($aWords); - foreach($aRest as $aSet) + while(sizeof($aWords) > 1) { - $aResult[] = array_merge(array($sFirstToken),$aSet); + $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) { $aTokens = array(); @@ -185,37 +235,39 @@ 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 @@ -226,15 +278,22 @@ var_dump($sSQL, $aNearPostcodes); exit; } - + if (sizeof($aNearPostcodes)) { - return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005)); + $aPostcodes = array(); + foreach($aNearPostcodes as $aPostcode) + { + $aPostcodes[] = array('lat' => $aPostcode['lat'], 'lon' => $aPostcode['lon'], 'radius' => 0.005); + } + + return $aPostcodes; } return false; } + function usPostcodeCalculate($sPostcode, &$oDB) { $iZipcode = (int)$sPostcode; @@ -250,7 +309,7 @@ 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)) { @@ -274,7 +333,7 @@ $fFac = 1; else $fFac = 1/($iDiff*$iDiff); - + $fTotalFac += $fFac; $fTotalLat += $aPostcode['lat'] * $fFac; $fTotalLon += $aPostcode['lon'] * $fFac; @@ -288,12 +347,13 @@ 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( @@ -324,7 +384,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',), @@ -352,6 +412,8 @@ 'landuse:commercial' => array('label'=>'Commercial','frequency'=>657,'icon'=>'',), 'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,), + 'aeroway:aerodrome' => array('label'=>'Aerodrome','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,), + 'aeroway' => array('label'=>'Aeroway','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_worship_unknown3',), 'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',), @@ -382,7 +444,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',), @@ -424,7 +485,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'=>'',), @@ -456,13 +517,14 @@ '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,), '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'=>'',), @@ -504,7 +566,6 @@ 'natural:beach' => array('label'=>'Beach','frequency'=>121,'icon'=>'tourist_beach',), 'place:moor' => array('label'=>'Moor','frequency'=>118,'icon'=>'',), 'amenity:grave_yard' => array('label'=>'Grave Yard','frequency'=>110,'icon'=>'',), - 'waterway:derelict_canal' => array('label'=>'Derelict Canal','frequency'=>109,'icon'=>'',), 'waterway:drain' => array('label'=>'Drain','frequency'=>108,'icon'=>'',), 'landuse:grass' => array('label'=>'Grass','frequency'=>106,'icon'=>'',), 'landuse:village_green' => array('label'=>'Village Green','frequency'=>106,'icon'=>'',), @@ -570,7 +631,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'=>'',), @@ -583,6 +644,7 @@ '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',), @@ -591,14 +653,15 @@ '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'=>'',), 'railway:disused' => array('label'=>'Disused','frequency'=>72,'icon'=>'',), - ); + ); } + function getClassTypesWithImportance() { $aOrders = getClassTypes(); @@ -610,24 +673,32 @@ return $aOrders; } - function javascript_renderData($xVal) - { - header("Access-Control-Allow-Origin: *"); - $jsonout = json_encode($xVal); + function javascript_renderData($xVal, $iOptions = 0) + { + header("Access-Control-Allow-Origin: *"); + if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) + $iOptions |= JSON_UNESCAPED_UNICODE; + $jsonout = json_encode($xVal, $iOptions); - 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) { @@ -650,7 +721,7 @@ foreach($aData as $iRank => $aRankedSet) { foreach($aRankedSet as $aRow) - { + { echo ""; echo "$iRank"; @@ -701,7 +772,7 @@ echo "".$aRow['fLat'].""; echo "".$aRow['fLon'].""; echo "".$aRow['fRadius'].""; - + echo ""; } } @@ -712,18 +783,18 @@ 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 "
";
-//var_dump($aAddressLines);
+		//echo "
";
+		//var_dump($aAddressLines);
 		$aAddress = array();
 		$aFallback = array();
 		$aClassType = getClassTypes();
@@ -747,7 +818,7 @@
 			{
 				$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
 				$sTypeLabel = str_replace(' ','_',$sTypeLabel);
-				if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]))
+				if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
 				{
 					$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
 				}
@@ -757,18 +828,6 @@
 		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)
 	{
@@ -778,27 +837,27 @@
 
 		// 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
@@ -829,14 +888,14 @@
 			$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))
+			if (PEAR::IsError($aPlace))
 			{
-				var_Dump($sSQL, $iPlaceID); 
+				var_Dump($sSQL, $aPlace);
 				exit;
 			}
+			$iPlaceID = $aPlace['place_id'];
 		}
 
 		// The point we found might be too small - use the address to find what it is a child of
@@ -846,7 +905,7 @@
 			$iPlaceID = $oDB->getOne($sSQL);
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
+				var_Dump($sSQL, $iPlaceID);
 				exit;
 			}
 
@@ -856,7 +915,7 @@
 				$iPlaceID = $oDB->getOne($sSQL);
 				if (PEAR::IsError($iPlaceID))
 				{
-					var_Dump($sSQL, $iPlaceID); 
+					var_Dump($sSQL, $iPlaceID);
 					exit;
 				}
 			}
@@ -869,15 +928,97 @@
 		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."'";
+	}
+
+	// returns boolean
+	function validLatLon($fLat,$fLon)
+	{
+		return ($fLat <= 90.1 && $fLat >= -90.1 && $fLon <= 180.1 && $fLon >= -180.1);
+	}
+
+	// Do we have anything that looks like a lat/lon pair?
+	// returns array(lat,lon,query_with_lat_lon_removed)
+	// or null
+	function looksLikeLatLonPair($sQuery)
+	{
+		$sFound    = null;
+		$fQueryLat = null;
+		$fQueryLon = null;
+
+		// degrees decimal minutes
+		// N 40 26.767, W 79 58.933
+		// N 40°26.767′, W 79°58.933′
+		//                  1         2                   3                  4         5            6
+		if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[° ]+([0-9.]+)?[′\']*[, ]+([EW])[ ]+([0-9]+)[° ]+([0-9]+[0-9.]*)[′\']*?\\b/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
+			$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
+		}
+		// degrees decimal minutes
+		// 40 26.767 N, 79 58.933 W
+		// 40° 26.767′ N 79° 58.933′ W
+		//                      1             2                      3          4            5                    6
+		elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\']*[ ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\' ]+([EW])\\b/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
+			$fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
+		}
+		// degrees decimal seconds
+		// 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))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60 + $aData[4]/3600);
+			$fQueryLon = ($aData[5]=='E'?1:-1) * ($aData[6] + $aData[7]/60 + $aData[8]/3600);
+		}
+		// degrees decimal seconds
+		// 40 26 46 N 79 58 56 W
+		// 40° 26′ 46″ N, 79° 58′ 56″ W
+		//                      1            2            3            4          5            6            7            8
+		elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([EW])\\b/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[4]=='N'?1:-1) * ($aData[1] + $aData[2]/60 + $aData[3]/3600);
+			$fQueryLon = ($aData[8]=='E'?1:-1) * ($aData[5] + $aData[6]/60 + $aData[7]/3600);
+		}
+		// degrees decimal
+		// N 40.446° W 79.982°
+		//                      1        2                               3        4
+		elseif (preg_match('/\\b([NS])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*[, ]+([EW])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*\\b/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2]);
+			$fQueryLon = ($aData[3]=='E'?1:-1) * ($aData[4]);
+		}
+		// degrees decimal
+		// 40.446° N 79.982° W
+		//                      1                           2          3                           4
+		elseif (preg_match('/\\b([0-9]+[0-9]*\\.[0-9]+)[° ]+([NS])[, ]+([0-9]+[0-9]*\\.[0-9]+)[° ]+([EW])\\b/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]);
+			$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[3]);
+		}
+		// degrees decimal
+		// 12.34, 56.78
+		// [12.456,-78.90]
+		//                   1          2                             3                        4
+		elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))
+		{
+			$sFound    = $aData[0];
+			$fQueryLat = $aData[2];
+			$fQueryLon = $aData[3];
+		}
+
+		if (!validLatLon($fQueryLat, $fQueryLon)) return;
+		$sQuery = trim(str_replace($sFound, ' ', $sQuery));
+
+		return array('lat' => $fQueryLat, 'lon' => $fQueryLon, 'query' => $sQuery);
+	}