From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 20 Apr 2012 21:19:52 +0000 (+0200)
Subject: Merge branch 'continent' of https://github.com/datendelphin/Nominatim
X-Git-Tag: v2.0.0~83
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7b430bc731ee68005a7b52bb2a22f53914011381?hp=5e6a9638a8f92449b8aa24e054f8e33f3136481a

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

diff --git a/sql/functions.sql b/sql/functions.sql
index 7a68718e..b248a46d 100644
--- 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 88248cea..7c0838c9 100755
--- 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))
 								{