Skip to content

Commit

Permalink
update to 4.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
philipkozeny committed Oct 7, 2023
1 parent c06e9bb commit 746eb95
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 18 deletions.
4 changes: 2 additions & 2 deletions 4.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN true \
RUN pip3 install osmium

# Nominatim install.
ENV NOMINATIM_VERSION=4.3.0
ENV NOMINATIM_VERSION=4.3.1
ARG USER_AGENT=mediagis/nominatim-docker:${NOMINATIM_VERSION}

RUN true \
Expand Down Expand Up @@ -143,7 +143,7 @@ ENV THREADS=16
ENV PROJECT_DIR=/nominatim

# i cannot figure out a way to remove this duplication, if anyone knows, please get in touch
ENV USER_AGENT=mediagis/nominatim-docker:4.3.0
ENV USER_AGENT=mediagis/nominatim-docker:4.3.1

WORKDIR /app

Expand Down
12 changes: 6 additions & 6 deletions 4.3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The following environment variables are available for configuration:
- `REPLICATION_URL`: Where to get updates from. Also available from Geofabrik.
- `REPLICATION_UPDATE_INTERVAL`: How often upstream publishes diffs (in seconds, default: `86400`). _Requires `REPLICATION_URL` to be set._
- `REPLICATION_RECHECK_INTERVAL`: How long to sleep if no update found yet (in seconds, default: `900`). _Requires `REPLICATION_URL` to be set._
- `UPDATE_MODE`: How to run replication to [update nominatim data](https://nominatim.org/release-docs/4.3.0/admin/Update/#updating-nominatim). Options: `continuous`/`once`/`catch-up`/`none` (default: `none`)
- `UPDATE_MODE`: How to run replication to [update nominatim data](https://nominatim.org/release-docs/4.3.1/admin/Update/#updating-nominatim). Options: `continuous`/`once`/`catch-up`/`none` (default: `none`)
- `FREEZE`: Freeze database and disable dynamic updates to save space. (default: `false`)
- `REVERSE_ONLY`: If you only want to use the Nominatim database for reverse lookups. (default: `false`)
- `IMPORT_WIKIPEDIA`: Whether to download and import the Wikipedia importance dumps (`true`) or path to importance dump in the container. Importance dumps improve the scoring of results. On a beefy 10 core server, this takes around 5 minutes. (default: `false`)
Expand Down Expand Up @@ -75,7 +75,7 @@ The following environment variables are available to tune PostgreSQL:
- `POSTGRES_CHECKPOINT_TIMEOUT` (default: `10min`)
- `POSTGRES_CHECKPOINT_COMPLETION_TARGET` (default: `0.9`)

See https://nominatim.org/release-docs/4.3.0/admin/Installation/#tuning-the-postgresql-database for more details on those settings.
See https://nominatim.org/release-docs/4.3.1/admin/Installation/#tuning-the-postgresql-database for more details on those settings.

### Import Style

Expand All @@ -91,11 +91,11 @@ Available options are :
- `full`: Default style that also includes points of interest.
- `extratags`: Like the full style but also adds most of the OSM tags into the extratags column.

See https://nominatim.org/release-docs/4.3.0/admin/Import/#filtering-imported-data for more details on those styles.
See https://nominatim.org/release-docs/4.3.1/admin/Import/#filtering-imported-data for more details on those styles.

### Flatnode files

In addition you can also mount a volume / bind-mount on `/nominatim/flatnode` (see: Persistent container data) to use flatnode storage. This is advised for bigger imports (Europe, North America etc.), see: https://nominatim.org/release-docs/4.3.0/admin/Import/#flatnode-files. If the mount is available for the container, the flatnode configuration is automatically set and used.
In addition you can also mount a volume / bind-mount on `/nominatim/flatnode` (see: Persistent container data) to use flatnode storage. This is advised for bigger imports (Europe, North America etc.), see: https://nominatim.org/release-docs/4.3.1/admin/Import/#flatnode-files. If the mount is available for the container, the flatnode configuration is automatically set and used.

## Persistent container data

Expand Down Expand Up @@ -145,7 +145,7 @@ where the _/osm-maps/data/_ directory contains _monaco-latest.osm.pbf_ file that

## Updating the database

Full documentation for Nominatim update available [here](https://nominatim.org/release-docs/4.3.0/admin/Update/). For a list of other methods see the output of:
Full documentation for Nominatim update available [here](https://nominatim.org/release-docs/4.3.1/admin/Update/). For a list of other methods see the output of:

```sh
docker exec -it nominatim sudo -u nominatim nominatim replication --help
Expand Down Expand Up @@ -190,7 +190,7 @@ docker run -it \

Where the path to the importance dump is given relative to the container. (The file does not need to be named `wikimedia-importance.sql.gz`.) The same works for `IMPORT_US_POSTCODES` and `IMPORT_GB_POSTCODES`.

For more information about the Tiger address file, see [Installing TIGER housenumber data for the US](https://nominatim.org/release-docs/4.3.0/customize/Tiger/).
For more information about the Tiger address file, see [Installing TIGER housenumber data for the US](https://nominatim.org/release-docs/4.3.1/customize/Tiger/).

## Development

Expand Down
2 changes: 1 addition & 1 deletion 4.3/conf.d/postgres-tuning.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See https://nominatim.org/release-docs/4.3.0/admin/Installation/#tuning-the-postgresql-database
# See https://nominatim.org/release-docs/4.3.1/admin/Installation/#tuning-the-postgresql-database
shared_buffers = 2GB
maintenance_work_mem = 10GB
autovacuum_work_mem = 2GB
Expand Down
5 changes: 1 addition & 4 deletions 4.3/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ fi
export NOMINATIM_QUERY_TIMEOUT=600
export NOMINATIM_REQUEST_TIMEOUT=3600
if [ "$REVERSE_ONLY" = "true" ]; then
# --search-only is a workaround until https://github.com/osm-search/Nominatim/issues/3213
# is merged and a new Nominatim version (probably 4.3.1) is released.
# Afterwards, we should revert back to using --reverse instead
sudo -H -E -u nominatim nominatim admin --warm --search-only
sudo -H -E -u nominatim nominatim admin --warm --reverse
else
sudo -H -E -u nominatim nominatim admin --warm
fi
Expand Down
5 changes: 1 addition & 4 deletions 4.3/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ export NOMINATIM_QUERY_TIMEOUT=600
export NOMINATIM_REQUEST_TIMEOUT=3600
if [ "$REVERSE_ONLY" = "true" ]; then
echo "Warm database caches for reverse queries"
# --search-only is a workaround until https://github.com/osm-search/Nominatim/issues/3213
# is merged and a new Nominatim version (probably 4.3.1) is released.
# Afterwards, we should revert back to using --reverse instead
sudo -H -E -u nominatim nominatim admin --warm --search-only > /dev/null
sudo -H -E -u nominatim nominatim admin --warm --reverse > /dev/null
else
echo "Warm database caches for search and reverse queries"
sudo -H -E -u nominatim nominatim admin --warm > /dev/null
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ See relevant installation and usage instructions for each version in the ```<ver

# Supported Nominatim versions #

- [`4.3.0`, `4.3`](https://github.com/mediagis/nominatim-docker/tree/master/4.3)
- [`4.3.1`, `4.3`](https://github.com/mediagis/nominatim-docker/tree/master/4.3)
- [`4.2.3`, `4.2`](https://github.com/mediagis/nominatim-docker/tree/master/4.2)

# Deprecated Nominatim versions #
Expand Down

0 comments on commit 746eb95

Please sign in to comment.