X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d4b633bfc50188f36e3c4a8b2b99c3a0e6a7f12e..5a6da83577935cf4622efa6c7ec32baf80d370fc:/website/reverse.php diff --git a/website/reverse.php b/website/reverse.php index e1a1b672..b05d752a 100644 --- a/website/reverse.php +++ b/website/reverse.php @@ -38,7 +38,6 @@ if ($sOsmType && $iOsmId > 0) { $oReverseGeocode->setZoom($iZoom); $oLookup = $oReverseGeocode->lookup($fLat, $fLon); - if (CONST_Debug) var_dump($oLookup); if ($oLookup) { $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)); @@ -55,7 +54,7 @@ if (isset($aPlace)) { $aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], - Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001), + Nominatim\ClassTypes\getDefRadius($aPlace), $fLat, $fLon ); @@ -75,13 +74,16 @@ if (CONST_Debug) { } if ($sOutputFormat == 'html') { - $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1")); + $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"); $sTileURL = CONST_Map_Tile_URL; $sTileAttribution = CONST_Map_Tile_Attribution; } elseif ($sOutputFormat == 'geocodejson') { $sQuery = $fLat.','.$fLon; if (isset($aPlace['place_id'])) { - $fDistance = chksql($oDB->getOne('SELECT ST_Distance(ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326), centroid) FROM placex where place_id='.$aPlace['place_id'])); + $fDistance = $oDB->getOne( + 'SELECT ST_Distance(ST_SetSRID(ST_Point(:lon,:lat),4326), centroid) FROM placex where place_id = :placeid', + array(':lon' => $fLon, ':lat' => $fLat, ':placeid' => $aPlace['place_id']) + ); } }