X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e03ae6d7ebdf56d084b00091382f5bcf0cb7e486..af06d31d21032670a944ca27023c6d12a5b18e8b:/lib/lib.php?ds=sidebyside

diff --git a/lib/lib.php b/lib/lib.php
index 20f5af17..897db8e7 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,6 +1,6 @@
 <?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');
@@ -11,10 +11,12 @@
 		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>";
@@ -22,10 +24,10 @@
 		}
 		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');
@@ -35,7 +37,13 @@
 		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 getParamBool($name, $default=false)
+	{
+		if (!isset($_GET[$name])) return $default;
 
+		return (bool) $_GET[$name];
 	}
 
 	function fail($sError, $sUserError = false)
@@ -43,33 +51,26 @@
 		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))
-                {
-			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');
-		preg_match_all('#processor	: [0-9]+#', $sCPU, $aMatches);
+		preg_match_all('#processor\s+: [0-9]+#', $sCPU, $aMatches);
 		return sizeof($aMatches[0]);
 	}
 
+
 	function getTotalMemoryMB()
 	{
 		$sCPU = file_get_contents('/proc/meminfo');
@@ -77,6 +78,7 @@
 		return (int)($aMatches[1]/1024);
 	}
 
+
 	function getCacheMemoryMB()
 	{
 		$sCPU = file_get_contents('/proc/meminfo');
@@ -84,48 +86,54 @@
 		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['rank_search'] != $b['rank_search'])
-			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 (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)
 		{
-			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', $sLangString, $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;
@@ -151,23 +159,47 @@
 		return $aLangPrefOrder;
 	}
 
-	function getWordSets($aWords)
+
+	function getWordSets($aWords, $iDepth)
 	{
 		$aResult = array(array(join(' ',$aWords)));
 		$sFirstToken = '';
-		while(sizeof($aWords) > 1)
+		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 = '';
+		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();
@@ -177,43 +209,16 @@
 			{
 				$aTokens[' '.$sWord] = ' '.$sWord;
 				$aTokens[$sWord] = $sWord;
-				//if (!strpos($sWord,' ')) $aTokens[$sWord] = $sWord;
 			}
 		}
 		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);
-		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
@@ -224,92 +229,44 @@
 			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;
 
-		// 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))
+		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))
+			$aPostcodes = array();
+			foreach($aNearPostcodes as $aPostcode)
 			{
-				var_dump($sSQL, $aNearPostcodes);
-				exit;
+				$aPostcodes[] = array('lat' => $aPostcode['lat'], 'lon' => $aPostcode['lon'], 'radius' => 0.005);
 			}
-		}
 
-		if (!sizeof($aNearPostcodes))
-		{
-			return false;
+			return $aPostcodes;
 		}
 
