mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-11-22 21:28:10 +03:00
generally remove all country and state places from address
Gets rid of the hard-coded expection for place nodes and sets the address rank generally via the address level config instead. That means only administrative boundaries are now used at that level in addresses.
This commit is contained in:
parent
dd50f1737b
commit
b0e6fb73c6
@ -3,8 +3,8 @@
|
|||||||
"place" : {
|
"place" : {
|
||||||
"sea" : [2, 0],
|
"sea" : [2, 0],
|
||||||
"continent" : [2, 0],
|
"continent" : [2, 0],
|
||||||
"country" : [4, 4],
|
"country" : [4, 0],
|
||||||
"state" : [8, 8],
|
"state" : [8, 0],
|
||||||
"region" : [18, 0],
|
"region" : [18, 0],
|
||||||
"county" : 12,
|
"county" : 12,
|
||||||
"city" : 16,
|
"city" : 16,
|
||||||
|
@ -887,11 +887,7 @@ BEGIN
|
|||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
-- some postcorrections
|
-- some postcorrections
|
||||||
IF NEW.class = 'place' THEN
|
IF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
|
||||||
IF NEW.type in ('continent', 'sea', 'country', 'state') AND NEW.osm_type = 'N' THEN
|
|
||||||
NEW.rank_address := 0;
|
|
||||||
END IF;
|
|
||||||
ELSEIF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
|
|
||||||
-- Slightly promote waterway relations so that they are processed
|
-- Slightly promote waterway relations so that they are processed
|
||||||
-- before their members.
|
-- before their members.
|
||||||
NEW.rank_search := NEW.rank_search - 1;
|
NEW.rank_search := NEW.rank_search - 1;
|
||||||
@ -908,11 +904,6 @@ BEGIN
|
|||||||
NEW.country_code := NULL;
|
NEW.country_code := NULL;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
-- Block import below rank 22
|
|
||||||
-- IF NEW.rank_search > 22 THEN
|
|
||||||
-- RETURN NULL;
|
|
||||||
-- END IF;
|
|
||||||
|
|
||||||
--DEBUG: RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
|
--DEBUG: RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
|
||||||
|
|
||||||
RETURN NEW; -- %DIFFUPDATES% The following is not needed until doing diff updates, and slows the main index process down
|
RETURN NEW; -- %DIFFUPDATES% The following is not needed until doing diff updates, and slows the main index process down
|
||||||
|
Loading…
Reference in New Issue
Block a user