]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
3 years agoadd tests for different scripts
Sarah Hoffmann [Mon, 26 Apr 2021 21:01:06 +0000 (23:01 +0200)]
add tests for different scripts

3 years agoMerge pull request #2298 from lonvia/add-warming-to-ci
Sarah Hoffmann [Mon, 26 Apr 2021 09:21:44 +0000 (11:21 +0200)]
Merge pull request #2298 from lonvia/add-warming-to-ci

Add warming to CI import tests and fix more Python 3.5 compatibility issues

3 years agoavoid Path in subprocess parameters
Sarah Hoffmann [Mon, 26 Apr 2021 08:16:05 +0000 (10:16 +0200)]
avoid Path in subprocess parameters

Not supported by Python 3.5.

3 years agoadd warming to CI import test
Sarah Hoffmann [Mon, 26 Apr 2021 07:54:09 +0000 (09:54 +0200)]
add warming to CI import test

3 years agoSwitching to log info and only send warning for invalid phrases
AntoJvlt [Sun, 25 Apr 2021 15:56:12 +0000 (17:56 +0200)]
Switching to log info and only send warning for invalid phrases

3 years agoImplemented statistics for the import of special phrases through the SpecialPhrasesIm...
AntoJvlt [Thu, 22 Apr 2021 15:34:35 +0000 (17:34 +0200)]
Implemented statistics for the import of special phrases through the SpecialPhrasesImporterStatistics class

3 years agoreorganization of folder/file for the special phrases importer
AntoJvlt [Wed, 21 Apr 2021 15:11:57 +0000 (17:11 +0200)]
reorganization of folder/file for the special phrases importer

3 years agoMerge pull request #2297 from lonvia/update-deployment-docs
Sarah Hoffmann [Sat, 24 Apr 2021 13:35:00 +0000 (15:35 +0200)]
Merge pull request #2297 from lonvia/update-deployment-docs

docs: update deployment to use project directory

3 years agoMerge pull request #2296 from lonvia/disable-too-few-public-methods-check
Sarah Hoffmann [Sat, 24 Apr 2021 13:03:28 +0000 (15:03 +0200)]
Merge pull request #2296 from lonvia/disable-too-few-public-methods-check

pylint: disable too-few-public-methods check

3 years agodocs: update deployment to use project directory
Sarah Hoffmann [Sat, 24 Apr 2021 13:00:18 +0000 (15:00 +0200)]
docs: update deployment to use project directory

Fixes #2295.

3 years agofix pylint complaints
Sarah Hoffmann [Sat, 24 Apr 2021 09:44:36 +0000 (11:44 +0200)]
fix pylint complaints

3 years agopylint: disable check too-few-public-methods
Sarah Hoffmann [Sat, 24 Apr 2021 09:39:44 +0000 (11:39 +0200)]
pylint: disable check too-few-public-methods

3 years agoMerge pull request #2293 from darkshredder/update-manpage
Sarah Hoffmann [Sat, 24 Apr 2021 07:20:28 +0000 (09:20 +0200)]
Merge pull request #2293 from darkshredder/update-manpage

Updated manual page

3 years agoMerge pull request #2294 from lonvia/update-actions
Sarah Hoffmann [Fri, 23 Apr 2021 21:33:15 +0000 (23:33 +0200)]
Merge pull request #2294 from lonvia/update-actions

CI: add import test against Python 3.5 and fix discovered issues

3 years agoactions: add import on ubuntu 18.04
Sarah Hoffmann [Fri, 23 Apr 2021 13:45:54 +0000 (15:45 +0200)]
actions: add import on ubuntu 18.04

This uses oldest possible dependencies where possible.

3 years agoindexes with includes are not available for postgresql < 11
Sarah Hoffmann [Fri, 23 Apr 2021 20:27:12 +0000 (22:27 +0200)]
indexes with includes are not available for postgresql < 11

3 years agouse group() for regex matches
Sarah Hoffmann [Fri, 23 Apr 2021 20:18:55 +0000 (22:18 +0200)]
use group() for regex matches

Needed for compatibility with Python 3.5.

3 years agouse pathlib version of open
Sarah Hoffmann [Fri, 23 Apr 2021 19:57:05 +0000 (21:57 +0200)]
use pathlib version of open

