Merge remote-tracking branch 'upstream/master'

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 884dd44d5ee8042493999007f18cc7ee04d5743c..7b227410c9032db135c49c351bafe4de110f8555 100644 (file)
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@ -153,7 +153,7 @@ if you plan to use the installation only for exports to a
 [photon](https://photon.komoot.io/) database, then you can set up a database
 without search indexes. Add `--reverse-only` to your setup command above.
 
-This saves about 5% of disk space.
+This saves about 5% of disk space, import time won't be significant faster.
 
 ### Filtering Imported Data
 

diff --git a/nominatim/api/reverse.py b/nominatim/api/reverse.py
index e16742cfa34170f6a8afbd0da75b6c945d7635d7..5471455962e991aabf728aa8448568eff2bd876f 100644 (file)
--- a/nominatim/api/reverse.py
+++ b/nominatim/api/reverse.py
@@ -186,7 +186,7 @@ class ReverseGeocoder:
                 .where(sa.or_(sa.not_(t.c.geometry.is_area()),
                               t.c.centroid.ST_Distance(WKT_PARAM) < diststr))
                 .order_by('distance')
-                .limit(1))
+                .limit(2))
 
         if self.has_geometries():
             sql = self._add_geometry_columns(sql, t.c.geometry)
@@ -212,7 +212,20 @@ class ReverseGeocoder:
 
         sql = sql.where(sa.or_(*restrict))
 
-        return (await self.conn.execute(sql, self.bind_params)).one_or_none()
+        # If the closest object is inside an area, then check if there is a
+        # POI node nearby and return that.
+        prev_row = None
+        for row in await self.conn.execute(sql, self.bind_params):
+            if prev_row is None:
+                if row.rank_search <= 27 or row.osm_type == 'N' or row.distance > 0:
+                    return row
+                prev_row = row
+            else:
+                if row.rank_search > 27 and row.osm_type == 'N'\
+                   and row.distance < 0.0001:
+                    return row
+
+        return prev_row
 
 
     async def _find_housenumber_for_street(self, parent_place_id: int) -> Optional[SaRow]:

diff --git a/nominatim/api/v1/format_json.py b/nominatim/api/v1/format_json.py
index 80560c95278da93f5175dbe5e0ceb232abeb6d51..1c17a032c586c6308023da8927dcbb0c8edef407 100644 (file)
--- a/nominatim/api/v1/format_json.py
+++ b/nominatim/api/v1/format_json.py
@@ -247,7 +247,8 @@ def format_base_geocodejson(results: Union[napi.ReverseResults, napi.SearchResul
             out.key('admin').start_object()
             if result.address_rows:
                 for line in result.address_rows:
-                    if line.isaddress and (line.admin_level or 15) < 15 and line.local_name:
+                    if line.isaddress and (line.admin_level or 15) < 15 and line.local_name \
+                       and line.category[0] == 'boundary' and line.category[1] == 'administrative':
                         out.keyval(f"level{line.admin_level}", line.local_name)
             out.end_object().next()
 

diff --git a/nominatim/clicmd/api.py b/nominatim/clicmd/api.py
index e8450e6ba9890aef096f5911e606277038eab02a..3c5416fea4fd1ed92373d18c187eea2c29f4d287 100644 (file)
--- a/nominatim/clicmd/api.py
+++ b/nominatim/clicmd/api.py
@@ -17,6 +17,7 @@ from nominatim.clicmd.args import NominatimArgs
 import nominatim.api as napi
 import nominatim.api.v1 as api_output
 from nominatim.api.v1.helpers import zoom_to_rank, deduplicate_results
+from nominatim.api.v1.format import dispatch as formatting
 import nominatim.api.logging as loglib
 
 # Do not repeat documentation of subcommand classes.
@@ -44,7 +45,7 @@ EXTRADATA_PARAMS = (
 def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None:
     group = parser.add_argument_group('Output arguments')
     group.add_argument('--format', default='jsonv2',
-                       choices=['xml', 'json', 'jsonv2', 'geojson', 'geocodejson', 'debug'],
+                       choices=formatting.list_formats(napi.SearchResults) + ['debug'],
                        help='Format of result')
     for name, desc in EXTRADATA_PARAMS:
         group.add_argument('--' + name, action='store_true', help=desc)

diff --git a/test/python/api/test_api_reverse.py b/test/python/api/test_api_reverse.py
index c51b3951af251e47f899e54ef35a5bce756ab1bc..8f8b2dba246bc4e676bb520208eb4451e72f22e9 100644 (file)
--- a/test/python/api/test_api_reverse.py
+++ b/test/python/api/test_api_reverse.py
@@ -68,24 +68,24 @@ def test_reverse_ignore_unindexed(apiobj, frontend):
                                               (0.70003, napi.DataLayer.MANMADE | napi.DataLayer.NATURAL, 225),
                                               (5, napi.DataLayer.ADDRESS, 229)])
 def test_reverse_rank_30_layers(apiobj, frontend, y, layer, place_id):
-    apiobj.add_placex(place_id=223, class_='place', type='house',
+    apiobj.add_placex(place_id=223, osm_type='N', class_='place', type='house',
                       housenumber='1',
                       rank_address=30,
                       rank_search=30,
                       centroid=(1.3, 0.70001))
-    apiobj.add_placex(place_id=224, class_='amenity', type='toilet',
+    apiobj.add_placex(place_id=224, osm_type='N', class_='amenity', type='toilet',
                       rank_address=30,
                       rank_search=30,
                       centroid=(1.3, 0.7))
-    apiobj.add_placex(place_id=225, class_='man_made', type='tower',
+    apiobj.add_placex(place_id=225, osm_type='N', class_='man_made', type='tower',
                       rank_address=0,
                       rank_search=30,
                       centroid=(1.3, 0.70003))
-    apiobj.add_placex(place_id=226, class_='railway', type='station',
+    apiobj.add_placex(place_id=226, osm_type='N', class_='railway', type='station',
                       rank_address=0,
                       rank_search=30,
                       centroid=(1.3, 0.70004))
-    apiobj.add_placex(place_id=227, class_='natural', type='cave',
+    apiobj.add_placex(place_id=227, osm_type='N', class_='natural', type='cave',
                       rank_address=0,
                       rank_search=30,
                       centroid=(1.3, 0.70005))