Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / taginfo.json

diff --git a/website/taginfo.json b/website/taginfo.json
index 3618026750b26946962942aea4fd5c3e1212bf75..98f8b978a7031672e5745247ef3c49a72ee5110b 100644 (file)
--- a/website/taginfo.json
+++ b/website/taginfo.json
@@ -18,9 +18,7 @@
       { "key" : "old_ref", "description": "Searchable name of the place."},
       { "key" : "iata", "description": "Searchable name of the place."},
       { "key" : "icao", "description": "Searchable name of the place."},
       { "key" : "old_ref", "description": "Searchable name of the place."},
       { "key" : "iata", "description": "Searchable name of the place."},
       { "key" : "icao", "description": "Searchable name of the place."},

-      { "key" : "pcode:1", "description": "Searchable name of the place."},
-      { "key" : "pcode:2", "description": "Searchable name of the place."},
-      { "key" : "pcode:3", "description": "Searchable name of the place."},
+      { "key" : "pcode", "description": "Searchable name of the place."},

       { "key" : "name", "description": "Searchable name of the place."},
       { "key" : "int_name", "description": "Searchable name of the place."},
       { "key" : "nat_name", "description": "Searchable name of the place."},
       { "key" : "name", "description": "Searchable name of the place."},
       { "key" : "int_name", "description": "Searchable name of the place."},
       { "key" : "nat_name", "description": "Searchable name of the place."},


@@ -43,8 +41,8 @@
       { "key" : "natural", "description": "POI in the search database." },
       { "key" : "man_made", "description": "POI in the search database." },
       { "key" : "mountain_pass", "description": "POI in the search database." },
       { "key" : "natural", "description": "POI in the search database." },
       { "key" : "man_made", "description": "POI in the search database." },
       { "key" : "mountain_pass", "description": "POI in the search database." },

-      { "key" : "highway", "description": "POI or street in the search database (not added are: 'no', 'turning_circle', 'traffic_signals', 'mini_roundabout', 'noexit', 'crossing')." },
-      { "key" : "aerialway", "description": "POI in the search database (unless value is 'no')." },
+      { "key" : "highway", "description": "POI or street in the search database (not added are: 'no', 'turning_circle', 'traffic_signals', 'mini_roundabout', 'crossing' and traffic signs)." },
+      { "key" : "aerialway", "description": "POI in the search database (unless value is 'no', 'pylon')." },

       { "key" : "aeroway", "description": "POI in the search database (unless value is 'no')." },
       { "key" : "amenity", "description": "POI in the search database (unless value is 'no')." },
       { "key" : "boundary", "description": "Area in the search database (used to compute addresses of other places)." },
       { "key" : "aeroway", "description": "POI in the search database (unless value is 'no')." },
       { "key" : "amenity", "description": "POI in the search database (unless value is 'no')." },
       { "key" : "boundary", "description": "Area in the search database (used to compute addresses of other places)." },


@@ -64,10 +62,11 @@
       { "key" : "tiger:zip_left", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "tiger:zip_right", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "addr:street", "description": "Used to determine the street of a house or POI. Note that a street with the same name must exist for the tag to be effective."},
       { "key" : "tiger:zip_left", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "tiger:zip_right", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "addr:street", "description": "Used to determine the street of a house or POI. Note that a street with the same name must exist for the tag to be effective."},

-      { "key" : "addr:place", "description": "Used to determine the settlement of a house or POI with a street-less address. Note that a place with the same name must exist for the tag to be effective."},
+      { "key" : "addr:place", "description": "Used to determine the settlement of a house or POI with a street-less address."},

       { "key" : "country_code", "description": "Used to determine the country a place is in."},
       { "key" : "ISO3166-1", "description": "Used to determine the country a place is in."},
       { "key" : "is_in:country_code", "description": "Used to determine the country a place is in."},
       { "key" : "country_code", "description": "Used to determine the country a place is in."},
       { "key" : "ISO3166-1", "description": "Used to determine the country a place is in."},
       { "key" : "is_in:country_code", "description": "Used to determine the country a place is in."},

