]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
3 months agoMerge pull request #3332 from lonvia/improve-cutting-of-result-list
Sarah Hoffmann [Wed, 7 Feb 2024 09:50:32 +0000 (10:50 +0100)]
Merge pull request #3332 from lonvia/improve-cutting-of-result-list

Prefilter bad results before adding details and reranking

3 months agoprefilter bad results before adding details and reranking
Sarah Hoffmann [Tue, 6 Feb 2024 19:29:48 +0000 (20:29 +0100)]
prefilter bad results before adding details and reranking

Move the first cutting of the result list before reranking
by result match. This means that results with significantly
less importance are removed early and independently of the
fact how well they match the original query.

Fixes #3266.

3 months agoMerge pull request #3331 from lonvia/fix-word-table-rights
Sarah Hoffmann [Tue, 6 Feb 2024 19:21:25 +0000 (20:21 +0100)]
Merge pull request #3331 from lonvia/fix-word-table-rights

Properly grant rights to read-only user when switching out word table

3 months agoproperly grant rights to read-only user when switching out word table
Sarah Hoffmann [Tue, 6 Feb 2024 16:30:01 +0000 (17:30 +0100)]
properly grant rights to read-only user when switching out word table

3 months agodocs: mark layer parameter as python-only
Sarah Hoffmann [Tue, 6 Feb 2024 14:59:04 +0000 (15:59 +0100)]
docs: mark layer parameter as python-only

3 months agoMerge pull request #3328 from lonvia/word-count-into-new-table
Sarah Hoffmann [Mon, 5 Feb 2024 10:58:11 +0000 (11:58 +0100)]
Merge pull request #3328 from lonvia/word-count-into-new-table

Recreate word table when refreshing counts

3 months agorecreate word table when refreshing counts
Sarah Hoffmann [Sun, 4 Feb 2024 15:43:33 +0000 (16:43 +0100)]
recreate word table when refreshing counts

The counting touches a large part of the word table, leaving
bloated tables and indexes. Thus recreate the table instead and
swap it in.

3 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 29 Jan 2024 18:44:46 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/master'

3 months agoavoid LookupAny with address and too many name tokens
Sarah Hoffmann [Mon, 29 Jan 2024 15:52:14 +0000 (16:52 +0100)]
avoid LookupAny with address and too many name tokens

The index for nameaddress_vector has grown so large that PostgreSQL
will resort to a sequential scan if there are too many items
in the LookupAny list.

3 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 29 Jan 2024 08:14:34 +0000 (09:14 +0100)]
Merge remote-tracking branch 'upstream/master'

3 months agoprint any collected debug output when returning a timeout error
Sarah Hoffmann [Sun, 28 Jan 2024 19:20:25 +0000 (20:20 +0100)]
print any collected debug output when returning a timeout error

3 months agoMerge pull request #3321 from lonvia/remove-duplicate-partials
Sarah Hoffmann [Sun, 28 Jan 2024 19:32:58 +0000 (20:32 +0100)]
Merge pull request #3321 from lonvia/remove-duplicate-partials

Improvements to query parsing

3 months agohousenumber-only searches cannot be combined with qualifiers
Sarah Hoffmann [Sun, 28 Jan 2024 17:09:48 +0000 (18:09 +0100)]
housenumber-only searches cannot be combined with qualifiers

3 months agoadjust rankings for housenumber-only searches
Sarah Hoffmann [Sun, 28 Jan 2024 16:54:22 +0000 (17:54 +0100)]
adjust rankings for housenumber-only searches

A normal address search with housenumber will use name rankings for
the street name. This is slightly different than weighing for
address parts. Use the same ranking for the first part of the
address for housenumber-only searches to make sure that penalties
remain comparable.

3 months agoalways add a penalty for name + address search fallback
Sarah Hoffmann [Sun, 28 Jan 2024 10:48:03 +0000 (11:48 +0100)]
always add a penalty for name + address search fallback

