]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

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

5 years 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.

5 years 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.

5 years 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.

5 years 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

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

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

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

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

5 years 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

5 years 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

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

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

5 years 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.

5 years 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

5 years 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.

5 years 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.

5 years 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

5 years 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.

5 years 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.

5 years 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.

5 years 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

5 years 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]

5 years 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.

5 years 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.

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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.

5 years 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.

5 years 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.

5 years 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.

5 years 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.

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

5 years 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.

5 years 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

5 years 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

5 years 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

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

5 years 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

5 years 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.

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

5 years 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

5 years 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/

5 years 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]

5 years 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]

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

5 years 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

5 years 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

5 years 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.

5 years 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

5 years 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

5 years 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

5 years 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.

5 years 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

5 years 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)

5 years 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

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

6 years 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

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

6 years 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.

6 years 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

6 years 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

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

6 years 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

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

6 years 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.

6 years 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.

6 years 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.

6 years 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

6 years agoupdate osm2pgsql (restrict operator)
Sarah Hoffmann [Sat, 17 Nov 2018 16:32:30 +0000 (17:32 +0100)]
update osm2pgsql (restrict operator)

Fixes #1176.

6 years agoDocument the mmap requirement for flatnode files
Sarah Hoffmann [Sat, 17 Nov 2018 14:37:46 +0000 (15:37 +0100)]
Document the mmap requirement for flatnode files

Fixes #877.

6 years agoKeep matches without house number
Sarah Hoffmann [Fri, 16 Nov 2018 23:35:38 +0000 (00:35 +0100)]
Keep matches without house number

Now that we have result ranking, we can keep the street results
for housenumber searches and reuse them in the next group round
if required. Also fixes an issue where postcode and housenumber
are in the query and one of them is wrong.

Fixes #1200.

6 years agoAdd result ranking for missing housenumber and postcode
Sarah Hoffmann [Fri, 16 Nov 2018 22:52:19 +0000 (23:52 +0100)]
Add result ranking for missing housenumber and postcode

Fixes #988.

6 years agoMerge pull request #1233 from mtmail/better-gbpostcode-setup-warning
Sarah Hoffmann [Thu, 15 Nov 2018 22:28:04 +0000 (23:28 +0100)]
Merge pull request #1233 from mtmail/better-gbpostcode-setup-warning

Improved warning message when looking for optional GB postcode file

6 years agodocs: more specific chapter title
Sarah Hoffmann [Thu, 15 Nov 2018 21:49:41 +0000 (22:49 +0100)]
docs: more specific chapter title

6 years ago2018 TIGER data conversion scripts, add documentation to /docs/data-sources
marc tobias [Fri, 28 Sep 2018 18:17:02 +0000 (20:17 +0200)]
2018 TIGER data conversion scripts, add documentation to /docs/data-sources

6 years agoMerge pull request #1188 from mtmail/prototype-setup-ubuntu18-nginx
Sarah Hoffmann [Thu, 15 Nov 2018 21:25:41 +0000 (22:25 +0100)]
Merge pull request #1188 from mtmail/prototype-setup-ubuntu18-nginx

copy of the Ubuntu18 vagrant setup but with nginx as webserver

6 years agomake HTML error message less technical
Sarah Hoffmann [Thu, 15 Nov 2018 20:19:31 +0000 (21:19 +0100)]
make HTML error message less technical

6 years agoMerge branch 'set-exception-handler-by-request-format' of https://github.com/mtmail...
Sarah Hoffmann [Thu, 15 Nov 2018 19:57:20 +0000 (20:57 +0100)]
Merge branch 'set-exception-handler-by-request-format' of https://github.com/mtmail/Nominatim into mtmail-set-exception-handler-by-request-format

6 years agoImproved warning message when looking for optional GB postcode file
marc tobias [Fri, 9 Nov 2018 10:06:17 +0000 (10:06 +0000)]
Improved warning message when looking for optional GB postcode file

6 years agocopy of the Ubuntu18 vagrant setup but with nginx as webserver
marc tobias [Thu, 20 Sep 2018 16:18:41 +0000 (18:18 +0200)]
copy of the Ubuntu18 vagrant setup but with nginx as webserver

6 years agoincrease limit when searching for street w/ house number
Sarah Hoffmann [Sat, 20 Oct 2018 15:26:45 +0000 (17:26 +0200)]
increase limit when searching for street w/ house number

Increase the chance that the correct street is found.

6 years agoset exception handler by request format, not always HTML
marc tobias [Sun, 16 Sep 2018 15:16:42 +0000 (17:16 +0200)]
set exception handler by request format, not always HTML

6 years agofix permissions for CMakeLists.txt
Sarah Hoffmann [Tue, 2 Oct 2018 21:33:29 +0000 (23:33 +0200)]
fix permissions for CMakeLists.txt

6 years agosimplify constructor of SetupFunctions
Sarah Hoffmann [Tue, 2 Oct 2018 20:59:10 +0000 (22:59 +0200)]
simplify constructor of SetupFunctions

Also cleans up spacing.

6 years agoMerge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into ThomasBarr...
Sarah Hoffmann [Tue, 2 Oct 2018 20:46:53 +0000 (22:46 +0200)]
Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into ThomasBarris-updatePHP

6 years agoMerge branch '201809-test-db' of https://github.com/mtmail/Nominatim into mtmail...
Sarah Hoffmann [Tue, 2 Oct 2018 19:41:57 +0000 (21:41 +0200)]
Merge branch '201809-test-db' of https://github.com/mtmail/Nominatim into mtmail-201809-test-db

6 years agoMerge pull request #1193 from mtmail/postgresql-10-postgis-scripts
Sarah Hoffmann [Sun, 30 Sep 2018 19:14:55 +0000 (21:14 +0200)]
Merge pull request #1193 from mtmail/postgresql-10-postgis-scripts

also install postgis.control for postgresql-10

6 years agoadjust BDD api test cases to 2018 test database
marc tobias [Fri, 28 Sep 2018 16:05:10 +0000 (18:05 +0200)]
adjust BDD api test cases to 2018 test database

6 years agoalso install postgis.control for postgresql-10
marc tobias [Thu, 27 Sep 2018 17:38:56 +0000 (19:38 +0200)]
also install postgis.control for postgresql-10

6 years agodocs: rewrite functions when migrating
Sarah Hoffmann [Sat, 22 Sep 2018 11:21:19 +0000 (13:21 +0200)]
docs: rewrite functions when migrating

Fixes #1183.