3 years agosubprocess needs string argument
Sarah Hoffmann [Fri, 23 Apr 2021 19:49:41 +0000 (21:49 +0200)]
subprocess needs string argument

Compatibility change for Python 3.5.

3 years agocheck for existance of custom .env before opening
Sarah Hoffmann [Fri, 23 Apr 2021 19:42:24 +0000 (21:42 +0200)]
check for existance of custom .env before opening

3 years agouse more generic ImportError to check for module
Sarah Hoffmann [Fri, 23 Apr 2021 19:10:19 +0000 (21:10 +0200)]
use more generic ImportError to check for module

ModuleNotFoundError was only introduced in Python 3.6.

3 years agoreplace usages of fromisoformat() with strptime()
Sarah Hoffmann [Fri, 23 Apr 2021 18:53:00 +0000 (20:53 +0200)]
replace usages of fromisoformat() with strptime()

fromisoformat was only introduced with Python 3.7 while we
still support Python 3.5.

Fixes #2292.

3 years agoremove argparse dependency for vagrant scripts
Sarah Hoffmann [Fri, 23 Apr 2021 18:27:14 +0000 (20:27 +0200)]
remove argparse dependency for vagrant scripts

Users don't need to recreate the manpage.

3 years agoUpdated manual page
Darkshredder [Fri, 23 Apr 2021 20:12:38 +0000 (01:42 +0530)]
Updated manual page

3 years agobdd tests: fix place dependen ranking tests
Sarah Hoffmann [Thu, 22 Apr 2021 15:31:00 +0000 (17:31 +0200)]
bdd tests: fix place dependen ranking tests

The ranks of places may differ for some countries. Force the
place nodes in the test on null island which always uses the
default ranking.

3 years agoMerge pull request #2288 from RhinoDevel/patch-1
Sarah Hoffmann [Thu, 22 Apr 2021 15:12:25 +0000 (17:12 +0200)]
Merge pull request #2288 from RhinoDevel/patch-1

Replace "nominatim-update" with "nominatim".

3 years agoReplace "nominatim-update" with "nominatim".
RhinoDevel [Thu, 22 Apr 2021 13:40:22 +0000 (15:40 +0200)]
Replace "nominatim-update" with "nominatim".

If I am not mistaken, the correct command to index imported data via commandline is "nominatim index".

3 years agoindexer: reset query counter
Sarah Hoffmann [Wed, 21 Apr 2021 08:33:45 +0000 (10:33 +0200)]
indexer: reset query counter

Reset the counter for queries after the asynchronous connections
have been reopened.

3 years agoMerge pull request #2285 from lonvia/split-indexer-code
Sarah Hoffmann [Tue, 20 Apr 2021 13:34:14 +0000 (15:34 +0200)]
Merge pull request #2285 from lonvia/split-indexer-code

Rework indexer code

3 years agofactor out async connection handling into separate class
Sarah Hoffmann [Tue, 20 Apr 2021 09:16:12 +0000 (11:16 +0200)]
factor out async connection handling into separate class

Also adds a test for reconnecting regularly while indexing.

3 years agoindexer: make self.conn function-local
Sarah Hoffmann [Mon, 19 Apr 2021 16:15:09 +0000 (18:15 +0200)]
indexer: make self.conn function-local

Also switches to our internal connect function which gives us
a cursor with a sclar() function.

3 years agomake index() function private
Sarah Hoffmann [Mon, 19 Apr 2021 16:00:28 +0000 (18:00 +0200)]
make index() function private

3 years agomove analyse function into indexinf function
Sarah Hoffmann [Mon, 19 Apr 2021 15:34:26 +0000 (17:34 +0200)]
move analyse function into indexinf function

3 years agoindexer: move runner into separate file
Sarah Hoffmann [Mon, 19 Apr 2021 15:20:31 +0000 (17:20 +0200)]
indexer: move runner into separate file

3 years agoMerge pull request #2284 from lonvia/cleanup-word-frequency-computation
Sarah Hoffmann [Mon, 19 Apr 2021 16:28:04 +0000 (18:28 +0200)]
Merge pull request #2284 from lonvia/cleanup-word-frequency-computation

Rename and simplify function for word pre-computation

