]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update to iD v1.6.0
[rails.git] / vendor / assets / iD / iD / locales / en.json
diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 97f269ba2cffe4bf0a85363fc79afe9d1ece5c18..7df4440a2b9e23643d5df69fe0f20891c0162a6e 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -97,7 +97,7 @@
         },
         "delete": {
             "title": "Delete",
         },
         "delete": {
             "title": "Delete",
-            "description": "Remove this from the map.",
+            "description": "Delete object permanently.",
             "annotation": {
                 "point": "Deleted a point.",
                 "vertex": "Deleted a node from a way.",
             "annotation": {
                 "point": "Deleted a point.",
                 "vertex": "Deleted a node from a way.",
@@ -354,6 +354,11 @@
         "zoom": "Zoom to GPX track",
         "browse": "Browse for a .gpx file"
     },
         "zoom": "Zoom to GPX track",
         "browse": "Browse for a .gpx file"
     },
+    "mapillary": {
+        "tooltip": "Street-level photos from Mapillary",
+        "title": "Photo Overlay (Mapillary)",
+        "view_on_mapillary": "View this image on Mapillary"
+    },
     "help": {
         "title": "Help",
         "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
     "help": {
         "title": "Help",
         "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
@@ -389,7 +394,7 @@
         },
         "areas": {
             "title": "Areas",
         },
         "areas": {
             "title": "Areas",
-            "add": "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most feature types points can be used for, and are often preferred. **Click the Area button to add a new area.**",
+            "add": "Areas are used to show the boundaries of features like lakes, buildings, and residential areas. They can be also be used for more detailed mapping of many features you might normally map as points. **Click the Area button to add a new area.**",
             "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**",
             "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**",
             "search": "**Search for '{name}'.**",
             "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**",
             "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**",
             "search": "**Search for '{name}'.**",
@@ -628,6 +633,9 @@
             "covered": {
                 "label": "Covered"
             },
             "covered": {
                 "label": "Covered"
             },
+            "craft": {
+                "label": "Type"
+            },
             "crop": {
                 "label": "Crop"
             },
             "crop": {
                 "label": "Crop"
             },
@@ -1054,6 +1062,9 @@
             "sport_ice": {
                 "label": "Sport"
             },
             "sport_ice": {
                 "label": "Sport"
             },
+            "sport_racing": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
@@ -1240,23 +1251,23 @@
             },
             "amenity/arts_centre": {
                 "name": "Arts Center",
             },
             "amenity/arts_centre": {
                 "name": "Arts Center",
-                "terms": "arts,arts centre"
+                "terms": ""
             },
             "amenity/atm": {
                 "name": "ATM",
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": ""
+                "terms": "money,cash,machine"
             },
             "amenity/bank": {
                 "name": "Bank",
             },
             "amenity/bank": {
                 "name": "Bank",
-                "terms": "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault"
+                "terms": "credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault"
             },
             "amenity/bar": {
                 "name": "Bar",
             },
             "amenity/bar": {
                 "name": "Bar",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
             },
             "amenity/bbq": {
                 "name": "Barbecue/Grill",
             },
             "amenity/bbq": {
                 "name": "Barbecue/Grill",
-                "terms": "barbecue,bbq,grill"
+                "terms": "bbq"
             },
             "amenity/bench": {
                 "name": "Bench",
             },
             "amenity/bench": {
                 "name": "Bench",
@@ -1264,23 +1275,27 @@
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/bicycle_rental": {
                 "name": "Bicycle Rental",
             },
             "amenity/bicycle_rental": {
                 "name": "Bicycle Rental",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/boat_rental": {
                 "name": "Boat Rental",
                 "terms": ""
             },
             },
             "amenity/boat_rental": {
                 "name": "Boat Rental",
                 "terms": ""
             },
+            "amenity/bureau_de_change": {
+                "name": "Currency Exchange",
+                "terms": "bureau de change,money changer"
+            },
             "amenity/bus_station": {
                 "name": "Bus Station",
                 "terms": ""
             },
             "amenity/cafe": {
                 "name": "Cafe",
             "amenity/bus_station": {
                 "name": "Bus Station",
                 "terms": ""
             },
             "amenity/cafe": {
                 "name": "Cafe",
-                "terms": "coffee,tea,coffee shop"
+                "terms": "coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
@@ -1299,24 +1314,24 @@
                 "terms": "EV,Electric Vehicle,Supercharger"
             },
             "amenity/childcare": {
                 "terms": "EV,Electric Vehicle,Supercharger"
             },
             "amenity/childcare": {
-                "name": "Childcare",
-                "terms": "nursery,orphanage,playgroup"
+                "name": "Nursery/Childcare",
+                "terms": "daycare,orphanage,playgroup"
             },
             "amenity/cinema": {
                 "name": "Cinema",
             },
             "amenity/cinema": {
                 "name": "Cinema",
-                "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
+                "terms": "drive-in,film,flick,movie,theater,picture,show,screen"
             },
             "amenity/clinic": {
                 "name": "Clinic",
             },
             "amenity/clinic": {
                 "name": "Clinic",
-                "terms": "clinic,medical clinic"
+                "terms": "medical,urgentcare"
             },
             "amenity/clock": {
                 "name": "Clock",
                 "terms": ""
             },
             "amenity/college": {
             },
             "amenity/clock": {
                 "name": "Clock",
                 "terms": ""
             },
             "amenity/college": {
-                "name": "College",
-                "terms": ""
+                "name": "College Grounds",
+                "terms": "university"
             },
             "amenity/compressed_air": {
                 "name": "Compressed Air",
             },
             "amenity/compressed_air": {
                 "name": "Compressed Air",
@@ -1328,19 +1343,19 @@
             },
             "amenity/dentist": {
                 "name": "Dentist",
             },
             "amenity/dentist": {
                 "name": "Dentist",
-                "terms": "dentist,dentist's office"
+                "terms": "tooth,teeth"
             },
             "amenity/doctor": {
                 "name": "Doctor",
             },
             "amenity/doctor": {
                 "name": "Doctor",
-                "terms": "doctor,doctor's office"
+                "terms": "medic*"
             },
             "amenity/dojo": {
                 "name": "Dojo / Martial Arts Academy",
             },
             "amenity/dojo": {
                 "name": "Dojo / Martial Arts Academy",
-                "terms": "martial arts,dojo,dojang"
+                "terms": "martial arts,dojang"
             },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
             },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
-                "terms": "water fountain,potable water"
+                "terms": "fountain,potable"
             },
             "amenity/embassy": {
                 "name": "Embassy",
             },
             "amenity/embassy": {
                 "name": "Embassy",
@@ -1348,7 +1363,7 @@
             },
             "amenity/fast_food": {
                 "name": "Fast Food",
             },
             "amenity/fast_food": {
                 "name": "Fast Food",
-                "terms": ""
+                "terms": "restaurant"
             },
             "amenity/fire_station": {
                 "name": "Fire Station",
             },
             "amenity/fire_station": {
                 "name": "Fire Station",
@@ -1368,15 +1383,15 @@
             },
             "amenity/hospital": {
                 "name": "Hospital Grounds",
             },
             "amenity/hospital": {
                 "name": "Hospital Grounds",
-                "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+                "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
             },
             "amenity/kindergarten": {
             },
             "amenity/kindergarten": {
-                "name": "Kindergarten Grounds",
-                "terms": "nursery,preschool"
+                "name": "Preschool/Kindergarten Grounds",
+                "terms": "kindergarden,pre-school"
             },
             "amenity/library": {
                 "name": "Library",
             },
             "amenity/library": {
                 "name": "Library",
-                "terms": ""
+                "terms": "book"
             },
             "amenity/marketplace": {
                 "name": "Marketplace",
             },
             "amenity/marketplace": {
                 "name": "Marketplace",
@@ -1396,7 +1411,7 @@
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": ""
+                "terms": "drug,medicine"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
@@ -1408,31 +1423,31 @@
             },
             "amenity/place_of_worship/christian": {
                 "name": "Church",
             },
             "amenity/place_of_worship/christian": {
                 "name": "Church",
-                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Synagogue",
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Synagogue",
-                "terms": "jewish,synagogue"
+                "terms": "jewish"
             },
             "amenity/place_of_worship/muslim": {
                 "name": "Mosque",
             },
             "amenity/place_of_worship/muslim": {
                 "name": "Mosque",
-                "terms": "muslim,mosque"
+                "terms": "muslim"
             },
             "amenity/police": {
                 "name": "Police",
             },
             "amenity/police": {
                 "name": "Police",
-                "terms": "badge,bear,blue,bluecoat,bobby,boy scout,bull,constable,constabulary,cop,copper,corps,county mounty,detective,fed,flatfoot,force,fuzz,gendarme,gumshoe,heat,law,law enforcement,man,narc,officers,patrolman,police"
+                "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
             },
             "amenity/post_box": {
                 "name": "Mailbox",
             },
             "amenity/post_box": {
                 "name": "Mailbox",
-                "terms": "letter drop,letterbox,mail drop,mailbox,pillar box,postbox"
+                "terms": "letter,post"
             },
             "amenity/post_office": {
                 "name": "Post Office",
             },
             "amenity/post_office": {
                 "name": "Post Office",
-                "terms": ""
+                "terms": "letter,mail"
             },
             "amenity/pub": {
                 "name": "Pub",
             },
             "amenity/pub": {
                 "name": "Pub",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
@@ -1440,19 +1455,19 @@
             },
             "amenity/recycling": {
                 "name": "Recycling",
             },
             "amenity/recycling": {
                 "name": "Recycling",
-                "terms": ""
+                "terms": "can,bottle,garbage,scrap,trash"
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
-                "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
+                "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
             },
             "amenity/school": {
                 "name": "School Grounds",
             },
             "amenity/school": {
                 "name": "School Grounds",
-                "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
+                "terms": "academy,elementary school,middle school,high school"
             },
             "amenity/shelter": {
                 "name": "Shelter",
             },
             "amenity/shelter": {
                 "name": "Shelter",
-                "terms": "lean-to"
+                "terms": "lean-to,gazebo,picnic"
             },
             "amenity/social_facility": {
                 "name": "Social Facility",
             },
             "amenity/social_facility": {
                 "name": "Social Facility",
@@ -1463,8 +1478,8 @@
                 "terms": ""
             },
             "amenity/social_facility/group_home": {
                 "terms": ""
             },
             "amenity/social_facility/group_home": {
-                "name": "Group Home",
-                "terms": "elderly,old,senior living"
+                "name": "Elderly Group Home",
+                "terms": "old,senior,living"
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Homeless Shelter",
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Homeless Shelter",
@@ -1472,7 +1487,7 @@
             },
             "amenity/studio": {
                 "name": "Studio",
             },
             "amenity/studio": {
                 "name": "Studio",
-                "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                "terms": "recording,radio,television"
             },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
             },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
