lots of little bug fixes and missing files

lib/lib.php

@@ -719,6 +719,7 @@
 			if ($aTypeLabel && ($aLine['localname'] || $aLine['housenumber']))
 			{
 				$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+				$sTypeLabel = str_replace(' ','_',$sTypeLabel);
 				if (!isset($aAddress[$sTypeLabel]) && $aLine['localname']) $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
 			}
 		}
@@ -768,6 +769,7 @@
 				if ($aTypeLabel && ($aLine['localname'] || $aLine['housenumber']))
 				{
 					$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+					$sTypeLabel = str_replace(' ','_',$sTypeLabel);
 					if (!isset($aAddress[$sTypeLabel]) && $aLine['localname']) $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
 				}
 				$iMinRank = $aLine['rank_address'];

lib/log.php

@@ -12,16 +12,35 @@
 				$sQuery
 			);
 
-                // Log
-		if ($sType == 'search')
+		if (CONST_Log_DB)
 		{
-	                $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
+	                // Log
+			if ($sType == 'search')
+			{
+		                $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
+			}
+
+			$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
+			$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
+			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).')';
+			$oDB->query($sSQL);
 		}
 
-		$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
-		$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
-		$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).')';
-		$oDB->query($sSQL);
+                if ($sType == 'reverse')
+                {
+                        $aStartTime = explode('.',$hLog[0]);
+                        file_put_contents('/data/mapquest/opentile_http/logs/nominatimreverse',
+                                $aStartTime[0].','.$aStartTime[1].','.
+                                php_uname('n').','.
+                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+                                '"'.addslashes($hLog[1]).'",'.
+                                $_GET['lat'].','.
+                                $_GET['lon'].','.
+                                $_GET['zoom'].','.
+                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+                                '"'.addslashes($_GET['format']).'"'."\n",
+                        FILE_APPEND);
+                }
 
 
 		return $hLog;
@@ -33,15 +52,31 @@
                 if (!$aEndTime[1]) $aEndTime[1] = '0';
                 $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
 
-		$sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-		$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-		$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-		$sSQL .= ' and query = '.getDBQuoted($hLog[3]);
-                $oDB->query($sSQL);
+		if (CONST_Log_DB)
+		{
+			$sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
+			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
+			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
+			$sSQL .= ' and query = '.getDBQuoted($hLog[3]);
+                	$oDB->query($sSQL);
+
+			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
+			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
+			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
+			$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
+			$oDB->query($sSQL);
+		}
+
+                $aStartTime = explode('.',$hLog[0]);
+                file_put_contents('/data/mapquest/opentile_http/logs/nominatimsearch',
+                                $aStartTime[0].','.$aStartTime[1].','.
+                                php_uname('n').','.
+                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+                                '"'.addslashes($hLog[1]).'",'.
+                                '"'.addslashes($hLog[3]).'",'.
+                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+                                '"'.addslashes($_GET['format']).'",'.
+                                $iNumResults."\n",
+                        FILE_APPEND);
 
-		$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-		$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-		$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-		$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
-		$oDB->query($sSQL);
 	}

lib/template/address-jsonv2.php

@@ -21,7 +21,12 @@
                         $aFilteredPlaces['osm_type'] = $sOSMType;
                         $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
                 }
+                $aFilteredPlaces['category'] = $aPlace['class'];
+                $aFilteredPlaces['type'] = $aPlace['type'];
+                $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+                $aFilteredPlaces['name'] = $aPlace['placename'];
 		$aFilteredPlaces['address'] = $aAddress;
 	}
 

lib/template/search-html.php

@@ -10,7 +10,7 @@
 
 	<script src="js/OpenLayers.js"></script>
 	<script src="js/OpenStreetMap.js"></script>
-	<script src="prototype-1.6.0.3.js"></script>
+	<script src="js/prototype-1.6.0.3.js"></script>
 
 	<style>
 * {-moz-box-sizing: border-box;}

