]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
4 years agoVAGRANT.md: we use different database DSN syntax these days
marc tobias [Fri, 31 Jul 2020 14:52:29 +0000 (16:52 +0200)]
VAGRANT.md: we use different database DSN syntax these days

4 years agoMerge pull request #1898 from lonvia/show-housenumber-with-housename
Sarah Hoffmann [Fri, 31 Jul 2020 08:11:09 +0000 (10:11 +0200)]
Merge pull request #1898 from lonvia/show-housenumber-with-housename

make house number reappear in display name on named POIs

4 years agomake house number reappear in display name on named POIs
Sarah Hoffmann [Thu, 30 Jul 2020 21:39:55 +0000 (23:39 +0200)]
make house number reappear in display name on named POIs

After 6cc6cf950c3c08103e6159a079c85b5a4f1c09fa names and house numbers
of POIS got mingled into a single item when creating the display name.
Add the house number as extra information without place_id to avoid
later mangling.

4 years agoMerge pull request #1894 from lonvia/fix-hierarchy-by-admin-level
Sarah Hoffmann [Wed, 29 Jul 2020 07:20:34 +0000 (09:20 +0200)]
Merge pull request #1894 from lonvia/fix-hierarchy-by-admin-level

Preserve admin level hierarchy between admin boundaries

4 years agoMerge pull request #1895 from lonvia/update-less-quiet
Sarah Hoffmann [Wed, 29 Jul 2020 07:20:14 +0000 (09:20 +0200)]
Merge pull request #1895 from lonvia/update-less-quiet

Make indexing during updates less quiet

4 years agomake indexing during updates less quiet
Sarah Hoffmann [Tue, 28 Jul 2020 20:35:51 +0000 (22:35 +0200)]
make indexing during updates less quiet

Adjust verbosity behaviour to that of indexing during setup.

4 years agopreserve admin level hierarchy between admin boundaries
Sarah Hoffmann [Tue, 28 Jul 2020 20:15:25 +0000 (22:15 +0200)]
preserve admin level hierarchy between admin boundaries

When the address rank of an admin boundary is changed because
of an attached place type, it may happen that the admin_level
hierarchy gets inversed. Avoid that by adjusting the address
rank if an inversion is detected.

4 years agoMerge pull request #1891 from lonvia/automatic-db-setup
Sarah Hoffmann [Sun, 26 Jul 2020 14:08:45 +0000 (16:08 +0200)]
Merge pull request #1891 from lonvia/automatic-db-setup

Implicitly connect to database during setup

4 years agotest: make road really cross the boundary
Sarah Hoffmann [Sun, 26 Jul 2020 13:57:07 +0000 (15:57 +0200)]
test: make road really cross the boundary

4 years agoremove connect() in update script
Sarah Hoffmann [Sun, 26 Jul 2020 10:27:52 +0000 (12:27 +0200)]
remove connect() in update script

This is now implicit.

4 years agoimplicitly connect to database during setup
Sarah Hoffmann [Sun, 26 Jul 2020 09:56:00 +0000 (11:56 +0200)]
implicitly connect to database during setup

Make access to the DB object a function, so that the connection
can be opened implicitly when the object is accessed for the first
time. This way we no longer need to check beforehand if a specific
function of the setup needs DB access or not.

Also move the check for the module to the relevant sub step.

4 years agoMerge pull request #1890 from lonvia/add-wiki-tags-to-all-styles
Sarah Hoffmann [Sat, 25 Jul 2020 09:34:51 +0000 (11:34 +0200)]
Merge pull request #1890 from lonvia/add-wiki-tags-to-all-styles

Add wiki tags to all styles

4 years agoadd wiki tags to all styles
Sarah Hoffmann [Sat, 25 Jul 2020 08:00:18 +0000 (10:00 +0200)]
add wiki tags to all styles

wikipedia and wikidata tags are needed to compute the importance
so we need to put them into extra tags for all styles.

Fixes #1885.

4 years agoforgit to adapt info message
Sarah Hoffmann [Sat, 18 Jul 2020 10:14:51 +0000 (12:14 +0200)]
forgit to adapt info message

4 years agoMerge pull request #1874 from joy-yyd/rank_modification
Sarah Hoffmann [Sat, 18 Jul 2020 10:12:37 +0000 (12:12 +0200)]
Merge pull request #1874 from joy-yyd/rank_modification

 House number search fix for #164