If there already was a search by full names, the search is likely
a repeatition that yields the same results, only running slower.

3 months agodisallow category tokens in the middle of a query string
Sarah Hoffmann [Sun, 28 Jan 2024 10:35:30 +0000 (11:35 +0100)]
disallow category tokens in the middle of a query string

This already worked for left-to-right readings and now is also
implemented for right-to-left reading. A qualifier must always be
before or after the name.

3 months agoprotect against very frequent bad partials
Sarah Hoffmann [Sat, 27 Jan 2024 20:26:03 +0000 (21:26 +0100)]
protect against very frequent bad partials

3 months agoavoid duplicates in the list of partial tokens for a query
Sarah Hoffmann [Sat, 27 Jan 2024 19:48:40 +0000 (20:48 +0100)]
avoid duplicates in the list of partial tokens for a query

This messes with the estimates for expected results.

3 months agoMerge pull request #3320 from lonvia/fix-timeout-return-code
Sarah Hoffmann [Sun, 28 Jan 2024 09:37:37 +0000 (10:37 +0100)]
Merge pull request #3320 from lonvia/fix-timeout-return-code

Fix returned HTTP error when query runs too long

3 months agocatch special async timeout error in servers
Sarah Hoffmann [Sat, 27 Jan 2024 18:53:13 +0000 (19:53 +0100)]
catch special async timeout error in servers

In Python <= 3.10 this is not yet the same as TimeoutError.

Fixes #3303.

3 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Fri, 26 Jan 2024 18:52:20 +0000 (19:52 +0100)]
Merge remote-tracking branch 'upstream/master'

3 months agoMerge pull request #3317 from lonvia/postcodes-for-highway-areas
Sarah Hoffmann [Fri, 26 Jan 2024 18:51:02 +0000 (19:51 +0100)]
Merge pull request #3317 from lonvia/postcodes-for-highway-areas

Search postcodes for highway areas around the area

3 months agosearch postcodes for highway areas around the area
Sarah Hoffmann [Fri, 26 Jan 2024 16:26:29 +0000 (17:26 +0100)]
search postcodes for highway areas around the area

So far the code would only accept postcodes that are inside the area.

Fixes #3304.

3 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Wed, 17 Jan 2024 09:48:11 +0000 (10:48 +0100)]
Merge remote-tracking branch 'upstream/master'

3 months agoMerge pull request #3301 from lonvia/fix-class-search-regression
Sarah Hoffmann [Wed, 17 Jan 2024 09:47:35 +0000 (10:47 +0100)]
Merge pull request #3301 from lonvia/fix-class-search-regression

Interpret stand-alone special terms always as near term

3 months agointerpret stand-alone special terms always as near term
Sarah Hoffmann [Tue, 16 Jan 2024 16:19:21 +0000 (17:19 +0100)]
interpret stand-alone special terms always as near term

Fixes #3298.

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 8 Jan 2024 17:49:40 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agoMerge pull request #3293 from lonvia/rematch-against-country-code
Sarah Hoffmann [Mon, 8 Jan 2024 17:48:32 +0000 (18:48 +0100)]
Merge pull request #3293 from lonvia/rematch-against-country-code

Add country code to words to be rematched

4 months agoadd country code to words to be rematched
Sarah Hoffmann [Mon, 8 Jan 2024 11:23:23 +0000 (12:23 +0100)]
add country code to words to be rematched

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 7 Jan 2024 19:42:55 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agoMerge pull request #3292 from lonvia/faster-country-search
Sarah Hoffmann [Sun, 7 Jan 2024 19:42:20 +0000 (20:42 +0100)]
Merge pull request #3292 from lonvia/faster-country-search

Speed up country search

4 months agowhen a country is in the results, restrict further searches to places
Sarah Hoffmann [Sun, 7 Jan 2024 16:29:12 +0000 (17:29 +0100)]
when a country is in the results, restrict further searches to places

