]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/et.json
Update to iD v2.15.2
[rails.git] / vendor / assets / iD / iD / locales / et.json
index a1c778704b1af4c5712d77931561d4d105941f82..049eb7e490aa0723d267c8fc516b2d65058828f7 100644 (file)
@@ -1,5 +1,15 @@
 {
     "et": {
+        "icons": {
+            "information": "info",
+            "remove": "eemalda",
+            "undo": "tühista",
+            "copy": "kopeeri",
+            "open_wikidata": "ava lehel wikidata.org"
+        },
+        "toolbar": {
+            "add_feature": "Lisa objekt"
+        },
         "modes": {
             "add_area": {
                 "title": "Ala",
                 "description": "Lisa kaardile restorane, monumente, postkaste ja muid punkte.",
                 "tail": "Klõpsa kaardil, et lisada punkt."
             },
+            "add_note": {
+                "title": "Märge",
+                "description": "Avastasid vea? Anna teistele kaardistajatele sellest märku.",
+                "tail": "Klõpsa kaardil, et lisada teade."
+            },
             "browse": {
                 "title": "Sirvi",
                 "description": "Nihuta ja suumi kaarti."
@@ -32,7 +47,8 @@
                 "annotation": {
                     "point": "Punkt lisatud.",
                     "vertex": "Joonele lisatud sõlm.",
-                    "relation": "Relatsioon lisatud."
+                    "relation": "Relatsioon lisatud.",
+                    "note": "Märge lisatud."
                 }
             },
             "start": {
@@ -82,7 +98,6 @@
                     "line": "Täisnurgasta selle joone nurgad.",
                     "area": "Täisnurgasta selle ala nurgad."
                 },
-                "key": "S",
                 "annotation": {
                     "line": "Joone nurgad täisnurgastatud.",
                     "area": "Ala nurgad täisnurgastatud."
             },
             "straighten": {
                 "title": "Tee sirgeks",
-                "description": "Tee see joon sirgeks.",
                 "key": "S",
-                "annotation": "Joon tehti sirgeks.",
-                "too_bendy": "Seda ei saa sirgeks teha, kuna see painduks liiga palju.",
-                "connected_to_hidden": "Seda ei saa teha sirgeks, kuna see on ühendatud peidetud objektiga."
+                "too_bendy": "Seda ei saa sirgeks teha, kuna see painduks liiga palju."
             },
             "delete": {
                 "title": "Kustuta",
             "delete_member": {
                 "annotation": "Relatsiooni liige kustutatud."
             },
-            "connect": {
-                "annotation": {
-                    "point": "Joon ühendatud punktiga.",
-                    "vertex": "Joon ühendatud teise joonega.",
-                    "line": "Joon ühendatud joonega.",
-                    "area": "Joon ühendatud alaga."
-                }
-            },
             "disconnect": {
                 "title": "Ühenda lahti",
                 "description": "Ühenda need jooned/alad üksteisest lahti.",
                 "key": "C",
                 "annotation": "Ühendatud {n} objekti.",
                 "not_eligible": "Neid objekte ei saa ühendada.",
-                "restriction": "Neid objekte ei saa ühendada, kuna vähemalt üks neist on relatsiooni \"{relation}\" liige.",
                 "incomplete_relation": "Neid objekte ei saa ühendada, kuna vähemalt üks neist ei ole täielikult alla laaditud.",
                 "conflicting_tags": "Neid objekte ei saa ühendada, kuna osa nende silte on konfliktsete väärtustega."
             },
         "browser_notice": "Seda redaktorit toetavad järgmised brauserid: Firefox, Chrome, Safari, Opera ning Internet Explorer 11 ja uuemad. Palun uuenda oma brauser või kasuta redaktorit Potlatch 2, et kaarti muuta.",
         "translate": {
             "translate": "Tõlgi",
-            "localized_translation_label": "Mitmekeelne nimi",
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
             "cancel": "Loobu",
             "changes": "{count} muudatust",
             "download_changes": "Laadi alla osmChange-fail",
+            "errors": "Vead",
             "warnings": "Hoiatused",
             "modified": "Muudetud",
             "deleted": "Kustutatud",
         },
         "info_panels": {
             "background": {
+                "title": "Taust",
                 "source": "Allikas",
                 "description": "Kirjeldus",
-                "resolution": "Resolutsioon",
-                "accuracy": "Täpsus"
+                "resolution": "Eraldus",
+                "accuracy": "Täpsus",
+                "unknown": "Teadmata"
             },
             "history": {
                 "title": "Ajalugu",
+                "selected": "{n} valitud",
+                "no_history": "Ajalugu puudub (uus detail)",
                 "version": "Versioon",
                 "last_edit": "Viimane muudatus",
                 "edited_by": "Muutis",
                 "changeset": "Muudatuskogum",
-                "unknown": "Teadmata"
+                "unknown": "Teadmata",
+                "link_text": "Ajalugu openstreetmap.org-is"
+            },
+            "location": {
+                "key": "A",
+                "title": "Asukoht",
+                "unknown_location": "Teadmata asukoht"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Mõõtmine",
+                "selected": "{n} valitud",
+                "geometry": "Geomeetria",
+                "closed_line": "suletud joon",
+                "closed_area": "suletud ala",
+                "center": "Keskpunkt",
+                "perimeter": "Ümbermõõt",
+                "length": "Pikkus",
+                "area": "Ala",
+                "centroid": "Tsentroid",
+                "location": "Asukoht",
+                "metric": "Meeter",
+                "imperial": "Inglise"
             }
         },
         "geometry": {
         },
         "geocoder": {
             "search": "Otsi kogu maailmast...",
-            "no_results_visible": "Nähtaval kaardialal tulemusi ei leitud",
             "no_results_worldwide": "Tulemusi ei leitud"
         },
         "geolocate": {
             "locating": "Asukoha määramine, palun oota..."
         },
         "inspector": {
-            "no_documentation_combination": "Selle sildi kohta puudub dokumentatsioon",
-            "no_documentation_key": "Selle objektiliigi kohta puudub informatsioon",
+            "zoom_to": {
+                "key": "Z",
+                "title": "Suumi selleni",
+                "tooltip_feature": "Tsentreeri ja suumi kaarti, et keskenduda sellele objektile.",
+                "tooltip_note": "Tsentreeri ja suumi kaarti, et keskenduda sellele teatele.",
+                "tooltip_data": "Tsentreeri ja suumi kaarti, et keskenduda sellele andmele.",
+                "tooltip_issue": "Tsentreeri ja suumi kaarti, et keskenduda sellele veale."
+            },
             "show_more": "Näita rohkem",
             "view_on_osm": "Vaata asukohas openstreetmap.org",
+            "view_on_keepRight": "Vaata lehel keepright.at",
             "all_fields": "Kõik väljad",
             "all_tags": "Kõik sildid",
             "all_members": "Kõik liikmed",
             "role": "Roll",
             "choose": "Vali objekti liik",
             "results": "{n} tulemust otsingule {search}",
-            "reference": "Vaata OpenStreetMapi vikis",
             "back_tooltip": "Muuda objekti",
             "remove": "Eemalda",
             "search": "Otsi",
             "none": "Puudub",
             "switch": "Vaheta tagasi selle tausta vastu",
             "custom": "Kohandatud",
-            "custom_button": "Muuda kohandatud tausta",
-            "custom_prompt": "Sisesta paanide internetiaadressi vormel. Sobivad järgmised sõned:\n   - {zoom} või {z}, {x}, {y}, kui kasutad paaniskeemi Z/X/Y\n   - {-y} või {ty}, kui kasutad TMS-skeemi ümberpööratud Y-koordinaate\n   - {u}, kui kasutad ruutpaani skeemi (quadtile)\n   - {switch:a,b,c}, kui kasutad DNS-serveri multipleksimist\n\nNäide:\n{example}",
             "overlays": "Ülekatted",
             "imagery_source_faq": "Pildimaterjali teave / teata probleemist",
             "reset": "lähtesta",
                 "osm": {
                     "tooltip": "Kaardiandmed OpenStreetMapist",
                     "title": "OpenStreetMapi andmed"
+                },
+                "notes": {
+                    "tooltip": "Märke andmed OpenStreetMapist",
+                    "title": "OpenStreetMapi märked"
+                },
+                "keepRight": {
+                    "tooltip": "Automaatselt tuvastatud keepright.at kaardivead",
+                    "title": "KeepRight Vead"
+                },
+                "improveOSM": {
+                    "tooltip": "Puuduvad andmed mis on improveosm.org poolt automaatselt avastatud",
+                    "title": "ImproveOSM Vead"
+                },
+                "custom": {
+                    "title": "Kohandatud kaardiandmed"
                 }
             },
             "fill_area": "Täida alad",
                 "tooltip": "Planeeritud, ehitamisel, mahajäetud, lammutatud.."
             },
             "others": {
-                "description": "Muu",
+                "description": "Muud",
                 "tooltip": "Kõik ülejäänud"
             }
         },
                 "tooltip": "Alad kuvatakse täielikult täidetuna."
             }
         },
