Merge branch 'continent' of https://github.com/datendelphin/Nominatim

diff --git a/sql/functions.sql b/sql/functions.sql
index 7a68718ea9c517480b99aa2ffd1f59c4aea7f853..b248a46d104601337458832a17e35e20845dd702 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1042,6 +1042,10 @@ BEGIN
       ELSEIF NEW.type in ('farm','locality','islet','isolated_dwelling','mountain_pass') THEN
         NEW.rank_search := 20;
         NEW.rank_address := 0;
+        -- Irish townlands, tagged as place=locality and locality=townland
+        IF (NEW.extratags -> 'locality') = 'townland' THEN
+          NEW.rank_address := 20;
+        END IF;
       ELSEIF NEW.type in ('hall_of_residence','neighbourhood','housing_estate','nature_reserve') THEN
         NEW.rank_search := 22;
         NEW.rank_address := 22;

diff --git a/website/search.php b/website/search.php
index 88248cea2484a191332073fc202ac30fa44606a7..7c0838c9f57436467b3f10b26b7c3be833ea9491 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -817,7 +817,7 @@
                                                                $sPlaceIDs = join(',',$aPlaceIDs);
        
                                                                // Now they are indexed look for a house attached to a street we found
-                                                               $sHouseNumberRegex = '\\\\m'.str_replace(' ','[-, ]',$aSearch['sHouseNumber']).'\\\\M';                                         
+                                                               $sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';                                                
                                                                $sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
                                                                if (sizeof($aExcludePlaceIDs))
                                                                {