Update to iD v2.3.0
[rails.git] / vendor / assets / iD / iD / locales / et.json
index b500eb3fc18e7c74fb932f60d23d5427b017dfd9..1b86dbfb71e7afec3bbb611d2d2d26b63928b872 100644 (file)
             },
             "delete": {
                 "title": "Kustuta",
+                "description": {
+                    "single": "Kustutad see nähtus jäädavalt.",
+                    "multiple": "Kustuta need nähtused jäädavalt"
+                },
                 "annotation": {
                     "point": "Punkt kustutatud.",
                     "vertex": "Punkt kustutatud joonelt.",
                     "line": "Joon kustutatud.",
                     "area": "Ala kustutatud.",
-                    "relation": "Seos kustutatud."
+                    "relation": "Seos kustutatud.",
+                    "multiple": "{n} nähtust kustutatud."
                 }
             },
             "add_member": {
             },
             "merge": {
                 "title": "Ühenda",
+                "description": "Ühendab valitud objektid kokku.",
                 "key": "C",
+                "annotation": "Ühendatud {n} objekti.",
                 "not_eligible": "Neid objekte ei saa ühendada.",
-                "incomplete_relation": "Neid objekte ei saa ühendada, kuna vähemalt üks neist ei ole täielikult laetud."
+                "restriction": "Neid objekte ei saa ühendada kuna vähemalt üks neist on seose \"{relation}\" liige.",
+                "incomplete_relation": "Neid objekte ei saa ühendada, kuna vähemalt üks neist ei ole täielikult laetud.",
+                "conflicting_tags": "Neid objekte ei saa ühendada kuna osa nende silte on konfliktsete väärtusega."
             },
             "move": {
                 "title": "Liiguta",
+                "description": {
+                    "single": "Liiguta see objekt teise asukohta.",
+                    "multiple": "Liiguta need objektid teise asukohta."
+                },
                 "key": "M",
                 "annotation": {
                     "point": "Punkt nihutatud.",
                     "vertex": "Nihutatud Joone punkti.",
                     "line": "Nihutatud joont.",
-                    "area": "Nihutatud ala."
+                    "area": "Nihutatud ala.",
+                    "multiple": "Liigutatud mitut objekti."
+                },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa liigutada kuna see ei ole veel täielikult alla laetud.",
+                    "multiple": "Neid objekte ei saa liigutada kuna nad ei ole veel täielikult alla laetud."
+                }
+            },
+            "reflect": {
+                "title": {
+                    "long": "Peegelda pikk",
+                    "short": "Peegelda lühike"
+                },
+                "description": {
+                    "long": {
+                        "single": "Peegelda objekt pikka telge pidi.",
+                        "multiple": "Peegelda objektid pikka telge pidi."
+                    },
+                    "short": {
+                        "single": "Peegelda objekt lühikest telge pidi.",
+                        "multiple": "Peegelda objektid lühikest telge pidi."
+                    }
+                },
+                "key": {
+                    "long": "T",
+                    "short": "Y"
+                },
+                "annotation": {
+                    "long": {
+                        "single": "Objekt peegeldatud pikka telge pidi.",
+                        "multiple": "Objektid peegeldatud pikka telge pidi."
+                    },
+                    "short": {
+                        "single": "Objekt peegeldatud lühkest telge pidi.",
+                        "multiple": "Objektid peegeldatud lühkest telge pidi."
+                    }
                 }
             },
             "rotate": {
                 "key": "R",
                 "annotation": {
                     "line": "Pööratud joont.",
-                    "area": "Pööratud ala."
+                    "area": "Pööratud ala.",
+                    "multiple": "Pööratud mitut objekti."
                 }
             },
             "reverse": {
                     "line": "Joon tükeldatud.",
                     "area": "Ala välispiir tükeldatud."
                 },
-                "not_eligible": "Jooni ei saa tükeldada nende algusest või lõpust."
+                "not_eligible": "Jooni ei saa tükeldada nende algusest või lõpust.",
+                "connected_to_hidden": "Seda ei saa tükedada kuna see on ühendatud peidetud objektiga."
+            },
+            "restriction": {
+                "help": {
+                    "toggle": "Kliki, et määrata pöörde piiranguid.",
+                    "toggle_on": "Kliki, et lisada \"{restriction}\" piirang.",
+                    "toggle_off": "Kliki, et eemaldada \"{restriction}\" piirang."
+                },
+                "annotation": {
+                    "create": "Lisatud pöörde piirang",
+                    "delete": "Kustutatud pöörde piirang"
+                }
             }
         },
         "undo": {
             "nothing": "Pole midagi uuesti teha."
         },
         "tooltip_keyhint": "Kiirvalik:",
