X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e42ff1935f05c6e0eb5db77d264e7c923186deb2..a92907186b2acc6e2074c0db270de49e9f266a9d:/lib/Geocode.php diff --git a/lib/Geocode.php b/lib/Geocode.php index 8d3ae79a..f87748c3 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -483,9 +483,9 @@ // Conflicts between US state abreviations and various words for 'the' in different languages if (isset($this->aLangPrefOrder['name:en'])) { - $sQuery = preg_replace('/,\s*il\s*(,|$)/',', illinois\1', $sQuery); - $sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery); - $sQuery = preg_replace('/,\s*la\s*(,|$)/',', louisiana\1', $sQuery); + $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/','\1illinois\2', $sQuery); + $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/','\1alabama\2', $sQuery); + $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery); } // View Box SQL