4 years agoMerge pull request #1884 from lonvia/fixes-for-webserver-settigns
Sarah Hoffmann [Sat, 18 Jul 2020 09:44:01 +0000 (11:44 +0200)]
Merge pull request #1884 from lonvia/fixes-for-webserver-settigns

Small fixes for new webserver settings file

4 years agomove website settings back to settings/
Sarah Hoffmann [Sat, 18 Jul 2020 09:02:07 +0000 (11:02 +0200)]
move website settings back to settings/

We don't want the settings to become visible when a server is
accidentally configured wrongly.

4 years agolog file is a string when not set to false
Sarah Hoffmann [Sat, 18 Jul 2020 09:00:17 +0000 (11:00 +0200)]
log file is a string when not set to false

4 years agoModifiy the range of address_rank, fix for issue #164
(Joy) Yuanyue Ding [Wed, 8 Jul 2020 15:47:38 +0000 (17:47 +0200)]
Modifiy the range of address_rank, fix for issue #164

4 years agoMerge pull request #1873 from lonvia/resurrect-debug-option
Sarah Hoffmann [Wed, 8 Jul 2020 08:06:49 +0000 (10:06 +0200)]
Merge pull request #1873 from lonvia/resurrect-debug-option

Reenable debug parameter

4 years agodefault language is a string when not set to false
Sarah Hoffmann [Wed, 8 Jul 2020 06:38:11 +0000 (08:38 +0200)]
default language is a string when not set to false

4 years agoreenable debug parameter
Sarah Hoffmann [Wed, 8 Jul 2020 06:32:46 +0000 (08:32 +0200)]
reenable debug parameter

The parameter got lost when switching to website settings.
Given that the use of a fixed parameter is limited,
debugging output can now only be set via the URL parameter.

4 years agoMerge pull request #1869 from lonvia/migration-for-setup-website
Sarah Hoffmann [Sun, 5 Jul 2020 19:06:27 +0000 (21:06 +0200)]
Merge pull request #1869 from lonvia/migration-for-setup-website

docs: add migration for new --setup-website step

4 years agoMerge pull request #1868 from lonvia/reverse-for-addressable-places-only
Sarah Hoffmann [Sun, 5 Jul 2020 19:06:00 +0000 (21:06 +0200)]
Merge pull request #1868 from lonvia/reverse-for-addressable-places-only

reverse: ignore place nodes without an address rank

4 years agodocs: add migration for new --setup-website step
Sarah Hoffmann [Sun, 5 Jul 2020 13:46:06 +0000 (15:46 +0200)]
docs: add migration for new --setup-website step

4 years agoreverse: ignore place nodes without an address rank
Sarah Hoffmann [Sun, 5 Jul 2020 13:38:49 +0000 (15:38 +0200)]
reverse: ignore place nodes without an address rank

We already exclude all polygon places without an address
rank. place nodes should also be ignored. This removes
places like locality from the reverse results.

Fixes #1839.

4 years agodocs: rename documentation chapter
Sarah Hoffmann [Sun, 5 Jul 2020 09:14:48 +0000 (11:14 +0200)]
docs: rename documentation chapter

Avoids confusion about this being the documentation itself.

4 years agodocs: move external data sources into simple page
Sarah Hoffmann [Sun, 5 Jul 2020 09:13:28 +0000 (11:13 +0200)]
docs: move external data sources into simple page

4 years agoMerge branch 'move-datasources-into-separate-repos' of https://github.com/mtmail...
Sarah Hoffmann [Sun, 5 Jul 2020 08:57:12 +0000 (10:57 +0200)]
Merge branch 'move-datasources-into-separate-repos' of https://github.com/mtmail/Nominatim into mtmail-move-datasources-into-separate-repos

4 years agoMerge pull request #1864 from lonvia/langauge-specific-presuffixes
Sarah Hoffmann [Sun, 5 Jul 2020 08:54:42 +0000 (10:54 +0200)]
Merge pull request #1864 from lonvia/langauge-specific-presuffixes

exclude language-specific name:prefix and name:suffix

4 years agoMerge pull request #1829 from krahulreddy/websiteSetup
Sarah Hoffmann [Wed, 1 Jul 2020 16:11:50 +0000 (18:11 +0200)]
Merge pull request #1829 from krahulreddy/websiteSetup

Added setup-website option

