update links to OSM objects

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 83eb647aaf0a1c96e2623028771293659e43a459..0c3c5f735c6bdbf43df1cabc49db8eaceb128d88 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1331,11 +1331,11 @@
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                 $aOrder[] = "";
-                                                               $aOrder[0] = " exists(select place_id from placex where parent_place_id = search_name.place_id";
+                                                               $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";
                                 $aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
                                                                // also housenumbers from interpolation lines table are needed
                                                                $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id";
-                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1)";
+                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
                                                                $aOrder[0] .= " desc";
                                                        }
 
@@ -1481,7 +1481,7 @@
 
                                                                        if (sizeof($this->aExcludePlaceIDs))
                                                                        {
-                                                                               $sSQL .= " and parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                                                               $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                                                        }
                                                                        //$sSQL .= " limit $this->iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);