X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/eb0b3bfa4cd74ee9e425c54868a30d8859e694cd..87f68937540b406f35feaa3435f951e7dc6d70ec:/lib/ReverseGeocode.php?ds=inline
diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 509ec0a8..27f8c89c 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -1,16 +1,22 @@
oDB =& $oDB;
}
- function setZoom($iZoom)
+
+ public function setZoom($iZoom)
{
// Zoom to rank, this could probably be calculated but a lookup gives fine control
$aZoomRank = array(
@@ -38,22 +44,50 @@ class ReverseGeocode
$this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
}
- // returns { place_id =>, type => '(osm|tiger)' }
- // fails if no place was found
- function lookup($fLat, $fLon, $bDoInterpolation = true)
+ /**
+ * Find the closest interpolation with the given search diameter.
+ *
+ * @param string $sPointSQL Reverse geocoding point as SQL
+ * @param float $fSearchDiam Search diameter
+ *
+ * @return Record of the interpolation or null.
+ */
+ protected function lookupInterpolation($sPointSQL, $fSearchDiam)
+ {
+ $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
+ $sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
+ $sSQL .= ' startnumber, endnumber, interpolationtype,';
+ $sSQL .= ' ST_Distance(linegeo,'.$sPointSQL.') as distance';
+ $sSQL .= ' FROM location_property_osmline';
+ $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
+ $sSQL .= ' and indexed_status = 0 and startnumber is not NULL ';
+ $sSQL .= ' ORDER BY distance ASC limit 1';
+
+ return chksql(
+ $this->oDB->getRow($sSQL),
+ 'Could not determine closest housenumber on an osm interpolation line.'
+ );
+ }
+
+ public function lookup($fLat, $fLon, $bDoInterpolation = true)
+ {
+ return $this->lookupPoint(
+ 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)',
+ $bDoInterpolation
+ );
+ }
+
+ public function lookupPoint($sPointSQL, $bDoInterpolation = true)
{
- $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
$iMaxRank = $this->iMaxRank;
// Find the nearest point
$fSearchDiam = 0.0004;
- $iPlaceID = null;
- $aArea = false;
+ $oResult = null;
+ $aPlace = null;
$fMaxAreaDistance = 1;
- $bIsInUnitedStates = false;
- $bPlaceIsTiger = false;
- $bPlaceIsLine = false;
- while (!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) {
+ $bIsTigerStreet = false;
+ while ($oResult === null && $fSearchDiam < $fMaxAreaDistance) {
$fSearchDiam = $fSearchDiam * 2;
// If we have to expand the search area by a large amount then we need a larger feature
@@ -65,144 +99,125 @@ class ReverseGeocode
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;
+ if ($fSearchDiam > 0.001 && $iMaxRank > 26) {
+ // try with interpolations before continuing
+ if ($bDoInterpolation) {
+ $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/2);
+
+ if ($aHouse) {
+ $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
+ $oResult->iHouseNumber = closestHouseNumber($aHouse);
+
+ $aPlace = $aHouse;
+ $iParentPlaceID = $aHouse['parent_place_id']; // the street
+ $iMaxRank = 30;
+
+ break;
+ }
+ }
+ // no interpolation found, continue search
+ $iMaxRank = 26;
+ }
- $sSQL = 'select place_id,parent_place_id,rank_search,calculated_country_code';
- $sSQL .= ' 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 = 'select place_id,parent_place_id,rank_search,country_code,';
+ $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
+ $sSQL .= ' FROM ';
+ if ($fSearchDiam < 0.01) {
+ $sSQL .= ' placex';
+ $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+ $sSQL .= ' AND';
+ } else {
+ $sSQL .= ' (SELECT * FROM placex ';
+ $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+ $sSQL .= ' LIMIT 1000) as p WHERE';
+ }
+ $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;
+ $sSQL .= ' and (name is not null or housenumber is not null';
+ $sSQL .= ' or rank_search between 26 and 27)';
$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
- $sSQL .= ' and indexed_status = 0 ';
+ $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
- $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
+ $sSQL .= ' ORDER BY distance ASC limit 1';
if (CONST_Debug) var_dump($sSQL);
$aPlace = chksql(
$this->oDB->getRow($sSQL),
- "Could not determine closest place."
- );
- $iPlaceID = $aPlace['place_id'];
- $iParentPlaceID = $aPlace['parent_place_id'];
- $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
- }
- // if a street or house was found, look in interpolation lines table
- if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26) {
- // if a house was found, search the interpolation line that is at least as close as the house
- $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
- $sSQL .= ' FROM location_property_osmline';
- $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
- $sSQL .= ' and indexed_status = 0 ';
- $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', linegeo) ASC limit 1';
-
- if (CONST_Debug) {
- $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
- var_dump($sSQL);
-
- $aAllHouses = chksql($this->oDB->getAll($sSQL));
- foreach ($aAllHouses as $i) {
- echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n";
- }
- }
- $aPlaceLine = chksql(
- $this->oDB->getRow($sSQL),
- "Could not determine closest housenumber on an osm interpolation line."
+ 'Could not determine closest place.'
);
- if ($aPlaceLine) {
- if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);
- if ($aPlace['rank_search'] == 30) {
- // if a house was already found in placex, we have to find out,
- // if the placex house or the interpolated house are closer to the searched point
- // distance between point and placex house
- $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID;
- $aDistancePlacex = chksql(
- $this->oDB->getRow($sSQL),
- "Could not determine distance between searched point and placex house."
- );
- $fDistancePlacex = $aDistancePlacex['distance'];
- // distance between point and interpolated house (fraction on interpolation line)
- $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance';
- $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id'];
- $aDistanceInterpolation = chksql(
- $this->oDB->getRow($sSQL),
- "Could not determine distance between searched point and interpolated house."
- );
- $fDistanceInterpolation = $aDistanceInterpolation['distance'];
- if ($fDistanceInterpolation < $fDistancePlacex) {
- // interpolation is closer to point than placex house
- $bPlaceIsLine = true;
- $aPlace = $aPlaceLine;
- $iPlaceID = $aPlaceLine['place_id'];
- $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
- $fFraction = $aPlaceLine['fraction'];
- $iMaxRank = 30;
+ if ($aPlace) {
+ $oResult = new Result($aPlace['place_id']);
+ $iParentPlaceID = $aPlace['parent_place_id'];
+ if ($bDoInterpolation) {
+ if ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27) {
+ $bIsTigerStreet = ($aPlace['country_code'] == 'us');
+ } elseif ($aPlace['rank_search'] == 30) {
+ // If a house was found, make sure there isn't an
+ // interpolation line that is closer.
+ $aHouse = $this->lookupInterpolation(
+ $sPointSQL,
+ $aPlace['distance']
+ );
+ if ($aHouse && $aPlace['distance'] < $aHouse['distance']) {
+ $oResult = new Result(
+ $aHouse['place_id'],
+ Result::TABLE_OSMLINE
+ );
+ $oResult->iHouseNumber = closestHouseNumber($aHouse);
+
+ $aPlace = $aHouse;
+ $iParentPlaceID = $aHouse['parent_place_id'];
+ }
}
- // else: nothing to do, take placex house from above
- } else {
- $bPlaceIsLine = true;
- $aPlace = $aPlaceLine;
- $iPlaceID = $aPlaceLine['place_id'];
- $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
- $fFraction = $aPlaceLine['fraction'];
- $iMaxRank = 30;
}
}
}
-
- // Only street found? If it's in the US we can check TIGER data for nearest housenumber
- if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) {
- $fSearchDiam = 0.001;
- $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
- //if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; }
- $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$iPlaceID;
- $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; //no centroid anymore in Tiger data, now we have lines
- $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', linegeo) ASC limit 1';
-
- if (CONST_Debug) {
- $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
- var_dump($sSQL);
-
- $aAllHouses = chksql($this->oDB->getAll($sSQL));
- foreach ($aAllHouses as $i) {
- echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n";
- }
- }
+
+ // Only street found? In the US we can check TIGER data for nearest housenumber
+ if (CONST_Use_US_Tiger_Data && $bIsTigerStreet && $this->iMaxRank >= 28) {
+ $fSearchDiam = $aPlace['rank_search'] > 28 ? $aPlace['distance'] : 0.001;
+ $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search,';
+ $sSQL .= 'ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
+ $sSQL .= 'ST_distance('.$sPointSQL.', linegeo) as distance,';
+ $sSQL .= 'startnumber,endnumber,interpolationtype';
+ $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId;
+ $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
+ $sSQL .= ' ORDER BY distance ASC limit 1';
+
+ if (CONST_Debug) var_dump($sSQL);
$aPlaceTiger = chksql(
$this->oDB->getRow($sSQL),
- "Could not determine closest Tiger place."
+ 'Could not determine closest Tiger place.'
);
if ($aPlaceTiger) {
if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
- $bPlaceIsTiger = true;
$aPlace = $aPlaceTiger;
- $iPlaceID = $aPlaceTiger['place_id'];
- $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
- $fFraction = $aPlaceTiger['fraction'];
+ $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER);
+ $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger);
+ $iParentPlaceID = $aPlace['parent_place_id'];
$iMaxRank = 30;
}
}
// 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 || $bPlaceIsTiger || $bPlaceIsLine) && $iParentPlaceID) {
+ if ($oResult !== null && $iMaxRank < 28) {
+ if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
$iPlaceID = $iParentPlaceID;
+ } else {
+ $iPlaceID = $oResult->iId;
}
- $sSQL = 'select address_place_id';
- $sSQL .= ' FROM place_addressline';
- $sSQL .= " WHERE place_id = $iPlaceID";
+ $sSQL = 'select a.address_place_id';
+ $sSQL .= ' FROM place_addressline a, placex p';
+ $sSQL .= " WHERE a.place_id = $iPlaceID and a.address_place_id = p.place_id";
+ $sSQL .= ' AND p.linked_place_id is null';
$sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
$sSQL .= ' LIMIT 1';
- $iPlaceID = chksql($this->oDB->getOne($sSQL), "Could not get parent for place.");
- if (!$iPlaceID) {
- $iPlaceID = $aPlace['place_id'];
+ $iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.');
+ if ($iPlaceID) {
+ $oResult = new Result($iPlaceID);
}
}
- return array(
- 'place_id' => $iPlaceID,
- 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),
- 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
- );
+
+ return $oResult;
}
-
}