Merge remote-tracking branch 'upstream/master'

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 48cbf1bc8ea78da685dc6ac2f587c1e224a03144..1aa12daa3be474d998faab6bebd1263e7e5fc108 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -1,10 +1,10 @@
 name: 'Build Nominatim'
 
 inputs:
-    ubuntu:
+    flavour:
         description: 'Version of Ubuntu to install on'
         required: false
-        default: '20'
+        default: 'ubuntu-20'
     cmake-args:
         description: 'Additional options to hand to cmake'
         required: false
@@ -23,10 +23,10 @@ runs:
             sudo rm -rf /opt/hostedtoolcache/go /opt/hostedtoolcache/CodeQL /usr/lib/jvm /usr/local/share/chromium /usr/local/lib/android
             df -h
           shell: bash
-        - name: Install prerequisites
+        - 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}
-            if [ "x$UBUNTUVER" == "x18" ]; then
+            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 datrie asyncpg
             else
                 sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml python3-asyncpg
@@ -34,7 +34,7 @@ runs:
             fi
           shell: bash
           env:
-            UBUNTUVER: ${{ inputs.ubuntu }}
+            FLAVOUR: ${{ inputs.flavour }}
             CMAKE_ARGS: ${{ inputs.cmake-args }}
             LUA_VERSION: ${{ inputs.lua }}
 

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 35e6306a7830b3b6e55ddec044aedc63885899e5..0f4aea263a7acd510a98c9c53bad47eb14e4c306 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -37,20 +37,26 @@ jobs:
         needs: create-archive
         strategy:
             matrix:
-                ubuntu: [18, 20, 22]
+                flavour: [oldstuff, "ubuntu-20", "ubuntu-22"]
                 include:
-                    - ubuntu: 18
-                      postgresql: 9.6
-                      postgis: 2.5
-                      php: 7.2
-                    - ubuntu: 20
+                    - flavour: oldstuff
+                      ubuntu: 20
+                      postgresql: '9.6'
+                      postgis: '2.5'
+                      php: '7.3'
+                      lua: '5.1'
+                    - flavour: ubuntu-20
+                      ubuntu: 20
                       postgresql: 13
                       postgis: 3
-                      php: 7.4
-                    - ubuntu: 22
+                      php: '7.4'
+                      lua: '5.3'
+                    - flavour: ubuntu-22
+                      ubuntu: 22
                       postgresql: 15
                       postgis: 3
-                      php: 8.1
+                      php: '8.1'
+                      lua: '5.3'
 
         runs-on: ubuntu-${{ matrix.ubuntu }}.04
 
@@ -72,7 +78,7 @@ jobs:
             - uses: actions/setup-python@v4
               with:
                 python-version: 3.7
-              if: matrix.ubuntu == 18
+              if: matrix.flavour == 'oldstuff'
 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
@@ -81,23 +87,24 @@ jobs:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:
-                  ubuntu: ${{ matrix.ubuntu }}
+                  flavour: ${{ matrix.flavour }}
+                  lua: ${{ matrix.lua }}
 
             - name: Install test prerequsites (behave from apt)
               run: sudo apt-get install -y -qq python3-behave
-              if: matrix.ubuntu == 20
+              if: matrix.flavour == 'ubuntu-20'
 
             - name: Install test prerequsites (behave from pip)
               run: pip3 install behave==1.2.6
-              if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }}
+              if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
             - name: Install test prerequsites (from apt for Ununtu 2x)
               run: sudo apt-get install -y -qq python3-pytest uvicorn
-              if: matrix.ubuntu >= 20
+              if: matrix.flavour != 'oldstuff'
 
             - name: Install test prerequsites (from pip for Ubuntu 18)
               run: pip3 install pytest uvicorn
-              if: matrix.ubuntu == 18
+              if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers
               run: pip3 install falcon sanic sanic-testing starlette
@@ -129,12 +136,12 @@ jobs:
 
             - name: Install newer Python packages (for typechecking info)
               run: pip3 install -U osmium uvicorn
-              if: matrix.ubuntu >= 20
+              if: matrix.flavour != 'oldstuff'
 
             - name: Python static typechecking
               run: python3 -m mypy --strict nominatim
               working-directory: Nominatim
-              if: matrix.ubuntu >= 20
+              if: matrix.flavour != 'oldstuff'
 
     legacy-test:
         needs: create-archive
