From 46dfb1284474b14d18082211510dc734c44daa60 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 2 Mar 2026 10:09:57 +0100 Subject: [PATCH] remove importance fallbacks in search queries --- src/nominatim_api/search/db_searches/address_search.py | 7 ++----- src/nominatim_api/search/db_searches/place_search.py | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/nominatim_api/search/db_searches/address_search.py b/src/nominatim_api/search/db_searches/address_search.py index b99363eb..2b4786ec 100644 --- a/src/nominatim_api/search/db_searches/address_search.py +++ b/src/nominatim_api/search/db_searches/address_search.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2025 by the Nominatim developer community. +# Copyright (C) 2026 by the Nominatim developer community. # For a full list of authors see the git log. """ Implementation of search for an address (search with housenumber). @@ -158,10 +158,7 @@ class AddressSearch(base.AbstractSearch): sql = sa.select(t.c.place_id, t.c.search_rank, t.c.address_rank, t.c.country_code, t.c.centroid, t.c.name_vector, t.c.nameaddress_vector, - sa.case((t.c.importance > 0, t.c.importance), - else_=0.40001-(sa.cast(t.c.search_rank, sa.Float())/75)) - .label('importance'), - penalty.label('penalty')) + t.c.importance, penalty.label('penalty')) for lookup in self.lookups: sql = sql.where(lookup.sql_condition(t)) diff --git a/src/nominatim_api/search/db_searches/place_search.py b/src/nominatim_api/search/db_searches/place_search.py index 9ff69eb5..e8119a69 100644 --- a/src/nominatim_api/search/db_searches/place_search.py +++ b/src/nominatim_api/search/db_searches/place_search.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2025 by the Nominatim developer community. +# Copyright (C) 2026 by the Nominatim developer community. # For a full list of authors see the git log. """ Implementation of search for a named place (without housenumber). @@ -61,9 +61,7 @@ class PlaceSearch(base.AbstractSearch): sql = sa.select(t.c.place_id, t.c.search_rank, t.c.address_rank, t.c.country_code, t.c.centroid, t.c.name_vector, t.c.nameaddress_vector, - sa.case((t.c.importance > 0, t.c.importance), - else_=0.40001-(sa.cast(t.c.search_rank, sa.Float())/75)) - .label('importance')) + t.c.importance) for lookup in self.lookups: sql = sql.where(lookup.sql_condition(t))