@@ -1496,15 +1511,15 @@
             },
             "amenity/townhall": {
                 "name": "Town Hall",
             },
             "amenity/townhall": {
                 "name": "Town Hall",
-                "terms": "village hall,city government,courthouse,municipal building,municipal center,municipal centre"
+                "terms": "village,city,government,courthouse,municipal"
             },
             "amenity/university": {
             },
             "amenity/university": {
-                "name": "University",
+                "name": "University Grounds",
                 "terms": "college"
             },
             "amenity/vending_machine": {
                 "name": "Vending Machine",
                 "terms": "college"
             },
             "amenity/vending_machine": {
                 "name": "Vending Machine",
-                "terms": ""
+                "terms": "snack,soda,ticket"
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
@@ -1512,7 +1527,7 @@
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish bin,litter bin,trash can,garbage can"
+                "terms": "rubbish,litter,trash,garbage"
             },
             "area": {
                 "name": "Area",
             },
             "area": {
                 "name": "Area",
@@ -1622,6 +1637,10 @@
                 "name": "Church",
                 "terms": ""
             },
                 "name": "Church",
                 "terms": ""
             },
+            "building/college": {
+                "name": "College Building",
+                "terms": "university"
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
@@ -1674,6 +1693,10 @@
                 "name": "Industrial Building",
                 "terms": ""
             },
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/kindergarten": {
+                "name": "Preschool/Kindergarten Building",
+                "terms": "kindergarden,pre-school"
+            },
             "building/public": {
                 "name": "Public Building",
                 "terms": ""
             "building/public": {
                 "name": "Public Building",
                 "terms": ""
@@ -1692,7 +1715,7 @@
             },
             "building/school": {
                 "name": "School Building",
             },
             "building/school": {
                 "name": "School Building",
-                "terms": ""
+                "terms": "academy,elementary school,middle school,high school"
             },
             "building/shed": {
                 "name": "Shed",
             },
             "building/shed": {
                 "name": "Shed",
@@ -1716,191 +1739,199 @@
             },
             "building/university": {
                 "name": "University Building",
             },
             "building/university": {
                 "name": "University Building",
-                "terms": ""
+                "terms": "college"
             },
             "building/warehouse": {
                 "name": "Warehouse",
                 "terms": ""
             },
             },
             "building/warehouse": {
                 "name": "Warehouse",
                 "terms": ""
             },