@@ -151,7 +158,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: '7.4'
 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
@@ -163,7 +170,6 @@ jobs:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:
-                  ubuntu: 20
                   cmake-args: -DBUILD_MODULE=on
 
             - name: Install test prerequsites

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index 90b2cb39c87be2938f874d7b2e4aa8e8cc5999e9..f6692f5876143d26f3a622ea99dcf7dd4a1b8c94 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -53,7 +53,7 @@ For running Nominatim:
   * [PyICU](https://pypi.org/project/PyICU/)
   * [PyYaml](https://pyyaml.org/) (5.1+)
   * [datrie](https://github.com/pytries/datrie)
-  * [PHP](https://php.net) (7.0 or later)
+  * [PHP](https://php.net) (7.3+)
   * PHP-pgsql
   * PHP-intl (bundled with PHP)
   * PHP-cgi (for running queries from the command line)

diff --git a/nominatim/clicmd/api.py b/nominatim/clicmd/api.py
index 9a4828b8ce1e02384d65a7badbf133570f511519..e2b903c73defa60d2444aa44b1dca59a9b572946 100644 (file)
--- a/nominatim/clicmd/api.py
+++ b/nominatim/clicmd/api.py
@@ -251,9 +251,9 @@ class APIDetails:
         if args.node:
             params = dict(osmtype='N', osmid=args.node)
         elif args.way:
-            params = dict(osmtype='W', osmid=args.node)
+            params = dict(osmtype='W', osmid=args.way)
         elif args.relation:
-            params = dict(osmtype='R', osmid=args.node)
+            params = dict(osmtype='R', osmid=args.relation)
         else:
             params = dict(place_id=args.place_id)
         if args.object_class:

diff --git a/settings/import-address.lua b/settings/import-address.lua
index 00d089ccd95af0219f83764cffe399bab28de23a..46ab3421352b38d8e8718c850fe26856131963d7 100644 (file)
--- a/settings/import-address.lua
+++ b/settings/import-address.lua
@@ -24,7 +24,7 @@ flex.set_main_tags{
 
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -44,7 +44,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'},

diff --git a/settings/import-admin.lua b/settings/import-admin.lua
index a1164acc5060f550c04dc64a1d678d71ed953e5a..5fca4002a6e867ad2592625e0acda3da502da447 100644 (file)
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -9,7 +9,7 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source', 'highway',
                                    'addr:housenumber', 'addr:street', 'addr:city',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -27,7 +27,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}

diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index d634d4a1ba9d0625aef597a39ef746427e9621f0..5feed1beea3b969d23fd8a43d6aefbb2af2b6f61 100644 (file)
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -77,6 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                     extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
+                               '*:wikipedia', 'brand:wikipedia:*',
                                'addr:street:name', 'addr:street:type'}
                    }
 

diff --git a/settings/import-full.lua b/settings/import-full.lua
index a932fa50e38dc263790e3378a543ed6ffdb11726..563f0ed9533bdd69ac5085ab43260c2b651aeb89 100644 (file)
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -77,6 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                     extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
+                               '*:wikipedia', 'brand:wikipedia:*',
                                'addr:street:name', 'addr:street:type'}
                    }
 

diff --git a/settings/import-street.lua b/settings/import-street.lua
index acadf01e7769c8229cba9dfff09c0f95c2755e56..1718874d21f5c41d757f902bd0cffc74d68b32cd 100644 (file)
--- a/settings/import-street.lua
+++ b/settings/import-street.lua
@@ -24,7 +24,7 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'addr:housenumber', 'addr:street',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -44,7 +44,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}

diff --git a/test/Makefile b/test/Makefile
index 6dd9a349405eebb39a72e48b43a6ab095544986f..5f78eeac878e3a794ada708b6ea1d82778643cdc 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,12 +1,9 @@
-all: bdd php
+all: bdd php python
 no-test-db: bdd-no-test-db php
 
 bdd:
        cd bdd && behave -DREMOVE_TEMPLATE=1
 
-icu:
-       cd bdd && behave -DREMOVE_TEMPLATE=1 -DTOKENIZER=icu
-
 php:
        cd php && phpunit ./
 
@@ -14,4 +11,4 @@ python:
        pytest python
 
 
-.PHONY: bdd php no-test-db
+.PHONY: bdd php no-test-db python