nominatim.git
24 hours agoreuse DB connections by default master
Sarah Hoffmann [Thu, 21 Feb 2019 22:40:40 +0000 (23:40 +0100)]
reuse DB connections by default

24 hours agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 21 Feb 2019 22:39:48 +0000 (23:39 +0100)]
Merge remote-tracking branch 'upstream/master'

25 hours agoadd osm_id index for osmline table
Sarah Hoffmann [Thu, 21 Feb 2019 22:26:31 +0000 (23:26 +0100)]
add osm_id index for osmline table

Needed when deleting address interpolation.

9 days agoadd hint that setup.php must be run from build directory
Sarah Hoffmann [Wed, 13 Feb 2019 20:58:59 +0000 (21:58 +0100)]
add hint that setup.php must be run from build directory

Fixes #1307.

12 days agoMerge pull request #1295 from mtmail/move-searchrank-labels-to-php
Sarah Hoffmann [Sun, 10 Feb 2019 16:22:49 +0000 (17:22 +0100)]
Merge pull request #1295 from mtmail/move-searchrank-labels-to-php

Remove get_addressrank_label. Move get_searchrank_label to PHP

12 days agoMerge pull request #1294 from mtmail/behave-support-for-DB-PORT
Sarah Hoffmann [Sun, 10 Feb 2019 16:20:57 +0000 (17:20 +0100)]
Merge pull request #1294 from mtmail/behave-support-for-DB-PORT

BDD: support for DB_PORT environment variable

12 days agoMerge pull request #1305 from mtmail/travis-ci-ubuntu-16
Sarah Hoffmann [Sun, 10 Feb 2019 16:20:06 +0000 (17:20 +0100)]
Merge pull request #1305 from mtmail/travis-ci-ubuntu-16

Travis CI Ubuntu 14 => Ubuntu 16

13 days agoBDD: support for DB_PORT environment variable
marc tobias [Mon, 28 Jan 2019 18:33:22 +0000 (19:33 +0100)]
BDD: support for DB_PORT environment variable

13 days agoTravis CI Ubuntu 14 => Ubuntu 16
marc tobias [Sat, 9 Feb 2019 19:22:34 +0000 (20:22 +0100)]
Travis CI Ubuntu 14 => Ubuntu 16

13 days agoRemove get_addressrank_label. Move get_searchrank_label to PHP
marc tobias [Mon, 28 Jan 2019 18:38:05 +0000 (19:38 +0100)]
Remove get_addressrank_label. Move get_searchrank_label to PHP

13 days agoMerge pull request #1282 from lonvia/remove-self-from-place-addressline
Sarah Hoffmann [Sat, 9 Feb 2019 15:00:46 +0000 (16:00 +0100)]
Merge pull request #1282 from lonvia/remove-self-from-place-addressline

Remove self from place addressline

13 days agodocs: adapt sizes to smaller place_address table
Sarah Hoffmann [Tue, 22 Jan 2019 21:42:18 +0000 (22:42 +0100)]
docs: adapt sizes to smaller place_address table

13 days agoremove self-reference from place-addressline
Sarah Hoffmann [Sun, 13 Jan 2019 20:07:01 +0000 (21:07 +0100)]
remove self-reference from place-addressline

13 days agoMerge pull request #1304 from mtmail/travis-use-composer-instead-of-pear-install
Sarah Hoffmann [Sat, 9 Feb 2019 14:24:04 +0000 (15:24 +0100)]
Merge pull request #1304 from mtmail/travis-use-composer-instead-of-pear-install

pear.php.net offline. Use composer instead of pear install

13 days agoMerge pull request #1303 from mtmail/remove-deprecated-phpunit-config-key
Sarah Hoffmann [Sat, 9 Feb 2019 08:54:34 +0000 (09:54 +0100)]
Merge pull request #1303 from mtmail/remove-deprecated-phpunit-config-key

remove phpunit config key deprecated since version 3.5

13 days agopear.php.net offline. Use composer instead of pear install
marc tobias [Sat, 9 Feb 2019 00:08:47 +0000 (01:08 +0100)]
pear.php.net offline. Use composer instead of pear install