4 years agoMerge pull request #1857 from mtmail/db-migration-update-functions
Sarah Hoffmann [Wed, 1 Jul 2020 16:11:14 +0000 (18:11 +0200)]
Merge pull request #1857 from mtmail/db-migration-update-functions

Migration.md - admin also need to run recreate db functions

4 years agoexclude language-specific name:prefix and name:suffix
Sarah Hoffmann [Wed, 1 Jul 2020 16:00:53 +0000 (18:00 +0200)]
exclude language-specific name:prefix and name:suffix

There are about 1k suffixes and 20k prefixes with a
language-speicfic variant in use. These should not
show up as names.

4 years agomove data-sources/ directory in new git repos
marc tobias [Wed, 1 Jul 2020 15:38:44 +0000 (17:38 +0200)]
move data-sources/ directory in new git repos

4 years agoMigration.md - admin also need to run recreate db functions
marc tobias [Tue, 30 Jun 2020 14:49:38 +0000 (16:49 +0200)]
Migration.md - admin also need to run recreate db functions

4 years agosql: fix rank variable type
Sarah Hoffmann [Wed, 1 Jul 2020 13:46:08 +0000 (15:46 +0200)]
sql: fix rank variable type

The rank type needs to match the parameter type of
update_place_diameter().

Fixes #1851.

4 years agoMerge pull request #1858 from lonvia/update-osm2pgsql
Sarah Hoffmann [Wed, 1 Jul 2020 09:38:40 +0000 (11:38 +0200)]
Merge pull request #1858 from lonvia/update-osm2pgsql

Update osm2pgsql

4 years agoupdate osm2pgsql (hang on multipolygons)
Sarah Hoffmann [Tue, 30 Jun 2020 20:39:38 +0000 (22:39 +0200)]
update osm2pgsql (hang on multipolygons)

4 years agoMerge pull request #1852 from osm-search/disable-jit-for-updates
Sarah Hoffmann [Sun, 28 Jun 2020 20:39:44 +0000 (22:39 +0200)]
Merge pull request #1852 from osm-search/disable-jit-for-updates

Disable Postgresql jit and parallel processing for osm2pgsql updates

4 years agomake phpcs happy
Sarah Hoffmann [Sun, 28 Jun 2020 16:24:29 +0000 (18:24 +0200)]
make phpcs happy

4 years agotravis: reduce the size of diff download
Sarah Hoffmann [Sun, 28 Jun 2020 16:21:42 +0000 (18:21 +0200)]
travis: reduce the size of diff download

4 years agotravis: run a single round of updates on the Monaco import
Sarah Hoffmann [Sun, 28 Jun 2020 16:09:08 +0000 (18:09 +0200)]
travis: run a single round of updates on the Monaco import

4 years agodisable JIT and parallel processing for osm2pgsql in updates
Sarah Hoffmann [Sun, 28 Jun 2020 16:06:06 +0000 (18:06 +0200)]
disable JIT and parallel processing for osm2pgsql in updates

This is known to cause issues because of bad indexing
statistics.

4 years agoMoved settings-frontend to website/
K Rahul Reddy [Fri, 19 Jun 2020 16:36:23 +0000 (22:06 +0530)]
Moved settings-frontend to website/

4 years agoUpdated setup.php
K Rahul Reddy [Fri, 19 Jun 2020 16:22:56 +0000 (21:52 +0530)]
Updated setup.php

4 years agoDocumentation updated
K Rahul Reddy [Sun, 14 Jun 2020 13:10:42 +0000 (18:40 +0530)]
Documentation updated

4 years agoAdded setup-website to travis.yml
K Rahul Reddy [Sun, 14 Jun 2020 13:00:01 +0000 (18:30 +0530)]
Added setup-website to travis.yml

4 years agoAdded setup-website option
K Rahul Reddy [Fri, 12 Jun 2020 13:34:48 +0000 (19:04 +0530)]
Added setup-website option

4 years agoMerge pull request #1836 from lonvia/rework-large-location-II
Sarah Hoffmann [Fri, 26 Jun 2020 19:36:32 +0000 (21:36 +0200)]
Merge pull request #1836 from lonvia/rework-large-location-II

Change processing of place nodes in addresses

4 years agodocs: minor typo and grammar fixes
Sarah Hoffmann [Tue, 23 Jun 2020 21:31:18 +0000 (23:31 +0200)]
docs: minor typo and grammar fixes

