From 5f09ba4e10b52b5154fb3e9211b8ec5fcfe82d91 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 22 Aug 2023 15:04:50 +0200 Subject: [PATCH 1/3] update osm2pgsql to 1.9.1 --- osm2pgsql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osm2pgsql b/osm2pgsql index 4facd1ae..ea0178e9 160000 --- a/osm2pgsql +++ b/osm2pgsql @@ -1 +1 @@ -Subproject commit 4facd1aea451cea220261c361698b8e5f18a9327 +Subproject commit ea0178e97d5b69a87a8b9c35210c8be4674e60e6 From 719b66e5ed23541db18fc7109cdd01f448d2ad62 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 22 Aug 2023 20:05:25 +0200 Subject: [PATCH 2/3] add new required json library for osm2pgsql --- .github/actions/build-nominatim/action.yml | 2 +- docs/admin/Installation.md | 1 + vagrant/Install-on-Ubuntu-20.sh | 2 +- vagrant/Install-on-Ubuntu-22.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml index 281b5128..70392d79 100644 --- a/.github/actions/build-nominatim/action.yml +++ b/.github/actions/build-nominatim/action.yml @@ -25,7 +25,7 @@ runs: shell: bash - name: Install${{ matrix.flavour }} prerequisites run: | - sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION} lua-dkjson + sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION} lua-dkjson nlohmann-json3-dev if [ "$FLAVOUR" == "oldstuff" ]; then pip3 install MarkupSafe==2.0.1 python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 datrie asyncpg else diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index d85359fa..abcd89d8 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -35,6 +35,7 @@ For compiling: * [bzip2](http://www.bzip.org/) * [zlib](https://www.zlib.net/) * [ICU](http://site.icu-project.org/) + * [nlohmann/json](https://json.nlohmann.me/) * [Boost libraries](https://www.boost.org/), including system and filesystem * PostgreSQL client libraries * a recent C++ compiler (gcc 5+ or Clang 3.8+) diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 0f664da2..78c42007 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -23,7 +23,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \ libboost-filesystem-dev libexpat1-dev zlib1g-dev \ libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \ - postgresql-12-postgis-3 \ + nlohmann-json3-dev postgresql-12-postgis-3 \ postgresql-contrib-12 postgresql-12-postgis-3-scripts \ php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 python3-pip \ diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index b170daad..71cbbcc9 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -23,7 +23,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \ libboost-filesystem-dev libexpat1-dev zlib1g-dev \ libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \ - postgresql-server-dev-14 postgresql-14-postgis-3 \ + nlohmann-json3-dev postgresql-14-postgis-3 \ postgresql-contrib-14 postgresql-14-postgis-3-scripts \ php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ From bc1009f8c200ad5468bef54f4b4de6220a20a57b Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 23 Aug 2023 08:34:12 +0200 Subject: [PATCH 3/3] vagrant scripts: add missing yaml library --- vagrant/Install-on-Ubuntu-22.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index 71cbbcc9..19e698e0 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -28,7 +28,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ python3-icu python3-datrie python3-sqlalchemy \ - python3-asyncpg git + python3-asyncpg python3-yaml git # # System Configuration