13 days agoremove phpunit config key deprecated since version 3.5
marc tobias [Fri, 8 Feb 2019 23:34:04 +0000 (00:34 +0100)]
remove phpunit config key deprecated since version 3.5

3 weeks agoMerge pull request #1296 from mtmail/readme-markdown-syntax-error
Sarah Hoffmann [Mon, 28 Jan 2019 20:19:46 +0000 (21:19 +0100)]
Merge pull request #1296 from mtmail/readme-markdown-syntax-error

README: tiny markdown syntax error

3 weeks agoREADME: tiny markdown syntax error
marc tobias [Mon, 28 Jan 2019 18:42:40 +0000 (19:42 +0100)]
README: tiny markdown syntax error

3 weeks agoDo not allow --no-index together with --import-osmosis-all
Sarah Hoffmann [Sat, 26 Jan 2019 14:25:00 +0000 (15:25 +0100)]
Do not allow --no-index together with --import-osmosis-all

Fixes #1283.

3 weeks agoset import_status when indexing only
Sarah Hoffmann [Sat, 26 Jan 2019 14:01:39 +0000 (15:01 +0100)]
set import_status when indexing only

Makes sure that things work as expected when running
`--import-osmosis --no-index` and `--index` separately.

Fixes #1284.

3 weeks agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sat, 26 Jan 2019 13:04:35 +0000 (14:04 +0100)]
Merge remote-tracking branch 'upstream/master'

3 weeks agoignore admin boundary ways for countries and states
Sarah Hoffmann [Sat, 26 Jan 2019 12:34:28 +0000 (13:34 +0100)]
ignore admin boundary ways for countries and states

Countries and states are mapped world-wide as relations by now.

Fixes #543 and #1291.

6 weeks agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 10 Jan 2019 19:37:10 +0000 (20:37 +0100)]
Merge remote-tracking branch 'upstream/master'

6 weeks agoMerge pull request #1277 from lonvia/osm2pgsql-import-from-json
Sarah Hoffmann [Thu, 10 Jan 2019 19:36:20 +0000 (20:36 +0100)]
Merge pull request #1277 from lonvia/osm2pgsql-import-from-json

Osm2pgsql import from json style file

6 weeks agopostcodes also need fallback
Sarah Hoffmann [Tue, 8 Jan 2019 22:46:18 +0000 (23:46 +0100)]
postcodes also need fallback

6 weeks agoadd final missing import numbers
Sarah Hoffmann [Tue, 8 Jan 2019 21:20:42 +0000 (22:20 +0100)]
add final missing import numbers

6 weeks agoupdate osm2pgsql (custom style)
Sarah Hoffmann [Sun, 6 Jan 2019 18:20:32 +0000 (19:20 +0100)]
update osm2pgsql (custom style)

6 weeks agomore style docs
Sarah Hoffmann [Thu, 3 Jan 2019 20:08:38 +0000 (21:08 +0100)]
more style docs

6 weeks agoadd tests for import of interpolations
Sarah Hoffmann [Thu, 3 Jan 2019 20:08:16 +0000 (21:08 +0100)]
add tests for import of interpolations

6 weeks agoadd postcodes and interpolations to osm2pgsql style
Sarah Hoffmann [Wed, 2 Jan 2019 13:50:55 +0000 (14:50 +0100)]
add postcodes and interpolations to osm2pgsql style

6 weeks agodocument import style variants
Sarah Hoffmann [Tue, 4 Dec 2018 21:22:19 +0000 (22:22 +0100)]
document import style variants

6 weeks agofix typo
Sarah Hoffmann [Sun, 2 Dec 2018 22:09:11 +0000 (23:09 +0100)]
fix typo

6 weeks agofixup admin import style and add two new ones
Sarah Hoffmann [Sun, 2 Dec 2018 22:05:45 +0000 (23:05 +0100)]
fixup admin import style and add two new ones

Remove unnamed landuses and postcode points from
importing. The latter will cause all objects with
address tags to be imported after all. Not expected
in the admin import style.

