Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / taginfo.json

diff --git a/website/taginfo.json b/website/taginfo.json
index ad0c446ac44dd10ea11fa6b9976ea51c660b8157..3618026750b26946962942aea4fd5c3e1212bf75 100644 (file)
--- a/website/taginfo.json
+++ b/website/taginfo.json
@@ -16,17 +16,11 @@
       { "key" : "reg_ref", "description": "Searchable name of the place."},
       { "key" : "loc_ref", "description": "Searchable name of the place."},
       { "key" : "old_ref", "description": "Searchable name of the place."},
       { "key" : "reg_ref", "description": "Searchable name of the place."},
       { "key" : "loc_ref", "description": "Searchable name of the place."},
       { "key" : "old_ref", "description": "Searchable name of the place."},

-      { "key" : "ncn_ref", "description": "Searchable name of the place."},
-      { "key" : "rcn_ref", "description": "Searchable name of the place."},
-      { "key" : "lcn_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" : "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" : "un:pcode:1", "description": "Searchable name of the place."},
-      { "key" : "un:pcode:2", "description": "Searchable name of the place."},
-      { "key" : "un:pcode:3", "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."},


@@ -35,17 +29,19 @@
       { "key" : "old_name", "description": "Searchable name of the place."},
       { "key" : "alt_name", "description": "Searchable name of the place."},
       { "key" : "official_name", "description": "Searchable name of the place."},
       { "key" : "old_name", "description": "Searchable name of the place."},
       { "key" : "alt_name", "description": "Searchable name of the place."},
       { "key" : "official_name", "description": "Searchable name of the place."},

-      { "key" : "commonname", "description": "Searchable name of the place."},
-      { "key" : "common_name", "description": "Searchable name of the place."},

       { "key" : "place_name", "description": "Searchable name of the place."},
       { "key" : "short_name", "description": "Searchable name of the place."},
       { "key" : "addr:housename", "description": "Searchable name of the place."},
       { "key" : "operator", "description": "Searchable name for amenities and shops." },
       { "key" : "place_name", "description": "Searchable name of the place."},
       { "key" : "short_name", "description": "Searchable name of the place."},
       { "key" : "addr:housename", "description": "Searchable name of the place."},
       { "key" : "operator", "description": "Searchable name for amenities and shops." },

+      { "key" : "brand", "description": "Searchable name of POI places."},
+      { "key" : "bridge:name", "description" : "Searchable name for bridges."},
+      { "key" : "tunnel:name", "description" : "Searchable name for tunnels."},

       { "key" : "emergency", "description": "POI in the search database." },
       { "key" : "tourism", "description": "POI in the search database." },
       { "key" : "historic", "description": "POI in the search database." },
       { "key" : "military", "description": "POI in the search database." },
       { "key" : "natural", "description": "POI in the search database." },
       { "key" : "emergency", "description": "POI in the search database." },
       { "key" : "tourism", "description": "POI in the search database." },
       { "key" : "historic", "description": "POI in the search database." },
       { "key" : "military", "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" : "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')." },


@@ -63,21 +59,14 @@
       { "key" : "waterway", "description": "Geographic feature in the search database (unless value is 'riverbank')."},
       { "key" : "place", "description": "Settlement on the search database (used to compute addresses of other places)." },
       { "key" : "postal_code", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "waterway", "description": "Geographic feature in the search database (unless value is 'riverbank')."},
       { "key" : "place", "description": "Settlement on the search database (used to compute addresses of other places)." },
       { "key" : "postal_code", "description": "Postcode in search database (used to compute postcodes of places around)." },

-      { "key" : "post_code", "description": "Postcode in search database (used to compute postcodes of places around)." },

       { "key" : "postcode", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "addr:postcode", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "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" : "postcode", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "key" : "addr:postcode", "description": "Postcode in search database (used to compute postcodes of places around)." },
       { "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" : "country_code_iso3166_1_alpha_2", "description": "Used to determine the country a place is in."},
-      { "key" : "country_code_iso3166_1", "description": "Used to determine the country a place is in."},
-      { "key" : "country_code_iso3166", "description": "Used to determine the country a place is in."},

       { "key" : "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:alpha2", "description": "Used to determine the country a place is in."},
-      { "key" : "iso3166-1", "description": "Used to determine the country a place is in."},

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

-      { "key" : "iso3166", "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" : "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" : "is_in:country_code", "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."},


@@ -87,13 +76,11 @@
       { "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: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" : "adr: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: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" : "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" : "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" : "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."}

-
-
-    ]
+   ]

 }
 }