A country search result usually comes with a very high importance.
As a result only other very well known places will show up together
with country results and that means only places with lower address
ranks. Name searches for country names tend to yield a lot of POI
results because the country name is part of the name
(think "embassy of Sweden"). By excluding POIs from further searches,
the search is sped up quite a bit.

4 months agodump params in log view
Sarah Hoffmann [Sun, 7 Jan 2024 14:37:53 +0000 (15:37 +0100)]
dump params in log view

4 months agoprioritize country searches when penaly is equal
Sarah Hoffmann [Sun, 7 Jan 2024 10:11:11 +0000 (11:11 +0100)]
prioritize country searches when penaly is equal

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 7 Jan 2024 14:24:30 +0000 (15:24 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agoMerge pull request #3238 from mtmail/check-database-for-version-match
Sarah Hoffmann [Sun, 7 Jan 2024 14:24:00 +0000 (15:24 +0100)]
Merge pull request #3238 from mtmail/check-database-for-version-match

admin --check-database also checks database vs nominatim version

4 months agoMerge pull request #3289 from lonvia/viewbox-and-housenumbers
Sarah Hoffmann [Sun, 7 Jan 2024 14:23:14 +0000 (15:23 +0100)]
Merge pull request #3289 from lonvia/viewbox-and-housenumbers

Do not restrict by viewbox when housenumber or postcode is available

4 months agoMerge pull request #3290 from lonvia/near-vs-quaifier-words
Sarah Hoffmann [Sun, 7 Jan 2024 14:23:00 +0000 (15:23 +0100)]
Merge pull request #3290 from lonvia/near-vs-quaifier-words

Do not run near queries on qualifier words

4 months agoMerge pull request #3291 from lonvia/fix-timezone-handling
Sarah Hoffmann [Sun, 7 Jan 2024 14:22:42 +0000 (15:22 +0100)]
Merge pull request #3291 from lonvia/fix-timezone-handling

Fix timezone handling for timestamps from the database

4 months agofix timezone handling for timestamps from the database
Sarah Hoffmann [Sat, 6 Jan 2024 21:31:38 +0000 (22:31 +0100)]
fix timezone handling for timestamps from the database

SQLite is not timezone-aware, so make sure to convert to UTC
before inserting any data.

4 months agodo not run near queries on qualifier words
Sarah Hoffmann [Sat, 6 Jan 2024 16:49:58 +0000 (17:49 +0100)]
do not run near queries on qualifier words

There is too much potential for confusion (e.g. 'Rio Grande' read
as 'river near Grande') fir too little gain. Use near phrases
instead.

4 months agodo not restrict by viewbox when housenumber or postcode is available
Sarah Hoffmann [Sat, 6 Jan 2024 15:53:48 +0000 (16:53 +0100)]
do not restrict by viewbox when housenumber or postcode is available

Fixes #3274.

4 months agocheck-database also checks database vs nominatim version
Marc Tobias [Thu, 2 Nov 2023 15:19:47 +0000 (16:19 +0100)]
check-database also checks database vs nominatim version

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Fri, 5 Jan 2024 20:25:41 +0000 (21:25 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agoMerge pull request #3286 from lonvia/avoid-bind-parameters-in-lambdas
Sarah Hoffmann [Fri, 5 Jan 2024 20:24:48 +0000 (21:24 +0100)]
Merge pull request #3286 from lonvia/avoid-bind-parameters-in-lambdas

Avoid closure variables in lambda statements

4 months agoavoid closure variables in lambda statements
Sarah Hoffmann [Fri, 5 Jan 2024 16:49:28 +0000 (17:49 +0100)]
avoid closure variables in lambda statements

There is a bug in SQLAlchemy that assigns the wrong value to bind
parameters from closure variables when reusing lambda statements
that are later extended with other non-lambda expressions.

Thus either avoid lambda statements with closure variables or extending
them with non-lambda expressions.

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 2 Jan 2024 16:18:08 +0000 (17:18 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agouse correct SQLAlchemy pool for asynchronous connections
Sarah Hoffmann [Tue, 2 Jan 2024 15:15:44 +0000 (16:15 +0100)]
use correct SQLAlchemy pool for asynchronous connections

See https://github.com/sqlalchemy/sqlalchemy/issues/8771

4 months agoAPI: avoid engine disposal on startup
Sarah Hoffmann [Tue, 2 Jan 2024 15:10:30 +0000 (16:10 +0100)]
API: avoid engine disposal on startup

4 months agoupdate typing for latest changes in SQLAlchemy
Sarah Hoffmann [Fri, 29 Dec 2023 19:55:33 +0000 (20:55 +0100)]
update typing for latest changes in SQLAlchemy

4 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 18 Dec 2023 15:00:08 +0000 (16:00 +0100)]
Merge remote-tracking branch 'upstream/master'

4 months agoMerge pull request #3273 from lonvia/search-with-sqlite
Sarah Hoffmann [Tue, 12 Dec 2023 11:15:22 +0000 (12:15 +0100)]
Merge pull request #3273 from lonvia/search-with-sqlite

Add forward search capability for SQLite databases

5 months agoadd minimal documentation for the SQLite usage
Sarah Hoffmann [Sat, 9 Dec 2023 15:30:31 +0000 (16:30 +0100)]
add minimal documentation for the SQLite usage

5 months agoerror out when a SQLite database does not exist
Sarah Hoffmann [Thu, 7 Dec 2023 09:24:53 +0000 (10:24 +0100)]
error out when a SQLite database does not exist

Requires to mark the databse r/w when it is newly created in the
convert function.

5 months agoenable search for sqlite conversion by default
Sarah Hoffmann [Thu, 7 Dec 2023 08:33:42 +0000 (09:33 +0100)]
enable search for sqlite conversion by default

5 months agoenable all BDD API tests for sqlite
Sarah Hoffmann [Wed, 6 Dec 2023 19:57:09 +0000 (20:57 +0100)]
enable all BDD API tests for sqlite

5 months agoenable all API tests for sqlite and port missing features
Sarah Hoffmann [Wed, 6 Dec 2023 19:56:21 +0000 (20:56 +0100)]
enable all API tests for sqlite and port missing features

5 months agoextend sqlite converter for search tables
Sarah Hoffmann [Wed, 6 Dec 2023 12:42:58 +0000 (13:42 +0100)]
extend sqlite converter for search tables

5 months agoremove unused function
Sarah Hoffmann [Wed, 6 Dec 2023 10:14:36 +0000 (11:14 +0100)]
remove unused function

5 months agoimprove typing for @compiles constructs
Sarah Hoffmann [Wed, 6 Dec 2023 10:13:12 +0000 (11:13 +0100)]
improve typing for @compiles constructs

The first parameter is in fact the self parameter referring to
the function class.

5 months agovoid unnecessary aliases
Sarah Hoffmann [Wed, 6 Dec 2023 10:03:12 +0000 (11:03 +0100)]
void unnecessary aliases

5 months agofactor out SQL for filtering by location
Sarah Hoffmann [Wed, 6 Dec 2023 09:55:21 +0000 (10:55 +0100)]
factor out SQL for filtering by location

Also improves on the decision if an indexed is used or not.

5 months agosimplify handling of SQL lookup code for search_name
Sarah Hoffmann [Wed, 6 Dec 2023 09:37:06 +0000 (10:37 +0100)]
simplify handling of SQL lookup code for search_name

Use function classes which can be instantiated directly.

5 months agocorrectly close API objects during testing
Sarah Hoffmann [Tue, 5 Dec 2023 20:20:57 +0000 (21:20 +0100)]
correctly close API objects during testing

5 months agoclean up ST_DWithin and intersects() functions
Sarah Hoffmann [Tue, 5 Dec 2023 17:02:40 +0000 (18:02 +0100)]
clean up ST_DWithin and intersects() functions

A non-index version of ST_DWithin is not necessary. ST_Distance
can be used for that purpose. Index use for intersects can be
covered with a simple parameter.

5 months agosimplify weigh_search() function
Sarah Hoffmann [Tue, 5 Dec 2023 15:07:56 +0000 (16:07 +0100)]
simplify weigh_search() function

Use JSON arrays which can have mixed types and therefore have
a more logical structure than separate arrays. Avoid JSON dicts
because of their verboseness.

5 months agofix parameter formatting in sqlite debug output
Sarah Hoffmann [Tue, 5 Dec 2023 14:23:16 +0000 (15:23 +0100)]
fix parameter formatting in sqlite debug output

5 months agoenable connection pools for sqlite
Sarah Hoffmann [Tue, 5 Dec 2023 11:22:00 +0000 (12:22 +0100)]
enable connection pools for sqlite

Connecting is reasonably expensive because the spatialite extension
needs to be loaded. Disable pooling for tests because there is some
memory leak when quickly opening and closing QueuePools with sqlite
connections.

5 months agohide type differences between Postgres and Sqlite in custom types
Sarah Hoffmann [Tue, 5 Dec 2023 10:29:16 +0000 (11:29 +0100)]
hide type differences between Postgres and Sqlite in custom types

Also define a custom set of operators in preparation of differences
in implementation.

5 months agoMerge pull request #3108 from mtmail/remove-legacy-wikipedia-tag-syntax
Sarah Hoffmann [Thu, 7 Dec 2023 08:24:32 +0000 (09:24 +0100)]
Merge pull request #3108 from mtmail/remove-legacy-wikipedia-tag-syntax

These days the OSM wikipedia tab no longer contains URLs

5 months agoMerge pull request #3268 from mtmail/wikipedia-file-path-warning
Sarah Hoffmann [Thu, 7 Dec 2023 08:21:59 +0000 (09:21 +0100)]
Merge pull request #3268 from mtmail/wikipedia-file-path-warning

Improve error message when Wikipedia importance file is not found

5 months agoRemoved unnecessary check for --prepare-database flag
Robbe Haesendonck [Thu, 23 Nov 2023 14:59:01 +0000 (15:59 +0100)]
Removed unnecessary check for --prepare-database flag

5 months agoConnect using localhost instead of socket
Robbe Haesendonck [Thu, 23 Nov 2023 14:51:35 +0000 (15:51 +0100)]
Connect using localhost instead of socket

5 months agoAdded changing permissions of nominatim-project dir
Robbe Haesendonck [Thu, 23 Nov 2023 12:41:13 +0000 (13:41 +0100)]
Added changing permissions of nominatim-project dir

5 months agoAdded osm-import to sudoers file for tokenizer setup
Robbe Haesendonck [Thu, 23 Nov 2023 12:17:33 +0000 (13:17 +0100)]
Added osm-import to sudoers file for tokenizer setup

5 months agoFixing CI tests for install-no-superuser
Robbe Haesendonck [Thu, 23 Nov 2023 11:03:36 +0000 (12:03 +0100)]
Fixing CI tests for install-no-superuser

5 months agoFixed typechecking error
Robbe Haesendonck [Thu, 23 Nov 2023 10:25:49 +0000 (11:25 +0100)]
Fixed typechecking error

5 months agoAdded missing return types to functions
Robbe Haesendonck [Fri, 29 Sep 2023 08:23:35 +0000 (10:23 +0200)]
Added missing return types to functions

5 months ago CI tests: Removed creation of user www-data.
Robbe Haesendonck [Fri, 29 Sep 2023 08:18:44 +0000 (10:18 +0200)]
 CI tests: Removed creation of user www-data.
Removed creation of user www-data as it already exists

5 months agoFixed legacy import command
Robbe Haesendonck [Thu, 28 Sep 2023 07:59:42 +0000 (09:59 +0200)]
Fixed legacy import command
Check whether prepare-database is true, if so exit early

5 months agoDisabled pylint too-many-branches
Robbe Haesendonck [Wed, 27 Sep 2023 14:40:08 +0000 (16:40 +0200)]
Disabled pylint too-many-branches

5 months agoFixed setting tokenizer property
Robbe Haesendonck [Wed, 27 Sep 2023 14:32:28 +0000 (16:32 +0200)]
Fixed setting tokenizer property

5 months agoUpdated no-superuser install ci test
Robbe Haesendonck [Wed, 27 Sep 2023 13:28:21 +0000 (15:28 +0200)]
Updated no-superuser install ci test

Added nominatim_database_webuser (www-data).
Set non-superuser password for importing

5 months agoUpdated check to see if osm_file is set
Robbe Haesendonck [Wed, 27 Sep 2023 08:50:40 +0000 (10:50 +0200)]
Updated check to see if osm_file is set

5 months agoFixed formatting
Robbe Haesendonck [Wed, 27 Sep 2023 08:37:57 +0000 (10:37 +0200)]
Fixed formatting

5 months agoUpdated ci tests to reflect changes in Nominatim CLI
Robbe Haesendonck [Wed, 27 Sep 2023 08:28:20 +0000 (10:28 +0200)]
Updated ci tests to reflect changes in Nominatim CLI

5 months agoMade sure legacy import command still works
Robbe Haesendonck [Wed, 27 Sep 2023 07:29:54 +0000 (09:29 +0200)]
Made sure legacy import command still works

5 months agoRemoved unused variable, fixed connection
Robbe Haesendonck [Wed, 27 Sep 2023 07:24:04 +0000 (09:24 +0200)]
Removed unused variable, fixed connection

5 months agoRemoved _is_complete_import check
Robbe Haesendonck [Wed, 27 Sep 2023 07:21:56 +0000 (09:21 +0200)]
Removed _is_complete_import check

5 months agoImproved logic.
Robbe Haesendonck [Tue, 26 Sep 2023 12:46:28 +0000 (14:46 +0200)]
Improved logic.

Fixed small oversight in mutually exclusiveness of arguments

5 months agoAdded new psql user for importing the data
Robbe Haesendonck [Tue, 26 Sep 2023 10:59:14 +0000 (12:59 +0200)]
Added new psql user for importing the data

5 months agoChanged naming of flags.
Robbe Haesendonck [Tue, 26 Sep 2023 09:59:32 +0000 (11:59 +0200)]
Changed naming of flags.

Made sure legacy import is also still ok

5 months agoAdded check to see if hstore is loaded
Robbe Haesendonck [Mon, 25 Sep 2023 10:39:38 +0000 (12:39 +0200)]
Added check to see if hstore is loaded

5 months agoFixed ci-tests, osm-file flag
Robbe Haesendonck [Mon, 25 Sep 2023 09:14:14 +0000 (11:14 +0200)]
Fixed ci-tests, osm-file flag

Preparing database should work without osm-file

5 months agoRenamed flags
Robbe Haesendonck [Mon, 25 Sep 2023 09:09:20 +0000 (11:09 +0200)]
Renamed flags

5 months agoFixed pylint warnings
Robbe Haesendonck [Thu, 21 Sep 2023 10:28:45 +0000 (12:28 +0200)]
Fixed pylint warnings

5 months agoAdded check for hstore extension
Robbe Haesendonck [Thu, 21 Sep 2023 10:20:46 +0000 (12:20 +0200)]
Added check for hstore extension

5 months agoFixed typo
Robbe Haesendonck [Thu, 21 Sep 2023 09:20:24 +0000 (11:20 +0200)]
Fixed typo

5 months agoFixed linting errors
Robbe Haesendonck [Thu, 21 Sep 2023 07:58:38 +0000 (09:58 +0200)]
Fixed linting errors

5 months agoAdded version check for PostGis and Postgres
Robbe Haesendonck [Wed, 20 Sep 2023 14:05:12 +0000 (16:05 +0200)]
Added version check for PostGis and Postgres