+            "craft": {
+                "name": "Craft",
+                "terms": ""
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
             "craft/basket_maker": {
                 "name": "Basket Maker",
-                "terms": "basket,basketry,basket maker,basket weaver"
+                "terms": ""
             },
             "craft/beekeeper": {
                 "name": "Beekeeper",
             },
             "craft/beekeeper": {
                 "name": "Beekeeper",
-                "terms": "bees,beekeeper,bee box"
+                "terms": ""
             },
             "craft/blacksmith": {
                 "name": "Blacksmith",
             },
             "craft/blacksmith": {
                 "name": "Blacksmith",
-                "terms": "blacksmith"
+                "terms": ""
             },
             "craft/boatbuilder": {
                 "name": "Boat Builder",
             },
             "craft/boatbuilder": {
                 "name": "Boat Builder",
-                "terms": "boat builder"
+                "terms": ""
             },
             "craft/bookbinder": {
                 "name": "Bookbinder",
             },
             "craft/bookbinder": {
                 "name": "Bookbinder",
-                "terms": "bookbinder,book repair"
+                "terms": "book repair"
             },
             "craft/brewery": {
                 "name": "Brewery",
             },
             "craft/brewery": {
                 "name": "Brewery",
-                "terms": "brewery"
+                "terms": "beer,bier"
             },
             "craft/carpenter": {
                 "name": "Carpenter",
             },
             "craft/carpenter": {
                 "name": "Carpenter",
-                "terms": "carpenter,woodworker"
+                "terms": "woodworker"
             },
             "craft/carpet_layer": {
                 "name": "Carpet Layer",
             },
             "craft/carpet_layer": {
                 "name": "Carpet Layer",
-                "terms": "carpet layer"
+                "terms": ""
             },
             "craft/caterer": {
                 "name": "Caterer",
             },
             "craft/caterer": {
                 "name": "Caterer",
-                "terms": "Caterer,Catering"
+                "terms": ""
             },
             "craft/clockmaker": {
                 "name": "Clockmaker",
             },
             "craft/clockmaker": {
                 "name": "Clockmaker",
-                "terms": "clock,clockmaker,clock repair"
+                "terms": ""
             },
             "craft/confectionary": {
                 "name": "Confectionary",
             },
             "craft/confectionary": {
                 "name": "Confectionary",
-                "terms": "confectionary,sweets,candy"
+                "terms": "sweets,candy"
             },
             "craft/dressmaker": {
                 "name": "Dressmaker",
             },
             "craft/dressmaker": {
                 "name": "Dressmaker",
-                "terms": "dress,dressmaker"
+                "terms": "seamstress"
             },
             "craft/electrician": {
                 "name": "Electrician",
             },
             "craft/electrician": {
                 "name": "Electrician",
-                "terms": "electrician"
+                "terms": "power,wire"
             },
             "craft/gardener": {
                 "name": "Gardener",
             },
             "craft/gardener": {
                 "name": "Gardener",
-                "terms": "gardener,landscaper,grounds keeper"
+                "terms": "landscaper,grounds keeper"
             },
             "craft/glaziery": {
                 "name": "Glaziery",
             },
             "craft/glaziery": {
                 "name": "Glaziery",
-                "terms": "glass,glass foundry,stained-glass,window"
+                "terms": "glass,stained-glass,window"
             },
             "craft/handicraft": {
                 "name": "Handicraft",
             },
             "craft/handicraft": {
                 "name": "Handicraft",
-                "terms": "handicraft"
+                "terms": ""
             },
             "craft/hvac": {
                 "name": "HVAC",
             },
             "craft/hvac": {
                 "name": "HVAC",
-                "terms": "heating,ventilating,air-conditioning,air conditioning"
+                "terms": "heat*,vent*,air conditioning"
             },
             "craft/insulator": {
                 "name": "Insulator",
             },
             "craft/insulator": {
                 "name": "Insulator",
-                "terms": "insulation,insulator"
+                "terms": ""
             },
             "craft/jeweler": {
                 "name": "Jeweler",
             },
             "craft/jeweler": {
                 "name": "Jeweler",
-                "terms": "jeweler,gem,diamond"
+                "terms": ""
             },
             "craft/key_cutter": {
                 "name": "Key Cutter",
             },
             "craft/key_cutter": {
                 "name": "Key Cutter",
-                "terms": "key,key cutter"
+                "terms": ""
             },
             "craft/locksmith": {
                 "name": "Locksmith",
             },
             "craft/locksmith": {
                 "name": "Locksmith",
-                "terms": "locksmith,lock"
+                "terms": ""
             },
             "craft/metal_construction": {
                 "name": "Metal Construction",
             },
             "craft/metal_construction": {
                 "name": "Metal Construction",
-                "terms": "metal construction"
+                "terms": ""
             },
             "craft/optician": {
                 "name": "Optician",
             },
             "craft/optician": {
                 "name": "Optician",
-                "terms": "glasses,optician"
+                "terms": ""
             },
             "craft/painter": {
                 "name": "Painter",
             },
             "craft/painter": {
                 "name": "Painter",
-                "terms": "painter"
+                "terms": ""
             },
             "craft/photographer": {
                 "name": "Photographer",
             },
             "craft/photographer": {
                 "name": "Photographer",
-                "terms": "photographer"
+                "terms": ""
             },
             "craft/photographic_laboratory": {
                 "name": "Photographic Laboratory",
             },
             "craft/photographic_laboratory": {
                 "name": "Photographic Laboratory",
-                "terms": "photographic laboratory,film developer"
+                "terms": "film"
             },
             "craft/plasterer": {
                 "name": "Plasterer",
             },
             "craft/plasterer": {
                 "name": "Plasterer",
-                "terms": "plasterer"
+                "terms": ""
             },
             "craft/plumber": {
                 "name": "Plumber",
             },
             "craft/plumber": {
                 "name": "Plumber",
-                "terms": "pumber"
+                "terms": "pipe"
             },
             "craft/pottery": {
                 "name": "Pottery",
             },
             "craft/pottery": {
                 "name": "Pottery",
-                "terms": "pottery,potter"
+                "terms": "ceramic"
             },
             "craft/rigger": {
                 "name": "Rigger",
             },
             "craft/rigger": {
                 "name": "Rigger",
-                "terms": "rigger"
+                "terms": ""
             },
             "craft/roofer": {
                 "name": "Roofer",
             },
             "craft/roofer": {
                 "name": "Roofer",
-                "terms": "roofer"
+                "terms": ""
             },
             "craft/saddler": {
                 "name": "Saddler",
             },
             "craft/saddler": {
                 "name": "Saddler",
-                "terms": "saddler"
+                "terms": ""
             },
             "craft/sailmaker": {
                 "name": "Sailmaker",
             },
             "craft/sailmaker": {
                 "name": "Sailmaker",
-                "terms": "sailmaker"
+                "terms": ""
             },
             "craft/sawmill": {
                 "name": "Sawmill",
             },
             "craft/sawmill": {
                 "name": "Sawmill",
-                "terms": "sawmill,lumber"
+                "terms": "lumber"
             },
             "craft/scaffolder": {
                 "name": "Scaffolder",
             },
             "craft/scaffolder": {
                 "name": "Scaffolder",
-                "terms": "scaffolder"
+                "terms": ""
             },
             "craft/sculpter": {
                 "name": "Sculpter",
             },
             "craft/sculpter": {
                 "name": "Sculpter",
-                "terms": "sculpter"
+                "terms": ""
             },
             "craft/shoemaker": {
                 "name": "Shoemaker",
             },
             "craft/shoemaker": {
                 "name": "Shoemaker",
-                "terms": "shoe repair,shoemaker"
+                "terms": "cobbler"
             },
             "craft/stonemason": {
                 "name": "Stonemason",
             },
             "craft/stonemason": {
                 "name": "Stonemason",
-                "terms": "stonemason,masonry"
+                "terms": "masonry"
             },
             "craft/sweep": {
                 "name": "Chimney Sweep",
             },
             "craft/sweep": {
                 "name": "Chimney Sweep",
-                "terms": "sweep,chimney sweep"
+                "terms": ""
             },
             "craft/tailor": {
                 "name": "Tailor",
             },
             "craft/tailor": {
                 "name": "Tailor",
-                "terms": "tailor,clothes"
+                "terms": "clothes,suit"
             },
             "craft/tiler": {
                 "name": "Tiler",
             },
             "craft/tiler": {
                 "name": "Tiler",
-                "terms": "tiler"
+                "terms": ""
             },
             "craft/tinsmith": {
                 "name": "Tinsmith",
             },
             "craft/tinsmith": {
                 "name": "Tinsmith",
-                "terms": "tinsmith"
+                "terms": ""
             },
             "craft/upholsterer": {
                 "name": "Upholsterer",
             },
             "craft/upholsterer": {
                 "name": "Upholsterer",
-                "terms": "upholsterer"
+                "terms": ""
             },
             "craft/watchmaker": {
                 "name": "Watchmaker",
             },
             "craft/watchmaker": {
                 "name": "Watchmaker",
-                "terms": "watch,watchmaker,watch repair"
+                "terms": ""
             },
             "craft/window_construction": {
                 "name": "Window Construction",
             },
             "craft/window_construction": {
                 "name": "Window Construction",
-                "terms": "window,window maker,window construction"
+                "terms": "glass"
+            },
+            "craft/winery": {
+                "name": "Winery",
+                "terms": ""
             },
             "embankment": {
                 "name": "Embankment",
             },
             "embankment": {
                 "name": "Embankment",
@@ -1908,7 +1939,7 @@
             },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
             },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