4 years agoMerge branch 'split-off-test-tool-installation-instructions' of https://github.com...
Sarah Hoffmann [Tue, 23 Jun 2020 21:25:46 +0000 (23:25 +0200)]
Merge branch 'split-off-test-tool-installation-instructions' of https://github.com/mtmail/Nominatim into mtmail-split-off-test-tool-installation-instructions

4 years agoMerge pull request #1841 from mtmail/faq-entry-about-rebuilding-nominatim-so
Sarah Hoffmann [Tue, 23 Jun 2020 21:20:43 +0000 (23:20 +0200)]
Merge pull request #1841 from mtmail/faq-entry-about-rebuilding-nominatim-so

FAQ addition when to rebuild nominatim.so

4 years agoMerge pull request #1834 from mtmail/faq-invalid-page-in-block
Sarah Hoffmann [Tue, 23 Jun 2020 21:10:26 +0000 (23:10 +0200)]
Merge pull request #1834 from mtmail/faq-invalid-page-in-block

FAQ entry for PostgreSQL -invalid page in block-

4 years agoFAQ addition when to rebuild nominatim.so
marc tobias [Sat, 20 Jun 2020 02:01:50 +0000 (04:01 +0200)]
FAQ addition when to rebuild nominatim.so

4 years agoPut install instructions of test tools into separate docs/ markdown file
marc tobias [Sat, 20 Jun 2020 01:48:07 +0000 (03:48 +0200)]
Put install instructions of test tools into separate docs/ markdown file

4 years agoFAQ entry for PostgreSQL -invalid page in block-
marc tobias [Mon, 15 Jun 2020 16:36:21 +0000 (18:36 +0200)]
FAQ entry for PostgreSQL -invalid page in block-

4 years agoMerge pull request #1838 from lonvia/make-serve
Sarah Hoffmann [Fri, 19 Jun 2020 18:12:56 +0000 (20:12 +0200)]
Merge pull request #1838 from lonvia/make-serve

add 'make serve' command

4 years agoadd 'make serve' command
Sarah Hoffmann [Fri, 19 Jun 2020 15:35:24 +0000 (17:35 +0200)]
add 'make serve' command

Starts up PHP's built-in webserver in the website/ directory.
Useful for testing and development.

See #1831.

4 years agoadapt tests to new search ranks
Sarah Hoffmann [Sat, 30 May 2020 09:50:04 +0000 (11:50 +0200)]
adapt tests to new search ranks

4 years agochange place node expansion for large area table
Sarah Hoffmann [Wed, 6 May 2020 20:22:24 +0000 (22:22 +0200)]
change place node expansion for large area table

So far we've used a buffer around a place node to define its
potential address reach. This had two problems: the buffer was
so large that addresses often contain false positives and the
buffer is really distorted when getting closer to the poles.

Change the buffer here to draw a bounndig box at a certain
distance in meter. This means that we always use the same
box everywhere on the planet and can make the extent much
smaller. Using a box has the advantage that it is much faster
to figure out if a point is within the box.

4 years agoMerge pull request #1830 from lonvia/docs-for-nominatim-ui
Sarah Hoffmann [Wed, 17 Jun 2020 07:30:29 +0000 (09:30 +0200)]
Merge pull request #1830 from lonvia/docs-for-nominatim-ui

Add usage docs for nominatim-ui

4 years agoadd usage docs for nominatim-ui
Sarah Hoffmann [Sat, 13 Jun 2020 18:06:01 +0000 (20:06 +0200)]
add usage docs for nominatim-ui

Includes migration guides for Apache and nginx.

4 years agoMerge pull request #1827 from mtmail/centos8-postgresql12-without-proj
Sarah Hoffmann [Thu, 11 Jun 2020 21:12:38 +0000 (23:12 +0200)]
Merge pull request #1827 from mtmail/centos8-postgresql12-without-proj

Vagrant centos8: proj52 not needed, use postgresql 12/postgis 3.0

4 years agoremove version warning from ubuntu 20 installation
Sarah Hoffmann [Thu, 11 Jun 2020 20:46:04 +0000 (22:46 +0200)]
remove version warning from ubuntu 20 installation

4 years agocmake: only require php for import and api
Sarah Hoffmann [Thu, 11 Jun 2020 20:44:00 +0000 (22:44 +0200)]
cmake: only require php for import and api

4 years agoVagrant centos8: proj52 not needed, use postgresql 12/postgis 3.0
marc tobias [Thu, 11 Jun 2020 17:10:38 +0000 (19:10 +0200)]
Vagrant centos8: proj52 not needed, use postgresql 12/postgis 3.0

