hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1971 from lonvia/drop-support-for-isin

Browse Source 
Drop support for is_in tag
This commit is contained in:
Sarah Hoffmann
2020-09-23 09:20:35 +02:00
committed by GitHub
parent c5c242d193 248d6b413a
commit f2ff351da4
4 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settings/import-extratags.style
View File

@@ -211,7 +211,7 @@
} }
}, },
{ {
"keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"], "keys" : ["addr:*", "is_in:*", "tiger:county"],
"values" : { "values" : {
"" : "address" "" : "address"
} }

2
settings/import-full.style
View File

@@ -211,7 +211,7 @@
} }
}, },
{ {
"keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"], "keys" : ["addr:*", "is_in:*", "tiger:county"],
"values" : { "values" : {
"" : "address" "" : "address"
} }

17
sql/functions/placex_triggers.sql
View File

@@ -290,23 +290,6 @@ BEGIN
END IF; END IF;
END IF; END IF;
END LOOP; END LOOP;
IF address ? 'is_in' THEN
-- is_in items need splitting
isin := regexp_split_to_array(address->'is_in', E'[;,]');
IF array_upper(isin, 1) IS NOT NULL THEN
FOR i IN 1..array_upper(isin, 1) LOOP
isin_tokens := array_merge(isin_tokens,
word_ids_from_name(isin[i]));
-- merge word into address vector
IF NOT %REVERSE-ONLY% THEN
nameaddress_vector := array_merge(nameaddress_vector,
addr_ids_from_name(isin[i]));
END IF;
END LOOP;
END IF;
END IF;
END IF; END IF;
IF NOT %REVERSE-ONLY% THEN IF NOT %REVERSE-ONLY% THEN
nameaddress_vector := array_merge(nameaddress_vector, isin_tokens); nameaddress_vector := array_merge(nameaddress_vector, isin_tokens);

15
test/bdd/db/import/search_name.feature
View File

@@ -223,21 +223,6 @@ Feature: Creation of search terms
| object | nameaddress_vector | | object | nameaddress_vector |
| W1 | 12345 | | W1 | 12345 |
Scenario: is_in is split and added to the address search terms
Given the scene roads-with-pois
And the places
| osm | class | type | name | geometry |
| N1 | place | state | new york | 80 80 |
| N2 | place | city | bonn | 81 81 |
| N3 | place | suburb | smalltown| 80 81 |
And the named places
| osm | class | type | addr+is_in | geometry |
| W1 | highway | service | bonn, New York, Smalltown | :w-north |
When importing
Then search_name contains
| object | nameaddress_vector |
| W1 | bonn, new york, smalltown |
Scenario: a linked place does not show up in search name Scenario: a linked place does not show up in search name
Given the named places Given the named places
| osm | class | type | admin | geometry | | osm | class | type | admin | geometry |