Merge pull request #2597 from lonvia/reorganise-interpolations

Reorganise interpolation code

diff --combined .github/workflows/ci-tests.yml
index 88de09a1eb8d74ecd22744c1a59eee37b1512c29,6d474a2e2b3fe90d4021d6af54d25085f020938a..ac8ad5af43d248468241694edfe8b4c8a8765f76
--- 1/.github/workflows/ci-tests.yml
--- 2/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@@ -40,7 -40,7 +40,7 @@@ jobs
                  ubuntu: [18, 20]
                  include:
                      - ubuntu: 18
-                       postgresql: 9.5
+                       postgresql: 9.6
                        postgis: 2.5
                        pytest: pytest
                        php: 7.2
@@@ -64,6 -64,7 +64,6 @@@
                uses: shivammathur/setup-php@v2
                with:
                    php-version: ${{ matrix.php }}
 -                  coverage: xdebug
                    tools: phpunit, phpcs, composer
  
              - uses: actions/setup-python@v2
@@@ -81,11 -82,11 +81,11 @@@
                    ubuntu: ${{ matrix.ubuntu }}
  
              - name: Install test prerequsites
 -              run: sudo apt-get install -y -qq pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage
 +              run: sudo apt-get install -y -qq pylint python3-pytest python3-behave
                if: matrix.ubuntu == 20
  
              - name: Install test prerequsites
 -              run: pip3 install pylint==2.6.0 pytest pytest-cov behave==1.2.6
 +              run: pip3 install pylint==2.6.0 pytest behave==1.2.6
                if: matrix.ubuntu == 18
  
              - name: PHP linting
@@@ -97,20 -98,41 +97,20 @@@
                working-directory: Nominatim
  
              - name: PHP unit tests
 -              run: phpunit --coverage-clover ../../coverage-php.xml ./
 +              run: phpunit ./
                working-directory: Nominatim/test/php
                if: matrix.ubuntu == 20
  
              - name: Python unit tests
 -              run: $PYTEST --cov=nominatim --cov-report=xml test/python
 +              run: $PYTEST test/python
                working-directory: Nominatim
                env:
                  PYTEST: ${{ matrix.pytest }}
  
 -            - name: BDD tests
 -              run: |
 -                  mkdir cov
 -                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 -DPHPCOV=./cov
 -                  composer require phpunit/phpcov:7.0.2
 -                  vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov
 -              working-directory: Nominatim/test/bdd
 -              if: matrix.ubuntu == 20
 -
              - name: BDD tests
                run: |
                    behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
                working-directory: Nominatim/test/bdd
 -              if: matrix.ubuntu == 18
 -
 -            - name: Upload coverage to Codecov
 -              uses: codecov/codecov-action@v1
 -              with:
 -                files: ./Nominatim/coverage*.xml
 -                directory: ./
 -                name: codecov-umbrella
 -                fail_ci_if_error: false
 -                path_to_write_report: ./coverage/codecov_report.txt
 -                verbose: true
 -              if: matrix.ubuntu == 20
  
  
      icu-test: