]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
23 months agoexplicit export for functions in flex-base
Sarah Hoffmann [Thu, 15 Dec 2022 16:48:00 +0000 (17:48 +0100)]
explicit export for functions in flex-base

23 months agoflex: add combining clean function
Sarah Hoffmann [Thu, 15 Dec 2022 15:47:54 +0000 (16:47 +0100)]
flex: add combining clean function

23 months agoflex: simplify name handling
Sarah Hoffmann [Thu, 15 Dec 2022 14:48:04 +0000 (15:48 +0100)]
flex: simplify name handling

23 months agoflex: simplify address configuration
Sarah Hoffmann [Thu, 15 Dec 2022 12:46:34 +0000 (13:46 +0100)]
flex: simplify address configuration

23 months agoupdate osm2pgsql (flex not building index)
Sarah Hoffmann [Thu, 15 Dec 2022 11:13:12 +0000 (12:13 +0100)]
update osm2pgsql (flex not building index)

23 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sat, 17 Dec 2022 14:59:30 +0000 (15:59 +0100)]
Merge remote-tracking branch 'upstream/master'

23 months agoMerge pull request #2927 from lonvia/remove-forward-dependencies
Sarah Hoffmann [Sat, 17 Dec 2022 14:59:09 +0000 (15:59 +0100)]
Merge pull request #2927 from lonvia/remove-forward-dependencies

Remove shortcut disabling forward dependencies

23 months agoremove code that disables processing of forward dependencies
Sarah Hoffmann [Sun, 11 Dec 2022 18:35:58 +0000 (19:35 +0100)]
remove code that disables processing of forward dependencies

23 months agoreturn server name with status
Sarah Hoffmann [Sun, 11 Dec 2022 15:29:15 +0000 (16:29 +0100)]
return server name with status

Helpful when asking people which server they hit.

23 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 11 Dec 2022 15:24:54 +0000 (16:24 +0100)]
Merge remote-tracking branch 'upstream/master'

23 months agoMerge pull request #2921 from lonvia/case-insensitive-utf8
Sarah Hoffmann [Sun, 11 Dec 2022 14:57:01 +0000 (15:57 +0100)]
Merge pull request #2921 from lonvia/case-insensitive-utf8

Use grapheme_stripos instead of stripos in PHP code

23 months agouse grapheme_stripos instead of stripos in PHP code
Sarah Hoffmann [Sun, 11 Dec 2022 12:55:27 +0000 (13:55 +0100)]
use grapheme_stripos instead of stripos in PHP code

The stripos() does not handle non-ASCII correctly.

23 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sat, 10 Dec 2022 16:31:18 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/master'

23 months agoMerge pull request #2920 from lonvia/no-postcode-for-rivers
Sarah Hoffmann [Sat, 10 Dec 2022 16:30:32 +0000 (17:30 +0100)]
Merge pull request #2920 from lonvia/no-postcode-for-rivers

Do not assign postcodes to long linear features

23 months agodo not assign postcodes to long linear features
Sarah Hoffmann [Sat, 10 Dec 2022 13:53:08 +0000 (14:53 +0100)]
do not assign postcodes to long linear features

This avoids a postcode in particular for waterway features and
long natural featues like ridges and valleys.

Fixes #2915.

23 months agoFix typo in NOMINATIM_LOG_FILE (#2919)
Frederik Ramm [Thu, 8 Dec 2022 16:34:54 +0000 (17:34 +0100)]
Fix typo in NOMINATIM_LOG_FILE (#2919)

* fix typo in docs (NOMINATIM_LOG_FILE uses s not ms)

23 months agoMerge pull request #2916 from lonvia/faq-postcodes
Sarah Hoffmann [Thu, 8 Dec 2022 07:42:10 +0000 (08:42 +0100)]
Merge pull request #2916 from lonvia/faq-postcodes

Add FAQ about finding bad postcodes

23 months agoadd FAQ about finding bad postcodes
Sarah Hoffmann [Wed, 7 Dec 2022 19:21:30 +0000 (20:21 +0100)]
add FAQ about finding bad postcodes

23 months agoMerge pull request #2913 from lonvia/remove-duplicate-spaces-in-transliteration
Sarah Hoffmann [Fri, 2 Dec 2022 18:43:07 +0000 (19:43 +0100)]
Merge pull request #2913 from lonvia/remove-duplicate-spaces-in-transliteration

contract duplicate spaces in transliteration string

23 months agocontract duplicate spaces in transliteration string
Sarah Hoffmann [Fri, 2 Dec 2022 09:15:02 +0000 (10:15 +0100)]
contract duplicate spaces in transliteration string

There are some pathological cases where an isolated letter may
be deleted because it is in itself meaningless. If this happens in
the middle of a sentence, then the transliteration contains two
consecutive spaces. Add a final rule to fix this.

See #2909.

23 months agoMerge pull request #2908 from n-timofeev/update-vagrantfile
Sarah Hoffmann [Tue, 29 Nov 2022 09:33:16 +0000 (10:33 +0100)]
Merge pull request #2908 from n-timofeev/update-vagrantfile

Update Vagrantfile

23 months agoUpdate Vagrantfile
n-timofeev [Tue, 29 Nov 2022 08:12:10 +0000 (11:12 +0300)]
Update Vagrantfile

23 months agoMerge pull request #2906 from lonvia/move-data-dirs-into-module
Sarah Hoffmann [Mon, 28 Nov 2022 07:44:29 +0000 (08:44 +0100)]
Merge pull request #2906 from lonvia/move-data-dirs-into-module

Reorganize how Nominatim finds its extra data and libraries

23 months agoclean up uses of cli.nominatim()
Sarah Hoffmann [Sun, 27 Nov 2022 14:27:04 +0000 (15:27 +0100)]
clean up uses of cli.nominatim()

They should not hand in data paths anymore.

23 months agouse data paths from new nominatim.paths
Sarah Hoffmann [Sat, 26 Nov 2022 21:00:43 +0000 (22:00 +0100)]
use data paths from new nominatim.paths

23 months agointroduce paths module which contains the data paths
Sarah Hoffmann [Sat, 26 Nov 2022 16:08:51 +0000 (17:08 +0100)]
introduce paths module which contains the data paths

This means that nominatim can find its data even when not called
from the command line tool.

23 months agoMerge pull request #2905 from lonvia/remove-nominatim-tool-var
Sarah Hoffmann [Sat, 26 Nov 2022 19:24:58 +0000 (20:24 +0100)]
Merge pull request #2905 from lonvia/remove-nominatim-tool-var

Remove NOMINATIM_NOMINATIM_TOOL variable

23 months agoremove NOMINATIM_NOMINATIM_TOOL variable
Sarah Hoffmann [Sat, 26 Nov 2022 15:40:20 +0000 (16:40 +0100)]
remove NOMINATIM_NOMINATIM_TOOL variable

This was used by the old PHP scripts to call the Python tool.
With the scripts now gone, the variable can be removed.

23 months agoactions: install keys for postgres repo v4.2.0
Sarah Hoffmann [Thu, 24 Nov 2022 10:36:56 +0000 (11:36 +0100)]
actions: install keys for postgres repo

23 months agoprepare release 4.2.0
Sarah Hoffmann [Thu, 24 Nov 2022 09:43:29 +0000 (10:43 +0100)]
prepare release 4.2.0

23 months agoadd checklist for releases
Sarah Hoffmann [Thu, 24 Nov 2022 09:17:30 +0000 (10:17 +0100)]
add checklist for releases

23 months agoMerge pull request #2903 from lonvia/migration-for-index-reorganization
Sarah Hoffmann [Thu, 24 Nov 2022 09:13:38 +0000 (10:13 +0100)]
Merge pull request #2903 from lonvia/migration-for-index-reorganization

Add migration for reorganization of pending indexes

23 months agoadd migration for reorganization of pending indexes
Sarah Hoffmann [Wed, 23 Nov 2022 09:55:39 +0000 (10:55 +0100)]
add migration for reorganization of pending indexes

Fixes #2900.

23 months agoMerge pull request #2902 from lonvia/tiger-county-sanitizer
Sarah Hoffmann [Wed, 23 Nov 2022 16:58:42 +0000 (17:58 +0100)]
Merge pull request #2902 from lonvia/tiger-county-sanitizer

Tiger county sanitizer

23 months agoremove BDD test for tiger:county
Sarah Hoffmann [Tue, 22 Nov 2022 16:17:38 +0000 (17:17 +0100)]
remove BDD test for tiger:county

We no longer rely on the import to strip the tag.

23 months agoadd sanitizer for TIGER tags
Sarah Hoffmann [Tue, 22 Nov 2022 16:10:21 +0000 (17:10 +0100)]
add sanitizer for TIGER tags

Currently only takes over cleaning the tiger:county data. This was
done by the import until now.

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 21 Nov 2022 19:03:42 +0000 (20:03 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2892 from lonvia/optional-forward-dependecies
Sarah Hoffmann [Mon, 21 Nov 2022 15:57:45 +0000 (16:57 +0100)]
Merge pull request #2892 from lonvia/optional-forward-dependecies

Add experimental configuration switch for enabling forward dependencies

2 years agoadd experimental option for enabling forward dependencies
Sarah Hoffmann [Fri, 4 Nov 2022 16:48:05 +0000 (17:48 +0100)]
add experimental option for enabling forward dependencies

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 20 Nov 2022 21:11:56 +0000 (22:11 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2890 from lonvia/use-rank-search-for-reverse-polygon-match
Sarah Hoffmann [Sun, 20 Nov 2022 21:11:35 +0000 (22:11 +0100)]
Merge pull request #2890 from lonvia/use-rank-search-for-reverse-polygon-match

Use rank search for reverse polygon match

2 years agoforce use of geometry index for reverse polygon lookup
Sarah Hoffmann [Sun, 20 Nov 2022 19:22:44 +0000 (20:22 +0100)]
force use of geometry index for reverse polygon lookup

2 years agouse rank_search for reverse polygon match
Sarah Hoffmann [Sun, 20 Nov 2022 18:28:56 +0000 (19:28 +0100)]
use rank_search for reverse polygon match

2 years agofix condition under which place_to_be_deleted is created
Sarah Hoffmann [Sat, 19 Nov 2022 20:53:14 +0000 (21:53 +0100)]
fix condition under which place_to_be_deleted is created

It is needed for updates, independently if reverse-only is set.

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Fri, 18 Nov 2022 17:51:49 +0000 (18:51 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2889 from lonvia/fix-interpolation-updates
Sarah Hoffmann [Fri, 18 Nov 2022 17:51:11 +0000 (18:51 +0100)]
Merge pull request #2889 from lonvia/fix-interpolation-updates

Drop illegal values for addr:interpolation on update

2 years agodrop illegal values for addr:interpolation on update
Sarah Hoffmann [Fri, 18 Nov 2022 16:26:56 +0000 (17:26 +0100)]
drop illegal values for addr:interpolation on update

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 17 Nov 2022 12:36:47 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2887 from lonvia/lookup-linked-places
Sarah Hoffmann [Thu, 17 Nov 2022 12:35:53 +0000 (13:35 +0100)]
Merge pull request #2887 from lonvia/lookup-linked-places

Add support for lookup of linked places

2 years agoMerge pull request #2886 from lonvia/closest-street-in-associated
Sarah Hoffmann [Thu, 17 Nov 2022 06:29:25 +0000 (07:29 +0100)]
Merge pull request #2886 from lonvia/closest-street-in-associated

Handle associatedStreet relations with multiple streets correctly

2 years agoadd support for lookup of linked places
Sarah Hoffmann [Wed, 16 Nov 2022 20:11:56 +0000 (21:11 +0100)]
add support for lookup of linked places

2 years agohandle associatedStreet relations with multiple streets
Sarah Hoffmann [Wed, 16 Nov 2022 16:25:51 +0000 (17:25 +0100)]
handle associatedStreet relations with multiple streets

When a associatedStreet relation has multiple street members
always take the closest one. Avoid geometry operations for
the frequent case that there is only one street.

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 15 Nov 2022 19:30:00 +0000 (20:30 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2884 from lonvia/tweak-special-term-penalties
Sarah Hoffmann [Tue, 15 Nov 2022 18:29:55 +0000 (19:29 +0100)]
Merge pull request #2884 from lonvia/tweak-special-term-penalties

Correctly handle special term + name combination

2 years agoMerge pull request #2885 from lonvia/remove-unused-countries
Sarah Hoffmann [Tue, 15 Nov 2022 18:29:39 +0000 (19:29 +0100)]
Merge pull request #2885 from lonvia/remove-unused-countries

Remove dependent territories from country list

2 years agocorrectly handle special term + name combination
Sarah Hoffmann [Tue, 15 Nov 2022 10:55:40 +0000 (11:55 +0100)]
correctly handle special term + name combination

Special terms with operator name usually appear in combination with the
name. The current penalties only took name + special term into account
not special term + name.

Fixes #2876.

2 years agoremove dependent territories from country list
Sarah Hoffmann [Tue, 15 Nov 2022 10:37:30 +0000 (11:37 +0100)]
remove dependent territories from country list

Removes territories of US, France, Australia and Netherlands from the
country list. These territories have their own country code (which is
why they are in the list in the first place) but are mapped as part of
the admin_level 2 relations for the respective parent countries.
Therefore they never had any places attached. In practical terms, the
change only affects the number of tables created.

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 15 Nov 2022 08:40:12 +0000 (09:40 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2881 from lonvia/more-update-tests-for-osm2pgsql
Sarah Hoffmann [Tue, 15 Nov 2022 08:39:46 +0000 (09:39 +0100)]
Merge pull request #2881 from lonvia/more-update-tests-for-osm2pgsql

Experimental support for osm2pgsql flex output

2 years agobdd: add tests for osm2pgsql update of postcode nodes
Sarah Hoffmann [Mon, 14 Nov 2022 16:27:04 +0000 (17:27 +0100)]
bdd: add tests for osm2pgsql update of postcode nodes

2 years agobdd: add osm2pgsql tests for updating interpolations
Sarah Hoffmann [Mon, 14 Nov 2022 15:57:31 +0000 (16:57 +0100)]
bdd: add osm2pgsql tests for updating interpolations

2 years agobdd: test placex content when updating with osm2pgsql
Sarah Hoffmann [Mon, 14 Nov 2022 13:48:44 +0000 (14:48 +0100)]
bdd: test placex content when updating with osm2pgsql

2 years agoreorganize handling of place type changes
Sarah Hoffmann [Mon, 14 Nov 2022 12:57:26 +0000 (13:57 +0100)]
reorganize handling of place type changes

Always replace existing entries in place, never delete them because
a direct delete will cause conflicts.

2 years agofix country handling in flex style
Sarah Hoffmann [Thu, 10 Nov 2022 14:52:13 +0000 (15:52 +0100)]
fix country handling in flex style

If the country tag does not match a 2-letter code, it needs to
be dropped.

2 years agoremove tests that differ between lua and gazetteer versions
Sarah Hoffmann [Thu, 10 Nov 2022 14:51:55 +0000 (15:51 +0100)]
remove tests that differ between lua and gazetteer versions

2 years agonode locations must be stable for osm2pgsql update tests
Sarah Hoffmann [Thu, 10 Nov 2022 10:11:45 +0000 (11:11 +0100)]
node locations must be stable for osm2pgsql update tests

2 years agobdd: extend osm2pgsql update tests
Sarah Hoffmann [Tue, 8 Nov 2022 13:06:18 +0000 (14:06 +0100)]
bdd: extend osm2pgsql update tests

Now also checks for correct indexing state of placex table.

2 years agooptimise tag match function
Sarah Hoffmann [Tue, 8 Nov 2022 09:21:44 +0000 (10:21 +0100)]
optimise tag match function

2 years agoadd lua requirements for vagrant scripts
Sarah Hoffmann [Fri, 4 Nov 2022 21:43:10 +0000 (22:43 +0100)]
add lua requirements for vagrant scripts

2 years agoCI: require lua libraries
Sarah Hoffmann [Fri, 4 Nov 2022 15:03:04 +0000 (16:03 +0100)]
CI: require lua libraries

2 years agoadd migration for place_to_be_deleted table
Sarah Hoffmann [Fri, 4 Nov 2022 14:20:43 +0000 (15:20 +0100)]
add migration for place_to_be_deleted table

2 years agochange updates to handle delete/insert workflow
Sarah Hoffmann [Fri, 4 Nov 2022 13:50:07 +0000 (14:50 +0100)]
change updates to handle delete/insert workflow

This makes Nominatim compatible with osm2pgsql's default update
modus operandi of deleting and reinserting data. Deletes are diverted
into a TODO table instead of executing them. When data is reinserted,
the corresponding entry in the TODO table is deleted. After updates are
finished, the remaining entries in the TODO table are executed, doing
the same work as the delete trigger did before.

The new behaviour also works against the gazetteer output with its
insert-only mechanism.

2 years agoinitial flex import scripts
Sarah Hoffmann [Thu, 3 Nov 2022 16:15:01 +0000 (17:15 +0100)]
initial flex import scripts

Only implements the extratags style for the moment. Tests pass
for the same behaviour as the gazetteer output. Updates still need
to be done.

2 years agobdd tests: make import style configurable
Sarah Hoffmann [Tue, 4 Oct 2022 15:01:25 +0000 (17:01 +0200)]
bdd tests: make import style configurable

The switch is for development. Tests are not guaranteed to still
work when run with anything but the 'extratags' style.

2 years agoadd osm2pgsql gazetteer tests
Sarah Hoffmann [Tue, 4 Oct 2022 13:02:19 +0000 (15:02 +0200)]
add osm2pgsql gazetteer tests

This ports the gazetteer tests from osm2pgsql to BDD tests.

2 years agoMerge pull request #2869 from mtmail/improve-tiger-install-doc
Sarah Hoffmann [Wed, 9 Nov 2022 19:48:39 +0000 (20:48 +0100)]
Merge pull request #2869 from mtmail/improve-tiger-install-doc

Tiger install doc: add -refresh website- step

2 years agofix type issues with calls to pyosmium
Sarah Hoffmann [Wed, 9 Nov 2022 19:45:56 +0000 (20:45 +0100)]
fix type issues with calls to pyosmium

2 years agoTiger install doc: add -refresh website- step
Marc Tobias [Tue, 8 Nov 2022 13:40:43 +0000 (14:40 +0100)]
Tiger install doc: add -refresh website- step

2 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Wed, 9 Nov 2022 13:27:07 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoMerge pull request #2871 from lonvia/fix-timeout-for-updates
Sarah Hoffmann [Wed, 9 Nov 2022 13:26:39 +0000 (14:26 +0100)]
Merge pull request #2871 from lonvia/fix-timeout-for-updates

Fix timeout for updates

2 years agoadd types-requests dependency
Sarah Hoffmann [Tue, 8 Nov 2022 22:43:30 +0000 (23:43 +0100)]
add types-requests dependency

2 years agorespect socket timeout also in other replication functions
Sarah Hoffmann [Tue, 8 Nov 2022 21:24:19 +0000 (22:24 +0100)]
respect socket timeout also in other replication functions

2 years agofix timeout use for replication timeout
Sarah Hoffmann [Tue, 8 Nov 2022 20:45:36 +0000 (21:45 +0100)]
fix timeout use for replication timeout

The timeout parameter is no longer taken into account since
pyosmium switched to the requests library. This adds the parameter
back.

2 years agoMerge pull request #2870 from mtmail/update-github-actions-to-node-16
Sarah Hoffmann [Tue, 8 Nov 2022 16:24:53 +0000 (17:24 +0100)]
Merge pull request #2870 from mtmail/update-github-actions-to-node-16

update those github action packages still using node12

2 years agoupdate those github action packages still using node12
Marc Tobias [Tue, 8 Nov 2022 14:16:55 +0000 (15:16 +0100)]
update those github action packages still using node12

2 years agoMerge pull request #2866 from lonvia/reverse-ignore-interpolations-without-parent
Sarah Hoffmann [Mon, 7 Nov 2022 08:00:59 +0000 (09:00 +0100)]
Merge pull request #2866 from lonvia/reverse-ignore-interpolations-without-parent

Ignore interpolations without parent on reverse search

2 years agoignore interpolations without parent on reverse search
Sarah Hoffmann [Sat, 5 Nov 2022 13:33:28 +0000 (14:33 +0100)]
ignore interpolations without parent on reverse search

If no parent can be found for an interpolation, there is most
likely a data error involved. So don' t show these interpolations
in reverse search results.

2 years agoMerge pull request #2865 from Romeo-PHILLIPS/fix/documentation_status_code
Sarah Hoffmann [Sat, 5 Nov 2022 21:14:44 +0000 (22:14 +0100)]
Merge pull request #2865 from Romeo-PHILLIPS/fix/documentation_status_code

Fix: documentation status code

2 years agofix: format
Romeo [Fri, 4 Nov 2022 17:05:40 +0000 (18:05 +0100)]
fix: format

2 years agofix: markup
Romeo [Fri, 4 Nov 2022 17:04:28 +0000 (18:04 +0100)]
fix: markup

2 years agofix: 705 Status Code Documentation
Romeo [Fri, 4 Nov 2022 17:03:49 +0000 (18:03 +0100)]
fix: 705 Status Code Documentation

2 years agofix: 705 Status Code Documenation
Romeo [Fri, 4 Nov 2022 16:59:36 +0000 (17:59 +0100)]
fix: 705 Status Code Documenation

2 years agoMerge pull request #2862 from mtmail/remove-version-from-fpm-sock-file
Sarah Hoffmann [Fri, 4 Nov 2022 16:32:50 +0000 (17:32 +0100)]
Merge pull request #2862 from mtmail/remove-version-from-fpm-sock-file

Install scripts: remove version from /var/run/php-fpm filenames

2 years agoMerge pull request #2863 from lonvia/add-support-for-postgresql-15
Sarah Hoffmann [Fri, 4 Nov 2022 16:32:06 +0000 (17:32 +0100)]
Merge pull request #2863 from lonvia/add-support-for-postgresql-15

Update CI tests to postgresql 15

2 years agoupdate CI tests to postgresql 15
Sarah Hoffmann [Fri, 4 Nov 2022 14:23:06 +0000 (15:23 +0100)]
update CI tests to postgresql 15

2 years agoInstall scripts: remove version from /var/run/php-fpm filenames
marc tobias [Thu, 3 Nov 2022 22:29:58 +0000 (23:29 +0100)]
Install scripts: remove version from /var/run/php-fpm filenames

2 years agoUpdate DB.php
t-tomek [Wed, 2 Nov 2022 13:11:52 +0000 (14:11 +0100)]
Update DB.php

Use SET instead of UPDATE queries to support read only databases

2 years agoactions: pin pyicu to 2.9
Sarah Hoffmann [Mon, 24 Oct 2022 12:21:44 +0000 (14:21 +0200)]
actions: pin pyicu to 2.9

2 years agoMerge pull request #2836 from mtmail/tiger2022
Sarah Hoffmann [Mon, 24 Oct 2022 09:21:55 +0000 (11:21 +0200)]
Merge pull request #2836 from mtmail/tiger2022

Documentation: remove year from TIGER filename, new 2022 data

2 years agoMerge pull request #2838 from lonvia/update-osm2pgsql
Sarah Hoffmann [Wed, 5 Oct 2022 16:59:13 +0000 (18:59 +0200)]
Merge pull request #2838 from lonvia/update-osm2pgsql

Update osm2pgsql to latest 1.7.1 release