6 weeks agoadd documentation for new import style
Sarah Hoffmann [Sun, 2 Dec 2018 16:38:25 +0000 (17:38 +0100)]
add documentation for new import style

6 weeks agoSwitch to configurable style for osm2pgsql
Sarah Hoffmann [Mon, 26 Nov 2018 23:17:00 +0000 (00:17 +0100)]
Switch to configurable style for osm2pgsql

Includes the full style, which is the same as now (minus
sidwalk exclusion) and a minimal style for boundaries only.

6 weeks agoadapt warm.php to new Result objects
Sarah Hoffmann [Tue, 8 Jan 2019 21:45:21 +0000 (22:45 +0100)]
adapt warm.php to new Result objects

Fixes #1276.

6 weeks agokeep country_osm_grid table when dropping update tables
Sarah Hoffmann [Tue, 8 Jan 2019 21:44:33 +0000 (22:44 +0100)]
keep country_osm_grid table when dropping update tables

6 weeks agoemphasize the need for valid HTTP referrer/user agent even more
Sarah Hoffmann [Sat, 5 Jan 2019 21:20:38 +0000 (22:20 +0100)]
emphasize the need for valid HTTP referrer/user agent even more

7 weeks agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Fri, 4 Jan 2019 22:29:03 +0000 (23:29 +0100)]
Merge remote-tracking branch 'upstream/master'

7 weeks agoRemove postcodes also from word table when they no longer exist
Sarah Hoffmann [Fri, 4 Jan 2019 22:11:47 +0000 (23:11 +0100)]
Remove postcodes also from word table when they no longer exist

Also adds tests for postcode updates.

Fixes #1273.

7 weeks agoDo not log file sizes in the index step on updates
Sarah Hoffmann [Fri, 4 Jan 2019 20:51:18 +0000 (21:51 +0100)]
Do not log file sizes in the index step on updates

Fixes #1274.

7 weeks agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 3 Jan 2019 20:51:59 +0000 (21:51 +0100)]
Merge remote-tracking branch 'upstream/master'

7 weeks agocorrectly discard partially matching duplicates
Sarah Hoffmann [Thu, 3 Jan 2019 20:49:50 +0000 (21:49 +0100)]
correctly discard partially matching duplicates

The same result may be found with different result ranks
in the same search loop when housenumber or postcode are
part of the name or address. In this case we need to keep
the result with the lower result rank.

Fixes #1264.

2 months agoMerge pull request #1263 from mtmail/add-new-postcodes-to-searchnames
Sarah Hoffmann [Tue, 11 Dec 2018 20:39:28 +0000 (21:39 +0100)]
Merge pull request #1263 from mtmail/add-new-postcodes-to-searchnames

when updating GB postcodes, also run SQL getorcreate_postcode_id

2 months agodocumentation: when updating GB postcodes, also run SQL getorcreate_postcode_id ...
marc tobias [Tue, 11 Dec 2018 20:34:56 +0000 (21:34 +0100)]
documentation: when updating GB postcodes, also run SQL getorcreate_postcode_id [SKIP CI]

2 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 6 Dec 2018 21:03:17 +0000 (22:03 +0100)]
Merge remote-tracking branch 'upstream/master'

2 months agotraverse address list backwards when computing admin levels
Sarah Hoffmann [Thu, 6 Dec 2018 20:18:47 +0000 (21:18 +0100)]
traverse address list backwards when computing admin levels

By starting with the lowest address level, when collecting
administrative boundaries by level, there is a better chance
to actually get the boundary when the capital of the
administrative boundary is tagged with the level of the
boundary as well.

This is just a heuristics adaption to make the best out of
the imprecise admin_level definition for place nodes.

Fixes #1261.

2 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Wed, 5 Dec 2018 20:40:52 +0000 (21:40 +0100)]
Merge remote-tracking branch 'upstream/master'

2 months agoDon't escape slashes in json output
Sarah Hoffmann [Tue, 4 Dec 2018 21:28:29 +0000 (22:28 +0100)]
Don't escape slashes in json output

Fixes #1256.