-		$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(
+ 'boundary:administrative:1' => array('label'=>'Continent','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'boundary:administrative:2' => array('label'=>'Country','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'place:country' => array('label'=>'Country','frequency'=>0,'icon'=>'poi_boundary_administrative','defzoom'=>6, 'defdiameter' => 15,),
+ 'boundary:administrative:3' => array('label'=>'State','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'boundary:administrative:4' => array('label'=>'State','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'place:state' => array('label'=>'State','frequency'=>0,'icon'=>'poi_boundary_administrative','defzoom'=>8, 'defdiameter' => 5.12,),
  'boundary:administrative:5' => array('label'=>'State District','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'boundary:administrative:6' => array('label'=>'County','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
+ 'boundary:administrative:7' => array('label'=>'County','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'place:county' => array('label'=>'County','frequency'=>108,'icon'=>'poi_boundary_administrative','defzoom'=>10, 'defdiameter' => 1.28,),
  'boundary:administrative:8' => array('label'=>'City','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'place:city' => array('label'=>'City','frequency'=>66,'icon'=>'poi_place_city','defzoom'=>12, 'defdiameter' => 0.32,),
  'boundary:administrative:9' => array('label'=>'City District','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'boundary:administrative:10' => array('label'=>'Suburb','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
  'boundary:administrative:11' => array('label'=>'Neighbourhood','frequency'=>0,'icon'=>'poi_boundary_administrative', 'defdiameter' => 0.32,),
- 'place:region' => array('label'=>'Region','frequency'=>0,'icon'=>'poi_boundary_administrative','defzoom'=>8, 'defdiameter' => 5.12,),
+ '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,),
@@ -318,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',),
@@ -346,6 +303,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',),
@@ -376,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',),
@@ -418,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'=>'',),
@@ -450,17 +408,18 @@
  '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'=>'',),
- 'historic:ruins' => array('label'=>'Ruins','frequency'=>483,'icon'=>'shopping_jewelry',),
+ 'historic:ruins' => array('label'=>'Ruins','frequency'=>483,'icon'=>'tourist_ruin',),
  'amenity:college' => array('label'=>'College','frequency'=>473,'icon'=>'education_school',),
  'historic:monument' => array('label'=>'Monument','frequency'=>470,'icon'=>'tourist_monument',),
  'railway:subway' => array('label'=>'Subway','frequency'=>385,'icon'=>'',),
@@ -498,7 +457,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'=>'',),
@@ -564,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'=>'',),
@@ -577,6 +535,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',),
@@ -585,14 +544,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();
@@ -603,27 +563,57 @@
 		}
 		return $aOrders;
 	}
-	
-	
 
-    function javascript_renderData($xVal)
-    {
-        header("Access-Control-Allow-Origin: *");
+	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;
+	}
+
 
-        $jsonout = json_encode($xVal);
+	function javascript_renderData($xVal, $iOptions = 0)
+	{
+		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)
 	{
@@ -642,11 +632,11 @@
 			}
 		}
 		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>";
 
@@ -659,6 +649,15 @@
 				}
 				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)
@@ -668,6 +667,15 @@
 				}
 				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>";
@@ -679,7 +687,7 @@
 				echo "<td>".$aRow['fLat']."</td>";
 				echo "<td>".$aRow['fLon']."</td>";
 				echo "<td>".$aRow['fRadius']."</td>";
-	
+
 				echo "</tr>";
 			}
 		}
@@ -687,123 +695,54 @@
 	}
 
 
-	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)";
-		IF (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
+		$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";
-	        $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);
+		//echo "<pre>";
+		//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']];
-			else $aTypeLabel = array('simplelabel'=>$aLine['class']);
-			if ($aTypeLabel && ($aLine['localname'] || $aLine['housenumber']))
+			elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]))
 			{
-				$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'];
+				$aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
+				$bFallback = true;
 			}
-		}
-//var_dump($aAddress);
-//exit;
-		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)
+			else
 			{
-				$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']))
-				{
-					$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'];
-				}
-				$iMinRank = $aLine['rank_address'];
+				$aTypeLabel = array('simplelabel'=>'address'.$aLine['rank_address']);
+				$bFallback = true;
 			}
-		}
-
-		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)
+			if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])))
 			{
-				$aAddress['country'] = $sCountryName;
+				$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+				$sTypeLabel = str_replace(' ','_',$sTypeLabel);
+				if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
+				{
+					$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
+				}
+				$aFallback[$sTypeLabel] = $bFallback;
 			}
 		}
-		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)
 	{
@@ -813,27 +752,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
@@ -864,14 +803,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
@@ -881,7 +820,7 @@
 			$iPlaceID = $oDB->getOne($sSQL);
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
+				var_Dump($sSQL, $iPlaceID);
 				exit;
 			}
 
@@ -891,7 +830,7 @@
 				$iPlaceID = $oDB->getOne($sSQL);
 				if (PEAR::IsError($iPlaceID))
 				{
-					var_Dump($sSQL, $iPlaceID); 
+					var_Dump($sSQL, $iPlaceID);
 					exit;
 				}
 			}
@@ -904,123 +843,143 @@
 		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 getBucketMemcache()
+	function addQuotes($s)
 	{
-		if (!CONST_ConnectionBucket_MemcacheServerAddress) return null;
-	        $m = new Memcached();
-        	$m->addServer(CONST_ConnectionBucket_MemcacheServerAddress, CONST_ConnectionBucket_MemcacheServerPort);
-		return $m;
+		return "'".$s."'";
 	}
 
-	function doBucket($asKey, $iRequestCost, $iLeakPerSecond, $iThreshold)
+	// returns boolean
+	function validLatLon($fLat,$fLon)
 	{
-	        $m = getBucketMemcache();
-		if (!$m) return 0;
-
-		$iMaxVal = 0;
-	        $t = time();
+		return ($fLat <= 90.1 && $fLat >= -90.1 && $fLon <= 180.1 && $fLon >= -180.1);
+	}
 
