Merge pull request #3840 from lonvia/normalize-penalties

Improve termination condition for forward search

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 |

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
 

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
+Additional information requested with `addressdetails=1`, `extratags=1`,
-`namedetails=1` can be found in extra elements.
+`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
+Additional information requested with `extratags=1`, `namedetails=1`, and
-be found in extra elements as sub-element of `extratags` and `namedetails`
+`entrances=1` can be found in extra elements as sub-element of `extratags`,
-respectively.
+`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"
+      }
+    }
+  ]
+}
+```

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
 

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
 

docs/customize/Settings.md

@@ -648,21 +648,53 @@ See also [NOMINATIM_DEFAULT_LANGUAGE](#nominatim_default_language).
 | **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:
+| 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}"` |
 
-    <request time> <execution time in s> <number of results> <type> "<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. |
+///
 
-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.
 
 #### NOMINATIM_DEBUG_SQL
 

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;
+}

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
+The `address_row` field has a helper function to compute the display name for each Address Line
-its members and save the result in the `local_name` field. It also returns
+component based on its `local_name` field. This is then utilized by the overall `result` object,
-all the localized names as a convenient simple list. This list can be used
+which has a helper function to apply the function to all its ‘address_row’ members and saves
-to create a human-readable output:
+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
 ```

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
 

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},
@@ -362,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'}

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;

lib-sql/functions/placex_triggers.sql

@@ -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
@@ -667,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
 
@@ -874,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,

lib-sql/functions/utils.sql

@@ -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;

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,

mkdocs.yml

@@ -67,6 +67,7 @@ markdown_extensions:
     - codehilite
     - admonition
     - pymdownx.superfences
+    - pymdownx.blocks.html
     - pymdownx.tabbed:
         alternate_style: true
     - def_list

packaging/nominatim-api/pyproject.toml

@@ -15,6 +15,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
+    "async-timeout",
     "python-dotenv",
     "pyYAML>=5.1",
     "SQLAlchemy>=1.4.31",

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,
+          "residential" : 24,
-          "farm" : 22,
+          "farm" : 24,
-          "farmyard" : 22,
+          "farmyard" : 24,
-          "industrial" : 22,
+          "industrial" : 24,
-          "commercial" : 22,
+          "commercial" : 24,
-          "allotments" : 22,
+          "allotments" : 24,
-          "retail" : 22,
+          "retail" : 24,
-          "" : [22, 0]
+          "" : [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
+      }
+  }
 }
 
 ]

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

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

settings/country-names/af.yaml

@@ -96,7 +96,6 @@ name:
     na: Apeganitan
     ne: अफगानिस्तान
     nl: Afghanistan
-    nn: Afghanistan
     "no": Afghanistan
     oc: Afganistan
     om: Afgaanistaan

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

settings/country-names/ai.yaml

@@ -50,7 +50,6 @@ name:
     ms: Anguilla
     ne: एन्गुला
     nl: Anguilla
-    nn: Anguilla
     "no": Anguilla
     oc: Anguilla
     pa: ਐਂਗੁਈਲਾ

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

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

settings/country-names/ao.yaml

@@ -90,7 +90,6 @@ name:
     na: Angora
     ne: अंगोला
     nl: Angola
-    nn: Angola
     "no": Angola
     nv: Angóola
     ny: Angola

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

settings/country-names/at.yaml

@@ -93,6 +93,7 @@ name:
     mt: Awstrija
     my: သြစတြီးယားနိုင်ငံ
     na: Oteriya
+    nb: Østerrike
     ne: अष्ट्रीया
     nl: Oostenrijk
     nn: Austerrike

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

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

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

settings/country-names/bb.yaml

@@ -77,7 +77,6 @@ name:
     na: Barbadot
     ne: बार्बाडोस
     nl: Barbados
-    nn: Barbados
     "no": Barbados
     oc: Barbados
     om: Baarbeedoos

settings/country-names/bd.yaml

@@ -29,6 +29,7 @@ name:
     lt: Bangladešas
     lv: Bangladeša
     mn: Бангладеш
+    "no": Bangladesh
     pl: Bangladesz
     pt: Bangladesh
     ru: Бангладеш

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

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

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

settings/country-names/bh.yaml

@@ -91,7 +91,6 @@ name:
     na: Bahrain
     ne: बहराइन
     nl: Bahrein
-    nn: Bahrain
     "no": Bahrain
     oc: Bahrayn
     om: Baahireen

settings/country-names/bi.yaml

@@ -88,7 +88,6 @@ name:
     na: Burundi
     ne: बुरूण्डी
     nl: Burundi
-    nn: Burundi
     "no": Burundi
     oc: Burundi
     om: Buruundii

settings/country-names/bj.yaml

@@ -91,7 +91,6 @@ name:
     na: Benin
     ne: बेनिन
     nl: Benin
-    nn: Benin
     "no": Benin
     oc: Benin
     om: Beeniin

settings/country-names/bm.yaml

@@ -25,6 +25,7 @@ name:
     lv: Bermudu salas
     mk: Бермуда
     mn: Бермудын Арал
+    "no": Bermuda
     oc: Bermudas
     pl: Bermudy
     pt: Bermudas

settings/country-names/bn.yaml

@@ -91,7 +91,6 @@ name:
     na: Brunei
     ne: ब्रुनेई
     nl: Brunei
-    nn: Brunei
     "no": Brunei
     ny: Brunei
     oc: Brunei

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

settings/country-names/br.yaml

@@ -99,7 +99,6 @@ name:
     na: Bradir
     ne: ब्राजिल
     nl: Brazilië
-    nn: Brasil
     "no": Brasil
     nv: Bwazííl
     oc: Brasil

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

settings/country-names/bt.yaml

@@ -92,7 +92,6 @@ name:
     na: Butan
     ne: भूटान
     nl: Bhutan
-    nn: Bhutan
     "no": Bhutan
     nv: Bikéyah
     oc: Botan

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

settings/country-names/by.yaml

@@ -83,8 +83,7 @@ name:
     na: Berarut
     ne: बेलारुस
     nl: Wit-Rusland
-    nn: Kviterussland
+    "no": Belarus
-    "no": Hviterussland
     oc: Bielorussia
     or: ବେଲାଋଷ
     os: Белорусси

settings/country-names/bz.yaml

@@ -85,7 +85,6 @@ name:
     na: Berij
     ne: बेलिज
     nl: Belize
-    nn: Belize
     "no": Belize
     oc: Belize
     om: Beliiz

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à

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

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

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

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

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

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

settings/country-names/cl.yaml

@@ -103,7 +103,6 @@ name:
     na: Tsire
     ne: चिली
     nl: Chili
-    nn: Chile
     "no": Chile
     nv: Chíilii
     ny: Chile

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

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

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

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

settings/country-names/cu.yaml

@@ -78,7 +78,6 @@ name:
     na: Kiuba
     ne: क्युबा
     nl: Cuba
-    nn: Cuba
     "no": Cuba
     nv: Kyóoba
     oc: Cuba

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: Кабо-Верде

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

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

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

settings/country-names/dj.yaml

@@ -74,7 +74,6 @@ name:
     na: Djibuti
     ne: जिबुटी
     nl: Djibouti
-    nn: Djibouti
     "no": Djibouti
     nv: Jibótii
     oc: Jiboti

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

settings/country-names/dm.yaml

@@ -28,6 +28,7 @@ name:
     lv: Dominika
     mn: Доминика
     nl: Dominica
+    "no": Dominica
     pl: Dominika
     pt: Dominica
     ru: Доминика

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

settings/country-names/dz.yaml

@@ -93,7 +93,6 @@ name:
     na: Ardjiriya
     ne: अल्जेरिया
     nl: Algerije
-    nn: Algerie
     "no": Algerie
     nv: Aljííya
     ny: Algeria

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

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

settings/country-names/eg.yaml

@@ -97,7 +97,6 @@ name:
     na: Idjipt
     ne: मिश्र
     nl: Egypte
-    nn: Egypt
     "no": Egypt
     nv: Ííjip
     oc: Egipte

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: صحراوی عرب عوامی جمہوریہ

settings/country-names/er.yaml

@@ -77,7 +77,6 @@ name:
     na: Eritrea
     ne: एरिट्रिया
     nl: Eritrea
-    nn: Eritrea
     "no": Eritrea
     oc: Eritrèa
     om: Eritrea

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

settings/country-names/et.yaml

@@ -92,7 +92,6 @@ name:
     na: Itiyopiya
     ne: इथियोपिया
     nl: Ethiopië
-    nn: Etiopia
     "no": Etiopia
     nv: Iithiyópya
     oc: Etiopia

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

settings/country-names/fj.yaml

@@ -73,7 +73,6 @@ name:
     na: Bidji
     ne: फिजी
     nl: Fiji
-    nn: Fiji
     "no": Fiji
     nv: Fííjii
     oc: Fiji

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

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: Федеративные Штаты Микронезии

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

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

settings/country-names/ga.yaml

@@ -77,7 +77,6 @@ name:
     na: Gabun
     ne: गाबोन
     nl: Gabon
-    nn: Gabon
     "no": Gabon
     nv: Gabǫ́ǫ́
     oc: Gabon

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

settings/country-names/gd.yaml

@@ -27,6 +27,7 @@ name:
     lv: Grenāda
     mn: Гренада
     nl: Grenada
+    "no": Grenada
     pl: Granada
     pt: Granada
     ru: Гренада

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)

settings/country-names/gg.yaml

@@ -55,7 +55,6 @@ name:
     ms: Guernsey
     ne: गुर्न्जी
     nl: Guernsey
-    nn: Guernsey
     "no": Guernsey
     oc: Guernesey
     os: Гернси

settings/country-names/gh.yaml

@@ -83,7 +83,6 @@ name:
     na: Gana
     ne: घाना
     nl: Ghana
-    nn: Ghana
     "no": Ghana
     nv: Gáana
     oc: Ghana

settings/country-names/gi.yaml

@@ -63,7 +63,6 @@ name:
     my: ဂျီဘရော်လ်တာ
     ne: गिब्राल्टार
     nl: Gibraltar
-    nn: Gibraltar
     "no": Gibraltar
     oc: Gibartar
     or: ଜିବ୍ରାଲେଟର

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

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

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

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

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

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

settings/country-names/gt.yaml

@@ -77,7 +77,6 @@ name:
     na: Guatemara
     ne: ग्वाटेमाला
     nl: Guatemala
-    nn: Guatemala
     "no": Guatemala
     oc: Guatemala
     os: Гватемалæ

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

settings/country-names/gy.yaml

@@ -77,7 +77,6 @@ name:
     na: Guyana
     ne: गुयना
     nl: Guyana
-    nn: Guyana
     "no": Guyana
     oc: Guyana
     or: ଗାଇଓନା

settings/country-names/hn.yaml

@@ -75,7 +75,6 @@ name:
     na: Ondurat
     ne: होण्डुरस
     nl: Honduras
-    nn: Honduras
     "no": Honduras
     oc: Honduras
     or: ହୋଣ୍ଡାରୁସ

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