Sarah Hoffmann
b6c8c0e72b
factor out SQL for filtering by location
...
Also improves on the decision if an indexed is used or not.
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
b06f5fddcb
simplify handling of SQL lookup code for search_name
...
Use function classes which can be instantiated directly.
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
8791c6cb69
correctly close API objects during testing
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
615b166c68
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.
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
c41f2fed21
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.
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
05e47fbb28
fix parameter formatting in sqlite debug output
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
1b7c8240ba
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.
2023-12-07 09:31:00 +01:00
Sarah Hoffmann
c4fd3ab97f
hide type differences between Postgres and Sqlite in custom types
...
Also define a custom set of operators in preparation of differences
in implementation.
2023-12-07 09:31:00 +01:00
Robbe Haesendonck
4f5f5ea8fc
Removed unnecessary check for --prepare-database flag
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
5f7cc91cf9
Connect using localhost instead of socket
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
424c1f0d41
Added changing permissions of nominatim-project dir
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
cff05394a1
Added osm-import to sudoers file for tokenizer setup
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
638b40c3ec
Fixing CI tests for install-no-superuser
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
53d2050dc5
Fixed typechecking error
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
97ac036df5
Added missing return types to functions
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
482f7fe3ba
CI tests: Removed creation of user www-data.
...
Removed creation of user www-data as it already exists
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
567c31ab6a
Fixed legacy import command
...
Check whether prepare-database is true, if so exit early
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
7d28fc35d1
Disabled pylint too-many-branches
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
c06f902398
Fixed setting tokenizer property
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
59ae63e6f5
Updated no-superuser install ci test
...
Added nominatim_database_webuser (www-data).
Set non-superuser password for importing
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
9c7d947fd1
Updated check to see if osm_file is set
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
58db0ad6d8
Fixed formatting
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
3b09c39dbf
Updated ci tests to reflect changes in Nominatim CLI
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
db917cb0d4
Made sure legacy import command still works
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
ba6cdd875d
Removed unused variable, fixed connection
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
d231ff60ed
Removed _is_complete_import check
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
c74904d075
Improved logic.
...
Fixed small oversight in mutually exclusiveness of arguments
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
22204050f2
Added new psql user for importing the data
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
667197a47e
Changed naming of flags.
...
Made sure legacy import is also still ok
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
e8b866aa88
Added check to see if hstore is loaded
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
e7b8e1a2c2
Fixed ci-tests, osm-file flag
...
Preparing database should work without osm-file
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
279b4fd6d2
Renamed flags
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
b7c83d3580
Fixed pylint warnings
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
d4018f2e3b
Added check for hstore extension
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
38369ca3cf
Fixed typo
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
cc0bdd34e9
Fixed linting errors
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
8e71ff329c
Added version check for PostGis and Postgres
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
b4e3d0ea44
Updated CI tests to check new import flags
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
992703b15e
Added --prepare-database flag
2023-12-07 09:04:33 +01:00
Robbe Haesendonck
ba5ec80611
Added --no-superuser flag
...
To allow import into already existing databases.
Refs: #2719
2023-12-07 09:04:33 +01:00
Sarah Hoffmann
3c32c0354a
actions: pin pytest-asyncio version for Ubuntu 20
...
Newest versions are no longer compatible with older pytest.
2023-12-04 14:32:03 +01:00
Sarah Hoffmann
8a2c6067a2
skip lookup with full names when there are none
2023-12-01 12:11:58 +01:00
Sarah Hoffmann
d60a45715a
Merge pull request #3263 from lonvia/near-search-penalty-inheritance
...
More tweaks for Python frontend search
2023-11-29 14:02:24 +01:00
Sarah Hoffmann
3c7a28dab0
further restrict stop search criterion
2023-11-29 11:28:54 +01:00
Sarah Hoffmann
0c72a434e0
use restrict for housenumber lookups with few numbers
2023-11-29 11:28:54 +01:00
Sarah Hoffmann
32e7b59b1f
NearSearch needs to inherit penalty from inner search
2023-11-29 11:28:52 +01:00
Sarah Hoffmann
f448423727
Merge pull request #3262 from lonvia/fix-category-search
...
Fix use of category parameter for search() function
2023-11-28 20:02:36 +01:00
Sarah Hoffmann
b2319e52ff
correctly exclude streets with housenumber searches
...
Street result are not subject to the full filtering in the SQL
query, so recheck.
2023-11-28 17:53:37 +01:00
Sarah Hoffmann
25279d009a
add tests for interaction of category parameter with category terms
2023-11-28 16:56:08 +01:00
Sarah Hoffmann
3f72ca4bca
rename use of category as POI search to near_item
...
Use the term category only as a short-cut for "tuple of key and value".
2023-11-28 16:27:05 +01:00