+      { "key" : "is_in:country", "description": "Used to determine the country a place is in."},

       { "key" : "addr:country", "description": "Used to determine the country a place is in."},
       { "key" : "addr:country_code", "description": "Used to determine the country a place is in."},
       { "key" : "addr:housenumber", "description": "House number of the place (no ranges)."},
       { "key" : "addr:country", "description": "Used to determine the country a place is in."},
       { "key" : "addr:country_code", "description": "Used to determine the country a place is in."},
       { "key" : "addr:housenumber", "description": "House number of the place (no ranges)."},


@@ -75,11 +74,38 @@
       { "key" : "addr:streetnumber", "description": "House number of the place (Eastern European system)."},
       { "key" : "addr:interpolation", "description": "Way along which house numbers are interpolated."} ,
       { "key" : "tiger:county", "description": "Used to determine the address in the US (needs a place with the same name and a county suffix)."},
       { "key" : "addr:streetnumber", "description": "House number of the place (Eastern European system)."},
       { "key" : "addr:interpolation", "description": "Way along which house numbers are interpolated."} ,
       { "key" : "tiger:county", "description": "Used to determine the address in the US (needs a place with the same name and a county suffix)."},

-      { "key" : "is_in", "description": "Used to determine the address of a place. Note that a place with the same name must exist for this to work."},
-      { "key" : "addr:suburb", "description": "Used to determine the address of a place. Note that a place with the same name must exist for this to work."},
-      { "key" : "addr:city", "description": "Used to determine the address of a place. Note that a place with the same name must exist for this to work."},
-      { "key" : "addr:state_code", "description": "Used to determine the address of a place. Note that a place with the same name must exist for this to work."},
-      { "key" : "addr:state", "description": "Used to determine the address of a place. Note that a place with the same name must exist for this to work."},
+      { "key" : "addr:suburb", "description": "Used to determine the address of a place."},
+      { "key" : "addr:city", "description": "Used to determine the address of a place."},
+      { "key" : "addr:state_code", "description": "Used to determine the address of a place."},
+      { "key" : "addr:state", "description": "Used to determine the address of a place."},
+      { "key" : "addr:province", "description": "Used to determine the address of a place."},
+      { "key" : "addr:district", "description": "Used to determine the address of a place."},
+      { "key" : "addr:region", "description": "Used to determine the address of a place."},
+      { "key" : "addr:county", "description": "Used to determine the address of a place."},
+      { "key" : "addr:municipality", "description": "Used to determine the address of a place."},
+      { "key" : "addr:hamlet", "description": "Used to determine the address of a place."},
+      { "key" : "addr:village", "description": "Used to determine the address of a place."},
+      { "key" : "addr:subdistrict", "description": "Used to determine the address of a place."},
+      { "key" : "addr:town", "description": "Used to determine the address of a place."},
+      { "key" : "addr:neighbourhood", "description": "Used to determine the address of a place."},
+      { "key" : "addr:quarter", "description": "Used to determine the address of a place."},
+      { "key" : "addr:parish", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:suburb", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:city", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:state_code", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:state", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:province", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:district", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:region", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:county", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:municipality", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:hamlet", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:village", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:subdistrict", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:town", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:neighbourhood", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:quarter", "description": "Used to determine the address of a place."},
+      { "key" : "is_in:parish", "description": "Used to determine the address of a place."},

       { "key" : "admin_level", "description": "Determines the hierarchy for administrative boundaries."},
       { "key" : "wikipedia", "description": "Linking to the right wikipedia article helps to guess the importance of a place, which determines how far up in the search results it appears."}
    ]
       { "key" : "admin_level", "description": "Determines the hierarchy for administrative boundaries."},
       { "key" : "wikipedia", "description": "Linking to the right wikipedia article helps to guess the importance of a place, which determines how far up in the search results it appears."}
    ]