]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
4 years agoSupport whitespace characters(x09-x0d) as single space
K Rahul Reddy [Wed, 1 Apr 2020 23:34:40 +0000 (05:04 +0530)]
Support whitespace characters(x09-x0d) as single space

4 years agoMerge pull request #1706 from mtmail/warn-if-no-tiger-files-found
Sarah Hoffmann [Fri, 6 Mar 2020 21:55:37 +0000 (22:55 +0100)]
Merge pull request #1706 from mtmail/warn-if-no-tiger-files-found

print warning if no Tiger files found

4 years agoMerge pull request #1707 from lonvia/regression-address-in-area
Sarah Hoffmann [Fri, 6 Mar 2020 21:55:24 +0000 (22:55 +0100)]
Merge pull request #1707 from lonvia/regression-address-in-area

place node address parts must be in lower rank area

4 years agoplace node address parts must be in lower rank area
Sarah Hoffmann [Fri, 6 Mar 2020 20:51:38 +0000 (21:51 +0100)]
place node address parts must be in lower rank area

This fixes a regression where the area of the lower ranking
area was not computed correctly.

Also excludes postcodes areas now as they have their own
hierarchy.

4 years agoprint warning if no Tiger files found
marc tobias [Fri, 6 Mar 2020 16:52:46 +0000 (17:52 +0100)]
print warning if no Tiger files found

4 years agoMerge pull request #1705 from lonvia/delete-linkee-from-search-name
Sarah Hoffmann [Wed, 4 Mar 2020 10:55:05 +0000 (11:55 +0100)]
Merge pull request #1705 from lonvia/delete-linkee-from-search-name

Remove linkees from search_name

4 years agoRemove linkees from search_name
Sarah Hoffmann [Wed, 4 Mar 2020 10:35:01 +0000 (11:35 +0100)]
Remove linkees from search_name

Fixes #722

4 years agoMerge pull request #1704 from lonvia/centroid-within-geometry
Sarah Hoffmann [Wed, 4 Mar 2020 09:18:57 +0000 (10:18 +0100)]
Merge pull request #1704 from lonvia/centroid-within-geometry

linked centroids must always be within geometry

4 years agolinked centroids must always be within geometry
Sarah Hoffmann [Wed, 4 Mar 2020 08:59:57 +0000 (09:59 +0100)]
linked centroids must always be within geometry

When using a linked place as centroid for a boundary, check
first that it is really within the area. If it is outside,
just keep the computed centroid because a centroid outside the
area just causes havok.

Fixes #1352.

4 years agoMerge pull request #1702 from lonvia/rename-derived-place
Sarah Hoffmann [Wed, 4 Mar 2020 07:08:39 +0000 (08:08 +0100)]
Merge pull request #1702 from lonvia/rename-derived-place

Make admin boundaries inherit address rank from place nodes

4 years agofix style
Sarah Hoffmann [Sun, 1 Mar 2020 21:24:32 +0000 (22:24 +0100)]
fix style

4 years agobetter grouping
Sarah Hoffmann [Fri, 28 Feb 2020 21:10:35 +0000 (22:10 +0100)]
better grouping

4 years agooutput linked place into address details
Sarah Hoffmann [Fri, 28 Feb 2020 21:07:06 +0000 (22:07 +0100)]
output linked place into address details

4 years agoadd testing for rank adaption while linking
Sarah Hoffmann [Fri, 21 Feb 2020 15:35:59 +0000 (16:35 +0100)]
add testing for rank adaption while linking

4 years agolink against place nodes by place type
Sarah Hoffmann [Wed, 19 Feb 2020 08:50:19 +0000 (09:50 +0100)]
link against place nodes by place type

If a boundary relation has no label member preferably
link against a place node with the same place type.

Also inherit the rank_address from the place node (only
has an effect when linking via lable member or place type).

4 years agomove linked place type into linked_place extratags
Sarah Hoffmann [Sun, 9 Feb 2020 21:26:53 +0000 (22:26 +0100)]
move linked place type into linked_place extratags

Using linked_place means that we don't overwrite any
place tags on the boundary. This is important when we
wanto to use the information for linking.