-                "terms": ""
+                "terms": "EMS,EMT,rescue"
             },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
             },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
@@ -1928,7 +1959,7 @@
             },
             "footway/crosswalk": {
                 "name": "Crosswalk",
             },
             "footway/crosswalk": {
                 "name": "Crosswalk",
-                "terms": "crosswalk,zebra crossing"
+                "terms": "zebra crossing"
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
@@ -1948,7 +1979,7 @@
             },
             "golf/green": {
                 "name": "Putting Green",
             },
             "golf/green": {
                 "name": "Putting Green",
-                "terms": "putting green"
+                "terms": ""
             },
             "golf/hole": {
                 "name": "Golf Hole",
             },
             "golf/hole": {
                 "name": "Golf Hole",
@@ -1976,7 +2007,7 @@
             },
             "highway/bridleway": {
                 "name": "Bridle Path",
             },
             "highway/bridleway": {
                 "name": "Bridle Path",
-                "terms": "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
+                "terms": "bridleway,equestrian,horse"
             },
             "highway/bus_stop": {
                 "name": "Bus Stop",
             },
             "highway/bus_stop": {
                 "name": "Bus Stop",
@@ -1988,15 +2019,15 @@
             },
             "highway/crosswalk": {
                 "name": "Crosswalk",
             },
             "highway/crosswalk": {
                 "name": "Crosswalk",
-                "terms": "crosswalk,zebra crossing"
+                "terms": "zebra crossing"
             },
             "highway/cycleway": {
                 "name": "Cycle Path",
             },
             "highway/cycleway": {
                 "name": "Cycle Path",
-                "terms": ""
+                "terms": "bike"
             },
             "highway/footway": {
                 "name": "Foot Path",
             },
             "highway/footway": {
                 "name": "Foot Path",
-                "terms": "beaten path,boulevard,clearing,course,cut*,drag*,footpath,highway,lane,line,orbit,passage,pathway,rail,rails,road,roadway,route,street,thoroughfare,trackway,trail,trajectory,walk"
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/living_street": {
                 "name": "Living Street",
             },
             "highway/living_street": {
                 "name": "Living Street",
@@ -2020,7 +2051,7 @@
             },
             "highway/path": {
                 "name": "Path",
             },
             "highway/path": {
                 "name": "Path",
-                "terms": ""
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/pedestrian": {
                 "name": "Pedestrian",
             },
             "highway/pedestrian": {
                 "name": "Pedestrian",
@@ -2034,13 +2065,17 @@
                 "name": "Primary Link",
                 "terms": "ramp,on ramp,off ramp"
             },
                 "name": "Primary Link",
                 "terms": "ramp,on ramp,off ramp"
             },