+        "browser_notice": "See redaktor on toetatud järgnevates veebilehitsejates: Firefox, Chrome, Safari, Opera, ja Internet Explorer 11 ning uuemates. Palun uuenda oma veebilehitsejat või kasuta Potlatch 2'te kaardi muutmiseks.",
         "translate": {
             "translate": "Tõlgi",
             "localized_translation_label": "Mitmekeelne nimi",
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
-        "zoom_in_edit": "Muutmiseks suurenda sisse",
+        "zoom_in_edit": "Muutmiseks suumi sisse",
+        "login": "Logi sisse",
         "logout": "Logi välja",
         "loading_auth": "OpenStreetMap'iga ühendamine...",
+        "report_a_bug": "Teata veast",
+        "help_translate": "Aita tõlkida",
+        "feature_info": {
+            "hidden_warning": "{count} peidetud objekti",
+            "hidden_details": "Need objektid on hetkel peidetud: {details}"
+        },
         "commit": {
+            "title": "Lae OpenStreetMapi",
+            "description_placeholder": "Oma muudatuste lühikirjeldus (nõutud)",
+            "message_label": "Muutuskogumi kommentaar",
             "upload_explanation": "Su salvestatavad muudatused on nähtaval kõikidel kaartidel mis kasutavad OpenStreetMap-i andmeid.",
             "upload_explanation_with_user": "Su kasutajana {user} salvestatavad muudatused on nähtaval kõikidel kaartidel, mis kasutavad OpenStreetMap-i andmeid.",
+            "save": "Salvesta",
             "cancel": "Tühista",
             "changes": "{count} Muudatust",
             "warnings": "Hoiatused",
             "modified": "Muudetud",
             "deleted": "Kustutatud",
-            "created": "Loodud"
+            "created": "Loodud",
+            "google_warning": "Sa mainisid Google'it selles kommentaaris: palun arvesta, et Google Maps'ist andmete kopeerimine on rangelt keelatud."
         },
         "contributors": {
             "list": "Muutjad: {users}",
             "truncated_list": "Muutjad: {users} ja {count} teist"
         },
-        "infobox": {
-            "selected": "{n} valitud",
-            "geometry": "Geomeetria",
-            "closed": "suletud",
-            "center": "Keskel",
-            "perimeter": "Välisäär",
-            "length": "Pikkus",
-            "area": "Ala",
-            "centroid": "Tsentroid",
-            "location": "Asukoht",
-            "metric": "Meeter",
-            "imperial": "Inglise"
-        },
         "geometry": {
             "point": "punkt",
             "vertex": "tipp",
             "no_results_worldwide": "Tulemusi ei leitud"
         },
         "geolocate": {
-            "title": "Näita minu asukohta"
+            "title": "Näita minu asukohta",
+            "locating": "Asukoha määramine, palun oota..."
         },
         "inspector": {
             "no_documentation_combination": "Selle sildi kohta puudub dokumentatsioon",
             "no_documentation_key": "Selle objektiliigi kohta puudub informatsioon",
             "show_more": "Näita rohkem",
             "view_on_osm": "Vaata openstreetmap.org lehel",
+            "all_fields": "Kõik väljad",
             "all_tags": "Kõik sildid",
             "all_members": "Kõik liikmed",
             "all_relations": "Kõik seosed",
             "back_tooltip": "Muuda objekti",
             "remove": "Eemalda",
             "search": "Otsi",
+            "multiselect": "Valitud objektid",
             "unknown": "Teadmata",
             "incomplete": "<alla laadimata>",
             "feature_list": "Otsi objekte",
             "edit": "Muuda objekti",
             "check": {
                 "yes": "Jah",
-                "no": "Ei"
+                "no": "Ei",
+                "reverser": "Muuda Suunda"
+            },
+            "radio": {
+                "structure": {
+                    "type": "Tüüp",
+                    "default": "Vaikimisi",
+                    "layer": "Kiht"
+                }
             },
+            "add": "Lisa",
             "none": "Puudub",
             "node": "Punkt",
             "way": "Joon",
             "none": "Puudub",
             "custom": "Kohandatud",
             "custom_button": "Muuda kohandatud tausta",
+            "fix_misalignment": "Korrigeeri kattekaardi nihet",
             "reset": "lähtesta",
+            "offset": "Lohista alumist halli kasti, et sättida kattekaardi nihet või siseta nihe meetrites.",
             "minimap": {
                 "description": "Minikaart",
                 "tooltip": "Näita väljasuumitud kaarti, et aidata tuvastada kuvatud ala."
             "description": "Kaardi andmed",
             "data_layers": "Andmekihid",
             "fill_area": "Täida alad",
-            "map_features": "Kaardikuva"
+            "map_features": "Kaardikuva",
+            "autohidden": "Need objektid on automaatselt peidetud, sest neid oleks ekraanil liiga palju. Suumi sisse, et neid muuta."
         },
         "feature": {
             "points": {
                 "description": "Punktid",
                 "tooltip": "Huvipunktid"
             },
+            "traffic_roads": {
+                "description": "Liiklusteed",
+                "tooltip": "Maanteed, tänavad..."
+            },
+            "service_roads": {
+                "description": "Ligipääsuteed",
+                "tooltip": "Ligipääsuteed, parklavaheteed, metsavaheteed..."
+            },
             "paths": {
                 "description": "Rajad",
                 "tooltip": "Kõnniteed, jalgteed, rattateed.."
         },
         "restore": {
             "heading": "Sul on salvestamata muudatusi",
-            "description": "Kas soovid taastada eelmise sessiooni käigus tehtud muudatused?",
-            "restore": "Taasta",
-            "reset": "Lähtesta"
+            "description": "Kas soovid taastada eelmise sessiooni käigus tehtud muudatused?"
         },
         "save": {
             "title": "Salvesta",
+            "help": "Vaata oma muudatused üle ning lae need OpenStreetMap'i, tehes need teistele kasutajatele nähtavaks.",
             "no_changes": "Salvestamist vajavad muudatused puuduvad.",
             "error": "Salvestamise tekkisid vead",
             "status_code": "Server vastas olekukoodiga {code}",
             "unknown_error_details": "Palun kontrolli Internetiühendust.",
+            "uploading": "Muudatuste üleslaadimine OpenStreetMap'i.",
             "unsaved_changes": "Sul on salvestamata muudatusi",
             "conflict": {
                 "header": "Lahenda konfliktsed muudatused",
                 "restore": "Taasta",
                 "delete": "Jäta kustutatuna",
                 "download_changes": "Või lae alla oma muudatused.",
-                "done": "Kõik konfliktid lahendatud!"
+                "done": "Kõik konfliktid lahendatud!",
+                "help": "Teine kasutaja muutis kaardil samu objekte mida sinagi.\nKlikkides allolevatele objektidele näed konflikti detaile ning saad valida\nkas säilitada sinu või teise tasutaja muudatused.\n"
             }
         },
         "merge_remote_changes": {
             "conflict": {
+                "deleted": "See objekt on kustutatud {user} poolt.",
+                "location": "See objekt on nii sinu kui {user} poolt liigutatud.",
                 "nodelist": "Sõlmi on muudetud nii sinu kui ka {user} poolt.",
                 "memberlist": "Seose liikmeid on muudetud nii sinu kui ka {user} poolt.",
                 "tags": "Sina määrasid <b>{tag}</b> lipiku väärtuseks \"{local}\", {user} aga määras \"{remote}\"."
             "view_on_osm": "Vaata OSM lehel",
             "facebook": "Jaga Facebook-is",
             "twitter": "Jaga Twitteris",
-            "google": "Jaga Google+-is"
+            "google": "Jaga Google+-is",
+            "help_html": "Sinu muudatused peaksid ilmuma \"Standard\" kihil mõne minuti jooksul. Teistel kihtidel aga ka teatud teatud objektidega võib kauem minna.",
+            "help_link_text": "Detailid"
         },
         "confirm": {
-            "okay": "Korras",
             "cancel": "Tühista"
         },
         "splash": {
             "used_with": "kasutatakse koos liigiga {type}"
         },
         "validations": {
+            "disconnected_highway": "Lahtiühendatud tee",
+            "disconnected_highway_tooltip": "Teed peaksid olema ühendatud teiste teede või hoonete sissepääsudega.",
             "untagged_point": "Sildistamata punkt",
             "untagged_line": "Sildistamata joon",
             "untagged_area": "Sildistamata ala",
+            "untagged_relation": "Sildisamatta seos",
+            "many_deletions": "Sa oled kustutamas {n} objekti. Oled sa kindel, et soovid seda teha? See kustutab need kaardilt, mida kõik teised näevad openstreetmap.org lehel.",
             "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
             "deprecated_tags": "Iganenud sildid: {tags}"
         },
         "zoom": {
-            "in": "Suurenda sisse",
-            "out": "Suurenda välja"
+            "in": "Suurenda vaadet",
+            "out": "Vähenda vaadet"
+        },
+        "cannot_zoom": "Ei ole võimalik rohkem välja suumida selles vaates.",
+        "full_screen": "Lülita täisekraanile",
+        "gpx": {
+            "local_layer": "Lokaalne fail",
+            "drag_drop": "Lohista lehele .gpx, .geojson või .kml fail või kliki nuppu paremal et sirvida",
+            "zoom": "Suumi tasandini",
+            "browse": "Sirvi faili"
+        },
+        "mapillary_images": {
+            "tooltip": "Tänava-tasandi fotod Mapillary'st",
+            "title": "Foto-kate (Mapillary)"
+        },
+        "mapillary_signs": {
+            "tooltip": "Liiklusmärgid Mapillary'st (Foto-kate peab olema lubatud)",
+            "title": "Liiklusmärgi-kate (Mapillary)"
         },
         "mapillary": {
             "view_on_mapillary": "Vaata seda fotot Mapillary's"
         },
         "help": {
             "title": "Abi",
-            "imagery": "# Aerofoto\n\nAerofotod on kaardistamisel oluliseks algallikaks. Valik aerofotosid on kättesaadavad paremal asuva redaktori taustaseadete menüü kaudu, vaikimisi on taustaks [Bing Maps](http://www.bing.com/maps/) satelliitfoto.\n\nMaa-ameti aerofoto taustana kasutamiseks lisa kohandatud tausta valikusse aadress kujul http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg. Selleks, et avada OSM ID-redaktor vaikimisi Maa-ameti ortofoto taustaga, kasuta veebibrauseris aadressi http://www.openstreetmap.org/edit#background=custom:http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg&map=@zoom/@lon/@lat, milles @zoom/@lon/@lat asenda reaalsete väärtustega (näit. 15/59.3438/24.5892).\n\nMõnikord on aerofoto kaardiandmete suhtes nihkes. Kui märkad mitmeid taustaga nihkes olevaid teid, ära asu kohe nende asukohti muutma, vaid kohanda vastavalt aerofoto asendit taustaseadete menüü valiku 'Korrigeeri nihet' abil.\n"
+            "imagery": "# Aerofoto\n\nAerofotod on kaardistamisel oluliseks algallikaks. Valik aerofotosid on kättesaadavad paremal asuva redaktori taustaseadete menüü kaudu, vaikimisi on taustaks [Bing Maps](http://www.bing.com/maps/) satelliitfoto.\n\nEesti puhul on reeglina kõige täpsemaks ning ajakohasemaks aerofotoks Maa-ameti ortokaart. Selleks, et avada OSM ID-redaktor vaikimisi Maa-ameti ortofoto taustaga, kasuta veebibrauseris aadressi http://www.openstreetmap.org/edit#background=custom:http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg&map=@zoom/@lon/@lat, milles @zoom/@lon/@lat asenda reaalsete väärtustega (näit. 15/59.3438/24.5892).\n\nMõnikord on aerofoto kaardiandmete suhtes nihkes. Kui märkad, et massiliselt objekte on nihkes siis ära asu kohe nende asukohti muutma vaid võrdle erinevaid aerofotosid ja vajadusel kohanda vastavalt aerofoto asendit taustaseadete menüü valiku 'Korrigeeri nihet' abil.\n"
         },
         "intro": {
+            "graph": {
+                "block_number": "<value for addr:block_number>",
+                "county": "<value for addr:county>",
+                "district": "<value for addr:district>",
+                "hamlet": "<value for addr:hamlet>",
+                "neighbourhood": "<value for addr:neighbourhood>",
+                "province": "<value for addr:province>",
+                "quarter": "<value for addr:quarter>",
+                "state": "<value for addr:state>",
+                "subdistrict": "<value for addr:subdistrict>",
+                "suburb": "<value for addr:suburb>",
+                "countrycode": "ee"
+            },
             "navigation": {
-                "title": "Navigeerimine",
-                "drag": "Peamises kaardivaates on näha aluskaardi peal olevad OpenStreetMap andmed. Vaate liigutamine toimub hiirega lohistades ja kerides, sarnaselt teiste kaartidega. **Lohista kaarti!**",
-                "select": "Kaardi objekte saab esitada kolmel viisil: kasutades punkte, jooni või alasid. Kõiki objekte saab valida nendel klikkides. **Kliki punktil, et see valida.**"
+                "title": "Navigeerimine"
             },
             "points": {
-                "title": "Punktid",
-                "choose": "**Vali nimekirjast kohvik**"
+                "title": "Punktid"
             },
             "areas": {
-                "title": "Alad",
-                "search": "**Otsi '{name}'.**",
-                "choose": "**Vali nimekirjast mänguväljak**"
+                "title": "Alad"
             },
             "lines": {
-                "title": "Jooned",
-                "road": "**Vali nimekirjast tee**"
+                "title": "Jooned"
             },
             "startediting": {
                 "title": "Alusta muutmist",
             }
         },
         "presets": {
+            "categories": {
+                "category-barrier": {
+                    "name": "Barjäärid"
+                },
+                "category-building": {
+                    "name": "Hooned"
+                },
+                "category-golf": {
+                    "name": "Golf"
+                },
+                "category-landuse": {
+                    "name": "Maakasutus"
+                },
+                "category-natural-area": {
+                    "name": "Looduslik"
+                },
+                "category-natural-line": {
+                    "name": "Looduslik"
+                },
+                "category-natural-point": {
+                    "name": "Looduslik"
+                },
+                "category-path": {
+                    "name": "Rajad"
+                },
+                "category-rail": {
+                    "name": "Raudteed"
+                },
+                "category-restriction": {
+                    "name": "Piirangud"
+                },
+                "category-road": {
+                    "name": "Teed"
+                },
+                "category-route": {
+                    "name": "Marsruudid"
+                },
+                "category-water-area": {
+                    "name": "Vesi"
+                },
+                "category-water-line": {
+                    "name": "Vesi"
+                }
+            },
             "fields": {
                 "access": {
                     "label": "Lubatud ligipääs",
                             "title": "Määratud"
                         },
                         "destination": {
+                            "description": "Lubatud ainult sihtpunkti pääsemiseks",
                             "title": "Sihtkoht"
                         },
                         "dismount": {
+                            "description": "Läbipääs lubatud vaid käekõrval liikudes.",
                             "title": "Käekõrval"
                         },
                         "no": {
                         },
                         "permissive": {
                             "description": "Juurdepääs on lubatud ajani, mil omanik tühistab loa",
-                            "title": "Omaniku lubatud"
+                            "title": "Omanik lubab"
                         },
                         "private": {
                             "description": "Juurdepääs lubatud ainult omaniku eriloal",
                             "title": "Lubatud"
                         }
                     },
+                    "placeholder": "Määramata",
                     "types": {
+                        "access": "Üldine",
                         "bicycle": "Jalgrattad",
-                        "foot": "Jalg",
+                        "foot": "Jala",
                         "horse": "Hobused",
                         "motor_vehicle": "Mootorsõidukid"
                     }
                 },
+                "access_simple": {
+                    "label": "Lubatud juurdepääs"
+                },
                 "access_toilets": {
                     "label": "Juurdepääs"
                 },
                     "label": "Aadress",
                     "placeholders": {
                         "city": "Linn",
+                        "city!vn": "Linn",
+                        "conscriptionnumber": "123",
                         "country": "Riik",
+                        "county": "Maakond",
+                        "county!jp": "Rajoon",
+                        "district": "Rajoon",
+                        "floor": "Korrus",
                         "housename": "Maja nimetus",
                         "housenumber": "123",
+                        "housenumber!jp": "Hoone või krundi number",
                         "place": "Koht",
                         "postcode": "Sihtnumber",
                         "street": "Tänav"
                 "amenity": {
                     "label": "Tüüp"
                 },
+                "animal_boarding": {
+                    "label": "Loomadele"
+                },
+                "animal_breeding": {
+                    "label": "Loomadele"
+                },
+                "animal_shelter": {
+                    "label": "Loomadele"
+                },
+                "area/highway": {
+                    "label": "Tüüp"
+                },
+                "artwork_type": {
+                    "label": "Tüüp"
+                },
                 "atm": {
                     "label": "Pangaautomaat"
                 },
+                "beauty": {
+                    "label": "Poetüüp"
+                },
+                "bench": {
+                    "label": "Pink"
+                },
                 "bicycle_parking": {
                     "label": "Tüüp"
                 },
+                "bin": {
+                    "label": "Prügikast"
+                },
+                "board_type": {
+                    "label": "Tüü"
+                },
+                "boundary": {
+                    "label": "Tüüp"
+                },
+                "brand": {
+                    "label": "Bränd"
+                },
                 "building": {
                     "label": "Hoone"
                 },
                 "building_area": {
                     "label": "Hoone"
                 },
+                "bunker_type": {
+                    "label": "Tüüp"
+                },
                 "capacity": {
                     "label": "Mahtutavus"
                 },
                 "cardinal_direction": {
                     "label": "Suund"
                 },
+                "castle_type": {
+                    "label": "Tüüp"
+                },
                 "clock_direction": {
                     "label": "Suund",
                     "options": {
                         "clockwise": "Päripäeva"
                     }
                 },
+                "club": {
+                    "label": "Tüüp"
+                },
                 "collection_times": {
                     "label": "Tühjendusajad"
                 },
                 "construction": {
                     "label": "Tüüp"
                 },
+                "contact/webcam": {
+                    "label": "Veebikaamera URL",
+                    "placeholder": "http://näidis.ee"
+                },
+                "content": {
+                    "label": "Sisu"
+                },
+                "country": {
+                    "label": "Riik"
+                },
+                "covered": {
+                    "label": "Kaetud"
+                },
+                "craft": {
+                    "label": "Tüüp"
+                },
+                "crop": {
+                    "label": "Põllukultuur"
+                },
                 "crossing": {
                     "label": "Tüüp"
                 },
                 "cuisine": {
                     "label": "Köök"
                 },
+                "cycle_network": {
+                    "label": "Võrgustik"
+                },
+                "cycleway": {
+                    "label": "Rattarajad",
+                    "options": {
+                        "lane": {
+                            "description": "Jalgrattarada mis on eraldatud muust liilusest värvitud joonega",
+                            "title": "Tavaline rattarada"
+                        },
+                        "none": {
+                            "description": "Rattarada puudub",
+                            "title": "Puudub"
+                        },
+                        "opposite": {
+                            "description": "Jalgrattarada mis võimaldab ühesuunalisel teel liikuda mõlemas suunas",
+                            "title": "Kontrasuunaline rattarada"
+                        },
+                        "opposite_lane": {
+                            "description": "Rattarada mis on muu liiklusega võrreldes vastupidise sõidusuunaga",
+                            "title": "Vastupidise suunaga rattarada"
+                        },
+                        "share_busway": {
+                            "description": "Rattarada mis on jagatud ühistranspordirajaga",
+                            "title": "Ühistranspordiga jagatud rattarada"
+                        },
+                        "shared_lane": {
+                            "description": "Rattarada mis ei ole ülejäänud liiklusest (mootorsõidukitest) kuidagi eraldatud",
+                            "title": "Jagatud rattarada"
+                        },
+                        "track": {
+                            "description": "Rattarada mis on liiklusest eraldatud füüsilise barjääriga",
+                            "title": "Eraldatud rattarada"
+                        }
+                    },
+                    "types": {
+                        "cycleway:left": "Vasakus servas",
+                        "cycleway:right": "Paremas servas"
+                    }
+                },
+                "date": {
+                    "label": "Kuupäev"
+                },
+                "delivery": {
+                    "label": "Kohaletoimetamine"
+                },
                 "denomination": {
                     "label": "Usulahk"
                 },
+                "dock": {
+                    "label": "Tüüp"
+                },
+                "drive_through": {
+                    "label": "Sõida läbi"
+                },
+                "electrified": {
+                    "label": "Elektrifitseeritud",
+                    "options": {
+                        "contact_line": "Kontaktliin",
+                        "no": "Ei",
+                        "rail": "Elektrifitseeritud raudtee",
+                        "yes": "Jah (määratlemata)"
+                    },
+                    "placeholder": "Kontaktliin, elektrifitseeritud, ei..."
+                },
                 "elevation": {
                     "label": "Kõrgus merepinnast"
                 },
+                "email": {
+                    "label": "Email",
+                    "placeholder": "näide@näide.ee"
+                },
+                "emergency": {
+                    "label": "Häda"
+                },
+                "entrance": {
+                    "label": "Tüüp"
+                },
+                "except": {
+                    "label": "Erandid"
+                },
                 "fax": {
                     "label": "Faks",
                     "placeholder": "+372 123 4567"
                 "fee": {
                     "label": "Tasu"
                 },
+                "fence_type": {
+                    "label": "Tüüp"
+                },
+                "fuel": {
+                    "label": "Kütus"
+                },
+                "fuel_multi": {
+                    "label": "Kütuse liigid"
+                },
+                "gauge": {
+                    "label": "Rööpalaius"
+                },
+                "golf_hole": {
+                    "label": "Viide"
+                },
+                "handrail": {
+                    "label": "Käsipuu"
+                },
                 "iata": {
                     "label": "IATA"
                 },
                 "icao": {
                     "label": "ICAO"
                 },
+                "indoor": {
+                    "label": "Siseruum"
+                },
                 "internet_access": {
+                    "label": "Pääs internetti",
                     "options": {
+                        "no": "Ei",
                         "terminal": "Terminal",
                         "wired": "Juhtmega",
-                        "wlan": "Wifi"
+                        "wlan": "Wifi",
+                        "yes": "Jah"
                     }
                 },
+                "internet_access/fee": {
+                    "label": "Internetipääsu tasu"
+                },
+                "internet_access/ssid": {
+                    "label": "SSID (Võrgu nimi)"
+                },
                 "lanes": {
                     "label": "Sõiduread"
                 },
                 "layer": {
                     "label": "Kiht"
                 },
+                "length": {
+                    "label": "Pikkus (meetrites)"
+                },
                 "levels": {
                     "label": "Korruseid"
                 },
                 "lit": {
                     "label": "Valgustatud"
                 },
+                "maxheight": {
+                    "label": "Kõrguse piirang"
+                },
                 "maxspeed": {
                     "label": "Kiirusepiirang"
                 },
                 "name": {
-                    "label": "Nimi"
+                    "label": "Nimi",
+                    "placeholder": "Üldine nimi (kui on)"
+                },
+                "natural": {
+                    "label": "Looduslik"
+                },
+                "network": {
+                    "label": "Võrgustik"
+                },
+                "network_bicycle": {
+                    "label": "Võrgustik",
+                    "options": {
+                        "icn": "Rahvusvaheline",
+                        "lcn": "Kohalik",
+                        "ncn": "Riiklik",
+                        "rcn": "Piirkondlik"
+                    },
+                    "placeholder": "Kohalik, piirkondlik, riiklik, rahvusvaheline"
+                },
+                "network_foot": {
+                    "label": "Võrgustik",
+                    "options": {
+                        "iwn": "Rahvusvaheline",
+                        "lwn": "Kohalik",
+                        "nwn": "Riiklik",
+                        "rwn": "Piirkondlik"
+                    },
+                    "placeholder": "Kohalik, piirkondlik, riiklik, rahvusvaheline"
+                },
+                "network_horse": {
+                    "label": "Võrgustik",
+                    "options": {
+                        "ihn": "Rahvusvaheline",
+                        "lhn": "Kohalik",
+                        "nhn": "Riiklik",
+                        "rhn": "Piirkondlik"
+                    },
+                    "placeholder": "Kohalik, piirkondlik, riiklik, rahvusvaheline"
+                },
+                "network_road": {
+                    "label": "Võrgustik"
                 },
                 "note": {
                     "label": "Märge"
                 "operator": {
                     "label": "Operaator"
                 },
+                "parallel_direction": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Taha",
+                        "forward": "Ette"
+                    }
+                },
                 "park_ride": {
                     "label": "Pargi ja Reisi"
                 },
                 "parking": {
-                    "label": "Tüüp"
+                    "label": "Tüüp",
+                    "options": {
+                        "carports": "Katusealune",
+                        "garage_boxes": "Garaažiboksid",
+                        "lane": "Teeäärne parkimisrada",
+                        "multi-storey": "Mitmekorruseline",
+                        "sheds": "Angaar",
+                        "surface": "Maapealne",
+                        "underground": "Maaalune"
+                    }
+                },
+                "payment_multi": {
+                    "label": "Makseviisid"
                 },
                 "phone": {
-                    "label": "Telefon"
+                    "label": "Telefon",
+                    "placeholder": "+372 567 8901"
+                },
+                "population": {
+                    "label": "Rahvaarv"
+                },
+                "power": {
+                    "label": "Tüüp"
+                },
+                "railway": {
+                    "label": "Tüüp"
+                },
+                "recycling_accepts": {
+                    "label": "Võtab vastu"
+                },
+                "recycling_type": {
+                    "label": "Ümbertöötluse tüüp",
+                    "options": {
+                        "centre": "Ümbertöötluskeskus",
+                        "container": "Konteiner"
+                    }
+                },
+                "ref": {
+                    "label": "Viide"
+                },
+                "relation": {
+                    "label": "Tüüp"
                 },
                 "religion": {
                     "label": "Religioon"
                 },
+                "restriction": {
+                    "label": "Tüüp"
+                },
                 "restrictions": {
                     "label": "Pöörangu piirangud"
                 },
+                "seasonal": {
+                    "label": "Hooajaline"
+                },
+                "second_hand": {
+                    "label": "Komisjonimüük",
+                    "options": {
+                        "no": "Ei",
+                        "only": "Ainult",
+                        "yes": "Jah"
+                    },
+                    "placeholder": "Jah, Ei, Ainult"
+                },
+                "service": {
+                    "label": "Tüüp"
+                },
+                "service/bicycle": {
+                    "label": "Teenused"
+                },
+                "service/vehicle": {
+                    "label": "Teenused"
+                },
+                "service_rail": {
+                    "label": "Teetüüp",
+                    "options": {
+                        "crossover": "Ühendustee",
+                        "siding": "Kõrvaltee",
+                        "spur": "Harutee",
+                        "yard": "Manöövritee"
+                    }
+                },
                 "shelter": {
                     "label": "Varjualune"
                 },
+                "shelter_type": {
+                    "label": "Tüüp"
+                },
+                "shop": {
+                    "label": "Tüüp"
+                },
+                "site": {
+                    "label": "Tüüp"
+                },
                 "smoking": {
-                    "label": "Suitsetamine"
+                    "label": "Suitsetamine",
+                    "options": {
+                        "dedicated": "Mõeldud suitsetajatele (sigariklubi näiteks)",
+                        "isolated": "Suitsetamiseks eraldatud kohtades",
+                        "no": "Suitsetamine keelatud",
+                        "outside": "Lubatud väljas",
+                        "separated": "Suitsetamisaladel mis ei ole eraldatud",
+                        "yes": "Lubatud kõikjal"
+                    },
+                    "placeholder": "Ei, Eraldatud, Jah..."
                 },
                 "smoothness": {
                     "label": "Tasasus",
                         "bad": "Vastupidavad rattad: matka- ja maastikuratas, auto",
                         "excellent": "Rullid: rulluisud, rula",
                         "good": "Kitsad rattad: maanteeratas",
-                        "horrible": "Maastiku rattad: maastur, džiip",
+                        "horrible": "Maastikurattad: maastur, džiip",
                         "impassable": "Ratastel läbimatu",
                         "intermediate": "Rattad: linnaratas, ratastool, motoroller",
                         "very_bad": "Kõrge kliirens: linnamaastur",
                         "very_horrible": "Spetsiaalselt maastikule: traktor, ATV"
                     },
-                    "placeholder": "Rullidele, Ratastele, Maastiku sõidukitele..."
+                    "placeholder": "Rullidele, Ratastele, Maastikusõidukitele..."
+                },
+                "social_facility": {
+                    "label": "Tüüp"
                 },
                 "source": {
                     "label": "Allikas"
                 },
-                "sport": {
-                    "label": "Sport"
+                "stop": {
+                    "label": "Tüüp",
+                    "options": {
+                        "all": "Kõik teed",
+                        "minor": "Vähetähtsad teed"
+                    }
                 },
                 "structure": {
                     "label": "Rajatis",
                     "options": {
                         "bridge": "Sild",
+                        "cutting": "Läbimurre",
                         "embankment": "Tamm",
                         "ford": "Koolmekoht",
                         "tunnel": "Tunnel"
                     }
                 },
+                "studio": {
+                    "label": "Tüüp"
+                },
+                "substation": {
+                    "label": "Tüüp"
+                },
+                "supervised": {
+                    "label": "Valvega"
+                },
+                "support": {
+                    "label": "Toestus"
+                },
                 "surface": {
                     "label": "Pinnakate"
                 },
+                "toll": {
+                    "label": "Maksustatud"
+                },
+                "tracktype": {
+                    "label": "Raja tüüp",
+                    "options": {
+                        "grade1": "Kõva: sillutatud või tugevalt tihendatud tee",
+                        "grade2": "Peamiselt kõva: sillutamata tee, kruus, kivi või kõva pinnas",
+                        "grade3": "Ühtlane segu kõvadest ja pehmetest materjalidest",
+                        "grade4": "Peamiselt pehme: suurem osa muld, liiv või rohi, osaliselt kõva pinnas",
+                        "grade5": "Pehme: muld, liiv, rohi"
+                    },
+                    "placeholder": "Kõva, peamiselt kõva, pehme"
+                },
+                "traffic_calming": {
+                    "label": "Tüüp"
+                },
+                "traffic_signals": {
+                    "label": "Tüüp"
+                },
+                "trees": {
+                    "label": "Puud"
+                },
+                "tunnel": {
+                    "label": "Tunnel"
+                },
+                "visibility": {
+                    "label": "Nähtavus"
+                },
+                "wall": {
+                    "label": "Tüüp"
+                },
+                "water": {
+                    "label": "Tüüp"
+                },
+                "water_point": {
+                    "label": "Veepunkt"
+                },
+                "waterway": {
+                    "label": "Tüüp"
+                },
                 "website": {
                     "label": "Veebileht",
                     "placeholder": "http://näidis24.ee/"
                 },
+                "wetland": {
+                    "label": "Tüüp"
+                },
+                "wheelchair": {
+                    "label": "Pääs ratastooliga"
+                },
                 "width": {
                     "label": "Laius (meetrites)"
                 },
                 "address": {
                     "name": "Aadress"
                 },
+                "advertising/billboard": {
+                    "name": "Reklaamtahvel"
+                },
                 "aeroway/aerodrome": {
                     "name": "Lennujaam"
                 },
                     "name": "Angaar"
                 },
                 "aeroway/helipad": {
-                    "name": "Kopteriväljak"
+                    "name": "Kopteriväljak",
+                    "terms": "Helikopteriväljak"
                 },
                 "aeroway/runway": {
                     "name": "Lennurada"
                 "aeroway/taxiway": {
                     "name": "Ruleerimistee"
                 },
+                "aeroway/terminal": {
+                    "name": "Lennuterminal",
+                    "terms": "terminal,lennujaam"
+                },
+                "amenity": {
+                    "name": "Hüve"
+                },
+                "amenity/arts_centre": {
+                    "name": "Kunstide keskus",
+                    "terms": "kunstidemaja"
+                },
                 "amenity/atm": {
-                    "name": "Pangaautomaat"
+                    "name": "Pangaautomaat",
+                    "terms": "sularahaautomaat"
                 },
                 "amenity/bank": {
                     "name": "Pank"
                 "amenity/bar": {
                     "name": "Baar"
                 },
+                "amenity/bbq": {
+                    "name": "Väligrill",
+                    "terms": "grill"
+                },
                 "amenity/bench": {
                     "name": "Pink"
                 },
                 "amenity/bicycle_parking": {
-                    "name": "Rattaparkla"
+                    "name": "Rattaparkla",
+                    "terms": "jalgrattaparkla"
                 },
                 "amenity/bicycle_rental": {
-                    "name": "Rattarent"
+                    "name": "Rattarent",
+                    "terms": "jalgrattarent,laenutus"
+                },
+                "amenity/bicycle_repair_station": {
+                    "name": "Jalgrattaremondi pukk"
+                },
+                "amenity/biergarten": {
+                    "name": "Õlleaed"
                 },
                 "amenity/boat_rental": {
                     "name": "Paadi laenutus"
                 },
                 "amenity/bureau_de_change": {
-                    "name": "Valuutavahetus"
+                    "name": "Valuutavahetus",
+                    "terms": "rahavahetus"
                 },
                 "amenity/bus_station": {
                     "name": "Bussijaam"
                 "amenity/car_rental": {
                     "name": "Autorent"
                 },
+                "amenity/car_sharing": {
+                    "name": "Auto lühirent",
+                    "terms": "Autojagamispunkt"
+                },
                 "amenity/car_wash": {
-                    "name": "Autopesula"
+                    "name": "Autopesula",
+                    "terms": "pesula"
                 },
                 "amenity/casino": {
                     "name": "Kasiino"
                 },
                 "amenity/charging_station": {
-                    "name": "Laadimisjaam"
+                    "name": "Laadimisjaam",
+                    "terms": "kiirlaadimisjaam,elektriauto,chademo,ccs,mennekes"
                 },
                 "amenity/childcare": {
-                    "name": "Lastehoid"
+                    "name": "Lastehoid",
+                    "terms": "päevahoid"
                 },
                 "amenity/cinema": {
-                    "name": "Kino"
+                    "name": "Kino",
+                    "terms": "kobarkino"
                 },
                 "amenity/clinic": {
                     "name": "Kliinik"
                 },
+                "amenity/clock": {
+                    "name": "Kell",
+                    "terms": "seinakell"
+                },
+                "amenity/college": {
+                    "name": "Kolledžiala"
+                },
+                "amenity/community_centre": {
+                    "name": "Kultuurikeskus",
+                    "terms": "keskus,üritused,hall,rahvamaja,kogukonna keskus,külakeskus"
+                },
                 "amenity/compressed_air": {
-                    "name": "Suruõhk"
+                    "name": "Suruõhk",
+                    "terms": "õhk"
                 },
                 "amenity/courthouse": {
-                    "name": "Kohtumaja"
+                    "name": "Kohtumaja",
+                    "terms": "Kohus"
+                },
+                "amenity/coworking_space": {
+                    "name": "Ühiskasutatavad tööruumid"
+                },
+                "amenity/crematorium": {
+                    "name": "Krematoorium"
                 },
                 "amenity/dentist": {
                     "name": "Hambaarst"
                 },
+                "amenity/doctors": {
+                    "name": "Arst",
+                    "terms": "doktor"
+                },
                 "amenity/drinking_water": {
                     "name": "Joogivesi"
                 },
+                "amenity/driving_school": {
+                    "name": "Sõidukool",
+                    "terms": "autokool,motokool,mootorratta,sõiduauto,veoauto,bussikool"
+                },
                 "amenity/embassy": {
-                    "name": "Saatkond"
+                    "name": "Saatkond",
+                    "terms": "suursaatkond"
                 },
                 "amenity/fast_food": {
                     "name": "Kiirtoitlustus"
                 },
+                "amenity/ferry_terminal": {
+                    "name": "Praamiterminal",
+                    "terms": "Praamisadam, sadam"
+                },
                 "amenity/fire_station": {
-                    "name": "Tuletõrjedepoo"
+                    "name": "Tuletõrjedepoo",
+                    "terms": "tuletõrjujad"
+                },
+                "amenity/food_court": {
+                    "name": "Toiduväljak",
+                    "terms": "Toiduala,söögiplats,söögiala"
                 },
                 "amenity/fountain": {
                     "name": "Purskkaev"
                 },
                 "amenity/fuel": {
-                    "name": "Bensiinijaam"
+                    "name": "Tankla",
+                    "terms": "Bensiinijaam, kütusejaam, kütus"
                 },
                 "amenity/grave_yard": {
-                    "name": "Surnuaed"
+                    "name": "Surnuaed",
+                    "terms": "kalmistu"
+                },
+                "amenity/grit_bin": {
+                    "name": "Libedustõrje kast"
+                },
+                "amenity/hospital": {
+                    "name": "Haigla territoorium",
+                    "terms": "Haigla"
+                },
+                "amenity/hunting_stand": {
+                    "name": "Jahitorn",
+                    "terms": "jahipukk,pukk,kõrgiste"
+                },
+                "amenity/ice_cream": {
+                    "name": "Jäätisekohvik"
+                },
+                "amenity/internet_cafe": {
+                    "name": "Internetikohvik",
+                    "terms": "Internetipunkt"
+                },
+                "amenity/kindergarten": {
+                    "name": "Lasteaed",
+                    "terms": "Eelkool"
                 },
                 "amenity/library": {
                     "name": "Raamatukogu"
                 },
                 "amenity/marketplace": {
-                    "name": "Turg"
+                    "name": "Turg",
+                    "terms": "Turuplats"
+                },
+                "amenity/motorcycle_parking": {
+                    "name": "Mootorratta parkla"
                 },
                 "amenity/nightclub": {
                     "name": "Ööklubi"
                 },
+                "amenity/nursing_home": {
+                    "name": "Hoolduskodu"
+                },
                 "amenity/parking": {
-                    "name": "Autoparkla"
+                    "name": "Autoparkla",
+                    "terms": "Parkla, parkimisplats"
+                },
+                "amenity/parking_entrance": {
+                    "name": "Parkimismaja sisse/väljapääs"
+                },
+                "amenity/parking_space": {
+                    "name": "Parkimiskoht",
+                    "terms": "parkla"
                 },
                 "amenity/pharmacy": {
                     "name": "Apteek"
                 },
+                "amenity/place_of_worship": {
+                    "name": "Pühakoda",
+                    "terms": "Pühapaik, palvekoht"
+                },
+                "amenity/place_of_worship/buddhist": {
+                    "name": "Budistlik tempel",
+                    "terms": "Budistlik pühakoda"
+                },
                 "amenity/place_of_worship/christian": {
-                    "name": "Kirik"
+                    "name": "Kirik",
+                    "terms": "katedral"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sünagoog"
                 "amenity/place_of_worship/muslim": {
                     "name": "Mošee"
                 },
+                "amenity/planetarium": {
+                    "name": "Planetaarium"
+                },
                 "amenity/police": {
                     "name": "Politsei"
                 },
                 "amenity/post_office": {
                     "name": "Postkontor"
                 },
+                "amenity/prison": {
+                    "name": "Vangla",
+                    "terms": "Arestimaja"
+                },
                 "amenity/pub": {
                     "name": "Kõrts",
                     "terms": "Pubi"
                 },
+                "amenity/public_bookcase": {
+                    "name": "Avalik raamaturiiul",
+                    "terms": "raamaturiiul"
+                },
+                "amenity/ranger_station": {
+                    "name": "Looduskeskus",
+                    "terms": "külastuskeskus"
+                },
+                "amenity/recycling": {
+                    "name": "Taaskasutus",
+                    "terms": "Taara,taaraautomaat,jäätmed,prügi,pudelid,klaas,purgid,praht,konteiner"
+                },
+                "amenity/recycling_centre": {
+                    "name": "Jäätmejaam",
+                    "terms": "Taaskasutuskeskus"
+                },
                 "amenity/register_office": {
                     "name": "Perekonnaseisu osakond"
                 },
                 "amenity/restaurant": {
                     "name": "Restoran"
                 },
+                "amenity/school": {
+                    "name": "Kool",
+                    "terms": "Koolimaja"
+                },
                 "amenity/shelter": {
-                    "name": "Varjualune"
+                    "name": "Varjualune",
+                    "terms": "ulualune,räästaalune,peavari"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Ujumisbassein"
+                "amenity/social_facility": {
+                    "name": "Sotsiaalkeskus",
+                    "terms": "Sotsiaalamet"
                 },
-                "amenity/telephone": {
-                    "name": "Telefon"
+                "amenity/social_facility/food_bank": {
+                    "name": "Toidupank"
                 },
-                "amenity/theatre": {
-                    "name": "Teater"
+                "amenity/social_facility/group_home": {
+                    "name": "Vanadekodu",
+                    "terms": "pensionärid"
                 },
-                "amenity/toilets": {
-                    "name": "Tualett"
+                "amenity/social_facility/homeless_shelter": {
+                    "name": "Kodutute varjupaik",
+                    "terms": "Kodutute öömaja,varjupaik"
+                },
+                "amenity/social_facility/nursing_home": {
+                    "name": "Hooldekodu"
+                },
+                "amenity/studio": {
+                    "name": "Stuudio",
+                    "terms": "TV,raadiomaja,telemaja,lindistus,helistuudio"
+                },
+                "amenity/swimming_pool": {
+                    "name": "Ujumisbassein"
+                },
+                "amenity/taxi": {
+                    "name": "Taksopeatus"
+                },
+                "amenity/telephone": {
+                    "name": "Taksofon",
+                    "terms": "Telefon, telefoniautomaat"
+                },
+                "amenity/theatre": {
+                    "name": "Teater"
+                },
+                "amenity/toilets": {
+                    "name": "Tualett",
+                    "terms": "WC,kemmerg,peldik"
                 },
                 "amenity/townhall": {
-                    "name": "Linnahall"
+                    "name": "Linnahall",
+                    "terms": "raehall,raehoone"
+                },
+                "amenity/university": {
+                    "name": "Ülikooliala"
+                },
+                "amenity/vending_machine/parking_tickets": {
+                    "name": "Parkimispileti automaat"
+                },
+                "amenity/veterinary": {
+                    "name": "Loomaarst",
+                    "terms": "Loomakliinik"
                 },
                 "amenity/waste_basket": {
                     "name": "Prügikast"
                 },
+                "amenity/waste_disposal": {
+                    "name": "Prügikonteiner",
+                    "terms": "konteiner"
+                },
                 "area": {
                     "name": "Ala"
                 },
+                "area/highway": {
+                    "name": "Teekate"
+                },
                 "barrier": {
-                    "name": "Barjäär"
+                    "name": "Barjäär",
+                    "terms": "tõke,takistus,blokeering,läbisõidupiirang"
+                },
+                "barrier/block": {
+                    "name": "Plokk",
+                    "terms": "Betoonplokk, betoon"
+                },
+                "barrier/bollard": {
+                    "name": "Piirdetulp",
+                    "terms": "pollar, piirdepost"
+                },
+                "barrier/border_control": {
+                    "name": "Piiripunkt",
+                    "terms": "Piirikontroll, piiriületuspunkt"
                 },
                 "barrier/cattle_grid": {
-                    "name": "Karjatara"
+                    "name": "Karjatara",
+                    "terms": "tara,karjus,elektrikarjus,looma"
                 },
                 "barrier/city_wall": {
                     "name": "Linnamüür"
                 },
+                "barrier/cycle_barrier": {
+                    "name": "Jalgratta barjäär"
+                },
+                "barrier/ditch": {
+                    "name": "Kraav"
+                },
+                "barrier/entrance": {
+                    "name": "Läbipääs"
+                },
                 "barrier/fence": {
                     "name": "Aed"
                 },
                 "barrier/hedge": {
                     "name": "Hekk"
                 },
+                "barrier/kissing_gate": {
+                    "name": "Karjavärav"
+                },
+                "barrier/lift_gate": {
+                    "name": "Tõkkepuu"
+                },
+                "barrier/retaining_wall": {
+                    "name": "Tugisein",
+                    "terms": "Kaitsemüür"
+                },
+                "barrier/stile": {
+                    "name": "Astmestik",
+                    "terms": "astmed"
+                },
+                "barrier/toll_booth": {
+                    "name": "Teemaksuputka"
+                },
                 "barrier/wall": {
-                    "name": "Vall"
+                    "name": "Müür",
+                    "terms": "Sein,vall"
+                },
+                "boundary/administrative": {
+                    "name": "Administratiivpiir"
                 },
                 "building": {
-                    "name": "Hoone"
+                    "name": "Hoone",
+                    "terms": "ehitis"
                 },
                 "building/apartments": {
                     "name": "Korterid"
                 },
+                "building/barn": {
+                    "name": "Küün",
+                    "terms": "Tall, laut"
+                },
+                "building/bunker": {
+                    "name": "Punker"
+                },
+                "building/cabin": {
+                    "name": "Tare",
+                    "terms": "Majake, onn, metsamajake"
+                },
+                "building/cathedral": {
+                    "name": "Katedraalihoone"
+                },
+                "building/chapel": {
+                    "name": "Kabelihoone"
+                },
+                "building/church": {
+                    "name": "Kirikuhoone"
+                },
+                "building/college": {
+                    "name": "Kolledžihoone"
+                },
                 "building/commercial": {
                     "name": "Ärihoone"
                 },
                 "building/construction": {
                     "name": "Ehitusjärgus hoone"
                 },
+                "building/detached": {
+                    "name": "Eraldiseisev maja"
+                },
                 "building/dormitory": {
                     "name": "Ühiselamu"
                 },
                     "name": "Sissepääs"
                 },
                 "building/garage": {
-                    "name": "Garaaz"
+                    "name": "Garaaž",
+                    "terms": "Garaaz"
                 },
                 "building/garages": {
-                    "name": "Garaazid"
+                    "name": "Garaažid",
+                    "terms": "Garaazid"
                 },
                 "building/greenhouse": {
                     "name": "Kasvuhoone"
                 },
                 "building/hospital": {
-                    "name": "Haigla"
+                    "name": "Haiglahoone"
                 },
                 "building/hotel": {
-                    "name": "Hotell"
+                    "name": "Hotellihoone"
                 },
                 "building/house": {
                     "name": "Maja"
                 },
                 "building/hut": {
-                    "name": "Onn"
+                    "name": "Hütt",
+                    "terms": "onn"
                 },
                 "building/industrial": {
                     "name": "Tööstushoone"
                 },
                 "building/kindergarten": {
-                    "name": "Lasteaed"
+                    "name": "Lasteaiahoone"
                 },
                 "building/public": {
                     "name": "Avalik hoone"
                 },
                 "building/residential": {
-                    "name": "Elamu"
+                    "name": "Elamu",
+                    "terms": "Eramu"
+                },
+                "building/retail": {
+                    "name": "Kaubandushoone",
+                    "terms": "Kaubandus"
                 },
                 "building/roof": {
                     "name": "Katus"
                 },
                 "building/school": {
-                    "name": "Koolihoone"
+                    "name": "Koolihoone",
+                    "terms": "õppehoone,algkool,keskkool"
+                },
+                "building/semidetached_house": {
+                    "name": "Ridaelamu",
+                    "terms": "Elumajaosa"
                 },
                 "building/shed": {
                     "name": "Kuur"
                     "name": "Tall",
                     "terms": "Hobusetall"
                 },
+                "building/static_caravan": {
+                    "name": "Paikne haagismaja",
+                    "terms": "Haagiselamu,haagismaja,teisaldatav maja"
+                },
+                "building/terrace": {
+                    "name": "Terrassmaja"
+                },
                 "building/train_station": {
                     "name": "Raudteejaam"
                 },
                 "building/university": {
-                    "name": "Ülikool"
+                    "name": "Ülikoolihoone"
                 },
                 "building/warehouse": {
-                    "name": "Ladu"
+                    "name": "Laohoone"
+                },
+                "camp_site/camp_pitch": {
+                    "name": "Kämpingukoht",
+                    "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
+                },
+                "club": {
+                    "name": "Klubi"
+                },
+                "craft": {
+                    "name": "Käsitöö",
+                    "terms": "meister,oskustöö"
                 },
                 "craft/basket_maker": {
                     "name": "Korvimeister"
                     "name": "Pruulikoda"
                 },
                 "craft/carpenter": {
-                    "name": "Puusepp"
+                    "name": "Tisler",
+                    "terms": "Puusepp, puussepp"
+                },
+                "craft/caterer": {
+                    "name": "Toitlustaja"
                 },
                 "craft/clockmaker": {
                     "name": "Kellassepp"
                     "terms": "Maiustused"
                 },
                 "craft/dressmaker": {
-                    "name": "Rätsep"
+                    "name": "Rätsep",
+                    "terms": "õmbleja"
                 },
                 "craft/electrician": {
                     "name": "Elektrik"
                 },
+                "craft/gardener": {
+                    "name": "Aednik"
+                },
+                "craft/glaziery": {
+                    "name": "Klaasissepp",
+                    "terms": "klaasimesiter"
+                },
                 "craft/handicraft": {
                     "name": "Käsitöö"
                 },
+                "craft/hvac": {
+                    "name": "Ventilatsioon",
+                    "terms": "kliima, sisekliima, kütteseadmed"
+                },
+                "craft/insulator": {
+                    "name": "Soojustaja",
+                    "terms": "isoleerija,isolatsioon"
+                },
                 "craft/jeweler": {
                     "name": "Kullassepp"
                 },
                 "craft/locksmith": {
                     "name": "Lukuabi"
                 },
+                "craft/metal_construction": {
+                    "name": "Metallikoda",
+                    "terms": "metallitööd"
+                },
+                "craft/optician": {
+                    "name": "Optik"
+                },
+                "craft/painter": {
+                    "name": "Maaler",
+                    "terms": "värvija"
+                },
+                "craft/photographer": {
+                    "name": "Fotograaf",
+                    "terms": "pildistaja"
+                },
+                "craft/photographic_laboratory": {
+                    "name": "Fotolabor",
+                    "terms": "pildiilmutus,ilmutus,ilmutamine,fotod"
+                },
+                "craft/plasterer": {
+                    "name": "Krohvija",
+                    "terms": "kellumees"
+                },
+                "craft/plumber": {
+                    "name": "Santehnik",
+                    "terms": "Toruabi"
+                },
+                "craft/pottery": {
+                    "name": "Pottsepp"
+                },
+                "craft/rigger": {
+                    "name": "Taglasemeister"
+                },
+                "craft/roofer": {
+                    "name": "Katuseehitaja"
+                },
+                "craft/saddler": {
+                    "name": "Sadulsepp"
+                },
+                "craft/sailmaker": {
+                    "name": "Purjemeister"
+                },
+                "craft/sawmill": {
+                    "name": "Saekaater"
+                },
+                "craft/sculpter": {
+                    "name": "Skulptor"
+                },
+                "craft/shoemaker": {
+                    "name": "Kingsepp"
+                },
+                "craft/stonemason": {
+                    "name": "Kiviraidur"
+                },
+                "craft/sweep": {
+                    "name": "Korstnapühkija"
+                },
+                "craft/tailor": {
+                    "name": "Rätsep"
+                },
+                "craft/tiler": {
+                    "name": "Plaatija"
+                },
+                "craft/tinsmith": {
+                    "name": "Plekksepp"
+                },
+                "craft/upholsterer": {
+                    "name": "Polsterdaja",
+                    "terms": "drapeerija"
+                },
+                "craft/watchmaker": {
+                    "name": "Kellassepp"
+                },
+                "craft/window_construction": {
+                    "name": "Aknameister",
+                    "terms": "uksemeister"
+                },
+                "craft/winery": {
+                    "name": "Veinitehas"
+                },
+                "embankment": {
+                    "name": "Teetamm",
+                    "terms": "muldkeha, tamm, vall"
+                },
+                "emergency/ambulance_station": {
+                    "name": "Kiirabipunkt"
+                },
+                "emergency/fire_hydrant": {
+                    "name": "Hüdrant",
+                    "terms": "Tulehüdrant"
+                },
                 "emergency/phone": {
                     "name": "Hädaabi telefon"
                 },
+                "entrance": {
+                    "name": "Sisse- ja Väljapääs"
+                },
                 "footway/crossing": {
                     "name": "Ülekäik"
                 },
                     "name": "Koolmekoht",
                     "terms": "Koole"
                 },
+                "healthcare/blood_donation": {
+                    "name": "Verekeskus",
+                    "terms": "veretalitus, vereteenistus, doonor"
+                },
                 "highway": {
                     "name": "Tee"
                 },
                 "highway/bridleway": {
-                    "name": "Ratsutamisrada"
+                    "name": "Ratsutamisrada"
                 },
                 "highway/bus_stop": {
                     "name": "Bussipeatus"
                 },
+                "highway/corridor": {
+                    "name": "Sisekoridor",
+                    "terms": "koridor"
+                },
                 "highway/crossing": {
                     "name": "Ülekäigurada"
                 },
                 "highway/crosswalk": {
-                    "name": "Jalakäijate ülekäik"
+                    "name": "Ülekäigurada",
+                    "terms": "jalakäijate ülekäik,ülekäik"
                 },
                 "highway/cycleway": {
                     "name": "Rattatee"
                 },
                 "highway/footway": {
-                    "name": "Kõnnitee"
+                    "name": "Jalgtee",
+                    "terms": "kõnnitee"
+                },
+                "highway/give_way": {
+                    "name": "Anna teed märk"
                 },
                 "highway/living_street": {
-                    "name": "Majadevaheline tänav",
-                    "terms": "Õueala tänav"
+                    "name": "Õueala tee",
+                    "terms": "Majadevaheline,elutänav,elamu,linna"
                 },
                 "highway/mini_roundabout": {
                     "name": "Mini-ringtee"
                 },
                 "highway/motorway": {
-                    "name": "Kiirtee"
+                    "name": "Kiirtee",
+                    "terms": "Eraldatud sõiduradadega tee"
+                },
+                "highway/motorway_junction": {
+                    "name": "Kiirtee mahasõit"
+                },
+                "highway/motorway_link": {
+                    "name": "Kiirtee ühenduslõik"
                 },
                 "highway/path": {
                     "name": "Rada"
                     "name": "Jalakäijate tänav"
                 },
                 "highway/primary": {
-                    "name": "Põhimaantee"
+                    "name": "Põhimaantee",
+                    "terms": "maantee"
+                },
+                "highway/primary_link": {
+                    "name": "Põhimaantee ühenduslõik"
+                },
+                "highway/raceway": {
+                    "name": "Ringrada (motosport)",
+                    "terms": "autorada, motorada, motokross, rallirada, motospordirada,krossirada"
                 },
                 "highway/residential": {
                     "name": "Elamupiikonna tänav"
                     "name": "Puhkeala"
                 },
                 "highway/road": {
-                    "name": "Teadmata tee"
+                    "name": "Teadmata tee",
+                    "terms": "tee,väike tee"
                 },
                 "highway/secondary": {
-                    "name": "Tugimaantee"
+                    "name": "Tugimaantee",
+                    "terms": "kohalik maantee,maantee"
                 },
                 "highway/secondary_link": {
-                    "name": "Tugimaantee"
+                    "name": "Tugimaantee ühenduslõik"
                 },
                 "highway/service": {
                     "name": "Juurdepääsutee",
-                    "terms": "Service Road, Teenindustee, Juurdesõidutee"
+                    "terms": "service road,teenindustee,juurdesõidutee,kitsas tee,eratee,läbipääsutee,hoovitee"
+                },
+                "highway/service/alley": {
+                    "name": "Vahekäik",
+                    "terms": "põiktänav,kitsas tänav"
+                },
+                "highway/service/drive-through": {
+                    "name": "Sõida läbi",
+                    "terms": "läbisõit,osta kaasa,drive-through,kaasa müük"
+                },
+                "highway/service/driveway": {
+                    "name": "Sissesõidutee"
+                },
+                "highway/service/emergency_access": {
+                    "name": "Päästetee",
+                    "terms": "tuletõrjetee,kiirabitee"
+                },
+                "highway/service/parking_aisle": {
+                    "name": "Parkla vahetee",
+                    "terms": "vahetee, vahekäik"
+                },
+                "highway/services": {
+                    "name": "Maantee teenindusala",
+                    "terms": "Teenindusala, kiirtee teenindusala, puhkeala"
+                },
+                "highway/speed_camera": {
+                    "name": "Kiiruskaamera"
                 },
                 "highway/steps": {
-                    "name": "Trepp"
+                    "name": "Trepp",
+                    "terms": "astmed"
+                },
+                "highway/stop": {
+                    "name": "Stoppmärk"
                 },
                 "highway/street_lamp": {
                     "name": "Tänavavalgusti"
                 },
                 "highway/tertiary": {
-                    "name": "Kohalik maantee"
+                    "name": "Kohalik maantee",
+                    "terms": "kohaliku tähtsusega maantee,maantee"
+                },
+                "highway/tertiary_link": {
+                    "name": "Kohaliku maantee ühendustee"
+                },
+                "highway/track": {
+                    "name": "Mittehooldatav tee",
+                    "terms": "metsatee,rada,põlluvahetee,põllutee,metsasiht,tee,eratee,kinni kasvanud tee,maastikutee,atv,traktor,4x4,offroad,kehv tee,kitsas tee,siht,juurdepääsutee"
+                },
+                "highway/traffic_mirror": {
+                    "name": "Liikluspeegel"
                 },
                 "highway/traffic_signals": {
-                    "name": "Valgusfoorid"
+                    "name": "Valgusfoorid",
+                    "terms": "Foorid,signaaltuled"
                 },
                 "highway/trunk": {
                     "name": "E-tähistusega põhimaantee",
-                    "terms": "Trunk Road"
+                    "terms": "Trunk Road,põhimaantee,maantee"
+                },
+                "highway/trunk_link": {
+                    "name": "E-tähistusega põhimaantee ühendustee"
                 },
                 "highway/turning_circle": {
-                    "name": "Ümberpööramiskoht"
+                    "name": "Ümberpöördering",
+                    "terms": "ümberpöörd,pöördering"
+                },
+                "highway/turning_loop": {
+                    "name": "Ümberpöördering (saarega)",
+                    "terms": "ümberpöörd,pöördering"
+                },
+                "highway/unclassified": {
+                    "name": "Vähetähtis/klassifitseerimata tee",
+                    "terms": "klassifitseerimata tee,väike tee,kitsas tee,kohalik tee"
                 },
                 "historic": {
                     "name": "Ajalooline koht"
                     "name": "Piirikivi"
                 },
                 "historic/castle": {
-                    "name": "Loss"
+                    "name": "Loss",
+                    "terms": "Kindlus"
                 },
                 "historic/memorial": {
-                    "name": "Memoriaal"
+                    "name": "Mälestusmärk",
+                    "terms": "Memoriaal"
                 },
                 "historic/monument": {
-                    "name": "Monument"
+                    "name": "Monument",
+                    "terms": "Mälestis, ausammas"
                 },
                 "historic/ruins": {
                     "name": "Varemed"
                 },
+                "historic/tomb": {
+                    "name": "Hauakamber",
+                    "terms": "haud, kabel"
+                },
+                "historic/wayside_cross": {
+                    "name": "Teeäärne rist"
+                },
+                "historic/wayside_shrine": {
+                    "name": "Teeäärne altar"
+                },
                 "junction": {
                     "name": "Ristmik"
                 },
                 "landuse": {
                     "name": "Maakasutus"
                 },
+                "landuse/allotments": {
+                    "name": "Ühisaed"
+                },
+                "landuse/aquaculture": {
+                    "name": "Akvakultuur"
+                },
+                "landuse/basin": {
+                    "name": "Kogumisbassein",
+                    "terms": "bassein"
+                },
                 "landuse/cemetery": {
-                    "name": "Surnuaed"
+                    "name": "Surnuaed",
+                    "terms": "Kalmistu"
+                },
+                "landuse/churchyard": {
+                    "name": "Kirikuaed"
                 },
                 "landuse/commercial": {
                     "name": "Kommertsala"
                 "landuse/construction": {
                     "name": "Ehitus"
                 },
+                "landuse/farm": {
+                    "name": "Põllumaa"
+                },
+                "landuse/farmland": {
+                    "name": "Põllumaa",
+                    "terms": "põllumajandusmaa, maatulundusmaa"
+                },
+                "landuse/farmyard": {
+                    "name": "Talumaa",
+                    "terms": "Põllumajandusmaa, põllumaa, maatulundusmaa"
+                },
                 "landuse/forest": {
                     "name": "Metsamaa"
                 },
+                "landuse/garages": {
+                    "name": "Garaažid",
+                    "terms": "Garaazid"
+                },
                 "landuse/grass": {
                     "name": "Muru"
                 },
+                "landuse/harbour": {
+                    "name": "Sadam",
+                    "terms": "jahisadam,paadisadam,laevasadam"
+                },
+                "landuse/industrial": {
+                    "name": "Tööstuspiirkond",
+                    "terms": "Tööstusala"
+                },
                 "landuse/landfill": {
                     "name": "Prügila",
                     "terms": "Prügimägi"
                 },
                 "landuse/meadow": {
-                    "name": "Niit"
+                    "name": "Heinamaa",
+                    "terms": "Niit, luht"
+                },
+                "landuse/military": {
+                    "name": "Militaarala",
+                    "terms": "Sõjaväeala, sõjaväepiirkond"
+                },
+                "landuse/military/airfield": {
+                    "name": "Sõjaväe lennuväli"
+                },
+                "landuse/military/barracks": {
+                    "name": "Kasarmu"
+                },
+                "landuse/military/bunker": {
+                    "name": "Militaarpunker",
+                    "terms": "punker"
+                },
+                "landuse/military/checkpoint": {
+                    "name": "Militaarkontrollpunkt"
+                },
+                "landuse/military/danger_area": {
+                    "name": "Militaarohu ala"
+                },
+                "landuse/military/naval_base": {
+                    "name": "Mereväebaas"
                 },
                 "landuse/orchard": {
                     "name": "Viljapuuaed"
                 },
+                "landuse/plant_nursery": {
+                    "name": "Puukool",
+                    "terms": "aiandus,aiand,lilled,kasvandus"
+                },
                 "landuse/quarry": {
                     "name": "Karjäär"
                 },
+                "landuse/railway": {
+                    "name": "Raudteekoridor"
+                },
+                "landuse/recreation_ground": {
+                    "name": "Mänguala",
+                    "terms": "puhkeala"
+                },
+                "landuse/residential": {
+                    "name": "Elamuala",
+                    "terms": "Elurajoon, elamurajoon"
+                },
+                "landuse/retail": {
+                    "name": "Jaekaubandusala",
+                    "terms": "kaubandusala"
+                },
                 "landuse/vineyard": {
                     "name": "Viinapuuaed"
                 },
+                "leisure": {
+                    "name": "Vaba aeg"
+                },
+                "leisure/bowling_alley": {
+                    "name": "Boolingusaal",
+                    "terms": "bowling,keegel,keeglisaal,hobikeegel"
+                },
+                "leisure/dance": {
+                    "name": "Tantsusaal",
+                    "terms": "tantsuhall"
+                },
                 "leisure/dog_park": {
                     "name": "Koerapark"
                 },
                     "name": "Lõkkease",
                     "terms": "Lõkkekoht"
                 },
+                "leisure/fitness_centre/yoga": {
+                    "name": "Jooga stuudio"
+                },
                 "leisure/garden": {
                     "name": "Aed"
                 },
                 "leisure/golf_course": {
                     "name": "Golfiväljak"
                 },
+                "leisure/horse_riding": {
+                    "name": "Ratsakeskus",
+                    "terms": "Ratsutuskeskus"
+                },
                 "leisure/ice_rink": {
                     "name": "Uisuväljak"
                 },
                 "leisure/marina": {
-                    "name": "Jahisadam"
+                    "name": "Väikesadam",
+                    "terms": "Jahisadam,kaatrisadam,jaht,paat,kaater,sadam"
+                },
+                "leisure/miniature_golf": {
+                    "name": "Minatuurgolf",
+                    "terms": "Minigolf"
+                },
+                "leisure/nature_reserve": {
+                    "name": "Looduskaitseala",
+                    "terms": "Maastikukaitseala, looduspark"
                 },
                 "leisure/park": {
                     "name": "Park"
                 "leisure/pitch": {
                     "name": "Spordiväljak"
                 },
+                "leisure/pitch/american_football": {
+                    "name": "Ameerika jalgpalliväljak"
+                },
                 "leisure/pitch/baseball": {
                     "name": "Pesapalliväljak"
                 },
                 "leisure/pitch/basketball": {
                     "name": "Korvpalliväljak"
                 },
+                "leisure/pitch/cricket": {
+                    "name": "Kriketiväljak"
+                },
+                "leisure/pitch/equestrian": {
+                    "name": "Ratsaspordirada"
+                },
                 "leisure/pitch/skateboard": {
                     "name": "Rulapark",
                     "terms": "Skate park"
                 "leisure/pitch/soccer": {
                     "name": "Jalgpalliväljak"
                 },
+                "leisure/pitch/table_tennis": {
+                    "name": "Lauatennise laud",
+                    "terms": "ping pongi laud, pinksi laud"
+                },
                 "leisure/pitch/tennis": {
                     "name": "Tenniseväljak"
                 },
                 "leisure/playground": {
                     "name": "Mänguväljak"
                 },
+                "leisure/resort": {
+                    "name": "Puhkekeskus",
+                    "terms": "Kuurort, spaa"
+                },
+                "leisure/running_track": {
+                    "name": "Jooksurada"
+                },
+                "leisure/slipway": {
+                    "name": "Slipp",
+                    "terms": "Slip, mini-sadam"
+                },
+                "leisure/sports_centre": {
+                    "name": "Spordikeskus",
+                    "terms": "Spordikompleks"
+                },
+                "leisure/sports_centre/swimming": {
+                    "name": "Ujula"
+                },
                 "leisure/stadium": {
                     "name": "Staadion"
                 },
                 "leisure/swimming_pool": {
                     "name": "Ujumisbassein"
                 },
+                "leisure/track": {
+                    "name": "Staadion"
+                },
+                "leisure/water_park": {
+                    "name": "Veepark",
+                    "terms": "Veekeskus"
+                },
                 "line": {
                     "name": "Joon"
                 },
                     "name": "Inimtehtud",
                     "terms": "Tehislik, Tehis"
                 },
+                "man_made/adit": {
+                    "name": "Stoll",
+                    "terms": "suue,kaevandus,sissepääs,horisontaalne,kaeveõõne,rõhtkaeve,koobas"
+                },
+                "man_made/breakwater": {
+                    "name": "Lainemurdja",
+                    "terms": "sadamatamm,kaitsetamm,tamm"
+                },
+                "man_made/bridge": {
+                    "name": "Sild"
+                },
+                "man_made/chimney": {
+                    "name": "Korsten"
+                },
                 "man_made/cutline": {
-                    "name": "Siht"
+                    "name": "Siht",
+                    "terms": "metsasiht,soosiht"
                 },
                 "man_made/embankment": {
                     "name": "Tamm"
                     "name": "Tuletorn"
                 },
                 "man_made/mast": {
-                    "name": "Raadiomast"
+                    "name": "Mast",
+                    "terms": "Mobiilimast, tv mast, telefonimast, raadiomast, televisioonimast, kommunikatsioonimast"
                 },
                 "man_made/observation": {
                     "name": "Vaatlustorn"
                 },
+                "man_made/petroleum_well": {
+                    "name": "Nafta puurkaev"
+                },
                 "man_made/pier": {
                     "name": "Kai"
                 },
                     "name": "Silo",
                     "terms": "Silo hoidla, Silo mahuti"
                 },
+                "man_made/storage_tank": {
+                    "name": "Mahuti"
+                },
+                "man_made/surveillance_camera": {
+                    "name": "Valvekaamera"
+                },
                 "man_made/tower": {
                     "name": "Torn"
                 },
                     "name": "Veekaev",
                     "terms": "Kaev"
                 },
+                "man_made/water_works": {
+                    "name": "Joogivee varustusjaam"
+                },
+                "man_made/works": {
+                    "name": "Tehas",
+                    "terms": "Vabrik"
+                },
                 "natural": {
-                    "name": "Looduslik"
+                    "name": "Looduslik",
+                    "terms": "loomulik, naturaalne"
+                },
+                "natural/bare_rock": {
+                    "name": "Paljand",
+                    "terms": "Kivi paljand"
                 },
                 "natural/bay": {
                     "name": "Laht"
                 },
                 "natural/beach": {
-                    "name": "Rand"
+                    "name": "Rand",
+                    "terms": "Liivarand"
                 },
                 "natural/cave_entrance": {
                     "name": "Koopa sissepääs",
-                    "terms": "Koobas"
+                    "terms": "Koobas,sissepääs,auk,õõs"
                 },
                 "natural/cliff": {
                     "name": "Kalju",
                     "name": "Rannajoon",
                     "terms": "Rand"
                 },
+                "natural/fell": {
+                    "name": "Mägitundra",
+                    "terms": "Tundra"
+                },
                 "natural/glacier": {
                     "name": "Liustik"
                 },
                     "name": "Nõmm"
                 },
                 "natural/peak": {
-                    "name": "Mäetipp"
+                    "name": "Mäetipp",
+                    "terms": "tipp"
+                },
+                "natural/ridge": {
+                    "name": "Mäehari",
+                    "terms": "seljandik,mäeseljandik,seljak,mäetipp,tipp"
+                },
+                "natural/saddle": {
+                    "name": "Mäesadul"
+                },
+                "natural/sand": {
+                    "name": "Liiv"
+                },
+                "natural/scree": {
+                    "name": "Rusukalle",
+                    "terms": "klibukalle,kalle,mäe,lahtised kivid,kivid"
                 },
                 "natural/scrub": {
                     "name": "Võsa"
                 },
                 "natural/spring": {
-                    "name": "Allikas"
+                    "name": "Allikas",
+                    "terms": "veeallikas,joogivesi,vesi"
                 },
                 "natural/tree": {
                     "name": "Puu"
                 },
+                "natural/tree_row": {
+                    "name": "Puude rivi",
+                    "terms": "rivis,reas,järjest"
+                },
                 "natural/volcano": {
                     "name": "Vulkaan"
                 },
                     "name": "Tiik"
                 },
                 "natural/water/reservoir": {
-                    "name": "Reservuaar"
+                    "name": "Reservuaar",
+                    "terms": "veehoidla"
                 },
                 "natural/wetland": {
-                    "name": "Märgala"
+                    "name": "Märgala",
+                    "terms": "roostik"
                 },
                 "natural/wood": {
                     "name": "Mets"
                 },
+                "noexit/yes": {
+                    "name": "Tee lõpp",
+                    "terms": "tupik,lõpp,ots"
+                },
+                "office": {
+                    "name": "Kontor"
+                },
                 "office/government": {
                     "name": "Valitsuse kontor"
                 },
+                "office/travel_agent": {
+                    "name": "Reisibüroo"
+                },
                 "piste": {
                     "name": "Suusarada"
                 },
+                "place": {
+                    "name": "Koht"
+                },
                 "place/city": {
                     "name": "Linn"
                 },
+                "place/farm": {
+                    "name": "farm"
+                },
                 "place/island": {
                     "name": "Saar"
                 },
+                "place/suburb": {
+                    "name": "Eeslinn",
+                    "terms": "Äärelinn"
+                },
                 "place/town": {
                     "name": "Linn"
                 },
                     "name": "Küla"
                 },
                 "point": {
-                    "name": "Punkt"
+                    "name": "Punkt",
+                    "terms": "sõlm"
                 },
                 "power": {
                     "name": "Elekter"
                 },
+                "power/generator": {
+                    "name": "Elektrigeneraator",
+                    "terms": "generaator"
+                },
                 "power/line": {
-                    "name": "Elektriliin"
+                    "name": "Kõrgepingeliin",
+                    "terms": "Elektriliin, kõrgliin, õhuliin"
+                },
+                "power/minor_line": {
+                    "name": "Elektriliin",
+                    "terms": "õhuliin"
+                },
+                "power/plant": {
+                    "name": "Elektrijaamaala"
                 },
                 "power/pole": {
-                    "name": "Elektripost"
+                    "name": "Elektripost",
+                    "terms": "õhuliinipost"
                 },
                 "power/sub_station": {
                     "name": "Alajaam"
                 },
+                "power/substation": {
+                    "name": "Alajaam"
+                },
+                "power/tower": {
+                    "name": "Kõrgepingetorn"
+                },
                 "power/transformer": {
-                    "name": "Trafo"
+                    "name": "Trafo",
+                    "terms": "Transformaator"
                 },
                 "public_transport/platform": {
                     "name": "Platvorm"
                 },
+                "public_transport/stop_position": {
+                    "name": "Peatuskoht"
+                },
                 "railway": {
                     "name": "Raudtee"
                 },
                 "railway/abandoned": {
                     "name": "Mahajäetud raudtee"
                 },
+                "railway/crossing": {
+                    "name": "Raudtee ülekäik",
+                    "terms": "ülekäik,ületuskoht,jalakäija ületus,raudteega,ületustee"
+                },
                 "railway/disused": {
-                    "name": "Kasutusest väljasolev raudtee"
+                    "name": "Mittekasutatav raudtee",
+                    "terms": "Kasutusest väljasolev raudtee, raudtee"
+                },
+                "railway/funicular": {
+                    "name": "Köisraudtee"
+                },
+                "railway/halt": {
+                    "name": "Peatuskoht",
+                    "terms": "pooljaam"
+                },
+                "railway/level_crossing": {
+                    "name": "Raudtee ülesõit",
+                    "terms": "ülesõit,ristumine,rongi"
                 },
                 "railway/monorail": {
-                    "name": "Monorelss"
+                    "name": "Monorelss",
+                    "terms": "üherööpmeline"
                 },
                 "railway/narrow_gauge": {
                     "name": "Kitsarööpaline raudtee"
                 },
                 "railway/platform": {
-                    "name": "Raudteeplatvorm"
+                    "name": "Raudteeplatvorm",
+                    "terms": "platvorm,perroon,raudteeperroon"
                 },
                 "railway/rail": {
-                    "name": "Raudtee"
+                    "name": "Raudtee",
+                    "terms": "rongitee"
                 },
                 "railway/station": {
-                    "name": "Raudteejaam"
+                    "name": "Raudteejaam",
+                    "terms": "jaam,rongijaam"
                 },
                 "railway/subway": {
                     "name": "Metroo"
                 },
                 "railway/subway_entrance": {
-                    "name": "Metroo sissepääs"
+                    "name": "Metroo sissepääs",
+                    "terms": "sissepääs"
                 },
                 "railway/tram": {
                     "name": "Tramm"
                 },
+                "railway/tram_stop": {
+                    "name": "Trammipeatus"
+                },
                 "relation": {
-                    "name": "Relatsioon"
+                    "name": "Seos",
+                    "terms": "relatsioon"
                 },
                 "roundabout": {
                     "name": "Ringtee"
                     "name": "Praamitee"
                 },
                 "shop": {
-                    "name": "Pood"
+                    "name": "Pood",
+                    "terms": "kauplus"
                 },
                 "shop/alcohol": {
                     "name": "Alkoholipood"
                 },
+                "shop/antiques": {
+                    "name": "Antikvariaat",
+                    "terms": "Antiigi kauplus"
+                },
+                "shop/art": {
+                    "name": "Kunstitarvete kauplus"
+                },
+                "shop/baby_goods": {
+                    "name": "Beebipood",
+                    "terms": "Lastepood, tita pood,"
+                },
+                "shop/bag": {
+                    "name": "Kotipood",
+                    "terms": "Käekoti pood"
+                },
                 "shop/bakery": {
                     "name": "Pagariäri"
                 },
+                "shop/bathroom_furnishing": {
+                    "name": "Santehnika kauplus",
+                    "terms": "Sanitaartehnika"
+                },
                 "shop/beauty": {
                     "name": "Ilusalong"
                 },
+                "shop/beauty/nails": {
+                    "name": "Küünesalong",
+                    "terms": "maniküür,pediküür"
+                },
+                "shop/beauty/tanning": {
+                    "name": "Solaarium"
+                },
+                "shop/bed": {
+                    "name": "Magamistoa kauba pood",
+                    "terms": "Voodipood, madratsipood, padjapood, mööblipood"
+                },
+                "shop/beverages": {
+                    "name": "Joogikauplus",
+                    "terms": "karastusjoogid"
+                },
                 "shop/bicycle": {
-                    "name": "Rattapood"
+                    "name": "Rattapood",
+                    "terms": "Spordipood"
+                },
+                "shop/bookmaker": {
+                    "name": "Trükkal",
+                    "terms": "Köitmiskoda, trükikoda, raamatutrükikoda, köitja"
                 },
                 "shop/books": {
                     "name": "Raamatupood"
                 },
+                "shop/boutique": {
+                    "name": "Butiik",
+                    "terms": "moekauplus, moekaup, boutique, ehtekauplus"
+                },
                 "shop/butcher": {
-                    "name": "Lihapood"
+                    "name": "Lihapood",
+                    "terms": "Lihunik"
+                },
+                "shop/candles": {
+                    "name": "Küünlapood"
                 },
                 "shop/car": {
-                    "name": "Autopood"
+                    "name": "Autopood",
+                    "terms": "Auto esindus"
                 },
                 "shop/car_parts": {
                     "name": "Autoosade pood"
                 },
                 "shop/car_repair": {
-                    "name": "Autoparandus"
+                    "name": "Autoremont",
+                    "terms": "autoparandus, auto hooldus"
+                },
+                "shop/carpet": {
+                    "name": "Vaibapood"
+                },
+                "shop/charity": {
+                    "name": "Heategevuslik kauplus",
+                    "terms": "Mittetulunduslik kauplus"
+                },
+                "shop/cheese": {
+                    "name": "Juustupood"
+                },
+                "shop/chemist": {
+                    "name": "Apteek",
+                    "terms": "Ravimid"
+                },
+                "shop/chocolate": {
+                    "name": "Šokolaadikauplus",
+                    "terms": "Sokolaadikauplus, shokolaadikauplus"
                 },
                 "shop/clothes": {
-                    "name": "Riidepood"
+                    "name": "Riidepood",
+                    "terms": "Moekauplus"
+                },
+                "shop/coffee": {
+                    "name": "Kohvipood"
                 },
                 "shop/computer": {
-                    "name": "Arvutipood"
+                    "name": "Arvutipood",
+                    "terms": "IT kauplus, arvutitarvikud"
                 },
                 "shop/confectionery": {
                     "name": "Kommipood"
                 },
+                "shop/convenience": {
+                    "name": "Esmatarbekauba pood",
+                    "terms": "Kauplus, pood"
+                },
+                "shop/copyshop": {
+                    "name": "Koopiateenuse kauplus"
+                },
+                "shop/cosmetics": {
+                    "name": "Kosmeetikapood",
+                    "terms": "moekauplus"
+                },
+                "shop/craft": {
+                    "name": "Käsitöökauplus",
+                    "terms": "Kuntsitarvete kauplus"
+                },
+                "shop/curtain": {
+                    "name": "Kardinakauplus"
+                },
+                "shop/dairy": {
+                    "name": "Piimapood",
+                    "terms": "Meierei kauplus, piimatoodete kauplus"
+                },
+                "shop/deli": {
+                    "name": "Delikatessikauplus",
+                    "terms": "Deli, delikaadid, hõrgutised"
+                },
+                "shop/department_store": {
+                    "name": "Kaubamaja",
+                    "terms": "kauplus, pood"
+                },
+                "shop/doityourself": {
+                    "name": "Ehituskauplus",
+                    "terms": "Ehituskaubad, santehnika, ehitustarvikud, ehituspood"
+                },
+                "shop/dry_cleaning": {
+                    "name": "Keemiline puhastus"
+                },
+                "shop/e-cigarette": {
+                    "name": "E-sigaretipood"
+                },
                 "shop/electronics": {
-                    "name": "Elektroonikapood"
+                    "name": "Elektroonikapood",
+                    "terms": "Arvutipood, köögitehnika, tehnika kauplus, tehnika pood"
+                },
+                "shop/erotic": {
+                    "name": "Erootikapood",
+                    "terms": "Seksipood,seksitarbed"
+                },
+                "shop/fabric": {
+                    "name": "Kangakauplus",
+                    "terms": "kangapood"
+                },
+                "shop/farm": {
+                    "name": "Talukaup",
+                    "terms": "Talusaadused,farmikaup,põllusaadused,aiasaadused"
+                },
+                "shop/fashion": {
+                    "name": "Moekauplus",
+                    "terms": "Butiik, moepood, rõivakauplus"
+                },
+                "shop/fishmonger": {
+                    "name": "Kalakauplus"
                 },
                 "shop/florist": {
-                    "name": "Lillepood"
+                    "name": "Lillepood",
+                    "terms": "Florist"
+                },
+                "shop/frame": {
+                    "name": "Raamikauplus",
+                    "terms": "Piltide raamimine,maali raamimine"
+                },
+                "shop/funeral_directors": {
+                    "name": "Matusebüroo",
+                    "terms": "kirstud, puusärgid, matused"
+                },
+                "shop/furnace": {
+                    "name": "Küttepood",
+                    "terms": "küttekaup,ahjupood,katlad"
                 },
                 "shop/furniture": {
                     "name": "Mööblipood"
                 },
+                "shop/garden_centre": {
+                    "name": "Aianduskeskus",
+                    "terms": "Aianduskauplus"
+                },
+                "shop/gas": {
+                    "name": "Balloongaasi kauplus",
+                    "terms": "gaas,vedelgaas,grillgaas,segugaas"
+                },
                 "shop/gift": {
                     "name": "Kingipood"
                 },
+                "shop/greengrocer": {
+                    "name": "Aedviljapood",
+                    "terms": "puuviljad,aedviljad,talukaup,juurviljad"
+                },
                 "shop/hairdresser": {
                     "name": "Juuksurisalong"
                 },
+                "shop/hardware": {
+                    "name": "Rauakauplus",
+                    "terms": "tööriistad,kinnitusvahendid"
+                },
+                "shop/hearing_aids": {
+                    "name": "Kuulmisabipood"
+                },
+                "shop/herbalist": {
+                    "name": "Ravimtaimekauplus",
+                    "terms": "ravitaimed"
+                },
+                "shop/hifi": {
+                    "name": "Hifi kauplus",
+                    "terms": "hi-fi,high fidelity,loomutruu,helitehnika"
+                },
+                "shop/houseware": {
+                    "name": "Kodutarvete kauplus",
+                    "terms": "köögitabed,majapidamistarbed"
+                },
+                "shop/interior_decoration": {
+                    "name": "Sisedekoratsioonikauplus",
+                    "terms": "dekoratsioonid,kaunistus"
+                },
+                "shop/jewelry": {
+                    "name": "Ehtepood",
+                    "terms": "ehted,kalliskivid"
+                },
+                "shop/kiosk": {
+                    "name": "Kiosk",
+                    "terms": "putka,ajalehekiosk"
+                },
+                "shop/kitchen": {
+                    "name": "Köögimööblikauplus",
+                    "terms": "köögimööblistuudio,köögistuudio"
+                },
                 "shop/laundry": {
                     "name": "Pesumaja"
                 },
+                "shop/leather": {
+                    "name": "Nahakauplus",
+                    "terms": "nahast,karusnahk"
+                },
+                "shop/locksmith": {
+                    "name": "Lukksepp",
+                    "terms": "lukud,uksed"
+                },
+                "shop/lottery": {
+                    "name": "Lotopood",
+                    "terms": "loterii"
+                },
+                "shop/mall": {
+                    "name": "Kaubanduskeskus",
+                    "terms": "kauplus,pood,shoppamine,poekompleks"
+                },
+                "shop/massage": {
+                    "name": "Massaaž",
+                    "terms": "massaaz"
+                },
+                "shop/medical_supply": {
+                    "name": "Tervisetoodete kauplus",
+                    "terms": "ravitooted,taastusravi,invakaup,abivahendid"
+                },
                 "shop/mobile_phone": {
-                    "name": "Mobiilipood"
+                    "name": "Mobiilipood",
+                    "terms": "mobiiltelefonid,nutitelefonid,telefonid"
+                },
+                "shop/money_lender": {
+                    "name": "Rahalaenutaja",
+                    "terms": "krediit,laenud,kiirlaenud"
                 },
                 "shop/motorcycle": {
-                    "name": "Mootorrattapood"
+                    "name": "Mootorrattapood",
+                    "terms": "tsiklid"
                 },
                 "shop/music": {
                     "name": "Muusikapood"
                 },
+                "shop/musical_instrument": {
+                    "name": "Muusikainstrumentide kauplus",
+                    "terms": "pillipood,pillid"
+                },
+                "shop/newsagent": {
+                    "name": "Ajakirjapood",
+                    "terms": "ajalehemüüja"
+                },
+                "shop/nutrition_supplements": {
+                    "name": "Toidulisandite kauplus"
+                },
                 "shop/optician": {
-                    "name": "Prillipood"
+                    "name": "Optikapood",
+                    "terms": "optik,prillipood,prillid,läätsed"
+                },
+                "shop/organic": {
+                    "name": "Mahetoodete kauplus",
+                    "terms": "mahekaup,ökoloogiline,mahepõllunduskaup"
+                },
+                "shop/outdoor": {
+                    "name": "Matkatarvete kauplus",
+                    "terms": "matkatarbed,välitarbed,telgid,ronimine,matkamine,telkimine"
+                },
+                "shop/paint": {
+                    "name": "Värvipood"
+                },
+                "shop/pastry": {
+                    "name": "Kondiiter",
+                    "terms": "koogid,tordid"
+                },
+                "shop/pawnbroker": {
+                    "name": "Pandimaja",
+                    "terms": "lombard"
+                },
+                "shop/perfumery": {
+                    "name": "Parfüümikauplus",
+                    "terms": "lõhnaõli"
                 },
                 "shop/pet": {
-                    "name": "Lemmikloomapood"
+                    "name": "Lemmikloomapood",
+                    "terms": "loomapood,loomatarbed,koduloomatarbed"
+                },
+                "shop/photo": {
+                    "name": "Fotograafiapood",
+                    "terms": "fotopood,fototarbed,pildid,fotod,ilmutus"
+                },
+                "shop/pyrotechnics": {
+                    "name": "Ilutulestiku kauplus",
+                    "terms": "pürotehnika"
+                },
+                "shop/radiotechnics": {
+                    "name": "Elektroonikakomponentide pood",
+                    "terms": "elektroonika,tehnika,raadiotehnika,arvutitehnika"
+                },
+                "shop/religion": {
+                    "name": "Usutarvete kauplus",
+                    "terms": "kirikupood,usupood,pühatarvete"
+                },
+                "shop/scuba_diving": {
+                    "name": "Sukeldustarvikute kauplus",
+                    "terms": "sukelduskeskus,sukeldumine,snorkeldamine"
+                },
+                "shop/seafood": {
+                    "name": "Kalapood",
+                    "terms": "mereannid"
+                },
+                "shop/second_hand": {
+                    "name": "Komisjonikauplus",
+                    "terms": "kasutatud"
                 },
                 "shop/shoes": {
                     "name": "Kingapood"
                 },
                 "shop/sports": {
-                    "name": "Sporditarvete pood"
+                    "name": "Sporditarvete pood",
+                    "terms": "spordipood"
+                },
+                "shop/stationery": {
+                    "name": "Kirjatarvete kauplus",
+                    "terms": "kirjutusvahendid,büroovahendid,paberipood"
                 },
                 "shop/supermarket": {
                     "name": "Supermarket"
                 },
+                "shop/tailor": {
+                    "name": "Rätsep",
+                    "terms": "õmbuskoda,õmbleja"
+                },
+                "shop/tattoo": {
+                    "name": "Tatoveeringu salong"
+                },
+                "shop/tea": {
+                    "name": "Teepood",
+                    "terms": "kohvipood"
+                },
+                "shop/ticket": {
+                    "name": "Piletikauplus",
+                    "terms": "piletid,kontserdipiletid,kassa,bussipiletid"
+                },
+                "shop/tobacco": {
+                    "name": "Tubakapood",
+                    "terms": "suitsupood,tubakas,sigarid,sigaretid"
+                },
                 "shop/toys": {
-                    "name": "Mänguasjapood"
+                    "name": "Mänguasjapood",
+                    "terms": "Lastekaup"
                 },
                 "shop/travel_agency": {
-                    "name": "Reisiagentuur"
+                    "name": "Reisibüroo",
+                    "terms": "reisiagentuur"
                 },
                 "shop/tyres": {
-                    "name": "Rehvipood"
+                    "name": "Rehvipood",
+                    "terms": "rehvid,kummid,autorehvid"
+                },
+                "shop/vacant": {
+                    "name": "Vaba kaubanduspind"
+                },
+                "shop/vacuum_cleaner": {
+                    "name": "Tolmuimeja kauplus"
+                },
+                "shop/variety_store": {
+                    "name": "Kodukauba pood",
+                    "terms": "majapidamiskaup"
                 },
                 "shop/video": {
-                    "name": "Videolaenutus"
+                    "name": "Videopood",
+                    "terms": "videolaenutus"
+                },
+                "shop/video_games": {
+                    "name": "Konsoolimängude pood",
+                    "terms": "telekamängud,telerimängud,mängud"
+                },
+                "shop/watches": {
+                    "name": "Kellapood"
+                },
+                "shop/water_sports": {
+                    "name": "Veesporditarvete kauplus",
+                    "terms": "ujumistarbed"
+                },
+                "shop/weapons": {
+                    "name": "Relvapood"
+                },
+                "shop/window_blind": {
+                    "name": "Aknakatete kauplus",
+                    "terms": "rulood,ribikardinad,lamellkardinad"
+                },
+                "shop/wine": {
+                    "name": "Veinipood"
                 },
                 "tourism": {
                     "name": "Turism"
                 "tourism/alpine_hut": {
                     "name": "Alpimaja"
                 },
+                "tourism/apartment": {
+                    "name": "Külaliskorter"
+                },
+                "tourism/aquarium": {
+                    "name": "Akvaarium"
+                },
                 "tourism/artwork": {
                     "name": "Kunstiteos"
                 },
                 "tourism/attraction": {
-                    "name": "Turismiatraktsioon"
+                    "name": "Turismiatraktsioon",
+                    "terms": "vaatamisväärsus"
+                },
+                "tourism/camp_site": {
+                    "name": "Telkimisala",
+                    "terms": "puhkeala,autoelamu,haagissuvila,telkimisplats,kämpimisala"
                 },
                 "tourism/caravan_site": {
-                    "name": "Karavanipark"
+                    "name": "Karavanipark",
+                    "terms": "autoelamu,haagissuvila,kämpimisala"
+                },
+                "tourism/chalet": {
+                    "name": "Mägimajake",
+                    "terms": "alpimaja"
+                },
+                "tourism/gallery": {
+                    "name": "Kunstigalerii"
                 },
                 "tourism/guest_house": {
                     "name": "Külalistemaja"
                 "tourism/hotel": {
                     "name": "Hotell"
                 },
+                "tourism/information": {
+                    "name": "Info",
+                    "terms": "informatsioon"
+                },
+                "tourism/information/board": {
+                    "name": "Infotahvel",
+                    "terms": "informatsioonitahvel,infopost"
+                },
+                "tourism/information/guidepost": {
+                    "name": "Teeviit",
+                    "terms": "suunaviit,viit,kohaviit"
+                },
+                "tourism/information/map": {
+                    "name": "Kaart",
+                    "terms": "seinakaart"
+                },
+                "tourism/information/office": {
+                    "name": "Turismiinfokeskus",
+                    "terms": "infokeskus"
+                },
                 "tourism/motel": {
-                    "name": "Motell"
+                    "name": "Motell",
+                    "terms": "motohotell"
                 },
                 "tourism/museum": {
                     "name": "Muuseum"
                 },
                 "tourism/picnic_site": {
-                    "name": "Piknikukoht"
+                    "name": "Piknikukoht",
+                    "terms": "einestuskoht,söögikoht"
                 },
                 "tourism/theme_park": {
-                    "name": "Teemapark"
+                    "name": "Teemapark",
+                    "terms": "lõbustuspark"
+                },
+                "tourism/viewpoint": {
+                    "name": "Vaatekoht",
+                    "terms": "kaunis vaade,vaade"
                 },
                 "tourism/zoo": {
                     "name": "Loomaaed"
                 },
+                "traffic_calming": {
+                    "name": "Liikluse rahustus"
+                },
+                "traffic_calming/bump": {
+                    "name": "Kiirusepiiraja",
+                    "terms": "künnis,lamav politseinik,kiirustõke,tõke,liikluskünnis"
+                },
+                "traffic_calming/chicane": {
+                    "name": "Suunamuutetakistus",
+                    "terms": "šikaan,shikaan,kitsendus,aeglustus,liiklusšikaan"
+                },
+                "traffic_calming/choker": {
+                    "name": "Teekitsendus",
+                    "terms": "sümmeetriline teekitsendus,kitsendus,sümmeetriline kitsendus,aeglustus"
+                },
+                "traffic_calming/cushion": {
+                    "name": "Sõiduautokünnis",
+                    "terms": "künnis,liikluskünnis,kitsendatud künnis"
+                },
+                "traffic_calming/dip": {
+                    "name": "Ümberpööratud liikluskünnis",
+                    "terms": "ümberpööratud künnis,künnis,lohk"
+                },
+                "traffic_calming/hump": {
+                    "name": "Liikluskünnis",
+                    "terms": "künnis,kiirustõke,tõke,aeglustaja,platvorm,kõrgendus,kühm"
+                },
+                "traffic_calming/island": {
+                    "name": "Eraldussaarega kitsendus",
+                    "terms": "kitsendus,liikluskitsendus,aeglustus,saar,ohutussaar,kitsendussaar"
+                },
+                "traffic_calming/rumble_strip": {
+                    "name": "Täristi",
+                    "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
+                },
+                "traffic_calming/table": {
+                    "name": "Tõstetud ülekäik",
+                    "terms": "kõrgendatud,künnis,aeglustus,ülekäigurada"
+                },
+                "type/boundary": {
+                    "name": "Piir"
+                },
                 "type/boundary/administrative": {
                     "name": "Administratiivpiir"
                 },
+                "type/restriction": {
+                    "name": "Piirang"
+                },
+                "type/restriction/no_left_turn": {
+                    "name": "Vasakpöörd keelatud"
+                },
+                "type/restriction/no_right_turn": {
+                    "name": "Parempöörd keelatud"
+                },
+                "type/restriction/no_straight_on": {
+                    "name": "Edasisõit keelatud"
+                },
+                "type/restriction/no_u_turn": {
+                    "name": "Tagasipöörd keelatud"
+                },
+                "type/restriction/only_left_turn": {
+                    "name": "Ainult vasakpöörd",
+                    "terms": "ainult vasakule,kohustuslik sõidusuund vasakule"
+                },
+                "type/restriction/only_right_turn": {
+                    "name": "Ainult parempöörd",
+                    "terms": "ainult paremale,kohustuslik sõidusuund paremale"
+                },
+                "type/restriction/only_straight_on": {
+                    "name": "Pööramine keelatud",
+                    "terms": "Kohustuslik sõidusuund otse,ainult otse"
+                },
+                "type/route": {
+                    "name": "Marsruut"
+                },
+                "type/route/bicycle": {
+                    "name": "Jalgrattamarsruut",
+                    "terms": "jalgrattatee,rattatee,rattamarsruut"
+                },
+                "type/route/bus": {
+                    "name": "Bussimarsruut",
+                    "terms": "autobussimarsruut"
+                },
+                "type/route/detour": {
+                    "name": "Ümbersõidu marsruut"
+                },
+                "type/route/ferry": {
+                    "name": "Praamlaeva marsruut"
+                },
+                "type/route/foot": {
+                    "name": "Jalgmarsruut"
+                },
+                "type/route/hiking": {
+                    "name": "Matkamarsruut"
+                },
+                "type/route/horse": {
+                    "name": "Ratsamarsruut"
+                },
+                "type/route/pipeline": {
+                    "name": "Torujuhtme marsruut"
+                },
+                "type/route/power": {
+                    "name": "Elektrimarsruut"
+                },
+                "type/route/road": {
+                    "name": "Teemarsruut"
+                },
+                "type/route/train": {
+                    "name": "Rongimarsruut"
+                },
+                "type/route/tram": {
+                    "name": "Trammimarsruut"
+                },
+                "type/route_master": {
+                    "name": "Ülemmarsruut",
+                    "terms": "Peamarsruut,koondmarsruut"
+                },
+                "type/site": {
+                    "name": "Asukoht"
+                },
+                "vertex": {
+                    "name": "Muu"
+                },
+                "waterway": {
+                    "name": "Veetee"
+                },
+                "waterway/boatyard": {
+                    "name": "Laevatehas",
+                    "terms": "dokk"
+                },
                 "waterway/canal": {
                     "name": "Kanal"
                 },
                 "waterway/ditch": {
                     "name": "Kraav"
                 },
+                "waterway/dock": {
+                    "name": "Dokk",
+                    "terms": "märgdokk,kuivdokk,ujuvdokk"
+                },
+                "waterway/drain": {
+                    "name": "Äravool",
+                    "terms": "reovee äravool"
+                },
+                "waterway/fuel": {
+                    "name": "Laevakütuse tankla",
+                    "terms": "kütus,bensiin,diisel,gaas,paat,paadi,mere"
+                },
                 "waterway/river": {
                     "name": "Jõgi"
                 },
                 "waterway/riverbank": {
                     "name": "Jõekallas"
                 },
+                "waterway/sanitary_dump_station": {
+                    "name": "Septitangi tühjenduspunkt",
+                    "terms": "wc tühjendus,tühjendus,sanitaar,paadi,laeva"
+                },
                 "waterway/stream": {
                     "name": "Oja"
                 },
+                "waterway/water_point": {
+                    "name": "Joogiveepunkt (veesõidukitele)",
+                    "terms": "vesi,vee"
+                },
+                "waterway/waterfall": {
+                    "name": "Kosk"
+                },
                 "waterway/weir": {
-                    "name": "Pais"
+                    "name": "Pais",
+                    "terms": "tamm"
                 }
             }
         }