4 years agoMerge pull request #1698 from lonvia/cleanup-partition-functions
Sarah Hoffmann [Wed, 26 Feb 2020 19:21:10 +0000 (20:21 +0100)]
Merge pull request #1698 from lonvia/cleanup-partition-functions

Cleanup partition functions

4 years agomake all query partition functions stable
Sarah Hoffmann [Wed, 26 Feb 2020 10:41:49 +0000 (11:41 +0100)]
make all query partition functions stable

4 years agoremove unused nearfeature types
Sarah Hoffmann [Wed, 26 Feb 2020 09:42:30 +0000 (10:42 +0100)]
remove unused nearfeature types

Also move the remaining nearfeaturecentr type close to the
function that is using it.

4 years agosimplify getNearestParallelRoadFeature function
Sarah Hoffmann [Wed, 26 Feb 2020 09:14:28 +0000 (10:14 +0100)]
simplify getNearestParallelRoadFeature function

The function only ever returns one result of which only the
place_id is used. So simplify it to return a single place_id
only (or NULL if none is found).

Also fix typo in function name.

4 years agosimplify getNearestRoadFeature function
Sarah Hoffmann [Wed, 26 Feb 2020 09:04:17 +0000 (10:04 +0100)]
simplify getNearestRoadFeature function

The function only ever returns one result of which only the
place_id is used. So simplify it to return a single place_id
only (or NULL if none is found). Rename funciton to avoid
conflicts when updating an existing database.

4 years agoadvise against using Postgresql 12 and Postgis 3
Sarah Hoffmann [Tue, 25 Feb 2020 08:44:32 +0000 (09:44 +0100)]
advise against using Postgresql 12 and Postgis 3

See also #1677

4 years agorevert using stricter uniqueness constraint on place
Sarah Hoffmann [Mon, 24 Feb 2020 21:42:03 +0000 (22:42 +0100)]
revert using stricter uniqueness constraint on place

Multiple objects with the same (osm_type, osm_id, class) may
exist when we hold back deleting an area because it is so
large.

Fixes #1695.

4 years agoMerge pull request #1693 from lonvia/reorganize-addressline-computation
Sarah Hoffmann [Mon, 24 Feb 2020 21:39:51 +0000 (22:39 +0100)]
Merge pull request #1693 from lonvia/reorganize-addressline-computation

Reorganize addressline computation

4 years agoadapt API tests
Sarah Hoffmann [Sat, 22 Feb 2020 15:46:03 +0000 (16:46 +0100)]
adapt API tests

4 years agomove address line computation in its own function
Sarah Hoffmann [Wed, 5 Feb 2020 09:12:43 +0000 (10:12 +0100)]
move address line computation in its own function

4 years agoMerge pull request #1692 from mtmail/tests-for-HasSetAny
Sarah Hoffmann [Thu, 20 Feb 2020 20:16:39 +0000 (21:16 +0100)]
Merge pull request #1692 from mtmail/tests-for-HasSetAny

unit tests for ParameterParser::hasSetAny

4 years agounit tests for ParameterParser::hasSetAny
marc tobias [Wed, 19 Feb 2020 15:55:17 +0000 (16:55 +0100)]
unit tests for ParameterParser::hasSetAny

4 years agoMerge pull request #1691 from lonvia/structured-query-via-cmdline
Sarah Hoffmann [Wed, 19 Feb 2020 10:12:37 +0000 (11:12 +0100)]
Merge pull request #1691 from lonvia/structured-query-via-cmdline

add structured search to command-line query tool

4 years agoadd structured search to command-line query tool
Sarah Hoffmann [Wed, 19 Feb 2020 09:20:18 +0000 (10:20 +0100)]
add structured search to command-line query tool

4 years agoMerge pull request #1690 from lonvia/parenting-large-rank-30-areas
Sarah Hoffmann [Wed, 19 Feb 2020 08:20:12 +0000 (09:20 +0100)]
Merge pull request #1690 from lonvia/parenting-large-rank-30-areas

improve parenting for large areas with rank 30

4 years agoimprove parenting for large areas with rank 30
Sarah Hoffmann [Wed, 5 Feb 2020 20:33:24 +0000 (21:33 +0100)]
improve parenting for large areas with rank 30

