fix postcode-related tests

diff --git a/sql/functions.sql b/sql/functions.sql
index be836c9281786e779d8116b431120de72896fa4f..c779e82683f225835bf5dd21c142d05034603285 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -265,6 +265,7 @@ DECLARE
 BEGIN
     rank_search := 30;
     rank_address := 30;
 BEGIN
     rank_search := 30;
     rank_address := 30;

+    postcode := upper(postcode);

 
     IF country_code = 'gb' THEN
         IF postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9][A-Z][A-Z])$' THEN
 
     IF country_code = 'gb' THEN
         IF postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9][A-Z][A-Z])$' THEN


@@ -824,9 +825,9 @@ BEGIN
             RETURN NULL;
         END IF;
 
             RETURN NULL;
         END IF;
 

-        NEW.name := hstore('ref', NEW.postcode);
+        NEW.name := hstore('ref', NEW.address->'postcode');

 
 

-        SELECT * FROM get_postcode_rank(NEW.country_code, NEW.postcode)
+        SELECT * FROM get_postcode_rank(NEW.country_code, NEW.address->'postcode')

           INTO NEW.rank_search, NEW.rank_address;
 
     ELSEIF NEW.class = 'place' THEN
           INTO NEW.rank_search, NEW.rank_address;
 
     ELSEIF NEW.class = 'place' THEN

diff --git a/test/bdd/db/import/search_name.feature b/test/bdd/db/import/search_name.feature
index 98def330c0e2274446094413d78852ecb704f42c..86bdea9bfd78133291f376d44251000039a1c7f0 100644 (file)
--- a/test/bdd/db/import/search_name.feature
+++ b/test/bdd/db/import/search_name.feature
@@ -23,17 +23,3 @@ Feature: Creation of search terms
         Then search_name contains
          | object | name_vector | nameaddress_vector |
          | N1     | foo         | the road |
         Then search_name contains
          | object | name_vector | nameaddress_vector |
          | N1     | foo         | the road |

-
-    Scenario: Roads take over the postcode from attached houses
-        Given the scene roads-with-pois
-        And the places
-         | osm | class | type  | housenr | postcode | street   | geometry |
-         | N1  | place | house | 1       | 12345    | North St | :p-S1 |
-        And the places
-         | osm | class   | type        | name     | geometry |
-         | W1  | highway | residential | North St | :w-north |
-        When importing
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-

diff --git a/test/bdd/db/update/poi-inherited-postcode.feature b/test/bdd/db/update/poi-inherited-postcode.feature
deleted file mode 100644 (file)
index 1b2065e..0000000
--- a/test/bdd/db/update/poi-inherited-postcode.feature
+++ /dev/null
@@ -1,57 +0,0 @@
-@DB
-Feature: Update of POI-inherited poscode
-    Test updates of postcodes on street which was inherited from a related POI
-
-    Background: Street and house with postcode
-        Given the scene roads-with-pois
-        And the places
-         | osm | class | type  | housenr | postcode | street   | geometry |
-         | N1  | place | house | 1       | 12345    | North St |:p-S1 |
-        And the places
-         | osm | class   | type        | name     | geometry |
-         | W1  | highway | residential | North St | :w-north |
-        When importing
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-
-    Scenario: POI-inherited postcode remains when way type is changed
-        When updating places
-         | osm | class   | type         | name     | geometry |
-         | W1  | highway | unclassified | North St | :w-north |
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-
-    Scenario: POI-inherited postcode remains when way name is changed
-        When updating places
-         | osm | class   | type         | name     | geometry |
-         | W1  | highway | unclassified | South St | :w-north |
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-
-    Scenario: POI-inherited postcode remains when way geometry is changed
-        When updating places
-         | osm | class   | type         | name     | geometry |
-         | W1  | highway | unclassified | South St | :w-south |
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-
-    Scenario: POI-inherited postcode is added when POI postcode changes
-        When updating places
-         | osm | class | type  | housenr | postcode | street   | geometry |
-         | N1  | place | house | 1       | 54321    | North St |:p-S1 |
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 54321 |
-
-    Scenario: POI-inherited postcode remains when POI geometry changes
-        When updating places
-         | osm | class | type  | housenr | postcode | street   | geometry |
-         | N1  | place | house | 1       | 12345    | North St |:p-S2 |
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-

diff --git a/test/bdd/db/update/search_terms.feature b/test/bdd/db/update/search_terms.feature
deleted file mode 100644 (file)
index 07dbd45..0000000
--- a/test/bdd/db/update/search_terms.feature
+++ /dev/null
@@ -1,21 +0,0 @@
-@DB
-Feature: Update of search terms
-    Tests that search_name table is updated correctly
-
-    Scenario: POI-inherited postcode remains when another POI is deleted
-        Given the scene roads-with-pois
-        And the places
-         | osm | class | type  | housenr | postcode | street   | geometry |
-         | N1  | place | house | 1       | 12345    | North St |:p-S1 |
-         | N2  | place | house | 2       |          | North St |:p-S2 |
-        And the places
-         | osm | class   | type        | name     | geometry |
-         | W1  | highway | residential | North St | :w-north |
-        When importing
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |
-        When marking for delete N2
-        Then search_name contains
-         | object | nameaddress_vector |
-         | W1     | 12345 |