+            "highway/raceway": {
+                "name": "Motor Raceway",
+                "terms": "auto*,race*,nascar"
+            },
             "highway/residential": {
                 "name": "Residential Road",
                 "terms": ""
             },
             "highway/rest_area": {
                 "name": "Rest Area",
             "highway/residential": {
                 "name": "Residential Road",
                 "terms": ""
             },
             "highway/rest_area": {
                 "name": "Rest Area",
-                "terms": "rest stop,turnout,lay-by"
+                "terms": "rest stop"
             },
             "highway/road": {
                 "name": "Unknown Road",
             },
             "highway/road": {
                 "name": "Unknown Road",
@@ -2104,7 +2139,7 @@
             },
             "highway/track": {
                 "name": "Track",
             },
             "highway/track": {
                 "name": "Track",
-                "terms": ""
+                "terms": "woods road,fire road"
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
@@ -2120,7 +2155,7 @@
             },
             "highway/turning_circle": {
                 "name": "Turning Circle",
             },
             "highway/turning_circle": {
                 "name": "Turning Circle",
-                "terms": ""
+                "terms": "cul-de-sac"
             },
             "highway/unclassified": {
                 "name": "Unclassified Road",
             },
             "highway/unclassified": {
                 "name": "Unclassified Road",
@@ -2276,7 +2311,7 @@
             },
             "leisure/marina": {
                 "name": "Marina",
             },
             "leisure/marina": {
                 "name": "Marina",
-                "terms": ""
+                "terms": "boat"
             },
             "leisure/park": {
                 "name": "Park",
             },
             "leisure/park": {
                 "name": "Park",
@@ -2284,11 +2319,11 @@
             },
             "leisure/picnic_table": {
                 "name": "Picnic Table",
             },
             "leisure/picnic_table": {
                 "name": "Picnic Table",
-                "terms": "bench,table"
+                "terms": "bench"
             },
             "leisure/pitch": {
                 "name": "Sport Pitch",
             },
             "leisure/pitch": {
                 "name": "Sport Pitch",
-                "terms": ""
+                "terms": "field"
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Field",
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Field",
@@ -2322,9 +2357,13 @@
                 "name": "Playground",
                 "terms": "jungle gym,play area"
             },
                 "name": "Playground",
                 "terms": "jungle gym,play area"
             },
+            "leisure/running_track": {
+                "name": "Running Track",
+                "terms": ""
+            },
             "leisure/slipway": {
                 "name": "Slipway",
             "leisure/slipway": {
                 "name": "Slipway",
-                "terms": ""
+                "terms": "boat launch,boat ramp"
             },
             "leisure/sports_center": {
                 "name": "Sports Center / Gym",
             },
             "leisure/sports_center": {
                 "name": "Sports Center / Gym",
@@ -2339,7 +2378,7 @@
                 "terms": ""
             },
             "leisure/track": {
                 "terms": ""
             },
             "leisure/track": {
-                "name": "Race Track",
+                "name": "Racetrack (non-Motorsport)",
                 "terms": ""
             },
             "line": {
                 "terms": ""
             },
             "line": {
@@ -2392,14 +2431,14 @@
             },
             "man_made/wastewater_plant": {
                 "name": "Wastewater Plant",
             },
             "man_made/wastewater_plant": {
                 "name": "Wastewater Plant",
-                "terms": "sewage works,sewage treatment plant,water treatment plant,reclamation plant"
+                "terms": "sewage*,water treatment plant,reclamation plant"
             },
             "man_made/water_tower": {
                 "name": "Water Tower",
                 "terms": ""
             },
             "man_made/water_well": {
             },
             "man_made/water_tower": {
                 "name": "Water Tower",
                 "terms": ""
             },
             "man_made/water_well": {
-                "name": "Water well",
+                "name": "Water Well",
                 "terms": ""
             },
             "man_made/water_works": {
                 "terms": ""
             },
             "man_made/water_works": {
@@ -2528,7 +2567,7 @@
             },
             "office/employment_agency": {
                 "name": "Employment Agency",
             },
             "office/employment_agency": {
                 "name": "Employment Agency",
-                "terms": ""
+                "terms": "job"
             },
             "office/estate_agent": {
                 "name": "Real Estate Office",
             },
             "office/estate_agent": {
                 "name": "Real Estate Office",
@@ -2744,20 +2783,44 @@
             },
             "shop/alcohol": {
                 "name": "Liquor Store",
             },
             "shop/alcohol": {
                 "name": "Liquor Store",
-                "terms": "alcohol"
+                "terms": "alcohol,beer,booze,wine"
+            },
+            "shop/anime": {
+                "name": "Anime Shop",
+                "terms": ""
+            },
+            "shop/antiques": {
+                "name": "Antiques Shop",
+                "terms": ""
             },
             "shop/art": {
             },
             "shop/art": {
-                "name": "Art Shop",
-                "terms": "art store,art gallery"
+                "name": "Art Gallery",
+                "terms": ""
+            },
+            "shop/baby_goods": {
+                "name": "Baby Goods Store",
+                "terms": ""
+            },
+            "shop/bag": {
+                "name": "Bag/Luggage Store",
+                "terms": "handbag,purse"
             },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
             },
             },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
             },
+            "shop/bathroom_furnishing": {
+                "name": "Bathroom Furnishing Store",
+                "terms": ""
+            },
             "shop/beauty": {
                 "name": "Beauty Shop",
                 "terms": "nail spa,spa,salon,tanning"
             },
             "shop/beauty": {
                 "name": "Beauty Shop",
                 "terms": "nail spa,spa,salon,tanning"
             },
+            "shop/bed": {
+                "name": "Bedding/Mattress Store",
+                "terms": ""
+            },
             "shop/beverages": {
                 "name": "Beverage Store",
                 "terms": ""
             "shop/beverages": {
                 "name": "Beverage Store",
                 "terms": ""
@@ -2771,7 +2834,7 @@
                 "terms": ""
             },
             "shop/books": {
                 "terms": ""
             },
             "shop/books": {
-                "name": "Bookstore",
+                "name": "Book Store",
                 "terms": ""
             },
             "shop/boutique": {
                 "terms": ""
             },
             "shop/boutique": {
@@ -2780,24 +2843,40 @@
             },
             "shop/butcher": {
                 "name": "Butcher",
             },
             "shop/butcher": {
                 "name": "Butcher",
+                "terms": "meat"
+            },
+            "shop/candles": {
+                "name": "Candle Shop",
                 "terms": ""
             },
             "shop/car": {
                 "name": "Car Dealership",
                 "terms": ""
             },
             "shop/car": {
                 "name": "Car Dealership",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_parts": {
                 "name": "Car Parts Store",
             },
             "shop/car_parts": {
                 "name": "Car Parts Store",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_repair": {
                 "name": "Car Repair Shop",
             },
             "shop/car_repair": {
                 "name": "Car Repair Shop",
+                "terms": "auto"
+            },
+            "shop/carpet": {
+                "name": "Carpet Store",
+                "terms": "rug"
+            },
+            "shop/cheese": {
+                "name": "Cheese Store",
                 "terms": ""
             },
             "shop/chemist": {
                 "name": "Chemist",
                 "terms": ""
             },
                 "terms": ""
             },
             "shop/chemist": {
                 "name": "Chemist",
                 "terms": ""
             },
+            "shop/chocolate": {
+                "name": "Chocolate Store",
+                "terms": ""
+            },
             "shop/clothes": {
                 "name": "Clothing Store",
                 "terms": ""
             "shop/clothes": {
                 "name": "Clothing Store",
                 "terms": ""
@@ -2807,16 +2886,36 @@
                 "terms": ""
             },
             "shop/confectionery": {
                 "terms": ""
             },
             "shop/confectionery": {
-                "name": "Confectionery",
+                "name": "Candy Store",
                 "terms": ""
             },
             "shop/convenience": {
                 "name": "Convenience Store",
                 "terms": ""
             },
                 "terms": ""
             },
             "shop/convenience": {
                 "name": "Convenience Store",
                 "terms": ""
             },
