From: Sarah Hoffmann Date: Wed, 4 Mar 2020 10:55:30 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~250 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c61b5219f9eeb48b09d5e74e1f5afc5a955682b9?hp=6b52e3765c7de9fa4831470d5f079b37e45d92bf Merge remote-tracking branch 'upstream/master' --- diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index e16b7783..d123e362 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -609,6 +609,8 @@ DECLARE location RECORD; relation_members TEXT[]; + centroid GEOMETRY; + addr_street TEXT; addr_place TEXT; @@ -683,10 +685,10 @@ BEGIN -- Speed up searches - just use the centroid of the feature -- cheaper but less acurate NEW.centroid := ST_PointOnSurface(NEW.geometry); - -- For searching near features rather use the centroid - NEW.postcode := null; --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid); + NEW.postcode := null; + -- 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, @@ -721,6 +723,7 @@ BEGIN and ( relation_members[i+1] != 'side_stream' or NEW.name->'name' = name->'name') LOOP UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id; + DELETE FROM search_name WHERE place_id = linked_node_id; END LOOP; END IF; END LOOP; @@ -837,9 +840,12 @@ BEGIN IF location.place_id is not null THEN --DEBUG: RAISE WARNING 'Linked %', location; - -- Use this as the centre point of the geometry - NEW.centroid := coalesce(location.centroid, - ST_Centroid(location.geometry)); + -- Use the linked point as the centre point of the geometry, + -- but only if it is within the area of the boundary. + centroid := coalesce(location.centroid, ST_Centroid(location.geometry)); + IF centroid is not NULL AND ST_Within(centroid, NEW.geometry) THEN + NEW.centroid := centroid; + END IF; -- Use the address rank of the linked place, if it has one IF location.rank_address between 5 and 25 THEN @@ -859,6 +865,8 @@ BEGIN -- mark the linked place (excludes from search results) UPDATE placex set linked_place_id = NEW.place_id WHERE place_id = location.place_id; + -- ensure that those places are not found anymore + DELETE FROM search_name WHERE place_id = location.place_id; SELECT wikipedia, importance FROM compute_importance(location.extratags, NEW.country_code, diff --git a/test/bdd/db/import/linking.feature b/test/bdd/db/import/linking.feature index 1bca7dfc..fa96e5b3 100644 --- a/test/bdd/db/import/linking.feature +++ b/test/bdd/db/import/linking.feature @@ -198,3 +198,21 @@ Feature: Linking of places | ID | osm_type | osm_id | | 0 | N | 2 | + # github #1352 + Scenario: Do not use linked centroid when it is outside the area + Given the named places + | osm | class | type | admin | geometry | + | R13 | boundary | administrative | 4 | poly-area:0.01 | + And the named places + | osm | class | type | geometry | + | N2 | place | city | 0.1 0.1 | + And the relations + | id | members | tags+type | + | 13 | N2:label | boundary | + When importing + Then placex contains + | object | linked_place_id | + | N2 | R13 | + And placex contains + | object | centroid | + | R13 | in geometry | diff --git a/test/bdd/db/import/search_name.feature b/test/bdd/db/import/search_name.feature index af31d46a..c4e5bbce 100644 --- a/test/bdd/db/import/search_name.feature +++ b/test/bdd/db/import/search_name.feature @@ -77,3 +77,36 @@ Feature: Creation of search terms | object | nameaddress_vector | | W1 | bonn, new york, smalltown | + Scenario: a linked place does not show up in search name + Given the named places + | osm | class | type | admin | geometry | + | R13 | boundary | administrative | 9 | poly-area:0.01 | + And the named places + | osm | class | type | geometry | + | N2 | place | city | 0.1 0.1 | + And the relations + | id | members | tags+type | + | 13 | N2:label | boundary | + When importing + Then placex contains + | object | linked_place_id | + | N2 | R13 | + And search_name has no entry for N2 + + Scenario: a linked waterway does not show up in search name + Given the scene split-road + And the places + | osm | class | type | name | geometry | + | W1 | waterway | river | Rhein | :w-2 | + | W2 | waterway | river | Rhein | :w-3 | + | R13 | waterway | river | Rhein | :w-1 + :w-2 + :w-3 | + And the relations + | id | members | tags+type | + | 13 | W1,W2:main_stream | waterway | + When importing + Then placex contains + | object | linked_place_id | + | W1 | R13 | + | W2 | R13 | + And search_name has no entry for W1 + And search_name has no entry for W2 diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py index 885c2df9..f4c485fd 100644 --- a/test/bdd/steps/db_ops.py +++ b/test/bdd/steps/db_ops.py @@ -197,10 +197,18 @@ def assert_db_column(row, column, value, context): return if column.startswith('centroid'): - fac = float(column[9:]) if column.startswith('centroid*') else 1.0 - x, y = value.split(' ') - assert_almost_equal(float(x) * fac, row['cx'], "Bad x coordinate") - assert_almost_equal(float(y) * fac, row['cy'], "Bad y coordinate") + if value == 'in geometry': + query = """SELECT ST_Within(ST_SetSRID(ST_Point({}, {}), 4326), + ST_SetSRID('{}'::geometry, 4326))""".format( + row['cx'], row['cy'], row['geomtxt']) + cur = context.db.cursor() + cur.execute(query) + eq_(cur.fetchone()[0], True, "(Row %s failed: %s)" % (column, query)) + else: + fac = float(column[9:]) if column.startswith('centroid*') else 1.0 + x, y = value.split(' ') + assert_almost_equal(float(x) * fac, row['cx'], msg="Bad x coordinate") + assert_almost_equal(float(y) * fac, row['cy'], msg="Bad y coordinate") elif column == 'geometry': geom = context.osm.parse_geometry(value, context.scene) cur = context.db.cursor()