-        "restore": {
-            "heading": "Sul on salvestamata muudatusi",
-            "description": "Kas soovid taastada eelmise seansi käigus tehtud muudatused?",
-            "restore": "Taasta muudatused",
-            "reset": "Hülga muudatused"
+        "settings": {
+            "custom_background": {
+                "tooltip": "Muuda kohandatud taustkatet",
+                "header": "Kohandatud taustakatte sätted"
+            },
+            "custom_data": {
+                "tooltip": "Muuda kohandatud andmekihti",
+                "header": "Kohandatud kaardiandmete sätted"
+            }
         },
         "save": {
             "title": "Salvesta",
             }
         },
         "success": {
-            "just_edited": "Täiendasid just OpenStreetMapi!",
             "help_link_text": "Üksikasjad"
         },
         "confirm": {
             "cancel": "Loobu"
         },
-        "splash": {
-            "welcome": "Tere tulemast OpenStreetMapi redaktorisse iD",
-            "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
-            "walkthrough": "Alusta tutvustust",
-            "start": "Redigeeri kohe"
-        },
         "source_switch": {
             "live": "live",
             "lose_changes": "Sul on salvestamata muudatusi. Kaardiserveri vahetamine kaotab need. Kas oled kindel, et soovid serverit vahetada?",
             "on_wiki": "{tag} wiki.osm.org-is",
             "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": "Sildistamata relatsioon",
-            "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
-            "deprecated_tags": "Iganenud sildid: {tags}"
-        },
         "zoom": {
             "in": "Suurenda",
             "out": "Vähenda"
         },
         "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 klõpsa nuppu paremal, et sirvida",
-            "zoom": "Suumi kihini",
-            "browse": "Sirvi faili"
+        "QA": {
+            "keepRight": {
+                "title": "KeepRight Viga",
+                "detail_title": "Viga",
+                "detail_description": "Kirjeldus",
+                "comment": "Kommentaar",
+                "comment_placeholder": "Lisa kommentaar, mida teistega jagada.",
+                "close": "Sulge (Viga Parandatud)",
+                "ignore": "Ignoreeri (Ei Ole Viga)",
+                "save_comment": "Salvesta Kommentaar",
+                "close_comment": "Sulge ja Kommenteeri",
+                "ignore_comment": "Ignoreeri ja Kommenteeri"
+            }
         },