4 years agoprepare 3.5.0 release v3.5.0
Sarah Hoffmann [Sat, 6 Jun 2020 18:29:38 +0000 (20:29 +0200)]
prepare 3.5.0 release

4 years agoMerge pull request #1822 from lonvia/document-address-labels
Sarah Hoffmann [Sat, 6 Jun 2020 16:02:40 +0000 (18:02 +0200)]
Merge pull request #1822 from lonvia/document-address-labels

document which labels may appear in the address info

4 years agodocument which labels may appear in the address info
Sarah Hoffmann [Sat, 6 Jun 2020 15:32:30 +0000 (17:32 +0200)]
document which labels may appear in the address info

The list is manually generated and only valid for the default
configuration as used on openstreetmap.org.

Fixes #1808.

4 years agoparents for large POIs must be address features
Sarah Hoffmann [Wed, 3 Jun 2020 09:30:51 +0000 (11:30 +0200)]
parents for large POIs must be address features

There are a couple of places with a search rank < 25 which are
not addressable like waterways and islands. We don't want them
to function as parents for POI-level objects. So use the
address rank for finding parents, not the search rank.

See #1815.

4 years agoMerge pull request #1813 from lonvia/revert-concurrent-indexing
Sarah Hoffmann [Mon, 1 Jun 2020 20:13:33 +0000 (22:13 +0200)]
Merge pull request #1813 from lonvia/revert-concurrent-indexing

revert building indexes concurrently

4 years agoMerge pull request #1814 from lonvia/disable-jit
Sarah Hoffmann [Mon, 1 Jun 2020 20:13:07 +0000 (22:13 +0200)]
Merge pull request #1814 from lonvia/disable-jit

Disable JIT and parallel workers when indexing

4 years agoremove warnings about postgres 12 and postgis 3
Sarah Hoffmann [Sat, 30 May 2020 09:25:00 +0000 (11:25 +0200)]
remove warnings about postgres 12 and postgis 3

4 years agoDisable JIT and parallel workers when indexing
Sarah Hoffmann [Sat, 30 May 2020 09:20:16 +0000 (11:20 +0200)]
Disable JIT and parallel workers when indexing

Locally disable jit and parallel workers in the connection that
do indexing. The query planner tends to be overenthusiatic about
using JIT. But with the rather less complex queries we have, the
overhead tends to be larger than the performance gain.

Fixes #1677.

4 years agorevert building indexes concurrently
Sarah Hoffmann [Sat, 30 May 2020 09:00:05 +0000 (11:00 +0200)]
revert building indexes concurrently

This does not really solve the issue with blocking autovacuum
requests and can lead to incomplete indexes and bogus
out-of-disk messages.

Fixes #1549.

4 years agoMerge pull request #1809 from lonvia/fix-display-names
Sarah Hoffmann [Wed, 27 May 2020 19:28:17 +0000 (21:28 +0200)]
Merge pull request #1809 from lonvia/fix-display-names

Fix some glitches in choice of address tags

4 years agoMerge pull request #1804 from lonvia/ranking-improvement-germany
Sarah Hoffmann [Wed, 27 May 2020 09:58:21 +0000 (11:58 +0200)]
Merge pull request #1804 from lonvia/ranking-improvement-germany

Localized ranking adaptions for Germany, Sweden and Norway

4 years agoprefer linked place type over own place type
Sarah Hoffmann [Wed, 27 May 2020 09:31:50 +0000 (11:31 +0200)]
prefer linked place type over own place type

For state cities, tagging might prefer the place=state on
the admin boundary. The linked place is a more reliable indicator.

4 years agoeach address line must fill at most one geocodejson field
Sarah Hoffmann [Wed, 27 May 2020 09:16:27 +0000 (11:16 +0200)]
each address line must fill at most one geocodejson field

This fixes an issue where a postcode with rank_address 5
would also appear in the state field.

