From: Sarah Hoffmann Date: Fri, 12 Sep 2025 20:28:21 +0000 (+0200) Subject: release 5.1.0.post20 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/HEAD?ds=inline;hp=0a7624039bc4189fd999eb23ea5a175a1c4b2dfb release 5.1.0.post20 --- diff --git a/.flake8 b/.flake8 index cf87715a..1aae19dc 100644 --- a/.flake8 +++ b/.flake8 @@ -7,5 +7,5 @@ extend-ignore = per-file-ignores = __init__.py: F401 test/python/utils/test_json_writer.py: E131 - test/python/conftest.py: E402 + **/conftest.py: E402 test/bdd/*: F821 diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index a8bf957f..794da84d 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -44,11 +44,13 @@ jobs: postgresql: 12 lua: '5.1' dependencies: pip + python: '3.9' - flavour: ubuntu-24 ubuntu: 24 postgresql: 17 lua: '5.3' dependencies: apt + python: 'builtin' runs-on: ubuntu-${{ matrix.ubuntu }}.04 @@ -68,26 +70,40 @@ jobs: with: dependencies: ${{ matrix.dependencies }} + - uses: actions/cache@v4 + with: + path: | + /usr/local/bin/osm2pgsql + key: osm2pgsql-bin-22-1 + if: matrix.ubuntu == '22' + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python }} + if: matrix.python != 'builtin' + - name: Compile osm2pgsql 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-dkjson nlohmann-json3-dev - mkdir osm2pgsql-build - cd osm2pgsql-build - git clone https://github.com/osm2pgsql-dev/osm2pgsql - mkdir build - cd build - cmake ../osm2pgsql - make - sudo make install - cd ../.. - rm -rf osm2pgsql-build + if [ ! -f /usr/local/bin/osm2pgsql ]; then + 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-dkjson nlohmann-json3-dev + mkdir osm2pgsql-build + cd osm2pgsql-build + git clone https://github.com/osm2pgsql-dev/osm2pgsql + mkdir build + cd build + cmake ../osm2pgsql + make + sudo make install + cd ../.. + rm -rf osm2pgsql-build + else + sudo apt-get install -y -qq libexpat1 liblua${LUA_VERSION} + fi if: matrix.ubuntu == '22' env: LUA_VERSION: ${{ matrix.lua }} - - name: Install test prerequisites - run: ./venv/bin/pip install behave==1.2.6 - - name: Install test prerequisites (apt) run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn python3-falcon python3-aiosqlite python3-pyosmium if: matrix.dependencies == 'apt' @@ -96,6 +112,9 @@ jobs: run: ./venv/bin/pip install pytest-asyncio falcon starlette asgi_lifespan aiosqlite osmium uvicorn if: matrix.dependencies == 'pip' + - name: Install test prerequisites + run: ./venv/bin/pip install pytest-bdd + - name: Install latest flake8 run: ./venv/bin/pip install -U flake8 @@ -108,7 +127,7 @@ jobs: if: matrix.dependencies == 'pip' - name: Python static typechecking - run: ../venv/bin/python -m mypy --strict --python-version 3.8 src + run: ../venv/bin/python -m mypy --strict --python-version 3.9 src working-directory: Nominatim if: matrix.dependencies == 'pip' @@ -118,8 +137,8 @@ jobs: - name: BDD tests run: | - ../../../venv/bin/python -m behave -DREMOVE_TEMPLATE=1 --format=progress3 - working-directory: Nominatim/test/bdd + ../venv/bin/python -m pytest test/bdd --nominatim-purge + working-directory: Nominatim install: runs-on: ubuntu-latest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 311414fe..6c90cd3c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -113,3 +113,5 @@ Checklist for releases: * run `nominatim --version` to confirm correct version * [ ] tag new release and add a release on github.com * [ ] build pip packages and upload to pypi + * `make build` + * `twine upload dist/*` diff --git a/ChangeLog b/ChangeLog index 9ffe4038..dff198eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +5.1.0 + * replace datrie with simple internal trie implementation + * add pattern-based postcode parser for queries, + postcodes no longer need to be present in OSM to be found + * take variants into account when computing token similarity + * add extratags output to geocodejson format + * fix default layer setting used for structured queries + * update abbreviation lists for Russian and English + (thanks @shoorick, @IvanShift, @mhsrn21) + * fix variant generation for Norwegian + * fix normalization around space-like characters + * improve postcode search and handling of postcodes in queries + * reorganise internal query structure and get rid of slow enums + * enable code linting for tests + * various code moderinsations in test code (thanks @eumiro) + * remove setting osm2pgsql location via config.lib_dir + * make SQL functions parallel save as far as possible (thanks @otbutz) + * various fixes and improvements to documentation (thanks @TuringVerified) + 5.0.0 * increase required versions for PostgreSQL (12+), PostGIS (3.0+) * remove installation via cmake and debundle osm2pgsql diff --git a/Makefile b/Makefile index f35c9782..2d501808 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ build-api: tests: mypy lint pytest bdd mypy: - mypy --strict --python-version 3.8 src + mypy --strict --python-version 3.9 src pytest: pytest test/python @@ -27,7 +27,7 @@ lint: flake8 src test/python test/bdd bdd: - cd test/bdd; behave -DREMOVE_TEMPLATE=1 + pytest test/bdd --nominatim-purge # Documentation diff --git a/README.md b/README.md index 3b0f328a..54bdbf8e 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,25 @@ can be found at nominatim.org as well. A quick summary of the necessary steps: -1. Create a Python virtualenv and install the packages: + +1. Clone this git repository and download the country grid + + git clone https://github.com/osm-search/Nominatim.git + wget -O Nominatim/data/country_osm_grid.sql.gz https://nominatim.org/data/country_grid.sql.gz + +2. Create a Python virtualenv and install the packages: python3 -m venv nominatim-venv ./nominatim-venv/bin/pip install packaging/nominatim-{api,db} -2. Create a project directory, get OSM data and import: +3. Create a project directory, get OSM data and import: mkdir nominatim-project cd nominatim-project - ../nominatim-venv/bin/nominatim import --osm-file + ../nominatim-venv/bin/nominatim import --osm-file 2>&1 | tee setup.log + -3. Start the webserver: +4. Start the webserver: ./nominatim-venv/bin/pip install uvicorn falcon ../nominatim-venv/bin/nominatim serve diff --git a/SECURITY.md b/SECURITY.md index e3660bcd..98295e1f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,7 +9,8 @@ versions. | Version | End of support for security updates | | ------- | ----------------------------------- | -| 5.0.x | 2027-02-06 +| 5.1.x | 2027-04-01 | +| 5.0.x | 2027-02-06 | | 4.5.x | 2026-09-12 | | 4.4.x | 2026-03-07 | | 4.3.x | 2025-09-07 | diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index 2571de5d..99387ed6 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -27,7 +27,7 @@ For running Nominatim: * [PostgreSQL](https://www.postgresql.org) (12+ will work, 13+ strongly recommended) * [PostGIS](https://postgis.net) (3.0+ will work, 3.2+ strongly recommended) * [osm2pgsql](https://osm2pgsql.org) (1.8+) - * [Python 3](https://www.python.org/) (3.7+) + * [Python 3](https://www.python.org/) (3.9+) Furthermore the following Python libraries are required: diff --git a/docs/admin/Setup-Nominatim-UI.md b/docs/admin/Setup-Nominatim-UI.md index cab2d2ed..5eef94a0 100644 --- a/docs/admin/Setup-Nominatim-UI.md +++ b/docs/admin/Setup-Nominatim-UI.md @@ -36,11 +36,11 @@ The website is now available at `http://localhost:8765`. ## Forwarding searches to nominatim-ui Nominatim used to provide the search interface directly by itself when -`format=html` was requested. For all endpoints except for `/reverse` and -`/lookup` this even used to be the default. +`format=html` was requested. For the `/search` endpoint this even used +to be the default. The following section describes how to set up Apache or nginx, so that your -users are forwarded to nominatim-ui when they go to URL that formerly presented +users are forwarded to nominatim-ui when they go to a URL that formerly presented the UI. ### Setting up forwarding in Nginx @@ -73,41 +73,28 @@ map $args $format { # Determine from the URI and the format parameter above if forwarding is needed. map $uri/$format $forward_to_ui { - default 1; # The default is to forward. - ~^/ui 0; # If the URI point to the UI already, we are done. - ~/other$ 0; # An explicit non-html format parameter. No forwarding. - ~/reverse.*/default 0; # Reverse and lookup assume xml format when - ~/lookup.*/default 0; # no format parameter is given. No forwarding. + default 0; # no forwarding by default + ~/search.*/default 1; # Use this line only, if search should go to UI by default. + ~/reverse.*/html 1; # Forward API calls that UI supports, when + ~/status.*/html 1; # format=html is explicitly requested. + ~/search.*/html 1; + ~/details.*/html 1; } ``` The `$forward_to_ui` parameter can now be used to conditionally forward the calls: -``` -# When no endpoint is given, default to search. -# Need to add a rewrite so that the rewrite rules below catch it correctly. -rewrite ^/$ /search; - -location @php { - # fastcgi stuff.. +``` nginx +location / { if ($forward_to_ui) { - rewrite ^(/[^/]*) https://yourserver.com/ui$1.html redirect; + rewrite ^(/[^/.]*) https://$http_host/ui$1.html redirect; } -} -location ~ [^/]\.php(/|$) { - # fastcgi stuff.. - if ($forward_to_ui) { - rewrite (.*).php https://yourserver.com/ui$1.html redirect; - } + # proxy_pass commands } ``` -!!! warning - Be aware that the rewrite commands are slightly different for URIs with and - without the .php suffix. - Reload nginx and the UI should be available. ### Setting up forwarding in Apache @@ -159,18 +146,16 @@ directory like this: RewriteBase "/nominatim/" # If no endpoint is given, then use search. - RewriteRule ^(/|$) "search.php" + RewriteRule ^(/|$) "search" # If format-html is explicitly requested, forward to the UI. RewriteCond %{QUERY_STRING} "format=html" - RewriteRule ^([^/]+)(.php)? ui/$1.html [R,END] + RewriteRule ^([^/.]+) ui/$1.html [R,END] - # If no format parameter is there then forward anything - # but /reverse and /lookup to the UI. + # Optionally: if no format parameter is there then forward /search. RewriteCond %{QUERY_STRING} "!format=" - RewriteCond %{REQUEST_URI} "!/lookup" - RewriteCond %{REQUEST_URI} "!/reverse" - RewriteRule ^([^/]+)(.php)? ui/$1.html [R,END] + RewriteCond %{REQUEST_URI} "/search" + RewriteRule ^([^/.]+) ui/$1.html [R,END] ``` diff --git a/docs/api/Details.md b/docs/api/Details.md index b836efd3..ddd97786 100644 --- a/docs/api/Details.md +++ b/docs/api/Details.md @@ -105,6 +105,13 @@ grouped by type. Include geometry of result. +| Parameter | Value | Default | +|-----------| ----- | ------- | +| entrances | 0 or 1 | 0 | + +When set to 1, include the tagged entrances in the result. + + ### Language of results | Parameter | Value | Default | diff --git a/docs/api/Lookup.md b/docs/api/Lookup.md index bed01275..b3f39a43 100644 --- a/docs/api/Lookup.md +++ b/docs/api/Lookup.md @@ -77,6 +77,12 @@ that is available in the database, e.g. wikipedia link, opening hours. When set to 1, include a full list of names for the result. These may include language variants, older names, references and brand. +| Parameter | Value | Default | +|-----------| ----- | ------- | +| entrances | 0 or 1 | 0 | + +When set to 1, include the tagged entrances in the result. + ### Language of results diff --git a/docs/api/Output.md b/docs/api/Output.md index a5ec933e..b361491b 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -60,6 +60,8 @@ The possible fields are: * `namedetails` - dictionary with full list of available names including ref etc. * `geojson`, `svg`, `geotext`, `geokml` - full geometry (only with the appropriate `polygon_*` parameter) + * `entrances` - array of objects representing tagged entrances for the object, or + null if none are found (only with `entrances=1`) ## JSONv2 @@ -87,6 +89,8 @@ The properties object has the following fields: * `extratags` - dictionary with additional useful tags like `website` or `maxspeed` (only with `extratags=1`) * `namedetails` - dictionary with full list of available names including ref etc. + * `entrances` - array of objects representing tagged entrances for the object, or + null if none are found (only with `entrances=1`) Use `polygon_geojson` to output the full geometry of the object instead of the centroid. @@ -110,6 +114,8 @@ The following feature attributes are implemented: * `admin` - list of localised names of administrative boundaries (only with `addressdetails=1`) * `extra` - dictionary with additional useful tags like `website` or `maxspeed` (only with `extratags=1`) + * `entrances` - array of objects representing tagged entrances for the object, or + null if none are found (only with `entrances=1`) Use `polygon_geojson` to output the full geometry of the object instead @@ -162,8 +168,8 @@ The place information can be found in the `result` element. The attributes of th The full address of the result can be found in the content of the `result` element as a comma-separated list. -Additional information requested with `addressdetails=1`, `extratags=1` and -`namedetails=1` can be found in extra elements. +Additional information requested with `addressdetails=1`, `extratags=1`, +`namedetails=1`, and `entrances=1` can be found in extra elements. ### Search and Lookup @@ -224,9 +230,9 @@ be more than one. The attributes of that element contain: When `addressdetails=1` is requested, the localised address parts appear as subelements with the type of the address part. -Additional information requested with `extratags=1` and `namedetails=1` can -be found in extra elements as sub-element of `extratags` and `namedetails` -respectively. +Additional information requested with `extratags=1`, `namedetails=1`, and +`entrances=1` can be found in extra elements as sub-element of `extratags`, +`namedetails`, and `entrances` respectively. ## Notes on field values @@ -303,3 +309,78 @@ with a designation label. Per default the following labels may appear: They roughly correspond to the classification of the OpenStreetMap data according to either the `place` tag or the main key of the object. + +### entrances + +Entrance details in the xml and json formats return the latitude and longitude +of the entrance, the osm node ID, the [type of +entrance](https://wiki.openstreetmap.org/wiki/Key:entrance), and any extra tags +associated with the entrance node. + + * osm_id + * type + * lat + * lon + * extratags + +They roughly correspond to the classification of the OpenStreetMap data +according to either the `place` tag or the main key of the object. + +#### Example + +##### JSON + +[https://nominatim.openstreetmap.org/details?osmtype=W&osmid=32619803&entrances=1&format=json](https://nominatim.openstreetmap.org/details?osmtype=W&osmid=32619803&entrances=1&format=json) + + +```json +{ + "place_id": 124325848, + "parent_place_id": 123936289, + "osm_type": "W", + "osm_id": 32619803, + "category": "shop", + "type": "supermarket", + "admin_level": 15, + "localname": "PENNY", + ... + "entrances": [ + { + "osm_id": 1733488238, + "type": "yes", + "lat": "51.0466704", + "lon": "12.8077106", + "extratags": { + "foot": "yes" + } + }, + { + "osm_id": 1733488256, + "type": "main", + "lat": "51.0467197", + "lon": "12.8078448", + "extratags": { + "foot": "yes" + } + }, + { + "osm_id": 1733498087, + "type": "exit", + "lat": "51.0467081", + "lon": "12.8078131", + "extratags": { + "foot": "yes" + } + }, + { + "osm_id": 7914950851, + "type": "service", + "lat": "51.0468487", + "lon": "12.8075876", + "extratags": { + "access": "delivery" + } + } + ] +} +``` diff --git a/docs/api/Reverse.md b/docs/api/Reverse.md index e646818f..2963c24b 100644 --- a/docs/api/Reverse.md +++ b/docs/api/Reverse.md @@ -98,6 +98,12 @@ that is available in the database, e.g. wikipedia link, opening hours. When set to 1, include a full list of names for the result. These may include language variants, older names, references and brand. +| Parameter | Value | Default | +|-----------| ----- | ------- | +| entrances | 0 or 1 | 0 | + +When set to 1, include the tagged entrances in the result. + ### Language of results diff --git a/docs/api/Search.md b/docs/api/Search.md index 1c269168..78852502 100644 --- a/docs/api/Search.md +++ b/docs/api/Search.md @@ -136,6 +136,12 @@ that is available in the database, e.g. wikipedia link, opening hours. When set to 1, include a full list of names for the result. These may include language variants, older names, references and brand. +| Parameter | Value | Default | +|-----------| ----- | ------- | +| entrances | 0 or 1 | 0 | + +When set to 1, include the tagged entrances in the result. + ### Language of results @@ -212,7 +218,7 @@ other layers. The featureType allows to have a more fine-grained selection for places from the address layer. Results can be restricted to places that make up the 'state', 'country' or 'city' part of an address. A featureType of -settlement selects any human inhabited feature from 'state' down to +`settlement` selects any human inhabited feature from 'state' down to 'neighbourhood'. When featureType is set, then results are automatically restricted diff --git a/docs/customize/Import-Styles.md b/docs/customize/Import-Styles.md index 23778f77..954f173d 100644 --- a/docs/customize/Import-Styles.md +++ b/docs/customize/Import-Styles.md @@ -36,18 +36,27 @@ local flex = require('flex-base') ### Using preset configurations If you want to start with one of the existing presets, then you can import -its settings using the `import_topic()` function: +its settings using the `load_topic()` function: -``` +``` lua local flex = require('flex-base') -flex.import_topic('streets') +flex.load_topic('streets') ``` -The `import_topic` function takes an optional second configuration +The `load_topic` function takes an optional second configuration parameter. The available options are explained in the [themepark section](#using-osm2pgsql-themepark). +Available topics are: `admin`, `street`, `address`, `full`. These topic +correspond to the [import styles](../admin/Import.md#filtering-imported-data) +you can choose during import. To start with the 'extratags' style, use the +`full` topic with the appropriate config parameter: + +``` lua +flex.load_topic('full', {with_extratags = true}) +``` + !!! note You can also directly import the preset style files, e.g. `local flex = require('import-street')`. It is not possible to @@ -116,8 +125,10 @@ value without key, then this is used as default for values that are not listed. `set_main_tags()` will completely replace the current main tag configuration with the new configuration. `modify_main_tags()` will merge the new -configuration with the existing one. Otherwise, the two functions do exactly -the same. +configuration with the existing one. Merging is done at value level. +For example, when the current setting is `highway = {'always', primary = 'named'}`, +then `set_main_tags{highway = 'delete'}` will result in a rule +`highway = {'delete', primary = 'named'}`. !!! example ``` lua @@ -134,9 +145,9 @@ the same. when it has a value of `administrative`. Objects with `highway` tags are always included with two exceptions: the troll tag `highway=no` is deleted on the spot. And when the value is `street_lamp` then the object - must have a name, too. Finally, if a `landuse` tag is present then - it will be used independently of the concrete value when neither boundary - nor highway tags were found and the object is named. + must also have a name, to be included. Finally, if a `landuse` tag is + present then it will be used independently of the concrete value when + neither boundary nor highway tags were found and the object is named. ##### Presets @@ -556,16 +567,6 @@ the Nominatim topic. ``` Discarding country-level boundaries when running under themepark. -## osm2pgsql gazetteer output - -Nominatim still allows you to configure the gazetteer output to remain -backwards compatible with older imports. It will be automatically used -when the style file name ends in `.style`. For documentation of the -old import style, please refer to the documentation of older releases -of Nominatim. Do not use the gazetteer output for new imports. There is no -guarantee that new versions of Nominatim are fully compatible with the -gazetteer output. - ## Changing the style of existing databases There is usually no issue changing the style of a database that is already diff --git a/docs/customize/Settings.md b/docs/customize/Settings.md index 94726ca7..9bd44f59 100644 --- a/docs/customize/Settings.md +++ b/docs/customize/Settings.md @@ -602,25 +602,44 @@ results gathered so far. Note that under high load you may observe that users receive different results than usual without seeing an error. This may cause some confusion. -### Logging Settings - -#### NOMINATIM_LOG_DB +#### NOMINATIM_OUTPUT_NAMES | Summary | | | -------------- | --------------------------------------------------- | -| **Description:** | Log requests into the database | -| **Format:** | boolean | -| **Default:** | no | -| **After Changes:** | run `nominatim refresh --website` | +| **Description:** | Specifies order of name tags | +| **Format:** | string: comma-separated list of tag names | +| **Default:** | name:XX,name,brand,official_name:XX,short_name:XX,official_name,short_name,ref | + +Specifies the order in which different name tags are used. +The values in this list determine the preferred order of name variants, +including language-specific names (in OSM: the name tag with and without any language suffix). + +Comma-separated list, where :XX stands for language suffix +(e.g. name:en) and no :XX stands for general tags (e.g. name). + +See also [NOMINATIM_DEFAULT_LANGUAGE](#nominatim_default_language). + +!!! note + If NOMINATIM_OUTPUT_NAMES = `name:XX,name,short_name:XX,short_name` the search follows -Enable logging requests into a database table with this setting. The logs -can be found in the table `new_query_log`. + ``` + 'name', 'short_name' + ``` -When using this logging method, it is advisable to set up a job that -regularly clears out old logging information. Nominatim will not do that -on its own. + if we have no preferred language order for showing search results. -Can be used as the same time as NOMINATIM_LOG_FILE. + For languages ['en', 'es'] the search follows + + ``` + 'name:en', 'name:es', + 'name', + 'short_name:en', 'short_name:es', + 'short_name' + ``` + + For those familiar with the internal implementation, the `_place_*` expansion is added, but to simplify, it is not included in this example. + +### Logging Settings #### NOMINATIM_LOG_FILE @@ -629,23 +648,53 @@ Can be used as the same time as NOMINATIM_LOG_FILE. | **Description:** | Log requests into a file | | **Format:** | path | | **Default:** | _empty_ (logging disabled) | -| **After Changes:** | run `nominatim refresh --website` | Enable logging of requests into a file with this setting by setting the log file where to log to. A relative file name is assumed to be relative to -the project directory. +the project directory. The format of the log output can be set +with NOMINATIM_LOG_FORMAT. +#### NOMINATIM_LOG_FORMAT -The entries in the log file have the following format: - - "" - -Request time is the time when the request was started. The execution time is -given in seconds and includes the entire time the query was queued and executed -in the frontend. -type contains the name of the endpoint used. +| Summary | | +| -------------- | --------------------------------------------------- | +| **Description:** | Log requests into a file | +| **Format:** | [Python String Format](https://docs.python.org/3/library/string.html#formatstrings) string | +| **Default:** | `[{start}] {total_time:.4f} {results_total} {endpoint} "{query_string}"` | + +Describes the content of a log line for a single request. The format +must be readable by Python's format function. Nominatim provides a number +of metrics than can be logged. The default set of metrics is the following: + +/// html | div.simple-table +| name | type | Description | +| --------------- | ------ | ------------| +| start | time | Point in time when the request arrived. | +| end | time | Point in time when the request was done. | +| query_start | time | Point in time when processing started. | +| total_time | float | Total time in seconds to handle the request. | +| wait_time | float | Time in seconds the request waited for a database connection to be available. | +| query_time | float | Total time in seconds to process the request once a connection was available. | +| results_total | int | Number of results found. | +| endpoint | string | API endpoint used. | +| query_string | string | Raw query string received. | +/// + +Variables of type 'time' contain a UTC timestamp string in ISO format. + +Nominatim also exposes additional metrics to help with development. These +are subject to change between versions: + +/// html | div.simple-table +| name | type | Description | +| ------------------------- | ------ | ------------| +| search_rounds | int | Total number of searches executed for the request. | +| search_min_penalty | float | Minimal possible penalty for the request. | +| search_first_result_round | int | Number of first search to yield any result. | +| search_min_result_penalty | float | Minimal penalty by a result found. | +| search_best_penalty_round | int | Search round that yielded the best penalty result. | +/// -Can be used as the same time as NOMINATIM_LOG_DB. #### NOMINATIM_DEBUG_SQL diff --git a/docs/customize/Tokenizers.md b/docs/customize/Tokenizers.md index d290c148..23db34c9 100644 --- a/docs/customize/Tokenizers.md +++ b/docs/customize/Tokenizers.md @@ -67,7 +67,13 @@ Here is an example configuration file: ``` yaml query-preprocessing: - - normalize + - step: split_japanese_phrases + - step: regex_replace + replacements: + - pattern: https?://[^\s]* # Filter URLs starting with http or https + replace: '' + - step: normalize + normalization: - ":: lower ()" - "ß > 'ss'" # German szet is unambiguously equal to double ss @@ -88,8 +94,8 @@ token-analysis: replacements: ['ä', 'ae'] ``` -The configuration file contains four sections: -`normalization`, `transliteration`, `sanitizers` and `token-analysis`. +The configuration file contains five sections: +`query-preprocessing`, `normalization`, `transliteration`, `sanitizers` and `token-analysis`. #### Query preprocessing @@ -106,6 +112,19 @@ The following is a list of preprocessors that are shipped with Nominatim. heading_level: 6 docstring_section_style: spacy +##### regex-replace + +::: nominatim_api.query_preprocessing.regex_replace + options: + members: False + heading_level: 6 + docstring_section_style: spacy + description: + This option runs any given regex pattern on the input and replaces values accordingly + replacements: + - pattern: regex pattern + replace: string to replace with + #### Normalization and Transliteration diff --git a/docs/develop/Database-Layout.md b/docs/develop/Database-Layout.md index 98413a0b..cca10896 100644 --- a/docs/develop/Database-Layout.md +++ b/docs/develop/Database-Layout.md @@ -3,8 +3,7 @@ ### Import tables OSM data is initially imported using [osm2pgsql](https://osm2pgsql.org). -Nominatim uses its own data output style 'gazetteer', which differs from the -output style created for map rendering. +Nominatim uses a custom flex style to create the initial import tables. The import process creates the following tables: @@ -14,7 +13,7 @@ The `planet_osm_*` tables are the usual backing tables for OSM data. Note that Nominatim uses them to look up special relations and to find nodes on ways. -The gazetteer style produces a single table `place` as output with the following +The osm2pgsql import produces a single table `place` as output with the following columns: * `osm_type` - kind of OSM object (**N** - node, **W** - way, **R** - relation) diff --git a/docs/develop/Development-Environment.md b/docs/develop/Development-Environment.md index 9ade7916..577ccbd0 100644 --- a/docs/develop/Development-Environment.md +++ b/docs/develop/Development-Environment.md @@ -25,15 +25,15 @@ following packages should get you started: ## Prerequisites for testing and documentation -The Nominatim test suite consists of behavioural tests (using behave) and +The Nominatim test suite consists of behavioural tests (using pytest-bdd) and unit tests (using pytest). It has the following additional requirements: -* [behave test framework](https://behave.readthedocs.io) >= 1.2.6 * [flake8](https://flake8.pycqa.org/en/stable/) (CI always runs the latest version from pip) * [mypy](http://mypy-lang.org/) (plus typing information for external libs) * [Python Typing Extensions](https://github.com/python/typing_extensions) (for Python < 3.9) * [pytest](https://pytest.org) * [pytest-asyncio](https://pytest-asyncio.readthedocs.io) +* [pytest-bdd](https://pytest-bdd.readthedocs.io) For testing the Python search frontend, you need to install extra dependencies depending on your choice of webserver framework: @@ -48,9 +48,6 @@ The documentation is built with mkdocs: * [mkdocs-material](https://squidfunk.github.io/mkdocs-material/) * [mkdocs-gen-files](https://oprypin.github.io/mkdocs-gen-files/) -Please be aware that tests always run against the globally installed -osm2pgsql, so you need to have this set up. If you want to test against -the vendored version of osm2pgsql, you need to set the PATH accordingly. ### Installing prerequisites on Ubuntu/Debian @@ -69,9 +66,10 @@ To set up the virtual environment with all necessary packages run: ```sh virtualenv ~/nominatim-dev-venv ~/nominatim-dev-venv/bin/pip install\ - psutil psycopg[binary] PyICU SQLAlchemy \ - python-dotenv jinja2 pyYAML behave \ - mkdocs mkdocstrings mkdocs-gen-files pytest pytest-asyncio flake8 \ + psutil 'psycopg[binary]' PyICU SQLAlchemy \ + python-dotenv jinja2 pyYAML \ + mkdocs 'mkdocstrings[python]' mkdocs-gen-files \ + pytest pytest-asyncio pytest-bdd flake8 \ types-jinja2 types-markupsafe types-psutil types-psycopg2 \ types-pygments types-pyyaml types-requests types-ujson \ types-urllib3 typing-extensions unicorn falcon starlette \ @@ -94,7 +92,7 @@ but executes against the code in the source tree. For example: ``` me@machine:~$ cd Nominatim me@machine:~Nominatim$ ./nominatim-cli.py --version -Nominatim version 4.4.99-1 +Nominatim version 5.1.0-0 ``` Make sure you have activated the virtual environment holding all diff --git a/docs/develop/Testing.md b/docs/develop/Testing.md index 12673d40..738fa4b8 100644 --- a/docs/develop/Testing.md +++ b/docs/develop/Testing.md @@ -43,53 +43,53 @@ The name of the pytest binary depends on your installation. ## BDD Functional Tests (`test/bdd`) Functional tests are written as BDD instructions. For more information on -the philosophy of BDD testing, see the -[Behave manual](http://pythonhosted.org/behave/philosophy.html). - -The following explanation assume that the reader is familiar with the BDD -notations of features, scenarios and steps. - -All possible steps can be found in the `steps` directory and should ideally -be documented. +the philosophy of BDD testing, read the Wikipedia article on +[Behaviour-driven development](https://en.wikipedia.org/wiki/Behavior-driven_development). ### General Usage To run the functional tests, do - cd test/bdd - behave - -The tests can be configured with a set of environment variables (`behave -D key=val`): - - * `TEMPLATE_DB` - name of template database used as a skeleton for - the test databases (db tests) - * `TEST_DB` - name of test database (db tests) - * `API_TEST_DB` - name of the database containing the API test data (api tests) - * `API_TEST_FILE` - OSM file to be imported into the API test database (api tests) - * `API_ENGINE` - webframe to use for running search queries, same values as - `nominatim serve --engine` parameter - * `DB_HOST` - (optional) hostname of database host - * `DB_PORT` - (optional) port of database on host - * `DB_USER` - (optional) username of database login - * `DB_PASS` - (optional) password for database login - * `REMOVE_TEMPLATE` - if true, the template and API database will not be reused - during the next run. Reusing the base templates speeds - up tests considerably but might lead to outdated errors - for some changes in the database layout. - * `KEEP_TEST_DB` - if true, the test database will not be dropped after a test - is finished. Should only be used if one single scenario is - run, otherwise the result is undefined. - -Logging can be defined through command line parameters of behave itself. Check -out `behave --help` for details. Also have a look at the 'work-in-progress' -feature of behave which comes in handy when writing new tests. + pytest test/bdd + +The BDD tests create databases for the tests. You can set name of the databases +through configuration variables in your `pytest.ini`: + + * `nominatim_test_db` defines the name of the temporary database created for + a single test (default: `test_nominatim`) + * `nominatim_api_test_db` defines the name of the database containing + the API test data, see also below (default: `test_api_nominatim`) + * `nominatim_template_db` defines the name of the template database used + for creating the temporary test databases. It contains some static setup + which usually doesn't change between imports of OSM data + (default: `test_template_nominatim`) + +To change other connection parameters for the PostgreSQL database, use +the [libpq enivronment variables](https://www.postgresql.org/docs/current/libpq-envars.html). +Never set a password through these variables. Use a +[password file](https://www.postgresql.org/docs/current/libpq-pgpass.html) instead. + +The API test database and the template database are only created once and then +left untouched. This is usually what you want because it speeds up subsequent +runs of BDD tests. If you do change code that has an influence on the content +of these databases, you can run pytest with the `--nominatim-purge` parameter +and the databases will be dropped and recreated from scratch. + +When running the BDD tests with make (using `make tests` or `make bdd`), then +the databases will always be purged. + +The temporary test database is usually dropped directly after the test, so +it does not take up unnecessary space. If you want to keep the database around, +for example while debugging a specific BDD test, use the parameter +`--nominatim-keep-db`. + ### API Tests (`test/bdd/api`) These tests are meant to test the different API endpoints and their parameters. They require to import several datasets into a test database. This is normally done automatically during setup of the test. The API test database is then -kept around and reused in subsequent runs of behave. Use `behave -DREMOVE_TEMPLATE` +kept around and reused in subsequent runs of behave. Use `--nominatim-purge` to force a reimport of the database. The official test dataset is saved in the file `test/testdb/apidb-test-data.pbf` @@ -109,12 +109,12 @@ test the correctness of osm2pgsql. Each test will write some data into the `plac table (and optionally the `planet_osm_*` tables if required) and then run Nominatim's processing functions on that. -These tests need to create their own test databases. By default they will be -called `test_template_nominatim` and `test_nominatim`. Names can be changed with -the environment variables `TEMPLATE_DB` and `TEST_DB`. The user running the tests -needs superuser rights for postgres. +These tests use the template database and create temporary test databases for +each test. ### Import Tests (`test/bdd/osm2pgsql`) -These tests check that data is imported correctly into the place table. They -use the same template database as the DB Creation tests, so the same remarks apply. +These tests check that data is imported correctly into the place table. + +These tests also use the template database and create temporary test databases +for each test. diff --git a/docs/develop/overview.md b/docs/develop/overview.md index aedce990..a4530f51 100644 --- a/docs/develop/overview.md +++ b/docs/develop/overview.md @@ -9,7 +9,7 @@ the address computation and the search frontend. The __data import__ stage reads the raw OSM data and extracts all information that is useful for geocoding. This part is done by osm2pgsql, the same tool that can also be used to import a rendering database. It uses the special -gazetteer output plugin in `osm2pgsql/src/output-gazetter.[ch]pp`. The result of +flex output style defined in the directory `/lib-lua`. The result of the import can be found in the database table `place`. The __address computation__ or __indexing__ stage takes the data from `place` diff --git a/docs/extra.css b/docs/extra.css index 033e9903..fe7bec48 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -39,3 +39,9 @@ th { filter: grayscale(100%); font-size: 80%; } + +.simple-table table:not([class]) th, +.simple-table table:not([class]) td { + padding: 2px 4px; + background: white; +} diff --git a/docs/library/Getting-Started.md b/docs/library/Getting-Started.md index 9f81724a..36876206 100644 --- a/docs/library/Getting-Started.md +++ b/docs/library/Getting-Started.md @@ -268,13 +268,17 @@ name out of it: 'Brugges' ``` -The `address_row` field has a helper function to apply the function to all -its members and save the result in the `local_name` field. It also returns -all the localized names as a convenient simple list. This list can be used -to create a human-readable output: +The `address_row` field has a helper function to compute the display name for each Address Line +component based on its `local_name` field. This is then utilized by the overall `result` object, +which has a helper function to apply the function to all its ‘address_row’ members and saves +the result in the `locale_name` field. + +However, in order to set this `local_name` field in a preferred language, you must use the `Locale` +object which contains the function `localize_results`, which explicitly sets each `local_name field`. ``` python ->>> address_parts = results[0].address_rows.localize(locale) +>>> Locales().localize_results(results) +>>> address_parts = results[0].address_rows >>> print(', '.join(address_parts)) Bruges, Flandre-Occidentale, Flandre, Belgique ``` diff --git a/docs/library/Result-Handling.md b/docs/library/Result-Handling.md index 1e8043cf..81d445c4 100644 --- a/docs/library/Result-Handling.md +++ b/docs/library/Result-Handling.md @@ -49,7 +49,11 @@ its address. ## Localization -Results are always returned with the full list of available names. +Results are always returned with the full list of available names. However, the +default `locale_name` must be explicitly set using the `localize` function within +`Locales`. This parses through the full list of available names to find the one +most preferred by the user. Once this is set, the user can simply use the +`display_name` field within a `Result` object to retrive the localized name. ### Locale diff --git a/lib-lua/themes/nominatim/presets.lua b/lib-lua/themes/nominatim/presets.lua index aa51ac14..3fac52b1 100644 --- a/lib-lua/themes/nominatim/presets.lua +++ b/lib-lua/themes/nominatim/presets.lua @@ -172,6 +172,10 @@ module.MAIN_TAGS_POIS = function (group) no = group, yes = group, fire_hydrant = group}, + entrance = {'always', + no = group}, + ["routing:entrance"] = {exclude_when_key_present('entrance'), + no = group}, healthcare = {'fallback', yes = group, no = group}, @@ -187,7 +191,7 @@ module.MAIN_TAGS_POIS = function (group) passing_place = group, street_lamp = 'named', traffic_signals = 'named'}, - historic = {'always', + historic = {'fallback', yes = group, no = group}, information = {include_when_tag_present('tourism', 'information'), @@ -196,6 +200,7 @@ module.MAIN_TAGS_POIS = function (group) trail_blaze = 'never'}, junction = {'fallback', no = group}, + landuse = {cemetery = 'always'}, leisure = {'always', nature_reserve = 'fallback', swimming_pool = 'named', @@ -229,6 +234,7 @@ module.MAIN_TAGS_POIS = function (group) shop = {'always', no = group}, tourism = {'always', + attraction = 'fallback', no = group, yes = group, information = exclude_when_key_present('information')}, @@ -330,7 +336,7 @@ module.NAME_TAGS.core = {main = {'name', 'name:*', } module.NAME_TAGS.address = {house = {'addr:housename'}} module.NAME_TAGS.poi = group_merge({main = {'brand'}, - extra = {'iata', 'icao'}}, + extra = {'iata', 'icao', 'faa'}}, module.NAME_TAGS.core) -- Address tagging @@ -360,7 +366,7 @@ module.IGNORE_KEYS.metatags = {'note', 'note:*', 'source', 'source:*', '*source' 'tiger:cfcc', 'tiger:reviewed', 'nysgissam:*', 'NHD:*', 'nhd:*', 'gnis:*', 'geobase:*', 'yh:*', 'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*', - 'lacounty:*', 'ref:linz:*', + 'lacounty:*', 'ref:linz:*', 'survey:*', 'ref:bygningsnr', 'ref:ruian:*', 'building:ruian:type', 'type', 'is_in:postcode'} diff --git a/lib-sql/functions.sql b/lib-sql/functions.sql index 158969d9..737a3f21 100644 --- a/lib-sql/functions.sql +++ b/lib-sql/functions.sql @@ -8,7 +8,6 @@ {% include('functions/utils.sql') %} {% include('functions/ranking.sql') %} {% include('functions/importance.sql') %} -{% include('functions/address_lookup.sql') %} {% include('functions/interpolation.sql') %} {% if 'place' in db.tables %} diff --git a/lib-sql/functions/address_lookup.sql b/lib-sql/functions/address_lookup.sql deleted file mode 100644 index b59b7656..00000000 --- a/lib-sql/functions/address_lookup.sql +++ /dev/null @@ -1,334 +0,0 @@ --- SPDX-License-Identifier: GPL-2.0-only --- --- This file is part of Nominatim. (https://nominatim.org) --- --- Copyright (C) 2022 by the Nominatim developer community. --- For a full list of authors see the git log. - --- Functions for returning address information for a place. - -DROP TYPE IF EXISTS addressline CASCADE; -CREATE TYPE addressline as ( - place_id BIGINT, - osm_type CHAR(1), - osm_id BIGINT, - name HSTORE, - class TEXT, - type TEXT, - place_type TEXT, - admin_level INTEGER, - fromarea BOOLEAN, - isaddress BOOLEAN, - rank_address INTEGER, - distance FLOAT -); - - -CREATE OR REPLACE FUNCTION get_name_by_language(name hstore, languagepref TEXT[]) - RETURNS TEXT - AS $$ -DECLARE - result TEXT; -BEGIN - IF name is null THEN - RETURN null; - END IF; - - FOR j IN 1..array_upper(languagepref,1) LOOP - IF name ? languagepref[j] THEN - result := trim(name->languagepref[j]); - IF result != '' THEN - return result; - END IF; - END IF; - END LOOP; - - -- as a fallback - take the last element since it is the default name - RETURN trim((avals(name))[array_length(avals(name), 1)]); -END; -$$ -LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; - - ---housenumber only needed for tiger data -CREATE OR REPLACE FUNCTION get_address_by_language(for_place_id BIGINT, - housenumber INTEGER, - languagepref TEXT[]) - RETURNS TEXT - AS $$ -DECLARE - result TEXT[]; - currresult TEXT; - prevresult TEXT; - location RECORD; -BEGIN - - result := '{}'; - prevresult := ''; - - FOR location IN - SELECT name, - CASE WHEN place_id = for_place_id THEN 99 ELSE rank_address END as rank_address - FROM get_addressdata(for_place_id, housenumber) - WHERE isaddress order by rank_address desc - LOOP - currresult := trim(get_name_by_language(location.name, languagepref)); - IF currresult != prevresult AND currresult IS NOT NULL - AND result[(100 - location.rank_address)] IS NULL - THEN - result[(100 - location.rank_address)] := currresult; - prevresult := currresult; - END IF; - END LOOP; - - RETURN array_to_string(result,', '); -END; -$$ -LANGUAGE plpgsql STABLE PARALLEL SAFE; - -DROP TYPE IF EXISTS addressdata_place; -CREATE TYPE addressdata_place AS ( - place_id BIGINT, - country_code VARCHAR(2), - housenumber TEXT, - postcode TEXT, - class TEXT, - type TEXT, - name HSTORE, - address HSTORE, - centroid GEOMETRY -); - --- Compute the list of address parts for the given place. --- --- If in_housenumber is greator or equal 0, look for an interpolation. -CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber INTEGER) - RETURNS setof addressline - AS $$ -DECLARE - place addressdata_place; - location RECORD; - country RECORD; - current_rank_address INTEGER; - location_isaddress BOOLEAN; -BEGIN - -- The place in question might not have a direct entry in place_addressline. - -- Look for the parent of such places then and save it in place. - - -- first query osmline (interpolation lines) - IF in_housenumber >= 0 THEN - SELECT parent_place_id as place_id, country_code, - in_housenumber as housenumber, postcode, - 'place' as class, 'house' as type, - null as name, null as address, - ST_Centroid(linegeo) as centroid - INTO place - FROM location_property_osmline - WHERE place_id = in_place_id - AND in_housenumber between startnumber and endnumber; - END IF; - - --then query tiger data - {% if config.get_bool('USE_US_TIGER_DATA') %} - IF place IS NULL AND in_housenumber >= 0 THEN - SELECT parent_place_id as place_id, 'us' as country_code, - in_housenumber as housenumber, postcode, - 'place' as class, 'house' as type, - null as name, null as address, - ST_Centroid(linegeo) as centroid - INTO place - FROM location_property_tiger - WHERE place_id = in_place_id - AND in_housenumber between startnumber and endnumber; - END IF; - {% endif %} - - -- postcode table - IF place IS NULL THEN - SELECT parent_place_id as place_id, country_code, - null::text as housenumber, postcode, - 'place' as class, 'postcode' as type, - null as name, null as address, - null as centroid - INTO place - FROM location_postcode - WHERE place_id = in_place_id; - END IF; - - -- POI objects in the placex table - IF place IS NULL THEN - SELECT parent_place_id as place_id, country_code, - coalesce(address->'housenumber', - address->'streetnumber', - address->'conscriptionnumber')::text as housenumber, - postcode, - class, type, - name, address, - centroid - INTO place - FROM placex - WHERE place_id = in_place_id and rank_search > 27; - END IF; - - -- If place is still NULL at this point then the object has its own - -- entry in place_address line. However, still check if there is not linked - -- place we should be using instead. - IF place IS NULL THEN - select coalesce(linked_place_id, place_id) as place_id, country_code, - null::text as housenumber, postcode, - class, type, - null as name, address, - null as centroid - INTO place - FROM placex where place_id = in_place_id; - END IF; - ---RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchpostcode; - - -- --- Return the record for the base entry. - - current_rank_address := 1000; - FOR location IN - SELECT placex.place_id, osm_type, osm_id, name, - coalesce(extratags->'linked_place', extratags->'place') as place_type, - class, type, admin_level, - CASE WHEN rank_address = 0 THEN 100 - WHEN rank_address = 11 THEN 5 - ELSE rank_address END as rank_address, - country_code - FROM placex - WHERE place_id = place.place_id - LOOP ---RAISE WARNING '%',location; - -- mix in default names for countries - IF location.rank_address = 4 and place.country_code is not NULL THEN - FOR country IN - SELECT coalesce(name, ''::hstore) as name FROM country_name - WHERE country_code = place.country_code LIMIT 1 - LOOP - place.name := country.name || place.name; - END LOOP; - END IF; - - IF location.rank_address < 4 THEN - -- no country locations for ranks higher than country - place.country_code := NULL::varchar(2); - ELSEIF place.country_code IS NULL AND location.country_code IS NOT NULL THEN - place.country_code := location.country_code; - END IF; - - RETURN NEXT ROW(location.place_id, location.osm_type, location.osm_id, - location.name, location.class, location.type, - location.place_type, - location.admin_level, true, - location.type not in ('postcode', 'postal_code'), - location.rank_address, 0)::addressline; - - current_rank_address := location.rank_address; - END LOOP; - - -- --- Return records for address parts. - - FOR location IN - SELECT placex.place_id, osm_type, osm_id, name, class, type, - coalesce(extratags->'linked_place', extratags->'place') as place_type, - admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress, - CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address, - distance, country_code, postcode - FROM place_addressline join placex on (address_place_id = placex.place_id) - WHERE place_addressline.place_id IN (place.place_id, in_place_id) - AND linked_place_id is null - AND (placex.country_code IS NULL OR place.country_code IS NULL - OR placex.country_code = place.country_code) - ORDER BY rank_address desc, - (place_addressline.place_id = in_place_id) desc, - (CASE WHEN coalesce((avals(name) && avals(place.address)), False) THEN 2 - WHEN isaddress THEN 0 - WHEN fromarea - and place.centroid is not null - and ST_Contains(geometry, place.centroid) THEN 1 - ELSE -1 END) desc, - fromarea desc, distance asc, rank_search desc - LOOP - -- RAISE WARNING '%',location; - location_isaddress := location.rank_address != current_rank_address; - - IF place.country_code IS NULL AND location.country_code IS NOT NULL THEN - place.country_code := location.country_code; - END IF; - IF location.type in ('postcode', 'postal_code') - AND place.postcode is not null - THEN - -- If the place had a postcode assigned, take this one only - -- into consideration when it is an area and the place does not have - -- a postcode itself. - IF location.fromarea AND location_isaddress - AND (place.address is null or not place.address ? 'postcode') - THEN - place.postcode := null; -- remove the less exact postcode - ELSE - location_isaddress := false; - END IF; - END IF; - RETURN NEXT ROW(location.place_id, location.osm_type, location.osm_id, - location.name, location.class, location.type, - location.place_type, - location.admin_level, location.fromarea, - location_isaddress, - location.rank_address, - location.distance)::addressline; - - current_rank_address := location.rank_address; - END LOOP; - - -- If no country was included yet, add the name information from country_name. - IF current_rank_address > 4 THEN - FOR location IN - SELECT name || coalesce(derived_name, ''::hstore) as name FROM country_name - WHERE country_code = place.country_code LIMIT 1 - LOOP ---RAISE WARNING '% % %',current_rank_address,searchcountrycode,countryname; - RETURN NEXT ROW(null, null, null, location.name, 'place', 'country', NULL, - null, true, true, 4, 0)::addressline; - END LOOP; - END IF; - - -- Finally add some artificial rows. - IF place.country_code IS NOT NULL THEN - location := ROW(null, null, null, hstore('ref', place.country_code), - 'place', 'country_code', null, null, true, false, 4, 0)::addressline; - RETURN NEXT location; - END IF; - - IF place.name IS NOT NULL THEN - location := ROW(in_place_id, null, null, place.name, place.class, - place.type, null, null, true, true, 29, 0)::addressline; - RETURN NEXT location; - END IF; - - IF place.housenumber IS NOT NULL THEN - location := ROW(null, null, null, hstore('ref', place.housenumber), - 'place', 'house_number', null, null, true, true, 28, 0)::addressline; - RETURN NEXT location; - END IF; - - IF place.address is not null and place.address ? '_unlisted_place' THEN - RETURN NEXT ROW(null, null, null, hstore('name', place.address->'_unlisted_place'), - 'place', 'locality', null, null, true, true, 25, 0)::addressline; - END IF; - - IF place.postcode is not null THEN - location := ROW(null, null, null, hstore('ref', place.postcode), 'place', - 'postcode', null, null, false, true, 5, 0)::addressline; - RETURN NEXT location; - ELSEIF place.address is not null and place.address ? 'postcode' - and not place.address->'postcode' SIMILAR TO '%(,|;)%' THEN - location := ROW(null, null, null, hstore('ref', place.address->'postcode'), 'place', - 'postcode', null, null, false, true, 5, 0)::addressline; - RETURN NEXT location; - END IF; - - RETURN; -END; -$$ -LANGUAGE plpgsql STABLE PARALLEL SAFE; diff --git a/lib-sql/functions/interpolation.sql b/lib-sql/functions/interpolation.sql index 452ef7c3..7e8877cc 100644 --- a/lib-sql/functions/interpolation.sql +++ b/lib-sql/functions/interpolation.sql @@ -309,7 +309,7 @@ BEGIN IF NEW.startnumber IS NULL THEN NEW.startnumber := startnumber; NEW.endnumber := endnumber; - NEW.linegeo := sectiongeo; + NEW.linegeo := ST_ReducePrecision(sectiongeo, 0.0000001); NEW.postcode := postcode; ELSE INSERT INTO location_property_osmline @@ -317,7 +317,8 @@ BEGIN startnumber, endnumber, step, address, postcode, country_code, geometry_sector, indexed_status) - VALUES (sectiongeo, NEW.partition, NEW.osm_id, NEW.parent_place_id, + VALUES (ST_ReducePrecision(sectiongeo, 0.0000001), + NEW.partition, NEW.osm_id, NEW.parent_place_id, startnumber, endnumber, NEW.step, NEW.address, postcode, NEW.country_code, NEW.geometry_sector, 0); diff --git a/lib-sql/functions/place_triggers.sql b/lib-sql/functions/place_triggers.sql index 5b4a8441..216ab487 100644 --- a/lib-sql/functions/place_triggers.sql +++ b/lib-sql/functions/place_triggers.sql @@ -338,6 +338,11 @@ BEGIN END IF; END IF; + -- When an existing way is updated, recalculate entrances + IF existingplacex.osm_type = 'W' and (existingplacex.rank_search > 27 or existingplacex.class IN ('landuse', 'leisure')) THEN + PERFORM place_update_entrances(existingplacex.place_id, existingplacex.osm_id); + END IF; + -- Abort the insertion (we modified the existing place instead) RETURN NULL; END; diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index 8524ffc3..600ba401 100644 --- a/lib-sql/functions/placex_triggers.sql +++ b/lib-sql/functions/placex_triggers.sql @@ -2,7 +2,7 @@ -- -- This file is part of Nominatim. (https://nominatim.org) -- --- Copyright (C) 2024 by the Nominatim developer community. +-- Copyright (C) 2025 by the Nominatim developer community. -- For a full list of authors see the git log. -- Trigger functions for the placex table. @@ -530,6 +530,7 @@ CREATE OR REPLACE FUNCTION insert_addresslines(obj_place_id BIGINT, AS $$ DECLARE address_havelevel BOOLEAN[]; + place_min_distance FLOAT[]; location_isaddress BOOLEAN; current_boundary GEOMETRY := NULL; @@ -545,6 +546,7 @@ BEGIN nameaddress_vector := '{}'::int[]; address_havelevel := array_fill(false, ARRAY[maxrank]); + place_min_distance := array_fill(1.0, ARRAY[maxrank]); FOR location IN SELECT apl.*, key @@ -575,6 +577,10 @@ BEGIN END IF; END IF; + IF location.isguess and location.distance < place_min_distance[location.rank_address] THEN + place_min_distance[location.rank_address] := location.distance; + END IF; + INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address) VALUES (obj_place_id, location.place_id, not location.isguess, @@ -602,6 +608,16 @@ BEGIN -- If this is the first item in the rank, then assume it is the address. location_isaddress := not address_havelevel[location.rank_address]; + -- Ignore guessed places when they are too far away compared to similar closer ones. + IF location.isguess THEN + CONTINUE WHEN not location_isaddress + AND location.distance > 2 * place_min_distance[location.rank_address]; + + IF location.distance < place_min_distance[location.rank_address] THEN + place_min_distance[location.rank_address] := location.distance; + END IF; + END IF; + -- Further sanity checks to ensure that the address forms a sane hierarchy. IF location_isaddress THEN IF location.isguess and current_node_area is not NULL THEN @@ -638,8 +654,10 @@ BEGIN -- Add it to the list of search terms {% if not db.reverse_only %} - nameaddress_vector := array_merge(nameaddress_vector, - location.keywords::integer[]); + IF location.rank_address != 11 AND location.rank_address != 5 THEN + nameaddress_vector := array_merge(nameaddress_vector, + location.keywords::integer[]); + END IF; {% endif %} INSERT INTO place_addressline (place_id, address_place_id, fromarea, @@ -665,6 +683,11 @@ DECLARE BEGIN {% if debug %}RAISE WARNING '% % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;{% endif %} + IF NEW.class IN ('routing:entrance', 'entrance') THEN + -- We don't need entrance nodes in the placex table. + RETURN NULL; + END IF; + NEW.place_id := nextval('seq_place'); NEW.indexed_status := 1; --STATUS_NEW @@ -730,7 +753,7 @@ BEGIN IF NEW.rank_address between 2 and 27 THEN IF (ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(NEW.geometry)) THEN -- Performance: We just can't handle re-indexing for country level changes - IF (NEW.rank_address < 26 and st_area(NEW.geometry) < 1) + IF (NEW.rank_address < 26 and st_area(NEW.geometry) <= 2) OR (NEW.rank_address >= 26 and st_area(NEW.geometry) < 0.01) THEN -- mark items within the geometry for re-indexing @@ -778,7 +801,7 @@ BEGIN SELECT count(*)>0 FROM pg_tables WHERE tablename = classtable and schemaname = current_schema() INTO result; IF result THEN EXECUTE 'INSERT INTO ' || classtable::regclass || ' (place_id, centroid) VALUES ($1,$2)' - USING NEW.place_id, ST_Centroid(NEW.geometry); + USING NEW.place_id, NEW.centroid; END IF; {% endif %} -- not disable_diff_updates @@ -872,6 +895,11 @@ BEGIN -- Compute a preliminary centroid. NEW.centroid := get_center_point(NEW.geometry); + -- Record the entrance node locations + IF NEW.osm_type = 'W' and (NEW.rank_search > 27 or NEW.class IN ('landuse', 'leisure')) THEN + PERFORM place_update_entrances(NEW.place_id, NEW.osm_id); + END IF; + -- recalculate country and partition IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN -- for countries, believe the mapped country code, @@ -960,9 +988,8 @@ BEGIN WHERE class = 'place' and rank_address between 1 and 23 and prank.address_rank >= NEW.rank_address and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index - and geometry && NEW.geometry - and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test - and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal + and ST_Contains(geometry, NEW.geometry) + and not ST_Equals(geometry, NEW.geometry) ORDER BY prank.address_rank desc LIMIT 1 LOOP NEW.rank_address := location.rank_address + 2; @@ -983,9 +1010,8 @@ BEGIN and rank_address between 1 and 25 -- select right index and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index and prank.address_rank >= NEW.rank_address - and geometry && NEW.geometry - and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test - and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal + and ST_Contains(geometry, NEW.geometry) + and not ST_Equals(geometry, NEW.geometry) ORDER BY prank.address_rank desc LIMIT 1 LOOP NEW.rank_address := location.rank_address + 2; diff --git a/lib-sql/functions/ranking.sql b/lib-sql/functions/ranking.sql index c16ad1db..cee72fcb 100644 --- a/lib-sql/functions/ranking.sql +++ b/lib-sql/functions/ranking.sql @@ -88,6 +88,10 @@ BEGIN area := area / 3; ELSIF country_code IN ('bo', 'ar', 'sd', 'mn', 'in', 'et', 'cd', 'mz', 'ly', 'cl', 'zm') THEN area := area / 2; + ELSIF country_code IN ('sg', 'ws', 'st', 'kn') THEN + area := area * 5; + ELSIF country_code IN ('dm', 'mt', 'lc', 'gg', 'sc', 'nr') THEN + area := area * 20; END IF; IF area > 1 THEN diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql index 30f94080..aea6d296 100644 --- a/lib-sql/functions/utils.sql +++ b/lib-sql/functions/utils.sql @@ -2,7 +2,7 @@ -- -- This file is part of Nominatim. (https://nominatim.org) -- --- Copyright (C) 2022 by the Nominatim developer community. +-- Copyright (C) 2025 by the Nominatim developer community. -- For a full list of authors see the git log. -- Assorted helper functions for the triggers. @@ -14,14 +14,14 @@ DECLARE geom_type TEXT; BEGIN geom_type := ST_GeometryType(place); - IF geom_type = ' ST_Point' THEN + IF geom_type = 'ST_Point' THEN RETURN place; END IF; IF geom_type = 'ST_LineString' THEN - RETURN ST_LineInterpolatePoint(place, 0.5); + RETURN ST_ReducePrecision(ST_LineInterpolatePoint(place, 0.5), 0.0000001); END IF; - RETURN ST_PointOnSurface(place); + RETURN ST_ReducePrecision(ST_PointOnSurface(place), 0.0000001); END; $$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; @@ -623,3 +623,36 @@ BEGIN RETURN NULL; END; $$ LANGUAGE plpgsql; + + +CREATE OR REPLACE FUNCTION place_update_entrances(placeid BIGINT, osmid BIGINT) + RETURNS INTEGER + AS $$ +DECLARE + entrance RECORD; + osm_ids BIGINT[]; +BEGIN + osm_ids := '{}'; + FOR entrance in SELECT osm_id, type, geometry, extratags + FROM place + WHERE osm_type = 'N' + AND osm_id IN (SELECT unnest(nodes) FROM planet_osm_ways WHERE id=osmid) + AND class IN ('routing:entrance', 'entrance') + LOOP + osm_ids := array_append(osm_ids, entrance.osm_id); + INSERT INTO placex_entrance (place_id, osm_id, type, location, extratags) + VALUES (placeid, entrance.osm_id, entrance.type, entrance.geometry, entrance.extratags) + ON CONFLICT (place_id, osm_id) DO UPDATE + SET type = excluded.type, location = excluded.location, extratags = excluded.extratags; + END LOOP; + + IF array_length(osm_ids, 1) > 0 THEN + DELETE FROM placex_entrance WHERE place_id=placeid AND NOT osm_id=ANY(osm_ids); + ELSE + DELETE FROM placex_entrance WHERE place_id=placeid; + END IF; + + RETURN NULL; +END; +$$ +LANGUAGE plpgsql; diff --git a/lib-sql/tables.sql b/lib-sql/tables.sql index cde33952..956009ac 100644 --- a/lib-sql/tables.sql +++ b/lib-sql/tables.sql @@ -244,6 +244,25 @@ CREATE UNIQUE INDEX idx_postcode_id ON location_postcode USING BTREE (place_id) CREATE INDEX idx_postcode_geometry ON location_postcode USING GIST (geometry) {{db.tablespace.address_index}}; GRANT SELECT ON location_postcode TO "{{config.DATABASE_WEBUSER}}" ; +-- Table to store location of entrance nodes +DROP TABLE IF EXISTS placex_entrance; +CREATE TABLE placex_entrance ( + place_id BIGINT NOT NULL, + osm_id BIGINT NOT NULL, + type TEXT NOT NULL, + location GEOMETRY(Point, 4326) NOT NULL, + extratags HSTORE + ); +CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance + USING BTREE (place_id, osm_id) {{db.tablespace.search_index}}; +GRANT SELECT ON placex_entrance TO "{{config.DATABASE_WEBUSER}}" ; + +-- Create an index on the place table for lookups to populate the entrance +-- table +CREATE INDEX IF NOT EXISTS idx_placex_entrance_lookup ON place + USING BTREE (osm_id) + WHERE class IN ('routing:entrance', 'entrance'); + DROP TABLE IF EXISTS import_polygon_error; CREATE TABLE import_polygon_error ( osm_id BIGINT, diff --git a/lib-sql/tokenizer/icu_tokenizer.sql b/lib-sql/tokenizer/icu_tokenizer.sql index f0c30f1b..8cf13120 100644 --- a/lib-sql/tokenizer/icu_tokenizer.sql +++ b/lib-sql/tokenizer/icu_tokenizer.sql @@ -128,16 +128,14 @@ DECLARE partial_terms TEXT[] = '{}'::TEXT[]; term TEXT; term_id INTEGER; - term_count INTEGER; BEGIN SELECT min(word_id) INTO full_token FROM word WHERE word = norm_term and type = 'W'; IF full_token IS NULL THEN full_token := nextval('seq_word'); - INSERT INTO word (word_id, word_token, type, word, info) - SELECT full_token, lookup_term, 'W', norm_term, - json_build_object('count', 0) + INSERT INTO word (word_id, word_token, type, word) + SELECT full_token, lookup_term, 'W', norm_term FROM unnest(lookup_terms) as lookup_term; END IF; @@ -150,14 +148,67 @@ BEGIN partial_tokens := '{}'::INT[]; FOR term IN SELECT unnest(partial_terms) LOOP - SELECT min(word_id), max(info->>'count') INTO term_id, term_count + SELECT min(word_id) INTO term_id + FROM word WHERE word_token = term and type = 'w'; + + IF term_id IS NULL THEN + term_id := nextval('seq_word'); + INSERT INTO word (word_id, word_token, type) + VALUES (term_id, term, 'w'); + END IF; + + partial_tokens := array_merge(partial_tokens, ARRAY[term_id]); + END LOOP; +END; +$$ +LANGUAGE plpgsql; + + +CREATE OR REPLACE FUNCTION getorcreate_full_word(norm_term TEXT, + lookup_terms TEXT[], + lookup_norm_terms TEXT[], + OUT full_token INT, + OUT partial_tokens INT[]) + AS $$ +DECLARE + partial_terms TEXT[] = '{}'::TEXT[]; + term TEXT; + term_id INTEGER; +BEGIN + SELECT min(word_id) INTO full_token + FROM word WHERE word = norm_term and type = 'W'; + + IF full_token IS NULL THEN + full_token := nextval('seq_word'); + IF lookup_norm_terms IS NULL THEN + INSERT INTO word (word_id, word_token, type, word) + SELECT full_token, lookup_term, 'W', norm_term + FROM unnest(lookup_terms) as lookup_term; + ELSE + INSERT INTO word (word_id, word_token, type, word, info) + SELECT full_token, t.lookup, 'W', norm_term, + CASE WHEN norm_term = t.norm THEN null + ELSE json_build_object('lookup', t.norm) END + FROM unnest(lookup_terms, lookup_norm_terms) as t(lookup, norm); + END IF; + END IF; + + FOR term IN SELECT unnest(string_to_array(unnest(lookup_terms), ' ')) LOOP + term := trim(term); + IF NOT (ARRAY[term] <@ partial_terms) THEN + partial_terms := partial_terms || term; + END IF; + END LOOP; + + partial_tokens := '{}'::INT[]; + FOR term IN SELECT unnest(partial_terms) LOOP + SELECT min(word_id) INTO term_id FROM word WHERE word_token = term and type = 'w'; IF term_id IS NULL THEN term_id := nextval('seq_word'); - term_count := 0; - INSERT INTO word (word_id, word_token, type, info) - VALUES (term_id, term, 'w', json_build_object('count', term_count)); + INSERT INTO word (word_id, word_token, type) + VALUES (term_id, term, 'w'); END IF; partial_tokens := array_merge(partial_tokens, ARRAY[term_id]); diff --git a/mkdocs.yml b/mkdocs.yml index 6a24e816..3fd9cd5a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -67,6 +67,7 @@ markdown_extensions: - codehilite - admonition - pymdownx.superfences + - pymdownx.blocks.html - pymdownx.tabbed: alternate_style: true - def_list diff --git a/packaging/nominatim-api/COPYING b/packaging/nominatim-api/COPYING deleted file mode 120000 index 7d29222e..00000000 --- a/packaging/nominatim-api/COPYING +++ /dev/null @@ -1 +0,0 @@ -../../COPYING \ No newline at end of file diff --git a/packaging/nominatim-api/COPYING b/packaging/nominatim-api/COPYING new file mode 100644 index 00000000..f6cdd22a --- /dev/null +++ b/packaging/nominatim-api/COPYING @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . + +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packaging/nominatim-api/pyproject.toml b/packaging/nominatim-api/pyproject.toml index 601029ca..bcaa1ea1 100644 --- a/packaging/nominatim-api/pyproject.toml +++ b/packaging/nominatim-api/pyproject.toml @@ -1,9 +1,9 @@ [project] name = "nominatim-api" -version = "5.0.0.post7" +version = "5.1.0.post20" description = "A tool for building a database of OpenStreetMap for geocoding and for searching the database. Search library." readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.9" license = 'GPL-3.0-or-later' maintainers = [ { name = "Sarah Hoffmann", email = "lonvia@denofr.de" }, @@ -16,9 +16,10 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "SQLAlchemy==2.0.39", - "falcon==4.0.2", - "uvicorn==0.34.0", + "Pygments==2.19.2", + "SQLAlchemy==2.0.43", + "falcon==4.1.0", + "uvicorn==0.35.0", "gunicorn==23.0.0" ] diff --git a/packaging/nominatim-db/COPYING b/packaging/nominatim-db/COPYING deleted file mode 120000 index 7d29222e..00000000 --- a/packaging/nominatim-db/COPYING +++ /dev/null @@ -1 +0,0 @@ -../../COPYING \ No newline at end of file diff --git a/packaging/nominatim-db/COPYING b/packaging/nominatim-db/COPYING new file mode 100644 index 00000000..f6cdd22a --- /dev/null +++ b/packaging/nominatim-db/COPYING @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . + +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packaging/nominatim-db/pyproject.toml b/packaging/nominatim-db/pyproject.toml index 0c9a7055..cc673792 100644 --- a/packaging/nominatim-db/pyproject.toml +++ b/packaging/nominatim-db/pyproject.toml @@ -1,9 +1,9 @@ [project] name = "nominatim-db" -version = "5.0.0.post7" +version = "5.1.0.post20" description = "A tool for building a database of OpenStreetMap for geocoding and for searching the database. Database backend." readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.9" license = 'GPL-3.0-or-later' maintainers = [ { name = "Sarah Hoffmann", email = "lonvia@denofr.de" }, @@ -16,13 +16,13 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "psycopg[binary]==3.2.6", - "python-dotenv==1.0.1", + "psycopg[binary]==3.2.9", + "python-dotenv==1.1.1", "jinja2==3.1.6", "pyYAML==6.0.2", "psutil==7.0.0", - "PyICU==2.14", - "osmium==4.0.2", + "PyICU==2.15.2", + "osmium==4.1.1", ] [project.urls] diff --git a/settings/address-levels.json b/settings/address-levels.json index 1b1ef7e7..eb3f2acd 100644 --- a/settings/address-levels.json +++ b/settings/address-levels.json @@ -21,7 +21,7 @@ "croft" : 20, "subdivision" : 22, "allotments" : 22, - "neighbourhood" : [20, 22], + "neighbourhood" : 24, "quarter" : [20, 22], "isolated_dwelling" : [22, 25], "farm" : [22, 25], @@ -48,14 +48,14 @@ "" : [25, 0] }, "landuse" : { - "residential" : 22, - "farm" : 22, - "farmyard" : 22, - "industrial" : 22, - "commercial" : 22, - "allotments" : 22, - "retail" : 22, - "" : [22, 0] + "residential" : 24, + "farm" : 24, + "farmyard" : 24, + "industrial" : 24, + "commercial" : 24, + "allotments" : 24, + "retail" : 24, + "" : [24, 0] }, "leisure" : { "park" : [24, 0] @@ -236,6 +236,17 @@ "administrative11" : 20 } } +}, +{ "countries" : ["jp"], + "tags" : { + "boundary" : { + "administrative7" : 16, + "administrative8" : 18, + "administrative9" : 20, + "administrative10" : 22, + "administrative11" : 24 + } + } } ] diff --git a/settings/country-names/ad.yaml b/settings/country-names/ad.yaml index 4ade5670..c93e1fb7 100644 --- a/settings/country-names/ad.yaml +++ b/settings/country-names/ad.yaml @@ -97,7 +97,6 @@ name: na: Andorra ne: एण्डोरा nl: Andorra - nn: Andorra "no": Andorra nv: Andówa oc: Andòrra diff --git a/settings/country-names/ae.yaml b/settings/country-names/ae.yaml index ede35e0d..f7afd903 100644 --- a/settings/country-names/ae.yaml +++ b/settings/country-names/ae.yaml @@ -74,6 +74,7 @@ name: mt: Emirati Għarab Magħquda my: အာရပ်စော်ဘွားများပြည်ထောင်စုနိုင်ငံ na: Emireitit Arabiya + nb: De forente arabiske emirater ne: संयुक्त अरब इमिरेट्स nl: Verenigde Arabische Emiraten nn: Dei sameinte arabiske emirata diff --git a/settings/country-names/af.yaml b/settings/country-names/af.yaml index 2f233de6..57aca0e8 100644 --- a/settings/country-names/af.yaml +++ b/settings/country-names/af.yaml @@ -96,7 +96,6 @@ name: na: Apeganitan ne: अफगानिस्तान nl: Afghanistan - nn: Afghanistan "no": Afghanistan oc: Afganistan om: Afgaanistaan diff --git a/settings/country-names/ag.yaml b/settings/country-names/ag.yaml index 1035946e..4661c714 100644 --- a/settings/country-names/ag.yaml +++ b/settings/country-names/ag.yaml @@ -86,10 +86,8 @@ name: mt: Antigwa u Barbuda my: အင်တီဂွါနှင့် ဘာဘူဒါ na: Antigua me Barbuda - nb: Antigua og Barbuda ne: एन्टिगुआ र बर्बुडा nl: Antigua en Barbuda - nn: Antigua og Barbuda "no": Antigua og Barbuda nv: Antíígwa dóó Hashkʼaan Bikéyah Yázhí oc: Antigua e Barbuda diff --git a/settings/country-names/ai.yaml b/settings/country-names/ai.yaml index 32fa3d3c..33cb5edb 100644 --- a/settings/country-names/ai.yaml +++ b/settings/country-names/ai.yaml @@ -50,7 +50,6 @@ name: ms: Anguilla ne: एन्गुला nl: Anguilla - nn: Anguilla "no": Anguilla oc: Anguilla pa: ਐਂਗੁਈਲਾ diff --git a/settings/country-names/al.yaml b/settings/country-names/al.yaml index bdd6b11a..10a4157f 100644 --- a/settings/country-names/al.yaml +++ b/settings/country-names/al.yaml @@ -101,7 +101,6 @@ name: na: Arbainiya ne: अल्बानिया nl: Albanië - nn: Albania "no": Albania nv: Dziłigaii Bikéyah oc: Albania diff --git a/settings/country-names/am.yaml b/settings/country-names/am.yaml index 9a1e9688..4cf59362 100644 --- a/settings/country-names/am.yaml +++ b/settings/country-names/am.yaml @@ -99,7 +99,6 @@ name: na: Arminiya ne: आर्मेनिया nl: Armenië - nn: Armenia "no": Armenia nv: Aooméénii Bikéyah oc: Armenia diff --git a/settings/country-names/ao.yaml b/settings/country-names/ao.yaml index 813e88e3..058b8bd8 100644 --- a/settings/country-names/ao.yaml +++ b/settings/country-names/ao.yaml @@ -90,7 +90,6 @@ name: na: Angora ne: अंगोला nl: Angola - nn: Angola "no": Angola nv: Angóola ny: Angola diff --git a/settings/country-names/ar.yaml b/settings/country-names/ar.yaml index 3054ff5a..ef2d77fc 100644 --- a/settings/country-names/ar.yaml +++ b/settings/country-names/ar.yaml @@ -99,7 +99,6 @@ name: na: Ardjentina ne: अर्जेन्टिना nl: Argentinië - nn: Argentina "no": Argentina nv: Béésh Łigaii Bikéyah oc: Argentina diff --git a/settings/country-names/at.yaml b/settings/country-names/at.yaml index 3b50922a..c88d88d7 100644 --- a/settings/country-names/at.yaml +++ b/settings/country-names/at.yaml @@ -93,6 +93,7 @@ name: mt: Awstrija my: သြစတြီးယားနိုင်ငံ na: Oteriya + nb: Østerrike ne: अष्ट्रीया nl: Oostenrijk nn: Austerrike diff --git a/settings/country-names/au.yaml b/settings/country-names/au.yaml index 96e4a4b0..f1b8897d 100644 --- a/settings/country-names/au.yaml +++ b/settings/country-names/au.yaml @@ -94,7 +94,6 @@ name: na: Otereiriya ne: अष्ट्रेलिया nl: Australië - nn: Australia "no": Australia nv: Nahatʼeʼiitsoh Bikéyah oc: Austràlia diff --git a/settings/country-names/az.yaml b/settings/country-names/az.yaml index f2cf417d..c96abe79 100644 --- a/settings/country-names/az.yaml +++ b/settings/country-names/az.yaml @@ -96,10 +96,8 @@ name: mt: Ażerbajġan my: အဇာဘိုင်ဂျန်နိုင်ငံ na: Aderbaidjan - nb: Aserbajdsjan ne: अजरबैजान nl: Azerbeidzjan - nn: Aserbajdsjan "no": Aserbajdsjan nv: Azééwii Bikéyah ny: Azerbaijan diff --git a/settings/country-names/ba.yaml b/settings/country-names/ba.yaml index bc3c1db0..d6b48fcb 100644 --- a/settings/country-names/ba.yaml +++ b/settings/country-names/ba.yaml @@ -94,7 +94,6 @@ name: na: Boteniya me Erdegobina ne: बोस्निया र हर्जगोभिना nl: Bosnië en Herzegovina - nn: Bosnia-Hercegovina "no": Bosnia-Hercegovina nv: Bosna dóó Hetsog Bikéyah oc: Bòsnia e Ercegovina diff --git a/settings/country-names/bb.yaml b/settings/country-names/bb.yaml index 7ad86343..abe512db 100644 --- a/settings/country-names/bb.yaml +++ b/settings/country-names/bb.yaml @@ -77,7 +77,6 @@ name: na: Barbadot ne: बार्बाडोस nl: Barbados - nn: Barbados "no": Barbados oc: Barbados om: Baarbeedoos diff --git a/settings/country-names/bd.yaml b/settings/country-names/bd.yaml index 07931411..284fad2a 100644 --- a/settings/country-names/bd.yaml +++ b/settings/country-names/bd.yaml @@ -29,6 +29,7 @@ name: lt: Bangladešas lv: Bangladeša mn: Бангладеш + "no": Bangladesh pl: Bangladesz pt: Bangladesh ru: Бангладеш diff --git a/settings/country-names/be.yaml b/settings/country-names/be.yaml index e1b85f6b..12107540 100644 --- a/settings/country-names/be.yaml +++ b/settings/country-names/be.yaml @@ -95,10 +95,8 @@ name: mt: Belġju my: ဘယ်လ်ဂျီယမ်နိုင်ငံ na: Berdjiyum - nb: Belgia ne: बेल्जियम nl: België - nn: Belgia "no": Belgia oc: Belgica om: Beeljiyeem diff --git a/settings/country-names/bf.yaml b/settings/country-names/bf.yaml index ddffe33d..c1e0b8db 100644 --- a/settings/country-names/bf.yaml +++ b/settings/country-names/bf.yaml @@ -88,7 +88,6 @@ name: na: Burkinabato ne: बुर्किना फासो nl: Burkina Faso - nn: Burkina Faso "no": Burkina Faso oc: Burkina Faso om: Burkinaa Faasoo diff --git a/settings/country-names/bg.yaml b/settings/country-names/bg.yaml index cc9fd51f..882e59c7 100644 --- a/settings/country-names/bg.yaml +++ b/settings/country-names/bg.yaml @@ -93,7 +93,6 @@ name: na: Borgeriya ne: बुल्गेरिया nl: Bulgarije - nn: Bulgaria "no": Bulgaria nv: Bálgaa Bikéyah oc: Bulgaria diff --git a/settings/country-names/bh.yaml b/settings/country-names/bh.yaml index 9aafc01a..d41ad58c 100644 --- a/settings/country-names/bh.yaml +++ b/settings/country-names/bh.yaml @@ -91,7 +91,6 @@ name: na: Bahrain ne: बहराइन nl: Bahrein - nn: Bahrain "no": Bahrain oc: Bahrayn om: Baahireen diff --git a/settings/country-names/bi.yaml b/settings/country-names/bi.yaml index ef5f8434..3fd42c2f 100644 --- a/settings/country-names/bi.yaml +++ b/settings/country-names/bi.yaml @@ -88,7 +88,6 @@ name: na: Burundi ne: बुरूण्डी nl: Burundi - nn: Burundi "no": Burundi oc: Burundi om: Buruundii diff --git a/settings/country-names/bj.yaml b/settings/country-names/bj.yaml index d6a65e2e..c67006c2 100644 --- a/settings/country-names/bj.yaml +++ b/settings/country-names/bj.yaml @@ -91,7 +91,6 @@ name: na: Benin ne: बेनिन nl: Benin - nn: Benin "no": Benin oc: Benin om: Beeniin diff --git a/settings/country-names/bm.yaml b/settings/country-names/bm.yaml index a7eb8ef9..38eca86c 100644 --- a/settings/country-names/bm.yaml +++ b/settings/country-names/bm.yaml @@ -25,6 +25,7 @@ name: lv: Bermudu salas mk: Бермуда mn: Бермудын Арал + "no": Bermuda oc: Bermudas pl: Bermudy pt: Bermudas diff --git a/settings/country-names/bn.yaml b/settings/country-names/bn.yaml index 1078a961..dc67d9db 100644 --- a/settings/country-names/bn.yaml +++ b/settings/country-names/bn.yaml @@ -91,7 +91,6 @@ name: na: Brunei ne: ब्रुनेई nl: Brunei - nn: Brunei "no": Brunei ny: Brunei oc: Brunei diff --git a/settings/country-names/bo.yaml b/settings/country-names/bo.yaml index 87996a22..f3de0253 100644 --- a/settings/country-names/bo.yaml +++ b/settings/country-names/bo.yaml @@ -94,7 +94,6 @@ name: na: Boribiya ne: बोलिभिया nl: Bolivia - nn: Bolivia "no": Bolivia nv: Bolíbiya oc: Bolívia diff --git a/settings/country-names/br.yaml b/settings/country-names/br.yaml index 5600bc52..0c35d259 100644 --- a/settings/country-names/br.yaml +++ b/settings/country-names/br.yaml @@ -99,7 +99,6 @@ name: na: Bradir ne: ब्राजिल nl: Brazilië - nn: Brasil "no": Brasil nv: Bwazííl oc: Brasil diff --git a/settings/country-names/bs.yaml b/settings/country-names/bs.yaml index dcfe0fca..222fdaf8 100644 --- a/settings/country-names/bs.yaml +++ b/settings/country-names/bs.yaml @@ -85,7 +85,6 @@ name: na: Bahamat ne: बहामस nl: Bahama's - nn: Bahamas "no": Bahamas oc: Las Bahamas om: Bahamaas diff --git a/settings/country-names/bt.yaml b/settings/country-names/bt.yaml index d921a670..f861e3cf 100644 --- a/settings/country-names/bt.yaml +++ b/settings/country-names/bt.yaml @@ -92,7 +92,6 @@ name: na: Butan ne: भूटान nl: Bhutan - nn: Bhutan "no": Bhutan nv: Bikéyah oc: Botan diff --git a/settings/country-names/bw.yaml b/settings/country-names/bw.yaml index 74d11880..856d3a0f 100644 --- a/settings/country-names/bw.yaml +++ b/settings/country-names/bw.yaml @@ -90,7 +90,6 @@ name: na: Botwana ne: बोत्स्वाना nl: Botswana - nn: Botswana "no": Botswana nv: Tswana Dineʼé Bikéyah oc: Botswana diff --git a/settings/country-names/by.yaml b/settings/country-names/by.yaml index 8cb34c56..5257aec7 100644 --- a/settings/country-names/by.yaml +++ b/settings/country-names/by.yaml @@ -83,8 +83,7 @@ name: na: Berarut ne: बेलारुस nl: Wit-Rusland - nn: Kviterussland - "no": Hviterussland + "no": Belarus oc: Bielorussia or: ବେଲାଋଷ os: Белорусси diff --git a/settings/country-names/bz.yaml b/settings/country-names/bz.yaml index c381f012..e6d5d080 100644 --- a/settings/country-names/bz.yaml +++ b/settings/country-names/bz.yaml @@ -85,7 +85,6 @@ name: na: Berij ne: बेलिज nl: Belize - nn: Belize "no": Belize oc: Belize om: Beliiz diff --git a/settings/country-names/ca.yaml b/settings/country-names/ca.yaml index eaa86a26..7350aa78 100644 --- a/settings/country-names/ca.yaml +++ b/settings/country-names/ca.yaml @@ -94,7 +94,6 @@ name: na: Kanada ne: क्यानाडा nl: Canada - nn: Canada "no": Canada nv: Deeteel Bikéyah oc: Canadà diff --git a/settings/country-names/cd.yaml b/settings/country-names/cd.yaml index 69d4f5dd..e5c62097 100644 --- a/settings/country-names/cd.yaml +++ b/settings/country-names/cd.yaml @@ -74,7 +74,6 @@ name: na: Ripubrikit Engame Kongo ne: प्रजातान्त्रिक गणतन्त्र कंगो nl: Democratische Republiek Congo - nn: Den demokratiske republikken Kongo "no": Den demokratiske republikken Kongo nv: Kéyah Káango Shádiʼááhjí Siʼánígíí oc: Republica Democratica de Còngo diff --git a/settings/country-names/cf.yaml b/settings/country-names/cf.yaml index 22a17fdb..c0c996ef 100644 --- a/settings/country-names/cf.yaml +++ b/settings/country-names/cf.yaml @@ -72,6 +72,7 @@ name: mt: Repubblika Ċentru-Afrikana my: ဗဟိုအာဖရိကသမ္မတနိုင်ငံ na: Ripubrikin Aprika Yugaga + nb: Den sentralafrikanske republikk ne: मध्य अफ्रिकी गणतन्त्र nl: Centraal-Afrikaanse Republiek nn: Den sentralafrikanske republikken diff --git a/settings/country-names/cg.yaml b/settings/country-names/cg.yaml index a2791122..e0590efb 100644 --- a/settings/country-names/cg.yaml +++ b/settings/country-names/cg.yaml @@ -70,7 +70,6 @@ name: na: Ripubrikin Kongo ne: कङ्गो nl: Congo-Brazzaville - nn: Kongo-Brazzaville "no": Republikken Kongo nv: Kéyah Káango Náhookǫsjí Siʼánígíí oc: Republica de Còngo diff --git a/settings/country-names/ch.yaml b/settings/country-names/ch.yaml index 0fa5820f..eb034d9b 100644 --- a/settings/country-names/ch.yaml +++ b/settings/country-names/ch.yaml @@ -84,7 +84,6 @@ name: na: Switzerland ne: स्विजरल्याण्ड nl: Zwitserland - nn: Sveits "no": Sveits nv: Swis Bikéyah oc: Soïssa diff --git a/settings/country-names/ci.yaml b/settings/country-names/ci.yaml index 684fb05e..a83eb741 100644 --- a/settings/country-names/ci.yaml +++ b/settings/country-names/ci.yaml @@ -75,6 +75,7 @@ name: mt: Kosta tal-Avorju my: အိုင်ဗရီကို့စ်နိုင်ငံ na: Aibori Kot + nb: Elfenbenskysten ne: आइभरी कोस्ट nl: Ivoorkust nn: Elfenbeinskysten diff --git a/settings/country-names/ck.yaml b/settings/country-names/ck.yaml index 51decfbf..9c822c58 100644 --- a/settings/country-names/ck.yaml +++ b/settings/country-names/ck.yaml @@ -79,6 +79,7 @@ name: ms: Kepulauan Cook mt: Gżejjer Cook my: ကွတ် ကျွန်းစု + nb: Cookøyene ne: कुक टापु nl: Cookeilanden nn: Cookøyane diff --git a/settings/country-names/cl.yaml b/settings/country-names/cl.yaml index b5e5bf9a..c7d5e827 100644 --- a/settings/country-names/cl.yaml +++ b/settings/country-names/cl.yaml @@ -103,7 +103,6 @@ name: na: Tsire ne: चिली nl: Chili - nn: Chile "no": Chile nv: Chíilii ny: Chile diff --git a/settings/country-names/cm.yaml b/settings/country-names/cm.yaml index d928abab..304ea2dd 100644 --- a/settings/country-names/cm.yaml +++ b/settings/country-names/cm.yaml @@ -79,7 +79,6 @@ name: na: Kamerun ne: क्यामेरून nl: Kameroen - nn: Kamerun "no": Kamerun nv: Táłtłʼááh Chʼosh Daadánígíí Bitooh oc: Cameron diff --git a/settings/country-names/cn.yaml b/settings/country-names/cn.yaml index 20981086..93cc4c17 100644 --- a/settings/country-names/cn.yaml +++ b/settings/country-names/cn.yaml @@ -101,10 +101,8 @@ name: mt: Ċina my: တရုတ် na: Tsiene - nb: Kina ne: चीन nl: China - nn: Kina "no": Kina nv: Tsiiʼyishbizhí Dineʼé Bikéyah ny: China diff --git a/settings/country-names/co.yaml b/settings/country-names/co.yaml index e65a86d4..8e8fc649 100644 --- a/settings/country-names/co.yaml +++ b/settings/country-names/co.yaml @@ -82,7 +82,6 @@ name: na: Korombiya ne: कोलम्बिया nl: Colombia - nn: Colombia "no": Colombia nv: Kolámbiya oc: Colómbia diff --git a/settings/country-names/cr.yaml b/settings/country-names/cr.yaml index e2609b87..9474cf06 100644 --- a/settings/country-names/cr.yaml +++ b/settings/country-names/cr.yaml @@ -81,7 +81,6 @@ name: na: Kosta Rika ne: कोस्टारिका nl: Costa Rica - nn: Costa Rica "no": Costa Rica oc: Còsta Rica om: Kostaa Rikaa diff --git a/settings/country-names/cu.yaml b/settings/country-names/cu.yaml index 58d3d10c..08b5cfc4 100644 --- a/settings/country-names/cu.yaml +++ b/settings/country-names/cu.yaml @@ -78,7 +78,6 @@ name: na: Kiuba ne: क्युबा nl: Cuba - nn: Cuba "no": Cuba nv: Kyóoba oc: Cuba diff --git a/settings/country-names/cv.yaml b/settings/country-names/cv.yaml index 51a07a30..f79bc6f5 100644 --- a/settings/country-names/cv.yaml +++ b/settings/country-names/cv.yaml @@ -36,6 +36,7 @@ name: mk: Зелен ’Рт mn: Кабо-Верде nl: Kaapverdië + "no": Kapp Verde pl: Republika Zielonego Przylądka pt: Cabo Verde ru: Кабо-Верде diff --git a/settings/country-names/cy.yaml b/settings/country-names/cy.yaml index 001ae3b9..d1853847 100644 --- a/settings/country-names/cy.yaml +++ b/settings/country-names/cy.yaml @@ -77,10 +77,8 @@ name: mt: Ċipru my: ဆိုက်ပရပ်စ်နိုင်ငံ na: Taiprus - nb: Kypros ne: साइप्रस nl: Cyprus - nn: Kypros "no": Kypros nv: Béésh Łichíiʼii Bikéyah oc: Chipre diff --git a/settings/country-names/cz.yaml b/settings/country-names/cz.yaml index c22134a2..3f2eb287 100644 --- a/settings/country-names/cz.yaml +++ b/settings/country-names/cz.yaml @@ -93,7 +93,6 @@ name: na: Ripubrikin Tsiek ne: चेक गणतन्त्र nl: Tsjechië - nn: Tsjekkia "no": Tsjekkia nv: Chek Bikéyah oc: Republica Chèca diff --git a/settings/country-names/de.yaml b/settings/country-names/de.yaml index 58b4f6d2..e092e0fb 100644 --- a/settings/country-names/de.yaml +++ b/settings/country-names/de.yaml @@ -99,7 +99,6 @@ name: na: Djermani ne: जर्मनी nl: Duitsland - nn: Tyskland "no": Tyskland nv: Béésh Bichʼahii Bikéyah oc: Alemanha diff --git a/settings/country-names/dj.yaml b/settings/country-names/dj.yaml index 9a205788..1eb50aa5 100644 --- a/settings/country-names/dj.yaml +++ b/settings/country-names/dj.yaml @@ -74,7 +74,6 @@ name: na: Djibuti ne: जिबुटी nl: Djibouti - nn: Djibouti "no": Djibouti nv: Jibótii oc: Jiboti diff --git a/settings/country-names/dk.yaml b/settings/country-names/dk.yaml index aed63702..705c4201 100644 --- a/settings/country-names/dk.yaml +++ b/settings/country-names/dk.yaml @@ -85,7 +85,6 @@ name: na: Denemark ne: डेनमार्क nl: Denemarken - nn: Danmark "no": Danmark nv: Déinish Dineʼé Bikéyah oc: Danemarc diff --git a/settings/country-names/dm.yaml b/settings/country-names/dm.yaml index 2dbc01e2..6e7fc8ed 100644 --- a/settings/country-names/dm.yaml +++ b/settings/country-names/dm.yaml @@ -28,6 +28,7 @@ name: lv: Dominika mn: Доминика nl: Dominica + "no": Dominica pl: Dominika pt: Dominica ru: Доминика diff --git a/settings/country-names/do.yaml b/settings/country-names/do.yaml index 4668450e..4c180f17 100644 --- a/settings/country-names/do.yaml +++ b/settings/country-names/do.yaml @@ -69,6 +69,7 @@ name: mt: Repubblika Dominikana my: ဒိုမီနီကန်သမ္မတနိုင်ငံ na: Ripubrikin Dominika + nb: Den dominikanske republikk ne: डोमिनिकन गणतन्त्र nl: Dominicaanse Republiek nn: Den dominikanske republikken diff --git a/settings/country-names/dz.yaml b/settings/country-names/dz.yaml index 86961365..fb92c59a 100644 --- a/settings/country-names/dz.yaml +++ b/settings/country-names/dz.yaml @@ -93,7 +93,6 @@ name: na: Ardjiriya ne: अल्जेरिया nl: Algerije - nn: Algerie "no": Algerie nv: Aljííya ny: Algeria diff --git a/settings/country-names/ec.yaml b/settings/country-names/ec.yaml index 72b44eaf..e9902cbc 100644 --- a/settings/country-names/ec.yaml +++ b/settings/country-names/ec.yaml @@ -77,7 +77,6 @@ name: na: Ekwador ne: इक्वेडर nl: Ecuador - nn: Ecuador "no": Ecuador nv: Kéyah Nahasdzáán Ałníiʼgi Siʼánígíí oc: Eqüator diff --git a/settings/country-names/ee.yaml b/settings/country-names/ee.yaml index 766fd43d..5ff0b48f 100644 --- a/settings/country-names/ee.yaml +++ b/settings/country-names/ee.yaml @@ -85,7 +85,6 @@ name: na: Etoniya ne: इस्टोनिया nl: Estland - nn: Estland "no": Estland nv: Ééstii Bikéyah oc: Estònia diff --git a/settings/country-names/eg.yaml b/settings/country-names/eg.yaml index d49b24b2..f0cff5fe 100644 --- a/settings/country-names/eg.yaml +++ b/settings/country-names/eg.yaml @@ -97,7 +97,6 @@ name: na: Idjipt ne: मिश्र nl: Egypte - nn: Egypt "no": Egypt nv: Ííjip oc: Egipte diff --git a/settings/country-names/eh.yaml b/settings/country-names/eh.yaml index 0f28bfd1..f0258106 100644 --- a/settings/country-names/eh.yaml +++ b/settings/country-names/eh.yaml @@ -10,7 +10,10 @@ name: fr: République arabe sahraouie démocratique it: Repubblica Araba Democratica dei Sahrawi lt: Sacharos Arabų Demokratinė Respublika + nb: Den saharawiske arabiske demokratiske republikk nl: Arabische Democratische Republiek Sahara + nn: Den saharawiske arabiske demokratiske republikken + "no": Den saharawiske arabiske demokratiske republikk pt: República Árabe Saaraui Democrática ru: Сахарская Арабская Демократическая Республика ur: صحراوی عرب عوامی جمہوریہ diff --git a/settings/country-names/er.yaml b/settings/country-names/er.yaml index a223f46e..f9fa276e 100644 --- a/settings/country-names/er.yaml +++ b/settings/country-names/er.yaml @@ -77,7 +77,6 @@ name: na: Eritrea ne: एरिट्रिया nl: Eritrea - nn: Eritrea "no": Eritrea oc: Eritrèa om: Eritrea diff --git a/settings/country-names/es.yaml b/settings/country-names/es.yaml index 47e051de..b5e334c7 100644 --- a/settings/country-names/es.yaml +++ b/settings/country-names/es.yaml @@ -88,10 +88,8 @@ name: mt: Spanja my: စပိန်နိုင်ငံ na: Pain - nb: Spania ne: स्पेन nl: Spanje - nn: Spania "no": Spania nv: Dibé Diníí Bikéyah oc: Espanha diff --git a/settings/country-names/et.yaml b/settings/country-names/et.yaml index 66e18129..4f809927 100644 --- a/settings/country-names/et.yaml +++ b/settings/country-names/et.yaml @@ -92,7 +92,6 @@ name: na: Itiyopiya ne: इथियोपिया nl: Ethiopië - nn: Etiopia "no": Etiopia nv: Iithiyópya oc: Etiopia diff --git a/settings/country-names/fi.yaml b/settings/country-names/fi.yaml index c7c36329..63af8c83 100644 --- a/settings/country-names/fi.yaml +++ b/settings/country-names/fi.yaml @@ -92,7 +92,6 @@ name: na: Finland ne: फिनल्याण्ड nl: Finland - nn: Finland "no": Finland nv: Nahoditsʼǫʼłání oc: Finlàndia diff --git a/settings/country-names/fj.yaml b/settings/country-names/fj.yaml index 8d2b6809..3c777bd1 100644 --- a/settings/country-names/fj.yaml +++ b/settings/country-names/fj.yaml @@ -73,7 +73,6 @@ name: na: Bidji ne: फिजी nl: Fiji - nn: Fiji "no": Fiji nv: Fííjii oc: Fiji diff --git a/settings/country-names/fk.yaml b/settings/country-names/fk.yaml index a7bae933..7b1dc285 100644 --- a/settings/country-names/fk.yaml +++ b/settings/country-names/fk.yaml @@ -68,6 +68,7 @@ name: ms: Kepulauan Falkland (Islas Malvinas) mt: Falkland Islands my: ဖောက်ကလန် ကျွန်းစု + nb: Falklandsøyene ne: फक्ल्याण्ड टापुहरू (इज्लास माल्भिनास) nl: Falklandeilanden nn: Falklandsøyane diff --git a/settings/country-names/fm.yaml b/settings/country-names/fm.yaml index f49daa5b..5efd08ab 100644 --- a/settings/country-names/fm.yaml +++ b/settings/country-names/fm.yaml @@ -31,7 +31,7 @@ name: lv: Mikronēzija mn: Микронези nl: Micronesia - "no": Mikronesia + "no": Mikronesiaføderasjonen oc: Estats Federats de Micronesia pl: Mikronezja ru: Федеративные Штаты Микронезии diff --git a/settings/country-names/fo.yaml b/settings/country-names/fo.yaml index 11129fad..80fa1f06 100644 --- a/settings/country-names/fo.yaml +++ b/settings/country-names/fo.yaml @@ -63,6 +63,7 @@ name: mr: फेरो द्वीपसमूह ms: Kepulauan Faroe mt: Gżejjer Faroe + nb: Færøyene ne: फरोइ टापु nl: Faeröer nn: Færøyane diff --git a/settings/country-names/fr.yaml b/settings/country-names/fr.yaml index b1a10465..29038843 100644 --- a/settings/country-names/fr.yaml +++ b/settings/country-names/fr.yaml @@ -96,7 +96,6 @@ name: na: Prant ne: फ्रान्स nl: Frankrijk - nn: Frankrike "no": Frankrike nv: Dáághahii Dineʼé Bikéyah oc: França diff --git a/settings/country-names/ga.yaml b/settings/country-names/ga.yaml index 314ecb84..60697a27 100644 --- a/settings/country-names/ga.yaml +++ b/settings/country-names/ga.yaml @@ -77,7 +77,6 @@ name: na: Gabun ne: गाबोन nl: Gabon - nn: Gabon "no": Gabon nv: Gabǫ́ǫ́ oc: Gabon diff --git a/settings/country-names/gb.yaml b/settings/country-names/gb.yaml index c3bcb711..1baedd3a 100644 --- a/settings/country-names/gb.yaml +++ b/settings/country-names/gb.yaml @@ -98,7 +98,6 @@ name: na: Ingerand ne: संयुक्त अधिराज्य nl: Verenigd Koninkrijk - nn: Storbritannia "no": Storbritannia nv: Tótaʼ Dineʼé Bikéyah oc: Reialme Unit diff --git a/settings/country-names/gd.yaml b/settings/country-names/gd.yaml index 23806e16..fb360aa2 100644 --- a/settings/country-names/gd.yaml +++ b/settings/country-names/gd.yaml @@ -27,6 +27,7 @@ name: lv: Grenāda mn: Гренада nl: Grenada + "no": Grenada pl: Granada pt: Granada ru: Гренада diff --git a/settings/country-names/ge.yaml b/settings/country-names/ge.yaml index 20066f8d..f0494b29 100644 --- a/settings/country-names/ge.yaml +++ b/settings/country-names/ge.yaml @@ -78,7 +78,6 @@ name: na: Djiordjiya ne: जर्जिया (देश) nl: Georgië - nn: Georgia "no": Georgia nv: Jóojah (Kéyah) oc: Georgia (Caucàs) diff --git a/settings/country-names/gg.yaml b/settings/country-names/gg.yaml index e035f2c1..efd21bab 100644 --- a/settings/country-names/gg.yaml +++ b/settings/country-names/gg.yaml @@ -55,7 +55,6 @@ name: ms: Guernsey ne: गुर्न्जी nl: Guernsey - nn: Guernsey "no": Guernsey oc: Guernesey os: Гернси diff --git a/settings/country-names/gh.yaml b/settings/country-names/gh.yaml index cbbc7162..7acfea51 100644 --- a/settings/country-names/gh.yaml +++ b/settings/country-names/gh.yaml @@ -83,7 +83,6 @@ name: na: Gana ne: घाना nl: Ghana - nn: Ghana "no": Ghana nv: Gáana oc: Ghana diff --git a/settings/country-names/gi.yaml b/settings/country-names/gi.yaml index dec3822e..201e15e0 100644 --- a/settings/country-names/gi.yaml +++ b/settings/country-names/gi.yaml @@ -63,7 +63,6 @@ name: my: ဂျီဘရော်လ်တာ ne: गिब्राल्टार nl: Gibraltar - nn: Gibraltar "no": Gibraltar oc: Gibartar or: ଜିବ୍ରାଲେଟର diff --git a/settings/country-names/gl.yaml b/settings/country-names/gl.yaml index 14a595f5..ebb0d735 100644 --- a/settings/country-names/gl.yaml +++ b/settings/country-names/gl.yaml @@ -72,7 +72,6 @@ name: my: ဂရင်းလန်ကျွန်း ne: ग्रीनल्याण्ड nl: Groenland - nn: Grønland "no": Grønland nv: Haʼaʼaahjí Hakʼaz Dineʼé Bikéyah oc: Groenlàndia diff --git a/settings/country-names/gm.yaml b/settings/country-names/gm.yaml index af315bcc..86292ebd 100644 --- a/settings/country-names/gm.yaml +++ b/settings/country-names/gm.yaml @@ -75,10 +75,8 @@ name: mt: Gambja my: ဂမ်ဘီယာနိုင်ငံ na: Gambiya - nb: Gambia ne: गाम्बिया nl: Gambia - nn: Gambia "no": Gambia nv: Géémbiya oc: Gàmbia diff --git a/settings/country-names/gn.yaml b/settings/country-names/gn.yaml index b25f68e7..48239910 100644 --- a/settings/country-names/gn.yaml +++ b/settings/country-names/gn.yaml @@ -76,7 +76,6 @@ name: na: Gini ne: गिनी nl: Guinee - nn: Guinea "no": Guinea nv: Gíní oc: Guinèa diff --git a/settings/country-names/gq.yaml b/settings/country-names/gq.yaml index 9b3248f9..236a8bb3 100644 --- a/settings/country-names/gq.yaml +++ b/settings/country-names/gq.yaml @@ -87,10 +87,8 @@ name: mt: Gwinea Ekwatorjali my: အီကွေတာဂီနီနိုင်ငံ na: Gini t Ekwador - nb: Ekvatorial-Guinea ne: इक्वेटोरियल गिनी nl: Equatoriaal Guinee - nn: Ekvatorial-Guinea "no": Ekvatorial-Guinea nv: Gíní Nahasdzáán Ałníiʼgi Siʼánígíí oc: Guinèa Eqüatoriala diff --git a/settings/country-names/gr.yaml b/settings/country-names/gr.yaml index 9dfcb8d0..623a0c76 100644 --- a/settings/country-names/gr.yaml +++ b/settings/country-names/gr.yaml @@ -88,7 +88,6 @@ name: na: Grit ne: ग्रीस nl: Griekenland - nn: Hellas "no": Hellas nv: Gwíík Dineʼé Bikéyah oc: Grècia diff --git a/settings/country-names/gs.yaml b/settings/country-names/gs.yaml index e625e959..9372a857 100644 --- a/settings/country-names/gs.yaml +++ b/settings/country-names/gs.yaml @@ -39,6 +39,7 @@ name: mk: Јужна Џорџија и Јужни Сендвички Острови mr: साउथ जॉर्जिया व साउथ सँडविच द्वीपसमूह ms: Georgia Selatan dan Kepulauan Sandwich Selatan + nb: Sør-Georgia og Sør-Sandwichøyene nl: Zuid-Georgia en de Zuidelijke Sandwicheilanden nn: Sør-Georgia og Sør-Sandwichøyane "no": Sør-Georgia og Sør-Sandwichøyene diff --git a/settings/country-names/gt.yaml b/settings/country-names/gt.yaml index 3cc1f208..4d3e45d3 100644 --- a/settings/country-names/gt.yaml +++ b/settings/country-names/gt.yaml @@ -77,7 +77,6 @@ name: na: Guatemara ne: ग्वाटेमाला nl: Guatemala - nn: Guatemala "no": Guatemala oc: Guatemala os: Гватемалæ diff --git a/settings/country-names/gw.yaml b/settings/country-names/gw.yaml index a856932e..dd87dbf0 100644 --- a/settings/country-names/gw.yaml +++ b/settings/country-names/gw.yaml @@ -76,7 +76,6 @@ name: na: Gini-Bitau ne: गिनी-बिसाउ nl: Guinee-Bissau - nn: Guinea-Bissau "no": Guinea-Bissau nv: Gíní Bisó oc: Guinèa Bissau diff --git a/settings/country-names/gy.yaml b/settings/country-names/gy.yaml index aa6fee71..ab8b58b6 100644 --- a/settings/country-names/gy.yaml +++ b/settings/country-names/gy.yaml @@ -77,7 +77,6 @@ name: na: Guyana ne: गुयना nl: Guyana - nn: Guyana "no": Guyana oc: Guyana or: ଗାଇଓନା diff --git a/settings/country-names/hn.yaml b/settings/country-names/hn.yaml index 82f848e6..f074e9fc 100644 --- a/settings/country-names/hn.yaml +++ b/settings/country-names/hn.yaml @@ -75,7 +75,6 @@ name: na: Ondurat ne: होण्डुरस nl: Honduras - nn: Honduras "no": Honduras oc: Honduras or: ହୋଣ୍ଡାରୁସ diff --git a/settings/country-names/hr.yaml b/settings/country-names/hr.yaml index be68fa63..3f2845c3 100644 --- a/settings/country-names/hr.yaml +++ b/settings/country-names/hr.yaml @@ -81,7 +81,6 @@ name: na: Kroaitsiya ne: क्रोएशिया nl: Kroatië - nn: Kroatia "no": Kroatia nv: Kwóóʼad Bikéyah oc: Croàcia diff --git a/settings/country-names/ht.yaml b/settings/country-names/ht.yaml index 82892f12..f05986e1 100644 --- a/settings/country-names/ht.yaml +++ b/settings/country-names/ht.yaml @@ -76,7 +76,6 @@ name: na: Aiti ne: हाइटी nl: Haïti - nn: Haiti "no": Haiti nv: Héítii oc: Haití (estat) diff --git a/settings/country-names/hu.yaml b/settings/country-names/hu.yaml index 049708d1..e596bef2 100644 --- a/settings/country-names/hu.yaml +++ b/settings/country-names/hu.yaml @@ -86,8 +86,7 @@ name: na: Ungari ne: हंगेरी nl: Hongarije - nn: Ungarn - "no": Ungern + "no": Ungarn nv: Hángewii oc: Ongria or: ହଙ୍ଗେରୀ diff --git a/settings/country-names/id.yaml b/settings/country-names/id.yaml index be193675..8a2dbc71 100644 --- a/settings/country-names/id.yaml +++ b/settings/country-names/id.yaml @@ -87,7 +87,6 @@ name: na: Indonitsiya ne: इण्डोनेशिया nl: Indonesië - nn: Indonesia "no": Indonesia nv: Indoníízha oc: Indonesia diff --git a/settings/country-names/ie.yaml b/settings/country-names/ie.yaml index 08eb0503..18504297 100644 --- a/settings/country-names/ie.yaml +++ b/settings/country-names/ie.yaml @@ -93,7 +93,6 @@ name: na: Ripubrikit Airerand ne: आइरल्याण्ड nl: Ierland - nn: Irland "no": Irland nv: Bitsiighaʼ Łichííʼí Bikéyah oc: Republica d'Irlanda diff --git a/settings/country-names/il.yaml b/settings/country-names/il.yaml index 9acd732f..ed2353ce 100644 --- a/settings/country-names/il.yaml +++ b/settings/country-names/il.yaml @@ -86,7 +86,6 @@ name: na: Iteraer ne: इजरायल nl: Israël - nn: Israel "no": Israel nv: Ízrel Bikéyah oc: Israèl diff --git a/settings/country-names/im.yaml b/settings/country-names/im.yaml index 49577b5a..c218c34d 100644 --- a/settings/country-names/im.yaml +++ b/settings/country-names/im.yaml @@ -56,7 +56,6 @@ name: mr: आईल ऑफ मान ms: Isle of Man nl: Eiland Man - nn: Isle of Man "no": Man oc: Illa de Man os: Мэн diff --git a/settings/country-names/in.yaml b/settings/country-names/in.yaml index 24758bfd..04569893 100644 --- a/settings/country-names/in.yaml +++ b/settings/country-names/in.yaml @@ -26,6 +26,7 @@ name: lt: Indija lv: Indija mn: Энэтхэг + "no": India pl: Indie ru: Индия sl: Indija diff --git a/settings/country-names/io.yaml b/settings/country-names/io.yaml index 1ed6eea7..d48eb76f 100644 --- a/settings/country-names/io.yaml +++ b/settings/country-names/io.yaml @@ -67,7 +67,6 @@ name: my: ဗြိတိသျှ အိန္ဒြိယ သမုဒ္ဒရာ ပိုင်နက် ne: बेलायती हिन्द महासागर क्षेत्र nl: Brits Territorium in de Indische Oceaan - nn: Britiske område i Det indiske hav "no": Det britiske territoriet i Indiahavet or: ବ୍ରିଟିଶ୍ ଭାରତୀୟ ସାମୁଦ୍ରିକ କ୍ଷେତ୍ର pl: Brytyjskie Terytorium Oceanu Indyjskiego diff --git a/settings/country-names/iq.yaml b/settings/country-names/iq.yaml index 5b70e36b..8516e6e0 100644 --- a/settings/country-names/iq.yaml +++ b/settings/country-names/iq.yaml @@ -76,10 +76,8 @@ name: mt: Iraq my: အီရတ်နိုင်ငံ na: Irak - nb: Irak ne: ईराक nl: Irak - nn: Irak "no": Irak nv: Iiwááʼ oc: Iraq diff --git a/settings/country-names/ir.yaml b/settings/country-names/ir.yaml index 3e73c0ed..f6930a36 100644 --- a/settings/country-names/ir.yaml +++ b/settings/country-names/ir.yaml @@ -82,7 +82,6 @@ name: na: Iran ne: इरान nl: Iran - nn: Iran "no": Iran nv: Iiwą́ą́ oc: Iran diff --git a/settings/country-names/is.yaml b/settings/country-names/is.yaml index d4272756..76b9b0b9 100644 --- a/settings/country-names/is.yaml +++ b/settings/country-names/is.yaml @@ -86,10 +86,8 @@ name: mt: Iżlanda my: အိုက်စလန်နိုင်ငံ na: Aiterand - nb: Island ne: आइसल्याण्ड nl: IJsland - nn: Island "no": Island nv: Tin Bikéyah oc: Islàndia diff --git a/settings/country-names/it.yaml b/settings/country-names/it.yaml index cb84ada8..44e7536b 100644 --- a/settings/country-names/it.yaml +++ b/settings/country-names/it.yaml @@ -93,7 +93,6 @@ name: na: Itari ne: इटाली nl: Italië - nn: Italia "no": Italia nv: Ídelii oc: Itàlia diff --git a/settings/country-names/je.yaml b/settings/country-names/je.yaml index 5212e46b..9fd0de3d 100644 --- a/settings/country-names/je.yaml +++ b/settings/country-names/je.yaml @@ -51,7 +51,6 @@ name: ms: Jersey ne: जर्सी nl: Jersey - nn: Jersey "no": Jersey oc: Jersei os: Джерси diff --git a/settings/country-names/jm.yaml b/settings/country-names/jm.yaml index 1cd5dc02..57a82605 100644 --- a/settings/country-names/jm.yaml +++ b/settings/country-names/jm.yaml @@ -30,6 +30,7 @@ name: lv: Jamaika mn: Ямайка nl: Jamaica + "no": Jamaica oc: Jamaica pl: Jamajka pt: Jamaica diff --git a/settings/country-names/jo.yaml b/settings/country-names/jo.yaml index 5c14c0a0..bb29696a 100644 --- a/settings/country-names/jo.yaml +++ b/settings/country-names/jo.yaml @@ -75,7 +75,6 @@ name: my: ဂျော်ဒန်နိုင်ငံ na: Djordan nl: Jordanië - nn: Jordan "no": Jordan nv: Jóoʼdan oc: Jordania diff --git a/settings/country-names/jp.yaml b/settings/country-names/jp.yaml index d587765a..156c11fa 100644 --- a/settings/country-names/jp.yaml +++ b/settings/country-names/jp.yaml @@ -92,7 +92,6 @@ name: na: Djapan ne: जापान nl: Japan - nn: Japan "no": Japan nv: Binaʼadaałtzózí Dinéʼiʼ Bikéyah oc: Japon diff --git a/settings/country-names/ke.yaml b/settings/country-names/ke.yaml index dabf1333..9529b93e 100644 --- a/settings/country-names/ke.yaml +++ b/settings/country-names/ke.yaml @@ -81,7 +81,6 @@ name: my: ကင်ညာနိုင်ငံ na: Keniya nl: Kenia - nn: Kenya "no": Kenya nv: Kénya oc: Kenya diff --git a/settings/country-names/kg.yaml b/settings/country-names/kg.yaml index 6fb9bc62..ab56f776 100644 --- a/settings/country-names/kg.yaml +++ b/settings/country-names/kg.yaml @@ -75,7 +75,6 @@ name: my: ကာဂျစ္စတန်နိုင်ငံ na: Kirgitan nl: Kirgizië - nn: Kirgisistan "no": Kirgisistan nv: Kíígiz Bikéyah oc: Quirguizstan diff --git a/settings/country-names/kh.yaml b/settings/country-names/kh.yaml index 5f6b2dc2..98f1b310 100644 --- a/settings/country-names/kh.yaml +++ b/settings/country-names/kh.yaml @@ -79,7 +79,6 @@ name: my: ကမ္ဘောဒီးယားနိုင်ငံ na: Kambodja nl: Cambodja - nn: Kambodsja "no": Kambodsja oc: Cambòtja or: କମ୍ବୋଡ଼ିଆ diff --git a/settings/country-names/ki.yaml b/settings/country-names/ki.yaml index 2f64e810..361610c2 100644 --- a/settings/country-names/ki.yaml +++ b/settings/country-names/ki.yaml @@ -19,6 +19,7 @@ name: lt: Kiribatis lv: Kiribati mn: Кирибати + "no": Kiribati pl: Kiribati ru: Кирибати sv: Kiribati diff --git a/settings/country-names/km.yaml b/settings/country-names/km.yaml index 406569c3..0f25bf17 100644 --- a/settings/country-names/km.yaml +++ b/settings/country-names/km.yaml @@ -35,7 +35,10 @@ name: lv: Komoru salas mk: Комори mn: Коморын арлууд + nb: Komorene nl: Comoren + nn: Komorane + "no": Komorene pl: Komory ps: قمرټاپوګان pt: Comores diff --git a/settings/country-names/kn.yaml b/settings/country-names/kn.yaml index c7329a6b..ce36068c 100644 --- a/settings/country-names/kn.yaml +++ b/settings/country-names/kn.yaml @@ -34,6 +34,7 @@ name: mk: Свети Кристифер и Невис mn: Сент-Киттс ба Невис nl: Saint Kitts en Nevis + "no": Saint Kitts og Nevis pl: Saint Kitts i Nevis pt: São Cristóvão e Nevis ru: Сент-Китс и Невис diff --git a/settings/country-names/kp.yaml b/settings/country-names/kp.yaml index a46a66a0..0b87b5e2 100644 --- a/settings/country-names/kp.yaml +++ b/settings/country-names/kp.yaml @@ -87,7 +87,6 @@ name: na: Ripubrikit Engame Korea ne: उत्तर कोरिया nl: Noord-Korea - nn: Nord-Korea "no": Nord-Korea nv: Kolíya Bikéyah Náhookǫsjí Siʼánígíí oc: Corèa del Nòrd diff --git a/settings/country-names/kr.yaml b/settings/country-names/kr.yaml index 69546975..27f16549 100644 --- a/settings/country-names/kr.yaml +++ b/settings/country-names/kr.yaml @@ -86,7 +86,6 @@ name: na: Ripubrikin Korea ne: दक्षिण कोरिया nl: Zuid-Korea - nn: Sør-Korea "no": Sør-Korea nv: Kolíya Bikéyah Shádiʼááhjí Siʼánígíí oc: Corèa del Sud diff --git a/settings/country-names/kw.yaml b/settings/country-names/kw.yaml index c6541dbd..9e1b2017 100644 --- a/settings/country-names/kw.yaml +++ b/settings/country-names/kw.yaml @@ -75,7 +75,6 @@ name: na: Kuwait ne: कुवेत nl: Koeweit - nn: Kuwait "no": Kuwait nv: Kóóweiʼ oc: Kowait diff --git a/settings/country-names/ky.yaml b/settings/country-names/ky.yaml index 0a2fbe35..8a1bb8a5 100644 --- a/settings/country-names/ky.yaml +++ b/settings/country-names/ky.yaml @@ -67,6 +67,7 @@ name: mr: केमन बेटे mt: Gżejjer Kajmani my: ကေမန် ကျွန်းစု + nb: Caymanøyene ne: केयमान टापु nl: Kaaimaneilanden nn: Caymanøyane diff --git a/settings/country-names/kz.yaml b/settings/country-names/kz.yaml index 74400582..33660dcb 100644 --- a/settings/country-names/kz.yaml +++ b/settings/country-names/kz.yaml @@ -84,7 +84,6 @@ name: my: ကာဇက်စတန်နိုင်ငံ na: Kadaketan nl: Kazachstan - nn: Kasakhstan "no": Kasakhstan nv: Kʼazah Bikéyah oc: Cazacstan diff --git a/settings/country-names/la.yaml b/settings/country-names/la.yaml index 2ea1dbe9..f8f6762c 100644 --- a/settings/country-names/la.yaml +++ b/settings/country-names/la.yaml @@ -76,7 +76,6 @@ name: my: လာအိုနိုင်ငံ na: Raot nl: Laos - nn: Laos "no": Laos nv: Lááʼos oc: Laos diff --git a/settings/country-names/lb.yaml b/settings/country-names/lb.yaml index 2c65bd67..10a23625 100644 --- a/settings/country-names/lb.yaml +++ b/settings/country-names/lb.yaml @@ -76,9 +76,7 @@ name: mt: Libanu my: လက်ဘနွန်နိုင်ငံ na: Ribanon - nb: Libanon nl: Libanon - nn: Libanon "no": Libanon nv: Łíbanoo oc: Liban diff --git a/settings/country-names/lc.yaml b/settings/country-names/lc.yaml index 02e7d24a..a867f252 100644 --- a/settings/country-names/lc.yaml +++ b/settings/country-names/lc.yaml @@ -29,6 +29,7 @@ name: lv: Sentlūsija mn: Сент Люсиа nl: Saint Lucia + "no": Saint Lucia pl: Saint Lucia pt: Santa Lúcia ru: Сент-Люсия diff --git a/settings/country-names/li.yaml b/settings/country-names/li.yaml index 3455c3ba..a97585d4 100644 --- a/settings/country-names/li.yaml +++ b/settings/country-names/li.yaml @@ -31,6 +31,7 @@ name: mk: Лихтенштајн mn: Лихтенштейн nl: Liechtenstein + "no": Liechtenstein pl: Liechtenstein ru: Лихтенштейн se: Liechtenstein diff --git a/settings/country-names/lk.yaml b/settings/country-names/lk.yaml index 50e3f559..e66f67e1 100644 --- a/settings/country-names/lk.yaml +++ b/settings/country-names/lk.yaml @@ -77,7 +77,6 @@ name: na: Sri Lanka ne: श्रीलंका nl: Sri Lanka - nn: Sri Lanka "no": Sri Lanka nv: Swii Lankʼa oc: Sri Lanka diff --git a/settings/country-names/lr.yaml b/settings/country-names/lr.yaml index c551a768..192bd658 100644 --- a/settings/country-names/lr.yaml +++ b/settings/country-names/lr.yaml @@ -74,7 +74,6 @@ name: mt: Liberja my: လိုက်ဘေးရီးယားနိုင်ငံ nl: Liberia - nn: Liberia "no": Liberia oc: Libèria or: ଲାଇବେରିଆ diff --git a/settings/country-names/ls.yaml b/settings/country-names/ls.yaml index e5133505..c04d6dcf 100644 --- a/settings/country-names/ls.yaml +++ b/settings/country-names/ls.yaml @@ -74,7 +74,6 @@ name: my: လီဆိုသိုနိုင်ငံ na: Resoto nl: Lesotho - nn: Lesotho "no": Lesotho nv: Sotho Dineʼé Bikéyah oc: Lesotho diff --git a/settings/country-names/lt.yaml b/settings/country-names/lt.yaml index 26a84bfa..bb2e524e 100644 --- a/settings/country-names/lt.yaml +++ b/settings/country-names/lt.yaml @@ -92,7 +92,6 @@ name: na: Rituainiya ne: लिथुआनिया nl: Litouwen - nn: Litauen "no": Litauen nv: Łitʼoowę́ęya ny: Lithuania diff --git a/settings/country-names/lu.yaml b/settings/country-names/lu.yaml index c4e0e4e7..8015e8e9 100644 --- a/settings/country-names/lu.yaml +++ b/settings/country-names/lu.yaml @@ -81,7 +81,6 @@ name: na: Ruketemburg ne: लक्जेम्बर्ग nl: Luxemburg - nn: Luxembourg "no": Luxembourg nv: Látsębooʼ oc: Luxemborg diff --git a/settings/country-names/lv.yaml b/settings/country-names/lv.yaml index d4396b2e..14f2805c 100644 --- a/settings/country-names/lv.yaml +++ b/settings/country-names/lv.yaml @@ -94,7 +94,6 @@ name: na: Ratebiya ne: लात्भिया nl: Letland - nn: Latvia "no": Latvia nv: Létbiiya oc: Letònia diff --git a/settings/country-names/ly.yaml b/settings/country-names/ly.yaml index e010401d..7a741b32 100644 --- a/settings/country-names/ly.yaml +++ b/settings/country-names/ly.yaml @@ -80,7 +80,6 @@ name: my: လစ်ဗျားနိုင်ငံ ne: लिबिया nl: Libië - nn: Libya "no": Libya nv: Łíbya oc: Libia diff --git a/settings/country-names/ma.yaml b/settings/country-names/ma.yaml index ac3a07f4..7c2c5217 100644 --- a/settings/country-names/ma.yaml +++ b/settings/country-names/ma.yaml @@ -75,7 +75,6 @@ name: mt: Marokk my: မော်ရိုကိုနိုင်ငံ nl: Marokko - nn: Marokko "no": Marokko nv: Moroko oc: Marròc diff --git a/settings/country-names/mc.yaml b/settings/country-names/mc.yaml index c0d7f06d..1ca0cce4 100644 --- a/settings/country-names/mc.yaml +++ b/settings/country-names/mc.yaml @@ -90,7 +90,6 @@ name: na: Monako ne: मोनाको nl: Monaco - nn: Monaco "no": Monaco oc: Mónegue or: ମୋନାକୋ diff --git a/settings/country-names/md.yaml b/settings/country-names/md.yaml index a274b803..384a942a 100644 --- a/settings/country-names/md.yaml +++ b/settings/country-names/md.yaml @@ -82,7 +82,6 @@ name: na: Mordowa ne: मोल्दोवा nl: Moldavië - nn: Moldova "no": Moldova oc: Moldàvia or: ମାଲଡୋଭା diff --git a/settings/country-names/me.yaml b/settings/country-names/me.yaml index 1b309098..63f4e6b4 100644 --- a/settings/country-names/me.yaml +++ b/settings/country-names/me.yaml @@ -80,7 +80,6 @@ name: na: Montenegro ne: मोन्टेनेग्रो nl: Montenegro - nn: Montenegro "no": Montenegro nv: Dziłizhin Bikéyah oc: Montenegro diff --git a/settings/country-names/mg.yaml b/settings/country-names/mg.yaml index 65048187..54ac5105 100644 --- a/settings/country-names/mg.yaml +++ b/settings/country-names/mg.yaml @@ -80,7 +80,6 @@ name: mt: Madagaskar my: မဒါဂတ်စကားနိုင်ငံ nl: Madagaskar - nn: Madagaskar "no": Madagaskar nv: Madaʼgéésgáá oc: Madagascar diff --git a/settings/country-names/mh.yaml b/settings/country-names/mh.yaml index d460e19d..7a131c51 100644 --- a/settings/country-names/mh.yaml +++ b/settings/country-names/mh.yaml @@ -33,7 +33,10 @@ name: lv: Māršala salas mk: Маршалски Острови mn: Маршаллын арлууд + nb: Marshalløyene nl: Marshalleilanden + nn: Marshalløyane + "no": Marshalløyene oc: Illas Marshall pl: Wyspy Marshalla pt: Ilhas Marshall diff --git a/settings/country-names/mk.yaml b/settings/country-names/mk.yaml index 4783ed4b..893c7f3a 100644 --- a/settings/country-names/mk.yaml +++ b/settings/country-names/mk.yaml @@ -91,7 +91,6 @@ name: na: Matedoniya ne: म्यासेडोनिया nl: Noord-Macedonië - nn: Nord-Makedonia "no": Nord-Makedonia oc: Republica de Macedònia or: ମାସିଡୋନିଆ diff --git a/settings/country-names/ml.yaml b/settings/country-names/ml.yaml index b957d70b..d42f5121 100644 --- a/settings/country-names/ml.yaml +++ b/settings/country-names/ml.yaml @@ -75,7 +75,6 @@ name: mt: Mali my: မာလီနိုင်ငံ nl: Mali - nn: Mali "no": Mali oc: Mali or: ମାଲି diff --git a/settings/country-names/mm.yaml b/settings/country-names/mm.yaml index 865f7dbe..e390ed90 100644 --- a/settings/country-names/mm.yaml +++ b/settings/country-names/mm.yaml @@ -80,7 +80,6 @@ name: na: Miyanmar ne: म्यानमार nl: Myanmar - nn: Myanmar "no": Myanmar oc: Birmania or: ବର୍ମା diff --git a/settings/country-names/mn.yaml b/settings/country-names/mn.yaml index fa9a3a30..1bcafb63 100644 --- a/settings/country-names/mn.yaml +++ b/settings/country-names/mn.yaml @@ -82,7 +82,6 @@ name: na: Mongoriya ne: मङ्गोलिया nl: Mongolië - nn: Mongolia "no": Mongolia nv: Chʼah Diʼilii Bikéyah oc: Mongolia diff --git a/settings/country-names/mr.yaml b/settings/country-names/mr.yaml index ebc42f16..41036428 100644 --- a/settings/country-names/mr.yaml +++ b/settings/country-names/mr.yaml @@ -75,7 +75,6 @@ name: mt: Mawritanja my: မော်ရီတေးနီးယားနိုင်ငံ nl: Mauritanië - nn: Mauritania "no": Mauritania nv: Moowitéínya oc: Mauritània diff --git a/settings/country-names/ms.yaml b/settings/country-names/ms.yaml index e0601a6d..7865450d 100644 --- a/settings/country-names/ms.yaml +++ b/settings/country-names/ms.yaml @@ -51,7 +51,6 @@ name: mr: माँटसेराट ms: Montserrat nl: Montserrat - nn: Montserrat "no": Montserrat oc: Montserrat pa: ਮਾਂਟਸਰਾਤ diff --git a/settings/country-names/mu.yaml b/settings/country-names/mu.yaml index 1739a9e2..4f56854d 100644 --- a/settings/country-names/mu.yaml +++ b/settings/country-names/mu.yaml @@ -60,6 +60,7 @@ name: my: မောရစ်ရှနိုင်ငံ ne: मौरिसस nl: Mauritius + "no": Mauritius oc: Maurici or: ମରିସସ os: Маврикий diff --git a/settings/country-names/mv.yaml b/settings/country-names/mv.yaml index 6f318a29..cbc2c018 100644 --- a/settings/country-names/mv.yaml +++ b/settings/country-names/mv.yaml @@ -66,6 +66,7 @@ name: mr: मालदीव्ज ms: Maldiv my: မော်လဒိုက် + nb: Maldivene ne: माल्दिभ्स nl: Malediven nn: Maldivane diff --git a/settings/country-names/mw.yaml b/settings/country-names/mw.yaml index 048bd8ed..65846046 100644 --- a/settings/country-names/mw.yaml +++ b/settings/country-names/mw.yaml @@ -75,7 +75,6 @@ name: mt: Malawi my: မာလဝီနိုင်ငံ nl: Malawi - nn: Malawi "no": Malawi nv: Malááwii ny: Malaŵi diff --git a/settings/country-names/mx.yaml b/settings/country-names/mx.yaml index 51a0f469..40cbbf3b 100644 --- a/settings/country-names/mx.yaml +++ b/settings/country-names/mx.yaml @@ -86,7 +86,6 @@ name: na: Meketiko ne: मेक्सिको nl: Mexico - nn: Mexico "no": Mexico nv: Méhigo oc: Mexic diff --git a/settings/country-names/my.yaml b/settings/country-names/my.yaml index 8e9ca68b..f7648bf1 100644 --- a/settings/country-names/my.yaml +++ b/settings/country-names/my.yaml @@ -78,7 +78,6 @@ name: na: Maraidja ne: मलेशिया nl: Maleisië - nn: Malaysia "no": Malaysia nv: Maléízha oc: Malàisia diff --git a/settings/country-names/mz.yaml b/settings/country-names/mz.yaml index c58ea0fe..fcc23a30 100644 --- a/settings/country-names/mz.yaml +++ b/settings/country-names/mz.yaml @@ -75,7 +75,6 @@ name: mt: Możambik my: မိုဇမ်ဘစ်နိုင်ငံ nl: Mozambique - nn: Mosambik "no": Mosambik ny: Mozambique oc: Moçambic diff --git a/settings/country-names/na.yaml b/settings/country-names/na.yaml index c08bfca6..c6a05ed9 100644 --- a/settings/country-names/na.yaml +++ b/settings/country-names/na.yaml @@ -73,7 +73,6 @@ name: mt: Namibja my: နမီးဘီးယားနိုင်ငံ nl: Namibië - nn: Namibia "no": Namibia nv: Namííbya oc: Namibia diff --git a/settings/country-names/ne.yaml b/settings/country-names/ne.yaml index cabcaa00..e40fe621 100644 --- a/settings/country-names/ne.yaml +++ b/settings/country-names/ne.yaml @@ -74,7 +74,6 @@ name: mt: Niġer my: နိုင်ဂျာနိုင်ငံ nl: Niger - nn: Niger "no": Niger oc: Nigèr or: ନାଇଜର diff --git a/settings/country-names/ng.yaml b/settings/country-names/ng.yaml index ac0d1779..e6aa9331 100644 --- a/settings/country-names/ng.yaml +++ b/settings/country-names/ng.yaml @@ -82,7 +82,6 @@ name: my: နိုင်ဂျီးရီးယားနိုင်ငံ ne: नाइजेरिया nl: Nigeria - nn: Nigeria "no": Nigeria oc: Nigèria or: ନାଇଜେରିଆ diff --git a/settings/country-names/ni.yaml b/settings/country-names/ni.yaml index 52b0dd0e..ecdfd258 100644 --- a/settings/country-names/ni.yaml +++ b/settings/country-names/ni.yaml @@ -75,7 +75,6 @@ name: my: နီကာရာဂွါနိုင်ငံ ne: निकाराग्वा nl: Nicaragua - nn: Nicaragua "no": Nicaragua oc: Nicaragua or: ନିକାରାଗୁଆ diff --git a/settings/country-names/nl.yaml b/settings/country-names/nl.yaml index 919e0862..c1311583 100644 --- a/settings/country-names/nl.yaml +++ b/settings/country-names/nl.yaml @@ -87,7 +87,6 @@ name: na: Eben Eyong ne: नेदरल्याण्ड्स nl: Nederland - nn: Nederland "no": Nederland nv: Tsin Bikeeʼ Dineʼé Bikéyah oc: Païses Basses diff --git a/settings/country-names/np.yaml b/settings/country-names/np.yaml index 919f7c9f..66bf6a0f 100644 --- a/settings/country-names/np.yaml +++ b/settings/country-names/np.yaml @@ -21,6 +21,7 @@ name: lv: Nepāla mn: Балба ne: नेपाल + "no": Nepal pl: Nepal ru: Непал sv: Nepal diff --git a/settings/country-names/nr.yaml b/settings/country-names/nr.yaml index 659f2c0c..ed85fa19 100644 --- a/settings/country-names/nr.yaml +++ b/settings/country-names/nr.yaml @@ -29,6 +29,7 @@ name: ml: നൗറു mn: Науру mt: Nawru + "no": Nauru pl: Nauru ru: Науру se: Nauru diff --git a/settings/country-names/nu.yaml b/settings/country-names/nu.yaml index 52db44b8..84f02602 100644 --- a/settings/country-names/nu.yaml +++ b/settings/country-names/nu.yaml @@ -32,6 +32,7 @@ name: ml: നിയുവെ mn: Ниуэ mr: न्युए + "no": Niue os: Ниуэ pl: Niue ru: Ниуэ diff --git a/settings/country-names/nz.yaml b/settings/country-names/nz.yaml index 29a44829..1a9688a4 100644 --- a/settings/country-names/nz.yaml +++ b/settings/country-names/nz.yaml @@ -77,7 +77,6 @@ name: na: Niu Djiran ne: न्यू जील्याण्ड nl: Nieuw-Zeeland - nn: New Zealand "no": New Zealand oc: Nòva Zelanda or: ନିଉଜିଲ୍ୟାଣ୍ଡ diff --git a/settings/country-names/om.yaml b/settings/country-names/om.yaml index a27ecc9e..51d22e0f 100644 --- a/settings/country-names/om.yaml +++ b/settings/country-names/om.yaml @@ -73,7 +73,6 @@ name: my: အိုမန်နိုင်ငံ na: Oman nl: Oman - nn: Oman "no": Oman nv: Omą́ą́ oc: Oman diff --git a/settings/country-names/pa.yaml b/settings/country-names/pa.yaml index 1cba5e5b..72cf84f6 100644 --- a/settings/country-names/pa.yaml +++ b/settings/country-names/pa.yaml @@ -78,7 +78,6 @@ name: my: ပနားမားနိုင်ငံ ne: पानामा nl: Panama - nn: Panama "no": Panama oc: Panamà or: ପାନାମା diff --git a/settings/country-names/pe.yaml b/settings/country-names/pe.yaml index de39e9f3..971b625a 100644 --- a/settings/country-names/pe.yaml +++ b/settings/country-names/pe.yaml @@ -88,7 +88,6 @@ name: na: Peru ne: पेरू nl: Peru - nn: Peru "no": Peru oc: Peró or: ପେରୁ diff --git a/settings/country-names/pg.yaml b/settings/country-names/pg.yaml index b7e3050b..2175098e 100644 --- a/settings/country-names/pg.yaml +++ b/settings/country-names/pg.yaml @@ -70,7 +70,6 @@ name: my: ပါပူအာနယူးဂီနီနိုင်ငံ na: Papua New Guinea nl: Papoea-Nieuw-Guinea - nn: Papua Ny-Guinea "no": Papua Ny-Guinea nv: Páápowa Bigíní Ániidí oc: Papoa-Nòva Guinèa diff --git a/settings/country-names/ph.yaml b/settings/country-names/ph.yaml index 9b173f5b..f23e1100 100644 --- a/settings/country-names/ph.yaml +++ b/settings/country-names/ph.yaml @@ -73,6 +73,7 @@ name: ms: Filipina my: ဖိလစ်ပိုင်နိုင်ငံ na: Eben Piripin + nb: Filippinene ne: फिलिपिन्स nl: Filipijnen nn: Filippinane diff --git a/settings/country-names/pk.yaml b/settings/country-names/pk.yaml index 935b84dd..4707e4de 100644 --- a/settings/country-names/pk.yaml +++ b/settings/country-names/pk.yaml @@ -82,10 +82,8 @@ name: mt: Pakistan my: ပါကစ္စတန်နိုင်ငံ na: Pakistan - nb: Pakistan ne: पाकिस्तान nl: Pakistan - nn: Pakistan "no": Pakistan nv: Eʼeʼaahjí Naakaii Dootłʼizhí Bikéyah oc: Paquistan diff --git a/settings/country-names/pl.yaml b/settings/country-names/pl.yaml index c8330a3c..6d18748d 100644 --- a/settings/country-names/pl.yaml +++ b/settings/country-names/pl.yaml @@ -92,7 +92,6 @@ name: na: Poran ne: पोल्याण्ड nl: Polen - nn: Polen "no": Polen nv: Póolish Dineʼé Bikéyah oc: Polonha diff --git a/settings/country-names/pn.yaml b/settings/country-names/pn.yaml index ca005c9f..bced88ef 100644 --- a/settings/country-names/pn.yaml +++ b/settings/country-names/pn.yaml @@ -30,7 +30,10 @@ name: mi: Pitikeina mk: Питкерн mn: Питкэрн Арлууд + nb: Pitcairnøyene nl: Pitcairneilanden + nn: Pitcairn + "no": Pitcairnøyene pl: Wyspy Pitcairn ru: Острова Питкэрн sl: Pitcairnovi otoki diff --git a/settings/country-names/ps.yaml b/settings/country-names/ps.yaml index ffaea4e3..5d046323 100644 --- a/settings/country-names/ps.yaml +++ b/settings/country-names/ps.yaml @@ -1,2 +1,3 @@ name: default: Palestinian Territory + "no": Det palestinske området diff --git a/settings/country-names/pt.yaml b/settings/country-names/pt.yaml index 36ccb6db..f578fe86 100644 --- a/settings/country-names/pt.yaml +++ b/settings/country-names/pt.yaml @@ -86,7 +86,6 @@ name: na: Portsiugar ne: पोर्चुगल nl: Portugal - nn: Portugal "no": Portugal oc: Portugal or: ପର୍ତ୍ତୁଗାଲ diff --git a/settings/country-names/pw.yaml b/settings/country-names/pw.yaml index 788b2878..ff40c8e8 100644 --- a/settings/country-names/pw.yaml +++ b/settings/country-names/pw.yaml @@ -11,6 +11,7 @@ name: io: Palau lt: Palau mi: Pārau + "no": Palau oc: Belau pl: Palau ru: Палау diff --git a/settings/country-names/py.yaml b/settings/country-names/py.yaml index d81925d5..5bf85423 100644 --- a/settings/country-names/py.yaml +++ b/settings/country-names/py.yaml @@ -76,7 +76,6 @@ name: my: ပါရာဂွေးနိုင်ငံ ne: पाराग्वे nl: Paraguay - nn: Paraguay "no": Paraguay oc: Paraguai or: ପାରାଗୁଏ diff --git a/settings/country-names/qa.yaml b/settings/country-names/qa.yaml index 311d9d2f..3eb2b085 100644 --- a/settings/country-names/qa.yaml +++ b/settings/country-names/qa.yaml @@ -75,7 +75,6 @@ name: my: ကာတာနိုင်ငံ na: Qatar nl: Qatar - nn: Qatar "no": Qatar nv: Kʼatár oc: Qatar diff --git a/settings/country-names/ro.yaml b/settings/country-names/ro.yaml index c5ca6b99..e5a0a725 100644 --- a/settings/country-names/ro.yaml +++ b/settings/country-names/ro.yaml @@ -83,7 +83,6 @@ name: na: Romania ne: रोमानिया nl: Roemenië - nn: Romania "no": Romania nv: Wooméiniya oc: Romania diff --git a/settings/country-names/rs.yaml b/settings/country-names/rs.yaml index 960c59e1..52c8fa86 100644 --- a/settings/country-names/rs.yaml +++ b/settings/country-names/rs.yaml @@ -80,10 +80,8 @@ name: mt: Serbja my: ဆားဘီးယားနိုင်ငံ na: Terbiya - nb: Serbia ne: सर्बिया nl: Servië - nn: Serbia "no": Serbia oc: Serbia or: ସର୍ବିଆ diff --git a/settings/country-names/ru.yaml b/settings/country-names/ru.yaml index b5c25eab..400d2eb9 100644 --- a/settings/country-names/ru.yaml +++ b/settings/country-names/ru.yaml @@ -102,7 +102,6 @@ name: na: Ratsiya ne: रुस nl: Rusland - nn: Russland "no": Russland nv: Biʼééʼ Łichííʼí Bikéyah ny: Russia diff --git a/settings/country-names/rw.yaml b/settings/country-names/rw.yaml index 6edd64e7..d7f24d45 100644 --- a/settings/country-names/rw.yaml +++ b/settings/country-names/rw.yaml @@ -74,7 +74,6 @@ name: my: ရဝမ်ဒါနိုင်ငံ ne: रुवाण्डा nl: Rwanda - nn: Rwanda "no": Rwanda nv: Wánda Dineʼé Bikéyah oc: Rwanda diff --git a/settings/country-names/sa.yaml b/settings/country-names/sa.yaml index dfb0bf02..cd6f40aa 100644 --- a/settings/country-names/sa.yaml +++ b/settings/country-names/sa.yaml @@ -80,7 +80,6 @@ name: na: Taudiarabiya ne: साउदी अरब nl: Saoedi-Arabië - nn: Saudi-Arabia "no": Saudi-Arabia nv: Ásáí Bikéyah Saʼoodí oc: Arabia Saudita diff --git a/settings/country-names/sb.yaml b/settings/country-names/sb.yaml index d632cb57..49fac24c 100644 --- a/settings/country-names/sb.yaml +++ b/settings/country-names/sb.yaml @@ -63,6 +63,7 @@ name: ms: Kepulauan Solomon mt: Gżejjer Solomon my: ဆော်လမွန်အိုင်းလန်းနိုင်ငံ + nb: Salomonøyene ne: सोलोमन द्धीप nl: Salomonseilanden nn: Salomonøyane diff --git a/settings/country-names/sc.yaml b/settings/country-names/sc.yaml index bfd763eb..3925dfb7 100644 --- a/settings/country-names/sc.yaml +++ b/settings/country-names/sc.yaml @@ -69,6 +69,7 @@ name: ms: Seychelles mt: Seychelles my: ဆေးရှဲနိုင်ငံ + nb: Seychellene nl: Seychellen nn: Seychellane "no": Seychellene diff --git a/settings/country-names/sd.yaml b/settings/country-names/sd.yaml index 48ddf92c..e1ba1452 100644 --- a/settings/country-names/sd.yaml +++ b/settings/country-names/sd.yaml @@ -81,7 +81,6 @@ name: my: ဆူဒန်နိုင်ငံ na: Tudan nl: Soedan - nn: Sudan "no": Sudan nv: Soodą́ą ny: Sudan diff --git a/settings/country-names/se.yaml b/settings/country-names/se.yaml index 01a689bd..8da28b51 100644 --- a/settings/country-names/se.yaml +++ b/settings/country-names/se.yaml @@ -91,7 +91,6 @@ name: na: Widen ne: स्वीडेन nl: Zweden - nn: Sverige "no": Sverige oc: Suècia or: ସ୍ଵିଡେନ diff --git a/settings/country-names/sg.yaml b/settings/country-names/sg.yaml index e1761413..31e1b7fa 100644 --- a/settings/country-names/sg.yaml +++ b/settings/country-names/sg.yaml @@ -82,7 +82,6 @@ name: na: Tsingapoar ne: सिंगापुर nl: Singapore - nn: Singapore "no": Singapore nv: Sį́ʼgaboo oc: Singapor diff --git a/settings/country-names/sh.yaml b/settings/country-names/sh.yaml index 2abb4b7e..e1092620 100644 --- a/settings/country-names/sh.yaml +++ b/settings/country-names/sh.yaml @@ -15,6 +15,7 @@ name: lt: Šventoji Elena, Dangun Žengimo ir Tristanas da Kunja mk: Света Елена, Успение и Тристан да Куња nl: Sint-Helena, Ascension en Tristan da Cunha + "no": Sankt Helena, Ascension og Tristan da Cunha pt: Santa Helena, Ascensão e Tristão da Cunha ru: Острова Святой Елены, Вознесения и Тристан-да-Кунья sk: Svätá Helena, Ascension a Tristan da Cunha diff --git a/settings/country-names/si.yaml b/settings/country-names/si.yaml index 2998010a..f07e2aaf 100644 --- a/settings/country-names/si.yaml +++ b/settings/country-names/si.yaml @@ -80,7 +80,6 @@ name: na: Tsirobeniya ne: स्लोभेनिया nl: Slovenië - nn: Slovenia "no": Slovenia nv: Słobíín Bikéyah oc: Eslovènia diff --git a/settings/country-names/sk.yaml b/settings/country-names/sk.yaml index 8197c62c..26cd060f 100644 --- a/settings/country-names/sk.yaml +++ b/settings/country-names/sk.yaml @@ -81,7 +81,6 @@ name: na: Slowakia ne: स्लोभाकिया nl: Slowakije - nn: Slovakia "no": Slovakia nv: Słóbaʼ Bikéyah oc: Eslovaquia diff --git a/settings/country-names/sl.yaml b/settings/country-names/sl.yaml index 8a948ea1..8f010a26 100644 --- a/settings/country-names/sl.yaml +++ b/settings/country-names/sl.yaml @@ -73,7 +73,6 @@ name: mt: Sierra Leone my: ဆီရာလီယွန်နိုင်ငံ nl: Sierra Leone - nn: Sierra Leone "no": Sierra Leone nv: Náshdóítsoh Bitsiijįʼ Daditłʼooʼígíí Bidził oc: Sierra Leone diff --git a/settings/country-names/sm.yaml b/settings/country-names/sm.yaml index 24752268..a9dad926 100644 --- a/settings/country-names/sm.yaml +++ b/settings/country-names/sm.yaml @@ -27,6 +27,7 @@ name: mi: Hato Marino mn: Сан-Марино nl: San Marino + "no": San Marino pl: San Marino pt: San Marino ru: Сан-Марино diff --git a/settings/country-names/sn.yaml b/settings/country-names/sn.yaml index ae8d263a..873123d8 100644 --- a/settings/country-names/sn.yaml +++ b/settings/country-names/sn.yaml @@ -77,7 +77,6 @@ name: my: ဆီနီဂေါနိုင်ငံ na: Senegal nl: Senegal - nn: Senegal "no": Senegal oc: Senegal or: ସେନେଗାଲ diff --git a/settings/country-names/so.yaml b/settings/country-names/so.yaml index 04b4b0b7..7719c0e7 100644 --- a/settings/country-names/so.yaml +++ b/settings/country-names/so.yaml @@ -74,7 +74,6 @@ name: my: ဆိုမာလီယာနိုင်ငံ na: Tomariya nl: Somalië - nn: Somalia "no": Somalia nv: Soomáálii Bikéyah oc: Somalia diff --git a/settings/country-names/sr.yaml b/settings/country-names/sr.yaml index f87b558e..057eb95d 100644 --- a/settings/country-names/sr.yaml +++ b/settings/country-names/sr.yaml @@ -74,7 +74,6 @@ name: mt: Surinam my: ဆူရာနမ်နိုင်ငံ nl: Suriname - nn: Surinam "no": Surinam nv: Sówinam oc: Surinam diff --git a/settings/country-names/ss.yaml b/settings/country-names/ss.yaml index 54c3aef1..5d2ca481 100644 --- a/settings/country-names/ss.yaml +++ b/settings/country-names/ss.yaml @@ -64,7 +64,6 @@ name: my: တောင်ဆူဒန်နိုင်ငံ na: South Sudan nl: Zuid-Soedan - nn: Sør-Sudan "no": Sør-Sudan nv: Shádiʼááhjí Soodą́ą oc: Sodan del Sud diff --git a/settings/country-names/st.yaml b/settings/country-names/st.yaml index 0e09d17a..267fe493 100644 --- a/settings/country-names/st.yaml +++ b/settings/country-names/st.yaml @@ -31,6 +31,7 @@ name: lt: Sao Tomė ir Prinsipė mn: Сан-Томе ба Принсипи nl: Sao Tomé en Principe + "no": São Tomé og Príncipe pl: Wyspy Świętego Tomasza i Książęca pt: São Tomé e Príncipe ru: Сан-Томе и Принсипи diff --git a/settings/country-names/sv.yaml b/settings/country-names/sv.yaml index b529dc8a..23a1fcb9 100644 --- a/settings/country-names/sv.yaml +++ b/settings/country-names/sv.yaml @@ -74,7 +74,6 @@ name: na: Ersarbador ne: एल साल्भादोर nl: El Salvador - nn: El Salvador "no": El Salvador oc: Lo Salvador or: ଏଲ ସାଲଭାଡୋର diff --git a/settings/country-names/sy.yaml b/settings/country-names/sy.yaml index a8ea2819..9874f0f6 100644 --- a/settings/country-names/sy.yaml +++ b/settings/country-names/sy.yaml @@ -80,7 +80,6 @@ name: na: Syria ne: सीरिया nl: Syrië - nn: Syria "no": Syria nv: Sííwiya oc: Siria diff --git a/settings/country-names/sz.yaml b/settings/country-names/sz.yaml index 0a4bcab2..cf6f1f9c 100644 --- a/settings/country-names/sz.yaml +++ b/settings/country-names/sz.yaml @@ -84,7 +84,6 @@ name: my: ဆွာဇီလန်နိုင်ငံ ne: स्वाजिल्याण्ड nl: Swaziland - nn: Eswatini "no": Eswatini nv: Swáazi Dineʼé Bikéyah oc: Swaziland diff --git a/settings/country-names/tc.yaml b/settings/country-names/tc.yaml index 944d7443..87ff7681 100644 --- a/settings/country-names/tc.yaml +++ b/settings/country-names/tc.yaml @@ -44,6 +44,7 @@ name: mn: Туркс ба Кайкосын Арлууд mr: टर्क्स आणि कैकास द्वीपसमूह ms: Kepulauan Turks dan Caicos + nb: Turks- og Caicosøyene nl: Turks- en Caicoseilanden nn: Turks- og Caicosøyane "no": Turks- og Caicosøyene diff --git a/settings/country-names/td.yaml b/settings/country-names/td.yaml index 1fec17ff..03955c13 100644 --- a/settings/country-names/td.yaml +++ b/settings/country-names/td.yaml @@ -76,7 +76,6 @@ name: my: ချဒ်သမ္မတနိုင်ငံ na: Tsiad nl: Tsjaad - nn: Tsjad "no": Tsjad oc: Chad or: ଚାଡ diff --git a/settings/country-names/tg.yaml b/settings/country-names/tg.yaml index 40899120..e228ff95 100644 --- a/settings/country-names/tg.yaml +++ b/settings/country-names/tg.yaml @@ -75,7 +75,6 @@ name: my: တိုဂိုနိုင်ငံ na: Togo nl: Togo - nn: Togo "no": Togo nv: Tʼóogo oc: Tògo diff --git a/settings/country-names/th.yaml b/settings/country-names/th.yaml index f0527bdf..b916623c 100644 --- a/settings/country-names/th.yaml +++ b/settings/country-names/th.yaml @@ -81,7 +81,6 @@ name: na: Thailand ne: थाइल्याण्ड nl: Thailand - nn: Thailand "no": Thailand nv: Tʼáí Bikéyah oc: Tailàndia diff --git a/settings/country-names/tj.yaml b/settings/country-names/tj.yaml index 5ca5ea84..866c389a 100644 --- a/settings/country-names/tj.yaml +++ b/settings/country-names/tj.yaml @@ -76,7 +76,6 @@ name: my: တာဂျစ်ကစ္စတန်နိုင်ငံ na: Tadjikitan nl: Tadzjikistan - nn: Tadsjikistan "no": Tadsjikistan nv: Tʼajiʼ Bikéyah oc: Tatgiquistan diff --git a/settings/country-names/tl.yaml b/settings/country-names/tl.yaml index fbf2da4e..d474bd42 100644 --- a/settings/country-names/tl.yaml +++ b/settings/country-names/tl.yaml @@ -30,7 +30,9 @@ name: lt: Rytų Timoras mn: Зүүн Тимор ms: Timor Timur + nb: Øst-Timor nl: Oost-Timor + nn: Aust-Timor "no": Øst-Timor pl: Timor Wschodni pt: Timor-Leste diff --git a/settings/country-names/tm.yaml b/settings/country-names/tm.yaml index aa11853d..2db5844f 100644 --- a/settings/country-names/tm.yaml +++ b/settings/country-names/tm.yaml @@ -75,7 +75,6 @@ name: na: Turkmenistan ne: तुर्कमेनिस्तान nl: Turkmenistan - nn: Turkmenistan "no": Turkmenistan nv: Tʼóokmen Bikéyah oc: Turcmenistan diff --git a/settings/country-names/tn.yaml b/settings/country-names/tn.yaml index 134143b1..2cbc7163 100644 --- a/settings/country-names/tn.yaml +++ b/settings/country-names/tn.yaml @@ -76,7 +76,6 @@ name: mt: Tuneżija my: တူနီးရှားနိုင်ငံ nl: Tunesië - nn: Tunisia "no": Tunisia oc: Tunisia or: ଟ୍ୟୁନିସିଆ diff --git a/settings/country-names/to.yaml b/settings/country-names/to.yaml index 0da4dd5a..6a01e841 100644 --- a/settings/country-names/to.yaml +++ b/settings/country-names/to.yaml @@ -67,7 +67,6 @@ name: mt: Tonga my: တုံဂါနိုင်ငံ nl: Tonga - nn: Tonga "no": Tonga nv: Tʼónga oc: Tònga diff --git a/settings/country-names/tr.yaml b/settings/country-names/tr.yaml index c7ee70cd..88e3eb9e 100644 --- a/settings/country-names/tr.yaml +++ b/settings/country-names/tr.yaml @@ -90,7 +90,6 @@ name: na: Terki ne: टर्की nl: Turkije - nn: Tyrkia "no": Tyrkia nv: Tʼóok Bikéyah oc: Turquia diff --git a/settings/country-names/tt.yaml b/settings/country-names/tt.yaml index fa68f7d1..752e7d48 100644 --- a/settings/country-names/tt.yaml +++ b/settings/country-names/tt.yaml @@ -30,6 +30,7 @@ name: lt: Trinidadas ir Tobagas mn: Тринидад ба Тобаго nl: Trinidad en Tobago + "no": Trinidad og Tobago pl: Trynidad i Tobago pt: Trindade e Tobago ru: Тринидад и Тобаго diff --git a/settings/country-names/tw.yaml b/settings/country-names/tw.yaml index 03ac0945..6be6f361 100644 --- a/settings/country-names/tw.yaml +++ b/settings/country-names/tw.yaml @@ -85,7 +85,6 @@ name: my: ထိုင်ဝမ် ne: ताइवान nl: Taiwan - nn: Taiwan "no": Taiwan oc: Taiwan or: ତାଇୱାନ diff --git a/settings/country-names/tz.yaml b/settings/country-names/tz.yaml index eb266f48..9a7dd893 100644 --- a/settings/country-names/tz.yaml +++ b/settings/country-names/tz.yaml @@ -79,7 +79,6 @@ name: my: တန်ဇေးနီးယားနိုင်ငံ ne: तन्जानिया nl: Tanzania - nn: Tanzania "no": Tanzania nv: Tʼanzanííya ny: Tanzania diff --git a/settings/country-names/ua.yaml b/settings/country-names/ua.yaml index 640ee113..16c7e5eb 100644 --- a/settings/country-names/ua.yaml +++ b/settings/country-names/ua.yaml @@ -85,7 +85,6 @@ name: na: Ukraine ne: युक्रेन nl: Oekraïne - nn: Ukraina "no": Ukraina nv: Yóókwein oc: Ucraïna diff --git a/settings/country-names/ug.yaml b/settings/country-names/ug.yaml index 628beaee..0a3ab5e9 100644 --- a/settings/country-names/ug.yaml +++ b/settings/country-names/ug.yaml @@ -77,7 +77,6 @@ name: mt: Uganda my: ယူဂန်းဒါးနိုင်ငံ nl: Oeganda - nn: Uganda "no": Uganda nv: Yogénda oc: Oganda diff --git a/settings/country-names/uy.yaml b/settings/country-names/uy.yaml index 886c4cd2..1251f743 100644 --- a/settings/country-names/uy.yaml +++ b/settings/country-names/uy.yaml @@ -90,7 +90,6 @@ name: my: ဥရုဂွေးနိုင်ငံ ne: उरुग्वाइ nl: Uruguay - nn: Uruguay "no": Uruguay nv: Táłtłʼááh Chʼosh Bitooh (Kéyah Dah Siʼánígíí) oc: Uruguai diff --git a/settings/country-names/uz.yaml b/settings/country-names/uz.yaml index 2f7b1ee8..e6e80ee7 100644 --- a/settings/country-names/uz.yaml +++ b/settings/country-names/uz.yaml @@ -74,7 +74,6 @@ name: my: ဥဇဘက်ကစ္စတန်နိုင်ငံ na: Uzbekistan nl: Oezbekistan - nn: Usbekistan "no": Usbekistan nv: Ózbeʼ Bikéyah oc: Ozbequistan diff --git a/settings/country-names/va.yaml b/settings/country-names/va.yaml index fd1b2eaf..595c168f 100644 --- a/settings/country-names/va.yaml +++ b/settings/country-names/va.yaml @@ -83,7 +83,6 @@ name: na: Batikan ne: भ्याटिकन सिटी nl: Vaticaanstad - nn: Vatikanstaten "no": Vatikanstaten nv: Bádikin Sídii oc: Vatican diff --git a/settings/country-names/vc.yaml b/settings/country-names/vc.yaml index 0887ea49..4c86ac2e 100644 --- a/settings/country-names/vc.yaml +++ b/settings/country-names/vc.yaml @@ -30,7 +30,10 @@ name: li: Saint-Vincent lt: Sent Vinsentas ir Grenadinai mn: Сент-Винсент ба Гренадин + nb: Saint Vincent og Grenadinene nl: Saint Vincent en de Grenadines + nn: Saint Vincent og Grenadinane + "no": Saint Vincent og Grenadinene pl: Saint Vincent i Grenadyny pt: São Vicente e Granadinas ru: Сент-Винсент и Гренадины diff --git a/settings/country-names/ve.yaml b/settings/country-names/ve.yaml index cd006d5c..9b5e2419 100644 --- a/settings/country-names/ve.yaml +++ b/settings/country-names/ve.yaml @@ -80,7 +80,6 @@ name: my: ဗင်နီဇွဲလားနိုင်ငံ ne: भेनेजुएला nl: Venezuela - nn: Venezuela "no": Venezuela nv: Táłkááʼ Bighan Dineʼé Bikéyah oc: Veneçuèla diff --git a/settings/country-names/vg.yaml b/settings/country-names/vg.yaml index 35430a20..46264fba 100644 --- a/settings/country-names/vg.yaml +++ b/settings/country-names/vg.yaml @@ -30,7 +30,10 @@ name: lv: Britu Virdžīnu salas mk: Британски Девствени Острови mn: Виржиний Арлууд, Британийн + nb: De britiske jomfruøyene nl: Britse Maagdeneilanden + nn: Dei britiske Jomfruøyane + "no": De britiske jomfruøyene pl: Brytyjskie Wyspy Dziewicze pt: Ilhas Virgens Britânicas ru: Британские Виргинские острова diff --git a/settings/country-names/vn.yaml b/settings/country-names/vn.yaml index bea82047..91b7de46 100644 --- a/settings/country-names/vn.yaml +++ b/settings/country-names/vn.yaml @@ -91,7 +91,6 @@ name: na: Bitinam ne: भियतनाम nl: Vietnam - nn: Vietnam "no": Vietnam nv: Biʼednam oc: Vietnam diff --git a/settings/country-names/vu.yaml b/settings/country-names/vu.yaml index c3087544..4fd998fd 100644 --- a/settings/country-names/vu.yaml +++ b/settings/country-names/vu.yaml @@ -45,6 +45,7 @@ name: my: ဗနွားတူနိုင်ငံ na: Banuatu ne: भानुअटु + "no": Vanuatu nv: Banoʼáátʼoo oc: Vanuatu or: ଭାନୁଆଟୁ diff --git a/settings/country-names/xk.yaml b/settings/country-names/xk.yaml index 1633036e..f9288d25 100644 --- a/settings/country-names/xk.yaml +++ b/settings/country-names/xk.yaml @@ -74,7 +74,6 @@ name: my: ကိုဆိုဗို na: Kosovo nl: Kosovo - nn: Kosovo "no": Kosovo ny: Kosovo oc: Kosova diff --git a/settings/country-names/ye.yaml b/settings/country-names/ye.yaml index adfad6b7..b0745064 100644 --- a/settings/country-names/ye.yaml +++ b/settings/country-names/ye.yaml @@ -79,7 +79,6 @@ name: na: Yemen ne: गणतन्त्र यमन nl: Jemen - nn: Jemen "no": Jemen nv: Shádiʼááhjí Ásáí Bikéyah oc: Iemèn diff --git a/settings/country-names/za.yaml b/settings/country-names/za.yaml index 728a91b5..e88b1918 100644 --- a/settings/country-names/za.yaml +++ b/settings/country-names/za.yaml @@ -87,7 +87,6 @@ name: my: တောင်အာဖရိက ne: दक्षिण अफ्रिका nl: Zuid-Afrika - nn: Sør-Afrika "no": Sør-Afrika nv: Kéyah Naakai Łizhinii Bikéyah Shádiʼááhjí Siʼánígíí ny: South Africa diff --git a/settings/country-names/zm.yaml b/settings/country-names/zm.yaml index fb58f5a1..79bdc010 100644 --- a/settings/country-names/zm.yaml +++ b/settings/country-names/zm.yaml @@ -72,7 +72,6 @@ name: mt: Żambja my: ဇမ်ဘီယာနိုင်ငံ nl: Zambia - nn: Zambia "no": Zambia ny: Zambia oc: Zambia diff --git a/settings/country-names/zw.yaml b/settings/country-names/zw.yaml index 1a329435..a96083f8 100644 --- a/settings/country-names/zw.yaml +++ b/settings/country-names/zw.yaml @@ -75,7 +75,6 @@ name: my: ဇင်ဘာဘွေနိုင်ငံ ne: जिम्बाब्वे nl: Zimbabwe - nn: Zimbabwe "no": Zimbabwe nv: Hooghan Tsé Bee Ádaalyaaí Bikéyah ny: Zimbabwe diff --git a/settings/country_settings.yaml b/settings/country_settings.yaml index a2ca7412..88ace911 100644 --- a/settings/country_settings.yaml +++ b/settings/country_settings.yaml @@ -944,7 +944,7 @@ kp: # South Korea (대한민국) kr: partition: 49 - languages: ko, en + languages: ko names: !include country-names/kr.yaml postcode: pattern: "ddddd" diff --git a/settings/env.defaults b/settings/env.defaults index b8c66667..827e3f2a 100644 --- a/settings/env.defaults +++ b/settings/env.defaults @@ -5,7 +5,6 @@ # Database connection string. # Add host, port, user etc through additional semicolon-separated attributes. # e.g. ;host=...;port=...;user=...;password=... -# Changing this variable requires to run 'nominatim refresh --website'. NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim" # Database web user. @@ -36,11 +35,11 @@ NOMINATIM_TOKENIZER_CONFIG= # Search in the Tiger house number data for the US. # Note: The tables must already exist or queries will throw errors. -# Changing this value requires to run ./utils/setup --create-functions --setup-website. +# Changing this value requires to run ./utils/setup --create-functions. NOMINATIM_USE_US_TIGER_DATA=no # Search in the auxiliary housenumber table. -# Changing this value requires to run ./utils/setup --create-functions --setup-website. +# Changing this value requires to run ./utils/setup --create-functions. NOMINATIM_USE_AUX_LOCATION_DATA=no # Proxy settings @@ -143,8 +142,7 @@ NOMINATIM_REPLICATION_RECHECK_INTERVAL=60 ### API settings # -# The following settings configure the API responses. You must rerun -# 'nominatim refresh --website' after changing any of them. +# The following settings configure the API responses. # Send permissive CORS access headers. # When enabled, send CORS headers to allow access to everybody. @@ -171,18 +169,21 @@ NOMINATIM_POLYGON_OUTPUT_MAX_TYPES=1 # under .php NOMINATIM_SERVE_LEGACY_URLS=yes -# Maximum number of connection a single API object can use. (Python API only) +# Maximum number of DB connections a single API object can use. # When running Nominatim as a server, then this is the maximum number # of connections _per worker_. -NOMINATIM_API_POOL_SIZE=10 +NOMINATIM_API_POOL_SIZE=5 # Timeout is seconds after which a single query to the database is cancelled. -# The user receives a 503 response, when a query times out. +# The caller receives a TimeoutError (or HTTP 503), when a query times out. # When empty, then timeouts are disabled. NOMINATIM_QUERY_TIMEOUT=10 -# Maximum time a single request is allowed to take. When the timeout is -# exceeded, the available results are returned. +# Maximum time a single request is allowed to take. If the timeout is exceeded +# before the request is able to obtain a database connection from the +# connection pool, a TimeoutError (or HTTP 503) is thrown. If the timeout +# is exceeded while the search is ongoing, all results already found will +# be returned. # When empty, then timeouts are disabled. NOMINATIM_REQUEST_TIMEOUT=60 @@ -192,20 +193,28 @@ NOMINATIM_REQUEST_TIMEOUT=60 # to geocode" instead. NOMINATIM_SEARCH_WITHIN_COUNTRIES=False +# Specifies the order in which different name tags are used. +# The values in this list determine the preferred order of name variants, +# including language-specific names. +# Comma-separated list, where :XX stands for language-specific tags +# (e.g. name:en) and no :XX stands for general tags (e.g. name). +NOMINATIM_OUTPUT_NAMES=name:XX,name,brand,official_name:XX,short_name:XX,official_name,short_name,ref + ### Log settings # # The following options allow to enable logging of API requests. -# You must rerun 'nominatim refresh --website' after changing any of them. # -# Enable logging of requests into the DB. -# The request will be logged into the new_query_log table. -# You should set up a cron job that regularly clears out this table. -NOMINATIM_LOG_DB=no - # Enable logging of requests into a file. # To enable logging set this setting to the file to log to. NOMINATIM_LOG_FILE= +# Set the output format of the query log. +# This is a string following the Python String Format syntax, +# see https://docs.python.org/3/library/string.html#formatstrings. +# For possible replacement values, see the full documentation at +# https://nominatim.org/release-docs/latest/customize/Settings/ +NOMINATIM_LOG_FORMAT='[{start}] {total_time:.4f} {results_total} {endpoint} "{query_string}"' + # Echo raw SQL from SQLAlchemy statements. # EXPERT: Works only in command line/library use. NOMINATIM_DEBUG_SQL=no diff --git a/settings/icu-rules/variants-en.yaml b/settings/icu-rules/variants-en.yaml index 99cd6da6..54a7b475 100644 --- a/settings/icu-rules/variants-en.yaml +++ b/settings/icu-rules/variants-en.yaml @@ -6,25 +6,19 @@ - Air Force Base -> AFB - Air National Guard Base -> ANGB - Airport -> Aprt - - Alley -> Al - - Alley -> All - - Alley -> Ally - - Alley -> Aly + - Alley -> Al,All,Ally,Aly - Alleyway -> Alwy - Amble -> Ambl - Anex -> Anx - Apartments -> Apts - - Approach -> Apch - - Approach -> App + - Approach -> Apch,App - Arcade -> Arc - Arterial -> Artl - Artery -> Arty - - Avenue -> Av - - Avenue -> Ave + - Avenue -> Av,Ave - Back -> Bk - Banan -> Ba - - Basin -> Basn - - Basin -> Bsn + - Basin -> Basn,Bsn - Bayou -> Byu - Beach -> Bch - Bend -> Bnd @@ -33,71 +27,51 @@ - Bluffs -> Blfs - Boardwalk -> Bwlk - Bottom -> Btm - - Boulevard -> Blvd - - Boulevard -> Bvd + - Boulevard -> Blvd,Bvd - Boundary -> Bdy - Bowl -> Bl - Brace -> Br - Brae -> Br - Branch -> Br - Break -> Brk - - Bridge -> Bdge - - Bridge -> Br - - Bridge -> Brdg - - Bridge -> Brg - - Bridge -> Bri - - Broadway -> Bdwy - - Broadway -> Bway - - Broadway -> Bwy + - Bridge$ -> Bdge,Br,Brdg,Brg,Bri + - Broadway -> Bdwy,Bway,Bwy - Brook -> Brk - Brooks -> Brks - Brow -> Brw - - Buildings -> Bldgs - - Buildings -> Bldngs + - Buildings -> Bldgs,Bldngs - Business -> Bus - Burg -> Bg - Burgs -> Bgs - - Bypass -> Bps - - Bypass -> Byp - - Bypass -> Bypa + - Bypass -> Bps,Byp,Bypa - Byway -> Bywy - Camp -> Cp - Canyon -> Cyn - Cape -> Cpe - Caravan -> Cvn - - Causeway -> Caus - - Causeway -> Cswy - - Causeway -> Cway - - Center -> Cen - - Center -> Ctr + - Causeway -> Caus,Cswy,Cway + - Center,Centre -> Cen,Ctr - Centers -> Ctrs - Central -> Ctrl - - Centre -> Cen - - Centre -> Ctr - Centreway -> Cnwy - Chase -> Ch - Church -> Ch - Circle -> Cir - Circles -> Cirs - - Circuit -> Cct - - Circuit -> Ci - - Circus -> Crc - - Circus -> Crcs + - Circuit -> Cct,Ci + - Circus -> Crc,Crcs - City -> Cty - Cliff -> Clf - Cliffs -> Clfs - Close -> Cl - Club -> Clb - - Common -> Cmn - - Common -> Comm + - Common -> Cmn,Comm - Commons -> Cmns - Community -> Comm - Concourse -> Cnc - Concourse -> Con - Copse -> Cps - - Corner -> Cor - - Corner -> Cnr - - Corner -> Crn + - Corner -> Cor,Cnr,Crn - Corners -> Cors - Corso -> Cso - Cottages -> Cotts @@ -105,36 +79,24 @@ - County Road -> CR - County Route -> CR - Course -> Crse - - Court -> Crt - - Court -> Ct + - Court -> Crt,Ct - Courts -> Cts - Courtyard -> Cyd - Courtyard -> Ctyd - - Cove -> Ce - - Cove -> Cov - - Cove -> Cv + - Cove$ -> Ce,Cov,Cv - Coves -> Cvs - - Creek -> Ck - - Creek -> Cr - - Creek -> Crk + - Creek$ -> Ck,Cr,Crk - Crescent -> Cr - Crescent -> Cres - - Crest -> Crst - - Crest -> Cst + - Crest -> Crst,Cst - Croft -> Cft - - Cross -> Cs - - Cross -> Crss - - Crossing -> Crsg - - Crossing -> Csg - - Crossing -> Xing - - Crossroad -> Crd - - Crossroad -> Xrd + - Cross -> Cs,Crss + - Crossing -> Crsg,Csg,Xing + - Crossroad -> Crd,Xrd - Crossroads -> Xrds - Crossway -> Cowy - - Cul-de-sac -> Cds - - Cul-de-sac -> Csac - - Curve -> Cve - - Curve -> Curv + - Cul-de-sac -> Cds,Csac + - Curve -> Cve,Curv - Cutting -> Cutt - Dale -> Dle - Dam -> Dm @@ -143,14 +105,10 @@ - Divide -> Dv - Down -> Dn - Downs -> Dn - - Drive -> Dr - - Drive -> Drv - - Drive -> Dv + - Drive -> Dr,Drv,Dv - Drives -> Drs - Drive-In => Drive-In # prevent abbreviation here - - Driveway -> Drwy - - Driveway -> Dvwy - - Driveway -> Dwy + - Driveway -> Drwy,Dvwy,Dwy - East -> E - Edge -> Edg - Elbow -> Elb @@ -158,25 +116,18 @@ - Esplanade -> Esp - Estate -> Est - Estates -> Ests - - Expressway -> Exp - - Expressway -> Expy - - Expressway -> Expwy - - Expressway -> Xway + - Expressway -> Exp,Expy,Expwy,Xway - Extension -> Ex - Extensions -> Exts - - Fairway -> Fawy - - Fairway -> Fy + - Fairway -> Fawy,Fy - Falls -> Fls - Father -> Fr - - Ferry -> Fy - - Ferry -> Fry - - Field -> Fd - - Field -> Fld + - Ferry -> Fy,Fry + - Field -> Fd,Fld - Fields -> Flds - Fire Track -> Ftrk - Firetrail -> Fit - - Flat -> Fl - - Flat -> Flt + - Flat -> Fl,Flt - Flats -> Flts - Follow -> Folw - Footway -> Ftwy @@ -191,67 +142,47 @@ - Fork -> Frk - Forks -> Frks - Fort -> Ft - - Freeway -> Frwy - - Freeway -> Fwy + - Freeway -> Frwy,Fwy - Front -> Frnt - - Frontage -> Fr - - Frontage -> Frtg + - Frontage -> Fr,Frtg - Garden -> Gdn - - Gardens -> Gdn - - Gardens -> Gdns - - Gate -> Ga - - Gate -> Gte - - Gates -> Ga - - Gates -> Gte - - Gateway -> Gwy - - Gateway -> Gtwy + - Gardens -> Gdn,Gdns + - Gate,Gates -> Ga,Gte + - Gateway -> Gwy,Gtwy - George -> Geo - - Glade -> Gl - - Glade -> Gld - - Glade -> Glde + - Glade$ -> Gl,Gld,Glde - Glen -> Gln - Glens -> Glns - Grange -> Gra - - Green -> Gn - - Green -> Grn + - Green -> Gn,Grn - Greens -> Grns - Ground -> Grnd - - Grove -> Gr - - Grove -> Gro - - Grove -> Grv + - Grove$ -> Gr,Gro,Grv - Groves -> Grvs - Grovet -> Gr - Gully -> Gly - - Harbor -> Hbr + - Harbor -> Hbr,Harbour - Harbors -> Hbrs - - Harbour -> Hbr + - Harbour -> Hbr,Harbor - Haven -> Hvn - Head -> Hd - Heads -> Hd - - Heights -> Hgts - - Heights -> Ht - - Heights -> Hts + - Heights -> Hgts,Ht,Hts - High School -> HS - - Highroad -> Hird - - Highroad -> Hrd + - Highroad -> Hird,Hrd - Highway -> Hwy - Hill -> Hl - - Hills -> Hl - - Hills -> Hls + - Hills -> Hl,Hls - Hollow -> Holw - Hospital -> Hosp - - House -> Ho - - House -> Hse + - House -> Ho,Hse - Industrial -> Ind - Inlet -> Inlt - Interchange -> Intg - International -> Intl - - Island -> I - - Island -> Is + - Island -> I,Is - Islands -> Iss - - Junction -> Jct - - Junction -> Jctn - - Junction -> Jnc + - Junction -> Jct,Jctn,Jnc - Junctions -> Jcts - Junior -> Jr - Key -> Ky @@ -260,40 +191,31 @@ - Knolls -> Knls - Lagoon -> Lgn - Lake -> Lk - - Lakes -> L - - Lakes -> Lks - - Landing -> Ldg - - Landing -> Lndg - - Lane -> La - - Lane -> Ln + - Lakes -> L,Lks + - Landing -> Ldg,Lndg + - Lane -> La,Ln - Laneway -> Lnwy - Light -> Lgt - Lights -> Lgts - Line -> Ln - Link -> Lk - - Little -> Lit - - Little -> Lt + - Little -> Lit,Lt - Loaf -> Lf - Lock -> Lck - Locks -> Lcks - Lodge -> Ldg - Lookout -> Lkt - Loop -> Lp - - Lower -> Low - - Lower -> Lr - - Lower -> Lwr + - Lower -> Low,Lr,Lwr - Mall -> Ml - Manor -> Mnr - Manors -> Mnrs - Mansions -> Mans - Market -> Mkt - Meadow -> Mdw - - Meadows -> Mdw - - Meadows -> Mdws + - Meadows -> Mdw,Mdws - Mead -> Md - - Meander -> Mdr - - Meander -> Mndr - - Meander -> Mr + - Meander -> Mdr,Mndr,Mr - Medical -> Med - Memorial -> Mem - Mews -> Mw @@ -304,12 +226,10 @@ - Mill -> Ml - Mills -> Mls - Mission -> Msn - - Motorway -> Mtwy - - Motorway -> Mwy + - Motorway -> Mtwy,Mwy - Mount -> Mt - Mountain -> Mtn - - Mountains -> Mtn - - Mountains -> Mtns + - Mountains$ -> Mtn,Mtns - Municipal -> Mun - Museum -> Mus - National Park -> NP @@ -321,50 +241,37 @@ - Northeast -> NE - Northwest -> NW - Orchard -> Orch - - Outlook -> Out - - Outlook -> Otlk + - Outlook -> Out,Otlk - Overpass -> Opas - Parade -> Pde - Paradise -> Pdse - Park -> Pk - Parklands -> Pkld - - Parkway -> Pkwy - - Parkway -> Pky - - Parkway -> Pwy + - Parkway -> Pkwy,Pky,Pwy - Parkways -> Pkwy - Pass -> Ps - Passage -> Psge - - Pathway -> Phwy - - Pathway -> Pway - - Pathway -> Pwy + - Pathway -> Phwy,Pway,Pwy - Piazza -> Piaz - Pike -> Pk - Pine -> Pne - Pines -> Pnes - Place -> Pl - - Plain -> Pl - - Plain -> Pln - - Plains -> Pl - - Plains -> Plns + - Plain -> Pl,Pln + - Plains -> Pl,Plns - Plateau -> Plat - - Plaza -> Pl - - Plaza -> Plz - - Plaza -> Plza + - Plaza -> Pl,Plz,Plza - Pocket -> Pkt - - Point -> Pnt - - Point -> Pt + - Point -> Pnt,Pt - Points -> Pts - - Port -> Prt - - Port -> Pt + - Port -> Prt,Pt - Ports -> Prts - Post Office -> PO - Prairie -> Pr - Precinct -> Pct - - Promenade -> Prm - - Promenade -> Prom + - Promenade -> Prm,Prom - Quadrangle -> Qdgl - - Quadrant -> Qdrt - - Quadrant -> Qd + - Quadrant -> Qdrt,Qd - Quay -> Qy - Quays -> Qy - Quays -> Qys @@ -372,8 +279,7 @@ - Ramble -> Ra - Ramble -> Rmbl - Ranch -> Rnch - - Range -> Rge - - Range -> Rnge + - Range -> Rge,Rnge - Rapid -> Rpd - Rapids -> Rpds - Reach -> Rch @@ -381,37 +287,31 @@ - Reserve -> Res - Reservoir -> Res - Rest -> Rst - - Retreat -> Rt - - Retreat -> Rtt + - Retreat -> Rt,Rtt - Return -> Rtn - - Ridge -> Rdg - - Ridge -> Rdge + - Ridge -> Rdg,Rdge - Ridges -> Rdgs - Ridgeway -> Rgwy - Right of Way -> Rowy - Rise -> Ri - - River -> R - - River -> Riv - - River -> Rvr + - ^River -> R,Riv,Rvr + - River$ -> R,Riv,Rvr - Riverway -> Rvwy - Riviera -> Rvra - Road -> Rd - Roads -> Rds - Roadside -> Rdsd - - Roadway -> Rdwy - - Roadway -> Rdy + - Roadway -> Rdwy,Rdy - Rocks -> Rks - Ronde -> Rnde - Rosebowl -> Rsbl - Rotary -> Rty - Round -> Rnd - - Route -> Rt - - Route -> Rte + - Route -> Rt,Rte - Saint -> St - Saints -> SS - Senior -> Sr - - Serviceway -> Swy - - Serviceway -> Svwy + - Serviceway -> Swy,Svwy - Shoal -> Shl - Shore -> Shr - Shores -> Shrs @@ -421,8 +321,7 @@ - Skyway -> Skwy - Slope -> Slpe - Sound -> Snd - - South -> S - - South -> Sth + - South -> S,Sth - Southeast -> SE - Southwest -> SW - Spring -> Spg @@ -431,13 +330,10 @@ - Square -> Sq - Squares -> Sqs - Stairway -> Strwy - - State Highway -> SH - - State Highway -> SHwy + - State Highway -> SH,SHwy - State Route -> SR - - Station -> Sta - - Station -> Stn - - Strand -> Sd - - Strand -> Stra + - Station -> Sta,Stn + - Strand -> Sd,Stra - Stravenue -> Stra - Stream -> Strm - Street -> St @@ -447,61 +343,43 @@ - Summit -> Smt - Tarn -> Tn - Terminal -> Term - - Terrace -> Tce - - Terrace -> Ter - - Terrace -> Terr - - Thoroughfare -> Thfr - - Thoroughfare -> Thor + - Terrace -> Tce,Ter,Terr + - Thoroughfare -> Thfr,Thor - Throughway -> Trwy - - Tollway -> Tlwy - - Tollway -> Twy + - Tollway -> Tlwy,Twy - Towers -> Twrs - Township -> Twp - Trace -> Trce - - Track -> Tr - - Track -> Trak - - Track -> Trk + - Track -> Tr,Trak,Trk - Trafficway -> Trfy - Trail -> Trl - Trailer -> Trlr - Triangle -> Tri - Trunkway -> Tkwy - - Tunnel -> Tun - - Tunnel -> Tunl - - Turn -> Tn - - Turn -> Trn - - Turnpike -> Tpk - - Turnpike -> Tpke - - Underpass -> Upas - - Underpass -> Ups + - Tunnel -> Tun,Tunl + - Turn -> Tn,Trn + - Turnpike -> Tpk,Tpke + - Underpass -> Upas,Ups - Union -> Un - Unions -> Uns - - University -> Uni - - University -> Univ + - University -> Uni,Univ - Upper -> Up - Upper -> Upr - Vale -> Va - Valley -> Vly - Valley -> Vy - Valleys -> Vlys - - Viaduct -> Vdct - - Viaduct -> Via - - Viaduct -> Viad + - Viaduct$ -> Vdct,Via,Viad - View -> Vw - Views -> Vws - - Village -> Vill - - Village -> Vlg + - Village -> Vill,Vlg - Villages -> Vlgs - Villas -> Vlls - Ville -> Vl - - Vista -> Vis - - Vista -> Vst - - Vista -> Vsta - - Walk -> Wk - - Walk -> Wlk + - Vista -> Vis,Vst,Vsta + - Walk -> Wk,Wlk - Walks -> Walk - - Walkway -> Wkwy - - Walkway -> Wky + - Walkway -> Wkwy,Wky - Waters -> Wtr - Way -> Wy - Well -> Wl diff --git a/settings/icu-rules/variants-ja.yaml b/settings/icu-rules/variants-ja.yaml deleted file mode 100644 index 72951d8c..00000000 --- a/settings/icu-rules/variants-ja.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Source: https://wiki.openstreetmap.org/wiki/Name_finder:Abbreviations#.E6.97.A5.E6.9C.AC.E8.AA.9E_.28Nihongo.29_-_Japanese -- lang: ja - words: - - ~中学校 |-> 中 - - ~大学 |-> 大 - - 独立行政法人~ -> 独 - - 学校法人~ -> 学 - - ~銀行 |-> 銀 - - ~合同会社 -> 合 - - 合同会社~ -> 合 - - ~合名会社 -> 名 - - 合名会社~ -> 名 - - ~合資会社 -> 資 - - 合資会社~ -> 資 - - 一般道道~ -> 一 - - 一般府道~ -> 一 - - 一般県道~ -> 一 - - 一般社団法人~ -> 一社 - - 一般都道~ -> 一 - - 一般財団法人~ -> 一財 - - 医療法人~ -> 医 - - ~株式会社 -> 株 - - 株式会社~ -> 株 - - 国立大学法人~ -> 大 - - 公立大学法人~ -> 大 - - ~高等学校 |-> 高 - - ~高等学校 |-> 高校 - - ~小学校 |-> 小 - - 主要地方道~ -> 主 - - 有限会社~ -> 有 - - ~有限会社 -> 有 - - 財団法人~ -> 財 diff --git a/settings/icu_tokenizer.yaml b/settings/icu_tokenizer.yaml index bb81f80b..45d21c2b 100644 --- a/settings/icu_tokenizer.yaml +++ b/settings/icu_tokenizer.yaml @@ -138,11 +138,6 @@ token-analysis: mode: variant-only variants: - !include icu-rules/variants-it.yaml - - id: ja - analyzer: generic - mode: variant-only - variants: - - !include icu-rules/variants-ja.yaml - id: mg analyzer: generic mode: variant-only diff --git a/src/nominatim_api/__init__.py b/src/nominatim_api/__init__.py index 89c57b65..bdef4258 100644 --- a/src/nominatim_api/__init__.py +++ b/src/nominatim_api/__init__.py @@ -24,7 +24,8 @@ from .types import (PlaceID as PlaceID, Point as Point, Bbox as Bbox, GeometryFormat as GeometryFormat, - DataLayer as DataLayer) + DataLayer as DataLayer, + QueryStatistics as QueryStatistics) from .results import (SourceTable as SourceTable, AddressLine as AddressLine, AddressLines as AddressLines, diff --git a/src/nominatim_api/core.py b/src/nominatim_api/core.py index f8941bcc..b6e0cb68 100644 --- a/src/nominatim_api/core.py +++ b/src/nominatim_api/core.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2024 by the Nominatim developer community. +# Copyright (C) 2025 by the Nominatim developer community. # For a full list of authors see the git log. """ Implementation of classes for API access via libraries. @@ -14,6 +14,11 @@ import sys import contextlib from pathlib import Path +if sys.version_info >= (3, 11): + from asyncio import timeout_at +else: + from async_timeout import timeout_at + import sqlalchemy as sa import sqlalchemy.ext.asyncio as sa_asyncio @@ -26,6 +31,7 @@ from .connection import SearchConnection from .status import get_status, StatusResult from .lookup import get_places, get_detailed_place from .reverse import ReverseGeocoder +from .timeout import Timeout from . import search as nsearch from . import types as ntyp from .results import DetailedResult, ReverseResult, SearchResults @@ -62,6 +68,8 @@ class NominatimAPIAsync: self.config = Configuration(project_dir, environ) self.query_timeout = self.config.get_int('QUERY_TIMEOUT') \ if self.config.QUERY_TIMEOUT else None + self.request_timeout = self.config.get_int('REQUEST_TIMEOUT') \ + if self.config.REQUEST_TIMEOUT else None self.reverse_restrict_to_country_area = self.config.get_bool('SEARCH_WITHIN_COUNTRIES') self.server_version = 0 @@ -170,12 +178,15 @@ class NominatimAPIAsync: await self.close() @contextlib.asynccontextmanager - async def begin(self) -> AsyncIterator[SearchConnection]: + async def begin(self, abs_timeout: Optional[float] = None) -> AsyncIterator[SearchConnection]: """ Create a new connection with automatic transaction handling. This function may be used to get low-level access to the database. Refer to the documentation of SQLAlchemy for details how to use the connection object. + + You may optionally give an absolute timeout until when to wait + for a connection to become available. """ if self._engine is None: await self.setup_database() @@ -183,14 +194,15 @@ class NominatimAPIAsync: assert self._engine is not None assert self._tables is not None - async with self._engine.begin() as conn: + async with timeout_at(abs_timeout), self._engine.begin() as conn: yield SearchConnection(conn, self._tables, self._property_cache, self.config) async def status(self) -> StatusResult: """ Return the status of the database. """ + timeout = Timeout(self.request_timeout) try: - async with self.begin() as conn: + async with self.begin(abs_timeout=timeout.abs) as conn: conn.set_query_timeout(self.query_timeout) status = await get_status(conn) except (PGCORE_ERROR, sa.exc.OperationalError): @@ -203,24 +215,30 @@ class NominatimAPIAsync: Returns None if there is no entry under the given ID. """ + timeout = Timeout(self.request_timeout) details = ntyp.LookupDetails.from_kwargs(params) - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - if details.keywords: - await nsearch.make_query_analyzer(conn) - return await get_detailed_place(conn, place, details) + with details.query_stats as qs: + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + if details.keywords: + await nsearch.make_query_analyzer(conn) + return await get_detailed_place(conn, place, details) async def lookup(self, places: Sequence[ntyp.PlaceRef], **params: Any) -> SearchResults: """ Get simple information about a list of places. Returns a list of place information for all IDs that were found. """ + timeout = Timeout(self.request_timeout) details = ntyp.LookupDetails.from_kwargs(params) - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - if details.keywords: - await nsearch.make_query_analyzer(conn) - return await get_places(conn, places, details) + with details.query_stats as qs: + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + if details.keywords: + await nsearch.make_query_analyzer(conn) + return await get_places(conn, places, details) async def reverse(self, coord: ntyp.AnyPoint, **params: Any) -> Optional[ReverseResult]: """ Find a place by its coordinates. Also known as reverse geocoding. @@ -233,29 +251,34 @@ class NominatimAPIAsync: # There are no results to be expected outside valid coordinates. return None + timeout = Timeout(self.request_timeout) details = ntyp.ReverseDetails.from_kwargs(params) - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - if details.keywords: - await nsearch.make_query_analyzer(conn) - geocoder = ReverseGeocoder(conn, details, - self.reverse_restrict_to_country_area) - return await geocoder.lookup(coord) + with details.query_stats as qs: + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + if details.keywords: + await nsearch.make_query_analyzer(conn) + geocoder = ReverseGeocoder(conn, details, + self.reverse_restrict_to_country_area) + return await geocoder.lookup(coord) async def search(self, query: str, **params: Any) -> SearchResults: """ Find a place by free-text search. Also known as forward geocoding. """ - query = query.strip() - if not query: - raise UsageError('Nothing to search for.') - - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - geocoder = nsearch.ForwardGeocoder(conn, ntyp.SearchDetails.from_kwargs(params), - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) - phrases = [nsearch.Phrase(nsearch.PHRASE_ANY, p.strip()) for p in query.split(',')] - return await geocoder.lookup(phrases) + timeout = Timeout(self.request_timeout) + details = ntyp.SearchDetails.from_kwargs(params) + with details.query_stats as qs: + query = query.strip() + if not query: + raise UsageError('Nothing to search for.') + + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + geocoder = nsearch.ForwardGeocoder(conn, details, timeout) + phrases = [nsearch.Phrase(nsearch.PHRASE_ANY, p.strip()) for p in query.split(',')] + return await geocoder.lookup(phrases) async def search_address(self, amenity: Optional[str] = None, street: Optional[str] = None, @@ -267,10 +290,9 @@ class NominatimAPIAsync: **params: Any) -> SearchResults: """ Find an address using structured search. """ - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - details = ntyp.SearchDetails.from_kwargs(params) - + timeout = Timeout(self.request_timeout) + details = ntyp.SearchDetails.from_kwargs(params) + with details.query_stats as qs: phrases: List[nsearch.Phrase] = [] if amenity: @@ -309,10 +331,11 @@ class NominatimAPIAsync: if amenity: details.layers |= ntyp.DataLayer.POI - geocoder = nsearch.ForwardGeocoder(conn, details, - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) - return await geocoder.lookup(phrases) + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + geocoder = nsearch.ForwardGeocoder(conn, details, timeout) + return await geocoder.lookup(phrases) async def search_category(self, categories: List[Tuple[str, str]], near_query: Optional[str] = None, @@ -321,23 +344,24 @@ class NominatimAPIAsync: The near place may either be given as an unstructured search query in itself or as coordinates. """ - if not categories: - return SearchResults() - + timeout = Timeout(self.request_timeout) details = ntyp.SearchDetails.from_kwargs(params) - async with self.begin() as conn: - conn.set_query_timeout(self.query_timeout) - if near_query: - phrases = [nsearch.Phrase(nsearch.PHRASE_ANY, p) for p in near_query.split(',')] - else: - phrases = [] - if details.keywords: - await nsearch.make_query_analyzer(conn) + with details.query_stats as qs: + if not categories: + return SearchResults() + + async with self.begin(abs_timeout=timeout.abs) as conn: + qs.log_time('start_query') + conn.set_query_timeout(self.query_timeout) + if near_query: + phrases = [nsearch.Phrase(nsearch.PHRASE_ANY, p) for p in near_query.split(',')] + else: + phrases = [] + if details.keywords: + await nsearch.make_query_analyzer(conn) - geocoder = nsearch.ForwardGeocoder(conn, details, - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) - return await geocoder.lookup_pois(categories, phrases) + geocoder = nsearch.ForwardGeocoder(conn, details, timeout) + return await geocoder.lookup_pois(categories, phrases) class NominatimAPI: @@ -434,6 +458,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. @@ -516,6 +542,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. @@ -596,6 +624,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. @@ -695,6 +725,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. @@ -811,6 +843,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. @@ -918,6 +952,8 @@ class NominatimAPI: Only POI places can have parents. (Default: False) keywords (bool): Add detailed information about the search terms used for this place. + query_stats (QueryStatistics): When given collects statistics + about the query execution. Returns: source_table (enum): Data source of the place. See below for possible values. diff --git a/src/nominatim_api/localization.py b/src/nominatim_api/localization.py index bbf9225b..3c786a20 100644 --- a/src/nominatim_api/localization.py +++ b/src/nominatim_api/localization.py @@ -8,6 +8,8 @@ Helper functions for localizing names of results. """ from typing import Mapping, List, Optional +from .config import Configuration +from .results import AddressLines, BaseResultT import re @@ -20,14 +22,18 @@ class Locales: """ def __init__(self, langs: Optional[List[str]] = None): + self.config = Configuration(None) self.languages = langs or [] self.name_tags: List[str] = [] - # Build the list of supported tags. It is currently hard-coded. - self._add_lang_tags('name') - self._add_tags('name', 'brand') - self._add_lang_tags('official_name', 'short_name') - self._add_tags('official_name', 'short_name', 'ref') + parts = self.config.OUTPUT_NAMES.split(',') + + for part in parts: + part = part.strip() + if part.endswith(":XX"): + self._add_lang_tags(part[:-3]) + else: + self._add_tags(part) def __bool__(self) -> bool: return len(self.languages) > 0 @@ -91,3 +97,24 @@ class Locales: languages.append(parts[0]) return Locales(languages) + + def localize(self, lines: AddressLines) -> None: + """ Sets the local name of address parts according to the chosen + locale. + + Only address parts that are marked as isaddress are localized. + + AddressLines should be modified in place. + """ + for line in lines: + if line.isaddress and line.names: + line.local_name = self.display_name(line.names) + + def localize_results(self, results: List[BaseResultT]) -> None: + """ Set the local name of results according to the chosen + locale. + """ + for result in results: + result.locale_name = self.display_name(result.names) + if result.address_rows: + self.localize(result.address_rows) diff --git a/src/nominatim_api/logging.py b/src/nominatim_api/logging.py index 1a6aef9b..dccc69c1 100644 --- a/src/nominatim_api/logging.py +++ b/src/nominatim_api/logging.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2024 by the Nominatim developer community. +# Copyright (C) 2025 by the Nominatim developer community. # For a full list of authors see the git log. """ Functions for specialised logging with HTML output. @@ -106,9 +106,6 @@ class BaseLogger: except TypeError: return sqlstr - # Fixes an odd issue with Python 3.7 where percentages are not - # quoted correctly. - sqlstr = re.sub(r'%(?!\()', '%%', sqlstr) sqlstr = re.sub(r'__\[POSTCOMPILE_([^]]*)\]', r'%(\1)s', sqlstr) return sqlstr % params @@ -342,7 +339,8 @@ HTML_HEADER: str = """ Nominatim - Debug