From 4429121341de7727be26d56b9a1d7ada84359ea6 Mon Sep 17 00:00:00 2001
From: Brian Quinion <brian.quinion@mapquest.com>
Date: Tue, 27 Aug 2013 17:21:20 +0100
Subject: [PATCH] move more code into library

---
 lib/template/address-json.php   |    2 +-
 lib/template/address-jsonv2.php |    2 +-
 lib/template/address-xml.php    |    2 +-
 lib/template/search-html.php    |   10 +-
 website/reverse.php             |  137 +--
 website/search.php              | 1602 ++-----------------------------
 6 files changed, 104 insertions(+), 1651 deletions(-)

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 0a1d074a..2f077818 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -21,7 +21,7 @@
                 if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
                 if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
+		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aPlace['aAddress'];
 	}
 
 	javascript_renderData($aFilteredPlaces);
diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 00f8750d..baf53129 100644
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -26,7 +26,7 @@
 
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
                 $aFilteredPlaces['name'] = $aPlace['placename'];
-		if ($bShowAddressDetails && $aAddress && sizeof($aAddress)) $aFilteredPlaces['address'] = $aAddress;
+		if ($bShowAddressDetails && $aPlace['aAddress'] && sizeof($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
 	}
 
 	javascript_renderData($aFilteredPlaces);
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 9989bb31..0747844a 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -30,7 +30,7 @@
 
 		if ($bShowAddressDetails) {
 			echo "<addressparts>";
-			foreach($aAddress as $sKey => $sValue)
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
 			{
 				$sKey = str_replace(' ','_',$sKey);
 				echo "<$sKey>";
diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 01647d91..b270e02f 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -15,14 +15,14 @@
 	<script src="js/prototype-1.6.0.3.js" type="text/javascript"></script>
 
 	<script type="text/javascript">
-        
+
 		var map;
 
 		function handleResize()
 		{
 			if ($('searchresults'))
 			{
-                var viewwidth = ((document.documentElement.clientWidth > 0?document.documentElement.clientWidth:document.documentElement.offsetWidth) - 200) + 'px';
+				var viewwidth = ((document.documentElement.clientWidth > 0?document.documentElement.clientWidth:document.documentElement.offsetWidth) - 200) + 'px';
 				$('map').style.width = viewwidth;
 				$('report').style.width = viewwidth;
 			}
@@ -31,7 +31,7 @@
 				$('map').style.width = ((document.documentElement.clientWidth > 0?document.documentElement.clientWidth:document.documentElement.offsetWidth) - 0) + 'px';
 				$('map').style.left = '0px';
 			}
-			
+
 			if ($('map')) $('map').style.height = ((document.documentElement.clientHeight > 0?document.documentElement.clientHeight:document.documentElement.offsetHeight) - 38) + 'px';
 			if ($('searchresults')) $('searchresults').style.height = ((document.documentElement.clientHeight > 0?document.documentElement.clientHeight:document.documentElement.offsetHeight) - 38) + 'px';
 			if ($('report')) $('report').style.height = ((document.documentElement.clientHeight > 0?document.documentElement.clientHeight:document.documentElement.offsetHeight) - 38) + 'px';
@@ -167,7 +167,7 @@ target="_blank">FAQ</a></td>
 	</div>
 
 <?php
-	if ($sQuery || sizeof($aSearchResults))
+	if ($sQuery)
 	{
 ?>
 	<div id="searchresultsfade1"></div><div id="searchresultsfade2"></div><div id="searchresultsfade3"></div><div id="searchresultsfade4"></div>
@@ -243,7 +243,7 @@ the component to 'nominatim'.  You can search for existing bug reports <a href="
 the problem relates to missing data, the osm id of the item that is missing.  Problems that contain enough detail are likely to get looked at before ones that 
 require significant research!</p>
 		</div>
-		
+
 <!--
  		<p>Please use this form to report problems with the search results.  Of particular interest are items missing, but please also use this form to 
 report any other problems.</p>
diff --git a/website/reverse.php b/website/reverse.php
index b4ab97b6..ee6a6100 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -3,6 +3,8 @@
 
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
+	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
 	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
 	{
@@ -32,139 +34,30 @@
 
 	// Preferred language
 	$aLangPrefOrder = getPreferredLanguages();
-	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
 	$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 	if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
 	{
-		$iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc"));
-		if (CONST_Debug) var_dump($sSQL);
-		if (!$iPlaceID) $sError = 'OSM ID Not Found';
-	}
-	else
-	{
-		// Location to look up
-		$fLat = (float)$_GET['lat'];
-		$fLon = (float)$_GET['lon'];
-		$sPointSQL = "ST_SetSRID(ST_Point($fLon,$fLat),4326)";
-
-		// 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
-				);
-		$iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
-
-		// Find the nearest point
-		$fSearchDiam = 0.0004;
-		$iPlaceID = null;
-		$aArea = false;
-		$fMaxAreaDistance = 1;
-		while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
-		{
-			$fSearchDiam = $fSearchDiam * 2;
-
-			// If we have to expand the search area by a large amount then we need a larger feature
-			// then there is a limit to how small the feature should be
-			if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
-			if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
-			if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
-			if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
-			if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
-			if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-			if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
-			if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
+		$oPlaceLookup = new PlaceLookup($oDB);
+		$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+		$oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
+		$oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
 
-			$sSQL = 'select place_id,parent_place_id,rank_search from placex';
-			$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-			$sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
-			$sSQL .= ' and (name is not null or housenumber is not null)';
-			$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')';
-			$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
-			$sSQL .= ' and indexed_status = 0 ';
-			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
-			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-			if (CONST_Debug) var_dump($sSQL);
-			$aPlace = $oDB->getRow($sSQL);
-			if (PEAR::IsError($aPlace))
-			{
-				failInternalError("Could not determine closest place.", $sSQL, $aPlace);
-			}
-			$iPlaceID = $aPlace['place_id'];
-			$iParentPlaceID = $aPlace['parent_place_id'];
-		}
+		$aPlace = $oPlaceLookup->lookup();
 
-		// The point we found might be too small - use the address to find what it is a child of
-		if ($iPlaceID && $iMaxRank < 28)
-		{
-			if ($aPlace['rank_search'] > 28 && $iParentPlaceID)
-			{
-				$iPlaceID = $iParentPlaceID;
-			}
-			$sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";
-			$iPlaceID = $oDB->getOne($sSQL);
-			if (PEAR::IsError($iPlaceID))
-			{
-				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
-			}
-			if (!$iPlaceID)
-			{
-				$iPlaceID = $aPlace['place_id'];
-			}
-		}
+		//if (!$iPlaceID) $sError = 'OSM ID Not Found';
 	}
-
-	if ($iPlaceID)
+	else
 	{
-		$sSQL = "select placex.*,";
-		$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-		$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-		$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
-		$sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
-		$sSQL .= " from placex where place_id = $iPlaceID ";
-
-		$aPlace = $oDB->getRow($sSQL);
-		//var_dump($sSQL, $aPlace); exit;
+		$oReverseGeocode = new ReverseGeocode($oDB);
+		$oReverseGeocode->setLanguagePreference($aLangPrefOrder);
+		$oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails);
 
-		if ($bShowAddressDetails)
-		{
-			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
-		}
-		$aClassType = getClassTypes();
-		$sAddressType = '';
-		$sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
-		if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
-		{
-			$sAddressType = $aClassType[$aClassType]['simplelabel'];
-		}
-		else
-		{
-			$sClassType = $aPlace['class'].':'.$aPlace['type'];
-			if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
-				$sAddressType = $aClassType[$sClassType]['simplelabel'];
-			else $sAddressType = $aPlace['class'];
-		}
-		$aPlace['addresstype'] = $sAddressType;
+		$oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
+		$oReverseGeocode->setZoom(@$_GET['zoom']);
 
+		$aPlace = $oReverseGeocode->lookup();
 	}
 
 	if (CONST_Debug) exit;
diff --git a/website/search.php b/website/search.php
index 272324b1..98c878ea 100755
--- a/website/search.php
+++ b/website/search.php
@@ -3,6 +3,7 @@
 
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
+        require_once(CONST_BasePath.'/lib/Geocode.php');
 
 	ini_set('memory_limit', '200M');
 
@@ -12,51 +13,45 @@
 	$fLat = CONST_Default_Lat;
 	$fLon = CONST_Default_Lon;
 	$iZoom = CONST_Default_Zoom;
-	$bBoundingBoxSearch = isset($_GET['bounded'])?(bool)$_GET['bounded']:false;
-	$sOutputFormat = 'html';
-	$aSearchResults = array();
-	$aExcludePlaceIDs = array();
-	$sCountryCodesSQL = false;
-	$bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
-	$bReverseInPlan = false;
-	$iFinalLimit = isset($_GET['limit'])?(int)$_GET['limit']:10;
-	$iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0;
-	$iMaxRank = 20;
-	if ($iFinalLimit > 50) $iFinalLimit = 50;
-	$iLimit = $iFinalLimit + min($iFinalLimit, 10);
-	$iMinAddressRank = 0;
-	$iMaxAddressRank = 30;
-	$aAddressRankList = array();
-	$sAllowedTypesSQLList = false;
+	$sSuggestionURL = false;
+
+	$oGeocode =& new Geocode($oDB);
+
+	$aLangPrefOrder = getPreferredLanguages();
+	$oGeocode->setLanguagePreference($aLangPrefOrder);
+
+	if (isset($_GET['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$_GET['addressdetails']);
+	if (isset($_GET['bounded'])) $oGeocode->setBounded((bool)$_GET['bounded']);
+	if (isset($_GET['dedupe'])) $oGeocode->setDedupe((bool)$_GET['dedupe']);
+
+	if (isset($_GET['limit'])) $oGeocode->setLimit((int)$_GET['limit']);
+	if (isset($_GET['offset'])) $oGeocode->setOffset((int)$_GET['offset']);
 
 	// Format for output
+	$sOutputFormat = 'html';
 	if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' ||  $_GET['format'] == 'jsonv2'))
 	{
 		$sOutputFormat = $_GET['format'];
 	}
 
 	// Show / use polygons
-	$bShowPolygons = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
 	if ($sOutputFormat == 'html')
 	{
-		$bAsText = $bShowPolygons;
-		$bShowPolygons = false;
-		$bAsGeoJSON = false;
-		$bAsKML = false;
-		$bAsSVG = false;
+		if (isset($_GET['polygon'])) $oGeocode->setIncludePolygonAsPoints((bool)$_GET['polygon']);
 	}
 	else
 	{
+		$bAsPoints = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
 		$bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
 		$bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
 		$bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
 		$bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
-		if ((($bShowPolygons?1:0)
-					+ ($bAsGeoJSON?1:0)
-					+ ($bAsKML?1:0)
-					+ ($bAsSVG?1:0)
-					+ ($bAsText?1:0)
-			) > CONST_PolygonOutput_MaximumTypes)
+		if ( ( ($bAsGeoJSON?1:0)
+		     + ($bAsKML?1:0)
+		     + ($bAsSVG?1:0)
+		     + ($bAsText?1:0)
+		     + ($bAsPoints?1:0)
+		     ) > CONST_PolygonOutput_MaximumTypes)
 		{
 			if (CONST_PolygonOutput_MaximumTypes)
 			{
@@ -68,19 +63,13 @@
 			}
 			exit;
 		}
+		$oGeocode->setIncludePolygonAsText($bAsText);
+		$oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON);
+		$oGeocode->setIncludePolygonAsKML($bAsKML);
+		$oGeocode->setIncludePolygonAsSVG($bAsSVG);
 	}
 
-	// Show address breakdown
-	$bShowAddressDetails = isset($_GET['addressdetails']) && $_GET['addressdetails'];
-
-	// Preferred language
-	$aLangPrefOrder = getPreferredLanguages();
-	if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
-	if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
-	if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
-
-	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
-
+	// List of excluded Place IDs - used for more acurate pageing
 	if (isset($_GET['exclude_place_ids']) && $_GET['exclude_place_ids'])
 	{
 		foreach(explode(',',$_GET['exclude_place_ids']) as $iExcludedPlaceID)
@@ -88,32 +77,14 @@
 			$iExcludedPlaceID = (int)$iExcludedPlaceID;
 			if ($iExcludedPlaceID) $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
 		}
+		$oGeocode->setExcludedPlaceIds($aExcludePlaceIDs);
 	}
 
 	// Only certain ranks of feature
-	if (isset($_GET['featureType']) && !isset($_GET['featuretype'])) $_GET['featuretype'] = $_GET['featureType'];
-
-	if (isset($_GET['featuretype']))
-	{
-		switch($_GET['featuretype'])
-		{
-		case 'country':
-			$iMinAddressRank = $iMaxAddressRank = 4;
-			break;
-		case 'state':
-			$iMinAddressRank = $iMaxAddressRank = 8;
-			break;
-		case 'city':
-			$iMinAddressRank = 14;
-			$iMaxAddressRank = 16;
-			break;
-		case 'settlement':
-			$iMinAddressRank = 8;
-			$iMaxAddressRank = 20;
-			break;
-		}
-	}
+	if (isset($_GET['featureType'])) $oGeocode->setFeatureType($_GET['featureType']);
+	if (isset($_GET['featuretype'])) $oGeocode->setFeatureType($_GET['featuretype']);
 
+	// Country code list
 	if (isset($_GET['countrycodes']))
 	{
 		$aCountryCodes = array();
@@ -121,1504 +92,93 @@
 		{
 			if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
 			{
-				$aCountryCodes[] = "'".strtolower($sCountryCode)."'";
+				$aCountryCodes[] = strtolower($sCountryCode);
 			}
 		}
-		$sCountryCodesSQL = join(',', $aCountryCodes);
+		$oGeocode->setCountryCodeList($aCountryCodes);
 	}
 
-	// Search query
-	$sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
-	if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
+	if (isset($_GET['viewboxlbrt']) && $_GET['viewboxlbrt'])
 	{
-		$sQuery = substr($_SERVER['PATH_INFO'], 1);
-
-		// reverse order of '/' separated string
-		$aPhrases = explode('/', $sQuery);
-		$aPhrases = array_reverse($aPhrases);
-		$sQuery = join(', ',$aPhrases);
+		$aCoOrdinatesLBRT = explode(',',$_GET['viewboxlbrt']);
+		$oGeocode->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
 	}
 
-	// Structured query?
-	$aStructuredOptions = array(
-				array('amenity', 26, 30, false),
-				array('street', 26, 30, false),
-				array('city', 14, 24, false),
-				array('county', 9, 13, false),
-				array('state', 8, 8, false),
-				array('country', 4, 4, false),
-				array('postalcode', 5, 11, array(5, 11)),
-				);
-	$aStructuredQuery = array();
-	$sAllowedTypesSQLList = '';
-	foreach($aStructuredOptions as $aStructuredOption)
+	if (isset($_GET['viewbox']) && $_GET['viewbox'])
 	{
-		loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $aAddressRankList, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2], $aStructuredOption[3]);
-	}
-	if (sizeof($aStructuredQuery) > 0) 
-	{
-		$sQuery = join(', ', $aStructuredQuery);
-		if ($iMaxAddressRank < 30)
-		{
-			$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
-		}
+		$aCoOrdinatesLTRB = explode(',',$_GET['viewbox']);
+		$oGeocode->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
 	}
 
-	if ($sQuery)
+	if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth'])
 	{
-		$hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder);
-
-		// Hack to make it handle "new york, ny" (and variants) correctly
-		$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $sQuery);
-		if (isset($aLangPrefOrder['name:en']))
-		{
-			$sQuery = preg_replace('/,\s*il\s*(,|$)/',', illinois\1', $sQuery);
-			$sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery);
-			$sQuery = preg_replace('/,\s*la\s*(,|$)/',', louisiana\1', $sQuery);
-		}
-
-		// If we have a view box create the SQL
-		// Small is the actual view box, Large is double (on each axis) that
-		$sViewboxCentreSQL = $sViewboxSmallSQL = $sViewboxLargeSQL = false;
-		if (isset($_GET['viewboxlbrt']) && $_GET['viewboxlbrt'])
-		{
-			$aCoOrdinatesLBRT = explode(',',$_GET['viewboxlbrt']);
-			$_GET['viewbox'] = $aCoOrdinatesLBRT[0].','.$aCoOrdinatesLBRT[3].','.$aCoOrdinatesLBRT[2].','.$aCoOrdinatesLBRT[1];
-		}
-		if (isset($_GET['viewbox']) && $_GET['viewbox'])
-		{
-			$aCoOrdinates = explode(',',$_GET['viewbox']);
-			$sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aCoOrdinates[0].",".(float)$aCoOrdinates[1]."),ST_Point(".(float)$aCoOrdinates[2].",".(float)$aCoOrdinates[3].")),4326)";
-			$fHeight = $aCoOrdinates[0]-$aCoOrdinates[2];
-			$fWidth = $aCoOrdinates[1]-$aCoOrdinates[3];
-			$aCoOrdinates[0] += $fHeight;
-			$aCoOrdinates[2] -= $fHeight;
-			$aCoOrdinates[1] += $fWidth;
-			$aCoOrdinates[3] -= $fWidth;
-			$sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aCoOrdinates[0].",".(float)$aCoOrdinates[1]."),ST_Point(".(float)$aCoOrdinates[2].",".(float)$aCoOrdinates[3].")),4326)";
-		}
-		else
-		{
-			$bBoundingBoxSearch = false;
-		}
-		if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth'])
-		{
-			$aPoints = explode(',',$_GET['route']);
-			if (sizeof($aPoints) % 2 != 0)
-			{
-				userError("Uneven number of points");
-				exit;
-			}
-			$sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-			$fPrevCoord = false;
-			foreach($aPoints as $i => $fPoint)
-			{
-				if ($i%2)
-				{
-					if ($i != 1) $sViewboxCentreSQL .= ",";
-					$sViewboxCentreSQL .= ((float)$fPoint).' '.$fPrevCoord;
-				}
-				else
-				{
-					$fPrevCoord = (float)$fPoint;
-				}
-			}
-			$sViewboxCentreSQL .= ")'::geometry,4326)";
-
-			$sSQL = "select st_buffer(".$sViewboxCentreSQL.",".(float)($_GET['routewidth']/69).")";
-			$sViewboxSmallSQL = $oDB->getOne($sSQL);
-			if (PEAR::isError($sViewboxSmallSQL))
-			{
-				failInternalError("Could not get small viewbox.", $sSQL, $sViewboxSmallSQL);
-			}
-			$sViewboxSmallSQL = "'".$sViewboxSmallSQL."'::geometry";
-
-			$sSQL = "select st_buffer(".$sViewboxCentreSQL.",".(float)($_GET['routewidth']/30).")";
-			$sViewboxLargeSQL = $oDB->getOne($sSQL);
-			if (PEAR::isError($sViewboxLargeSQL))
-			{
-				failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
-			}
-			$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
-			$bBoundingBoxSearch = true;
-		}
-
-		// Do we have anything that looks like a lat/lon pair?
-		if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[ ]+([0-9.]+)?[, ]+([EW])[ ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?\\b/', $sQuery, $aData))
-		{
-			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
-			$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
-			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-			{
-				$_GET['nearlat'] = $fQueryLat;
-				$_GET['nearlon'] = $fQueryLon;
-				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-			}
-		}
-		elseif (preg_match('/\\b([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([NS])[, ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([EW])\\b/', $sQuery, $aData))
-		{
-			$fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
-			$fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
-			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-			{
-				$_GET['nearlat'] = $fQueryLat;
-				$_GET['nearlon'] = $fQueryLon;
-				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-			}
-		}
-		elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))
+		$aPoints = explode(',',$_GET['route']);
+		if (sizeof($aPoints) % 2 != 0)
 		{
-			$fQueryLat = $aData[2];
-			$fQueryLon = $aData[3];
-			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-			{
-				$_GET['nearlat'] = $fQueryLat;
-				$_GET['nearlon'] = $fQueryLon;
-				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-			}
+			userError("Uneven number of points");
+			exit;
 		}