3 years agosimplify token precomputation
Sarah Hoffmann [Mon, 19 Apr 2021 14:54:22 +0000 (16:54 +0200)]
simplify token precomputation

Rename function to reflect that it is only used for precomputation.
The token IDs are not really needed, so don't bother to compute
the array of tokens.

3 years agoremove unused word recomputation script
Sarah Hoffmann [Mon, 19 Apr 2021 14:40:57 +0000 (16:40 +0200)]
remove unused word recomputation script

Has been replaced by a script recomputing counts from search_name.

3 years agoMerge pull request #2283 from darkshredder/tiger-data-test-fix
Sarah Hoffmann [Mon, 19 Apr 2021 11:56:36 +0000 (13:56 +0200)]
Merge pull request #2283 from darkshredder/tiger-data-test-fix

Fix: tiger-data tarfile test

3 years agoFix: tiger-data tarfile test
Darkshredder [Mon, 19 Apr 2021 10:23:01 +0000 (15:53 +0530)]
Fix: tiger-data tarfile test

3 years agoMerge pull request #2282 from lonvia/add-paths-to-config
Sarah Hoffmann [Mon, 19 Apr 2021 10:14:25 +0000 (12:14 +0200)]
Merge pull request #2282 from lonvia/add-paths-to-config

Include software paths in Python config object

3 years agosimplify sql and website creation functions
Sarah Hoffmann [Mon, 19 Apr 2021 08:01:17 +0000 (10:01 +0200)]
simplify sql and website creation functions

3 years agosimplify constructor for SQL preprocessor
Sarah Hoffmann [Mon, 19 Apr 2021 07:38:17 +0000 (09:38 +0200)]
simplify constructor for SQL preprocessor

Use sql path from config.

3 years agosimplify interface for adding tiger data
Sarah Hoffmann [Mon, 19 Apr 2021 07:23:37 +0000 (09:23 +0200)]
simplify interface for adding tiger data

Also simplifies tests using existing fixtures.

3 years agoadd library directories to config
Sarah Hoffmann [Mon, 19 Apr 2021 07:06:42 +0000 (09:06 +0200)]
add library directories to config

Allows to reduce the number of parameters in functions that take
the config anyway.

3 years agoMerge pull request #2281 from changpingc/changping/fix-tiger-index
Sarah Hoffmann [Mon, 19 Apr 2021 06:42:59 +0000 (08:42 +0200)]
Merge pull request #2281 from changpingc/changping/fix-tiger-index

fix index on location_property_tiger (parent_place_id)

3 years agofix index on location_property_tiger (parent_place_id)
Channgping Chen [Mon, 19 Apr 2021 00:01:01 +0000 (00:01 +0000)]
fix index on location_property_tiger (parent_place_id)

Looks like 2af82975cd968ec09683ae5b16a9aa157a7f2176
accidentally renamed an index. Because of the added "if not
exists" clause, the index doesn't get created. This
significantly slows down reverse queries because they now
require full scans on location_property_tiger.

Without this fix, reverse queries can take 8s on a full
planet install on an r5.8xlarge instance in EC2.

3 years agoMerge pull request #2280 from AntoJvlt/Fix-special-phrases-import-and-tests-cleaning
Sarah Hoffmann [Sun, 18 Apr 2021 09:57:19 +0000 (11:57 +0200)]
Merge pull request #2280 from AntoJvlt/Fix-special-phrases-import-and-tests-cleaning

Fix regex and sanity check for the import of special phrases and tests cleaning.

3 years agoOnly log a warning if a wrong input is detected on the wiki while importing special...
AntoJvlt [Sat, 17 Apr 2021 17:45:24 +0000 (19:45 +0200)]
Only log a warning if a wrong input is detected on the wiki while importing special phrases

3 years agoFix occurence regex
AntoJvlt [Sat, 17 Apr 2021 17:24:13 +0000 (19:24 +0200)]
Fix occurence regex

3 years agoCleaned tests and add database cleaning tests on test_import_from_wiki
AntoJvlt [Sat, 17 Apr 2021 17:23:33 +0000 (19:23 +0200)]
Cleaned tests and add database cleaning tests on test_import_from_wiki

