From: Brian Quinion Date: Wed, 10 Jul 2013 14:14:17 +0000 (+0100) Subject: refector reverse geocoding into its own class X-Git-Tag: v2.2.0~52 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b30fd57733ac6e05b79bddf498a3b7feb723fb48 refector reverse geocoding into its own class --- diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php new file mode 100644 index 00000000..07cf8062 --- /dev/null +++ b/lib/PlaceLookup.php @@ -0,0 +1,76 @@ +oDB =& $oDB; + } + + function setLanguagePreference($aLangPrefOrder) + { + $this->aLangPrefOrder = $aLangPrefOrder; + } + + function setIncludeAddressDetails($bAddressDetails = true) + { + $this->bAddressDetails = $bAddressDetails; + } + + function setPlaceID($iPlaceID) + { + $this->iPlaceID = $iPlaceID; + } + + function setOSMID($sType, $iID) + { + $sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc"; + $this->iPlaceID = $this->oDB->getOne($sSQL); + } + + function lookup() + { + $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; + + $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 = ".(int)$this->iPlaceID; + $aPlace = $this->oDB->getRow($sSQL); + + if ($this->bAddressDetails) + { + $aAddress = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $this->iPlaceID, $aPlace['calculated_country_code']); + $aPlace['aAddress'] = $aAddress; + } + + $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; + + return $aPlace; + } + } +?> diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php new file mode 100644 index 00000000..8503e1eb --- /dev/null +++ b/lib/ReverseGeocode.php @@ -0,0 +1,139 @@ +oDB =& $oDB; + } + + function setLanguagePreference($aLangPref) + { + $this->aLangPrefOrder = $aLangPref; + } + + function setIncludeAddressDetails($bAddressDetails = true) + { + $this->bAddressDetails = $bAddressDetails; + } + + function setLatLon($fLat, $fLon) + { + $this->fLat = (float)$fLat; + $this->fLon = (float)$fLon; + } + + function setRank($iRank) + { + $this->iMaxRank = $iRank; + } + + function setZoom($iZoom) + { + // Zoom to rank, this could probably be calculated but a lookup gives fine control + $aZoomRank = array( + 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 + ); + $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28; + } + + function lookup() + { + $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)'; + $iMaxRank = $this->iMaxRank; + + // 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 = $this->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 = $this->oDB->getOne($sSQL); + if (PEAR::IsError($iPlaceID)) + { + failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); + } + if (!$iPlaceID) + { + $iPlaceID = $aPlace['place_id']; + } + } + + $oPlaceLookup = new PlaceLookup($this->oDB); + $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder); + $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails); + $oPlaceLookup->setPlaceId($iPlaceID); + + return $oPlaceLookup->lookup(); + } + } +?>