X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4c9cfe2532273955619e7a651260c0e085c070e1..731c620e314e61a958f99a14556983e73ed914be:/sql/functions/placex_triggers.sql diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index 0102d2c8..0bfefbb0 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -643,7 +643,7 @@ BEGIN addr_street := NEW.address->'street'; addr_place := NEW.address->'place'; - IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(,|;)%' THEN + IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(:|,|;)%' THEN i := getorcreate_postcode_id(NEW.address->'postcode'); END IF; END IF; @@ -703,7 +703,7 @@ BEGIN -- --------------------------------------------------------------------------- -- For low level elements we inherit from our parent road - IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN + IF NEW.rank_search > 27 THEN --DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id; NEW.parent_place_id := null; @@ -766,11 +766,6 @@ BEGIN -- Performance, it would be more acurate to do all the rest of the import -- process but it takes too long -- Just be happy with inheriting from parent road only - IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN - result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry); - --DEBUG: RAISE WARNING 'Place added to location table'; - END IF; - result := insertSearchName(NEW.partition, NEW.place_id, name_vector, NEW.rank_search, NEW.rank_address, NEW.geometry);