3 years agoMerge pull request #2279 from lonvia/add-index-for-continued-indexing
Sarah Hoffmann [Sat, 17 Apr 2021 09:51:21 +0000 (11:51 +0200)]
Merge pull request #2279 from lonvia/add-index-for-continued-indexing

Add index for continued indexing

3 years agoadd tests for continuing import
Sarah Hoffmann [Sat, 17 Apr 2021 09:10:36 +0000 (11:10 +0200)]
add tests for continuing import

3 years agoadd support index when continuing import at index phase
Sarah Hoffmann [Sat, 17 Apr 2021 09:07:04 +0000 (11:07 +0200)]
add support index when continuing import at index phase

Indexing scans the placex table sequentially during indexing
on the initial import. That is okay because we know that all
rows need to be processed anywhere. When continuing the import,
however, a large part might already be indexed, so that the
process spends a lot of time going through rows that are no
longer of interest. Create a supporting index for all unindexed
rows to speed up the scan. This is the same index as used later
for updates.

3 years agoMerge pull request #2278 from lonvia/remove-transistion-functions
Sarah Hoffmann [Sat, 17 Apr 2021 08:13:33 +0000 (10:13 +0200)]
Merge pull request #2278 from lonvia/remove-transistion-functions

Remove transition functions

3 years agoremove transition functions from Python
Sarah Hoffmann [Fri, 16 Apr 2021 16:41:14 +0000 (18:41 +0200)]
remove transition functions from Python

3 years agoMerge pull request #2277 from lonvia/update-osm2pgsql
Sarah Hoffmann [Fri, 16 Apr 2021 15:40:43 +0000 (17:40 +0200)]
Merge pull request #2277 from lonvia/update-osm2pgsql

Update osm2pgsql to current master

3 years agoremove PHP code for transition functions
Sarah Hoffmann [Fri, 16 Apr 2021 15:28:51 +0000 (17:28 +0200)]
remove PHP code for transition functions

3 years agoremove installation of PHP util scripts
Sarah Hoffmann [Fri, 16 Apr 2021 15:09:40 +0000 (17:09 +0200)]
remove installation of PHP util scripts

3 years agoMerge pull request #2276 from lonvia/port-country-code-creation-to-python
Sarah Hoffmann [Fri, 16 Apr 2021 14:57:04 +0000 (16:57 +0200)]
Merge pull request #2276 from lonvia/port-country-code-creation-to-python

Port country code creation to python

3 years agoadd test for new postcode import function
Sarah Hoffmann [Fri, 16 Apr 2021 13:37:53 +0000 (15:37 +0200)]
add test for new postcode import function

3 years agoport function to compute initial postcodes to Python
Sarah Hoffmann [Fri, 16 Apr 2021 13:05:40 +0000 (15:05 +0200)]
port function to compute initial postcodes to Python

3 years agoMerge pull request #2275 from lonvia/switch-to-absolute-imports
Sarah Hoffmann [Fri, 16 Apr 2021 13:04:10 +0000 (15:04 +0200)]
Merge pull request #2275 from lonvia/switch-to-absolute-imports

Use absolute imports in Python code

3 years agouse absolute imports in Python code
Sarah Hoffmann [Fri, 16 Apr 2021 12:20:09 +0000 (14:20 +0200)]
use absolute imports in Python code

Relative imports are no longer officially recommended.

3 years agoupdate osm2pgsql to current master (fixes version output)
Sarah Hoffmann [Thu, 15 Apr 2021 08:24:01 +0000 (10:24 +0200)]
update osm2pgsql to current master (fixes version output)

3 years agoMerge pull request #2263 from AntoJvlt/special-phrases-autoupdate
Sarah Hoffmann [Thu, 15 Apr 2021 08:13:25 +0000 (10:13 +0200)]
Merge pull request #2263 from AntoJvlt/special-phrases-autoupdate

Implemented auto update of special phrases while importing them

3 years agoMerge pull request #2270 from lonvia/simplify-place-boundary-merge
Sarah Hoffmann [Thu, 15 Apr 2021 08:12:53 +0000 (10:12 +0200)]
Merge pull request #2270 from lonvia/simplify-place-boundary-merge

Simplify matching between place and boundary names

3 years agoadapt database check to new index layout
Sarah Hoffmann [Wed, 14 Apr 2021 07:58:14 +0000 (09:58 +0200)]
adapt database check to new index layout

