Merge pull request #3774 from lonvia/remove-postcodes-from-nameaddressvector

Do not add postcodes from postcode boundaries to address vector

lib-sql/functions/placex_triggers.sql

@@ -638,8 +638,10 @@ BEGIN
 
     -- Add it to the list of search terms
     {% if not db.reverse_only %}
-      nameaddress_vector := array_merge(nameaddress_vector,
+      IF location.rank_address != 11 AND location.rank_address != 5 THEN
-                                        location.keywords::integer[]);
+          nameaddress_vector := array_merge(nameaddress_vector,
+                                            location.keywords::integer[]);
+      END IF;
     {% endif %}
 
     INSERT INTO place_addressline (place_id, address_place_id, fromarea,

lib-sql/functions/ranking.sql

@@ -88,6 +88,10 @@ BEGIN
     area := area / 3;
   ELSIF country_code IN ('bo', 'ar', 'sd', 'mn', 'in', 'et', 'cd', 'mz', 'ly', 'cl', 'zm') THEN
     area := area / 2;
+  ELSIF country_code IN ('sg', 'ws', 'st', 'kn') THEN
+    area := area * 5;
+  ELSIF country_code IN ('dm', 'mt', 'lc', 'gg', 'sc', 'nr') THEN
+    area := area * 20;
   END IF;
 
   IF area > 1 THEN

src/nominatim_api/v1/server_glue.py

@@ -374,14 +374,17 @@ async def deletable_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any
     """
     fmt = parse_format(params, RawDataList, 'json')
 
+    results = RawDataList()
     async with api.begin() as conn:
-        sql = sa.text(""" SELECT p.place_id, country_code,
+        for osm_type in ('N', 'W', 'R'):
-                                 name->'name' as name, i.*
+            sql = sa.text(""" SELECT p.place_id, country_code,
-                          FROM placex p, import_polygon_delete i
+                                     name->'name' as name, i.*
-                          WHERE p.osm_id = i.osm_id AND p.osm_type = i.osm_type
+                              FROM placex p, import_polygon_delete i
-                                AND p.class = i.class AND p.type = i.type
+                              WHERE i.osm_type = :osm_type
-                      """)
+                                    AND p.osm_id = i.osm_id AND p.osm_type = :osm_type
-        results = RawDataList(r._asdict() for r in await conn.execute(sql))
+                                    AND p.class = i.class AND p.type = i.type
+                          """)
+            results.extend(r._asdict() for r in await conn.execute(sql, {'osm_type': osm_type}))
 
     return build_response(params, params.formatting().format_result(results, fmt, {}))