-
-		if ($sQuery || $aStructuredQuery)
+		$fPrevCoord = false;
+		$aRoute = array();
+		foreach($aPoints as $i => $fPoint)
 		{
-			// Start with a blank search
-			$aSearches = array(
-				array('iSearchRank' => 0, 'iNamePhrase' => -1, 'sCountryCode' => false, 'aName'=>array(), 'aAddress'=>array(), 'aFullNameAddress'=>array(),
-				      'aNameNonSearch'=>array(), 'aAddressNonSearch'=>array(),
-				      'sOperator'=>'', 'aFeatureName' => array(), 'sClass'=>'', 'sType'=>'', 'sHouseNumber'=>'', 'fLat'=>'', 'fLon'=>'', 'fRadius'=>'')
-			);
-
-			$sNearPointSQL = false;
-			if (isset($_GET['nearlat']) && isset($_GET['nearlon']))
-			{
-				$sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$_GET['nearlon'].",".(float)$_GET['nearlat']."),4326)";
-				$aSearches[0]['fLat'] = (float)$_GET['nearlat'];
-				$aSearches[0]['fLon'] = (float)$_GET['nearlon'];
-				$aSearches[0]['fRadius'] = 0.1;
-			}
-
-			$bSpecialTerms = false;
-			preg_match_all('/\\[(.*)=(.*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-			$aSpecialTerms = array();
-			foreach($aSpecialTermsRaw as $aSpecialTerm)
-			{
-				$sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-				$aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
-			}
-
-			preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-			$aSpecialTerms = array();
-			if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity'])
-			{
-				$aSpecialTermsRaw[] = array('['.$aStructuredQuery['amenity'].']', $aStructuredQuery['amenity']);
-				unset($aStructuredQuery['amenity']);
-			}
-			foreach($aSpecialTermsRaw as $aSpecialTerm)
-			{
-				$sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-				$sToken = $oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string");
-				$sSQL = 'select * from (select word_id,word_token, word, class, type, country_code, operator';
-				$sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null';
-				if (CONST_Debug) var_Dump($sSQL);
-				$aSearchWords = $oDB->getAll($sSQL);
-				$aNewSearches = array();
-				foreach($aSearches as $aSearch)
-				{
-					foreach($aSearchWords as $aSearchTerm)
-					{
-						$aNewSearch = $aSearch;
-						if ($aSearchTerm['country_code'])
-						{
-							$aNewSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
-							$aNewSearches[] = $aNewSearch;
-							$bSpecialTerms = true;
-						}
-						if ($aSearchTerm['class'])
-						{
-							$aNewSearch['sClass'] = $aSearchTerm['class'];
-							$aNewSearch['sType'] = $aSearchTerm['type'];
-							$aNewSearches[] = $aNewSearch;
-							$bSpecialTerms = true;
-						}
-					}
-				}
-				$aSearches = $aNewSearches;
-			}
-
-			// Split query into phrases
-			// Commas are used to reduce the search space by indicating where phrases split
-			if (sizeof($aStructuredQuery) > 0)
+			if ($i%2)
 			{
-				$aPhrases = $aStructuredQuery;
-				$bStructuredPhrases = true;
+				$aRoute[] = array((float)$fPoint, $fPrevCoord);
 			}
 			else
 			{
-				$aPhrases = explode(',',$sQuery);
-				$bStructuredPhrases = false;
-			}
-
-			// Convert each phrase to standard form
-			// Create a list of standard words
-			// Get all 'sets' of words
-			// Generate a complete list of all
-			$aTokens = array();
-			foreach($aPhrases as $iPhrase => $sPhrase)
-			{
-				$aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
-				if (PEAR::isError($aPhrase))
-				{
-					userError("Illegal query string (not an UTF-8 string): ".$sPhrase);
-					if (CONST_Debug) var_dump($aPhrase);
-					exit;
-				}
-				if (trim($aPhrase['string']))
-				{
-					$aPhrases[$iPhrase] = $aPhrase;
-					$aPhrases[$iPhrase]['words'] = explode(' ',$aPhrases[$iPhrase]['string']);
-					$aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
-					$aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));
-				}
-				else
-				{
-					unset($aPhrases[$iPhrase]);
-				}
-			}
-
-			// reindex phrases - we make assumptions later on
-			$aPhraseTypes = array_keys($aPhrases);
-			$aPhrases = array_values($aPhrases);
-
-			if (sizeof($aTokens))
-			{
-
-				// Check which tokens we have, get the ID numbers
-				$sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count';
-				$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
-				//$sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency;
-				//$sSQL .= ' group by word_token, word, class, type, country_code';
-
-				if (CONST_Debug) var_Dump($sSQL);
-
-				$aValidTokens = array();
-				if (sizeof($aTokens)) $aDatabaseWords = $oDB->getAll($sSQL);
-				else $aDatabaseWords = array();
-				if (PEAR::IsError($aDatabaseWords))
-				{
-					failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
-				}
-				$aPossibleMainWordIDs = array();
-				$aWordFrequencyScores = array();
-				foreach($aDatabaseWords as $aToken)
-				{
-					// Very special case - require 2 letter country param to match the country code found
-					if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country'])
-							&& strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code'])
-					{
-						continue;
-					}
-
-					if (isset($aValidTokens[$aToken['word_token']]))
-					{
-						$aValidTokens[$aToken['word_token']][] = $aToken;
-					}
-					else
-					{
-						$aValidTokens[$aToken['word_token']] = array($aToken);
-					}
-					if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
-					$aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
-				}
-				if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
-
-				// Try and calculate GB postcodes we might be missing
-				foreach($aTokens as $sToken)
-				{
-					// Source of gb postcodes is now definitive - always use
-					if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData))
-					{
-						if (substr($aData[1],-2,1) != ' ')
-						{
-							$aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1));
-							$aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1);
-						}
-						$aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $oDB);
-						if ($aGBPostcodeLocation)
-						{
-							$aValidTokens[$sToken] = $aGBPostcodeLocation;
-						}
-					}
-					// US ZIP+4 codes - if there is no token,
-					// 	merge in the 5-digit ZIP code
-					else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData))
-					{
-						if (isset($aValidTokens[$aData[1]]))
-						{
-							foreach($aValidTokens[$aData[1]] as $aToken)
-							{
-								if (!$aToken['class'])
-								{
-									if (isset($aValidTokens[$sToken]))
-									{
-										$aValidTokens[$sToken][] = $aToken;
-									}
-									else
-									{
-										$aValidTokens[$sToken] = array($aToken);
-									}
-								}
-							}
-						}
-					}
-				}
-
-				foreach($aTokens as $sToken)
-				{
-					// Unknown single word token with a number - assume it is a house number
-					if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken))
-					{
-						$aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
-					}
-				}
-
-				// Any words that have failed completely?
-				// TODO: suggestions
-
-				// Start the search process
-				$aResultPlaceIDs = array();
-
-				/*
-				   Calculate all searches using aValidTokens i.e.
-				   'Wodsworth Road, Sheffield' =>
-
-				   Phrase Wordset
-				   0      0       (wodsworth road)
-				   0      1       (wodsworth)(road)
-				   1      0       (sheffield)
-
-				   Score how good the search is so they can be ordered
-				 */
-				foreach($aPhrases as $iPhrase => $sPhrase)
-				{
-					$aNewPhraseSearches = array();
-					if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
-					else $sPhraseType = '';
-
-					foreach($aPhrases[$iPhrase]['wordsets'] as $aWordset)
-					{
-						$aWordsetSearches = $aSearches;
-
-						// Add all words from this wordset
-						foreach($aWordset as $iToken => $sToken)
-						{
-							//echo "<br><b>$sToken</b>";
-							$aNewWordsetSearches = array();
-
-							foreach($aWordsetSearches as $aCurrentSearch)
-							{
-								//echo "<i>";
-								//var_dump($aCurrentSearch);
-								//echo "</i>";
-
-								// If the token is valid
-								if (isset($aValidTokens[' '.$sToken]))
-								{
-									foreach($aValidTokens[' '.$sToken] as $aSearchTerm)
-									{
-										$aSearch = $aCurrentSearch;
-										$aSearch['iSearchRank']++;
-										if (($sPhraseType == '' || $sPhraseType == 'country') && !empty($aSearchTerm['country_code']) && $aSearchTerm['country_code'] != '0')
-										{
-											if ($aSearch['sCountryCode'] === false)
-											{
-												$aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
-												// Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
-												// If reverse order is enabled, it may appear at the beginning as well.
-												if (($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)) &&
-														(!$bReverseInPlan || $iToken > 0 || $iPhrase > 0))
-												{
-													$aSearch['iSearchRank'] += 5;
-												}
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-											}
-										}
-										elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null)
-										{
-											if ($aSearch['fLat'] === '')
-											{
-												$aSearch['fLat'] = $aSearchTerm['lat'];
-												$aSearch['fLon'] = $aSearchTerm['lon'];
-												$aSearch['fRadius'] = $aSearchTerm['radius'];
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-											}
-										}
-										elseif ($sPhraseType == 'postalcode')
-										{
-											// We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
-											if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-											{
-												// If we already have a name try putting the postcode first
-												if (sizeof($aSearch['aName']))
-												{
-													$aNewSearch = $aSearch;
-													$aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
-													$aNewSearch['aName'] = array();
-													$aNewSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
-												}
-
-												if (sizeof($aSearch['aName']))
-												{
-													if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false))
-													{
-														$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													}
-													else
-													{
-														$aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-														$aSearch['iSearchRank'] += 1000; // skip;
-													}
-												}
-												else
-												{
-													$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													//$aSearch['iNamePhrase'] = $iPhrase;
-												}
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-											}
-
-										}
-										elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house')
-										{
-											if ($aSearch['sHouseNumber'] === '')
-											{
-												$aSearch['sHouseNumber'] = $sToken;
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-												/*
-												// Fall back to not searching for this item (better than nothing)
-												$aSearch = $aCurrentSearch;
-												$aSearch['iSearchRank'] += 1;
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-												 */
-											}
-										}
-										elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null)
-										{
-											if ($aSearch['sClass'] === '')
-											{
-												$aSearch['sOperator'] = $aSearchTerm['operator'];
-												$aSearch['sClass'] = $aSearchTerm['class'];
-												$aSearch['sType'] = $aSearchTerm['type'];
-												if (sizeof($aSearch['aName'])) $aSearch['sOperator'] = 'name';
-												else $aSearch['sOperator'] = 'near'; // near = in for the moment
-
-												// Do we have a shortcut id?
-												if ($aSearch['sOperator'] == 'name')
-												{
-													$sSQL = "select get_tagpair('".$aSearch['sClass']."', '".$aSearch['sType']."')";
-													if ($iAmenityID = $oDB->getOne($sSQL))
-													{
-														$aValidTokens[$aSearch['sClass'].':'.$aSearch['sType']] = array('word_id' => $iAmenityID);
-														$aSearch['aName'][$iAmenityID] = $iAmenityID;
-														$aSearch['sClass'] = '';
-														$aSearch['sType'] = '';
-													}
-												}
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-											}
-										}
-										elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-										{
-											if (sizeof($aSearch['aName']))
-											{
-												if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false))
-												{
-													$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-												}
-												else
-												{
-													$aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													$aSearch['iSearchRank'] += 1000; // skip;
-												}
-											}
-											else
-											{
-												$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-												//$aSearch['iNamePhrase'] = $iPhrase;
-											}
-											if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-										}
-									}
-								}
-								if (isset($aValidTokens[$sToken]))
-								{
-									// Allow searching for a word - but at extra cost
-									foreach($aValidTokens[$sToken] as $aSearchTerm)
-									{
-										if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-										{
-											if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strlen($sToken) >= 4)
-											{
-												$aSearch = $aCurrentSearch;
-												$aSearch['iSearchRank'] += 1;
-												if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
-												{
-													$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-												}
-												elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version?
-												{
-													foreach($aValidTokens[' '.$sToken] as $aSearchTermToken)
-													{
-														if (empty($aSearchTermToken['country_code'])
-																&& empty($aSearchTermToken['lat'])
-																&& empty($aSearchTermToken['class']))
-														{
-															$aSearch = $aCurrentSearch;
-															$aSearch['iSearchRank'] += 1;
-															$aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id'];
-															if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-														}
-													}
-												}
-												else
-												{
-													$aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-													if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-												}
-											}
-
-											if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase)
-											{
-												$aSearch = $aCurrentSearch;
-												$aSearch['iSearchRank'] += 2;
-												if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
-												if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
-													$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-												else
-													$aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-												$aSearch['iNamePhrase'] = $iPhrase;
-												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-											}
-										}
-									}
-								}
-								else
-								{
-									// Allow skipping a word - but at EXTREAM cost
-									//$aSearch = $aCurrentSearch;
-									//$aSearch['iSearchRank']+=100;
-									//$aNewWordsetSearches[] = $aSearch;
-								}
-							}
-							// Sort and cut
-							usort($aNewWordsetSearches, 'bySearchRank');
-							$aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50);
-						}
-						//var_Dump('<hr>',sizeof($aWordsetSearches)); exit;
-
-						$aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches);
-						usort($aNewPhraseSearches, 'bySearchRank');
-
-						$aSearchHash = array();
-						foreach($aNewPhraseSearches as $iSearch => $aSearch)
-						{
-							$sHash = serialize($aSearch);
-							if (isset($aSearchHash[$sHash])) unset($aNewPhraseSearches[$iSearch]);
-							else $aSearchHash[$sHash] = 1;
-						}
-
-						$aNewPhraseSearches = array_slice($aNewPhraseSearches, 0, 50);
-					}
-
-					// Re-group the searches by their score, junk anything over 20 as just not worth trying
-					$aGroupedSearches = array();
-					foreach($aNewPhraseSearches as $aSearch)
-					{
-						if ($aSearch['iSearchRank'] < $iMaxRank)
-						{
-							if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
-							$aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
-						}
-					}
-					ksort($aGroupedSearches);
-
-					$iSearchCount = 0;
-					$aSearches = array();
-					foreach($aGroupedSearches as $iScore => $aNewSearches)
-					{
-						$iSearchCount += sizeof($aNewSearches);
-						$aSearches = array_merge($aSearches, $aNewSearches);
-						if ($iSearchCount > 50) break;
-					}
-
-					//if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
-
-				}
-
-			}
-			else
-			{
-				// Re-group the searches by their score, junk anything over 20 as just not worth trying
-				$aGroupedSearches = array();
-				foreach($aSearches as $aSearch)
-				{
-					if ($aSearch['iSearchRank'] < $iMaxRank)
-					{
-						if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
-						$aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
-					}
-				}
-				ksort($aGroupedSearches);
-			}
-
-			if (CONST_Debug) var_Dump($aGroupedSearches);
-
-			if ($bReverseInPlan)
-			{
-				$aCopyGroupedSearches = $aGroupedSearches;
-				foreach($aCopyGroupedSearches as $iGroup => $aSearches)
-				{
-					foreach($aSearches as $iSearch => $aSearch)
-					{
-						if (sizeof($aSearch['aAddress']))
-						{
-							$iReverseItem = array_pop($aSearch['aAddress']);
-							if (isset($aPossibleMainWordIDs[$iReverseItem]))
-							{
-								$aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']);
-								$aSearch['aName'] = array($iReverseItem);
-								$aGroupedSearches[$iGroup][] = $aSearch;
-							}
-							//$aReverseSearch['aName'][$iReverseItem] = $iReverseItem;
-							//$aGroupedSearches[$iGroup][] = $aReverseSearch;
-						}
-					}
-				}
-			}
-
-			if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0)
-			{
-				$aCopyGroupedSearches = $aGroupedSearches;
-				foreach($aCopyGroupedSearches as $iGroup => $aSearches)
-				{
-					foreach($aSearches as $iSearch => $aSearch)
-					{
-						$aReductionsList = array($aSearch['aAddress']);
-						$iSearchRank = $aSearch['iSearchRank'];
-						while(sizeof($aReductionsList) > 0)
-						{
-							$iSearchRank += 5;
-							if ($iSearchRank > iMaxRank) break 3;
-							$aNewReductionsList = array();
-							foreach($aReductionsList as $aReductionsWordList)
-							{
-								for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++)
-								{
-									$aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
-									$aReverseSearch = $aSearch;
-									$aSearch['aAddress'] = $aReductionsWordListResult;
-									$aSearch['iSearchRank'] = $iSearchRank;
-									$aGroupedSearches[$iSearchRank][] = $aReverseSearch;
-									if (sizeof($aReductionsWordListResult) > 0)
-									{
-										$aNewReductionsList[] = $aReductionsWordListResult;
-									}
-								}
-							}
-							$aReductionsList = $aNewReductionsList;
-						}
-					}
-				}
-				ksort($aGroupedSearches);
-			}
-
-			// Filter out duplicate searches
-			$aSearchHash = array();
-			foreach($aGroupedSearches as $iGroup => $aSearches)
-			{
-				foreach($aSearches as $iSearch => $aSearch)
-				{
-					$sHash = serialize($aSearch);
-					if (isset($aSearchHash[$sHash]))
-					{
-						unset($aGroupedSearches[$iGroup][$iSearch]);
-						if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);
-					}
-					else
-					{
-						$aSearchHash[$sHash] = 1;
-					}
-				}
-			}
-
-			if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
-
-			$iGroupLoop = 0;
-			$iQueryLoop = 0;
-			foreach($aGroupedSearches as $iGroupedRank => $aSearches)
-			{
-				$iGroupLoop++;
-				foreach($aSearches as $aSearch)
-				{
-					$iQueryLoop++;
-
-					if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
-					if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
-
-
-					// Must have a location term
-					if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
-					{
-						if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
-						{
-							if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank)
-							{
-								$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
-								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-								$sSQL .= " order by st_area(geometry) desc limit 1";
-								if (CONST_Debug) var_dump($sSQL);
-								$aPlaceIDs = $oDB->getCol($sSQL);
-							}
-						}
-						else
-						{
-							if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
-							if (!$aSearch['sClass']) continue;
-							$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-							if ($oDB->getOne($sSQL))
-							{
-								$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-								if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-								$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)";
-								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-								if (sizeof($aExcludePlaceIDs))
-								{
-									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-								}
-								if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
-								$sSQL .= " limit $iLimit";
-								if (CONST_Debug) var_dump($sSQL);
-								$aPlaceIDs = $oDB->getCol($sSQL);
-
-								// If excluded place IDs are given, it is fair to assume that
-								// there have been results in the small box, so no further
-								// expansion in that case.
-								if (!sizeof($aPlaceIDs) && !sizeof($aExcludePlaceIDs))
-								{
-									$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-									if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-									$sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid)";
-									if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-									if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
-									$sSQL .= " limit $iLimit";
-									if (CONST_Debug) var_dump($sSQL);
-									$aPlaceIDs = $oDB->getCol($sSQL);
-								}
-							}
-							else
-							{
-								$sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-								$sSQL .= " and st_contains($sViewboxSmallSQL, geometry) and linked_place_id is null";
-								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-								if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
-								$sSQL .= " limit $iLimit";
-								if (CONST_Debug) var_dump($sSQL);
-								$aPlaceIDs = $oDB->getCol($sSQL);
-							}
-						}
-					}
-					else
-					{
-						$aPlaceIDs = array();
-
-						// First we need a position, either aName or fLat or both
-						$aTerms = array();
-						$aOrder = array();
-
-						// TODO: filter out the pointless search terms (2 letter name tokens and less)
-						// they might be right - but they are just too darned expensive to run
-						if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
-						if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
-						if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress'])
-						{
-							// For infrequent name terms disable index usage for address
-							if (CONST_Search_NameOnlySearchFrequencyThreshold &&
-									sizeof($aSearch['aName']) == 1 &&
-									$aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold)
-							{
-								$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
-							}
-							else
-							{
-								$aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
-								if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
-							}
-						}
-						if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-						if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank between 16 and 27";
-						if ($aSearch['fLon'] && $aSearch['fLat'])
-						{
-							$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
-							$aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
-						}
-						if (sizeof($aExcludePlaceIDs))
-						{
-							$aTerms[] = "place_id not in (".join(',',$aExcludePlaceIDs).")";
-						}
-						if ($sCountryCodesSQL)
-						{
-							$aTerms[] = "country_code in ($sCountryCodesSQL)";
-						}
-
-						if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
-						if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
-
-						$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
-						if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
-						if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
-						$aOrder[] = "$sImportanceSQL DESC";
-						if (sizeof($aSearch['aFullNameAddress']))
-						{
-							$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
-						}
-
-						if (sizeof($aTerms))
-						{
-							$sSQL = "select place_id";
-							$sSQL .= " from search_name";
-							$sSQL .= " where ".join(' and ',$aTerms);
-							$sSQL .= " order by ".join(', ',$aOrder);
-							if ($aSearch['sHouseNumber'] || $aSearch['sClass'])
-								$sSQL .= " limit 50";
-							elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass'])
-								$sSQL .= " limit 1";
-							else
-								$sSQL .= " limit ".$iLimit;
-
-							if (CONST_Debug) { var_dump($sSQL); }
-							$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
-							if (PEAR::IsError($aViewBoxPlaceIDs))
-							{
-								failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
-							}
-							//var_dump($aViewBoxPlaceIDs);
-							// Did we have an viewbox matches?
-							$aPlaceIDs = array();
-							$bViewBoxMatch = false;
-							foreach($aViewBoxPlaceIDs as $aViewBoxRow)
-							{
-								//if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break;
-								//if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break;
-								//if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;
-								//else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2;
-								$aPlaceIDs[] = $aViewBoxRow['place_id'];
-							}
-						}
-						//var_Dump($aPlaceIDs);
-						//exit;
-
-						if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
-						{
-							$aRoadPlaceIDs = $aPlaceIDs;
-							$sPlaceIDs = join(',',$aPlaceIDs);
-
-							// Now they are indexed look for a house attached to a street we found
-							$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';
-							$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
-							if (sizeof($aExcludePlaceIDs))
-							{
-								$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-							}
-							$sSQL .= " limit $iLimit";
-							if (CONST_Debug) var_dump($sSQL);
-							$aPlaceIDs = $oDB->getCol($sSQL);
-
-							// If not try the aux fallback table
-							if (!sizeof($aPlaceIDs))
-							{
-								$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
-								if (sizeof($aExcludePlaceIDs))
-								{
-									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-								}
-								//$sSQL .= " limit $iLimit";
-								if (CONST_Debug) var_dump($sSQL);
-								$aPlaceIDs = $oDB->getCol($sSQL);
-							}
-
-							if (!sizeof($aPlaceIDs))
-							{
-								$sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
-								if (sizeof($aExcludePlaceIDs))
-								{
-									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-								}
-								//$sSQL .= " limit $iLimit";
-								if (CONST_Debug) var_dump($sSQL);
-								$aPlaceIDs = $oDB->getCol($sSQL);
-							}
-
-							// Fallback to the road
-							if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))
-							{
-								$aPlaceIDs = $aRoadPlaceIDs;
-							}
-
-						}
-
-						if ($aSearch['sClass'] && sizeof($aPlaceIDs))
-						{
-							$sPlaceIDs = join(',',$aPlaceIDs);
-							$aClassPlaceIDs = array();
-
-							if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
-							{
-								// If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
-								$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-								$sSQL .= " and linked_place_id is null";
-								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-								$sSQL .= " order by rank_search asc limit $iLimit";
-								if (CONST_Debug) var_dump($sSQL);
-								$aClassPlaceIDs = $oDB->getCol($sSQL);
-							}
-
-							if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
-							{
-								$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-								$bCacheTable = $oDB->getOne($sSQL);
-
-								$sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
-
-								if (CONST_Debug) var_dump($sSQL);
-								$iMaxRank = ((int)$oDB->getOne($sSQL));
-
-								// For state / country level searches the normal radius search doesn't work very well
-								$sPlaceGeom = false;
-								if ($iMaxRank < 9 && $bCacheTable)
-								{
-									// Try and get a polygon to search in instead
-									$sSQL = "select geometry from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank + 5 and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon') order by rank_search asc limit 1";
-									if (CONST_Debug) var_dump($sSQL);
-									$sPlaceGeom = $oDB->getOne($sSQL);
-								}
-
-								if ($sPlaceGeom)
-								{
-									$sPlaceIDs = false;
-								}
-								else
-								{
-									$iMaxRank += 5;
-									$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
-									if (CONST_Debug) var_dump($sSQL);
-									$aPlaceIDs = $oDB->getCol($sSQL);
-									$sPlaceIDs = join(',',$aPlaceIDs);
-								}
-
-								if ($sPlaceIDs || $sPlaceGeom)
-								{
-
-									$fRange = 0.01;
-									if ($bCacheTable)
-									{
-										// More efficient - can make the range bigger
-										$fRange = 0.05;
-
-										$sOrderBySQL = '';
-										if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)";
-										else if ($sPlaceIDs) $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
-										else if ($sPlaceGeom) $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
-
-										$sSQL = "select distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
-										if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
-										if ($sPlaceIDs)
-										{
-											$sSQL .= ",placex as f where ";
-											$sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, f.centroid, $fRange) ";
-										}
-										if ($sPlaceGeom)
-										{
-											$sSQL .= " where ";
-											$sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
-										}
-										if (sizeof($aExcludePlaceIDs))
-										{
-											$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
-										}
-										if ($sCountryCodesSQL) $sSQL .= " and lp.calculated_country_code in ($sCountryCodesSQL)";
-										if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";
-										if ($iOffset) $sSQL .= " offset $iOffset";
-										$sSQL .= " limit $iLimit";
-										if (CONST_Debug) var_dump($sSQL);
-										$aClassPlaceIDs = array_merge($aClassPlaceIDs, $oDB->getCol($sSQL));
-									}
-									else
-									{
-										if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
-
-										$sOrderBySQL = '';
-										if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)";
-										else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
-
-										$sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from placex as l,placex as f where ";
-										$sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, f.centroid, $fRange) ";
-										$sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' ";
-										if (sizeof($aExcludePlaceIDs))
-										{
-											$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
-										}
-										if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";
-										if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
-										if ($iOffset) $sSQL .= " offset $iOffset";
-										$sSQL .= " limit $iLimit";
-										if (CONST_Debug) var_dump($sSQL);
-										$aClassPlaceIDs = array_merge($aClassPlaceIDs, $oDB->getCol($sSQL));
-									}
-								}
-							}
-
-							$aPlaceIDs = $aClassPlaceIDs;
-
-						}
-
-					}
-
-					if (PEAR::IsError($aPlaceIDs))
-					{
-						failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
-					}
-
-					if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
-
-					foreach($aPlaceIDs as $iPlaceID)
-					{
-						$aResultPlaceIDs[$iPlaceID] = $iPlaceID;
-					}
-					if ($iQueryLoop > 20) break;
-				}
-
-				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($iMinAddressRank != 0 || $iMaxAddressRank != 30))
-				{
-					// Need to verify passes rank limits before dropping out of the loop (yuk!)
-					$sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
-					$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-					if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-					if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
-					$sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
-					$sSQL .= "and (30 between $iMinAddressRank and $iMaxAddressRank ";
-					if ($aAddressRankList) $sSQL .= " OR 30 in (".join(',',$aAddressRankList).")";
-					$sSQL .= ")";
-					if (CONST_Debug) var_dump($sSQL);
-					$aResultPlaceIDs = $oDB->getCol($sSQL);
-				}
-
-
-				//exit;
-				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
-				if ($iGroupLoop > 4) break;
-				if ($iQueryLoop > 30) break;
-			}
-
-			// Did we find anything?
-			if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
-			{
-				//var_Dump($aResultPlaceIDs);exit;
-				// Get the details for display (is this a redundant extra step?)
-				$sPlaceIDs = join(',',$aResultPlaceIDs);
-				$sOrderSQL = 'CASE ';
-				foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
-				{
-					$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
-				}
-				$sOrderSQL .= ' ELSE 10000000 END';
-				$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
-				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-				$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-				$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
-				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-				//$sSQL .= $sOrderSQL." as porder, ";
-				$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-				$sSQL .= "(extratags->'place') as extra_place ";
-				$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-				$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-				if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-				if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
-				$sSQL .= ") ";
-				if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
-				$sSQL .= "and linked_place_id is null ";
-				$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-				if (!$bDeDupe) $sSQL .= ",place_id";
-				$sSQL .= ",langaddress ";
-				$sSQL .= ",placename ";
-				$sSQL .= ",ref ";
-				$sSQL .= ",extratags->'place' ";
-				$sSQL .= " union ";
-				$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-				$sSQL .= "null as placename,";
-				$sSQL .= "null as ref,";
-				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-				//$sSQL .= $sOrderSQL." as porder, ";
-				$sSQL .= "-0.15 as importance, ";
-				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-				$sSQL .= "null as extra_place ";
-				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-				$sSQL .= "group by place_id";
-				if (!$bDeDupe) $sSQL .= ",place_id";
-				$sSQL .= " union ";
-				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-				$sSQL .= "null as placename,";
-				$sSQL .= "null as ref,";
-				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-				//$sSQL .= $sOrderSQL." as porder, ";
-				$sSQL .= "-0.10 as importance, ";
-				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-				$sSQL .= "null as extra_place ";
-				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-				$sSQL .= "group by place_id";
-				if (!$bDeDupe) $sSQL .= ",place_id";
-				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-				$sSQL .= "order by importance desc";
-				//$sSQL .= "order by rank_search,rank_address,porder asc";
-				if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
-				$aSearchResults = $oDB->getAll($sSQL);
-				//var_dump($sSQL,$aSearchResults);exit;
-
-				if (PEAR::IsError($aSearchResults))
-				{
-					failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
-				}
-			}
-		} // end if ($sQuery)
-		else
-		{
-			if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
-			{
-				$iPlaceID = geocodeReverse((float)$_GET['nearlat'], (float)$_GET['nearlon']);
-
-				if ($iPlaceID)
-				{
-					$aResultPlaceIDs = array($iPlaceID);
-					// TODO: this needs refactoring!
-
-					// Get the details for display (is this a redundant extra step?)
-					$sPlaceIDs = join(',',$aResultPlaceIDs);
-					$sOrderSQL = 'CASE ';
-					foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
-					{
-						$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
-					}
-					$sOrderSQL .= ' ELSE 10000000 END';
-					$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-					$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-					//$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-					$sSQL .= "(extratags->'place') as extra_place ";
-					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-					if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-					if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
-					$sSQL .= ") ";
-					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-					$sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
-					$sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
-					$sSQL .= ",extratags->'place' ";
-					$sSQL .= " union ";
-					$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-					//$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.15 as importance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= " union ";
-					$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-					//$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.10 as importance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-					$sSQL .= "order by importance desc";
-					//$sSQL .= "order by rank_search,rank_address,porder asc";
-					if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
-					$aSearchResults = $oDB->getAll($sSQL);
-					//var_dump($sSQL,$aSearchResults);exit;
-
-					if (PEAR::IsError($aSearchResults))
-					{
-						failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
-					}
-				}
-				else
-				{
-					$aSearchResults = array();
-				}
+				$fPrevCoord = (float)$fPoint;
 			}
 		}
