require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php');
require_once(CONST_BasePath.'/lib/SearchContext.php');
+require_once(CONST_BasePath.'/lib/Result.php');
/**
* Description of a single interpretation of a search query.
return $this->iSearchRank;
}
- /**
- * Increase the search rank.
- *
- * @param integer $iAddRank Number of ranks to increase.
- *
- * @return void
- */
- public function addToRank($iAddRank)
- {
- $this->iSearchRank += $iAddRank;
- return $this->iSearchRank;
- }
-
/**
* Make this search a POI search.
*
/**
* Check if the combination of parameters is sensible.
*
- * @param string[] $aCountryCodes List of country codes.
- *
* @return bool True, if the search looks valid.
*/
- public function isValidSearch(&$aCountryCodes)
+ public function isValidSearch()
{
if (!sizeof($this->aName)) {
if ($this->sHouseNumber) {
return false;
}
- }
- if ($aCountryCodes
- && $this->sCountryCode
- && !in_array($this->sCountryCode, $aCountryCodes)
- ) {
- return false;
+ if (!$this->sClass && !$this->sCountryCode) {
+ return false;
+ }
}
return true;
* Derive new searches by adding a full term to the existing search.
*
* @param mixed[] $aSearchTerm Description of the token.
- * @param bool $bWordInQuery True, if the normalised version of the word
- * is contained in the query.
* @param bool $bHasPartial True if there are also tokens of partial terms
* with the same name.
* @param string $sPhraseType Type of phrase the token is contained in.
* @param bool $bFirstPhrase True if the token is in the first phrase of
* the query.
* @param bool $bLastToken True if the token is at the end of the query.
- * @param integer $iGlobalRank Changable ranking of all searches in the
- * batch.
*
* @return SearchDescription[] List of derived search descriptions.
*/
- public function extendWithFullTerm($aSearchTerm, $bWordInQuery, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken, &$iGlobalRank)
+ public function extendWithFullTerm($aSearchTerm, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken)
{
$aNewSearches = array();
$oSearch->iSearchRank += 5;
}
$aNewSearches[] = $oSearch;
-
- // If it is at the beginning, we can be almost sure that
- // the terms are in the wrong order. Increase score for all searches.
- if ($bFirstToken) {
- $iGlobalRank++;
- }
}
} elseif (($sPhraseType == '' || $sPhraseType == 'postalcode')
&& $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == '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 && $bWordInQuery
+ if (!$this->sPostcode
+ && $aSearchTerm['word']
&& pg_escape_string($aSearchTerm['word']) == $aSearchTerm['word']
) {
// If we have structured search or this is the first term,
$oSearch->sHouseNumber = trim($aSearchTerm['word_token']);
// sanity check: if the housenumber is not mainly made
// up of numbers, add a penalty
- if (preg_match_all("/[^0-9]/", $oSearch->sHouseNumber, $aMatches) > 2) {
+ if (preg_match_all('/[^0-9]/', $oSearch->sHouseNumber, $aMatches) > 2) {
$oSearch->iSearchRank++;
}
if (!isset($aSearchTerm['word_id'])) {
$oSearch->iSearchRank++;
}
// also must not appear in the middle of the address
- if (sizeof($this->aAddress) || sizeof($this->aAddressNonSearch)) {
+ if (sizeof($this->aAddress)
+ || sizeof($this->aAddressNonSearch)
+ || $this->sPostcode
+ ) {
$oSearch->iSearchRank++;
}
$aNewSearches[] = $oSearch;
}
- } elseif ($sPhraseType == ''
- && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null
- ) {
- // require a normalized exact match of the term
- // if we have the normalizer version of the query
- // available
- if ($this->iOperator == Operator::NONE
- && (isset($aSearchTerm['word']) && $aSearchTerm['word'])
- && $bWordInQuery
- ) {
+ } elseif ($sPhraseType == '' && $aSearchTerm['class']) {
+ if ($this->iOperator == Operator::NONE) {
$oSearch = clone $this;
$oSearch->iSearchRank++;
$iOp = Operator::NEAR; // near == in for the moment
if ($aSearchTerm['operator'] == '') {
- if (sizeof($this->aName)) {
+ if (sizeof($this->aName) || $this->oContext->isBoundedSearch()) {
$iOp = Operator::NAME;
}
$oSearch->iSearchRank += 2;
$oSearch->setPoiSearch($iOp, $aSearchTerm['class'], $aSearchTerm['type']);
$aNewSearches[] = $oSearch;
}
- } elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
+ } elseif (isset($aSearchTerm['word_id'])
+ && $aSearchTerm['word_id']
+ && $sPhraseType != 'country'
+ ) {
$iWordID = $aSearchTerm['word_id'];
if (sizeof($this->aName)) {
if (($sPhraseType == '' || !$bFirstPhrase)
/**
* Derive new searches by adding a partial term to the existing search.
*
- * @param mixed[] $aSearchTerm Description of the token.
- * @param bool $bStructuredPhrases True if the search is structured.
- * @param integer $iPhrase Number of the phrase the token is in.
- * @param mixed[] $aWordFrequencyScores Number of times tokens appears
- * overall in a planet database.
- * @param array[] $aFullTokens List of full term tokens with the
- * same name.
+ * @param mixed[] $aSearchTerm Description of the token.
+ * @param bool $bStructuredPhrases True if the search is structured.
+ * @param integer $iPhrase Number of the phrase the token is in.
+ * @param array[] $aFullTokens List of full term tokens with the
+ * same name.
*
* @return SearchDescription[] List of derived search descriptions.
*/
- public function extendWithPartialTerm($aSearchTerm, $bStructuredPhrases, $iPhrase, &$aWordFrequencyScores, $aFullTokens)
+ public function extendWithPartialTerm($aSearchTerm, $bStructuredPhrases, $iPhrase, $aFullTokens)
{
// Only allow name terms.
if (!(isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])) {
&& sizeof($this->aName)
&& strpos($aSearchTerm['word_token'], ' ') === false
) {
- if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
+ if ($aSearchTerm['search_name_count'] + 1 < CONST_Max_Word_Frequency) {
$oSearch = clone $this;
- $oSearch->iSearchRank++;
+ $oSearch->iSearchRank += 2;
$oSearch->aAddress[$iWordID] = $iWordID;
$aNewSearches[] = $oSearch;
} else {
&& (!sizeof($this->aName) || $this->iNamePhrase == $iPhrase)
) {
$oSearch = clone $this;
- $oSearch->iSearchRank++;
+ $oSearch->iSearchRank += 2;
if (!sizeof($this->aName)) {
$oSearch->iSearchRank += 1;
}
if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) {
$oSearch->iSearchRank += 2;
}
- if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
+ if ($aSearchTerm['search_name_count'] + 1 < CONST_Max_Word_Frequency) {
$oSearch->aName[$iWordID] = $iWordID;
} else {
$oSearch->aNameNonSearch[$iWordID] = $iWordID;
* @param object $oDB Database connection to use.
* @param mixed[] $aWordFrequencyScores Number of times tokens appears
* overall in a planet database.
- * @param mixed[] $aExactMatchCache Saves number of exact matches.
* @param integer $iMinRank Minimum address rank to restrict
* search to.
* @param integer $iMaxRank Maximum address rank to restrict
* matching place IDs and houseNumber the houseNumber
* if appicable or -1 if not.
*/
- public function query(&$oDB, &$aWordFrequencyScores, &$aExactMatchCache, $iMinRank, $iMaxRank, $iLimit)
+ public function query(&$oDB, &$aWordFrequencyScores, $iMinRank, $iMaxRank, $iLimit)
{
- $aPlaceIDs = array();
+ $aResults = array();
$iHousenumber = -1;
if ($this->sCountryCode
) {
// Just looking for a country - look it up
if (4 >= $iMinRank && 4 <= $iMaxRank) {
- $aPlaceIDs = $this->queryCountry($oDB);
+ $aResults = $this->queryCountry($oDB);
}
} elseif (!sizeof($this->aName) && !sizeof($this->aAddress)) {
// Neither name nor address? Then we must be
// looking for a POI in a geographic area.
if ($this->oContext->isBoundedSearch()) {
- $aPlaceIDs = $this->queryNearbyPoi($oDB, $iLimit);
+ $aResults = $this->queryNearbyPoi($oDB, $iLimit);
}
} elseif ($this->iOperator == Operator::POSTCODE) {
// looking for postcode
- $aPlaceIDs = $this->queryPostcode($oDB, $iLimit);
+ $aResults = $this->queryPostcode($oDB, $iLimit);
} else {
// Ordinary search:
// First search for places according to name and address.
- $aNamedPlaceIDs = $this->queryNamedPlace(
+ $aResults = $this->queryNamedPlace(
$oDB,
$aWordFrequencyScores,
$iMinRank,
$iLimit
);
- if (sizeof($aNamedPlaceIDs)) {
- foreach ($aNamedPlaceIDs as $aRow) {
- $aPlaceIDs[] = $aRow['place_id'];
- $aExactMatchCache[$aRow['place_id']] = $aRow['exactmatch'];
- }
- }
-
//now search for housenumber, if housenumber provided
- if ($this->sHouseNumber && sizeof($aPlaceIDs)) {
- $aResult = $this->queryHouseNumber($oDB, $aPlaceIDs, $iLimit);
-
- if (sizeof($aResult)) {
- $iHousenumber = $aResult['iHouseNumber'];
- $aPlaceIDs = $aResult['aPlaceIDs'];
- } elseif (!$this->looksLikeFullAddress()) {
- $aPlaceIDs = array();
+ if ($this->sHouseNumber && sizeof($aResults)) {
+ $aNamedPlaceIDs = $aResults;
+ $aResults = $this->queryHouseNumber($oDB, $aNamedPlaceIDs, $iLimit);
+
+ if (!sizeof($aResults) && $this->looksLikeFullAddress()) {
+ $aResults = $aNamedPlaceIDs;
}
}
// finally get POIs if requested
- if ($this->sClass && sizeof($aPlaceIDs)) {
- $aPlaceIDs = $this->queryPoiByOperator($oDB, $aPlaceIDs, $iLimit);
+ if ($this->sClass && sizeof($aResults)) {
+ $aResults = $this->queryPoiByOperator($oDB, $aResults, $iLimit);
}
}
if (CONST_Debug) {
- echo "<br><b>Place IDs:</b> ";
- var_Dump($aPlaceIDs);
+ echo '<br><b>Place IDs:</b> ';
+ var_dump(array_keys($aResults));
}
- if (sizeof($aPlaceIDs) && $this->sPostcode) {
- $sSQL = 'SELECT place_id FROM placex';
- $sSQL .= ' WHERE place_id in ('.join(',', $aPlaceIDs).')';
- $sSQL .= " AND postcode = '".$this->sPostcode."'";
- if (CONST_Debug) var_dump($sSQL);
- $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL));
- if ($aFilteredPlaceIDs) {
- $aPlaceIDs = $aFilteredPlaceIDs;
- if (CONST_Debug) {
- echo "<br><b>Place IDs after postcode filtering:</b> ";
- var_Dump($aPlaceIDs);
+ if (sizeof($aResults) && $this->sPostcode) {
+ $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
+ if ($sPlaceIds) {
+ $sSQL = 'SELECT place_id FROM placex';
+ $sSQL .= ' WHERE place_id in ('.$sPlaceIds.')';
+ $sSQL .= " AND postcode = '".$this->sPostcode."'";
+ if (CONST_Debug) var_dump($sSQL);
+ $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL));
+ if ($aFilteredPlaceIDs) {
+ $aNewResults = array();
+ foreach ($aFilteredPlaceIDs as $iPlaceId) {
+ $aNewResults[$iPlaceId] = $aResults[$iPlaceId];
+ }
+ $aResults = $aNewResults;
+ if (CONST_Debug) {
+ echo '<br><b>Place IDs after postcode filtering:</b> ';
+ var_dump(array_keys($aResults));
+ }
}
}
}
- return array('IDs' => $aPlaceIDs, 'houseNumber' => $iHousenumber);
+ return $aResults;
}
if ($this->oContext->bViewboxBounded) {
$sSQL .= ' AND ST_Intersects('.$this->oContext->sqlViewboxSmall.', geometry)';
}
- $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";
+ $sSQL .= ' ORDER BY st_area(geometry) DESC LIMIT 1';
if (CONST_Debug) var_dump($sSQL);
- return chksql($oDB->getCol($sSQL));
+ $aResults = array();
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
+ }
+
+ return $aResults;
}
private function queryNearbyPoi(&$oDB, $iLimit)
return array();
}
+ $aDBResults = array();
$sPoiTable = $this->poiTable();
$sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'";
}
$sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL);
- return chksql($oDB->getCol($sSQL));
+ $aDBResults = chksql($oDB->getCol($sSQL));
}
if ($this->oContext->hasNearPoint()) {
if ($this->oContext->sqlCountryList) {
$sSQL .= ' AND country_code in '.$this->oContext->sqlCountryList;
}
- $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid')." ASC";
+ $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid').' ASC';
$sSQL .= " LIMIT $iLimit";
if (CONST_Debug) var_dump($sSQL);
- return chksql($oDB->getCol($sSQL));
+ $aDBResults = chksql($oDB->getCol($sSQL));
+ }
+
+ $aResults = array();
+ foreach ($aDBResults as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
}
- return array();
+ return $aResults;
}
private function queryPostcode(&$oDB, $iLimit)
if (CONST_Debug) var_dump($sSQL);
- return chksql($oDB->getCol($sSQL));
+ $aResults = array();
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_POSTCODE);
+ }
+
+ return $aResults;
}
private function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
}
if ($this->sHouseNumber) {
- $aTerms[] = "address_rank between 16 and 27";
+ $aTerms[] = 'address_rank between 16 and 27';
} elseif (!$this->sClass || $this->iOperator == Operator::NAME) {
if ($iMinAddressRank > 0) {
- $aTerms[] = "address_rank >= ".$iMinAddressRank;
+ $aTerms[] = 'address_rank >= '.$iMinAddressRank;
}
if ($iMaxAddressRank < 30) {
- $aTerms[] = "address_rank <= ".$iMaxAddressRank;
+ $aTerms[] = 'address_rank <= '.$iMaxAddressRank;
}
}
$iLimit = 20;
}
+ $aResults = array();
+
if (sizeof($aTerms)) {
$sSQL = 'SELECT place_id,'.$sExactMatchSQL;
$sSQL .= ' FROM search_name';
if (CONST_Debug) var_dump($sSQL);
- return chksql(
+ $aDBResults = chksql(
$oDB->getAll($sSQL),
- "Could not get places for search terms."
+ 'Could not get places for search terms.'
);
+
+ foreach ($aDBResults as $aResult) {
+ $oResult = new Result($aResult['place_id']);
+ $oResult->iExactMatches = $aResult['exactmatch'];
+ $aResults[$aResult['place_id']] = $oResult;
+ }
}
- return array();
+ return $aResults;
}
private function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
{
- $sPlaceIDs = join(',', $aRoadPlaceIDs);
+ $aResults = array();
+ $sPlaceIDs = Result::joinIdsByTable($aRoadPlaceIDs, Result::TABLE_PLACEX);
+
+ if (!$sPlaceIDs) {
+ return $aResults;
+ }
$sHouseNumberRegex = '\\\\m'.$this->sHouseNumber.'\\\\M';
$sSQL = 'SELECT place_id FROM placex ';
if (CONST_Debug) var_dump($sSQL);
- $aPlaceIDs = chksql($oDB->getCol($sSQL));
-
- if (sizeof($aPlaceIDs)) {
- return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
+ // XXX should inherit the exactMatches from its parent
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
}
$bIsIntHouseNumber= (bool) preg_match('/[0-9]+/', $this->sHouseNumber);
$iHousenumber = intval($this->sHouseNumber);
- if ($bIsIntHouseNumber) {
+ if ($bIsIntHouseNumber && !sizeof($aResults)) {
// if nothing found, search in the interpolation line table
$sSQL = 'SELECT distinct place_id FROM location_property_osmline';
$sSQL .= ' WHERE startnumber is not NULL';
$sSQL .= "interpolationtype='odd'";
}
$sSQL .= " or interpolationtype='all') and ";
- $sSQL .= $iHousenumber.">=startnumber and ";
- $sSQL .= $iHousenumber."<=endnumber";
+ $sSQL .= $iHousenumber.'>=startnumber and ';
+ $sSQL .= $iHousenumber.'<=endnumber';
$sSQL .= $this->oContext->excludeSQL(' AND place_id');
$sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL);
- $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
-
- if (sizeof($aPlaceIDs)) {
- return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $oResult = new Result($iPlaceId, Result::TABLE_OSMLINE);
+ $oResult->iHouseNumber = $iHousenumber;
+ $aResults[$iPlaceId] = $oResult;
}
}
// If nothing found try the aux fallback table
- if (CONST_Use_Aux_Location_data) {
+ if (CONST_Use_Aux_Location_data && !sizeof($aResults)) {
$sSQL = 'SELECT place_id FROM location_property_aux';
$sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.')';
$sSQL .= " AND housenumber = '".$this->sHouseNumber."'";
if (CONST_Debug) var_dump($sSQL);
- $aPlaceIDs = chksql($oDB->getCol($sSQL));
-
- if (sizeof($aPlaceIDs)) {
- return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_AUX);
}
}
// If nothing found then search in Tiger data (location_property_tiger)
- if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber) {
- $sSQL = 'SELECT distinct place_id FROM location_property_tiger';
+ if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber && !sizeof($aResults)) {
+ $sSQL = 'SELECT place_id FROM location_property_tiger';
$sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.') and (';
if ($iHousenumber % 2 == 0) {
$sSQL .= "interpolationtype='even'";
$sSQL .= "interpolationtype='odd'";
}
$sSQL .= " or interpolationtype='all') and ";
- $sSQL .= $iHousenumber.">=startnumber and ";
- $sSQL .= $iHousenumber."<=endnumber";
+ $sSQL .= $iHousenumber.'>=startnumber and ';
+ $sSQL .= $iHousenumber.'<=endnumber';
$sSQL .= $this->oContext->excludeSQL(' AND place_id');
$sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL);
- $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
-
- if (sizeof($aPlaceIDs)) {
- return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $oResult = new Result($iPlaceId, Result::TABLE_TIGER);
+ $oResult->iHouseNumber = $iHousenumber;
+ $aResults[$iPlaceId] = $oResult;
}
}
- return array();
+ return $aResults;
}
private function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
{
- $sPlaceIDs = join(',', $aParentIDs);
- $aClassPlaceIDs = array();
+ $aResults = array();
+ $sPlaceIDs = Result::joinIdsByTable($aParentIDs, Result::TABLE_PLACEX);
+
+ if (!$sPlaceIDs) {
+ return $aResults;
+ }
if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NAME) {
// If they were searching for a named class (i.e. 'Kings Head pub')
$sSQL .= " WHERE place_id in ($sPlaceIDs)";
$sSQL .= " AND class='".$this->sClass."' ";
$sSQL .= " AND type='".$this->sType."'";
- $sSQL .= " AND linked_place_id is null";
+ $sSQL .= ' AND linked_place_id is null';
$sSQL .= $this->oContext->excludeSQL(' AND place_id');
- $sSQL .= " ORDER BY rank_search ASC ";
+ $sSQL .= ' ORDER BY rank_search ASC ';
$sSQL .= " LIMIT $iLimit";
if (CONST_Debug) var_dump($sSQL);
- $aClassPlaceIDs = chksql($oDB->getCol($sSQL));
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
+ }
}
// NEAR and IN are handled the same
$sSQL .= " WHERE place_id in ($sPlaceIDs)";
$sSQL .= " AND rank_search < $iMaxRank + 5";
$sSQL .= " AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')";
- $sSQL .= " ORDER BY rank_search ASC ";
- $sSQL .= " LIMIT 1";
+ $sSQL .= ' ORDER BY rank_search ASC ';
+ $sSQL .= ' LIMIT 1';
if (CONST_Debug) var_dump($sSQL);
$sPlaceGeom = chksql($oDB->getOne($sSQL));
}
if ($this->oContext->hasNearPoint()) {
$sOrderBySQL = $this->oContext->distanceSQL('l.centroid');
} elseif ($sPlaceIDs) {
- $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
+ $sOrderBySQL = 'ST_Distance(l.centroid, f.geometry)';
} elseif ($sPlaceGeom) {
$sOrderBySQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
}
$sSQL .= ' from '.$sClassTable.' as l';
if ($sPlaceIDs) {
- $sSQL .= ",placex as f WHERE ";
+ $sSQL .= ',placex as f WHERE ';
$sSQL .= "f.place_id in ($sPlaceIDs) ";
$sSQL .= " AND ST_DWithin(l.centroid, f.centroid, $fRange)";
} elseif ($sPlaceGeom) {
if (CONST_Debug) var_dump($sSQL);
- $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
+ }
} else {
if ($this->oContext->hasNearPoint()) {
$fRange = $this->oContext->nearRadius();
if ($this->oContext->hasNearPoint()) {
$sOrderBySQL = $this->oContext->distanceSQL('l.geometry');
} else {
- $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
+ $sOrderBySQL = 'ST_Distance(l.geometry, f.geometry)';
}
$sSQL = 'SELECT distinct l.place_id';
$sSQL .= " AND l.type='".$this->sType."'";
$sSQL .= $this->oContext->excludeSQL(' AND l.place_id');
if ($sOrderBySQL) {
- $sSQL .= "ORDER BY orderterm ASC";
+ $sSQL .= 'ORDER BY orderterm ASC';
}
$sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL);
- $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
+ foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
+ }
}
}
}
- return $aClassPlaceIDs;
+ return $aResults;
}
private function poiTable()
return $aWordIDs[$k];
};
- echo "<tr>";
+ echo '<tr>';
echo "<td>$this->iSearchRank</td>";
- echo "<td>".join(', ', array_map($kf, $this->aName))."</td>";
- echo "<td>".join(', ', array_map($kf, $this->aNameNonSearch))."</td>";
- echo "<td>".join(', ', array_map($kf, $this->aAddress))."</td>";
- echo "<td>".join(', ', array_map($kf, $this->aAddressNonSearch))."</td>";
- echo "<td>".$this->sCountryCode."</td>";
- echo "<td>".Operator::toString($this->iOperator)."</td>";
- echo "<td>".$this->sClass."</td>";
- echo "<td>".$this->sType."</td>";
- echo "<td>".$this->sPostcode."</td>";
- echo "<td>".$this->sHouseNumber."</td>";
-
- echo "</tr>";
+ echo '<td>'.join(', ', array_map($kf, $this->aName)).'</td>';
+ echo '<td>'.join(', ', array_map($kf, $this->aNameNonSearch)).'</td>';
+ echo '<td>'.join(', ', array_map($kf, $this->aAddress)).'</td>';
+ echo '<td>'.join(', ', array_map($kf, $this->aAddressNonSearch)).'</td>';
+ echo '<td>'.$this->sCountryCode.'</td>';
+ echo '<td>'.Operator::toString($this->iOperator).'</td>';
+ echo '<td>'.$this->sClass.'</td>';
+ echo '<td>'.$this->sType.'</td>';
+ echo '<td>'.$this->sPostcode.'</td>';
+ echo '<td>'.$this->sHouseNumber.'</td>';
+
+ echo '</tr>';
}
}
projects / nominatim.git / blobdiff