+            "shop/copyshop": {
+                "name": "Copy Store",
+                "terms": ""
+            },
+            "shop/cosmetics": {
+                "name": "Cosmetics Store",
+                "terms": ""
+            },
+            "shop/craft": {
+                "name": "Arts and Crafts Store",
+                "terms": ""
+            },
+            "shop/curtain": {
+                "name": "Curtain Store",
+                "terms": "drape*,window"
+            },
+            "shop/dairy": {
+                "name": "Dairy Store",
+                "terms": "milk,egg,cheese"
+            },
             "shop/deli": {
                 "name": "Deli",
             "shop/deli": {
                 "name": "Deli",
-                "terms": ""
+                "terms": "lunch,meat,sandwich"
             },
             "shop/department_store": {
                 "name": "Department Store",
             },
             "shop/department_store": {
                 "name": "Department Store",
@@ -2827,36 +2926,56 @@
                 "terms": ""
             },
             "shop/dry_cleaning": {
                 "terms": ""
             },
             "shop/dry_cleaning": {
-                "name": "Dry Cleaners",
+                "name": "Dry Cleaner",
                 "terms": ""
             },
             "shop/electronics": {
                 "name": "Electronics Store",
                 "terms": ""
             },
             "shop/electronics": {
                 "name": "Electronics Store",
-                "terms": ""
+                "terms": "appliance,audio,computer,tv"
+            },
+            "shop/erotic": {
+                "name": "Erotic Store",
+                "terms": "sex,porn"
+            },
+            "shop/fabric": {
+                "name": "Fabric Store",
+                "terms": "sew"
             },
             "shop/farm": {
                 "name": "Produce Stand",
                 "terms": "farm shop,farm stand"
             },
             },
             "shop/farm": {
                 "name": "Produce Stand",
                 "terms": "farm shop,farm stand"
             },
+            "shop/fashion": {
+                "name": "Fashion Store",
+                "terms": ""
+            },
             "shop/fishmonger": {
                 "name": "Fishmonger",
                 "terms": ""
             },
             "shop/florist": {
                 "name": "Florist",
             "shop/fishmonger": {
                 "name": "Fishmonger",
                 "terms": ""
             },
             "shop/florist": {
                 "name": "Florist",
+                "terms": "flower"
+            },
+            "shop/frame": {
+                "name": "Framing Shop",
                 "terms": ""
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
                 "terms": ""
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
-                "terms": "undertaker,funeral parlour,funeral parlor,memorial home"
+                "terms": "undertaker,memorial home"
+            },
+            "shop/furnace": {
+                "name": "Furnace Store",
+                "terms": "oven,stove"
             },
             "shop/furniture": {
                 "name": "Furniture Store",
             },
             "shop/furniture": {
                 "name": "Furniture Store",
-                "terms": ""
+                "terms": "chair,sofa,table"
             },
             "shop/garden_centre": {
                 "name": "Garden Center",
             },
             "shop/garden_centre": {
                 "name": "Garden Center",
-                "terms": "garden centre"
+                "terms": "landscape,mulch,shrub,tree"
             },
             "shop/gift": {
                 "name": "Gift Shop",
             },
             "shop/gift": {
                 "name": "Gift Shop",
@@ -2864,7 +2983,7 @@
             },
             "shop/greengrocer": {
                 "name": "Greengrocer",
             },
             "shop/greengrocer": {
                 "name": "Greengrocer",
-                "terms": ""
+                "terms": "fruit,vegetable"
             },
             "shop/hairdresser": {
                 "name": "Hairdresser",
             },
             "shop/hairdresser": {
                 "name": "Hairdresser",
@@ -2874,25 +2993,45 @@
                 "name": "Hardware Store",
                 "terms": ""
             },
                 "name": "Hardware Store",
                 "terms": ""
             },
+            "shop/hearing_aids": {
+                "name": "Hearing Aids Store",
+                "terms": ""
+            },
+            "shop/herbalist": {
+                "name": "Herbalist",
+                "terms": ""
+            },
             "shop/hifi": {
                 "name": "Hifi Store",
             "shop/hifi": {
                 "name": "Hifi Store",
+                "terms": "stereo,video"
+            },
+            "shop/interior_decoration": {
+                "name": "Interior Decoration Store",
                 "terms": ""
             },
             "shop/jewelry": {
                 "name": "Jeweler",
                 "terms": ""
             },
             "shop/jewelry": {
                 "name": "Jeweler",
-                "terms": ""
+                "terms": "diamond,gem,ring"
             },
             "shop/kiosk": {
             },
             "shop/kiosk": {
-                "name": "Kiosk",
+                "name": "News Kiosk",
+                "terms": ""
+            },
+            "shop/kitchen": {
+                "name": "Kitchen Design Store",
                 "terms": ""
             },
             "shop/laundry": {
                 "name": "Laundry",
                 "terms": ""
             },
                 "terms": ""
             },
             "shop/laundry": {
                 "name": "Laundry",
                 "terms": ""
             },
+            "shop/leather": {
+                "name": "Leather Store",
+                "terms": ""
+            },
             "shop/locksmith": {
                 "name": "Locksmith",
             "shop/locksmith": {
                 "name": "Locksmith",
-                "terms": "keys"
+                "terms": "key,lockpick"
             },
             "shop/lottery": {
                 "name": "Lottery Shop",
             },
             "shop/lottery": {
                 "name": "Lottery Shop",
@@ -2902,42 +3041,90 @@
                 "name": "Mall",
                 "terms": ""
             },
                 "name": "Mall",
                 "terms": ""
             },
+            "shop/massage": {
+                "name": "Massage Shop",
+                "terms": ""
+            },
+            "shop/medical_supply": {
+                "name": "Medical Supply Store",
+                "terms": ""
+            },
             "shop/mobile_phone": {
                 "name": "Mobile Phone Store",
                 "terms": ""
             },
             "shop/mobile_phone": {
                 "name": "Mobile Phone Store",
                 "terms": ""
             },
