X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8f0c628310e9ad4160eb995f3ba53afa791a3ffc..22800d7d59f952ced174008669e5eddadf1117d8:/lib/SearchDescription.php diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php index f5179ce1..c339b108 100644 --- a/lib/SearchDescription.php +++ b/lib/SearchDescription.php @@ -199,15 +199,10 @@ class SearchDescription } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode') && is_a($oSearchTerm, '\Nominatim\Token\Postcode') ) { - // We need to try the case where the postal code is the primary element - // (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) - // so try both. if (!$this->sPostcode) { // If we have structured search or this is the first term, // make the postcode the primary search element. - if ($this->iOperator == Operator::NONE - && ($sPhraseType == 'postalcode' || $bFirstToken) - ) { + if ($this->iOperator == Operator::NONE && $bFirstToken) { $oSearch = clone $this; $oSearch->iSearchRank++; $oSearch->iOperator = Operator::POSTCODE; @@ -252,6 +247,15 @@ class SearchDescription $oSearch->iSearchRank++; } $aNewSearches[] = $oSearch; + // Housenumbers may appear in the name when the place has its own + // address terms. + if (($this->iNamePhrase >= 0 || empty($this->aName)) && empty($this->aAddress)) { + $oSearch = clone $this; + $oSearch->iSearchRank++; + $oSearch->aAddress = $this->aName; + $oSearch->aName = array($oSearchTerm->iId => $oSearchTerm->iId); + $aNewSearches[] = $oSearch; + } } } elseif ($sPhraseType == '' && is_a($oSearchTerm, '\Nominatim\Token\SpecialTerm') @@ -404,7 +408,7 @@ class SearchDescription /** * Query database for places that match this search. * - * @param object $oDB Database connection to use. + * @param object $oDB Nominatim::DB instance to use. * @param integer $iMinRank Minimum address rank to restrict search to. * @param integer $iMaxRank Maximum address rank to restrict search to. * @param integer $iLimit Maximum number of results. @@ -447,8 +451,8 @@ class SearchDescription $iLimit ); - //now search for housenumber, if housenumber provided - if ($this->sHouseNumber && !empty($aResults)) { + // Now search for housenumber, if housenumber provided. Can be zero. + if (($this->sHouseNumber || $this->sHouseNumber === '0') && !empty($aResults)) { // Downgrade the rank of the street results, they are missing // the housenumber. foreach ($aResults as $oRes) { @@ -479,7 +483,7 @@ class SearchDescription $sSQL .= ' WHERE place_id in ('.$sPlaceIds.')'; $sSQL .= " AND postcode != '".$this->sPostcode."'"; Debug::printSQL($sSQL); - $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL)); + $aFilteredPlaceIDs = $oDB->getCol($sSQL); if ($aFilteredPlaceIDs) { foreach ($aFilteredPlaceIDs as $iPlaceId) { $aResults[$iPlaceId]->iResultRank++; @@ -504,8 +508,10 @@ class SearchDescription Debug::printSQL($sSQL); + $iPlaceId = $oDB->getOne($sSQL); + $aResults = array(); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + if ($iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId); } @@ -521,8 +527,7 @@ class SearchDescription $aDBResults = array(); $sPoiTable = $this->poiTable(); - $sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'"; - if (chksql($oDB->getOne($sSQL))) { + if ($oDB->tableExists($sPoiTable)) { $sSQL = 'SELECT place_id FROM '.$sPoiTable.' ct'; if ($this->oContext->sqlCountryList) { $sSQL .= ' JOIN placex USING (place_id)'; @@ -542,14 +547,14 @@ class SearchDescription } elseif ($this->oContext->hasNearPoint()) { $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('ct.centroid').' ASC'; } - $sSQL .= " limit $iLimit"; + $sSQL .= " LIMIT $iLimit"; Debug::printSQL($sSQL); - $aDBResults = chksql($oDB->getCol($sSQL)); + $aDBResults = $oDB->getCol($sSQL); } if ($this->oContext->hasNearPoint()) { $sSQL = 'SELECT place_id FROM placex WHERE '; - $sSQL .= 'class=\''.$this->sClass."' and type='".$this->sType."'"; + $sSQL .= 'class = :class and type = :type'; $sSQL .= ' AND '.$this->oContext->withinSQL('geometry'); $sSQL .= ' AND linked_place_id is null'; if ($this->oContext->sqlCountryList) { @@ -558,7 +563,10 @@ class SearchDescription $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid').' ASC'; $sSQL .= " LIMIT $iLimit"; Debug::printSQL($sSQL); - $aDBResults = chksql($oDB->getCol($sSQL)); + $aDBResults = $oDB->getCol( + $sSQL, + array(':class' => $this->sClass, ':type' => $this->sType) + ); } $aResults = array(); @@ -577,20 +585,23 @@ class SearchDescription $sSQL .= ', search_name s '; $sSQL .= 'WHERE s.place_id = p.parent_place_id '; $sSQL .= 'AND array_cat(s.nameaddress_vector, s.name_vector)'; - $sSQL .= ' @> '.getArraySQL($this->aAddress).' AND '; + $sSQL .= ' @> '.$oDB->getArraySQL($this->aAddress).' AND '; } else { $sSQL .= 'WHERE '; } $sSQL .= "p.postcode = '".reset($this->aName)."'"; $sSQL .= $this->countryCodeSQL(' AND p.country_code'); + if ($this->oContext->bViewboxBounded) { + $sSQL .= ' AND ST_Intersects('.$this->oContext->sqlViewboxSmall.', geometry)'; + } $sSQL .= $this->oContext->excludeSQL(' AND p.place_id'); $sSQL .= " LIMIT $iLimit"; Debug::printSQL($sSQL); $aResults = array(); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_POSTCODE); } @@ -633,14 +644,14 @@ class SearchDescription } if (!empty($this->aName)) { - $aTerms[] = 'name_vector @> '.getArraySQL($this->aName); + $aTerms[] = 'name_vector @> '.$oDB->getArraySQL($this->aName); } if (!empty($this->aAddress)) { // For infrequent name terms disable index usage for address if ($this->bRareName) { - $aTerms[] = 'array_cat(nameaddress_vector,ARRAY[]::integer[]) @> '.getArraySQL($this->aAddress); + $aTerms[] = 'array_cat(nameaddress_vector,ARRAY[]::integer[]) @> '.$oDB->getArraySQL($this->aAddress); } else { - $aTerms[] = 'nameaddress_vector @> '.getArraySQL($this->aAddress); + $aTerms[] = 'nameaddress_vector @> '.$oDB->getArraySQL($this->aAddress); } } @@ -650,13 +661,10 @@ class SearchDescription } if ($this->sHouseNumber) { - $aTerms[] = 'address_rank between 16 and 27'; + $aTerms[] = 'address_rank between 16 and 30'; } elseif (!$this->sClass || $this->iOperator == Operator::NAME) { if ($iMinAddressRank > 0) { - $aTerms[] = 'address_rank >= '.$iMinAddressRank; - } - if ($iMaxAddressRank < 30) { - $aTerms[] = 'address_rank <= '.$iMaxAddressRank; + $aTerms[] = "((address_rank between $iMinAddressRank and $iMaxAddressRank) or (search_rank between $iMinAddressRank and $iMaxAddressRank))"; } } @@ -695,7 +703,7 @@ class SearchDescription if (!empty($this->aFullNameAddress)) { $sExactMatchSQL = ' ( '; $sExactMatchSQL .= ' SELECT count(*) FROM ( '; - $sExactMatchSQL .= ' SELECT unnest('.getArraySQL($this->aFullNameAddress).')'; + $sExactMatchSQL .= ' SELECT unnest('.$oDB->getArraySQL($this->aFullNameAddress).')'; $sExactMatchSQL .= ' INTERSECT '; $sExactMatchSQL .= ' SELECT unnest(nameaddress_vector)'; $sExactMatchSQL .= ' ) s'; @@ -720,10 +728,7 @@ class SearchDescription Debug::printSQL($sSQL); - $aDBResults = chksql( - $oDB->getAll($sSQL), - 'Could not get places for search terms.' - ); + $aDBResults = $oDB->getAll($sSQL, null, 'Could not get places for search terms.'); foreach ($aDBResults as $aResult) { $oResult = new Result($aResult['place_id']); @@ -753,7 +758,7 @@ class SearchDescription Debug::printSQL($sSQL); // XXX should inherit the exactMatches from its parent - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId); } @@ -779,7 +784,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $oResult = new Result($iPlaceId, Result::TABLE_OSMLINE); $oResult->iHouseNumber = $iHousenumber; $aResults[$iPlaceId] = $oResult; @@ -795,7 +800,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_AUX); } } @@ -816,7 +821,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $oResult = new Result($iPlaceId, Result::TABLE_TIGER); $oResult->iHouseNumber = $iHousenumber; $aResults[$iPlaceId] = $oResult; @@ -850,7 +855,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId); } } @@ -858,12 +863,11 @@ class SearchDescription // NEAR and IN are handled the same if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NEAR) { $sClassTable = $this->poiTable(); - $sSQL = "SELECT count(*) FROM pg_tables WHERE tablename = '$sClassTable'"; - $bCacheTable = (bool) chksql($oDB->getOne($sSQL)); + $bCacheTable = $oDB->tableExists($sClassTable); $sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)"; Debug::printSQL($sSQL); - $iMaxRank = (int)chksql($oDB->getOne($sSQL)); + $iMaxRank = (int) $oDB->getOne($sSQL); // For state / country level searches the normal radius search doesn't work very well $sPlaceGeom = false; @@ -876,7 +880,7 @@ class SearchDescription $sSQL .= ' ORDER BY rank_search ASC '; $sSQL .= ' LIMIT 1'; Debug::printSQL($sSQL); - $sPlaceGeom = chksql($oDB->getOne($sSQL)); + $sPlaceGeom = $oDB->getOne($sSQL); } if ($sPlaceGeom) { @@ -886,7 +890,7 @@ class SearchDescription $sSQL = 'SELECT place_id FROM placex'; $sSQL .= " WHERE place_id in ($sPlaceIDs) and rank_search < $iMaxRank"; Debug::printSQL($sSQL); - $aPlaceIDs = chksql($oDB->getCol($sSQL)); + $aPlaceIDs = $oDB->getCol($sSQL); $sPlaceIDs = join(',', $aPlaceIDs); } @@ -932,7 +936,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId); } } else { @@ -964,7 +968,7 @@ class SearchDescription Debug::printSQL($sSQL); - foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) { + foreach ($oDB->getCol($sSQL) as $iPlaceId) { $aResults[$iPlaceId] = new Result($iPlaceId); } }