-        "mapillary_images": {
-            "tooltip": "Tänavatasandi fotod Mapillaryst",
-            "title": "Fotokate (Mapillary)"
+        "streetside": {
+            "tooltip": "Tänava-tasandi fotod Microsoftilt",
+            "report": "Teata privaatsusmurest selle pildiga",
+            "view_on_bing": "Vaata Bing Mapsis",
+            "hires": "Suur eraldus"
         },
-        "mapillary_signs": {
-            "tooltip": "Liiklusmärgid Mapillaryst (fotokate peab olema lubatud)",
-            "title": "Liiklusmärkide kate (Mapillary)"
+        "mapillary_images": {
+            "tooltip": "Tänavatasandi fotod Mapillaryst"
         },
         "mapillary": {
             "view_on_mapillary": "Vaata seda fotot Mapillarys"
         },
         "openstreetcam_images": {
-            "tooltip": "Tänavatasandi fotod OpenStreetCamist",
-            "title": "Fotokate (OpenStreetCam)"
+            "tooltip": "Tänavatasandi fotod OpenStreetCamist"
+        },
+        "note": {
+            "note": "Märge",
+            "title": "Muuda märget",
+            "anonymous": "anonüümne",
+            "closed": "(Suletud)",
+            "commentTitle": "Kommentaarid",
+            "newComment": "Uus kommentaar",
+            "inputPlaceholder": "Lisa kommentaar teistega jagamiseks.",
+            "close": "Sulge märge",
+            "open": "Taasava märge",
+            "comment": "Kommentaar",
+            "close_comment": "Sulge ja kommenteeri",
+            "open_comment": "Taasava ja kommenteeri",
+            "report": "Teavita",
+            "new": "Uus märge",
+            "newDescription": "Kirjelda mure.",
+            "save": "Salvesta märge",
+            "login": "Sa pead olema sisse logitud, et muuta või kommenteerida seda märget.",
+            "upload_explanation": "Sinu kommentaarid on avalikult nähtavad kõigile OpenStreetMapi kasutajatele.",
+            "upload_explanation_with_user": "Sinu kommentaarid kasutajana {user} on avalikult nähtavad kõigile OpenStreetMapi kasutajatele."
         },
         "help": {
             "title": "Abi",
             "editing": {
                 "keyboard_h": "Kiirklahvid"
+            },
+            "notes": {
+                "title": "Märked"
+            }
+        },
+        "issues": {
+            "title": "Vead",
+            "list_title": "Vigu ({count})",
+            "no_issues": {
+                "hidden_issues": {
+                    "none": "Avastatud vead ilmuvad siia",
+                    "elsewhere": "Vead mujal: {count}"
+                }
             }
         },
         "intro": {
                 "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": {
                     "label": "Pääs lubatud",
                     "options": {
                         "designated": {
-                            "description": "Pääs lubatud märkide või kohalike eriseadustega",
                             "title": "Määratud"
                         },
                         "destination": {
-                            "description": "Pääs lubatud ainult sihtpunkti jõudmiseks",
                             "title": "Sihtkoht"
                         },
                         "dismount": {
-                            "description": "Pääs lubatud, kui liikleja tuleb sadulast maha",
                             "title": "Sadulast maas"
                         },
                         "no": {
-                            "description": "Avalik juurdepääs puudub",
                             "title": "Keelatud"
                         },
                         "permissive": {
-                            "description": "Juurdepääs on lubatud ajani, mil omanik tühistab loa",
                             "title": "Omanik lubab"
                         },
                         "private": {
-                            "description": "Juurdepääs lubatud ainult omaniku eriloal",
                             "title": "Era"
                         },
                         "yes": {
-                            "description": "Juurdepääs seaduse alusel; igameheõigus",
                             "title": "Lubatud"
                         }
                     },
                 "admin_level": {
                     "label": "Haldusüksuse järk"
                 },
+                "aerialway": {
+                    "label": "Tüüp"
+                },
                 "aerialway/access": {
                     "options": {
                         "both": "Mõlemad"
                 "atm": {
                     "label": "Pangaautomaat"
                 },
-                "beauty": {
-                    "label": "Poetüüp"
+                "attraction": {
+                    "label": "Tüüp"
+                },
+                "barrier": {
+                    "label": "Tüüp"
+                },
+                "basin": {
+                    "label": "Tüüp"
                 },
                 "bench": {
                     "label": "Pink"
                 "board_type": {
                     "label": "Tüüp"
                 },
+                "booth": {
+                    "label": "Kabiin"
+                },
+                "boules": {
+                    "label": "Tüüp"
+                },
                 "boundary": {
                     "label": "Tüüp"
                 },
                 "brand": {
                     "label": "Tootemark"
                 },
+                "bridge": {
+                    "label": "Tüüp"
+                },
+                "bridge/support": {
+                    "label": "Tüüp"
+                },
                 "building": {
                     "label": "Hoone"
                 },
                     "label": "Veebikaamera URL",
                     "placeholder": "http://näidis.ee"
                 },
+                "conveying": {
+                    "options": {
+                        "reversible": "Muutsuunaga"
+                    }
+                },
                 "country": {
                     "label": "Riik"
                 },
                 "cuisine": {
                     "label": "Köök"
                 },
+                "cutting": {
+                    "label": "Tüüp"
+                },
                 "cycle_network": {
                     "label": "Võrgustik"
                 },
                 "denomination": {
                     "label": "Usulahk"
                 },
+                "diplomatic": {
+                    "label": "Tüüp"
+                },
                 "direction": {
                     "label": "Suund (kraade päripäeva)",
                     "placeholder": "45, 90, 180, 270"
                     }
                 },
                 "direction_vertex": {
-                    "label": "Suund",
                     "options": {
                         "backward": "Tagasi",
                         "both": "Mõlemad / Kõik",
                 "dock": {
                     "label": "Tüüp"
                 },
+                "door_type": {
+                    "label": "Tüüp"
+                },
                 "drive_through": {
                     "label": "Sõida läbi"
                 },
                     "label": "E-posti aadress",
                     "placeholder": "näide@näide.ee"
                 },
+                "embankment": {
+                    "label": "Tüüp"
+                },
+                "embassy": {
+                    "label": "Tüüp"
+                },
                 "emergency": {
                     "label": "Hädaabi"
                 },
+                "emergency_combo": {
+                    "label": "Tüüp"
+                },
+                "enforcement": {
+                    "label": "Tüüp"
+                },
                 "entrance": {
                     "label": "Tüüp"
                 },
                 "fence_type": {
                     "label": "Tüüp"
                 },
+                "fixme": {
+                    "label": "Vajab parandamist"
+                },
+                "ford": {
+                    "label": "Tüüp"
+                },
                 "fuel": {
                     "label": "Kütus"
                 },
                 "gauge": {
                     "label": "Rööpalaius"
                 },
+                "generator/type": {
+                    "label": "Tüüp"
+                },
+                "government": {
+                    "label": "Tüüp"
+                },
+                "guest_house": {
+                    "label": "Tüüp"
+                },
                 "handrail": {
                     "label": "Käsipuu"
                 },
                 "hashtags": {
                     "label": "Soovitatud trellsildid"
                 },
+                "healthcare": {
+                    "label": "Tüüp"
+                },
                 "healthcare/speciality": {
                     "label": "Erialad"
                 },
+                "highway": {
+                    "label": "Tüüp"
+                },
+                "historic": {
+                    "label": "Tüüp"
+                },
                 "horse_riding": {
                     "label": "Ratsutamine"
                 },
                 "indoor": {
                     "label": "Siseruum"
                 },
+                "indoor_type": {
+                    "label": "Tüüp"
+                },
+                "industrial": {
+                    "label": "Tüüp"
+                },
+                "information": {
+                    "label": "Tüüp"
+                },
+                "intermittent": {
+                    "label": "Perioodiline"
+                },
+                "intermittent_yes": {
+                    "label": "Perioodiline"
+                },
                 "internet_access": {
                     "label": "Pääs internetti",
                     "options": {
                 "internet_access/fee": {
                     "label": "Internetipääsu tasu"
                 },
-                "internet_access/ssid": {
-                    "label": "SSID (võrgu nimi)"
+                "lamp_type": {
+                    "label": "Tüüp"
+                },
+                "landuse": {
+                    "label": "Tüüp"
                 },
                 "lanes": {
                     "label": "Sõiduread"
                 "layer": {
                     "label": "Kiht"
                 },
+                "leaf_type": {
+                    "label": "Lehe tüüp"
+                },
+                "leaf_type_singular": {
+                    "label": "Lehe tüüp"
+                },
+                "leisure": {
+                    "label": "Tüüp"
+                },
                 "length": {
                     "label": "Pikkus (meetrites)"
                 },
                 "levels": {
                     "label": "Korruseid"
                 },
+                "liaison": {
+                    "label": "Tüüp"
+                },
                 "lit": {
                     "label": "Valgustatud"
                 },
+                "man_made": {
+                    "label": "Tüüp"
+                },
+                "manhole": {
+                    "label": "Tüüp"
+                },
+                "map_type": {
+                    "label": "Tüüp"
+                },
                 "maxheight": {
                     "label": "Kõrguse piirang"
                 },
                     "label": "Soovitatav suurim kiirus",
                     "placeholder": "30, 50, 70..."
                 },
+                "maxweight_bridge": {
+                    "label": "Massipiirang"
+                },
+                "memorial": {
+                    "label": "Tüüp"
+                },
                 "name": {
                     "label": "Nimi",
                     "placeholder": "Üldlevinud nimi (kui on)"
                     "options": {
                         "alternating": "Vahelduv",
                         "no": "Ei",
-                        "reversible": "Ümberpööratav",
+                        "reversible": "Muutsuunaga",
                         "undefined": "Eeldatavasti mitte",
                         "yes": "Jah"
                     }
                     "options": {
                         "alternating": "Vahelduv",
                         "no": "Ei",
-                        "reversible": "Ümberpööratav",
+                        "reversible": "Muutsuunaga",
                         "undefined": "Eeldatavasti Jah",
                         "yes": "Jah"
                     }
                 "payment_multi": {
                     "label": "Makseviisid"
                 },
+                "payment_multi_fee": {
+                    "label": "Makseviisid"
+                },
                 "phone": {
-                    "label": "Telefon",
                     "placeholder": "+372 567 8901"
                 },
+                "piste/type": {
+                    "label": "Tüüp"
+                },
+                "place": {
+                    "label": "Tüüp"
+                },
+                "playground": {
+                    "label": "Tüüp"
+                },
                 "population": {
                     "label": "Rahvaarv"
                 },
                     "label": "Tüüp"
                 },
                 "railway/signal/direction": {
-                    "label": "Suund",
                     "options": {
                         "backward": "Tagasi",
                         "both": "Mõlemad / Kõik",
                 "recycling_accepts": {
                     "label": "Võtab vastu"
                 },
+                "recycling_type": {
+                    "label": "Tüüp"
+                },
                 "ref/isil": {
                     "label": "ISIL-kood"
                 },
                 "restrictions": {
                     "label": "Pöörangu piirangud"
                 },
+                "room": {
+                    "label": "Tüüp"
+                },
+                "route": {
+                    "label": "Tüüp"
+                },
+                "route_master": {
+                    "label": "Tüüp"
+                },
+                "salt": {
+                    "label": "Soolane"
+                },
                 "seasonal": {
                     "label": "Hooajaline"
                 },
                 "shop": {
                     "label": "Tüüp"
                 },
+                "siren/type": {
+                    "label": "Tüüp"
+                },
                 "site": {
                     "label": "Tüüp"
                 },
+                "site_type": {
+                    "label": "Koha tüüp"
+                },
                 "smoking": {
                     "label": "Suitsetamine",
                     "options": {
                         "minor": "Vähetähtsad teed"
                     }
                 },
+                "street_cabinet": {
+                    "label": "Tüüp"
+                },
                 "structure": {
                     "label": "Rajatis",
                     "options": {
                 "surface": {
                     "label": "Pinnakate"
                 },
+                "surveillance/type": {
+                    "label": "Seire tüüp"
+                },
+                "swimming_pool": {
+                    "label": "Tüüp"
+                },
+                "switch": {
+                    "label": "Tüüp"
+                },
+                "tidal": {
+                    "label": "Loodetest"
+                },
                 "toll": {
                     "label": "Maksustatud"
                 },
-                "tourism_attraction": {
-                    "label": "Turism"
+                "tomb": {
+                    "label": "Tüüp"
+                },
+                "tourism": {
+                    "label": "Tüüp"
+                },
+                "tower/type": {
+                    "label": "Tüüp"
                 },
                 "tracktype": {
                     "label": "Raja tüüp",
                     },
                     "placeholder": "Kõva, peamiselt kõva, pehme"
                 },
+                "trade": {
+                    "label": "Tüüp"
+                },
                 "traffic_calming": {
                     "label": "Tüüp"
                 },
                     "label": "Tüüp"
                 },
                 "traffic_signals/direction": {
-                    "label": "Suund",
                     "options": {
                         "backward": "Tagasi",
                         "both": "Mõlemad / Kõik",
                         "forward": "Edasi"
                     }
                 },
+                "transformer": {
+                    "label": "Tüüp"
+                },
                 "trees": {
                     "label": "Puud"
                 },
+                "tunnel": {
+                    "label": "Tüüp"
+                },
                 "usage_rail": {
-                    "label": "Kasutusostarve"
+                    "label": "Kasutusotstarve"
+                },
+                "vending": {
+                    "label": "Kauba tüübid"
                 },
                 "visibility": {
                     "label": "Nähtavus"
                 },
+                "volcano/type": {
+                    "label": "Vulkaani tüüp"
+                },
                 "wall": {
                     "label": "Tüüp"
                 },
                     "label": "Tüüp"
                 },
                 "website": {
-                    "label": "Veebileht",
-                    "placeholder": "http://näidis24.ee/"
+                    "label": "Veebileht"
                 },
                 "wetland": {
                     "label": "Tüüp"
                     "name": "Lennuterminal",
                     "terms": "terminal,lennujaam"
                 },
+                "aeroway/windsock": {
+                    "name": "Tuulesokk"
+                },
                 "allotments/plot": {
                     "name": "Ühisaia krunt"
                 },
                     "name": "Rattaparkla",
                     "terms": "jalgrattaparkla"
                 },
+                "amenity/bicycle_parking/building": {
+                    "terms": "autoparkla,parkla"
+                },
                 "amenity/bicycle_rental": {
                     "name": "Rattarent",
                     "terms": "jalgrattarent,laenutus"
                 "amenity/bicycle_repair_station": {
                     "name": "Jalgrattaremondi pukk"
                 },
-                "amenity/biergarten": {
-                    "name": "Õlleaed"
-                },
                 "amenity/boat_rental": {
                     "name": "Paadi laenutus"
                 },
                     "name": "Kolledžiala"
                 },
                 "amenity/community_centre": {
-                    "name": "Kultuurikeskus",
-                    "terms": "keskus,üritused,hall,rahvamaja,kogukonna keskus,külakeskus"
+                    "name": "Kogukonna keskus",
+                    "terms": "keskus,üritused,hall,rahvamaja,kultuurikeskus,külakeskus,spordikeskus,külamaja"
                 },
                 "amenity/compressed_air": {
                     "name": "Suruõhk",
                     "terms": "õhk"
                 },
+                "amenity/conference_centre": {
+                    "name": "Konverentsikeskus",
+                    "terms": "auditoorium,näituse,hall,väljapanek,loengu,sündmuste,seminari"
+                },
                 "amenity/courthouse": {
                     "name": "Kohtumaja",
                     "terms": "Kohus"
                     "terms": "autokool,motokool,mootorratta,sõiduauto,veoauto,bussikool"
                 },
                 "amenity/embassy": {
-                    "name": "Saatkond",
-                    "terms": "suursaatkond"
+                    "name": "Saatkond"
+                },
+                "amenity/events_venue": {
+                    "name": "Ürituste pidamiskoht",
+                    "terms": "sündmuste,hall,tähistuskoht,saal,peosaal,peokoht,pidu,seminari,koolituste,rendiruumid"
                 },
                 "amenity/fast_food": {
                     "name": "Kiirtoitlustus"
                 },
                 "amenity/fire_station": {
-                    "name": "Tuletõrjedepoo",
-                    "terms": "tuletõrjujad"
+                    "name": "Päästedepoo",
+                    "terms": "Tuletõrjedepoo,tuletõrjujad,merepääste"
                 },
                 "amenity/food_court": {
                     "name": "Toiduväljak",
                 },
                 "amenity/parking": {
                     "name": "Autoparkla",
-                    "terms": "Parkla, parkimisplats"
+                    "terms": "Parkla,parkimisplats,sõiduauto"
+                },
+                "amenity/parking/multi-storey": {
+                    "name": "Mitmetasandiline parkimismaja",
+                    "terms": "parkla,parkimismaja,autoparkla"
+                },
+                "amenity/parking/underground": {
+                    "name": "Maaalune parkla"
                 },
                 "amenity/parking_entrance": {
                     "name": "Parkimismaja sisse/väljapääs"
                     "name": "Parkimiskoht",
                     "terms": "parkla"
                 },
-                "amenity/pharmacy": {
-                    "name": "Apteek",
-                    "terms": "ravimid"
+                "amenity/photo_booth": {
+                    "name": "Fotokabiin"
                 },
                 "amenity/place_of_worship": {
                     "name": "Pühakoda",
                     "terms": "Budistlik pühakoda"
                 },
                 "amenity/place_of_worship/christian": {
-                    "name": "Kirik",
-                    "terms": "katedral"
+                    "name": "Kristlik kirik",
+                    "terms": "kirik,katedraal,püha,luteri,kabel,pühamu"
                 },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Sünagoog"
+                    "name": "Juudi sünagoog",
+                    "terms": "sünagoog,juudi,juut,judaism"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mošee"
+                    "name": "Islami mošee",
+                    "terms": "muslim,moslem,mosee"
                 },
                 "amenity/planetarium": {
                     "name": "Planetaarium"
                     "name": "Looduskeskus",
                     "terms": "külastuskeskus"
                 },
-                "amenity/recycling": {
-                    "name": "Jäätmekonteiner",
-                    "terms": "taaskasutus,konteiner,prügi,jäätmed,ohtlikud"
-                },
                 "amenity/recycling_centre": {
                     "name": "Ümbertöötluskeskus",
                     "terms": "Taaskasutuskeskus"
                 "amenity/smoking_area": {
                     "name": "Suitsetamise koht"
                 },
+                "amenity/social_centre": {
+                    "name": "Sotsiaalkeskus"
+                },
                 "amenity/social_facility": {
                     "name": "Sotsiaalkeskus",
                     "terms": "Sotsiaalamet"
                 "attraction/amusement_ride": {
                     "name": "Lõbuatraktsioon"
                 },
-                "attraction/animal": {
-                    "name": "Loom"
-                },
                 "attraction/big_wheel": {
                     "name": "Vaateratas"
                 },
                 "barrier/hedge": {
                     "name": "Hekk"
                 },
-                "barrier/kerb": {
-                    "name": "Kiviääris",
-                    "terms": "ääris"
-                },
                 "barrier/kissing_gate": {
                     "name": "Karjavärav"
                 },
                     "terms": "ehitis"
                 },
                 "building/apartments": {
-                    "name": "Korterid"
+                    "name": "Kortermaja"
                 },
                 "building/barn": {
                     "name": "Küün",
                     "name": "Kirikuhoone"
                 },
                 "building/civic": {
-                    "name": "Kultuurihoone",
+                    "name": "Üldkasutatav hoone",
                     "terms": "linna,keskus,seltsimaja,rahvamaja"
                 },
                 "building/college": {
                     "name": "Sissepääs"
                 },
                 "building/farm": {
-                    "name": "Maamaja",
+                    "name": "Talumaja",
                     "terms": "talumaja,elumaja,elamu,maja,rehi*"
                 },
                 "building/farm_auxiliary": {
                 "building/greenhouse": {
                     "name": "Kasvuhoone"
                 },
+                "building/hangar": {
+                    "name": "Angaar",
+                    "terms": "lennukikuur"
+                },
                 "building/hospital": {
                     "name": "Haiglahoone"
                 },
                 },
                 "building/ruins": {
                     "name": "Hoone varemed",
-                    "terms": "varemed,purunenud,maha jäätud"
+                    "terms": "varemed,purunenud,maha jäetud"
                 },
                 "building/school": {
                     "name": "Koolihoone",
                 "building/terrace": {
                     "name": "Terrassmaja"
                 },
-                "building/train_station": {
-                    "name": "Raudteejaam"
-                },
                 "building/transportation": {
                     "name": "Transpordihoone"
                 },
                 "building/warehouse": {
                     "name": "Laohoone"
                 },
+                "building_part": {
+                    "name": "Hoone osa"
+                },
+                "building_point": {
+                    "name": "Hoone"
+                },
                 "camp_site/camp_pitch": {
                     "name": "Kämpingukoht",
                     "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
                 },
-                "circular": {
-                    "name": "Liiklusring"
-                },
                 "club": {
                     "name": "Klubi"
                 },
                     "name": "Veinitehas"
                 },
                 "embankment": {
-                    "name": "Teetamm",
-                    "terms": "muldkeha, tamm, vall"
+                    "name": "Teetamm"
                 },
                 "emergency/ambulance_station": {
                     "name": "Kiirabipunkt"
                 "entrance": {
                     "name": "Sisse- ja Väljapääs"
                 },
-                "footway/crossing": {
-                    "name": "Ülekäik"
-                },
-                "footway/crossing-raised": {
-                    "name": "Tõstetud ülekäik",
-                    "terms": "lame,künnis,aeglusti"
-                },
-                "footway/crosswalk": {
-                    "name": "Ülekäigurada"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Tõstetud ülekäigurada"
-                },
-                "footway/sidewalk": {
-                    "name": "Kõnnitee"
-                },
                 "ford": {
                     "name": "Koolmekoht",
                     "terms": "Koole"
                 "highway/bridleway": {
                     "name": "Ratsutamisrada"
                 },
+                "highway/bus_stop": {
+                    "name": "Bussipeatus"
+                },
+                "highway/construction": {
+                    "name": "Suletud tee",
+                    "terms": "teesulg,teeehitus"
+                },
                 "highway/corridor": {
                     "name": "Sisekoridor",
                     "terms": "koridor"
                 },
                 "highway/crossing": {
-                    "name": "Ülekäigurada"
+                    "name": "Ülekäik"
                 },
-                "highway/crossing-raised": {
-                    "name": "Tõstetud ristmik"
+                "highway/cycleway": {
+                    "name": "Rattatee"
                 },
-                "highway/crosswalk": {
-                    "name": "Ülekäigurada",
-                    "terms": "jalakäijate ülekäik,ülekäik"
+                "highway/cycleway/bicycle_foot": {
+                    "name": "Jalgratta- ja jalgtee",
+                    "terms": "ratta,jalg,jala,jalgratta"
                 },
-                "highway/crosswalk-raised": {
-                    "name": "Tõstetud ülekäigurada"
+                "highway/cycleway/crossing": {
+                    "name": "Lõikumine (jalg- ja) jalgrattateega"
                 },
-                "highway/cycleway": {
-                    "name": "Rattatee"
+                "highway/cycleway/crossing/marked": {
+                    "name": "Märgistatud lõikumine (jalg- ja) jalgrattateega",
+                    "terms": "ratta,jalgratta,ülekäigu,ülekäik"
+                },
+                "highway/cycleway/crossing/unmarked": {
+                    "name": "Märgistamatta lõikumine (jalg- ja) jalgrattateega",
+                    "terms": "ratta,jalgratta,ülekäigu,ülekäik"
                 },
                 "highway/footway": {
                     "name": "Jalgtee",
                     "terms": "kõnnitee"
                 },
+                "highway/footway/crossing": {
+                    "name": "Jalakäia ülekäik"
+                },
                 "highway/give_way": {
                     "name": "Anna teed märk"
                 },
                     "name": "Valgusfoorid",
                     "terms": "Foorid,signaaltuled"
                 },
+                "highway/trailhead": {
+                    "name": "Raja algus",
+                    "terms": "matka,algus,infopunkt,start,plats,stardi"
+                },
                 "highway/trunk": {
                     "name": "E-tähistusega põhimaantee",
                     "terms": "Trunk Road,põhimaantee,maantee"
                     "name": "Loss",
                     "terms": "Kindlus"
                 },
+                "historic/castle/fortress": {
+                    "name": "Linnus",
+                    "terms": "kaitserajatis,kaitsevall,kaitsemüür,müür,kindlus,maalinn"
+                },
+                "historic/castle/palace": {
+                    "name": "Palee",
+                    "terms": "kuninglik,esindusloss,loss,aadli,kõrgaadli"
+                },
+                "historic/castle/stately": {
+                    "name": "Härrastemaja",
+                    "terms": "loss,häärber,mõis,peahoone,esindus,mõisniku,aadli,kõrgaadli"
+                },
+                "historic/city_gate": {
+                    "name": "Linnavärav"
+                },
+                "historic/fort": {
+                    "name": "Kindlus",
+                    "terms": "kindlustus,loss,kaitse,fortifikatsioon,fort"
+                },
+                "historic/manor": {
+                    "name": "Mõis",
+                    "terms": "härrastemaja,mõisa"
+                },
                 "historic/memorial": {
                     "name": "Mälestusmärk",
                     "terms": "Memoriaal"
                 "junction": {
                     "name": "Ristmik"
                 },
+                "junction/roundabout": {
+                    "name": "Ringristmik"
+                },
                 "landuse": {
                     "name": "Maakasutus"
                 },
                     "name": "Akvakultuur"
                 },
                 "landuse/basin": {
-                    "name": "Kogumisbassein",
-                    "terms": "bassein"
+                    "name": "Kogumisbassein"
                 },
                 "landuse/cemetery": {
                     "name": "Surnuaed",
                     "terms": "põllumajandusmaa, maatulundusmaa"
                 },
                 "landuse/farmyard": {
-                    "name": "Talumaa",
-                    "terms": "Põllumajandusmaa, põllumaa, maatulundusmaa"
+                    "name": "Taluõu",
+                    "terms": "taluhoov"
                 },
                 "landuse/forest": {
-                    "name": "Metsamaa"
+                    "name": "Metsamajandusmaa",
+                    "terms": "metsandusmaa,metsatööstusmaa"
                 },
                 "landuse/garages": {
                     "name": "Maakasutus garaažidele",
                 "landuse/military/barracks": {
                     "name": "Kasarmu"
                 },
-                "landuse/military/bunker": {
-                    "name": "Militaarpunker",
-                    "terms": "punker"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Militaarkontrollpunkt"
-                },
                 "landuse/military/danger_area": {
                     "name": "Militaarohu ala"
                 },
                     "name": "Mänguala",
                     "terms": "puhkeala"
                 },
+                "landuse/religious": {
+                    "name": "Sakraalmaa",
+                    "terms": "religioosne,kirik,usu"
+                },
                 "landuse/residential": {
                     "name": "Elamuala",
                     "terms": "Elurajoon, elamurajoon"
                 },
+                "landuse/residential/apartments": {
+                    "name": "Kortermajade kompleks",
+                    "terms": "elumajad"
+                },
                 "landuse/retail": {
                     "name": "Jaekaubandusala",
                     "terms": "kaubandusala"
                 "leisure/pitch/american_football": {
                     "name": "Ameerika jalgpalliväljak"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "Pesapalliväljak"
-                },
                 "leisure/pitch/basketball": {
                     "name": "Korvpalliväljak"
                 },
                     "name": "Puhkekeskus",
                     "terms": "Kuurort, spaa"
                 },
-                "leisure/running_track": {
-                    "name": "Jooksurada"
-                },
                 "leisure/sauna": {
                     "name": "Saun"
                 },
                     "name": "Joon"
                 },
                 "man_made": {
-                    "name": "Inimtehtud",
-                    "terms": "Tehislik, Tehis"
+                    "name": "Inimtehtud"
                 },
                 "man_made/adit": {
                     "name": "Stoll",
                 "man_made/chimney": {
                     "name": "Korsten"
                 },
+                "man_made/clearcut": {
+                    "name": "Raiesmik",
+                    "terms": "lageraie,raiestik,kännustik"
+                },
                 "man_made/crane": {
                     "name": "Kraana"
                 },
                     "name": "Mast",
                     "terms": "Mobiilimast, tv mast, telefonimast, raadiomast, televisioonimast, kommunikatsioonimast"
                 },
-                "man_made/observation": {
-                    "name": "Vaatlustorn"
-                },
                 "man_made/observatory": {
                     "name": "Observatoorium"
                 },
                 "man_made/storage_tank": {
                     "name": "Mahuti"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Valvekaamera"
-                },
                 "man_made/tower": {
                     "name": "Torn"
                 },
+                "man_made/tower/defensive": {
+                    "name": "Kindlustorn",
+                    "terms": "torn,kaitse"
+                },
+                "man_made/tunnel": {
+                    "name": "Tunnel",
+                    "terms": "maaalune"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Reoveepuhastusjaam"
                 },
                     "terms": "Vabrik"
                 },
                 "natural": {
-                    "name": "Looduslik",
-                    "terms": "loomulik, naturaalne"
+                    "name": "Looduslik"
                 },
                 "natural/bare_rock": {
                     "name": "Paljand",
                     "name": "Rand",
                     "terms": "Liivarand"
                 },
+                "natural/cape": {
+                    "name": "Neem",
+                    "terms": "maanina,poolsaar"
+                },
                 "natural/cave_entrance": {
                     "name": "Koopa sissepääs",
                     "terms": "Koobas,sissepääs,auk,õõs"
                     "name": "Mäetipp",
                     "terms": "tipp"
                 },
+                "natural/reef": {
+                    "name": "Kari",
+                    "terms": "riff,korall"
+                },
                 "natural/ridge": {
                     "name": "Mäehari",
                     "terms": "seljandik,mäeseljandik,seljak,mäetipp,tipp"
                 },
+                "natural/rock": {
+                    "name": "Kaljurahn",
+                    "terms": "kivi,rahn"
+                },
                 "natural/saddle": {
                     "name": "Mäesadul"
                 },
                 "natural/scrub": {
                     "name": "Võsa"
                 },
+                "natural/shingle": {
+                    "name": "Kiviklibu",
+                    "terms": "klibu,kivid"
+                },
                 "natural/spring": {
                     "name": "Allikas",
                     "terms": "veeallikas,joogivesi,vesi"
                 },
+                "natural/stone": {
+                    "name": "Lahtine kivirahn",
+                    "terms": "kivi,rändrahn,rahn"
+                },
                 "natural/tree": {
                     "name": "Puu"
                 },
-                "natural/tree_row": {
-                    "name": "Puude rivi",
-                    "terms": "rivis,reas,järjest"
+                "natural/valley": {
+                    "name": "Org",
+                    "terms": "süvend,kanjon,depressioon,kuristik"
                 },
                 "natural/volcano": {
                     "name": "Vulkaan"
                 "natural/water/lake": {
                     "name": "Järv"
                 },
+                "natural/water/moat": {
+                    "name": "Vallikraav",
+                    "terms": "kaitsekraav,kraav"
+                },
                 "natural/water/pond": {
                     "name": "Tiik"
                 },
                     "name": "Reservuaar",
                     "terms": "veehoidla"
                 },
+                "natural/water/wastewater": {
+                    "name": "Reovee bassein",
+                    "terms": "reovesi"
+                },
                 "natural/wetland": {
                     "name": "Märgala",
                     "terms": "roostik"
                     "name": "Ettevõtte kontor",
                     "terms": "kontor,firma,korporatiiv"
                 },
+                "office/diplomatic/consulate": {
+                    "name": "Konsulaat",
+                    "terms": "saatkond"
+                },
+                "office/diplomatic/embassy": {
+                    "name": "Saatkond"
+                },
                 "office/government": {
                     "name": "Valitsuse kontor"
                 },
                 "office/travel_agent": {
                     "name": "Reisibüroo"
                 },
-                "piste": {
-                    "name": "Suusarada"
-                },
                 "place": {
                     "name": "Koht"
                 },
                     "name": "Elektrigeneraator",
                     "terms": "generaator"
                 },
+                "power/generator/source/hydro": {
+                    "name": "Vee turbiin",
+                    "terms": "hüdroelektrijaam,tamm,veegeneraator,turbiin"
+                },
                 "power/line": {
                     "name": "Kõrgepingeliin",
                     "terms": "Elektriliin, kõrgliin, õhuliin"
                     "name": "Trafo",
                     "terms": "Transformaator"
                 },
+                "public_transport/platform/bus_point": {
+                    "name": "Bussipeatus"
+                },
                 "railway": {
                     "name": "Raudtee"
                 },
                     "name": "Seos",
                     "terms": "relatsioon"
                 },
-                "roundabout": {
-                    "name": "Ringtee"
-                },
                 "route/ferry": {
                     "name": "Praamitee"
                 },
                     "name": "Raamatupood"
                 },
                 "shop/boutique": {
-                    "name": "Butiik",
-                    "terms": "moekauplus, moekaup, boutique, ehtekauplus"
+                    "name": "Butiik"
                 },
                 "shop/butcher": {
                     "name": "Lihapood",
                     "name": "Autoremont",
                     "terms": "autoparandus, auto hooldus"
                 },
+                "shop/caravan": {
+                    "name": "Haagissuvilate/autoelamute müügiplats",
+                    "terms": "matkaauto,karavan,autoelamu,ratastel maja, autokaravan,haagiselamu"
+                },
                 "shop/carpet": {
                     "name": "Vaibapood"
                 },
                     "name": "Kommipood"
                 },
                 "shop/convenience": {
-                    "name": "Esmatarbekauba pood",
-                    "terms": "Kauplus, pood"
+                    "name": "Toidupood",
+                    "terms": "Kauplus,pood,külapood,esmatarbekaup,väike pood"
                 },
                 "shop/copyshop": {
                     "name": "Koopiateenuse kauplus"
                     "terms": "Talusaadused,farmikaup,põllusaadused,aiasaadused"
                 },
                 "shop/fashion": {
-                    "name": "Moekauplus",
-                    "terms": "Butiik, moepood, rõivakauplus"
+                    "name": "Moekauplus"
+                },
+                "shop/fireplace": {
+                    "name": "Küttekollete pood",
+                    "terms": "kaminad,ahjud,katlad"
+                },
+                "shop/fishing": {
+                    "name": "Kalastustarvete pood"
                 },
                 "shop/fishmonger": {
                     "name": "Kalakauplus"
                     "name": "Raamikauplus",
                     "terms": "Piltide raamimine,maali raamimine"
                 },
+                "shop/fuel": {
+                    "name": "Küttepood",
+                    "terms": "õli,kütteõli,küte,briketid,küttepuu,puitbrikett,turbabrikett,küttegraanul,pellet,kaminapuu"
+                },
                 "shop/funeral_directors": {
                     "name": "Matusebüroo",
                     "terms": "kirstud, puusärgid, matused"
                     "name": "Balloongaasi kauplus",
                     "terms": "gaas,vedelgaas,grillgaas,segugaas"
                 },
+                "shop/general": {
+                    "name": "Kauplus",
+                    "terms": "pood,esmatarbe"
+                },
                 "shop/gift": {
                     "name": "Kingipood"
                 },
                     "name": "Kodutarvete kauplus",
                     "terms": "köögitabed,majapidamistarbed"
                 },
+                "shop/hunting": {
+                    "name": "Jahipood"
+                },
                 "shop/interior_decoration": {
                     "name": "Sisedekoratsioonikauplus",
                     "terms": "dekoratsioonid,kaunistus"
                 },
-                "shop/jewelry": {
-                    "name": "Ehtepood",
-                    "terms": "ehted,kalliskivid"
-                },
                 "shop/kitchen": {
                     "name": "Köögimööblikauplus",
                     "terms": "köögimööblistuudio,köögistuudio"
                     "name": "Mootorrattapood",
                     "terms": "tsiklid"
                 },
+                "shop/motorcycle_repair": {
+                    "name": "Mootorratta remondikoda",
+                    "terms": "remont,hooldus"
+                },
                 "shop/music": {
                     "name": "Muusikapood"
                 },
                 },
                 "shop/religion": {
                     "name": "Usutarvete kauplus",
-                    "terms": "kirikupood,usupood,pühatarvete"
+                    "terms": "kirikupood,usupood,pühatarvete,sakraal"
                 },
                 "shop/scuba_diving": {
                     "name": "Sukeldustarvikute kauplus",
                 "shop/watches": {
                     "name": "Kellapood"
                 },
+                "shop/water": {
+                    "name": "Joogivee pood"
+                },
                 "shop/water_sports": {
                     "name": "Veesporditarvete kauplus",
                     "terms": "ujumistarbed"
                 "shop/wine": {
                     "name": "Veinipood"
                 },
+                "telecom/data_center": {
+                    "name": "Andmekeskus",
+                    "terms": "datacenter,serveri"
+                },
                 "tourism": {
                     "name": "Turism"
                 },
                 "tourism/artwork": {
                     "name": "Kunstiteos"
                 },
+                "tourism/artwork/installation": {
+                    "name": "Kunstiinstallatsioon",
+                    "terms": "installatsioon,kunst,püsinäitus,väljapanek"
+                },
                 "tourism/attraction": {
                     "name": "Turismiatraktsioon",
                     "terms": "vaatamisväärsus"
                     "name": "Turismiinfokeskus",
                     "terms": "infokeskus"
                 },
+                "tourism/information/route_marker": {
+                    "name": "Rajatähis",
+                    "terms": "tähis,silt,post,märk,juhis,teejuht"
+                },
                 "tourism/motel": {
                     "name": "Motell",
                     "terms": "motohotell"
                     "terms": "einestuskoht,söögikoht"
                 },
                 "tourism/theme_park": {
-                    "name": "Teemapark",
-                    "terms": "lõbustuspark"
+                    "name": "Lõbustuspark",
+                    "terms": "teemapark,seikluskeskus,perepark,seikluspark"
                 },
                 "tourism/viewpoint": {
                     "name": "Vaatekoht",
                 "type/boundary/administrative": {
                     "name": "Halduspiir"
                 },
+                "type/enforcement": {
+                    "name": "Liiklusjärelvalve",
+                    "terms": "järelvalve,liikluskontroll,politseikontroll"
+                },
                 "type/restriction": {
                     "name": "Piirang"
                 },
                 "type/site": {
                     "name": "Asukoht"
                 },
-                "vertex": {
-                    "name": "Muu"
-                },
                 "waterway": {
                     "name": "Veetee"
                 },
                     "name": "Oja"
                 },
                 "waterway/stream_intermittent": {
-                    "name": "Ajutine oja",
-                    "terms": "perioodiline"
+                    "name": "Perioodiline oja",
+                    "terms": "oja,kraav,üleujutatud,ajutine,vahelduv,katkendlik,seiskuv"
                 },
                 "waterway/water_point": {
                     "name": "Joogiveepunkt (veesõidukitele)",
                     "terms": "vesi,vee"
                 },
                 "waterway/waterfall": {
-                    "name": "Kosk"
+                    "name": "Juga"
                 },
                 "waterway/weir": {
                     "name": "Ülevoolupais",
                 "name": "Bingi aerofotod"
             },
             "DigitalGlobe-Premium": {
-                "description": "DigitalGlobe'i satelliidifotod (premium)",
                 "name": "DigitalGlobe'i pildimaterjal (premium)"
             },
             "DigitalGlobe-Standard": {
-                "description": "DigitalGlobe'i satelliidifotod (standard)",
                 "name": "DigitalGlobe'i pildimaterjal (standard)"
             },
             "EsriWorldImagery": {