2 months agoMerge pull request #1252 from mtmail/update-and-document-gb-postcode-data2
Sarah Hoffmann [Tue, 4 Dec 2018 21:20:55 +0000 (22:20 +0100)]
Merge pull request #1252 from mtmail/update-and-document-gb-postcode-data2

GB postcode: new conversion script, documentation

2 months agoMerge pull request #1255 from mtmail/faq-about-permanent-ids
Sarah Hoffmann [Tue, 4 Dec 2018 21:03:41 +0000 (22:03 +0100)]
Merge pull request #1255 from mtmail/faq-about-permanent-ids

new FAQ entry about place_id values

2 months agoMerge pull request #1258 from lonvia/cleanup-utils
Sarah Hoffmann [Tue, 4 Dec 2018 21:00:31 +0000 (22:00 +0100)]
Merge pull request #1258 from lonvia/cleanup-utils

Restructure script and website installation

2 months agoExplain place_id, i.e. shouldn't be use as permanent id
marc tobias [Wed, 28 Nov 2018 18:36:56 +0000 (19:36 +0100)]
Explain place_id, i.e. shouldn't be use as permanent id

2 months agoGB postcode: new conversion script, documentation
Marc Tobias Metten [Sun, 4 Nov 2018 20:50:00 +0000 (21:50 +0100)]
GB postcode: new conversion script, documentation

2 months agoNo longer install phrase configuration
Sarah Hoffmann [Sun, 2 Dec 2018 10:50:44 +0000 (11:50 +0100)]
No longer install phrase configuration

Instead add it as a configurable path with the one from
the source directory as the default.

Also reinstates that settings/defaults.php is installed as
settings/settings.php.

2 months agoRemove server_compare from list of installed scripts
Sarah Hoffmann [Sun, 2 Dec 2018 10:21:09 +0000 (11:21 +0100)]
Remove server_compare from list of installed scripts

This is a stand alone script and does not depend on
the configured environment.

2 months agoRemove settings/settings.php
Sarah Hoffmann [Sun, 2 Dec 2018 10:16:41 +0000 (11:16 +0100)]
Remove settings/settings.php

This was only a stub to warn when something was
executed directly from utils/ in the source directory.
This is no longer possible.

2 months agoRestructure script and website installation
Sarah Hoffmann [Sun, 2 Dec 2018 10:13:48 +0000 (11:13 +0100)]
Restructure script and website installation

Just make cmake install a small stub that includes
the settings from the build directory and then the
script from the source directory. Remove executable
rights from php files in utils/ so that they cannot
be accidentally executed.

2 months agoremove blocks script
Sarah Hoffmann [Sun, 2 Dec 2018 09:14:11 +0000 (10:14 +0100)]
remove blocks script

Belongs to the rate-limiting code that has been
removed a long time ago.

2 months agoMigration hint for address levels
Sarah Hoffmann [Sat, 1 Dec 2018 22:20:04 +0000 (23:20 +0100)]
Migration hint for address levels

2 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sat, 1 Dec 2018 21:55:33 +0000 (22:55 +0100)]
Merge remote-tracking branch 'upstream/master'

2 months agofixup typos and linking of data-source docs
Sarah Hoffmann [Sat, 1 Dec 2018 21:40:37 +0000 (22:40 +0100)]
fixup typos and linking of data-source docs

Can't create symbolic links to a directory and then
to files within.

2 months agoMerge branch 'document-osm-country-grid' of https://github.com/mtmail/Nominatim
Sarah Hoffmann [Sat, 1 Dec 2018 21:20:50 +0000 (22:20 +0100)]
Merge branch 'document-osm-country-grid' of https://github.com/mtmail/Nominatim

2 months agoMerge pull request #1245 from lonvia/address-levels-from-json
Sarah Hoffmann [Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)]
Merge pull request #1245 from lonvia/address-levels-from-json

Make rank assignments configurable

2 months agodocument what country_osm_grid does
marc tobias [Wed, 28 Nov 2018 17:57:17 +0000 (18:57 +0100)]
document what country_osm_grid does

