move more code into library

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);

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);

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>";

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>

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"));
+		$oPlaceLookup = new PlaceLookup($oDB);
-		if (CONST_Debug) var_dump($sSQL);
+		$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-		if (!$iPlaceID) $sError = 'OSM ID Not Found';
+		$oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
+		$oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
+
+		$aPlace = $oPlaceLookup->lookup();
+
+		//if (!$iPlaceID) $sError = 'OSM ID Not Found';
 	}
 	else
 	{
-		// Location to look up
+		$oReverseGeocode = new ReverseGeocode($oDB);
-		$fLat = (float)$_GET['lat'];
+		$oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-		$fLon = (float)$_GET['lon'];
+		$oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails);
-		$sPointSQL = "ST_SetSRID(ST_Point($fLon,$fLat),4326)";
 
-		// Zoom to rank, this could probably be calculated but a lookup gives fine control
+		$oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
-		$aZoomRank = array(
+		$oReverseGeocode->setZoom(@$_GET['zoom']);
-				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;
-
-			$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'];
-		}
-
-		// 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)
-	{
-		$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;
-
-		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;
 
+		$aPlace = $oReverseGeocode->lookup();
 	}
 
 	if (CONST_Debug) exit;