admin_level fix for Poland; extra_place == village fix

dbapl · Feb 13, 2014 · e94727fabc706606a3f5b5ac0e55f1111ec4d56b · e94727f
1 parent bf182ba
commit e94727fabc706606a3f5b5ac0e55f1111ec4d56b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/lib/Geocode.php b/lib/Geocode.php
@@ -1465,6 +1465,13 @@ function lookup()
 					$aResult['rank_search'] = 16;
 				}
 
+				if ($aResult['extra_place'] == 'village')
+				{
+					$aResult['class'] = 'place';
+					$aResult['type'] = 'village';
+					$aResult['rank_search'] = 16;
+				}
+
 				if (!isset($aResult['aBoundingBox']))
 				{
 					// Default

diff --git a/sql/functions.sql b/sql/functions.sql
@@ -1124,6 +1124,23 @@ BEGIN
       END IF;
       NEW.rank_search := NEW.admin_level * 2;
       NEW.rank_address := NEW.rank_search;
+      -- RAISE WARNING 'COUNTRY CODE %', NEW.calculated_country_code;
+      IF NEW.calculated_country_code = 'pl' THEN
+        CASE NEW.admin_level
+          WHEN 10 THEN -- village
+            -- RAISE WARNING 'VILLAGE CODE % %', NEW.calculated_country_code, NEW.name;
+            NEW.rank_search := 19;
+            NEW.rank_address := 16;
+          WHEN 9 THEN -- suburb
+            -- RAISE WARNING 'SUBURB CODE % %', NEW.calculated_country_code, NEW.name;
+            NEW.rank_search := 20;
+            NEW.rank_address := NEW.rank_search;
+          ELSE
+            NEW.rank_search := NEW.admin_level * 2;
+            NEW.rank_address := NEW.rank_search;
+          END CASE;
+      END IF;
+
     ELSEIF NEW.class = 'landuse' AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN
       NEW.rank_search := 22;
       NEW.rank_address := NEW.rank_search;