Instead of unconditionally parenting them to a street, the
larger areas get a parent area that contains them. To keep
things computationally light-weight, only use the centroid and
bbox to determine if an area is contained.

Requires renaming of parenting functions because renaming
a parameter of the function causes issues when updating the
function (it requires a manual delete, which I'd like to
avoid).

4 years agoMerge pull request #1689 from mtmail/travis-postgres-stopped-working
Sarah Hoffmann [Wed, 19 Feb 2020 07:00:08 +0000 (08:00 +0100)]
Merge pull request #1689 from mtmail/travis-postgres-stopped-working

Travis: documentation suggests we need to add postgresql-client package

4 years agoTravis: documentation suggests we need to add postgresql-client package pre-startup
marc tobias [Tue, 18 Feb 2020 22:37:06 +0000 (23:37 +0100)]
Travis: documentation suggests we need to add postgresql-client package pre-startup

4 years agoMerge pull request #1688 from mtmail/snippet-noun-vs-snipped-verb
Sarah Hoffmann [Tue, 18 Feb 2020 21:55:20 +0000 (22:55 +0100)]
Merge pull request #1688 from mtmail/snippet-noun-vs-snipped-verb

documentation wording: snipped->snippet

4 years agodocumentation wording: snipped->snippet
marc tobias [Tue, 18 Feb 2020 21:48:27 +0000 (22:48 +0100)]
documentation wording: snipped->snippet

4 years agomake sure that linked places are within a boundary
Sarah Hoffmann [Tue, 18 Feb 2020 21:46:32 +0000 (22:46 +0100)]
make sure that linked places are within a boundary

This is a regression from previous code refactoring.

Fixes #1684.

4 years agoadd bbox whereclause to make postgis 3.0 happy
Sarah Hoffmann [Sun, 16 Feb 2020 13:10:22 +0000 (14:10 +0100)]
add bbox whereclause to make postgis 3.0 happy

Normally ST_Covers() should include a bbox index use,
so adding a bbox where clause is not really necessary.
However, the query planner messes up and uses a parallel
index search with a second index instead of exclusively
running on the geometry index, when the bbox part is
missing.

4 years agoMerge pull request #1678 from lonvia/early-drop
Sarah Hoffmann [Thu, 13 Feb 2020 21:50:41 +0000 (22:50 +0100)]
Merge pull request #1678 from lonvia/early-drop

Clean up intermediate tables earlier with --drop

4 years agofix duplicate keys in tests
Sarah Hoffmann [Wed, 12 Feb 2020 10:29:33 +0000 (11:29 +0100)]
fix duplicate keys in tests

The tests suddenly failed because the unique key constraint
is more strict and does no longer include the type.

4 years agoclean up intermediate tables earlier with --drop
Sarah Hoffmann [Wed, 12 Feb 2020 10:03:20 +0000 (11:03 +0100)]
clean up intermediate tables earlier with --drop

When --drop is given, we can remove all node geometry information
already after the import with osm2pgsql. Also drop all unnecessary
tables before creating the final indices.

4 years agoMerge pull request #1675 from lonvia/refresh-connection-while-indexing
Sarah Hoffmann [Wed, 12 Feb 2020 07:18:09 +0000 (08:18 +0100)]
Merge pull request #1675 from lonvia/refresh-connection-while-indexing

Fix a couple of issues with the new Python nominatim script

4 years agoMerge pull request #1674 from mtmail/testdb-how-to-select-tiger-data
Sarah Hoffmann [Tue, 11 Feb 2020 21:57:39 +0000 (22:57 +0100)]
Merge pull request #1674 from mtmail/testdb-how-to-select-tiger-data

document how to extract subset of TIGER data needed for API tests

4 years agoMerge pull request #1673 from mtmail/wikidata-wget-incomplete
Sarah Hoffmann [Tue, 11 Feb 2020 21:56:45 +0000 (22:56 +0100)]
Merge pull request #1673 from mtmail/wikidata-wget-incomplete

wikipedia: wget didnt download, skip index generation