+		$oGeocode->setRoute($aRoute);
 	}
 
-	$sSearchResult = '';
-	if (!sizeof($aSearchResults) && isset($_GET['q']) && $_GET['q'])
+	// Search query
+	$sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
+	if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
 	{
-		$sSearchResult = 'No Results Found';
+		$sQuery = substr($_SERVER['PATH_INFO'], 1);
+
+		// reverse order of '/' separated string
+		$aPhrases = explode('/', $sQuery);
+		$aPhrases = array_reverse($aPhrases);
+		$sQuery = join(', ',$aPhrases);
 	}
-	//var_Dump($aSearchResults);
-	//exit;
-	$aClassType = getClassTypesWithImportance();
-	$aRecheckWords = preg_split('/\b/u',$sQuery);
-	foreach($aRecheckWords as $i => $sWord)
+	if (!$sQuery)
 	{
-		if (!$sWord) unset($aRecheckWords[$i]);
+		$oGeocode->setStructuredQuery(@$_GET['amenity'], @$_GET['street'], @$_GET['city'], @$_GET['county'], @$_GET['state'], @$_GET['country'], @$_GET['postalcode']);
 	}
-	foreach($aSearchResults as $iResNum => $aResult)
+	else
 	{
-		if (CONST_Search_AreaPolygons)
-		{
-			// Get the bounding box and outline polygon
-			$sSQL = "select place_id,numfeatures,area,outline,";
-			$sSQL .= "ST_Y(ST_PointN(ST_ExteriorRing(Box2D(outline)),4)) as minlat,ST_Y(ST_PointN(ST_ExteriorRing(Box2D(outline)),2)) as maxlat,";
-			$sSQL .= "ST_X(ST_PointN(ST_ExteriorRing(Box2D(outline)),1)) as minlon,ST_X(ST_PointN(ST_ExteriorRing(Box2D(outline)),3)) as maxlon,";
-			$sSQL .= "ST_AsText(outline) as outlinestring from get_place_boundingbox_quick(".$aResult['place_id'].")";
-
-			$sSQL = "select place_id,0 as numfeatures,st_area(geometry) as area,";
-			$sSQL .= "ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,";
-			$sSQL .= "ST_Y(ST_PointN(ST_ExteriorRing(Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ST_ExteriorRing(Box2D(geometry)),2)) as maxlat,";
-			$sSQL .= "ST_X(ST_PointN(ST_ExteriorRing(Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ST_ExteriorRing(Box2D(geometry)),3)) as maxlon";
-			if ($bAsGeoJSON) $sSQL .= ",ST_AsGeoJSON(geometry) as asgeojson";
-			if ($bAsKML) $sSQL .= ",ST_AsKML(geometry) as askml";
-			if ($bAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg";
-			if ($bAsText || $bShowPolygons) $sSQL .= ",ST_AsText(geometry) as astext";
-			$sSQL .= " from placex where place_id = ".$aResult['place_id'].' and st_geometrytype(Box2D(geometry)) = \'ST_Polygon\'';
-			$aPointPolygon = $oDB->getRow($sSQL);
-			if (PEAR::IsError($aPointPolygon))
-			{
-				failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
-			}
-			if ($aPointPolygon['place_id'])
-			{
-				if ($bAsGeoJSON) $aResult['asgeojson'] = $aPointPolygon['asgeojson'];
-				if ($bAsKML) $aResult['askml'] = $aPointPolygon['askml'];
-				if ($bAsSVG) $aResult['assvg'] = $aPointPolygon['assvg'];
-				if ($bAsText) $aResult['astext'] = $aPointPolygon['astext'];
-
-				if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null )
-				{
-					$aResult['lat'] = $aPointPolygon['centrelat'];
-					$aResult['lon'] = $aPointPolygon['centrelon'];
-				}
-				if ($bShowPolygons)
-				{
-					// Translate geometary string to point array
-					if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
-					{
-						preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
-					}
-					elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
-					{
-						preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
-					}
-					elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
-					{
-						$fRadius = 0.01;
-						$iSteps = ($fRadius * 40000)^2;
-						$fStepSize = (2*pi())/$iSteps;
-						$aPolyPoints = array();
-						for($f = 0; $f < 2*pi(); $f += $fStepSize)
-						{
-							$aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
-						}
-						$aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
-						$aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
-						$aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
-						$aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
-					}
-				}
-
-				// Output data suitable for display (points and a bounding box)
-				if ($bShowPolygons && isset($aPolyPoints))
-				{
-					$aResult['aPolyPoints'] = array();
-					foreach($aPolyPoints as $aPoint)
-					{
-						$aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
-					}
-				}
-				$aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
-			}
-		}
-
-		if ($aResult['extra_place'] == 'city')
-		{
-			$aResult['class'] = 'place';
-			$aResult['type'] = 'city';
-			$aResult['rank_search'] = 16;
-		}
-
-		if (!isset($aResult['aBoundingBox']))
-		{
-			// Default
-			$fDiameter = 0.0001;
-
-			if (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']]['defzoom'];
-			}
-			elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-					&& $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-			{
-				$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
-			}
-			$fRadius = $fDiameter / 2;
-
-			$iSteps = max(8,min(100,$fRadius * 3.14 * 100000));
-			$fStepSize = (2*pi())/$iSteps;
-			$aPolyPoints = array();
-			for($f = 0; $f < 2*pi(); $f += $fStepSize)
-			{
-				$aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
-			}
-			$aPointPolygon['minlat'] = $aResult['lat'] - $fRadius;
-			$aPointPolygon['maxlat'] = $aResult['lat'] + $fRadius;
-			$aPointPolygon['minlon'] = $aResult['lon'] - $fRadius;
-			$aPointPolygon['maxlon'] = $aResult['lon'] + $fRadius;
-
-			// Output data suitable for display (points and a bounding box)
-			if ($bShowPolygons)
-			{
-				$aResult['aPolyPoints'] = array();
-				foreach($aPolyPoints as $aPoint)
-				{
-					$aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
-				}
-			}
-			$aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
-		}
-
-		// Is there an icon set for this type of result?
-		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
-				&& $aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
-		{
-			$aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
-		}
-
-		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
-				&& $aClassType[$aResult['class'].':'.$aResult['type']]['label'])
-		{
-			$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
-		}
-
-		if ($bShowAddressDetails)
-		{
-			$aResult['address'] = getAddressDetails($oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);
-			if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city']))
-			{
-				$aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']);
-			}
-
-			//var_dump($aResult['address']);
-			//exit;
-		}
-
-		// Adjust importance for the number of exact string matches in the result
-		$aResult['importance'] = max(0.001,$aResult['importance']);
-		$iCountWords = 0;
-		$sAddress = $aResult['langaddress'];
-		foreach($aRecheckWords as $i => $sWord)
-		{
-			if (stripos($sAddress, $sWord)!==false) $iCountWords++;
-		}
-
-		$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
-
-		//if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']);
-		/*
-		   if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
-		   && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
-		   {
-		   $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'];
-		   }
-		   elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-		   && $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-		   {
-		   $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
-		   }
-		   else
-		   {
-		   $aResult['importance'] = 1000000000000000;
-		   }
-		 */
-		$aResult['name'] = $aResult['langaddress'];
-		$aResult['foundorder'] = -$aResult['addressimportance'];
-		$aSearchResults[$iResNum] = $aResult;
+		$oGeocode->setQuery($sQuery);
 	}