3 years agoadd migration for new placenode geometry index
Sarah Hoffmann [Fri, 9 Apr 2021 19:24:35 +0000 (21:24 +0200)]
add migration for new placenode geometry index

3 years agosimplify name matching between boundary and place node
Sarah Hoffmann [Fri, 9 Apr 2021 19:10:00 +0000 (21:10 +0200)]
simplify name matching between boundary and place node

Instead of normalising the names simply compare them in lower
case. This removes the dependency on the tokenizer for
linking boundaries and nodes. When looking up the linked places
by place type also allow that one name is simply contained in the
other. This catches the frequent case where one of the names has
an addendum (e.g. Newport vs. City of Newport).

Drops the special index for the name lookup and insted relies
on a slightly extended version of the geometry index used for
reverse lookup. Saves around 100MB on a planet.

3 years agoMerge pull request #2269 from lonvia/fix-actions
Sarah Hoffmann [Wed, 14 Apr 2021 15:50:02 +0000 (17:50 +0200)]
Merge pull request #2269 from lonvia/fix-actions

github actions: reintroduce postgresql repo

3 years agogithub actions: reintroduce postgresql repo
Sarah Hoffmann [Wed, 14 Apr 2021 14:19:49 +0000 (16:19 +0200)]
github actions: reintroduce postgresql repo

3 years agoMerge pull request #2264 from darkshredder/tiger-data-tests
Sarah Hoffmann [Wed, 14 Apr 2021 08:56:12 +0000 (10:56 +0200)]
Merge pull request #2264 from darkshredder/tiger-data-tests

Fix:  Error if last statements is wrong and improved tests in tiger data import

3 years agoFix: Removed error if endstatement is wrong and improved tests
Darkshredder [Tue, 13 Apr 2021 09:36:02 +0000 (15:06 +0530)]
Fix: Removed error if endstatement is wrong and improved tests

3 years agoTests added for the auto update of special phrases during import
AntoJvlt [Mon, 12 Apr 2021 12:10:30 +0000 (14:10 +0200)]
Tests added for the auto update of special phrases during import

3 years agoImplemented auto update of special phrases while importing them
AntoJvlt [Mon, 12 Apr 2021 09:55:18 +0000 (11:55 +0200)]
Implemented auto update of special phrases while importing them

3 years agoMerge pull request #2260 from AntoJvlt/fix-load-languages-special-phrases
Sarah Hoffmann [Sun, 11 Apr 2021 21:09:45 +0000 (23:09 +0200)]
Merge pull request #2260 from AntoJvlt/fix-load-languages-special-phrases

Fix default languages loading for special phrases import

3 years agoFix default languages loading
AntoJvlt [Sun, 11 Apr 2021 20:26:31 +0000 (22:26 +0200)]
Fix default languages loading

3 years agoMerge pull request #2258 from darkshredder/code-coverage
Sarah Hoffmann [Sat, 10 Apr 2021 19:19:55 +0000 (21:19 +0200)]
Merge pull request #2258 from darkshredder/code-coverage

Disabled Code coverage status checks

3 years agoCodeCov comment only when codecoverage changes
Darkshredder [Sat, 10 Apr 2021 16:58:29 +0000 (22:28 +0530)]
CodeCov comment only when codecoverage changes

3 years agoDisabled Coverage status checks
Darkshredder [Sat, 10 Apr 2021 15:14:52 +0000 (20:44 +0530)]
Disabled Coverage status checks

3 years agoadd badge for codecov
Sarah Hoffmann [Sat, 10 Apr 2021 14:57:39 +0000 (16:57 +0200)]
add badge for codecov

3 years agoMerge pull request #2252 from darkshredder/code-coverage
Sarah Hoffmann [Sat, 10 Apr 2021 14:37:12 +0000 (16:37 +0200)]
Merge pull request #2252 from darkshredder/code-coverage

Added Code coverage support using Codecov

3 years agosplit LANGUAGES parameter before use
Sarah Hoffmann [Fri, 9 Apr 2021 15:48:28 +0000 (17:48 +0200)]
split LANGUAGES parameter before use

The user supplies the languages as a comma-separated list.

3 years agoadd migration information for new configuration format
Sarah Hoffmann [Thu, 8 Apr 2021 09:01:19 +0000 (11:01 +0200)]
add migration information for new configuration format