4 years agopsycopg 2.6 is now usable on ubuntu 16
Sarah Hoffmann [Tue, 11 Feb 2020 21:49:03 +0000 (22:49 +0100)]
psycopg 2.6 is now usable on ubuntu 16

4 years agonominatim.py: use async in connect() function
Sarah Hoffmann [Tue, 11 Feb 2020 21:08:04 +0000 (22:08 +0100)]
nominatim.py: use async in connect() function

The _async parameter name is only supported since psycopg 2.7.
However, async is a keyword in Python >= 3.7, so using this
gives us a syntax error. Working around this by defining the
parameters in a dict and handing that into the connect function.

4 years agonominatim.py: also catch deadlocks on final wait
Sarah Hoffmann [Tue, 11 Feb 2020 21:00:24 +0000 (22:00 +0100)]
nominatim.py: also catch deadlocks on final wait

4 years agoregularly close connection while indexing
Sarah Hoffmann [Sun, 9 Feb 2020 12:57:36 +0000 (13:57 +0100)]
regularly close connection while indexing

Postgres sooner or later runs out of memory when the connection
is used for too long.

4 years agodocument how to extract subset of TIGER data needed for API tests
marc tobias [Tue, 11 Feb 2020 17:50:27 +0000 (18:50 +0100)]
document how to extract subset of TIGER data needed for API tests

4 years agowikipedia: wget didnt download, skip index generation
marc tobias [Mon, 10 Feb 2020 16:20:11 +0000 (17:20 +0100)]
wikipedia: wget didnt download, skip index generation

4 years agoMerge pull request #1670 from lonvia/permalinks-for-tiger-and-interpolation
Sarah Hoffmann [Sun, 9 Feb 2020 20:07:19 +0000 (21:07 +0100)]
Merge pull request #1670 from lonvia/permalinks-for-tiger-and-interpolation

Enable Permalinks to dtails for tiger and interpolation

4 years agofix formatting
Sarah Hoffmann [Sun, 9 Feb 2020 15:57:55 +0000 (16:57 +0100)]
fix formatting

4 years agodetails: also look for interpolations when way id is given
Sarah Hoffmann [Sun, 9 Feb 2020 15:50:04 +0000 (16:50 +0100)]
details: also look for interpolations when way id is given

4 years agouse detailsPermaLink function on main website as well
Sarah Hoffmann [Sun, 9 Feb 2020 15:05:22 +0000 (16:05 +0100)]
use detailsPermaLink function on main website as well

4 years agoreturn place_id link to details when not an OSM object
Sarah Hoffmann [Sun, 9 Feb 2020 14:45:38 +0000 (15:45 +0100)]
return place_id link to details when not an OSM object

Stop-gap solution to find the right object for Tiger and
interpolation objects.

4 years agoMerge pull request #1667 from mtmail/setup-delete-invalid-indices
Sarah Hoffmann [Sun, 9 Feb 2020 13:21:17 +0000 (14:21 +0100)]
Merge pull request #1667 from mtmail/setup-delete-invalid-indices

setup: delete invalid indices in create-search-indices step

4 years agoRemove hack that changes the class/type of cities
Sarah Hoffmann [Sun, 9 Feb 2020 11:14:32 +0000 (12:14 +0100)]
Remove hack that changes the class/type of cities

This interferes badly with the details view.

Fixes #1668.

4 years agosetup: delete invalid indices in create-search-indices step
marc tobias [Sat, 8 Feb 2020 14:16:20 +0000 (15:16 +0100)]
setup: delete invalid indices in create-search-indices step

4 years agoMerge pull request #1665 from mtmail/centos7-php7
Sarah Hoffmann [Fri, 7 Feb 2020 19:43:49 +0000 (20:43 +0100)]
Merge pull request #1665 from mtmail/centos7-php7

CentOS7: update from PHP 5.4 to 7.2, add psycopg2

4 years agoMerge pull request #1666 from mtmail/ubuntu-installs-add-psycopg2
Sarah Hoffmann [Fri, 7 Feb 2020 19:42:38 +0000 (20:42 +0100)]
Merge pull request #1666 from mtmail/ubuntu-installs-add-psycopg2

Vagrant Ubuntu: psycopg2 is required