settings/settings.php

@@ -25,3 +25,8 @@
 	@define('CONST_Search_AreaPolygons_Enabled', true);
 
 	@define('CONST_Suggestions_Enabled', false);
+
+	// Log settings
+	@define('CONST_Log_DB', true);
+	@define('CONST_Log_File', false);
+	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded

website/details.php

@@ -70,7 +70,10 @@
 	$aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
 
 	// Get the bounding box and outline polygon
-	$sSQL = "select *,ST_AsText(outline) as outlinestring from get_place_boundingbox($iPlaceID)";
+	$sSQL = "select ST_AsText(geometry) as outlinestring,";
+	$sSQL .= "ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)) as maxlat,";
+	$sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)) as maxlon";
+	$sSQL .= " from placex where place_id = $iPlaceID";
 	$aPointPolygon = $oDB->getRow($sSQL);
 	IF (PEAR::IsError($aPointPolygon))
 	{
@@ -84,7 +87,8 @@
 	elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch))
 	{
 		$fRadius = 0.01;
-		$iSteps = ($fRadius * 40000)^2;
+		if ($aPointDetails['rank_search'] > 20) $fRadius = 0.0001;
+		$iSteps = min(max(($fRadius * 40000)^2,16),100);
 		$fStepSize = (2*pi())/$iSteps;
 		$aPolyPoints = array();
 		for($f = 0; $f < 2*pi(); $f += $fStepSize)

website/js/theme/default/google.css

@@ -0,0 +1,9 @@
+.olLayerGoogleCopyright {
+    right: 3px;
+    bottom: 2px;  
+}
+.olLayerGooglePoweredBy {
+    left: 2px;
+    bottom: 2px;   
+}
+

website/js/theme/default/ie6-style.css

@@ -0,0 +1,7 @@
+.olControlZoomPanel div {
+    background-image: url(img/zoom-panel-NOALPHA.png);
+}
+.olControlPanPanel div {
+    background-image: url(img/pan-panel-NOALPHA.png);
+}
+

website/js/theme/default/style.css

@@ -0,0 +1,343 @@
+div.olMap {
+	z-index: 0;
+    padding: 0px!important;
+    margin: 0px!important;
+    cursor: default;
+}
+
+div.olMapViewport {
+    text-align: left;
+}
+
+div.olLayerDiv {
+   -moz-user-select: none;
+}
+
+.olLayerGoogleCopyright {
+    left: 2px;
+    bottom: 2px;  
+}
+.olLayerGooglePoweredBy {
+    left: 2px;
+    bottom: 15px;   
+}
+.olControlAttribution {
+    font-size: smaller; 
+    right: 3px; 
+    bottom: 4.5em; 
+    position: absolute; 
+    display: block;
+}
+.olControlScale {
+    right: 3px;
+    bottom: 3em;
+    display: block;
+    position: absolute;
+    font-size: smaller;
+}
+.olControlScaleLine {
+   left: 10px;
+   bottom: 15px;
+   font-size: xx-small;
+}
+.olControlScaleLineBottom {
+   border: solid 2px black;
+   border-bottom: none;
+   margin-top:-2px;
+   text-align: center;
+}
+.olControlScaleLineTop {
+   border: solid 2px black;
+   border-top: none;
+   text-align: center;
+}
+
+.olControlPermalink {
+    right: 3px;
+    bottom: 1.5em;
+    display: block;
+    position: absolute;
+    font-size: smaller;
+} 
+
+div.olControlMousePosition {
+    bottom: 0em;
+    right: 3px;
+    display: block;
+    position: absolute;
+    font-family: Arial;
+    font-size: smaller;
+}
+
+.olControlOverviewMapContainer {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+}
+
+.olControlOverviewMapElement {
+    padding: 10px 18px 10px 10px;
+    background-color: #00008B;
+    -moz-border-radius: 1em 0 0 0;
+}
+
+.olControlOverviewMapMinimizeButton {
+    right: 0px;
+    bottom: 80px;
+}    
+
+.olControlOverviewMapMaximizeButton {
+    right: 0px;
+    bottom: 80px;
+}
+
+.olControlOverviewMapExtentRectangle {
+    overflow: hidden;
+    background-image: url("img/blank.gif");
+    cursor: move;
+    border: 2px dotted red;
+}
+.olControlOverviewMapRectReplacement {
+    overflow: hidden;
+    cursor: move;
+    background-image: url("img/overview_replacement.gif");
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+.olLayerGeoRSSDescription {
+    float:left;
+    width:100%;
+    overflow:auto;
+    font-size:1.0em;
+}
+.olLayerGeoRSSClose {
+    float:right;
+    color:gray;
+    font-size:1.2em;
+    margin-right:6px;
+    font-family:sans-serif;
+}
+.olLayerGeoRSSTitle {
+    float:left;font-size:1.2em;
+}
+
+.olPopupContent {
+    padding:5px;
+    overflow: auto;
+}    
+.olControlNavToolbar { 
+    width:0px;
+    height:0px;
+}    
+.olControlNavToolbar div { 
+  display:block;
+  width:  28px;
+  height: 28px;
+  top: 300px;
+  left: 6px;
+  position: relative;
+}
+
+.olControlNavigationHistory {
+   background-image: url("img/navigation_history.png");
+   background-repeat: no-repeat;
+   width:  24px;
+   height: 24px;
+
+}
+.olControlNavigationHistoryPreviousItemActive { 
+  background-position: 0px 0px;
+}
+.olControlNavigationHistoryPreviousItemInactive { 
+   background-position: 0px -24px;
+}
+.olControlNavigationHistoryNextItemActive { 
+   background-position: -24px 0px;
+}
+.olControlNavigationHistoryNextItemInactive { 
+   background-position: -24px -24px;
+}
+
+.olControlNavToolbar .olControlNavigationItemActive { 
+  background-image: url("img/panning-hand-on.png");
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlNavigationItemInactive { 
+  background-image: url("img/panning-hand-off.png");
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlZoomBoxItemActive { 
+  background-image: url("img/drag-rectangle-on.png");
+  background-color: orange;
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlZoomBoxItemInactive { 
+  background-image: url("img/drag-rectangle-off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar  {
+    float:right;
+    right: 0px;
+    height: 30px; 
+    width: 200px;
+}
+.olControlEditingToolbar div { 
+  background-image: url("img/editing_tool_bar.png");
+  background-repeat: no-repeat;
+  float:right;
+  width:  24px;
+  height: 24px;
+  margin: 5px;
+}
+.olControlEditingToolbar .olControlNavigationItemActive { 
+  background-position: -103px -23px; 
+}
+.olControlEditingToolbar .olControlNavigationItemInactive { 
+  background-position: -103px -0px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemActive { 
+  background-position: -77px -23px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { 
+  background-position: -77px -0px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { 
+  background-position: -51px 0px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemActive { 
+  background-position: -51px -23px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive { 
+  background-position: -26px 0px; 
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { 
+  background-position: -26px -23px ;                                                                   
+}
+.olControlSaveFeaturesItemActive { 
+    background-image: url(img/save_features_on.png);
+    background-repeat: no-repeat;
+    background-position: 0px 1px;
+}
+.olControlSaveFeaturesItemInactive { 
+    background-image: url(img/save_features_off.png);
+    background-repeat: no-repeat;
+    background-position: 0px 1px;
+}
+
+.olHandlerBoxZoomBox {
+    border: 2px solid red;
+    position: absolute;
+    background-color: white;
+    opacity: 0.50;
+    font-size: 1px;
+    filter: alpha(opacity=50);
+}
+.olHandlerBoxSelectFeature {
+    border: 2px solid blue;
+    position: absolute;
+    background-color: white;
+    opacity: 0.50;
+    font-size: 1px;
+    filter: alpha(opacity=50);
+}   
+
+.olControlPanPanel {
+    top: 10px;
+    left: 5px;
+}  
+
+.olControlPanPanel div {
+    background-image: url(img/pan-panel.png);
+    height: 18px;
+    width: 18px;
+    cursor: pointer;
+    position: absolute;
+}
+
+.olControlPanPanel .olControlPanNorthItemInactive {
+    top: 0px;
+    left: 9px;
+    background-position: 0px 0px;
+}
+.olControlPanPanel .olControlPanSouthItemInactive {
+    top: 36px;
+    left: 9px;
+    background-position: 18px 0px;
+}
+.olControlPanPanel .olControlPanWestItemInactive {
+    position: absolute;
+    top: 18px;
+    left: 0px;
+    background-position: 0px 18px;
+}
+.olControlPanPanel .olControlPanEastItemInactive {
+    top: 18px;
+    left: 18px;
+    background-position: 18px 18px;
+}
+
+.olControlZoomPanel {
+    top: 71px;
+    left: 14px;
+} 
+
+.olControlZoomPanel div {
+    background-image: url(img/zoom-panel.png);
+    position: absolute;
+    height: 18px;
+    width: 18px;
+    cursor: pointer;
+}
+
+.olControlZoomPanel .olControlZoomInItemInactive {
+    top: 0px;
+    left: 0px;
+    background-position: 0px 0px;
+}
+
+.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
+    top: 18px;
+    left: 0px;
+    background-position: 0px -18px;
+}
+
+.olControlZoomPanel .olControlZoomOutItemInactive {
+    top: 36px;
+    left: 0px;
+    background-position: 0px 18px;
+}
+
+.olPopupCloseBox {
+  background: url("img/close.gif") no-repeat;
+  cursor: pointer;
+}
+
+.olFramedCloudPopupContent {
+    padding: 5px;
+    overflow: auto;
+}
+
+.olControlNoSelect {
+ -moz-user-select: none;
+}
+
+/**
+ * Cursor styles
+ */
+
+.olCursorWait {
+    cursor: wait;
+}
+.olDragDown {
+    cursor: move;
+}
+.olDrawBox {
+    cursor: crosshair;
+}
+.olControlDragFeatureOver {
+    cursor: move;
+}
+.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
+    cursor: -moz-grabbing;
+}

website/reverse.php

@@ -1,6 +1,8 @@
 <?php
+	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(CONST_BasePath.'/lib/log.php');
 
-        require_once('.htlib/init.php');
+	$oDB =& getDB();
 
         if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
         {
@@ -18,7 +20,7 @@
 
         // Format for output
 	$sOutputFormat = 'xml';
-        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json'))
+        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
         {
                 $sOutputFormat = $_GET['format'];
         }
@@ -61,7 +63,7 @@
 			15 => 22,
 			16 => 26, // Street, TODO: major street?
 			17 => 26, 
-			18 => 28, // or >, Building
+			18 => 30, // or >, Building
 			19 => 30, // or >, Building
 			);
 		$iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28;
@@ -83,68 +85,51 @@
 			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.01 && $iMaxRank > 22) $iMaxRank = 22;
+			if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
+			if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
 
-			if ($iMaxRank >= 26)
+			$sSQL = 'select place_id,parent_place_id 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\')';
+			$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
+			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
+			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
+//var_dump($sSQL);
+			$aPlace = $oDB->getRow($sSQL);
+			$iPlaceID = $aPlace['place_id'];
+			if (PEAR::IsError($iPlaceID))
 			{
-				// Street level search is done using placex table
-				$sSQL = 'select place_id from placex';
-				$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-				$sSQL .= ' and rank_search >= 26 and rank_search <= '.$iMaxRank;
-				$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
-				$sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
-				$sSQL .= ' ORDER BY rank_search desc, ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-				$iPlaceID = $oDB->getOne($sSQL);
-				if (PEAR::IsError($iPlaceID))
-				{
-					var_Dump($sSQL, $iPlaceID); 
-					exit;
-				}
-			}
-			else
-			{
-				// Other search uses the location_point and location_area tables
-
-				// If we've not yet done the area search do it now
-				if ($aArea === false)
-				{
-					$sSQL = 'select place_id,rank_address,ST_distance('.$sPointSQL.', centroid) as distance from location_area';
-					$sSQL .= ' WHERE ST_Contains(area,'.$sPointSQL.') and rank_search <= '.$iMaxRank;
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$aArea = $oDB->getRow($sSQL);
-					if ($aArea) $fMaxAreaDistance = $aArea['distance'];
-				}
-
-				// Different search depending if we found an area match
-				if ($aArea)
-				{
-					// Found best match area - is there a better point match?
-					$sSQL = 'select place_id from location_point_'.($iMaxRank+1);
-					$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.') ';
-					$sSQL .= ' and rank_search > '.($aArea['rank_address']+3);
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$iPlaceID = $oDB->getOne($sSQL);
-					if (PEAR::IsError($iPlaceID))
-					{
-						var_Dump($sSQL, $iPlaceID); 
-						exit;
-					}
-				}
-				else
-				{
-					$sSQL = 'select place_id from location_point_'.($iMaxRank+1);
-					$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.') ';
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$iPlaceID = $oDB->getOne($sSQL);
-					if (PEAR::IsError($iPlaceID))
-					{
-						var_Dump($sSQL, $iPlaceID); 
-						exit;
-					}
-				}
+				var_Dump($sSQL, $iPlaceID); 
+				exit;
 			}
 		}
-		if (!$iPlaceID && $aArea) $iPlaceID = $aArea['place_id'];
+
+		// The point we found might be too small - use the address to find what it is a child of
+		$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc";
+//var_dump($sSQL);
+		$iPlaceID = $oDB->getOne($sSQL);
+		if (PEAR::IsError($iPlaceID))
+		{
+			var_Dump($sSQL, $iPlaceID); 
+			exit;
+		}
+		if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
+		{
+			$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
+//var_dump($sSQL);
+			$iPlaceID = $oDB->getOne($sSQL);
+			if (PEAR::IsError($iPlaceID))
+			{
+				var_Dump($sSQL, $iPlaceID); 
+				exit;
+			}
+		}
+		if (!$iPlaceID)
+		{
+			$iPlaceID = $aPlace['place_id'];
+		}
 	}
 
 	if ($iPlaceID)
@@ -157,5 +142,15 @@
 		$aPlace = $oDB->getRow($sSQL);
 
 		$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+
+		$aClassType = getClassTypes();
+                $sAddressType = '';
+                if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))
+                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel'];
+                elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']]))
+                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel'];
+                else $sAddressType = $aPlace['class'];
+                $aPlace['addresstype'] = $sAddressType;
+
 	}
-	include('.htlib/output/address-'.$sOutputFormat.'.php');
+	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

website/search.php

@@ -773,7 +773,7 @@
 										{
 											$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
 										}
-										if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.geometry) ASC";
+										if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.centroid) ASC";
 										else $sSQL .= " order by ST_Distance(l.centroid, f.geometry) asc";
 										$sSQL .= " limit $iLimit";
 										if (CONST_Debug) var_dump($sSQL);
@@ -896,6 +896,11 @@
 			$sSQL .= "ST_Y(ST_PointN(ExteriorRing(ST_Box2D(outline)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(outline)),2)) as maxlat,";
 			$sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(outline)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_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(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)) as maxlat,";
+			$sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)) as maxlon,";
+			$sSQL .= "ST_AsText(geometry) as outlinestring from placex where place_id = ".$aResult['place_id'].' and st_geometrytype(ST_Box2D(geometry)) = \'ST_Polygon\'';
 			$aPointPolygon = $oDB->getRow($sSQL);
 			if (PEAR::IsError($aPointPolygon))
 			{