3 years agoMerge pull request #2256 from lonvia/remove-reverseinplan-option
Sarah Hoffmann [Thu, 8 Apr 2021 08:54:16 +0000 (10:54 +0200)]
Merge pull request #2256 from lonvia/remove-reverseinplan-option

Remove ReverseInPlan option

3 years agoremove special handling for reversed queries in getGroupedSearches
Sarah Hoffmann [Thu, 8 Apr 2021 08:35:14 +0000 (10:35 +0200)]
remove special handling for reversed queries in getGroupedSearches

getGroupedSearches is guaranteed not to be called with reversed
structured queries, so there is no need to have special exclusion
code.

3 years agoremove reverseInPlan option from Geocode
Sarah Hoffmann [Thu, 8 Apr 2021 08:19:27 +0000 (10:19 +0200)]
remove reverseInPlan option from Geocode

Disabling query reversal is no longer possible in the configuration,
so there is no need to keep this as an option. Reversal is
automatically disabled for structured search only.

3 years agoprepare 3.7.0 release v3.7.0
Sarah Hoffmann [Tue, 6 Apr 2021 19:23:29 +0000 (21:23 +0200)]
prepare 3.7.0 release

3 years agodocs: minor spelling corrections
Sarah Hoffmann [Tue, 6 Apr 2021 14:09:53 +0000 (16:09 +0200)]
docs: minor spelling corrections

3 years agodocs: unpacking tiger data is no longer necessary
Sarah Hoffmann [Tue, 6 Apr 2021 13:56:08 +0000 (15:56 +0200)]
docs: unpacking tiger data is no longer necessary

3 years agoMerge pull request #2250 from lonvia/save-transliterated-housenumbers
Sarah Hoffmann [Mon, 5 Apr 2021 13:48:22 +0000 (15:48 +0200)]
Merge pull request #2250 from lonvia/save-transliterated-housenumbers

Switch to saving transliterated housenumbers in placex

3 years agoFixed BDD tests coverage reports
Darkshredder [Mon, 5 Apr 2021 01:00:31 +0000 (06:30 +0530)]
Fixed BDD tests coverage reports

3 years agoadd migration for transliterated housenumbers
Sarah Hoffmann [Fri, 2 Apr 2021 15:28:52 +0000 (17:28 +0200)]
add migration for transliterated housenumbers

3 years agouse new transliteration in initial housenumber word computation
Sarah Hoffmann [Thu, 1 Apr 2021 16:52:06 +0000 (18:52 +0200)]
use new transliteration in initial housenumber word computation

The new create_housenumber_id() function splits housenumber
lists correctly. Otherwise there is no difference.

3 years agocorrectly handle housenumber lists
Sarah Hoffmann [Mon, 29 Mar 2021 15:36:44 +0000 (17:36 +0200)]
correctly handle housenumber lists

Lists are now standardised to use a semicolon separator.

3 years agomove transliteration of housenumbers into indexing
Sarah Hoffmann [Mon, 29 Mar 2021 14:45:09 +0000 (16:45 +0200)]
move transliteration of housenumbers into indexing

Housenumbers are now saved in transliterated form in the housenumber
column. This saves the transliteration step during lookup.

3 years agotests for finding non-ascii housenumbers
Sarah Hoffmann [Mon, 29 Mar 2021 14:36:45 +0000 (16:36 +0200)]
tests for finding non-ascii housenumbers

3 years agoreturn housenumbers always from address field
Sarah Hoffmann [Mon, 29 Mar 2021 07:36:56 +0000 (09:36 +0200)]
return housenumbers always from address field

This means that we can use normalized versions of the
housenumber in the housenumber field as it is no longer
a user visible field.

3 years agoMerge pull request #2248 from darkshredder/special-term-test
Sarah Hoffmann [Sat, 3 Apr 2021 16:31:01 +0000 (18:31 +0200)]
Merge pull request #2248 from darkshredder/special-term-test

Added Test for TokenSpecialTerm

3 years agoAdded Test for TokenSpecialTerm
Darkshredder [Thu, 1 Apr 2021 23:19:05 +0000 (04:49 +0530)]
Added Test for TokenSpecialTerm