hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 02:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various places where conversion from to ->aStructuredQuery had been missed

Browse Source
This commit is contained in:
Brian Quinion
2015-04-07 14:04:08 +01:00
parent ddcb95ca39
commit a5a0e1dd0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Geocode.php
View File

@@ -871,10 +871,10 @@
preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER); preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
$aSpecialTerms = array(); $aSpecialTerms = array();
if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity']) if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity'])
{ {
$aSpecialTermsRaw[] = array('['.$aStructuredQuery['amenity'].']', $aStructuredQuery['amenity']); $aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
unset($aStructuredQuery['amenity']); unset($this->aStructuredQuery['amenity']);
} }
foreach($aSpecialTermsRaw as $aSpecialTerm) foreach($aSpecialTermsRaw as $aSpecialTerm)
{ {
@@ -972,8 +972,8 @@
foreach($aDatabaseWords as $aToken) foreach($aDatabaseWords as $aToken)
{ {
// Very special case - require 2 letter country param to match the country code found // Very special case - require 2 letter country param to match the country code found
if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country']) if ($bStructuredPhrases && $aToken['country_code'] && !empty($this->aStructuredQuery['country'])
&& strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code']) && strlen($this->aStructuredQuery['country']) == 2 && strtolower($this->aStructuredQuery['country']) != $aToken['country_code'])
{ {
continue; continue;
} }
@@ -1097,7 +1097,7 @@
if (CONST_Debug) var_Dump($aGroupedSearches); if (CONST_Debug) var_Dump($aGroupedSearches);
if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0) if (CONST_Search_TryDroppedAddressTerms && sizeof($this->aStructuredQuery) > 0)
{ {
$aCopyGroupedSearches = $aGroupedSearches; $aCopyGroupedSearches = $aGroupedSearches;
foreach($aCopyGroupedSearches as $iGroup => $aSearches) foreach($aCopyGroupedSearches as $iGroup => $aSearches)