2 months agofix tests
Sarah Hoffmann [Wed, 28 Nov 2018 22:40:17 +0000 (23:40 +0100)]
fix tests

2 months agoMerge pull request #1251 from mtmail/remove-naturalearth-boundary-fallback
Sarah Hoffmann [Wed, 28 Nov 2018 21:29:41 +0000 (22:29 +0100)]
Merge pull request #1251 from mtmail/remove-naturalearth-boundary-fallback

remove Natural Earth dataset

2 months agoMerge pull request #1253 from RhinoDevel/patch-1
Sarah Hoffmann [Wed, 28 Nov 2018 21:28:16 +0000 (22:28 +0100)]
Merge pull request #1253 from RhinoDevel/patch-1

Fix typo.

2 months agoFix typo.
RhinoDevel [Wed, 28 Nov 2018 12:11:06 +0000 (13:11 +0100)]
Fix typo.

2 months agouse consistent naming in doc pages
Sarah Hoffmann [Tue, 27 Nov 2018 21:59:18 +0000 (22:59 +0100)]
use consistent naming in doc pages

2 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)]
Merge remote-tracking branch 'upstream/master'

2 months agoMove address level config into settings/
Sarah Hoffmann [Tue, 27 Nov 2018 21:32:27 +0000 (22:32 +0100)]
Move address level config into settings/

2 months agoMerge pull request #1250 from mtmail/correct-builddir-variable-in-test-readme
Sarah Hoffmann [Tue, 27 Nov 2018 21:27:25 +0000 (22:27 +0100)]
Merge pull request #1250 from mtmail/correct-builddir-variable-in-test-readme

test/README.txt: BUILDDIR should be BUILD_DIR [SKIP CI]

2 months agotest/README.txt: BUILDDIR should be BUILD_DIR [SKIP CI]
marc tobias [Tue, 27 Nov 2018 19:17:27 +0000 (20:17 +0100)]
test/README.txt: BUILDDIR should be BUILD_DIR [SKIP CI]

2 months agoremove Natural Earth dataset
marc tobias [Tue, 27 Nov 2018 19:08:38 +0000 (20:08 +0100)]
remove Natural Earth dataset

2 months agoMerge pull request #1247 from mtmail/exit-with-error-code
Sarah Hoffmann [Mon, 26 Nov 2018 13:53:11 +0000 (14:53 +0100)]
Merge pull request #1247 from mtmail/exit-with-error-code

settings.php: when printing error, also exit with error code

2 months agosettings.php: when printing error, also exit with error code
marc tobias [Mon, 26 Nov 2018 13:28:09 +0000 (14:28 +0100)]
settings.php: when printing error, also exit with error code

2 months agoremove PHP parameter typing
Sarah Hoffmann [Sat, 24 Nov 2018 18:05:13 +0000 (19:05 +0100)]
remove PHP parameter typing

Older PHPs don't seem to like it.

2 months agotravis: make sure to start with fresh template for DB tests
Sarah Hoffmann [Sat, 24 Nov 2018 15:22:05 +0000 (16:22 +0100)]
travis: make sure to start with fresh template for DB tests

2 months agoAdd function to update address levels
Sarah Hoffmann [Sat, 24 Nov 2018 09:20:24 +0000 (10:20 +0100)]
Add function to update address levels

2 months agoAdd documentation for new ranking level configuration
Sarah Hoffmann [Fri, 23 Nov 2018 22:52:28 +0000 (23:52 +0100)]
Add documentation for new ranking level configuration

2 months agoMake rank assignments configurable
Sarah Hoffmann [Fri, 23 Nov 2018 22:02:32 +0000 (23:02 +0100)]
Make rank assignments configurable

The initial search and address rank is saved in a table
that is set up from a json configuration file. Ranks may
be assigned on a country level according to class and
type of the object. Special handling that depends on the
geometry or OSM type is still hard-coded in placex insert.

The new default config file mimicks the current assignment
as close as possible. A couple of exceptions have been
removed, most notably the exception for Irish townlands.