4 years agoVagrant Ubuntu: psycopg2 is required
marc tobias [Fri, 7 Feb 2020 14:26:09 +0000 (15:26 +0100)]
Vagrant Ubuntu: psycopg2 is required

4 years agoCentOS7: update from PHP 5.4 to 7.2
marc tobias [Fri, 7 Feb 2020 14:18:46 +0000 (15:18 +0100)]
CentOS7: update from PHP 5.4 to 7.2

4 years agoMerge pull request #1663 from mtmail/vagrant-centos-8
Sarah Hoffmann [Thu, 6 Feb 2020 20:12:28 +0000 (21:12 +0100)]
Merge pull request #1663 from mtmail/vagrant-centos-8

Vagrant setup for CentOS 8

4 years agoMerge pull request #1664 from mtmail/check-import-finished-for-reverse-only
Sarah Hoffmann [Thu, 6 Feb 2020 20:07:04 +0000 (21:07 +0100)]
Merge pull request #1664 from mtmail/check-import-finished-for-reverse-only

check_import_finished.php - reverse_only mode has less indices

4 years agocheck_import_finished.php - reverse_only mode has less indices
marc tobias [Thu, 6 Feb 2020 15:46:54 +0000 (16:46 +0100)]
check_import_finished.php - reverse_only mode has less indices

4 years agoVagrant setup for CentOS 8
marc tobias [Mon, 3 Feb 2020 12:13:46 +0000 (13:13 +0100)]
Vagrant setup for CentOS 8

4 years agodetails html page: no longer use place_id in URLs
marc tobias [Sun, 2 Feb 2020 00:16:31 +0000 (01:16 +0100)]
details html page: no longer use place_id in URLs

4 years agofix verboseness of nominiatim script during updates
Sarah Hoffmann [Fri, 31 Jan 2020 17:17:42 +0000 (18:17 +0100)]
fix verboseness of nominiatim script during updates

4 years agoMerge pull request #1648 from lonvia/nominatim-as-python-script
Sarah Hoffmann [Fri, 31 Jan 2020 16:53:49 +0000 (17:53 +0100)]
Merge pull request #1648 from lonvia/nominatim-as-python-script

Replace C Nominatim indexer with Python script

4 years agoremove libxml dependency for travis as well
Sarah Hoffmann [Wed, 29 Jan 2020 10:54:20 +0000 (11:54 +0100)]
remove libxml dependency for travis as well

4 years agofix typo
Sarah Hoffmann [Wed, 29 Jan 2020 10:50:30 +0000 (11:50 +0100)]
fix typo

4 years agoalso adapt indexing command in update script
Sarah Hoffmann [Wed, 29 Jan 2020 10:36:12 +0000 (11:36 +0100)]
also adapt indexing command in update script

4 years agoupdate cMake build documentation
Sarah Hoffmann [Fri, 24 Jan 2020 21:53:26 +0000 (22:53 +0100)]
update cMake build documentation

Remove the dependency on libxml, no longer needed.

4 years agoforgot to index last rank
Sarah Hoffmann [Wed, 22 Jan 2020 10:18:21 +0000 (11:18 +0100)]
forgot to index last rank

4 years agoreplace nominatim C program
Sarah Hoffmann [Tue, 21 Jan 2020 20:57:07 +0000 (21:57 +0100)]
replace nominatim C program

4 years agofix log levels
Sarah Hoffmann [Mon, 20 Jan 2020 22:34:56 +0000 (23:34 +0100)]
fix log levels

4 years agoadd time display for nominatim.py
Sarah Hoffmann [Mon, 20 Jan 2020 22:17:52 +0000 (23:17 +0100)]
add time display for nominatim.py

4 years agoclean up and document script
Sarah Hoffmann [Mon, 20 Jan 2020 21:19:33 +0000 (22:19 +0100)]
clean up and document script

4 years agofix SQL and some other stuff
Sarah Hoffmann [Sun, 19 Jan 2020 23:05:28 +0000 (00:05 +0100)]
fix SQL and some other stuff

4 years agoRevert "switch to threading"
Sarah Hoffmann [Sun, 19 Jan 2020 20:56:37 +0000 (21:56 +0100)]
Revert "switch to threading"

