Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 016fc101215618274effd14b89ea400411ab70ff..1588dff5def2bc99641b9facd890e62d3c69a791 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -485,8 +485,6 @@
                                $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
                        }
 
                                $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
                        }
 

-                       // Hack to make it handle "new york, ny" (and variants) correctly
-                       //$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $this->sQuery);

                        $sQuery = $this->sQuery;
 
                        // Conflicts between US state abreviations and various words for 'the' in different languages
                        $sQuery = $this->sQuery;
 
                        // Conflicts between US state abreviations and various words for 'the' in different languages


@@ -498,7 +496,7 @@
                        }
 
                        // View Box SQL
                        }
 
                        // View Box SQL

-                       $sViewboxCentreSQL;
+                       $sViewboxCentreSQL = false;

                        $bBoundingBoxSearch = false;
                        if ($this->aViewBox)
                        {
                        $bBoundingBoxSearch = false;
                        if ($this->aViewBox)
                        {