2 months agoMerge pull request #1237 from ckquentvp/fix-accept-language-underscore-parsing
Sarah Hoffmann [Sat, 24 Nov 2018 15:20:00 +0000 (16:20 +0100)]
Merge pull request #1237 from ckquentvp/fix-accept-language-underscore-parsing

match languages such as ja_rm (or any other with underscore) properly

2 months agotest languages with underscores (e.g. ja_rm)
name [Sat, 24 Nov 2018 14:52:24 +0000 (16:52 +0200)]
test languages with underscores (e.g. ja_rm)

2 months agofix variable name in setup --drop
Sarah Hoffmann [Sat, 24 Nov 2018 11:29:00 +0000 (12:29 +0100)]
fix variable name in setup --drop

2 months agoadd Makefile for tests
Sarah Hoffmann [Sat, 24 Nov 2018 11:25:28 +0000 (12:25 +0100)]
add Makefile for tests

3 months agoMerge pull request #1242 from lonvia/import-for-reverse-only
Sarah Hoffmann [Wed, 21 Nov 2018 20:36:11 +0000 (21:36 +0100)]
Merge pull request #1242 from lonvia/import-for-reverse-only

Add a reverse-only mode

3 months agoadd documentation for reverse-only
Sarah Hoffmann [Wed, 21 Nov 2018 18:36:33 +0000 (19:36 +0100)]
add documentation for reverse-only

3 months agoAdd reverse-only parameter to setup
Sarah Hoffmann [Tue, 20 Nov 2018 20:03:56 +0000 (21:03 +0100)]
Add reverse-only parameter to setup

Avoids creating the search_name table. Useful when only /reverse
is used or the content is directly exported to photon.

Fixes #939.

3 months agosetup: add convenience function for executing SQL commands
Sarah Hoffmann [Wed, 21 Nov 2018 11:18:13 +0000 (12:18 +0100)]
setup: add convenience function for executing SQL commands

3 months agoMerge pull request #1238 from lonvia/simplify-version-check
Sarah Hoffmann [Tue, 20 Nov 2018 22:07:55 +0000 (23:07 +0100)]
Merge pull request #1238 from lonvia/simplify-version-check

Simplify parsing of postgres and postgis versions

3 months agofix phpcs offences
Sarah Hoffmann [Tue, 20 Nov 2018 22:05:56 +0000 (23:05 +0100)]
fix phpcs offences

3 months agosimplify connection handling in setup script
Sarah Hoffmann [Tue, 20 Nov 2018 21:51:37 +0000 (22:51 +0100)]
simplify connection handling in setup script

- factor out runWithEnv
- require explicit connect() call to avoid rechecking for oDB
  (more for readability than for speed)
- clean DSNInfo of empty strings and simplify check for entries

3 months agofix variable prefix
Sarah Hoffmann [Tue, 20 Nov 2018 20:07:24 +0000 (21:07 +0100)]
fix variable prefix

3 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 20 Nov 2018 19:26:56 +0000 (20:26 +0100)]
Merge remote-tracking branch 'upstream/master'

3 months agoSimplify parsing of postgres and postgis versions
Sarah Hoffmann [Sun, 18 Nov 2018 16:18:17 +0000 (17:18 +0100)]
Simplify parsing of postgres and postgis versions

Switch to functions server_version_num and postgis_lib_version
which both only return the version string, so that no elaborate
string parsing is necessary anymore. The version string could
become especially cumbersome in pre-release versions.

3 months agoAlways ignore continents for addresses
Sarah Hoffmann [Sun, 18 Nov 2018 16:00:12 +0000 (17:00 +0100)]
Always ignore continents for addresses

Fixes #1236.

3 months agoRemove country and state nodes from address computation
Sarah Hoffmann [Sun, 22 Jul 2018 15:21:27 +0000 (17:21 +0200)]
Remove country and state nodes from address computation

OSM has by now almost complete coverage of admin
boundaries up to state level. Place nodes will do more
harm than good in this case.

3 months agomatch languages such as ja_rm (or any other with underscore) properly
name [Sat, 17 Nov 2018 18:20:06 +0000 (20:20 +0200)]
match languages such as ja_rm (or any other with underscore) properly