reorganize ranks of high-level place types

Rank 25 is now available for places that should appear in addresses
but not when a street is present. Use this for som block-like
place types. Also document the particularity of rank 25.

subdevisions and allotments are now at the same level as landuse
which they are frequently used together with.

diff --git a/docs/develop/Ranking.md b/docs/develop/Ranking.md
index 278039db6c923c4ab4db46b64f70d75c61ef41e6..06f255004dcbc3b8cf272303da96880e3abc3c2a 100644 (file)
--- a/docs/develop/Ranking.md
+++ b/docs/develop/Ranking.md
@@ -23,7 +23,7 @@ rank   | typical place types             | extent
 4      | countries                       | -
 5-9    | states, regions, provinces      | -
 10-12  | counties                        | -
 4      | countries                       | -
 5-9    | states, regions, provinces      | -
 10-12  | counties                        | -

-13-16  | cities, municipalities, islands | 7.5 km
+13-16  | cities, municipalities, islands | 15 km

 17-18  | towns, boroughs                 | 4 km
 19     | villages, suburbs               | 2 km
 20     | hamlets, farms, neighbourhoods  |  1 km
 17-18  | towns, boroughs                 | 4 km
 19     | villages, suburbs               | 2 km
 20     | hamlets, farms, neighbourhoods  |  1 km


@@ -51,16 +51,24 @@ The following table gives an overview how ranks are mapped to address parts:
  10-12       | county
  13-16       | city
  17-21       | suburb
  10-12       | county
  13-16       | city
  17-21       | suburb

- 22-25       | neighbourhood
+ 22-24       | neighbourhood
+ 25          | squares, farms, localities

  26-27       | street
  28-30       | POI/house number
 
 The country rank 4 usually doesn't show up in the address parts of an object.
 The country is determined indirectly from the country code.
 
  26-27       | street
  28-30       | POI/house number
 
 The country rank 4 usually doesn't show up in the address parts of an object.
 The country is determined indirectly from the country code.
 

-Ranks 5-25 can be assigned more or less freely. They make up the major part
+Ranks 5-24 can be assigned more or less freely. They make up the major part

 of the address.
 
 of the address.
 

+Rank 25 is also an addressing rank but it is special because while it can be
+the parent to a POI with an addr:place of the same name, it cannot be a parent
+to streets. Use it for place features that are technically on the same level
+as a street (e.g. squares, city blocks) or for places that should not normally
+appear in an address unless explicitly tagged so (e.g place=locality which
+should be uninhabited and as such not addressable).
+

 The street ranks 26 and 27 are handled slightly differently. Only one object
 from these ranks shows up in an address.
 
 The street ranks 26 and 27 are handled slightly differently. Only one object
 from these ranks shows up in an address.
 

diff --git a/settings/address-levels.json b/settings/address-levels.json
index 574e0dd041ef590fe3e100b1c7258d0f3743e655..1810af59755be89a1ed734594ad35cc51e895129 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -10,26 +10,26 @@
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,

+          "district" : 12,

           "municipality" : 14,
           "city" : 16,
           "town" : [18, 16],
           "borough" : 18,
           "village" : [19, 16],
           "municipality" : 14,
           "city" : 16,
           "town" : [18, 16],
           "borough" : 18,
           "village" : [19, 16],

-          "district" : [19, 16],

           "suburb" : [19, 20],
           "hamlet" : 20,
           "croft" : 20,
           "suburb" : [19, 20],
           "hamlet" : 20,
           "croft" : 20,

-          "subdivision" : 20,
-          "allotments" : 20,
+          "subdivision" : 22,
+          "allotments" : 22,

           "neighbourhood" : [20, 22],
           "quarter" : [20, 22],
           "isolated_dwelling" : [22, 20],
           "neighbourhood" : [20, 22],
           "quarter" : [20, 22],
           "isolated_dwelling" : [22, 20],

-          "city_block" : 22,
-          "mountain_pass" : [20, 0],
+          "farm" : [22, 20],
+          "city_block" : 25,
+          "mountain_pass" : 25,

           "square" : 25,
           "square" : 25,

+          "locality" : 25,

           "houses" : [28, 0],
           "houses" : [28, 0],

-          "farm" : [20, 0],
-          "locality" : [20, 0],

           "house" : 30,
           "" : [22, 0]
       },
           "house" : 30,
           "" : [22, 0]
       },