X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/00265af528652d6c1bb32cf0694d71e8c5603f39..a8a700e16d286971c43c013b322a1fd4a339de4d:/lib/SearchDescription.php
diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php
index 1325a463..bf45dada 100644
--- a/lib/SearchDescription.php
+++ b/lib/SearchDescription.php
@@ -4,6 +4,7 @@ namespace Nominatim;
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.
@@ -67,19 +68,6 @@ class SearchDescription
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.
*
@@ -186,12 +174,10 @@ class SearchDescription
* @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, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken, &$iGlobalRank)
+ public function extendWithFullTerm($aSearchTerm, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken)
{
$aNewSearches = array();
@@ -209,12 +195,6 @@ class SearchDescription
$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'
@@ -260,14 +240,17 @@ class SearchDescription
$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;
@@ -319,11 +302,11 @@ class SearchDescription
/**
* 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 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.
*/
@@ -405,7 +388,6 @@ class SearchDescription
* @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
@@ -416,9 +398,9 @@ class SearchDescription
* 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
@@ -429,21 +411,21 @@ class SearchDescription
) {
// 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,
@@ -451,52 +433,50 @@ class SearchDescription
$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 "
Place IDs: ";
- var_Dump($aPlaceIDs);
+ echo '
Place IDs: ';
+ 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 "
Place IDs after postcode filtering: ";
- 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 '
Place IDs after postcode filtering: ';
+ var_dump(array_keys($aResults));
+ }
}
}
}
- return array('IDs' => $aPlaceIDs, 'houseNumber' => $iHousenumber);
+ return $aResults;
}
@@ -508,11 +488,16 @@ class SearchDescription
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)
@@ -521,6 +506,7 @@ class SearchDescription
return array();
}
+ $aDBResults = array();
$sPoiTable = $this->poiTable();
$sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'";
@@ -546,7 +532,7 @@ class SearchDescription
}
$sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL);
- return chksql($oDB->getCol($sSQL));
+ $aDBResults = chksql($oDB->getCol($sSQL));
}
if ($this->oContext->hasNearPoint()) {
@@ -557,13 +543,18 @@ class SearchDescription
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));
}
- return array();
+ $aResults = array();
+ foreach ($aDBResults as $iPlaceId) {
+ $aResults[$iPlaceId] = new Result($iPlaceId);
+ }
+
+ return $aResults;
}
private function queryPostcode(&$oDB, $iLimit)
@@ -586,7 +577,12 @@ class SearchDescription
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)
@@ -642,13 +638,13 @@ class SearchDescription
}
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;
}
}
@@ -701,6 +697,8 @@ class SearchDescription
$iLimit = 20;
}
+ $aResults = array();
+
if (sizeof($aTerms)) {
$sSQL = 'SELECT place_id,'.$sExactMatchSQL;
$sSQL .= ' FROM search_name';
@@ -710,18 +708,29 @@ class SearchDescription
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 ';
@@ -732,15 +741,14 @@ class SearchDescription
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';
@@ -754,22 +762,22 @@ class SearchDescription
$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."'";
@@ -778,16 +786,14 @@ class SearchDescription
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'";
@@ -795,28 +801,32 @@ class SearchDescription
$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')
@@ -825,14 +835,16 @@ class SearchDescription
$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
@@ -853,8 +865,8 @@ class SearchDescription
$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));
}
@@ -880,7 +892,7 @@ class SearchDescription
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)";
}
@@ -896,7 +908,7 @@ class SearchDescription
$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) {
@@ -912,7 +924,9 @@ class SearchDescription
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();
@@ -922,7 +936,7 @@ class SearchDescription
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';
@@ -936,18 +950,20 @@ class SearchDescription
$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()
@@ -989,19 +1005,19 @@ class SearchDescription
return $aWordIDs[$k];
};
- echo "";
+ echo '
';
echo "| $this->iSearchRank | ";
- echo "".join(', ', array_map($kf, $this->aName))." | ";
- echo "".join(', ', array_map($kf, $this->aNameNonSearch))." | ";
- echo "".join(', ', array_map($kf, $this->aAddress))." | ";
- echo "".join(', ', array_map($kf, $this->aAddressNonSearch))." | ";
- echo "".$this->sCountryCode." | ";
- echo "".Operator::toString($this->iOperator)." | ";
- echo "".$this->sClass." | ";
- echo "".$this->sType." | ";
- echo "".$this->sPostcode." | ";
- echo "".$this->sHouseNumber." | ";
-
- echo "
";
+ echo ''.join(', ', array_map($kf, $this->aName)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aNameNonSearch)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aAddress)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aAddressNonSearch)).' | ';
+ echo ''.$this->sCountryCode.' | ';
+ echo ''.Operator::toString($this->iOperator).' | ';
+ echo ''.$this->sClass.' | ';
+ echo ''.$this->sType.' | ';
+ echo ''.$this->sPostcode.' | ';
+ echo ''.$this->sHouseNumber.' | ';
+
+ echo '';
}
}