Merge branch 'master' into master

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
@@ -10,9 +10,18 @@ Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-num
 #  readability-named-parameter
 #    Differ from our style guidelines
 #
+#  abseil-*
+#    Not applicable.
+#
+#  altera-*
+#    Not applicable.
+#
 #  android-cloexec-*
 #    O_CLOEXEC isn't available on Windows
 #
+#  bugprone-easily-swappable-parameters
+#    Can't always be avoided.
+#
 #  cert-err58-cpp
 #    There are many of these in the test code, most of them from the Catch
 #    framework. Difficult to avoid.
@@ -56,6 +65,10 @@ Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-num
 #  modernize-use-trailing-return-type
 #    We are not that modern...
 #
+#  readability-identifier-length
+#    Generally not a bad idea, but there are many cases where short names
+#    for (local) vars are okay.
+#
 #  readability-implicit-bool-conversion
 #    Readability is a matter of opinion here
 #
@@ -70,4 +83,8 @@ CheckOptions:
       value: true
     - key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
       value: true
+    - key: readability-function-cognitive-complexity.Threshold
+      value: 100
+    - key: readability-function-cognitive-complexity.IgnoreMacros
+      value: true
 ...

.github/actions/build-and-test/action.yml

@@ -1,4 +1,4 @@
-name: Build and test osm2pgsq
+name: Build and test osm2pgsql
 
 inputs:
   test-wrapper:
@@ -35,7 +35,7 @@ runs:
         shell: bash
         working-directory: build
         env:
-          CXXFLAGS: -pedantic -Wextra -Werror
+          CXXFLAGS: -pedantic -Wextra ${{ env.EXTRA_FLAGS }} -Werror
 
       - name: build
         run: make -j3 all man

.github/actions/ubuntu-prerequisites/action.yml

@@ -7,7 +7,9 @@ runs:
     - name: Remove preinstalled PostgreSQL
       run: |
         sudo apt-get remove -yq postgresql*
-        sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo apt-get install curl ca-certificates gnupg
+        curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
+        sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         sudo apt-get update -qq
       shell: bash
 
@@ -18,18 +20,25 @@ runs:
           libboost-system-dev \
           libbz2-dev \
           libexpat1-dev \
+          libopencv-dev \
+          libpotrace-dev \
           libpq-dev \
           libproj-dev \
+          nlohmann-json3-dev \
           pandoc \
           postgresql-${POSTGRESQL_VERSION} \
           postgresql-${POSTGRESQL_VERSION}-postgis-${POSTGIS_VERSION} \
           postgresql-${POSTGRESQL_VERSION}-postgis-${POSTGIS_VERSION}-scripts \
           postgresql-client postgresql-contrib-${POSTGRESQL_VERSION} \
-          python3-psycopg2 \
           python3-setuptools \
           zlib1g-dev
-        pip3 install behave
+        pip3 install behave osmium
         if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
+        if [ "$PSYCOPG" = "2"]; then
+            sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2
+        else
+            pip3 install psycopg
+        fi
       shell: bash
 
     - name: Install Lua

.github/actions/win-install/action.yml

@@ -5,9 +5,20 @@ runs:
 
   steps:
     - name: Install packages
-      run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows proj4:x64-windows boost-geometry:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-property-tree:x64-windows lua:x64-windows libpq:x64-windows
+      run: |
+        vcpkg install \
+          boost-filesystem:x64-windows \
+          boost-geometry:x64-windows \
+          boost-property-tree:x64-windows \
+          boost-system:x64-windows \
+          bzip2:x64-windows \
+          expat:x64-windows \
+          libpq:x64-windows \
+          lua:x64-windows \
+          nlohmann-json:x64-windows \
+          proj:x64-windows \
+          zlib:x64-windows
       shell: bash
-
-    - name: Install psycopg2 and beahve
-      run: python -m pip install psycopg2 behave
+    - name: Install psycopg2 and behave
+      run: python -m pip install psycopg2 behave osmium
       shell: bash

.github/actions/win-test/action.yml

@@ -6,6 +6,8 @@ runs:
   steps:
     - name: Test
       run: ctest --output-on-failure -C Release
+      env:
+        PYTHONUTF8: 1
       shell: bash
       working-directory: build