+            "shop/money_lender": {
+                "name": "Money Lender",
+                "terms": ""
+            },
             "shop/motorcycle": {
                 "name": "Motorcycle Dealership",
                 "terms": ""
             },
             "shop/music": {
                 "name": "Music Store",
             "shop/motorcycle": {
                 "name": "Motorcycle Dealership",
                 "terms": ""
             },
             "shop/music": {
                 "name": "Music Store",
+                "terms": "CD,vinyl"
+            },
+            "shop/musical_instrument": {
+                "name": "Musical Instrument Store",
                 "terms": ""
             },
             "shop/newsagent": {
                 "terms": ""
             },
             "shop/newsagent": {
-                "name": "Newsagent",
+                "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
             "shop/optician": {
                 "name": "Optician",
                 "terms": ""
             },
             "shop/optician": {
                 "name": "Optician",
+                "terms": "eye,glasses"
+            },
+            "shop/organic": {
+                "name": "Organic Goods Store",
                 "terms": ""
             },
             "shop/outdoor": {
                 "terms": ""
             },
             "shop/outdoor": {
-                "name": "Outdoor Store",
+                "name": "Outdoors Store",
+                "terms": "camping,climbing,hiking"
+            },
+            "shop/paint": {
+                "name": "Paint Store",
+                "terms": ""
+            },
+            "shop/pawnbroker": {
+                "name": "Pawn Shop",
                 "terms": ""
             },
             "shop/pet": {
                 "name": "Pet Store",
                 "terms": ""
             },
             "shop/pet": {
                 "name": "Pet Store",
-                "terms": ""
+                "terms": "cat,dog,fish"
             },
             "shop/photo": {
                 "name": "Photography Store",
             },
             "shop/photo": {
                 "name": "Photography Store",
+                "terms": "camera,film"
+            },
+            "shop/pyrotechnics": {
+                "name": "Fireworks Store",
+                "terms": ""
+            },
+            "shop/radiotechnics": {
+                "name": "Radio/Electronic Component Store",
+                "terms": ""
+            },
+            "shop/religion": {
+                "name": "Religious Store",
+                "terms": ""
+            },
+            "shop/scuba_diving": {
+                "name": "Scuba Diving Shop",
                 "terms": ""
             },
             "shop/seafood": {
                 "name": "Seafood Shop",
                 "terms": "fishmonger"
             },
                 "terms": ""
             },
             "shop/seafood": {
                 "name": "Seafood Shop",
                 "terms": "fishmonger"
             },
+            "shop/second_hand": {
+                "name": "Consignment/Thrift Store",
+                "terms": "secondhand,second hand,resale,thrift,used"
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
@@ -2948,15 +3135,31 @@
             },
             "shop/stationery": {
                 "name": "Stationery Store",
             },
             "shop/stationery": {
                 "name": "Stationery Store",
-                "terms": ""
+                "terms": "card,paper"
             },
             "shop/supermarket": {
                 "name": "Supermarket",
             },
             "shop/supermarket": {
                 "name": "Supermarket",
-                "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop"
+                "terms": "grocery,store,shop"
             },
             "shop/tailor": {
                 "name": "Tailor",
             },
             "shop/tailor": {
                 "name": "Tailor",
-                "terms": "tailor,clothes"
+                "terms": "clothes,suit"
+            },
+            "shop/tattoo": {
+                "name": "Tattoo Parlor",
+                "terms": ""
+            },
+            "shop/tea": {
+                "name": "Tea Store",
+                "terms": ""
+            },
+            "shop/ticket": {
+                "name": "Ticket Seller",
+                "terms": ""
+            },
+            "shop/tobacco": {
+                "name": "Tobacco Shop",
+                "terms": ""
             },
             "shop/toys": {
                 "name": "Toy Store",
             },
             "shop/toys": {
                 "name": "Toy Store",
@@ -2974,17 +3177,37 @@
                 "name": "Vacant Shop",
                 "terms": ""
             },
                 "name": "Vacant Shop",
                 "terms": ""
             },
+            "shop/vacuum_cleaner": {
+                "name": "Vacuum Cleaner Store",
+                "terms": ""
+            },
             "shop/variety_store": {
                 "name": "Variety Store",
                 "terms": ""
             },
             "shop/video": {
                 "name": "Video Store",
             "shop/variety_store": {
                 "name": "Variety Store",
                 "terms": ""
             },
             "shop/video": {
                 "name": "Video Store",
+                "terms": "DVD"
+            },
+            "shop/video_games": {
+                "name": "Video Game Store",
+                "terms": ""
+            },
+            "shop/water_sports": {
+                "name": "Watersport/Swim Shop",
+                "terms": ""
+            },
+            "shop/weapons": {
+                "name": "Weapon Shop",
+                "terms": "ammo,gun,knife,knives"
+            },
+            "shop/window_blind": {
+                "name": "Window Blind Store",
                 "terms": ""
             },
             "shop/wine": {
                 "name": "Wine Shop",
                 "terms": ""
             },
             "shop/wine": {
                 "name": "Wine Shop",
-                "terms": "winery"
+                "terms": ""
             },
             "tourism": {
                 "name": "Tourism",
             },
             "tourism": {
                 "name": "Tourism",
@@ -3004,7 +3227,7 @@
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": "camping"
+                "terms": ""
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
@@ -3016,7 +3239,7 @@
             },
             "tourism/guest_house": {
                 "name": "Guest House",
             },
             "tourism/guest_house": {
                 "name": "Guest House",
-                "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
+                "terms": "B&B,Bed and Breakfast"
             },
             "tourism/hostel": {
                 "name": "Hostel",
             },
             "tourism/hostel": {
                 "name": "Hostel",
@@ -3036,11 +3259,11 @@
             },
             "tourism/museum": {
                 "name": "Museum",
             },
             "tourism/museum": {
                 "name": "Museum",
-                "terms": "exhibition,exhibits archive,foundation,gallery,hall,institution,library,menagerie,repository,salon,storehouse,treasury,vault"
+                "terms": "exhibition,foundation,gallery,hall,institution"
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",
-                "terms": ""
+                "terms": "camp"
             },
             "tourism/theme_park": {
                 "name": "Theme Park",
             },
             "tourism/theme_park": {
                 "name": "Theme Park",
The OpenStreetMap web site