-		foreach($asKey as $sKey)
+	// 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))
 		{
-		        $aCurrentBlock = $m->get($sKey);
-	        	if (!$aCurrentBlock)
-			{
-		                $aCurrentBlock = array($iRequestCost, $t);
-        		}
-			else
-			{
-				// add RequestCost
-				// remove leak * the time since the last request 
-	        		$aCurrentBlock[0] += $iRequestCost - ($t - $aCurrentBlock[1])*$iLeakPerSecond;
-		        	$aCurrentBlock[1] = $t;
-			}
-
-	        	if ($aCurrentBlock[0] <= 0)
-			{
-                		$m->delete($sKey);
-		        }
-			else
-			{
-				// If we have hit the threshold stop and record this to the block list
-				if ($aCurrentBlock[0] >= $iThreshold)
-				{
-					$aCurrentBlock[0] = $iThreshold;
+			$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];
+		}
 
-					// Make up to 10 attempts to record this to memcache (with locking to prevent conflicts)
-					$i = 10;
-					for($i = 0; $i < 10; $i++)
-					{
-						$aBlockedList = $m->get('blockedList', null, $hCasToken);
-						if (!$aBlockedList)
-						{
-							$aBlockedList = array();
-							$m->add('blockedList', $aBlockedList);
-							$aBlockedList = $m->get('blockedList', null, $hCasToken);
-						}
-						if (!isset($aBlockedList[$sKey]))
-						{
-							$aBlockedList[$sKey] = array(1, $t);
-						}
-						else
-						{
-							$aBlockedList[$sKey][0]++;
-							$aBlockedList[$sKey][1] = $t;
-						}
-						$x = $m->cas($hCasToken, 'blockedList', $aBlockedList);
-						if ($x) break;
-					}
-				}
-				// Only keep in memcache until the time it would have expired (to avoid clutering memcache)
-	                	$m->set($sKey, $aCurrentBlock, $t + 1 + $aCurrentBlock[0]/$iLeakPerSecond);
-			}
+		if (!validLatLon($fQueryLat, $fQueryLon)) return;
+		$sQuery = trim(str_replace($sFound, ' ', $sQuery));
 
-			// Bucket result in the largest bucket we find
-			$iMaxVal = max($iMaxVal, $aCurrentBlock[0]);
-		}
+		return array('lat' => $fQueryLat, 'lon' => $fQueryLon, 'query' => $sQuery);
+	}
 
-		return $iMaxVal;
-        }
 
-	function getBucketBlocks()
+	function geometryText2Points($geometry_as_text, $fRadius)
 	{
-	        $m = getBucketMemcache();
-		if (!$m) return null;
-	        $t = time();
-		$aBlockedList = $m->get('blockedList', null, $hCasToken);
-		if (!$aBlockedList) $aBlockedList = array();
-		foreach($aBlockedList as $sKey => $aDetails)
+		$aPolyPoints = NULL;
+		if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
 		{
-			$aCurrentBlock = $m->get($sKey);
-			if (!$aCurrentBlock) $aCurrentBlock = array(0, $t);
-			$iCurrentBucketSize = max(0, $aCurrentBlock[0] - ($t - $aCurrentBlock[1])*CONST_ConnectionBucket_LeakRate);
-			$aBlockedList[$sKey] = array(
-				'totalBlocks' => $aDetails[0],
-				'lastBlockTimestamp' => $aDetails[1],
-				'currentBucketSize' => $iCurrentBucketSize,
-				'lastRequestBlocked' => $aCurrentBlock[0] >= CONST_ConnectionBucket_BlockLimit,
-				'currentlyBlocked' => $iCurrentBucketSize + (CONST_ConnectionBucket_Cost_Reverse) >= CONST_ConnectionBucket_BlockLimit,
-				);
+			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);
 		}
-		return $aBlockedList;
+		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 clearBucketBlocks()
+	function createPointsAroundCenter($fLon, $fLat, $fRadius)
 	{
-	        $m = getBucketMemcache();
-		if (!$m) return false;
-		$m->delete('blockedList');
-		return true;
+			$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;
 	}