This reverts commit 8b1c2181be5aa5335c68d36a49cab9c4e2cd8bef.

4 years agoswitch to threading
Sarah Hoffmann [Sun, 19 Jan 2020 20:56:20 +0000 (21:56 +0100)]
switch to threading

4 years agouse generator for thread choice
Sarah Hoffmann [Sun, 19 Jan 2020 13:51:15 +0000 (14:51 +0100)]
use generator for thread choice

4 years agoadd prepared statement
Sarah Hoffmann [Sun, 19 Jan 2020 13:06:48 +0000 (14:06 +0100)]
add prepared statement

4 years agosimple implementation
Sarah Hoffmann [Sun, 19 Jan 2020 12:37:45 +0000 (13:37 +0100)]
simple implementation

4 years agoMerge pull request #1647 from lonvia/split-out-linking
Sarah Hoffmann [Fri, 24 Jan 2020 20:55:19 +0000 (21:55 +0100)]
Merge pull request #1647 from lonvia/split-out-linking

Split up placex update trigger code

4 years agofix indent
Sarah Hoffmann [Fri, 24 Jan 2020 20:16:26 +0000 (21:16 +0100)]
fix indent

4 years agorename functions where return parameter changed
Sarah Hoffmann [Thu, 23 Jan 2020 21:24:41 +0000 (22:24 +0100)]
rename functions where return parameter changed

Postgresql cannot cleanly reimport these functions when
upgrading, so simply rename to avoid errors.

4 years agoforgot new trigger sql
Sarah Hoffmann [Sat, 18 Jan 2020 22:49:38 +0000 (23:49 +0100)]
forgot new trigger sql

4 years agoadapt index for changes name lookup
Sarah Hoffmann [Fri, 17 Jan 2020 16:47:10 +0000 (17:47 +0100)]
adapt index for changes name lookup

4 years agomove trigger creation later in setup
Sarah Hoffmann [Thu, 16 Jan 2020 21:53:52 +0000 (22:53 +0100)]
move trigger creation later in setup

4 years agoclean up get_word_id function
Sarah Hoffmann [Thu, 16 Jan 2020 21:08:37 +0000 (22:08 +0100)]
clean up get_word_id function

Replaced by addr_ids_from_name() which also normalises the
string.

4 years agogetNearestNamed*Feature functions better return values
Sarah Hoffmann [Thu, 16 Jan 2020 20:43:26 +0000 (21:43 +0100)]
getNearestNamed*Feature functions better return values

4 years agofactor out parent search from addr:street/addr:place
Sarah Hoffmann [Thu, 16 Jan 2020 20:17:19 +0000 (21:17 +0100)]
factor out parent search from addr:street/addr:place

4 years agofactor out searching for parent road for pois
Sarah Hoffmann [Thu, 16 Jan 2020 19:26:17 +0000 (20:26 +0100)]
factor out searching for parent road for pois

4 years agoremove unused function
Sarah Hoffmann [Thu, 16 Jan 2020 16:31:31 +0000 (17:31 +0100)]
remove unused function

4 years agofactor out computation of default names
Sarah Hoffmann [Wed, 15 Jan 2020 23:11:32 +0000 (00:11 +0100)]
factor out computation of default names

Also moves the computation down the line so that we never
have to do it twice.

4 years agofactor out place linking sql
Sarah Hoffmann [Wed, 15 Jan 2020 21:01:33 +0000 (22:01 +0100)]
factor out place linking sql

4 years agoadapt test to change in hamlet classification
Sarah Hoffmann [Thu, 23 Jan 2020 21:26:47 +0000 (22:26 +0100)]
adapt test to change in hamlet classification

4 years agodoc: clarify the influence of autovacuum on memory
Sarah Hoffmann [Wed, 22 Jan 2020 11:02:38 +0000 (12:02 +0100)]
doc: clarify the influence of autovacuum on memory

4 years agodocs: add a note that the faltnode file is needed for updates
Sarah Hoffmann [Wed, 22 Jan 2020 10:44:05 +0000 (11:44 +0100)]
docs: add a note that the faltnode file is needed for updates

Fixes #1644.