4 years agoFix script names in README (#1805)
Frederik Ramm [Mon, 25 May 2020 10:45:35 +0000 (12:45 +0200)]
Fix script names in README (#1805)

4 years agoadapt tests to new ranks
Sarah Hoffmann [Sat, 23 May 2020 17:40:41 +0000 (19:40 +0200)]
adapt tests to new ranks

4 years agoAdapt boundary labels for Sweden and Norway
Sarah Hoffmann [Sat, 23 May 2020 14:19:27 +0000 (16:19 +0200)]
Adapt boundary labels for Sweden and Norway

This also gives us the correct labels for address output in
json and xml.

4 years agofix admin levels for Norway and Sweden
Sarah Hoffmann [Sat, 25 Apr 2020 20:53:35 +0000 (22:53 +0200)]
fix admin levels for Norway and Sweden

Admin levels 3 and 4 are used for region and county respectively,
so downgrade the ranking.

4 years agoadapt municipality and region for Germany
Sarah Hoffmann [Sun, 5 Apr 2020 14:15:55 +0000 (16:15 +0200)]
adapt municipality and region for Germany

4 years agoMerge pull request #1801 from lonvia/rework-classtypes
Sarah Hoffmann [Wed, 20 May 2020 06:22:56 +0000 (08:22 +0200)]
Merge pull request #1801 from lonvia/rework-classtypes

Rework ClassTypes helper functions

4 years agofix style
Sarah Hoffmann [Mon, 18 May 2020 20:20:36 +0000 (22:20 +0200)]
fix style

4 years agoadapt tests to modified address types
Sarah Hoffmann [Sun, 17 May 2020 14:53:33 +0000 (16:53 +0200)]
adapt tests to modified address types

4 years agoencapsulate icon URL in a function
Sarah Hoffmann [Sun, 17 May 2020 14:45:46 +0000 (16:45 +0200)]
encapsulate icon URL in a function

4 years agoalso adapt uses of ClassTypes in website/
Sarah Hoffmann [Sun, 17 May 2020 14:32:42 +0000 (16:32 +0200)]
also adapt uses of ClassTypes in website/

4 years agoadapt php tests
Sarah Hoffmann [Sun, 17 May 2020 11:47:08 +0000 (13:47 +0200)]
adapt php tests

Also fixes some errors found by the tests.

4 years agoreorganise class/type information
Sarah Hoffmann [Fri, 15 May 2020 21:00:04 +0000 (23:00 +0200)]
reorganise class/type information

Add a separate function for each property which saves necessary
information independently. Simplify computation of labels and
simple labels to not explicitly save the labels.

4 years agofirst draft
Sarah Hoffmann [Fri, 15 May 2020 15:36:37 +0000 (17:36 +0200)]
first draft

4 years agonominatim: always use deadlock-protected wait
Sarah Hoffmann [Fri, 15 May 2020 16:48:01 +0000 (18:48 +0200)]
nominatim: always use deadlock-protected wait

Fixes #1785.

4 years agoMerge pull request #1793 from lonvia/remove-struct-params-in-gui
Sarah Hoffmann [Fri, 15 May 2020 14:50:54 +0000 (16:50 +0200)]
Merge pull request #1793 from lonvia/remove-struct-params-in-gui

search UI: hide unused query parameters

4 years agoUpdate travis to bionic=Ubuntu18 (#1800)
mmd [Thu, 14 May 2020 20:52:04 +0000 (22:52 +0200)]
Update travis to bionic=Ubuntu18 (#1800)

4 years agoMerge pull request #1797 from mtmail/jquery-3-5-1
Sarah Hoffmann [Thu, 14 May 2020 18:54:17 +0000 (20:54 +0200)]
Merge pull request #1797 from mtmail/jquery-3-5-1

update jquery dependency 3.5.0 => 3.5.1

4 years agoupdate jquery dependency 3.5.0 => 3.5.1
marc tobias [Thu, 14 May 2020 13:53:05 +0000 (15:53 +0200)]
update jquery dependency 3.5.0 => 3.5.1

4 years agoimprove syntax highlighting for apache and nginx examples
Sarah Hoffmann [Wed, 13 May 2020 08:13:15 +0000 (10:13 +0200)]
improve syntax highlighting for apache and nginx examples

4 years agoswitch to php-fpm 7.3
Sarah Hoffmann [Wed, 13 May 2020 08:04:31 +0000 (10:04 +0200)]
switch to php-fpm 7.3

Also fixes indent.

4 years agoMerge branch 'patch-1' of https://github.com/ganeshkrishnan1/Nominatim into ganeshkri...
Sarah Hoffmann [Wed, 13 May 2020 07:55:48 +0000 (09:55 +0200)]
Merge branch 'patch-1' of https://github.com/ganeshkrishnan1/Nominatim into ganeshkrishnan1-patch-1