-	uasort($aSearchResults, 'byImportance');
 
-	$aOSMIDDone = array();
-	$aClassTypeNameDone = array();
-	$aToFilter = $aSearchResults;
-	$aSearchResults = array();
+	$hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder);
 
-	$bFirst = true;
-	foreach($aToFilter as $iResNum => $aResult)
+	if (isset($_GET['batch']))
 	{
-		if ($aResult['type'] == 'adminitrative') $aResult['type'] = 'administrative';
-		$aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
-		if ($bFirst)
-		{
-			$fLat = $aResult['lat'];
-			$fLon = $aResult['lon'];
-			if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
-			$bFirst = false;
-		}
-		if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
-					&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']])))
-		{
-			$aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
-			$aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true;
-			$aSearchResults[] = $aResult;
+		$aBatch = json_decode($_GET['batch'], true);
+		foreach($aBatch as $aItem) {
+			var_dump($aItem);
 		}
-
-		// Absolute limit on number of results
-		if (sizeof($aSearchResults) >= $iFinalLimit) break;
+		exit;
 	}
 
+	$aSearchResults = $oGeocode->lookup();
+	if ($aSearchResults === false) $aSearchResults = array();
+
 	$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
 
-	if (isset($_GET['nearlat']) && isset($_GET['nearlon']))
-	{
-		$sQuery .= ' ['.$_GET['nearlat'].','.$_GET['nearlon'].']';
-	}
+	logEnd($oDB, $hLog, sizeof($aSearchResults));
 
-	if ($sQuery)
-	{
-		logEnd($oDB, $hLog, sizeof($aToFilter));
-	}
-	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
+	$bAsText = $oGeocode->getIncludePolygonAsText();
+	$sQuery = $oGeocode->getQueryString();
+
+	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
 	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
-	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
-	if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
+	if ($oGeocode->getIncludePolygonAsPoints()) $sMoreURL .= '&polygon=1';
+	if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
 	if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);
 	if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
 	$sMoreURL .= '&q='.urlencode($sQuery);
-- 
2.39.5