$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
if (CONST_Debug) var_dump($sSQL);
- $aPlace = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aPlace))
- {
- failInternalError("Could not determine closest place.", $sSQL, $aPlace);
- }
+ $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 ($iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 || $aPlace['rank_search'] == 30))
+ if ($iMaxRank_orig >= 28 && $aPlace && $aPlace['rank_search'] >= 26)
{
- $fSearchDiam = 0.001;
- if ($aPlace['rank_search'] == 30)
- {
- // if a house was found, the closest road needs to be searched, to use its place id as parent_place_id of the interpolation line
- // because a road can be closer to the point than the house from above
- $iRoadID = null;
- while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance)
- {
- $fSearchDiam = $fSearchDiam * 2;
- $sSQL = 'select place_id ';
- $sSQL .= ' FROM placex';
- $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
- $sSQL .= ' and (rank_search = 26 or rank_search = 27)';
- $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
- $sSQL .= ' and indexed_status = 0 ';
- $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
- $aPlaceRoad = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aPlace))
- {
- failInternalError("Could not determine closest place.", $sSQL, $aPlace);
- }
- $iRoadID = $aPlaceRoad['place_id'];
- $iTempPlaceID = $iRoadID;
- }
- }
- else
- {
- // if a street was found, we can take its place_id as parent_place_id
- $iTempPlaceID = $iPlaceID;
- }
+ // 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';
- //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_osmline WHERE parent_place_id = '.$iTempPlaceID;
- $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.') AND indexed_status = 0';
+ $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 = $this->oDB->getAll($sSQL);
+ $aAllHouses = chksql($this->oDB->getAll($sSQL));
foreach($aAllHouses as $i)
{
echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
}
}
- $aPlaceLine = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aPlaceLine))
- {
- failInternalError("Could not determine closest housenumber on an osm interpolation line.", $sSQL, $aPlaceLine);
- }
- $iInterpolationLinePlaceID = $aPlaceLine['place_id'];
+ $aPlaceLine = chksql($this->oDB->getRow($sSQL),
+ "Could not determine closest housenumber on an osm interpolation line.");
if ($aPlaceLine)
{
if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);
// 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 = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aDistancePlacex))
- {
- failInternalError("Could not determine distance between searched point and placex house.", $sSQL, $aDistancePlacex);
- }
+ $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 = '.$iInterpolationLinePlaceID;
- $aDistanceInterpolation = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aDistanceInterpolation))
- {
- failInternalError("Could not determine distance between searched point and interpolated house.", $sSQL, $aDistanceInterpolation);
- }
+ $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 = $iInterpolationLinePlaceID;
+ $iPlaceID = $aPlaceLine['place_id'];
$iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
$fFraction = $aPlaceLine['fraction'];
+ $iMaxRank = 30;
}
// else: nothing to do, take placex house from above
}
$iPlaceID = $aPlaceLine['place_id'];
$iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
$fFraction = $aPlaceLine['fraction'];
+ $iMaxRank = 30;
}
}
}
$sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
var_dump($sSQL);
- $aAllHouses = $this->oDB->getAll($sSQL);
+ $aAllHouses = chksql($this->oDB->getAll($sSQL));
foreach($aAllHouses as $i)
{
echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
}
}
- $aPlaceTiger = $this->oDB->getRow($sSQL);
- if (PEAR::IsError($aPlaceTiger))
- {
- failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger);
- }
+ $aPlaceTiger = chksql($this->oDB->getRow($sSQL),
+ "Could not determine closest Tiger place.");
if ($aPlaceTiger)
{
if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
$iPlaceID = $aPlaceTiger['place_id'];
$iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
$fFraction = $aPlaceTiger['fraction'];
+ $iMaxRank = 30;
}
}
$sSQL .= " WHERE place_id = $iPlaceID";
$sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
$sSQL .= ' LIMIT 1';
- $iPlaceID = $this->oDB->getOne($sSQL);
- if (PEAR::IsError($iPlaceID))
- {
- failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
- }
+ $iPlaceID = chksql($this->oDB->getOne($sSQL),
+ "Could not get parent for place.");
if (!$iPlaceID)
{
$iPlaceID = $aPlace['place_id'];
}
}
return array('place_id' => $iPlaceID,
- 'type' => $bPlaceIsTiger ? 'tiger' : $bPlaceIsLine ? 'interpolation' : 'osm',
+ 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),
'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
}
projects / nominatim.git / blobdiff